more renames

Author: fadi-george

__test__/setupTests.ts

@@ -20,7 +20,7 @@ afterEach(() => {
   server.resetHandlers();
   if (typeof OneSignal !== 'undefined') {
     OneSignal._coreDirector?._operationRepo._clear();
-    OneSignal._emitter?.removeAllListeners();
+    OneSignal._emitter?._removeAllListeners();
   }
 });
 

package.json

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

src/core/executors/LoginUserOperationExecutor.test.ts

@@ -141,10 +141,8 @@ describe('LoginUserOperationExecutor', () => {
       const res = await executor._execute(ops);
 
       expect(res).toEqual({
-        result: ExecutionResult._Success,
-        retryAfterSeconds: undefined,
-        operations: undefined,
-        idTranslations: {
+        _result: ExecutionResult._Success,
+        _idTranslations: {
           [ONESIGNAL_ID_2]: ONESIGNAL_ID,
         },
       });
@@ -206,10 +204,9 @@ describe('LoginUserOperationExecutor', () => {
       const refreshOp = new RefreshUserOperation(APP_ID, ONESIGNAL_ID_2);
       refreshOp._modelId = res._operations![0]._modelId;
       expect(res).toEqual({
-        result: ExecutionResult._Success,
-        retryAfterSeconds: undefined,
-        operations: [refreshOp],
-        idTranslations: {
+        _result: ExecutionResult._Success,
+        _operations: [refreshOp],
+        _idTranslations: {
           [ONESIGNAL_ID]: ONESIGNAL_ID_2,
           [SUB_ID]: SUB_ID_2,
         },
@@ -230,24 +227,24 @@ describe('LoginUserOperationExecutor', () => {
       setCreateUserError({ status: 429, retryAfter: 10 });
       const res = await executor._execute(ops);
       expect(res).toEqual({
-        result: ExecutionResult._FailRetry,
-        retryAfterSeconds: 10,
+        _result: ExecutionResult._FailRetry,
+        _retryAfterSeconds: 10,
       });
 
       // unauthorized error
       setCreateUserError({ status: 401, retryAfter: 15 });
       const res2 = await executor._execute(ops);
       expect(res2).toEqual({
-        result: ExecutionResult._FailUnauthorized,
-        retryAfterSeconds: 15,
+        _result: ExecutionResult._FailUnauthorized,
+        _retryAfterSeconds: 15,
       });
 
       // others errors - pause repo
       setCreateUserError({ status: 400, retryAfter: 20 });
       const res3 = await executor._execute(ops);
       expect(res3).toEqual({
-        result: ExecutionResult._FailPauseOpRepo,
-        retryAfterSeconds: undefined,
+        _result: ExecutionResult._FailPauseOpRepo,
+        _retryAfterSeconds: undefined,
       });
     });
   });
@@ -278,8 +275,8 @@ describe('LoginUserOperationExecutor', () => {
       );
 
       expect(res).toEqual({
-        result: ExecutionResult._SuccessStartingOnly,
-        idTranslations: {
+        _result: ExecutionResult._SuccessStartingOnly,
+        _idTranslations: {
           [ONESIGNAL_ID]: ONESIGNAL_ID_2,
         },
       });
@@ -300,8 +297,8 @@ describe('LoginUserOperationExecutor', () => {
 
       const res = await executor._execute([loginOp]);
       expect(res).toMatchObject({
-        result: ExecutionResult._Success,
-        idTranslations: {
+        _result: ExecutionResult._Success,
+        _idTranslations: {
           [ONESIGNAL_ID]: '123',
         },
       });
@@ -314,8 +311,8 @@ describe('LoginUserOperationExecutor', () => {
 
       const res2 = await executor._execute([loginOp]);
       expect(res2).toMatchObject({
-        result: ExecutionResult._Success,
-        idTranslations: {
+        _result: ExecutionResult._Success,
+        _idTranslations: {
           [ONESIGNAL_ID]: '456',
         },
       });
@@ -325,7 +322,7 @@ describe('LoginUserOperationExecutor', () => {
 
       const res3 = await executor._execute([loginOp]);
       expect(res3).toMatchObject({
-        result: ExecutionResult._FailUnauthorized,
+        _result: ExecutionResult._FailUnauthorized,
       });
     });
   });

src/core/executors/RefreshUserOperationExecutor.test.ts

@@ -227,8 +227,8 @@ describe('RefreshUserOperationExecutor', () => {
       });
       const res1 = await executor._execute([refreshOp]);
       expect(res1).toMatchObject({
-        result: ExecutionResult._FailRetry,
-        retryAfterSeconds: 10,
+        _result: ExecutionResult._FailRetry,
+        _retryAfterSeconds: 10,
       });
 
       // unauthorized error
@@ -238,8 +238,8 @@ describe('RefreshUserOperationExecutor', () => {
       });
       const res2 = await executor._execute([refreshOp]);
       expect(res2).toMatchObject({
-        result: ExecutionResult._FailUnauthorized,
-        retryAfterSeconds: 15,
+        _result: ExecutionResult._FailUnauthorized,
+        _retryAfterSeconds: 15,
       });
 
       // missing error
@@ -251,16 +251,15 @@ describe('RefreshUserOperationExecutor', () => {
       getRebuildOpsSpy.mockReturnValueOnce(null);
       const res3 = await executor._execute([refreshOp]);
       expect(res3).toMatchObject({
-        result: ExecutionResult._FailNoretry,
-        retryAfterSeconds: undefined,
+        _result: ExecutionResult._FailNoretry,
       });
 
       // -- with rebuild ops
       const res4 = await executor._execute([refreshOp]);
       expect(res4).toMatchObject({
-        result: ExecutionResult._FailRetry,
-        retryAfterSeconds: 5,
-        operations: [
+        _result: ExecutionResult._FailRetry,
+        _retryAfterSeconds: 5,
+        _operations: [
           {
             _name: 'login-user',
             _appId: APP_ID,
@@ -282,8 +281,8 @@ describe('RefreshUserOperationExecutor', () => {
       });
       const res6 = await executor._execute([refreshOp]);
       expect(res6).toMatchObject({
-        result: ExecutionResult._FailRetry,
-        retryAfterSeconds: 20,
+        _result: ExecutionResult._FailRetry,
+        _retryAfterSeconds: 20,
       });
 
       // other errors
@@ -292,8 +291,7 @@ describe('RefreshUserOperationExecutor', () => {
       });
       const res7 = await executor._execute([refreshOp]);
       expect(res7).toMatchObject({
-        result: ExecutionResult._FailNoretry,
-        retryAfterSeconds: undefined,
+        _result: ExecutionResult._FailNoretry,
       });
     });
   });