Address PR Comments

Author: alexs-mparticle

src/mp-instance.ts

@@ -42,7 +42,7 @@ import { removeExpiredIdentityCacheDates } from './identity-utils';
 import IntegrationCapture from './integrationCapture';
 import { IPreInit, processReadyQueue } from './pre-init-utils';
 import { BaseEvent, MParticleWebSDK, SDKHelpersApi,  } from './sdkRuntimeModels';
-import { Callback, SDKEventAttrs } from '@mparticle/web-sdk';
+import { Callback, Dictionary, SDKEventAttrs } from '@mparticle/web-sdk';
 import { IIdentity } from './identity.interfaces';
 import { IEvents } from './events.interfaces';
 import { IECommerce } from './ecommerce.interfaces';
@@ -61,7 +61,7 @@ export interface IErrorLogMessageMinified {
     t?: string;
 }
 
-export type IntegrationDelays = { [key: number]: boolean };
+export type IntegrationDelays = Dictionary<boolean>;
 
 // https://go.mparticle.com/work/SQDSDKS-6949
 export interface IMParticleWebSDKInstance extends MParticleWebSDK {
@@ -73,7 +73,7 @@ export interface IMParticleWebSDKInstance extends MParticleWebSDK {
     _Consent: IConsent;
     _Ecommerce: IECommerce;
     _Events: IEvents;
-    _Forwarders: any;
+    _Forwarders: any; // https://go.mparticle.com/work/SQDSDKS-5767
     _ForwardingStatsUploader: ForwardingStatsUploader;
     _Helpers: SDKHelpersApi;
     _Identity: IIdentity;
@@ -630,7 +630,7 @@ export default function mParticleInstance(this: IMParticleWebSDKInstance, instan
             {
                 messageType: MessageType.PageView,
                 name: eventName,
-                data: attrs as { [key: string]: string },
+                data: attrs as SDKEventAttrs,
                 eventType: EventType.Unknown,
                 customFlags: customFlags,
             },

src/sdkRuntimeModels.ts

@@ -8,7 +8,7 @@ import {
     SDKEventAttrs,
     Callback,
 } from '@mparticle/web-sdk';
-import { IntegrationAttribute, IStore, WrapperSDKTypes } from './store';
+import { IntegrationAttribute, IntegrationAttributes, IStore, WrapperSDKTypes } from './store';
 import Validators from './validators';
 import { Dictionary, valueof } from './utils';
 import { IKitConfigs } from './configAPIClient';
@@ -69,7 +69,7 @@ export interface SDKEvent {
     AppName?: string;
     Package?: string;
     ConsentState?: SDKConsentState;
-    IntegrationAttributes?: { [key: string]: { [key: string]: string } };
+    IntegrationAttributes?: IntegrationAttributes;
     ProductAction?: SDKProductAction;
     PromotionAction?: SDKPromotionAction;
     ProductImpressions?: SDKProductImpression[];
@@ -205,15 +205,20 @@ export interface MParticleWebSDK {
     setOptOut(isOptingOut: boolean): void;
     eCommerce: SDKECommerceAPI;
 
-    // QUESTION: Is this still used?
-    // logLevel: string;
+    isInitialized(): boolean;
+    
+    ready(f: Function): void;
+    reset(instance: IMParticleWebSDKInstance): void;
+    setAppName(name: string): void;
+    setAppVersion(version: string): void;
+    setOptOut(isOptingOut: boolean): void;
+    startTrackingLocation(callback?: Callback): void;
+    stopTrackingLocation(): void;
 
     ProductActionType: valueof<typeof ProductActionType>;
     generateHash(value: string): string;
-
-    // QUESTION: Should integration ID be a number or a string?
-    setIntegrationAttribute(integrationId: number, attrs: IntegrationAttribute): void;
-    getIntegrationAttributes(integrationId: number): IntegrationAttribute;
+    setIntegrationAttribute(integrationModuleId: number, attrs: IntegrationAttribute): void;
+    getIntegrationAttributes(integrationModuleId: number): IntegrationAttribute;
 }
 
 // https://go.mparticle.com/work/SQDSDKS-4805
@@ -240,17 +245,8 @@ export interface IMParticleInstanceManager extends MParticleWebSDK {
     getEnvironment(): valueof<typeof Constants.Environment>;
     getInstance(instanceName?: string): IMParticleWebSDKInstance;
     getVersion(): string;
-    isInitialized(): boolean;
-    
-    ready(f: Function): void;
-    reset(instance: IMParticleWebSDKInstance): void;
-    setAppName(name: string): void;
-    setAppVersion(version: string): void;
-    setOptOut(isOptingOut: boolean): void;
-    startTrackingLocation(callback?: Callback): void;
-    stopTrackingLocation(): void;
 
-    // @deprecated
+    // https://go.mparticle.com/work/SQDSDKS-7060
     sessionManager: Pick<ISessionManager, 'getSession'>; 
 }
 

src/store.ts

@@ -121,7 +121,12 @@ function createSDKConfig(config: SDKInitConfig): SDKConfig {
 //       to TypeScript
 export type ServerSettings = Dictionary;
 export type SessionAttributes = Dictionary;
+
+// FIXME: DefinitelyTyped Batch definition defines this as a string but
+// in some of our kits, we pass this in as a number
+// export type IntegrationAttribute = Dictionary<string | number>;
 export type IntegrationAttribute = Dictionary<string>;
+
 export type IntegrationAttributes = Dictionary<IntegrationAttribute>;
 
 export type WrapperSDKTypes = 'flutter' | 'none';