more renames

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/helpers/setup.ts

@@ -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,

__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.64 kB",
+      "limit": "47.59 kB",
       "gzip": true
     },
     {

src/core/executors/LoginUserOperationExecutor.ts

@@ -106,7 +106,7 @@ export class LoginUserOperationExecutor implements IOperationExecutor {
           );
         }
 
-        if (this._propertiesModelStore.model.onesignalId === opOneSignalId) {
+        if (this._propertiesModelStore.model._onesignalId === opOneSignalId) {
           this._propertiesModelStore.model._setProperty(
             'onesignalId',
             backendOneSignalId,
@@ -195,7 +195,7 @@ export class LoginUserOperationExecutor implements IOperationExecutor {
         );
       }
 
-      if (this._propertiesModelStore.model.onesignalId === opOneSignalId) {
+      if (this._propertiesModelStore.model._onesignalId === opOneSignalId) {
         this._propertiesModelStore.model._setProperty(
           'onesignalId',
           backendOneSignalId,

src/core/executors/RefreshUserOperationExecutor.test.ts

@@ -108,7 +108,7 @@ describe('RefreshUserOperationExecutor', () => {
 
       const result = await executor._execute([refreshOp]);
       expect(result.result).toBe(ExecutionResult.SUCCESS);
-      expect(propertiesModelStore.model.language).not.toBe('fr');
+      expect(propertiesModelStore.model._language).not.toBe('fr');
     });
 
     test('should handle successful user retrieval and update models', async () => {
@@ -152,13 +152,13 @@ describe('RefreshUserOperationExecutor', () => {
       );
 
       // Check properties model updates
-      expect(propertiesModelStore.model.country).toBe('US');
-      expect(propertiesModelStore.model.language).toBe('en');
-      expect(propertiesModelStore.model.tags).toEqual({
+      expect(propertiesModelStore.model._country).toBe('US');
+      expect(propertiesModelStore.model._language).toBe('en');
+      expect(propertiesModelStore.model._tags).toEqual({
         test_tag: 'test_value',
         test_tag_2: 'test_value_2',
       });
-      expect(propertiesModelStore.model.timezone_id).toBe('America/New_York');
+      expect(propertiesModelStore.model._timezone_id).toBe('America/New_York');
 
       // Check subscription model updates
       const subscriptions = subscriptionModelStore.list();
@@ -181,7 +181,7 @@ describe('RefreshUserOperationExecutor', () => {
       pushSubModel.id = SUB_ID_2;
       pushSubModel.type = SubscriptionType.ChromePush;
       pushSubModel.token = PUSH_TOKEN;
-      pushSubModel.notification_types = NotificationType.Subscribed;
+      pushSubModel._notification_types = NotificationType.Subscribed;
 
       subscriptionModelStore.add(pushSubModel, ModelChangeTags.NO_PROPAGATE);
       await setPushToken(PUSH_TOKEN);

src/core/executors/RefreshUserOperationExecutor.ts

@@ -88,7 +88,7 @@ export class RefreshUserOperationExecutor implements IOperationExecutor {
       }
 
       const propertiesModel = new PropertiesModel();
-      propertiesModel.onesignalId = op._onesignalId;
+      propertiesModel._onesignalId = op._onesignalId;
 
       const { properties = {}, subscriptions = [] } = result;
 
@@ -102,15 +102,15 @@ export class RefreshUserOperationExecutor implements IOperationExecutor {
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         model.id = sub.id!;
         model.token = sub.token ?? '';
-        model.notification_types =
+        model._notification_types =
           sub.notification_types ?? NotificationType.Subscribed;
         model.type = sub.type;
         model.enabled =
-          model.notification_types !== NotificationType.UserOptedOut;
+          model._notification_types !== NotificationType.UserOptedOut;
         model.sdk = sub.sdk;
         model.device_os = sub.device_os;
         model.device_model = sub.device_model;
-        model.onesignalId = op._onesignalId;
+        model._onesignalId = op._onesignalId;
 
         // We only add a non-push subscriptions. For push, the device is the source of truth
         // so we don't want to cache these subscriptions from the backend.
@@ -122,7 +122,7 @@ export class RefreshUserOperationExecutor implements IOperationExecutor {
       const pushModel =
         await OneSignal._coreDirector._getPushSubscriptionModel();
       if (pushModel) {
-        pushModel.onesignalId = op._onesignalId;
+        pushModel._onesignalId = op._onesignalId;
         subscriptionModels.push(pushModel);
       }
 

src/core/executors/UpdateUserOperationExecutor.test.ts

@@ -91,7 +91,7 @@ describe('UpdateUserOperationExecutor', () => {
 
       const result = await executor._execute([setPropertyOp]);
       expect(result.result).toBe(ExecutionResult.SUCCESS);
-      expect(propertiesModelStore.model.language).toBe('fr');
+      expect(propertiesModelStore.model._language).toBe('fr');
     });
 
     test('can set tags', async () => {
@@ -105,7 +105,7 @@ describe('UpdateUserOperationExecutor', () => {
 
       const result = await executor._execute([setPropertyOp]);
       expect(result.result).toBe(ExecutionResult.SUCCESS);
-      expect(propertiesModelStore.model.tags).toEqual({
+      expect(propertiesModelStore.model._tags).toEqual({
         tagA: 'valueA',
         tagB: 'valueB',
       });

src/core/executors/UpdateUserOperationExecutor.ts

@@ -2,7 +2,6 @@ import {
   getResponseStatusType,
   ResponseStatusType,
 } from 'src/shared/helpers/NetworkUtils';
-import { PropertyOperationHelper } from 'src/shared/helpers/PropertyOperationHelper';
 import Log from 'src/shared/libraries/Log';
 import { IdentityConstants, OPERATION_NAME } from '../constants';
 import { type IPropertiesModelKeys } from '../models/PropertiesModel';
@@ -54,11 +53,10 @@ export class UpdateUserOperationExecutor implements IOperationExecutor {
           appId = operation._appId;
           onesignalId = operation._onesignalId;
         }
-        propertiesObject =
-          PropertyOperationHelper.createPropertiesFromOperation(
-            operation,
-            propertiesObject,
-          );
+        propertiesObject = createPropertiesFromOperation(
+          operation,
+          propertiesObject,
+        );
       } else {
         throw new Error(`Unrecognized operation: ${operation}`);
       }
@@ -166,3 +164,22 @@ export class UpdateUserOperationExecutor implements IOperationExecutor {
     }
   }
 }
+
+function createPropertiesFromOperation(
+  operation: Operation,
+  properties: PropertiesObject,
+): PropertiesObject {
+  if (operation instanceof SetPropertyOperation) {
+    const propertyKey = operation.property;
+    const allowedKeys = Object.keys(properties);
+    if (allowedKeys.includes(propertyKey)) {
+      return new PropertiesObject({
+        ...properties,
+        [propertyKey]: operation.value,
+      });
+    }
+    return new PropertiesObject({ ...properties });
+  }
+
+  throw new Error(`Unsupported operation type: ${operation._name}`);
+}

src/core/listeners/PropertiesModelStoreListener.ts

@@ -32,7 +32,7 @@ export class PropertiesModelStoreListener extends SingletonModelStoreListener<Pr
 
     return new SetPropertyOperation(
       appId,
-      model.onesignalId,
+      model._onesignalId,
       property,
       newValue as PropertyValue[string],
     );