Merge pull request #599 from Iterable/2.0.0-alpha/MOB-9995-reorganize-source-code

[MOB-9995] reorganize source code

Author: lposen

src/IterableAction.ts

@@ -1,5 +1,5 @@
-import { IterableAttributionInfo } from '../Iterable';
-import { IterableInAppMessage } from '../IterableInAppMessage';
+import { IterableAttributionInfo } from '../core';
+import { IterableInAppMessage } from '../inApp';
 
 export class MockRNIterableAPI {
   static email?: string;

src/IterableInAppClasses.ts

@@ -0,0 +1,2 @@
+export * from './MockLinking';
+export * from './MockRNIterableAPI';

src/__mocks__/MockRNIterableAPI.ts

@@ -2,24 +2,21 @@ import { NativeEventEmitter } from 'react-native';
 
 import { MockLinking } from '../__mocks__/MockLinking';
 import { MockRNIterableAPI } from '../__mocks__/MockRNIterableAPI';
-import { TestHelper } from './TestHelper';
-
+import { IterableLogger } from '../core';
 // import from the same location that consumers import from
 import {
   Iterable,
   IterableAction,
   IterableActionContext,
   IterableActionSource,
-  IterableConfig,
-  IterableLogLevel,
-} from '../index';
-import {
-  EventName,
   IterableAttributionInfo,
   IterableCommerceItem,
-} from '../Iterable';
-import { IterableDataRegion } from '../IterableDataRegion';
-import { IterableLogger } from '../IterableLogger';
+  IterableConfig,
+  IterableDataRegion,
+  IterableEventName,
+  IterableLogLevel,
+} from '..';
+import { TestHelper } from './TestHelper';
 
 describe('Iterable', () => {
   beforeEach(() => {
@@ -253,7 +250,7 @@ describe('Iterable', () => {
     );
     // sets up event emitter
     const nativeEmitter = new NativeEventEmitter();
-    nativeEmitter.removeAllListeners(EventName.handleUrlCalled);
+    nativeEmitter.removeAllListeners(IterableEventName.handleUrlCalled);
     // sets up config file and urlHandler function
     // urlHandler set to return false
     const config = new IterableConfig();
@@ -276,7 +273,7 @@ describe('Iterable', () => {
       context: { action: actionDict, source: 'inApp' },
     };
     // WHEN handleUrlCalled event is emitted
-    nativeEmitter.emit(EventName.handleUrlCalled, dict);
+    nativeEmitter.emit(IterableEventName.handleUrlCalled, dict);
     // THEN urlHandler and MockLinking is called with expected url
     return await TestHelper.delayed(0, () => {
       expect(config.urlHandler).toBeCalledWith(expectedUrl, dict.context);
@@ -289,7 +286,7 @@ describe('Iterable', () => {
     );
     // sets up event emitter
     const nativeEmitter = new NativeEventEmitter();
-    nativeEmitter.removeAllListeners(EventName.handleUrlCalled);
+    nativeEmitter.removeAllListeners(IterableEventName.handleUrlCalled);
     // sets up config file and urlHandler function
     // urlHandler set to return false
     const config = new IterableConfig();
@@ -312,7 +309,7 @@ describe('Iterable', () => {
       context: { action: actionDict, source: 'inApp' },
     };
     // WHEN handleUrlCalled event is emitted
-    nativeEmitter.emit(EventName.handleUrlCalled, dict);
+    nativeEmitter.emit(IterableEventName.handleUrlCalled, dict);
     // THEN urlHandler is called and MockLinking.openURL is not called
     return await TestHelper.delayed(0, () => {
       expect(config.urlHandler).toBeCalledWith(expectedUrl, dict.context);
@@ -325,7 +322,7 @@ describe('Iterable', () => {
     );
     // sets up event emitter
     const nativeEmitter = new NativeEventEmitter();
-    nativeEmitter.removeAllListeners(EventName.handleUrlCalled);
+    nativeEmitter.removeAllListeners(IterableEventName.handleUrlCalled);
     // sets up config file and urlHandler function
     // urlHandler set to return true
     const config = new IterableConfig();
@@ -348,7 +345,7 @@ describe('Iterable', () => {
       context: { action: actionDict, source: 'inApp' },
     };
     // WHEN handleUrlCalled event is emitted
-    nativeEmitter.emit(EventName.handleUrlCalled, dict);
+    nativeEmitter.emit(IterableEventName.handleUrlCalled, dict);
     // THEN urlHandler is called and MockLinking.openURL is not called
     return await TestHelper.delayed(0, () => {
       expect(config.urlHandler).toBeCalledWith(expectedUrl, dict.context);
@@ -361,7 +358,9 @@ describe('Iterable', () => {
     );
     // sets up event emitter
     const nativeEmitter = new NativeEventEmitter();
-    nativeEmitter.removeAllListeners(EventName.handleCustomActionCalled);
+    nativeEmitter.removeAllListeners(
+      IterableEventName.handleCustomActionCalled
+    );
     // sets up config file and customActionHandler function
     // customActionHandler set to return true
     const config = new IterableConfig();
@@ -382,7 +381,7 @@ describe('Iterable', () => {
       context: { action: actionDict, source: IterableActionSource.inApp },
     };
     // WHEN handleCustomActionCalled event is emitted
-    nativeEmitter.emit(EventName.handleCustomActionCalled, dict);
+    nativeEmitter.emit(IterableEventName.handleCustomActionCalled, dict);
     // THEN customActionHandler is called with expected action and expected context
     const expectedAction = new IterableAction(actionName, actionData);
     const expectedContext = new IterableActionContext(

src/__mocks__/index.ts

@@ -1,20 +1,21 @@
 import { NativeEventEmitter } from 'react-native';
 
+import { IterableLogger } from '../core';
 import { MockRNIterableAPI } from '../__mocks__/MockRNIterableAPI';
 
-import { Iterable, EventName } from '../Iterable';
-import { IterableConfig } from '../IterableConfig';
-import { IterableInAppMessage } from '../IterableInAppMessage';
 import {
+  Iterable,
+  IterableConfig,
+  IterableEventName,
+  IterableInAppCloseSource,
+  IterableInAppDeleteSource,
   IterableInAppLocation,
+  IterableInAppMessage,
+  IterableInAppShowResponse,
   IterableInAppTrigger,
   IterableInAppTriggerType,
   IterableInboxMetadata,
-  IterableInAppCloseSource,
-  IterableInAppShowResponse,
-  IterableInAppDeleteSource,
-} from '../IterableInAppClasses';
-import { IterableLogger } from '../IterableLogger';
+} from '..';
 
 describe('Iterable In App', () => {
   beforeEach(() => {
@@ -137,7 +138,7 @@ describe('Iterable In App', () => {
   test('inAppHandler_messageAndEventEmitted_methodCalledWithMessage', () => {
     // sets up event emitter
     const nativeEmitter = new NativeEventEmitter();
-    nativeEmitter.removeAllListeners(EventName.handleInAppCalled);
+    nativeEmitter.removeAllListeners(IterableEventName.handleInAppCalled);
 
     // sets up config file and inAppHandler function
     const config = new IterableConfig();
@@ -170,7 +171,7 @@ describe('Iterable In App', () => {
     );
 
     // WHEN handleInAppCalled event is emitted
-    nativeEmitter.emit(EventName.handleInAppCalled, messageDict);
+    nativeEmitter.emit(IterableEventName.handleInAppCalled, messageDict);
 
     // THEN inAppHandler and MockRNIterableAPI.setInAppShowResponse is called with message
     expect(config.inAppHandler).toBeCalledWith(expectedMessage);