more method renames

Author: fadi-george

__test__/unit/models/path.test.ts

@@ -3,40 +3,42 @@ import Path from '../../../src/shared/models/Path';
 describe('Path tests', () => {
   test(`should return correct components for a simple web path`, () => {
     const path = new Path('/web-folder/assets/service-worker.js');
-    expect(path.getFileName()).toBe('service-worker.js');
-    expect(path.getFullPath()).toBe('/web-folder/assets/service-worker.js');
+    expect(path._getFileName()).toBe('service-worker.js');
+    expect(path._getFullPath()).toBe('/web-folder/assets/service-worker.js');
   });
 
   test(`should return correct components for a file-based path`, () => {
     const path = new Path('file:///c:/web-folder/assets/service-worker.js');
-    expect(path.getFileName()).toBe('service-worker.js');
-    expect(path.getFullPath()).toBe(
+    expect(path._getFileName()).toBe('service-worker.js');
+    expect(path._getFullPath()).toBe(
       'file:///c:/web-folder/assets/service-worker.js',
     );
   });
 
   test(`should return case-sensitive correct components for a file-based path`, () => {
     const path = new Path('/WeB-FoLdEr/AsSeTs/SeRvIcE-WoRkEr.js');
-    expect(path.getFileName()).toBe('SeRvIcE-WoRkEr.js');
-    expect(path.getFullPath()).toBe('/WeB-FoLdEr/AsSeTs/SeRvIcE-WoRkEr.js');
+    expect(path._getFileName()).toBe('SeRvIcE-WoRkEr.js');
+    expect(path._getFullPath()).toBe('/WeB-FoLdEr/AsSeTs/SeRvIcE-WoRkEr.js');
   });
 
   test(`should return correct components for a double-extension path`, () => {
     const path = new Path('/web-folder/assets/service-worker.js.php');
-    expect(path.getFileName()).toBe('service-worker.js.php');
-    expect(path.getFullPath()).toBe('/web-folder/assets/service-worker.js.php');
+    expect(path._getFileName()).toBe('service-worker.js.php');
+    expect(path._getFullPath()).toBe(
+      '/web-folder/assets/service-worker.js.php',
+    );
   });
 
   test(`should return correct components for a root-relative path`, () => {
     const path = new Path('/service-worker.js');
-    expect(path.getFileName()).toBe('service-worker.js');
-    expect(path.getFullPath()).toBe('/service-worker.js');
+    expect(path._getFileName()).toBe('service-worker.js');
+    expect(path._getFullPath()).toBe('/service-worker.js');
   });
 
   test(`should return correct components for an absolute web path`, () => {
     const path = new Path('https://site.com/web-folder/service-worker.js');
-    expect(path.getFileName()).toBe('service-worker.js');
-    expect(path.getFullPath()).toBe(
+    expect(path._getFileName()).toBe('service-worker.js');
+    expect(path._getFullPath()).toBe(
       'https://site.com/web-folder/service-worker.js',
     );
   });
@@ -45,21 +47,15 @@ describe('Path tests', () => {
     const path = new Path(
       'https://site.com/web-folder/service-worker.js?appId=12345',
     );
-    expect(path.getFullPath()).toBe(
-      'https://site.com/web-folder/service-worker.js?appId=12345',
-    );
-  });
-  test(`should include query string in path with query`, () => {
-    const path = new Path(
+    expect(path._getFullPath()).toBe(
       'https://site.com/web-folder/service-worker.js?appId=12345',
     );
-    expect(path.getFileNameWithQuery()).toBe('service-worker.js?appId=12345');
   });
 
   test(`should not include query string in path filename`, () => {
     const path = new Path(
       'https://site.com/web-folder/service-worker.js?appId=12345',
     );
-    expect(path.getFileName()).toBe('service-worker.js');
+    expect(path._getFileName()).toBe('service-worker.js');
   });
 });

package.json

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

src/page/bell/Button.ts

@@ -4,7 +4,7 @@ import {
   limitGetLast,
   limitIsEmpty,
   limitStorePut,
-} from 'src/shared/services/limitStore2';
+} from 'src/shared/services/limitStore';
 import OneSignalEvent from 'src/shared/services/OneSignalEvent';
 import AnimatedElement from './AnimatedElement';
 import type Bell from './Bell';

src/page/managers/LoginManager.ts

@@ -10,11 +10,14 @@ import Log from '../../shared/libraries/Log';
 
 export default class LoginManager {
   // Other internal classes should await on this if they access users
-  static switchingUsersPromise: Promise<void> = Promise.resolve();
+  static _switchingUsersPromise: Promise<void> = Promise.resolve();
 
   // public api
   static async login(externalId: string, token?: string): Promise<void> {
-    await (this.switchingUsersPromise = LoginManager._login(externalId, token));
+    await (this._switchingUsersPromise = LoginManager._login(
+      externalId,
+      token,
+    ));
   }
 
   private static async _login(
@@ -77,7 +80,7 @@ export default class LoginManager {
 
   // public api
   static async logout(): Promise<void> {
-    await (this.switchingUsersPromise = LoginManager._logout());
+    await (this._switchingUsersPromise = LoginManager._logout());
   }
 
   private static async _logout(): Promise<void> {

src/shared/helpers/service-worker.ts

@@ -27,7 +27,7 @@ export function getServiceWorkerHref(
   sdkVersion: string,
 ): string {
   return appendServiceWorkerParams(
-    config.workerPath.getFullPath(),
+    config.workerPath._getFullPath(),
     appId,
     sdkVersion,
   );

src/shared/managers/ServiceWorkerManager.ts

@@ -87,7 +87,7 @@ export class ServiceWorkerManager {
     }
 
     const workerScriptPath = new URL(serviceWorker.scriptURL).pathname;
-    const swFileName = new Path(workerScriptPath).getFileName();
+    const swFileName = new Path(workerScriptPath)._getFileName();
 
     // If the current service worker is Akamai's
     if (swFileName == 'akam-sw.js') {
@@ -101,7 +101,7 @@ export class ServiceWorkerManager {
           "Found a ServiceWorker under Akamai's akam-sw.js?othersw=",
           importedSw,
         );
-        return new Path(new URL(importedSw).pathname).getFileName();
+        return new Path(new URL(importedSw).pathname)._getFileName();
       }
     }
     return swFileName;
@@ -115,7 +115,7 @@ export class ServiceWorkerManager {
       return ServiceWorkerActiveState.None;
     }
     const isValidOSWorker =
-      fileName == this._config.workerPath.getFileName() ||
+      fileName == this._config.workerPath._getFileName() ||
       fileName == 'OneSignalSDK.sw.js'; // For backwards compatibility with temporary v16 user model beta filename (remove after 5/5/24 deprecation)
 
     if (isValidOSWorker) {

src/shared/managers/sessionManager/SessionManager.ts

@@ -112,7 +112,7 @@ export class SessionManager implements ISessionManager {
   }
 
   async _handleVisibilityChange(): Promise<void> {
-    await LoginManager.switchingUsersPromise;
+    await LoginManager._switchingUsersPromise;
 
     if (!User._singletonInstance?.onesignalId) {
       return;
@@ -180,7 +180,7 @@ export class SessionManager implements ISessionManager {
   }
 
   async _handleOnBeforeUnload(): Promise<void> {
-    await LoginManager.switchingUsersPromise;
+    await LoginManager._switchingUsersPromise;
 
     if (!User._singletonInstance?.onesignalId) {
       return;
@@ -213,7 +213,7 @@ export class SessionManager implements ISessionManager {
   }
 
   async _handleOnFocus(e: Event): Promise<void> {
-    await LoginManager.switchingUsersPromise;
+    await LoginManager._switchingUsersPromise;
 
     Log._debug('handleOnFocus', e);
     if (!User._singletonInstance?.onesignalId) {
@@ -243,7 +243,7 @@ export class SessionManager implements ISessionManager {
   }
 
   async _handleOnBlur(e: Event): Promise<void> {
-    await LoginManager.switchingUsersPromise;
+    await LoginManager._switchingUsersPromise;
 
     Log._debug('handleOnBlur', e);
     if (!User._singletonInstance?.onesignalId) {
@@ -273,7 +273,7 @@ export class SessionManager implements ISessionManager {
   }
 
   async _upsertSession(sessionOrigin: SessionOriginValue): Promise<void> {
-    await LoginManager.switchingUsersPromise;
+    await LoginManager._switchingUsersPromise;
 
     if (User._singletonInstance?.onesignalId) {
       const { onesignalId, subscriptionId } =

src/shared/managers/subscription/page.ts

@@ -53,7 +53,7 @@ export const updatePushSubscriptionModelWithRawSubscription = async (
 ) => {
   // incase a login op was called before user accepts the notifcations permissions, we need to wait for it to finish
   // otherwise there would be two login ops in the same bucket for LoginOperationExecutor which would error
-  await LoginManager.switchingUsersPromise;
+  await LoginManager._switchingUsersPromise;
 
   let pushModel = await OneSignal._coreDirector._getPushSubscriptionModel();
   // for new users, we need to create a new push subscription model and also save its push id to IndexedDB

src/shared/models/Path.ts

@@ -1,50 +1,30 @@
 import { EmptyArgumentError } from '../errors/common';
 
+const QUERY_STRING = '?';
+
 /**
  * Represents a normalized path.
  *
  * Paths spaces are trimmed.
  * Paths without file names will never contain trailing slashes, except for empty paths.
  */
 export default class Path {
-  private static QUERY_STRING = '?';
-
-  private readonly path: string;
+  private readonly _path: string;
 
   constructor(path: string) {
     if (!path) throw EmptyArgumentError('path');
-    this.path = path.trim();
-  }
-
-  getQueryString(): string | null {
-    // If there are no ? characters, return null
-    // If there are multiple ?, return the substring starting after the first ? all the way to the end
-    const indexOfDelimiter = this.path.indexOf('?');
-    if (indexOfDelimiter === -1) {
-      return null;
-    }
-    if (this.path.length > indexOfDelimiter) {
-      // Return the substring *after the first ? to the end
-      return this.path.substring(indexOfDelimiter + 1);
-    } else {
-      // The last character is ?
-      return null;
-    }
-  }
-
-  getWithoutQueryString(): string {
-    return this.path.split(Path.QUERY_STRING)[0];
+    this._path = path.trim();
   }
 
-  getFileName(): string | undefined {
-    return this.getWithoutQueryString().split('\\').pop()?.split('/').pop();
+  _getWithoutQueryString(): string {
+    return this._path.split(QUERY_STRING)[0];
   }
 
-  getFileNameWithQuery(): string | undefined {
-    return this.path.split('\\').pop()?.split('/').pop();
+  _getFileName(): string | undefined {
+    return this._getWithoutQueryString().split('\\').pop()?.split('/').pop();
   }
 
-  getFullPath() {
-    return this.path;
+  _getFullPath() {
+    return this._path;
   }
 }