@maxzima/wa-communicator 0.0.14 → 0.0.15

package/dist/engine/utils.js

@@ -10,7 +10,7 @@ export function modifyOrigin(address) {
     catch (_) {
         return null;
     }
-    return url.origin;
+    return url.origin !== 'null' ? url.origin : null;
 }
 export function isValidMessage(message) {
     const isValidTarget = message.target && CommunicatorTargetEnum_isCorrect(message.target);

package/dist/enums/CommunicatorActionEnum.d.ts

@@ -1,4 +1,5 @@
 export declare enum CommunicatorActionEnum {
+    LOADED = "loaded",
     TOKEN = "token",
     RESIZE = "resize",
     CLOSE = "close",

package/dist/enums/CommunicatorActionEnum.js

@@ -1,5 +1,6 @@
 export var CommunicatorActionEnum;
 (function (CommunicatorActionEnum) {
+    CommunicatorActionEnum["LOADED"] = "loaded";
     CommunicatorActionEnum["TOKEN"] = "token";
     CommunicatorActionEnum["RESIZE"] = "resize";
     CommunicatorActionEnum["CLOSE"] = "close";

package/dist/types/index.d.ts

@@ -23,6 +23,7 @@ export declare type TCommunicatorActionGotoParams = {
     isTargetBlank?: boolean;
 };
 export declare type TCommunicatorSenderActionMap = {
+    [CommunicatorActionEnum.LOADED]?: true;
     [CommunicatorActionEnum.TOKEN]?: TCommunicatorActionTokenParams;
     [CommunicatorActionEnum.RESIZE]?: TCommunicatorActionResizeParams;
     [CommunicatorActionEnum.GOTO]?: TCommunicatorActionGotoParams;

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.0.14",
+  "version": "0.0.15",
   "name": "@maxzima/wa-communicator",
   "description": "",
   "author": "Noname",

package/src/engine/utils.ts

@@ -14,7 +14,7 @@ export function modifyOrigin(address: string): string {
   } catch (_) {
     return null;
   }
-  return url.origin;
+  return url.origin !== 'null' ? url.origin : null;
 }
 
 /**

package/src/enums/CommunicatorActionEnum.ts

@@ -1,4 +1,5 @@
 export enum CommunicatorActionEnum {
+  LOADED = 'loaded',
   TOKEN = 'token',
   RESIZE = 'resize',
   CLOSE = 'close',
@@ -11,5 +12,5 @@ export function CommunicatorActionEnum_isCorrect(item: string): boolean {
 }
 
 export function CommunicatorActionEnum_scenario(): CommunicatorActionEnum[]  {
-  return Object.values(CommunicatorActionEnum);
+  return Object.values(CommunicatorActionEnum) as CommunicatorActionEnum[];
 }

package/src/types/index.ts

@@ -30,6 +30,7 @@ export type TCommunicatorActionGotoParams = {
 }
 
 export type TCommunicatorSenderActionMap = {
+  [CommunicatorActionEnum.LOADED]?: true,
   [CommunicatorActionEnum.TOKEN]?: TCommunicatorActionTokenParams,
   [CommunicatorActionEnum.RESIZE]?: TCommunicatorActionResizeParams,
   [CommunicatorActionEnum.GOTO]?: TCommunicatorActionGotoParams,

package/test/testUnits/queue.ts

@@ -1,56 +1,165 @@
 import {TReceiverMessageQueue} from '../../src/types';
 import {CommunicatorActionEnum, CommunicatorTargetEnum} from '../../src';
 
-const getQueue = (isDefaultSort = false): TReceiverMessageQueue => {
-  if (isDefaultSort) {
-    return [
-      {
-        target: CommunicatorTargetEnum.SIGN_IN,
-        action: CommunicatorActionEnum.CLOSE,
-        params: {
-          callback: () => {}
-        }
-      },
-      {
-        target: CommunicatorTargetEnum.SIGN_IN,
-        action: CommunicatorActionEnum.OPEN,
-        params: {
-          callback: () => {}
-        }
-      },
-      {
-        target: CommunicatorTargetEnum.SIGN_IN,
-        action: CommunicatorActionEnum.GOTO,
-        params: {
-          callback: () => {}
-        }
-      }
-    ];
-  }
+const queueWithoutSorting: TReceiverMessageQueue = [
+  {
+    target: CommunicatorTargetEnum.SIGN_IN,
+    action: CommunicatorActionEnum.OPEN,
+    params: {
+      callback: () => {}
+    }
+  },
+  {
+    target: CommunicatorTargetEnum.SIGN_IN,
+    action: CommunicatorActionEnum.CLOSE,
+    params: {
+      callback: () => {}
+    }
+  },
+  {
+    target: CommunicatorTargetEnum.SIGN_IN,
+    action: CommunicatorActionEnum.GOTO,
+    params: {
+      callback: () => {}
+    }
+  },
+  {
+    target: CommunicatorTargetEnum.SIGN_IN,
+    action: CommunicatorActionEnum.TOKEN,
+    params: {
+      callback: () => {}
+    }
+  },
+];
 
-  return [
-    {
-      target: CommunicatorTargetEnum.SIGN_IN,
-      action: CommunicatorActionEnum.OPEN,
-      params: {
-        callback: () => {}
-      }
-    },
-    {
-      target: CommunicatorTargetEnum.SIGN_IN,
-      action: CommunicatorActionEnum.CLOSE,
-      params: {
-        callback: () => {}
-      }
-    },
-    {
-      target: CommunicatorTargetEnum.SIGN_IN,
-      action: CommunicatorActionEnum.GOTO,
-      params: {
-        callback: () => {}
-      }
-    }
-  ];
-};
+const queueWithDefaultScenario: TReceiverMessageQueue = [
+  {
+    target: CommunicatorTargetEnum.SIGN_IN,
+    action: CommunicatorActionEnum.TOKEN,
+    params: {
+      callback: () => {}
+    }
+  },
+  {
+    target: CommunicatorTargetEnum.SIGN_IN,
+    action: CommunicatorActionEnum.CLOSE,
+    params: {
+      callback: () => {}
+    }
+  },
+  {
+    target: CommunicatorTargetEnum.SIGN_IN,
+    action: CommunicatorActionEnum.OPEN,
+    params: {
+      callback: () => {}
+    }
+  },
+  {
+    target: CommunicatorTargetEnum.SIGN_IN,
+    action: CommunicatorActionEnum.GOTO,
+    params: {
+      callback: () => {}
+    }
+  },
+];
 
-export default getQueue;
+const queueWithCustomScenario: TReceiverMessageQueue = [
+  {
+    target: CommunicatorTargetEnum.SIGN_IN,
+    action: CommunicatorActionEnum.OPEN,
+    params: {
+      callback: () => {}
+    }
+  },
+  {
+    target: CommunicatorTargetEnum.SIGN_IN,
+    action: CommunicatorActionEnum.CLOSE,
+    params: {
+      callback: () => {}
+    }
+  },
+  {
+    target: CommunicatorTargetEnum.SIGN_IN,
+    action: CommunicatorActionEnum.TOKEN,
+    params: {
+      callback: () => {}
+    }
+  },
+  {
+    target: CommunicatorTargetEnum.SIGN_IN,
+    action: CommunicatorActionEnum.GOTO,
+    params: {
+      callback: () => {}
+    }
+  },
+];
+
+const queueWithCustomV2Scenario: TReceiverMessageQueue = [
+  {
+    target: CommunicatorTargetEnum.SIGN_IN,
+    action: CommunicatorActionEnum.CLOSE,
+    params: {
+      callback: () => {}
+    }
+  },
+  {
+    target: CommunicatorTargetEnum.SIGN_IN,
+    action: CommunicatorActionEnum.TOKEN,
+    params: {
+      callback: () => {}
+    }
+  },
+  {
+    target: CommunicatorTargetEnum.SIGN_IN,
+    action: CommunicatorActionEnum.OPEN,
+    params: {
+      callback: () => {}
+    }
+  },
+  {
+    target: CommunicatorTargetEnum.SIGN_IN,
+    action: CommunicatorActionEnum.GOTO,
+    params: {
+      callback: () => {}
+    }
+  },
+];
+
+const queueWithCustomV3Scenario: TReceiverMessageQueue = [
+  {
+    target: CommunicatorTargetEnum.SIGN_IN,
+    action: CommunicatorActionEnum.OPEN,
+    params: {
+      callback: () => {}
+    }
+  },
+  {
+    target: CommunicatorTargetEnum.SIGN_IN,
+    action: CommunicatorActionEnum.CLOSE,
+    params: {
+      callback: () => {}
+    }
+  },
+  {
+    target: CommunicatorTargetEnum.SIGN_IN,
+    action: CommunicatorActionEnum.TOKEN,
+    params: {
+      callback: () => {}
+    }
+  },
+  {
+    target: CommunicatorTargetEnum.SIGN_IN,
+    action: CommunicatorActionEnum.GOTO,
+    params: {
+      callback: () => {}
+    }
+  },
+];
+
+export {
+  queueWithoutSorting,
+  queueWithDefaultScenario,
+  queueWithCustomScenario,
+  queueWithCustomV2Scenario,
+  queueWithCustomV3Scenario,
+};

package/test/testUnits/scenario.ts

@@ -0,0 +1,31 @@
+import {CommunicatorActionEnum, CommunicatorActionEnum_scenario} from '../../src/enums/CommunicatorActionEnum';
+
+const defaultScenario = CommunicatorActionEnum_scenario();
+
+const scenarioCustom = [
+  CommunicatorActionEnum.CLOSE,
+  CommunicatorActionEnum.TOKEN,
+  CommunicatorActionEnum.GOTO,
+];
+
+const scenarioCustomV2 = [
+  CommunicatorActionEnum.CLOSE,
+  CommunicatorActionEnum.TOKEN,
+  CommunicatorActionEnum.OPEN,
+  CommunicatorActionEnum.GOTO,
+];
+
+const scenarioCustomV3 = [
+  CommunicatorActionEnum.OPEN,
+  CommunicatorActionEnum.CLOSE,
+  CommunicatorActionEnum.TOKEN,
+  CommunicatorActionEnum.OPEN,
+  CommunicatorActionEnum.GOTO,
+];
+
+export {
+  defaultScenario,
+  scenarioCustom,
+  scenarioCustomV2,
+  scenarioCustomV3
+};

package/test/utiles.spec.ts

@@ -1,12 +1,19 @@
 import {isValidMessage, modifyOrigin, sortMessageQueue} from '../src/engine/utils';
-import {CommunicatorActionEnum_scenario} from '../src/enums/CommunicatorActionEnum';
-import getQueue from './testUnits/queue';
+import {
+  queueWithCustomScenario,
+  queueWithCustomV2Scenario, queueWithCustomV3Scenario,
+  queueWithDefaultScenario,
+  queueWithoutSorting
+} from './testUnits/queue';
 import {messageWithInvalidAction, messageWithInvalidTarget, normalMessage} from './testUnits/message';
+import {scenarioCustom, defaultScenario, scenarioCustomV2, scenarioCustomV3} from './testUnits/scenario';
 
 test('modifyOrigin', () => {
   expect(modifyOrigin('google.com')).toBe('https://google.com');
   expect(modifyOrigin('google.com/test')).toBe('https://google.com');
   expect(modifyOrigin('https://google.com/')).toBe('https://google.com');
+  expect(modifyOrigin('  https://google.com/')).toBe('https://google.com');
+  expect(modifyOrigin('htts://google.com')).toBe(null);
 });
 
 describe('isValidMessage', () => {
@@ -35,10 +42,28 @@ describe('isValidMessage', () => {
 });
 
 describe('sortMessageQueue', () => {
-  it('Default Sorting', () => {
+  it('Default Sorting (Default scenario)', () => {
     expect(
-      JSON.stringify(sortMessageQueue(getQueue(), CommunicatorActionEnum_scenario()))
-    ).toBe(JSON.stringify(getQueue(true)));
+      JSON.stringify(sortMessageQueue(queueWithoutSorting, defaultScenario))
+    ).toBe(JSON.stringify(queueWithDefaultScenario));
+  });
+
+  it('Custom Sorting (Not full scenario)', () => {
+    expect(
+      JSON.stringify(sortMessageQueue(queueWithoutSorting, scenarioCustom))
+    ).toBe(JSON.stringify(queueWithCustomScenario));
+  });
+
+  it('Custom Sorting (Full scenario)', () => {
+    expect(
+      JSON.stringify(sortMessageQueue(queueWithoutSorting, scenarioCustomV2))
+    ).toBe(JSON.stringify(queueWithCustomV2Scenario));
+  });
+
+  it('Custom Sorting (Full scenario with Doubling)', () => {
+    expect(
+      JSON.stringify(sortMessageQueue(queueWithoutSorting, scenarioCustomV3))
+    ).toBe(JSON.stringify(queueWithCustomV3Scenario));
   });
 });