more renames

Author: fadi-george

__test__/support/helpers/setup.ts

@@ -138,7 +138,7 @@ export const setupSubscriptionModel = async (
 export const setupLoadStylesheet = async () => {
   vi.spyOn(
     OneSignal._context._dynamicResourceLoader,
-    'loadSdkStylesheet',
+    '_loadSdkStylesheet',
   ).mockResolvedValue(ResourceLoadState.Loaded);
 };
 

package.json

@@ -84,7 +84,7 @@
     },
     {
       "path": "./build/releases/OneSignalSDK.page.es6.js",
-      "limit": "47.33 kB",
+      "limit": "47.26 kB",
       "gzip": true
     },
     {

src/onesignal/OneSignal.ts

@@ -168,7 +168,7 @@ export default class OneSignal {
   private static async _delayedInit(): Promise<void> {
     OneSignal._pendingInit = false;
     // Ignore Promise as doesn't return until the service worker becomes active.
-    OneSignal._context._workerMessenger.listen();
+    OneSignal._context._workerMessenger._listen();
 
     async function __init() {
       if (OneSignal._initAlreadyCalled) return;

src/page/bell/Bell.ts

@@ -413,7 +413,7 @@ export default class Bell {
     if (!this._options.enable) return;
 
     const sdkStylesLoadResult =
-      await OneSignal._context._dynamicResourceLoader.loadSdkStylesheet();
+      await OneSignal._context._dynamicResourceLoader._loadSdkStylesheet();
     if (sdkStylesLoadResult !== ResourceLoadState.Loaded) {
       Log._debug('Not showing notify button because styles failed to load.');
       return;

src/page/managers/PromptsManager.ts

@@ -202,7 +202,7 @@ export class PromptsManager {
     }
 
     const sdkStylesLoadResult =
-      await this.context._dynamicResourceLoader.loadSdkStylesheet();
+      await this.context._dynamicResourceLoader._loadSdkStylesheet();
     if (sdkStylesLoadResult !== ResourceLoadState.Loaded) {
       Log._debug(
         'Not showing slidedown permission message because styles failed to load.',

src/page/services/DynamicResourceLoader.test.ts

@@ -129,15 +129,15 @@ describe('DynamicResourceLoader', () => {
     );
 
     const loader = new DynamicResourceLoader();
-    const state = await loader.loadSdkStylesheet();
+    const state = await loader._loadSdkStylesheet();
 
     expect(state).toBe(ResourceLoadState.Loaded);
     const stylesheets = document.head.querySelectorAll(
       'link[rel="stylesheet"]',
     );
     const url = `${cssURL}?v=${__VERSION__}`;
     expect(stylesheets[0].getAttribute('href')).toBe(url);
-    expect(loader.getCache()).toEqual({
+    expect(loader._getCache()).toEqual({
       [url]: expect.any(Promise),
     });
   });
@@ -153,14 +153,14 @@ describe('DynamicResourceLoader', () => {
     );
 
     const loader = new DynamicResourceLoader();
-    const state = await loader.loadIfNew(
+    const state = await loader._loadIfNew(
       ResourceType.Script,
       new URL(scriptURL),
     );
     expect(state).toBe(ResourceLoadState.Loaded);
 
     // should not load the same script again
-    const state2 = await loader.loadIfNew(
+    const state2 = await loader._loadIfNew(
       ResourceType.Script,
       new URL(scriptURL),
     );
@@ -179,7 +179,7 @@ describe('DynamicResourceLoader', () => {
     );
 
     const loader = new DynamicResourceLoader();
-    const state = await loader.loadIfNew(
+    const state = await loader._loadIfNew(
       ResourceType.Script,
       new URL(scriptURL),
     );

src/page/services/DynamicResourceLoader.ts

@@ -68,21 +68,21 @@ const getOneSignalResourceUrlPath = () => {
 };
 
 export class DynamicResourceLoader {
-  private cache: DynamicResourceLoaderCache;
+  private _cache: DynamicResourceLoaderCache;
 
   constructor() {
-    this.cache = {};
+    this._cache = {};
   }
 
-  getCache(): DynamicResourceLoaderCache {
+  _getCache(): DynamicResourceLoaderCache {
     // Cache is private; return a cloned copy just for testing
-    return { ...this.cache };
+    return { ...this._cache };
   }
 
-  async loadSdkStylesheet(): Promise<ResourceLoadStateValue> {
+  async _loadSdkStylesheet(): Promise<ResourceLoadStateValue> {
     const pathForEnv = getOneSignalResourceUrlPath();
     const cssFileForEnv = getOneSignalCssFileName();
-    return this.loadIfNew(
+    return this._loadIfNew(
       ResourceType.Stylesheet,
       new URL(`${pathForEnv}/${cssFileForEnv}?v=${VERSION}`),
     );
@@ -92,24 +92,24 @@ export class DynamicResourceLoader {
    * Attempts to load a resource by adding it to the document's <head>.
    * Caches any previous load attempt's result and does not retry loading a previous resource.
    */
-  async loadIfNew(
+  async _loadIfNew(
     type: ResourceTypeValue,
     url: URL,
   ): Promise<ResourceLoadStateValue> {
     // Load for first time
-    if (!this.cache[url.toString()]) {
-      this.cache[url.toString()] = DynamicResourceLoader.load(type, url);
+    if (!this._cache[url.toString()]) {
+      this._cache[url.toString()] = DynamicResourceLoader._load(type, url);
     }
     // Resource is loading; multiple calls can be made to this while the same resource is loading
     // Waiting on the Promise is what we want here
-    return this.cache[url.toString()];
+    return this._cache[url.toString()];
   }
 
   /**
    * Attempts to load a resource by adding it to the document's <head>.
    * Each call creates a new DOM element and fetch attempt.
    */
-  static async load(
+  static async _load(
     type: ResourceTypeValue,
     url: URL,
   ): Promise<ResourceLoadStateValue> {

src/shared/libraries/workerMessenger/page.ts

@@ -15,18 +15,18 @@ export class WorkerMessengerPage extends WorkerMessengerBase<ContextInterface> {
    * synchronously add self.addEventListener('message') if we are running in the
    * service worker.
    */
-  public async listen() {
+  public async _listen() {
     if (!supportsServiceWorkers()) return;
-    await this.listenForPage();
+    await this._listenForPage();
   }
 
   /**
    * Listens for messages for the service worker.
    */
-  private async listenForPage() {
+  private async _listenForPage() {
     navigator.serviceWorker.addEventListener(
       'message',
-      this.onPageMessageReceivedFromServiceWorker.bind(this),
+      this._onPageMessageReceivedFromServiceWorker.bind(this),
     );
     Log._debug(
       `(${location.origin}) [Worker Messenger] Page is now listening for messages.`,
@@ -40,7 +40,7 @@ export class WorkerMessengerPage extends WorkerMessengerBase<ContextInterface> {
   message topic. If no one is listening to the message, it is discarded;
   otherwise, the listener callback is executed.
   */
-  onPageMessageReceivedFromServiceWorker(event: MessageEvent) {
+  _onPageMessageReceivedFromServiceWorker(event: MessageEvent) {
     const data: WorkerMessengerMessage = event.data;
 
     /* If this message doesn't contain our expected fields, discard the message */
@@ -74,17 +74,17 @@ export class WorkerMessengerPage extends WorkerMessengerBase<ContextInterface> {
   /**
    * Sends a postMessage() to OneSignal's Serviceworker
    */
-  async unicast(
+  async _unicast(
     command: WorkerMessengerCommandValue,
     payload?: WorkerMessengerPayload,
   ) {
     Log._debug(
       `[Worker Messenger] [Page -> SW] Unicasting '${command.toString()}' to service worker.`,
     );
-    this.directPostMessageToSW(command, payload);
+    this._directPostMessageToSW(command, payload);
   }
 
-  public async directPostMessageToSW(
+  public async _directPostMessageToSW(
     command: WorkerMessengerCommandValue,
     payload?: WorkerMessengerPayload,
   ): Promise<void> {

src/shared/managers/CustomLinkManager.ts

@@ -124,7 +124,7 @@ export class CustomLinkManager {
 
   private async _loadSdkStyles(): Promise<boolean> {
     const sdkStylesLoadResult =
-      await OneSignal._context._dynamicResourceLoader.loadSdkStylesheet();
+      await OneSignal._context._dynamicResourceLoader._loadSdkStylesheet();
     if (sdkStylesLoadResult !== ResourceLoadState.Loaded) {
       Log._debug(
         'Not initializing custom link button because styles failed to load.',

src/shared/managers/ServiceWorkerManager.ts

@@ -133,7 +133,7 @@ export class ServiceWorkerManager {
           resolve(workerVersion);
         },
       );
-      await this._context._workerMessenger.unicast(
+      await this._context._workerMessenger._unicast(
         WorkerMessengerCommand.WorkerVersion,
       );
     });
@@ -336,7 +336,7 @@ export class ServiceWorkerManager {
             timestamp: incomingPayload.timestamp,
             focused: document.hasFocus(),
           };
-          await workerMessenger.directPostMessageToSW(
+          await workerMessenger._directPostMessageToSW(
             WorkerMessengerCommand.AreYouVisibleResponse,
             payload,
           );