Merge pull request #1396 from OneSignal/fg/reduce-size-2

refactor: more size reduction

Author: fadi-george

__test__/setupTests.ts

@@ -19,8 +19,8 @@ beforeEach(async () => {
 afterEach(() => {
   server.resetHandlers();
   if (typeof OneSignal !== 'undefined') {
-    OneSignal._coreDirector?.operationRepo._clear();
-    OneSignal.emitter?.removeAllListeners();
+    OneSignal._coreDirector?._operationRepo._clear();
+    OneSignal._emitter?.removeAllListeners();
   }
 });
 

__test__/support/environment/TestEnvironment.ts

@@ -32,7 +32,7 @@ export class TestEnvironment {
   ) {
     mockJsonp();
     const oneSignal = initOSGlobals(config);
-    OneSignal._coreDirector.operationRepo.queue = [];
+    OneSignal._coreDirector._operationRepo.queue = [];
 
     if (config.initOneSignalId) {
       updateIdentityModel('onesignal_id', ONESIGNAL_ID);

__test__/support/environment/TestEnvironmentHelpers.ts

@@ -25,14 +25,14 @@ export function initOSGlobals(config: TestEnvironmentConfig = {}) {
   global.OneSignal = OneSignal;
   global.OneSignal.EVENTS = ONESIGNAL_EVENTS;
   global.OneSignal.config = TestContext.getFakeMergedConfig(config);
-  global.OneSignal.context = new Context(global.OneSignal.config);
-  global.OneSignal.initialized = true;
-  global.OneSignal.emitter = new Emitter();
+  global.OneSignal._context = new Context(global.OneSignal.config);
+  global.OneSignal._initialized = true;
+  global.OneSignal._emitter = new Emitter();
   const core = new CoreModule();
   global.OneSignal._coreDirector = new CoreModuleDirector(core);
 
   // Clear the User singleton before creating new instance
-  User.singletonInstance = undefined;
+  User._singletonInstance = undefined;
 
   const userNamespace = new UserNamespace(!!config.initUserAndPushSubscription); // TO DO: pass in subscription, and permission
   global.OneSignal.User = userNamespace;
@@ -60,7 +60,7 @@ export const createPushSub = ({
   onesignalId?: string;
 } = {}) => {
   const pushSubscription = new SubscriptionModel();
-  pushSubscription.initializeFromJson({
+  pushSubscription._initializeFromJson({
     ...BASE_SUB,
     id,
     onesignalId,
@@ -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/core.ts

@@ -5,8 +5,8 @@ import { CoreModuleDirector } from '../../../src/core/CoreModuleDirector';
 
 export function generateNewSubscription(modelId = '0000000000') {
   const model = new SubscriptionModel();
-  model.modelId = modelId;
-  model.mergeData({
+  model._modelId = modelId;
+  model._mergeData({
     type: SubscriptionType.Email,
     id: '123', // subscription id
     token: 'myToken',
@@ -18,6 +18,6 @@ export function generateNewSubscription(modelId = '0000000000') {
 // Requirement: Test must also call TestEnvironment.initialize();
 export async function getCoreModuleDirector(): Promise<CoreModuleDirector> {
   const coreModule = new CoreModule();
-  await coreModule.init();
+  await coreModule._init();
   return new CoreModuleDirector(coreModule);
 }

__test__/support/helpers/setup.ts

@@ -64,7 +64,7 @@ export const setupIdentityModel = async (
 ) => {
   const newIdentityModel = new IdentityModel();
   newIdentityModel.onesignalId = onesignalID;
-  OneSignal._coreDirector.identityModelStore.replace(
+  OneSignal._coreDirector._identityModelStore.replace(
     newIdentityModel,
     ModelChangeTags.NO_PROPAGATE,
   );
@@ -78,7 +78,7 @@ export const setupPropertiesModel = async (
 ) => {
   const newPropertiesModel = new PropertiesModel();
   newPropertiesModel.onesignalId = onesignalID;
-  OneSignal._coreDirector.propertiesModelStore.replace(
+  OneSignal._coreDirector._propertiesModelStore.replace(
     newPropertiesModel,
     ModelChangeTags.NO_PROPAGATE,
   );
@@ -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.NO_PROPAGATE);
 };
 
 /**
@@ -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.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,
   );
@@ -137,7 +137,7 @@ export const setupSubscriptionModel = async (
  */
 export const setupLoadStylesheet = async () => {
   vi.spyOn(
-    OneSignal.context._dynamicResourceLoader,
+    OneSignal._context._dynamicResourceLoader,
     'loadSdkStylesheet',
   ).mockResolvedValue(ResourceLoadState.Loaded);
 };

__test__/unit/core/coreModuleDirector.test.ts

@@ -12,7 +12,7 @@ describe('CoreModuleDirector tests', () => {
 
   describe('getPushSubscriptionModel', () => {
     async function getPushSubscriptionModel() {
-      return (await getCoreModuleDirector()).getPushSubscriptionModel();
+      return (await getCoreModuleDirector())._getPushSubscriptionModel();
     }
 
     test('returns undefined when it find no push records', async () => {
@@ -23,9 +23,7 @@ describe('CoreModuleDirector tests', () => {
       const pushModelCurrent = generateNewSubscription();
       vi.spyOn(
         CoreModuleDirector.prototype,
-        // @ts-expect-error - private method
-        'getPushSubscriptionModelByCurrentToken',
-        // @ts-expect-error - private method
+        '_getPushSubscriptionModelByCurrentToken',
       ).mockResolvedValue(pushModelCurrent);
       expect(await getPushSubscriptionModel()).toBe(pushModelCurrent);
     });
@@ -34,9 +32,7 @@ describe('CoreModuleDirector tests', () => {
       const pushModelLastKnown = generateNewSubscription();
       vi.spyOn(
         CoreModuleDirector.prototype,
-        // @ts-expect-error - private method
-        'getPushSubscriptionModelByLastKnownToken',
-        // @ts-expect-error - private method
+        '_getPushSubscriptionModelByLastKnownToken',
       ).mockResolvedValue(pushModelLastKnown);
       expect(await getPushSubscriptionModel()).toEqual(pushModelLastKnown);
     });
@@ -45,17 +41,13 @@ describe('CoreModuleDirector tests', () => {
       const pushModelCurrent = generateNewSubscription();
       vi.spyOn(
         CoreModuleDirector.prototype,
-        // @ts-expect-error - private method
-        'getPushSubscriptionModelByCurrentToken',
-        // @ts-expect-error - private method
+        '_getPushSubscriptionModelByCurrentToken',
       ).mockResolvedValue(pushModelCurrent);
 
       const pushModelLastKnown = generateNewSubscription();
       vi.spyOn(
         CoreModuleDirector.prototype,
-        // @ts-expect-error - private method
-        'getPushSubscriptionModelByLastKnownToken',
-        // @ts-expect-error - private method
+        '_getPushSubscriptionModelByLastKnownToken',
       ).mockResolvedValue(pushModelLastKnown);
 
       expect(await getPushSubscriptionModel()).toBe(pushModelCurrent);

__test__/unit/http/sdkVersion.test.ts

@@ -97,7 +97,7 @@ describe('Sdk Version Header Tests', () => {
       },
       {
         // @ts-expect-error - partial identity object
-        subscription: generateNewSubscription().data,
+        subscription: generateNewSubscription()._data,
       },
     );
     expectHeaderToBeSent();

__test__/unit/push/registerForPush.test.ts

@@ -26,21 +26,21 @@ describe('Register for push', () => {
   });
 
   test('registerForPushNotifications: before OneSignal.initialized', async () => {
-    global.OneSignal.initialized = false;
+    global.OneSignal._initialized = false;
     global.OneSignal._initCalled = false;
 
     const promise = OneSignal.User.PushSubscription.optIn();
 
     expect(spy).not.toHaveBeenCalled();
     OneSignalEvent.trigger(OneSignal.EVENTS.SDK_INITIALIZED);
     await promise;
-    expect(OneSignal.initialized).toBe(true);
+    expect(OneSignal._initialized).toBe(true);
     expect(spy).toHaveBeenCalledTimes(1);
   });
 
   // Revisit with Vitest change
   test('registerForPushNotifications: after OneSignal.initialized', async () => {
-    global.OneSignal.initialized = true;
+    global.OneSignal._initialized = true;
     global.OneSignal._initCalled = false;
 
     await expect(InitHelper.registerForPushNotifications()).resolves.toBe(

__test__/unit/pushSubscription/nativePermissionChange.test.ts

@@ -27,7 +27,7 @@ vi.useFakeTimers();
 describe('Notification Types are set correctly on subscription change', () => {
   beforeEach(() => {
     TestEnvironment.initialize();
-    OneSignal.emitter = new Emitter();
+    OneSignal._emitter = new Emitter();
   });
 
   afterEach(async () => {
@@ -112,7 +112,7 @@ describe('Notification Types are set correctly on subscription change', () => {
         lastKnownPushToken: PUSH_TOKEN,
         lastKnownPushId: SUB_ID,
       });
-      OneSignal._coreDirector.addSubscriptionModel(pushModel);
+      OneSignal._coreDirector._addSubscriptionModel(pushModel);
 
       await checkAndTriggerSubscriptionChanged();
       expect(changeListener).not.toHaveBeenCalled();
@@ -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({

__test__/unit/user/user.test.ts

@@ -8,7 +8,7 @@ describe('User tests', () => {
   test('getTags called with unset tags should return empty tags', () => {
     TestEnvironment.initialize();
 
-    const user = User.createOrGetInstance();
+    const user = User._createOrGetInstance();
     const tags = user.getTags();
 
     expect(tags).toStrictEqual({});
@@ -17,7 +17,7 @@ describe('User tests', () => {
   test('getTags called with empty tags in properties model should return empty tags', () => {
     TestEnvironment.initialize();
 
-    const user = User.createOrGetInstance();
+    const user = User._createOrGetInstance();
     const tags = user.getTags();
 
     expect(tags).toStrictEqual({});
@@ -30,7 +30,7 @@ describe('User tests', () => {
     const propModel = OneSignal._coreDirector._getPropertiesModel();
     propModel.tags = tagsSample;
 
-    const user = User.createOrGetInstance();
+    const user = User._createOrGetInstance();
     const tags = user.getTags();
 
     expect(tags).toBe(tagsSample);
@@ -44,7 +44,7 @@ describe('User tests', () => {
     const propModel = OneSignal._coreDirector._getPropertiesModel();
     propModel.language = languageSample;
 
-    const user = User.createOrGetInstance();
+    const user = User._createOrGetInstance();
     const language = user.getLanguage();
 
     expect(language).toBe(languageSample);
@@ -55,7 +55,7 @@ describe('User tests', () => {
 
     const languageSample = 'fr';
 
-    const user = User.createOrGetInstance();
+    const user = User._createOrGetInstance();
     user.setLanguage(languageSample);
 
     const propModel = OneSignal._coreDirector._getPropertiesModel();