more renames

Author: fadi-george

package.json

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

src/core/executors/CustomEventOperationExecutor.ts

@@ -6,7 +6,7 @@ import {
 import {
   getResponseStatusType,
   ResponseStatusType,
-} from 'src/shared/helpers/NetworkUtils';
+} from 'src/shared/helpers/network';
 import Log from 'src/shared/libraries/Log';
 import { VERSION } from 'src/shared/utils/env';
 import { OPERATION_NAME } from '../constants';
@@ -52,12 +52,12 @@ export class CustomEventsOperationExecutor implements IOperationExecutor {
     const response = await sendCustomEvent(
       { appId: operation._appId },
       {
-        name: operation.event.name,
+        name: operation._event.name,
         onesignal_id: operation._onesignalId,
-        external_id: operation.externalId,
-        timestamp: operation.timestamp,
+        external_id: operation._externalId,
+        timestamp: operation._timestamp,
         payload: {
-          ...(operation.event.properties ?? {}),
+          ...(operation._event.properties ?? {}),
           os_sdk: this._eventMetadata,
         },
       },

src/core/executors/IdentityOperationExecutor.ts

@@ -7,7 +7,7 @@ import type { IRebuildUserService } from 'src/core/types/user';
 import {
   getResponseStatusType,
   ResponseStatusType,
-} from 'src/shared/helpers/NetworkUtils';
+} from 'src/shared/helpers/network';
 import Log from 'src/shared/libraries/Log';
 import { IdentityConstants, OPERATION_NAME } from '../constants';
 import { type IdentityModelStore } from '../modelStores/IdentityModelStore';

src/core/executors/LoginUserOperationExecutor.ts

@@ -7,7 +7,7 @@ import { getTimeZoneId } from 'src/shared/helpers/general';
 import {
   getResponseStatusType,
   ResponseStatusType,
-} from 'src/shared/helpers/NetworkUtils';
+} from 'src/shared/helpers/network';
 import Log from 'src/shared/libraries/Log';
 import { checkAndTriggerUserChanged } from 'src/shared/listeners';
 import { IdentityConstants, OPERATION_NAME } from '../constants';
