[MOB-12033] Restructure native Directory (#933)

a7medev · web-flow · commit ec1f130c2d07 · 2023-03-02T10:38:42.000+02:00
* Restructure Native Directory

* Remove commented code

* Fix imports in mocks
diff --git a/src/models/Report.ts b/src/models/Report.ts
@@ -1,6 +1,6 @@
 import { Platform } from 'react-native';
 
-import { NativeInstabug } from '../native';
+import { NativeInstabug } from '../native/NativeInstabug';
 
 interface LogInfo {
   log: string;
diff --git a/src/models/Trace.ts b/src/models/Trace.ts
@@ -1,4 +1,4 @@
-import { NativeAPM } from '../native';
+import { NativeAPM } from '../native/NativeAPM';
 
 export default class Trace {
   constructor(
diff --git a/src/modules/APM.ts b/src/modules/APM.ts
@@ -1,7 +1,8 @@
 import { Platform } from 'react-native';
 
 import Trace from '../models/Trace';
-import { NativeAPM, NativeInstabug } from '../native';
+import { NativeAPM } from '../native/NativeAPM';
+import { NativeInstabug } from '../native/NativeInstabug';
 import { logLevel } from '../utils/ArgsRegistry';
 
 export { logLevel };
diff --git a/src/modules/BugReporting.ts b/src/modules/BugReporting.ts
@@ -1,6 +1,6 @@
 import { Platform } from 'react-native';
 
-import { NativeBugReporting } from '../native';
+import { NativeBugReporting } from '../native/NativeBugReporting';
 import {
   dismissType,
   extendedBugReportMode,
diff --git a/src/modules/CrashReporting.ts b/src/modules/CrashReporting.ts
@@ -1,8 +1,8 @@
 import { Platform } from 'react-native';
 import type { ExtendedError } from 'react-native/Libraries/Core/Devtools/parseErrorStack';
 
-import { NativeCrashReporting } from '../native';
-import type { CrashData } from '../native/CrashReportingNativeModule';
+import type { CrashData } from '../native/NativeCrashReporting';
+import { NativeCrashReporting } from '../native/NativeCrashReporting';
 import InstabugUtils from '../utils/InstabugUtils';
 
 /**
diff --git a/src/modules/FeatureRequests.ts b/src/modules/FeatureRequests.ts
@@ -1,4 +1,4 @@
-import { NativeFeatureRequests } from '../native';
+import { NativeFeatureRequests } from '../native/NativeFeatureRequests';
 import { actionTypes } from '../utils/ArgsRegistry';
 import type { ActionType } from '../utils/Enums';
 
diff --git a/src/modules/Instabug.ts b/src/modules/Instabug.ts
@@ -7,7 +7,7 @@ import type { NavigationAction, NavigationState as NavigationStateV4 } from 'rea
 
 import type { InstabugConfig } from '../models/InstabugConfig';
 import Report from '../models/Report';
-import { NativeInstabug } from '../native';
+import { NativeInstabug } from '../native/NativeInstabug';
 import {
   IBGPosition,
   actionTypes,
diff --git a/src/modules/NetworkLogger.ts b/src/modules/NetworkLogger.ts
@@ -2,7 +2,8 @@ import { Platform } from 'react-native';
 
 import type { RequestHandler } from '@apollo/client';
 
-import { NativeAPM, NativeInstabug } from '../native';
+import { NativeAPM } from '../native/NativeAPM';
+import { NativeInstabug } from '../native/NativeInstabug';
 import IBGEventEmitter from '../utils/IBGEventEmitter';
 import InstabugConstants from '../utils/InstabugConstants';
 import xhr, { NetworkData, ProgressCallback } from '../utils/XhrNetworkInterceptor';
diff --git a/src/modules/Replies.ts b/src/modules/Replies.ts
@@ -1,6 +1,6 @@
 import { Platform } from 'react-native';
 
-import { NativeReplies } from '../native';
+import { NativeReplies } from '../native/NativeReplies';
 import IBGEventEmitter from '../utils/IBGEventEmitter';
 import InstabugConstants from '../utils/InstabugConstants';
 
diff --git a/src/modules/Surveys.ts b/src/modules/Surveys.ts
@@ -1,7 +1,7 @@
 import { Platform } from 'react-native';
 
-import { NativeSurveys } from '../native';
-import type { Survey } from '../native/SurveysNativeModule';
+import { NativeSurveys } from '../native/NativeSurveys';
+import type { Survey } from '../native/NativeSurveys';
 import IBGEventEmitter from '../utils/IBGEventEmitter';
 import InstabugConstants from '../utils/InstabugConstants';
 
diff --git a/src/native/NativeAPM.ts b/src/native/NativeAPM.ts
@@ -1,6 +1,7 @@
 import type { NativeModule } from 'react-native';
 
 import type { logLevel } from '../utils/ArgsRegistry';
+import { NativeModules } from './NativePackage';
 
 export interface ApmNativeModule extends NativeModule {
   // Essential APIs //
@@ -28,3 +29,5 @@ export interface ApmNativeModule extends NativeModule {
   /** @deprecated */
   setLogLevel(level: logLevel): void;
 }
+
+export const NativeAPM = NativeModules.IBGAPM;
diff --git a/src/native/NativeBugReporting.ts b/src/native/NativeBugReporting.ts
@@ -18,6 +18,7 @@ import type {
   RecordingButtonPosition,
   ReportType,
 } from '../utils/Enums';
+import { NativeModules } from './NativePackage';
 
 export interface BugReportingNativeModule extends NativeModule {
   // Essential APIs //
@@ -57,3 +58,5 @@ export interface BugReportingNativeModule extends NativeModule {
     handler: (dismissType: dismissType | DismissType, reportType: reportType | ReportType) => void,
   ): void;
 }
+
+export const NativeBugReporting = NativeModules.IBGBugReporting;
diff --git a/src/native/NativeCrashReporting.ts b/src/native/NativeCrashReporting.ts
@@ -1,6 +1,8 @@
 import type { NativeModule, Platform } from 'react-native';
 import type { StackFrame } from 'react-native/Libraries/Core/Devtools/parseErrorStack';
 
+import { NativeModules } from './NativePackage';
+
 export interface CrashData {
   message: string;
   e_message: string;
@@ -15,3 +17,5 @@ export interface CrashReportingNativeModule extends NativeModule {
   sendJSCrash(data: CrashData | string): void;
   sendHandledJSCrash(data: CrashData | string): void;
 }
+
+export const NativeCrashReporting = NativeModules.IBGCrashReporting;
diff --git a/src/native/NativeFeatureRequests.ts b/src/native/NativeFeatureRequests.ts
@@ -2,6 +2,7 @@ import type { NativeModule } from 'react-native';
 
 import type { actionTypes } from '../utils/ArgsRegistry';
 import type { ActionType } from '../utils/Enums';
+import { NativeModules } from './NativePackage';
 
 export interface FeatureRequestsNativeModule extends NativeModule {
   setEnabled(isEnabled: boolean): void;
@@ -11,3 +12,5 @@ export interface FeatureRequestsNativeModule extends NativeModule {
     types: actionTypes[] | ActionType[],
   ): void;
 }
+
+export const NativeFeatureRequests = NativeModules.IBGFeatureRequests;
diff --git a/src/native/NativeInstabug.ts b/src/native/NativeInstabug.ts
@@ -21,6 +21,7 @@ import type {
 } from '../utils/Enums';
 import type { NetworkData } from '../utils/XhrNetworkInterceptor';
 import type { NativeConstants } from './NativeConstants';
+import { NativeModules } from './NativePackage';
 
 export interface InstabugNativeModule extends NativeModule {
   getConstants(): NativeConstants;
@@ -120,3 +121,5 @@ export interface InstabugNativeModule extends NativeModule {
   /** @deprecated */
   callPrivateApi(apiName: string, param: any[]): void;
 }
+
+export const NativeInstabug = NativeModules.Instabug;
diff --git a/src/native/NativePackage.ts b/src/native/NativePackage.ts
@@ -0,0 +1,21 @@
+import { NativeModules as ReactNativeModules } from 'react-native';
+
+import type { ApmNativeModule } from './NativeAPM';
+import type { BugReportingNativeModule } from './NativeBugReporting';
+import type { CrashReportingNativeModule } from './NativeCrashReporting';
+import type { FeatureRequestsNativeModule } from './NativeFeatureRequests';
+import type { InstabugNativeModule } from './NativeInstabug';
+import type { RepliesNativeModule } from './NativeReplies';
+import type { SurveysNativeModule } from './NativeSurveys';
+
+export interface InstabugNativePackage {
+  IBGAPM: ApmNativeModule;
+  IBGBugReporting: BugReportingNativeModule;
+  IBGCrashReporting: CrashReportingNativeModule;
+  IBGFeatureRequests: FeatureRequestsNativeModule;
+  Instabug: InstabugNativeModule;
+  IBGReplies: RepliesNativeModule;
+  IBGSurveys: SurveysNativeModule;
+}
+
+export const NativeModules = ReactNativeModules as InstabugNativePackage;
diff --git a/src/native/NativeReplies.ts b/src/native/NativeReplies.ts
@@ -1,5 +1,7 @@
 import type { NativeModule } from 'react-native';
 
+import { NativeModules } from './NativePackage';
+
 export interface RepliesNativeModule extends NativeModule {
   // Essential APIs //
   setEnabled(isEnabled: boolean): void;
@@ -22,3 +24,5 @@ export interface RepliesNativeModule extends NativeModule {
   setPushNotificationChannelId(id: string): void;
   setSystemReplyNotificationSoundEnabled(isEnabled: boolean): void;
 }
+
+export const NativeReplies = NativeModules.IBGReplies;
diff --git a/src/native/NativeSurveys.ts b/src/native/NativeSurveys.ts
@@ -1,5 +1,7 @@
 import type { NativeModule } from 'react-native';
 
+import { NativeModules } from './NativePackage';
+
 export interface Survey {
   title: string;
 }
@@ -24,3 +26,5 @@ export interface SurveysNativeModule extends NativeModule {
   setOnShowHandler(onShowHandler: () => void): void;
   setOnDismissHandler(onDismissHandler: () => void): void;
 }
+
+export const NativeSurveys = NativeModules.IBGSurveys;
diff --git a/src/native/index.ts b/src/native/index.ts
diff --git a/src/utils/ArgsRegistry.ts b/src/utils/ArgsRegistry.ts
@@ -1,4 +1,4 @@
-import { NativeInstabug } from '../native';
+import { NativeInstabug } from '../native/NativeInstabug';
 
 const constants = NativeInstabug.getConstants();
 
diff --git a/src/utils/Enums.ts b/src/utils/Enums.ts
@@ -1,4 +1,4 @@
-import { NativeInstabug } from '../native';
+import { NativeInstabug } from '../native/NativeInstabug';
 
 const constants = NativeInstabug.getConstants();
 
diff --git a/src/utils/InstabugUtils.ts b/src/utils/InstabugUtils.ts
@@ -7,8 +7,8 @@ import parseErrorStackLib, {
 import type { NavigationState as NavigationStateV5, PartialState } from '@react-navigation/native';
 import type { NavigationState as NavigationStateV4 } from 'react-navigation';
 
-import { NativeCrashReporting } from '../native';
-import type { CrashData } from '../native/CrashReportingNativeModule';
+import type { CrashData } from '../native/NativeCrashReporting';
+import { NativeCrashReporting } from '../native/NativeCrashReporting';
 
 export const parseErrorStack = (error: ExtendedError): StackFrame[] => {
   return parseErrorStackLib(error);
diff --git a/test/mocks/mockAPM.ts b/test/mocks/mockAPM.ts
@@ -1,4 +1,4 @@
-import type { ApmNativeModule } from '../../src/native/ApmNativeModule';
+import type { ApmNativeModule } from '../../src/native/NativeAPM';
 
 const mockAPM: ApmNativeModule = {
   addListener: jest.fn(),
diff --git a/test/mocks/mockBugReporting.ts b/test/mocks/mockBugReporting.ts
@@ -1,4 +1,4 @@
-import type { BugReportingNativeModule } from '../../src/native/BugReportingNativeModule';
+import type { BugReportingNativeModule } from '../../src/native/NativeBugReporting';
 
 const mockBugReporting: BugReportingNativeModule = {
   addListener: jest.fn(),
diff --git a/test/mocks/mockCrashReporting.ts b/test/mocks/mockCrashReporting.ts
@@ -1,4 +1,4 @@
-import type { CrashReportingNativeModule } from '../../src/native/CrashReportingNativeModule';
+import type { CrashReportingNativeModule } from '../../src/native/NativeCrashReporting';
 
 const mockCrashReporting: CrashReportingNativeModule = {
   addListener: jest.fn(),
diff --git a/test/mocks/mockFeatureRequests.ts b/test/mocks/mockFeatureRequests.ts
@@ -1,4 +1,4 @@
-import type { FeatureRequestsNativeModule } from '../../src/native/FeatureRequestsNativeModule';
+import type { FeatureRequestsNativeModule } from '../../src/native/NativeFeatureRequests';
 
 const mockFeatureRequests: FeatureRequestsNativeModule = {
   addListener: jest.fn(),
diff --git a/test/mocks/mockInstabug.ts b/test/mocks/mockInstabug.ts
@@ -1,4 +1,4 @@
-import type { InstabugNativeModule } from '../../src/native/InstabugNativeModule';
+import type { InstabugNativeModule } from '../../src/native/NativeInstabug';
 
 const mockInstabug: InstabugNativeModule = {
   addListener: jest.fn(),
diff --git a/test/mocks/mockNativeModules.ts b/test/mocks/mockNativeModules.ts
@@ -1,4 +1,4 @@
-import type { InstabugNativePackage } from '../../src/native';
+import type { InstabugNativePackage } from '../../src/native/NativePackage';
 import mockAPM from './mockAPM';
 import mockBugReporting from './mockBugReporting';
 import mockCrashReporting from './mockCrashReporting';
diff --git a/test/mocks/mockReplies.ts b/test/mocks/mockReplies.ts
@@ -1,4 +1,4 @@
-import type { RepliesNativeModule } from '../../src/native/RepliesNativeModule';
+import type { RepliesNativeModule } from '../../src/native/NativeReplies';
 
 const mockReplies: RepliesNativeModule = {
   addListener: jest.fn(),
diff --git a/test/mocks/mockSurveys.ts b/test/mocks/mockSurveys.ts
@@ -1,4 +1,4 @@
-import type { SurveysNativeModule } from '../../src/native/SurveysNativeModule';
+import type { SurveysNativeModule } from '../../src/native/NativeSurveys';
 
 const mockSurveys: SurveysNativeModule = {
   addListener: jest.fn(),
diff --git a/test/models/Report.spec.ts b/test/models/Report.spec.ts
@@ -1,7 +1,7 @@
 import { Platform } from 'react-native';
 
 import Report from '../../src/models/Report';
-import { NativeInstabug } from '../../src/native';
+import { NativeInstabug } from '../../src/native/NativeInstabug';
 
 describe('Report Model', () => {
   let report: Report;
diff --git a/test/models/Trace.spec.ts b/test/models/Trace.spec.ts
@@ -1,5 +1,5 @@
 import Trace from '../../src/models/Trace';
-import { NativeAPM } from '../../src/native';
+import { NativeAPM } from '../../src/native/NativeAPM';
 
 describe('Trace Model', () => {
   it('should set the id, name and attributes if passed', () => {
diff --git a/test/modules/APM.spec.ts b/test/modules/APM.spec.ts
@@ -4,7 +4,8 @@ import { mocked } from 'ts-jest/utils';
 
 import Trace from '../../src/models/Trace';
 import * as APM from '../../src/modules/APM';
-import { NativeAPM, NativeInstabug } from '../../src/native';
+import { NativeAPM } from '../../src/native/NativeAPM';
+import { NativeInstabug } from '../../src/native/NativeInstabug';
 
 describe('APM Module', () => {
   it('should call the native method setEnabled', () => {
diff --git a/test/modules/BugReporting.spec.ts b/test/modules/BugReporting.spec.ts
@@ -1,7 +1,7 @@
 import { Platform } from 'react-native';
 
 import * as BugReporting from '../../src/modules/BugReporting';
-import { NativeBugReporting } from '../../src/native';
+import { NativeBugReporting } from '../../src/native/NativeBugReporting';
 import {
   ExtendedBugReportMode,
   FloatingButtonPosition,
diff --git a/test/modules/CrashReporting.spec.ts b/test/modules/CrashReporting.spec.ts
@@ -3,7 +3,7 @@ import '../mocks/mockInstabugUtils';
 import { Platform } from 'react-native';
 
 import * as CrashReporting from '../../src/modules/CrashReporting';
-import { NativeCrashReporting } from '../../src/native';
+import { NativeCrashReporting } from '../../src/native/NativeCrashReporting';
 
 describe('CrashReporting Module', () => {
   it('should call the native method setEnabled', () => {
diff --git a/test/modules/FeatureRequests.spec.ts b/test/modules/FeatureRequests.spec.ts
@@ -1,5 +1,5 @@
 import * as FeatureRequests from '../../src/modules/FeatureRequests';
-import { NativeFeatureRequests } from '../../src/native';
+import { NativeFeatureRequests } from '../../src/native/NativeFeatureRequests';
 import { ActionType } from '../../src/utils/Enums';
 
 describe('Feature Requests Module', () => {
diff --git a/test/modules/Instabug.spec.ts b/test/modules/Instabug.spec.ts
@@ -6,7 +6,7 @@ import waitForExpect from 'wait-for-expect';
 
 import Report from '../../src/models/Report';
 import * as Instabug from '../../src/modules/Instabug';
-import { NativeInstabug } from '../../src/native';
+import { NativeInstabug } from '../../src/native/NativeInstabug';
 import {
   ColorTheme,
   InvocationEvent,
diff --git a/test/modules/NetworkLogger.spec.ts b/test/modules/NetworkLogger.spec.ts
@@ -5,7 +5,8 @@ import { Platform } from 'react-native';
 import waitForExpect from 'wait-for-expect';
 
 import * as NetworkLogger from '../../src/modules/NetworkLogger';
-import { NativeAPM, NativeInstabug } from '../../src/native';
+import { NativeAPM } from '../../src/native/NativeAPM';
+import { NativeInstabug } from '../../src/native/NativeInstabug';
 import IBGEventEmitter from '../../src/utils/IBGEventEmitter';
 import IBGConstants from '../../src/utils/InstabugConstants';
 import Interceptor from '../../src/utils/XhrNetworkInterceptor';
diff --git a/test/modules/Replies.spec.ts b/test/modules/Replies.spec.ts
@@ -1,7 +1,7 @@
 import { Platform } from 'react-native';
 
 import * as Replies from '../../src/modules/Replies';
-import { NativeReplies } from '../../src/native';
+import { NativeReplies } from '../../src/native/NativeReplies';
 import IBGEventEmitter from '../../src/utils/IBGEventEmitter';
 import IBGConstants from '../../src/utils/InstabugConstants';
 
diff --git a/test/modules/Surveys.spec.ts b/test/modules/Surveys.spec.ts
@@ -1,7 +1,7 @@
 import { Platform } from 'react-native';
 
 import * as Surveys from '../../src/modules/Surveys';
-import { NativeSurveys } from '../../src/native';
+import { NativeSurveys } from '../../src/native/NativeSurveys';
 import IBGEventEmitter from '../../src/utils/IBGEventEmitter';
 import IBGConstants from '../../src/utils/InstabugConstants';
 
diff --git a/test/utils/InstabugUtils.spec.ts b/test/utils/InstabugUtils.spec.ts

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { NativeAPM } from '../native';`
	`1`	`+import { NativeAPM } from '../native/NativeAPM';`
`2`	`2`
`3`	`3`	`export default class Trace {`
`4`	`4`	`constructor(`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { NativeFeatureRequests } from '../native';`
	`1`	`+import { NativeFeatureRequests } from '../native/NativeFeatureRequests';`
`2`	`2`	`import { actionTypes } from '../utils/ArgsRegistry';`
`3`	`3`	`import type { ActionType } from '../utils/Enums';`
`4`	`4`