Merge pull request #1402 from OneSignal/fg/size-reduction-5

chore: more size reduction

Author: fadi-george

__test__/constants/constants.ts

@@ -28,6 +28,6 @@ export const BASE_SUB = {
   device_model: '',
   device_os: '56',
   enabled: true,
-  notification_types: NotificationType.Subscribed,
+  notification_types: NotificationType._Subscribed,
   sdk: __VERSION__,
 };

__test__/setupTests.ts

@@ -20,7 +20,7 @@ afterEach(() => {
   server.resetHandlers();
   if (typeof OneSignal !== 'undefined') {
     OneSignal._coreDirector?._operationRepo._clear();
-    OneSignal._emitter?.removeAllListeners();
+    OneSignal._emitter?._removeAllListeners();
   }
 });
 
@@ -53,7 +53,7 @@ Object.defineProperty(navigator, 'userAgent', {
 let downloadSpy: MockInstance;
 export const mockJsonp = () => {
   const serverConfig = TestContext.getFakeServerAppConfig(
-    ConfigIntegrationKind.Custom,
+    ConfigIntegrationKind._Custom,
   );
 
   if (!downloadSpy)

__test__/support/environment/TestContext.ts

@@ -23,7 +23,7 @@ export default class TestContext {
     appId: string = APP_ID,
   ): ServerAppConfig {
     let remoteConfigMockDefaults: ServerAppConfig;
-    if (configIntegrationKind === ConfigIntegrationKind.Custom) {
+    if (configIntegrationKind === ConfigIntegrationKind._Custom) {
       remoteConfigMockDefaults = {
         success: true,
         version: 2,
@@ -49,7 +49,7 @@ export default class TestContext {
             proxyOriginEnabled: true,
           },
           integration: {
-            kind: ConfigIntegrationKind.Custom,
+            kind: ConfigIntegrationKind._Custom,
           },
           staticPrompts: {
             native: {
@@ -311,8 +311,8 @@ export default class TestContext {
           },
           notificationBehavior: {
             click: {
-              match: NotificationClickMatchBehavior.Exact,
-              action: NotificationClickActionBehavior.Navigate,
+              match: NotificationClickMatchBehavior._Exact,
+              action: NotificationClickActionBehavior._Navigate,
             },
             display: {
               persist: false,
@@ -453,15 +453,15 @@ export default class TestContext {
         'notification.dismissed':
           'https://fake-config.com/notification-dismissed',
       },
-      notificationClickHandlerMatch: NotificationClickMatchBehavior.Origin,
-      notificationClickHandlerAction: NotificationClickActionBehavior.Focus,
+      notificationClickHandlerMatch: NotificationClickMatchBehavior._Origin,
+      notificationClickHandlerAction: NotificationClickActionBehavior._Focus,
     };
   }
 
   static getFakeMergedConfig(config: TestEnvironmentConfig = {}): AppConfig {
     const fakeUserConfig = config.userConfig || this.getFakeAppUserConfig();
     const fakeServerConfig = this.getFakeServerAppConfig(
-      config.integration || ConfigIntegrationKind.Custom,
+      config.integration || ConfigIntegrationKind._Custom,
       config.overrideServerConfig,
     );
     const fakeMergedConfig = getMergedConfig(fakeUserConfig, fakeServerConfig);

__test__/support/environment/TestEnvironmentHelpers.ts

@@ -65,7 +65,7 @@ export const createPushSub = ({
     id,
     onesignalId,
     token,
-    type: SubscriptionType.ChromePush,
+    type: SubscriptionType._ChromePush,
   });
   return pushSubscription;
 };
@@ -97,7 +97,7 @@ export const setupSubModelStore = async ({
   await setPushToken(pushModel.token);
   OneSignal._coreDirector._subscriptionModelStore._replaceAll(
     [pushModel],
-    ModelChangeTags.NO_PROPAGATE,
+    ModelChangeTags._NoPropogate,
   );
 
   return pushModel;

__test__/support/helpers/configHelper.ts

@@ -14,7 +14,7 @@ export async function getFinalAppConfig(
   fakeUserConfig: any,
 ): Promise<AppConfig> {
   const fakeServerConfig = TestContext.getFakeServerAppConfig(
-    ConfigIntegrationKind.Custom,
+    ConfigIntegrationKind._Custom,
   );
   fakeUserConfig.appId = fakeServerConfig.app_id;
   const getFakeServerConfig = () =>

__test__/support/helpers/core.ts

@@ -7,7 +7,7 @@ export function generateNewSubscription(modelId = '0000000000') {
   const model = new SubscriptionModel();
   model._modelId = modelId;
   model._mergeData({
-    type: SubscriptionType.Email,
+    type: SubscriptionType._Email,
     id: '123', // subscription id
     token: 'myToken',
   });

__test__/support/helpers/executors.ts

@@ -18,7 +18,7 @@ export class SomeOperation extends Operation {
   }
 
   get _groupComparisonType() {
-    return GroupComparisonType.CREATE;
+    return GroupComparisonType._Create;
   }
 
   get _canStartExecute() {

__test__/support/helpers/setup.ts

@@ -64,9 +64,9 @@ export const setupIdentityModel = async (
 ) => {
   const newIdentityModel = new IdentityModel();
   newIdentityModel._onesignalId = onesignalID;
-  OneSignal._coreDirector._identityModelStore.replace(
+  OneSignal._coreDirector._identityModelStore._replace(
     newIdentityModel,
-    ModelChangeTags.NO_PROPAGATE,
+    ModelChangeTags._NoPropogate,
   );
 };
 
@@ -78,9 +78,9 @@ export const setupPropertiesModel = async (
 ) => {
   const newPropertiesModel = new PropertiesModel();
   newPropertiesModel._onesignalId = onesignalID;
-  OneSignal._coreDirector._propertiesModelStore.replace(
+  OneSignal._coreDirector._propertiesModelStore._replace(
     newPropertiesModel,
-    ModelChangeTags.NO_PROPAGATE,
+    ModelChangeTags._NoPropogate,
   );
 
   // wait for db to be updated
@@ -97,7 +97,7 @@ export const updateIdentityModel = async <
   value?: IdentitySchema[T],
 ) => {
   const identityModel = OneSignal._coreDirector._getIdentityModel();
-  identityModel._setProperty(property, value, ModelChangeTags.NO_PROPAGATE);
+  identityModel._setProperty(property, value, ModelChangeTags._NoPropogate);
 };
 
 /**
@@ -113,7 +113,7 @@ export const updatePropertiesModel = async <
   value?: PropertiesSchema[T],
 ) => {
   const propertiesModel = OneSignal._coreDirector._getPropertiesModel();
-  propertiesModel._setProperty(property, value, ModelChangeTags.NO_PROPAGATE);
+  propertiesModel._setProperty(property, value, ModelChangeTags._NoPropogate);
 };
 
 /**
@@ -128,7 +128,7 @@ export const setupSubscriptionModel = async (
   subscriptionModel.token = token || '';
   OneSignal._coreDirector._subscriptionModelStore._replaceAll(
     [subscriptionModel],
-    ModelChangeTags.NO_PROPAGATE,
+    ModelChangeTags._NoPropogate,
   );
 };
 
@@ -139,7 +139,7 @@ export const setupLoadStylesheet = async () => {
   vi.spyOn(
     OneSignal._context._dynamicResourceLoader,
     '_loadSdkStylesheet',
-  ).mockResolvedValue(ResourceLoadState.Loaded);
+  ).mockResolvedValue(ResourceLoadState._Loaded);
 };
 
 export const getRawPushSubscription = () => {

__test__/unit/http/sdkVersion.test.ts

@@ -46,7 +46,7 @@ describe('Sdk Version Header Tests', () => {
     getUserByAlias(
       { appId: APP_ID },
       {
-        label: IdentityConstants.EXTERNAL_ID,
+        label: IdentityConstants._ExternalID,
         id: EXTERNAL_ID,
       },
     );
@@ -57,7 +57,7 @@ describe('Sdk Version Header Tests', () => {
     updateUserByAlias(
       { appId: APP_ID },
       {
-        label: IdentityConstants.EXTERNAL_ID,
+        label: IdentityConstants._ExternalID,
         id: EXTERNAL_ID,
       },
       {},
@@ -69,7 +69,7 @@ describe('Sdk Version Header Tests', () => {
     updateUserByAlias(
       { appId: APP_ID, subscriptionId: SUB_ID },
       {
-        label: IdentityConstants.EXTERNAL_ID,
+        label: IdentityConstants._ExternalID,
         id: EXTERNAL_ID,
       },
       {},
@@ -81,7 +81,7 @@ describe('Sdk Version Header Tests', () => {
     deleteUserByAlias(
       { appId: APP_ID },
       {
-        label: IdentityConstants.EXTERNAL_ID,
+        label: IdentityConstants._ExternalID,
         id: EXTERNAL_ID,
       },
     );
@@ -92,7 +92,7 @@ describe('Sdk Version Header Tests', () => {
     createSubscriptionByAlias(
       { appId: APP_ID },
       {
-        label: IdentityConstants.EXTERNAL_ID,
+        label: IdentityConstants._ExternalID,
         id: EXTERNAL_ID,
       },
       {
@@ -107,7 +107,7 @@ describe('Sdk Version Header Tests', () => {
     getUserIdentity(
       { appId: APP_ID },
       {
-        label: IdentityConstants.EXTERNAL_ID,
+        label: IdentityConstants._ExternalID,
         id: EXTERNAL_ID,
       },
     );
@@ -118,10 +118,10 @@ describe('Sdk Version Header Tests', () => {
     deleteAlias(
       { appId: APP_ID },
       {
-        label: IdentityConstants.EXTERNAL_ID,
+        label: IdentityConstants._ExternalID,
         id: EXTERNAL_ID,
       },
-      IdentityConstants.EXTERNAL_ID,
+      IdentityConstants._ExternalID,
     );
     expectHeaderToBeSent();
   });

__test__/unit/pushSubscription/nativePermissionChange.test.ts

@@ -130,7 +130,7 @@ describe('Notification Types are set correctly on subscription change', () => {
         lastKnownPushToken: PUSH_TOKEN_2,
         lastKnownPushId: SUB_ID_3,
       });
-      OneSignal._coreDirector._subscriptionModelStore.add(pushModel);
+      OneSignal._coreDirector._subscriptionModelStore._add(pushModel);
 
       await checkAndTriggerSubscriptionChanged();
       expect(changeListener).toHaveBeenCalledWith({