@@ -80,22 +80,22 @@ export class LoginUserOperationExecutor implements IOperationExecutor {
     // When there is no existing user to attempt to associate with the externalId provided, we go right to
     // createUser.  If there is no externalId provided this is an insert, if there is this will be an
     // "upsert with retrieval" as the user may already exist.
-    if (!loginUserOp.existingOnesignalId || !loginUserOp.externalId) {
+    if (!loginUserOp._existingOnesignalId || !loginUserOp._externalId) {
       return this._createUser(loginUserOp, operations);
     }
 
     const result = await this._identityOperationExecutor._execute([
       new SetAliasOperation(
         loginUserOp._appId,
-        loginUserOp.existingOnesignalId,
+        loginUserOp._existingOnesignalId,
         IdentityConstants._ExternalID,
-        loginUserOp.externalId,
+        loginUserOp._externalId,
       ),
     ]);
 
     switch (result._result) {
       case ExecutionResult._Success: {
-        const backendOneSignalId = loginUserOp.existingOnesignalId;
+        const backendOneSignalId = loginUserOp._existingOnesignalId;
         const opOneSignalId = loginUserOp._onesignalId;
 
         if (this._identityModelStore._model._onesignalId === opOneSignalId) {
@@ -122,12 +122,12 @@ export class LoginUserOperationExecutor implements IOperationExecutor {
       }
 
       case ExecutionResult._FailConflict:
-        Log._debug(`Handling 409 for externalId: ${loginUserOp.externalId}`);
+        Log._debug(`Handling 409 for externalId: ${loginUserOp._externalId}`);
         return this._createUser(loginUserOp, operations);
 
       case ExecutionResult._FailNoretry:
         Log._error(
-          `Recovering from SetAlias failure for externalId: ${loginUserOp.externalId}`,
+          `Recovering from SetAlias failure for externalId: ${loginUserOp._externalId}`,
         );
         return this._createUser(loginUserOp, operations);
 
@@ -147,8 +147,8 @@ export class LoginUserOperationExecutor implements IOperationExecutor {
       language: getLanguage(),
     };
 
-    if (createUserOperation.externalId) {
-      identity[IdentityConstants._ExternalID] = createUserOperation.externalId;
+    if (createUserOperation._externalId) {
+      identity[IdentityConstants._ExternalID] = createUserOperation._externalId;
     }
 
     for (const operation of operations) {

src/core/executors/RefreshUserOperationExecutor.ts

@@ -1,7 +1,7 @@
 import {
   getResponseStatusType,
   ResponseStatusType,
-} from 'src/shared/helpers/NetworkUtils';
+} from 'src/shared/helpers/network';
 import { isPushSubscriptionType } from 'src/shared/helpers/subscription';
 import Log from 'src/shared/libraries/Log';
 import { NotificationType } from 'src/shared/subscriptions/constants';

src/core/executors/SubscriptionOperationExecutor.ts

@@ -6,7 +6,7 @@ import type { IRebuildUserService } from 'src/core/types/user';
 import {
   getResponseStatusType,
   ResponseStatusType,
-} from 'src/shared/helpers/NetworkUtils';
+} from 'src/shared/helpers/network';
 import Log from 'src/shared/libraries/Log';
 import { IdentityConstants, OPERATION_NAME } from '../constants';
 import { type SubscriptionModelStore } from '../modelStores/SubscriptionModelStore';

src/core/executors/UpdateUserOperationExecutor.ts

@@ -1,7 +1,7 @@
 import {
   getResponseStatusType,
   ResponseStatusType,
-} from 'src/shared/helpers/NetworkUtils';
+} from 'src/shared/helpers/network';
 import Log from 'src/shared/libraries/Log';
 import { IdentityConstants, OPERATION_NAME } from '../constants';
 import { type IPropertiesModelKeys } from '../models/PropertiesModel';
@@ -101,7 +101,7 @@ export class UpdateUserOperationExecutor implements IOperationExecutor {
 
     const isTagProperty = (
       op: SetPropertyOperation,
-    ): op is SetPropertyOperation<'tags'> => op.property === 'tags';
+    ): op is SetPropertyOperation<'tags'> => op._property === 'tags';
 
     if (ok) {
       if (this._identityModelStore._model._onesignalId === onesignalId) {
@@ -115,7 +115,7 @@ export class UpdateUserOperationExecutor implements IOperationExecutor {
             }
 
             this._propertiesModelStore._model._setProperty(
-              operation.property as IPropertiesModelKeys,
+              operation._property as IPropertiesModelKeys,
               value,
               ModelChangeTags._Hydrate,
             );
@@ -175,7 +175,7 @@ function createPropertiesFromOperation(
   properties: PropertiesObject,
 ): PropertiesObject {
   if (operation instanceof SetPropertyOperation) {
-    const propertyKey = operation.property;
+    const propertyKey = operation._property;
     const allowedKeys: IPropertiesModelKeys[] = [
       'ip',
       'tags',

src/core/operations/LoginUserOperation.ts

@@ -33,17 +33,17 @@ export class LoginUserOperation extends Operation<ILoginOp> {
     existingOneSignalId?: string,
   ) {
     super(OPERATION_NAME._LoginUser, appId, onesignalId);
-    if (externalId) this.externalId = externalId;
-    if (existingOneSignalId) this.existingOnesignalId = existingOneSignalId;
+    if (externalId) this._externalId = externalId;
+    if (existingOneSignalId) this._existingOnesignalId = existingOneSignalId;
   }
 
   /**
    * The optional external ID of this newly logged-in user. Must be unique for the appId.
    */
-  get externalId(): string | undefined {
+  get _externalId(): string | undefined {
     return this._getProperty('externalId');
   }
-  private set externalId(value: string) {
+  private set _externalId(value: string) {
     this._setProperty('externalId', value);
   }
 
@@ -52,10 +52,10 @@ export class LoginUserOperation extends Operation<ILoginOp> {
    * When null (or non-null but unsuccessful), a new user will be upserted. This ID *may* be locally generated
    * and can be checked via IDManager.isLocalId to ensure correct processing.
    */
-  get existingOnesignalId(): string | undefined {
+  get _existingOnesignalId(): string | undefined {
     return this._getProperty('existingOnesignalId');
   }
-  private set existingOnesignalId(value: string) {
+  private set _existingOnesignalId(value: string) {
     this._setProperty('existingOnesignalId', value);
   }
 
@@ -73,18 +73,18 @@ export class LoginUserOperation extends Operation<ILoginOp> {
 
   override get _canStartExecute(): boolean {
     return (
-      !this.existingOnesignalId ||
-      !IDManager._isLocalId(this.existingOnesignalId)
+      !this._existingOnesignalId ||
+      !IDManager._isLocalId(this._existingOnesignalId)
     );
   }
 
   override get _applyToRecordId(): string {
-    return this.existingOnesignalId ?? this._onesignalId;
+    return this._existingOnesignalId ?? this._onesignalId;
   }
 
   override _translateIds(map: Record<string, string>): void {
-    if (this.existingOnesignalId && map[this.existingOnesignalId]) {
-      this.existingOnesignalId = map[this.existingOnesignalId];
+    if (this._existingOnesignalId && map[this._existingOnesignalId]) {
+      this._existingOnesignalId = map[this._existingOnesignalId];
     }
   }
 }

src/core/operations/SetPropertyOperation.ts

@@ -32,18 +32,18 @@ export class SetPropertyOperation<
   ) {
     super(OPERATION_NAME._SetProperty, appId, onesignalId);
     if (property && value) {
-      this.property = property;
+      this._property = property;
       this.value = value;
     }
   }
 
   /**
    * The property that is to be updated against the user.
    */
-  get property(): string {
+  get _property(): string {
     return this._getProperty('property');
   }
-  private set property(value: P) {
+  private set _property(value: P) {
     this._setProperty('property', value);
   }
 

src/core/operations/TrackCustomEventOperation.ts

@@ -27,43 +27,43 @@ export class TrackCustomEventOperation extends Operation<ITrackEventOp> {
   constructor(props?: OperationProps);
   constructor(props: OperationProps) {
     super(OPERATION_NAME._CustomEvent, props?.appId, props?.onesignalId);
-    if (props?.externalId) this.externalId = props.externalId;
-    if (props?.timestamp) this.timestamp = props.timestamp;
-    if (props?.event) this.event = props.event;
+    if (props?.externalId) this._externalId = props.externalId;
+    if (props?.timestamp) this._timestamp = props.timestamp;
+    if (props?.event) this._event = props.event;
   }
 
   /**
    * The external ID for the user, if available.
    */
-  get externalId(): string | undefined {
+  get _externalId(): string | undefined {
     return this._getProperty('externalId');
   }
-  private set externalId(value: string | undefined) {
+  private set _externalId(value: string | undefined) {
     this._setProperty('externalId', value);
   }
 
   /**
    * The timestamp when the event occurred.
    */
-  get timestamp(): string {
+  get _timestamp(): string {
     return this._getProperty('timestamp');
   }
-  private set timestamp(value: string) {
+  private set _timestamp(value: string) {
     this._setProperty('timestamp', value);
   }
 
   /**
    * The custom event instance containing the event name and properties.
    */
-  get event(): ICustomEvent {
+  get _event(): ICustomEvent {
     return this._getProperty('event');
   }
-  set event(value: ICustomEvent) {
+  set _event(value: ICustomEvent) {
     this._setProperty('event', value);
   }
 
   private get key(): string {
-    return `${this._appId}.User.${this._onesignalId}.CustomEvent.${this.event.name}`;
+    return `${this._appId}.User.${this._onesignalId}.CustomEvent.${this._event.name}`;
   }
 
   override get _createComparisonKey(): string {