Merge pull request #1399 from OneSignal/fg/size-reduction-3

chore: more size reduction

Author: fadi-george

.vscode/settings.json

@@ -3,31 +3,31 @@
     "source.fixAll.eslint": "explicit",
     "source.organizeImports": "always"
   },
+  "editor.rename.enablePreview": false,
 
   // a macro to rename a variable to _variable
   "macros": {
     "rename_": [
       {
         "javascript": [
-          "const ed = vscode.window.activeTextEditor;",
-          "if (!ed) return;",
+          "const ed = vscode.window.activeTextEditor; if (!ed) return;",
           "const pos = ed.selection.active;",
-          "const rng = ed.document.getWordRangeAtPosition(pos);",
-          "if (!rng) return;",
-          "const oldName = ed.document.getText(rng);",
-          "// if it already starts with '_', do nothing (remove this guard if you always want to re-run)",
-          "if (oldName.startsWith('_')) return;",
+          "const rng = ed.document.getWordRangeAtPosition(pos); if (!rng) return;",
+          "const oldName = ed.document.getText(rng); if (oldName.startsWith('_')) return;",
           "const newName = '_' + oldName;",
-          "// Ask VS Code for a rename edit at this position",
-          "const edit = await vscode.commands.executeCommand(",
-          "  'vscode.executeDocumentRenameProvider',",
-          "  ed.document.uri,",
-          "  pos,",
-          "  newName",
-          ");",
-          "if (edit) await vscode.workspace.applyEdit(edit);",
-          "await new Promise(resolve => setTimeout(resolve, 100));",
-          "await vscode.commands.executeCommand('workbench.action.files.saveAll');"
+          "const edit = await vscode.commands.executeCommand('vscode.executeDocumentRenameProvider', ed.document.uri, pos, newName);",
+          "if (!edit) return;",
+          "await vscode.workspace.applyEdit(edit);",
+          "(async () => {",
+          "  for (let attempt = 0; attempt < 5; attempt++) {",
+          "    let remaining = 0;",
+          "    for (const doc of vscode.workspace.textDocuments) {",
+          "      try { if (doc.isDirty) { remaining++; await doc.save(); } } catch (_) {}",
+          "    }",
+          "    if (remaining === 0) break;",
+          "    await new Promise(r => setTimeout(r, 80));",
+          "  }",
+          "})();"
         ]
       }
     ]

__test__/support/environment/TestEnvironmentHelpers.ts

@@ -95,7 +95,7 @@ export const setupSubModelStore = async ({
     pushModel.web_p256 = web_p256;
   }
   await setPushToken(pushModel.token);
-  OneSignal._coreDirector._subscriptionModelStore.replaceAll(
+  OneSignal._coreDirector._subscriptionModelStore._replaceAll(
     [pushModel],
     ModelChangeTags.NO_PROPAGATE,
   );

__test__/support/helpers/executors.ts

@@ -5,23 +5,23 @@ export class SomeOperation extends Operation {
     super('some-operation');
   }
 
-  get applyToRecordId() {
+  get _applyToRecordId() {
     return '';
   }
 
-  get createComparisonKey() {
+  get _createComparisonKey() {
     return '';
   }
 
-  get modifyComparisonKey() {
+  get _modifyComparisonKey() {
     return '';
   }
 
-  get groupComparisonType() {
+  get _groupComparisonType() {
     return GroupComparisonType.CREATE;
   }
 
-  get canStartExecute() {
+  get _canStartExecute() {
     return true;
   }
 }

__test__/support/helpers/setup.ts

@@ -63,7 +63,7 @@ export const setupIdentityModel = async (
   onesignalID: string = ONESIGNAL_ID,
 ) => {
   const newIdentityModel = new IdentityModel();
-  newIdentityModel.onesignalId = onesignalID;
+  newIdentityModel._onesignalId = onesignalID;
   OneSignal._coreDirector._identityModelStore.replace(
     newIdentityModel,
     ModelChangeTags.NO_PROPAGATE,
@@ -77,7 +77,7 @@ export const setupPropertiesModel = async (
   onesignalID: string = ONESIGNAL_ID,
 ) => {
   const newPropertiesModel = new PropertiesModel();
-  newPropertiesModel.onesignalId = onesignalID;
+  newPropertiesModel._onesignalId = onesignalID;
   OneSignal._coreDirector._propertiesModelStore.replace(
     newPropertiesModel,
     ModelChangeTags.NO_PROPAGATE,
@@ -126,7 +126,7 @@ export const setupSubscriptionModel = async (
   const subscriptionModel = new SubscriptionModel();
   subscriptionModel.id = id || '';
   subscriptionModel.token = token || '';
-  OneSignal._coreDirector._subscriptionModelStore.replaceAll(
+  OneSignal._coreDirector._subscriptionModelStore._replaceAll(
     [subscriptionModel],
     ModelChangeTags.NO_PROPAGATE,
   );

__test__/unit/user/user.test.ts

@@ -28,7 +28,7 @@ describe('User tests', () => {
 
     const tagsSample = { key1: 'value1' };
     const propModel = OneSignal._coreDirector._getPropertiesModel();
-    propModel.tags = tagsSample;
+    propModel._tags = tagsSample;
 
     const user = User._createOrGetInstance();
     const tags = user.getTags();
@@ -42,7 +42,7 @@ describe('User tests', () => {
     const languageSample = 'fr';
 
     const propModel = OneSignal._coreDirector._getPropertiesModel();
-    propModel.language = languageSample;
+    propModel._language = languageSample;
 
     const user = User._createOrGetInstance();
     const language = user.getLanguage();
@@ -59,6 +59,6 @@ describe('User tests', () => {
     user.setLanguage(languageSample);
 
     const propModel = OneSignal._coreDirector._getPropertiesModel();
-    expect(propModel.language).toBe(languageSample);
+    expect(propModel._language).toBe(languageSample);
   });
 });

package.json

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

src/core/CoreModuleDirector.ts

@@ -1,13 +1,13 @@
 import FuturePushSubscriptionRecord from 'src/page/userModel/FuturePushSubscriptionRecord';
 import { getPushToken } from 'src/shared/database/subscription';
+import { isPushSubscriptionType } from 'src/shared/helpers/subscription';
 import { IDManager } from 'src/shared/managers/IDManager';
 import {
   SubscriptionChannel,
   SubscriptionType,
 } from 'src/shared/subscriptions/constants';
 import type { SubscriptionChannelValue } from 'src/shared/subscriptions/types';
 import { logMethodCall } from 'src/shared/utils/utils';
-import SubscriptionHelper from '../../src/shared/helpers/SubscriptionHelper';
 import MainHelper from '../shared/helpers/MainHelper';
 import { RawPushSubscription } from '../shared/models/RawPushSubscription';
 import CoreModule from './CoreModule';
@@ -108,9 +108,7 @@ export class CoreModuleDirector {
   public _getAllPushSubscriptionModels(): SubscriptionModel[] {
     logMethodCall('CoreModuleDirector.getAllPushSubscriptionModels');
     const subscriptions = this._core._subscriptionModelStore.list();
-    return subscriptions.filter((s) =>
-      SubscriptionHelper.isPushSubscriptionType(s.type),
-    );
+    return subscriptions.filter((s) => isPushSubscriptionType(s.type));
   }
 
   async _getPushSubscriptionModelByCurrentToken(): Promise<

src/core/controllers/CustomEventController.ts

@@ -27,8 +27,8 @@ export class CustomEventController implements ICustomEventController {
 
     const op = new TrackCustomEventOperation({
       appId,
-      onesignalId: identityModel.onesignalId,
-      externalId: identityModel.externalId,
+      onesignalId: identityModel._onesignalId,
+      externalId: identityModel._externalId,
       timestamp: new Date().toISOString(),
       event,
     });

src/core/executors/CustomEventOperationExecutor.ts

@@ -50,10 +50,10 @@ export class CustomEventsOperationExecutor implements IOperationExecutor {
     }
 
     const response = await sendCustomEvent(
-      { appId: operation.appId },
+      { appId: operation._appId },
       {
         name: operation.event.name,
-        onesignal_id: operation.onesignalId,
+        onesignal_id: operation._onesignalId,
         external_id: operation.externalId,
         timestamp: operation.timestamp,
         payload: {

src/core/executors/IdentityOperationExecutor.test.ts

@@ -61,7 +61,7 @@ describe('IdentityOperationExecutor', () => {
     );
     getRebuildOpsSpy = vi.spyOn(
       rebuildUserService,
-      'getRebuildOperationsIfCurrentUser',
+      '_getRebuildOperationsIfCurrentUser',
     );
   });
 
@@ -158,20 +158,20 @@ describe('IdentityOperationExecutor', () => {
       expect(res5.retryAfterSeconds).toBeUndefined();
 
       // with rebuild ops
-      identityModelStore.model.onesignalId = ONESIGNAL_ID;
+      identityModelStore.model._onesignalId = ONESIGNAL_ID;
       const res7 = await executor._execute(ops);
       expect(res7.result).toBe(ExecutionResult.FAIL_RETRY);
       expect(res7.retryAfterSeconds).toBeUndefined();
       expect(res7.operations).toMatchObject([
         {
-          name: 'login-user',
-          appId: APP_ID,
-          onesignalId: ONESIGNAL_ID,
+          _name: 'login-user',
+          _appId: APP_ID,
+          _onesignalId: ONESIGNAL_ID,
         },
         {
-          name: 'refresh-user',
-          appId: APP_ID,
-          onesignalId: ONESIGNAL_ID,
+          _name: 'refresh-user',
+          _appId: APP_ID,
+          _onesignalId: ONESIGNAL_ID,
         },
       ]);