Address PR Comments

Author: alexs-mparticle

src/mp-instance.ts

@@ -126,11 +126,10 @@ export default function mParticleInstance(this: IMParticleWebSDKInstance, instan
     this._IntegrationCapture = new IntegrationCapture();
 
     // required for forwarders once they reference the mparticle instance
-    this.IdentityType = IdentityType as unknown as valueof<typeof IdentityType>;
-    // this.EventType = EventType as unknown as valueof<typeof EventType>;
+    this.IdentityType = IdentityType;
     this.EventType = EventType;
-    this.CommerceEventType = CommerceEventType as unknown as valueof<typeof CommerceEventType>;
-    this.PromotionType = PromotionActionType as unknown as valueof<typeof PromotionActionType>;
+    this.CommerceEventType = CommerceEventType;
+    this.PromotionType = PromotionActionType;
     this.ProductActionType = ProductActionType;
 
 

src/mparticle-instance-manager.ts

@@ -32,11 +32,10 @@ function mParticleInstanceManager(this: IMParticleInstanceManager) {
     // Only leaving this here in case any clients are trying to access mParticle.Store, to prevent from throwing
     this.Store = {} as IStore;
     this._instances = {} as Dictionary<IMParticleWebSDKInstance>;
-    this.IdentityType = IdentityType as unknown as valueof<typeof IdentityType>;
-    // this.EventType = EventType as unknown as valueof<typeof EventType>;
+    this.IdentityType = IdentityType;
     this.EventType = EventType;
-    this.CommerceEventType = CommerceEventType as unknown as valueof<typeof CommerceEventType>;
-    this.PromotionType = PromotionActionType as unknown as valueof<typeof PromotionActionType>;
+    this.CommerceEventType = CommerceEventType;
+    this.PromotionType = PromotionActionType;
     this.ProductActionType = ProductActionType;
 
     this.MPSideloadedKit = MPSideloadedKit;

src/sdkRuntimeModels.ts

@@ -162,11 +162,10 @@ export interface SDKProduct {
 // https://go.mparticle.com/work/SQDSDKS-6949
 export interface MParticleWebSDK {
     addForwarder(mockForwarder: MPForwarder): void;
-    // FIXME: Make these consistent
-    IdentityType: valueof<typeof IdentityType>;
-    CommerceEventType: valueof<typeof CommerceEventType>;
+    IdentityType: typeof IdentityType;
+    CommerceEventType: typeof CommerceEventType;
     EventType: typeof EventType;
-    PromotionType: valueof<typeof PromotionActionType>;
+    PromotionType: typeof PromotionActionType;
     ProductActionType: typeof ProductActionType;
     Identity: SDKIdentityApi;
     Logger: SDKLoggerApi;

test/src/tests-forwarders.ts

@@ -14,8 +14,6 @@ import { IMParticleInstanceManager, SDKEvent } from '../../src/sdkRuntimeModels'
 import { IMParticleUser, UserAttributes } from '../../src/identity-user-interfaces';
 import { IdentityType } from '../../src/types';
 import { IntegrationAttribute } from '../../src/store';
-import { IConsentRules } from '../../src/consent';
-import { UserIdentities } from '@mparticle/web-sdk';
 
 
 const {