refactor: keep existing type ownership

Author: rmi22186

src/configAPIClient.ts

@@ -1,6 +1,6 @@
-import { DataPlanConfig } from './publicSdkTypes';
-import {
+import type {
     BooleanStringLowerCase,
+    DataPlanConfig,
     DataPlanResult,
     SDKEventCustomFlags,
     SDKInitConfig,

src/identity-user-interfaces.ts

@@ -1,20 +1,11 @@
 import type {
     AllUserAttributes,
-    IdentityCallback,
-    IdentityResultBody,
     MPID,
     User,
 } from './publicSdkTypes';
-import { SDKIdentityTypeEnum } from './identity.interfaces';
+import type { SDKIdentityTypeEnum } from './identity.interfaces';
 import { MessageType } from './types';
-import { BaseEvent, SDKProduct } from './sdkRuntimeModels';
-
-export type {
-    IdentityCallback,
-    IdentityModifyResultBody,
-    IdentityResult,
-    IdentityResultBody,
-} from './publicSdkTypes';
+import type { BaseEvent, SDKProduct } from './sdkRuntimeModels';
 
 // Cart is Deprecated and private to mParticle user in @mparticle/web-sdk
 // but we need to expose it here for type safety in some of our tests
@@ -37,6 +28,45 @@ interface ICart {
     getCartProducts: () => SDKProduct[];
 }
 
+export interface IdentityResultBody {
+    context: string | null;
+    is_ephemeral: boolean;
+    is_logged_in: boolean;
+    matched_identities: Record<string, unknown>;
+    mpid?: MPID;
+}
+
+export interface IdentityModifyResultBody {
+    change_results?: {
+        identity_type: SDKIdentityTypeEnum;
+        modified_mpid: MPID;
+    };
+}
+
+export type IdentityHTTPCode =
+    | -1 // noHttpCoverage
+    | -2 // activeIdentityRequest
+    | -3 // activeSession
+    | -4 // validationIssue
+    | -5 // nativeIdentityRequest
+    | -6 // loggingDisabledOrMissingAPIKey
+    | 200
+    | 202
+    | 400
+    | 429;
+
+export interface IdentityResult {
+    httpCode: IdentityHTTPCode;
+    getPreviousUser(): User;
+    getUser(): User;
+    body: IdentityResultBody | IdentityModifyResultBody;
+}
+
+// https://go.mparticle.com/work/SQDSDKS-6460
+export interface IdentityCallback {
+    (result: IdentityResult): void;
+}
+
 // https://go.mparticle.com/work/SQDSDKS-5033
 // https://go.mparticle.com/work/SQDSDKS-6354
 export interface IMParticleUser extends User {

src/public-types.ts

@@ -46,16 +46,8 @@ export type {
     Cart,
     CCPAConsentState,
     ConsentState,
-    DataPlanConfig,
-    DataPlanResult,
-    Dictionary,
     GDPRConsentState,
     IdentityApiData,
-    IdentityCallback,
-    IdentityHTTPCode,
-    IdentityModifyResultBody,
-    IdentityResult,
-    IdentityResultBody,
     IdentifyRequest,
     Impression,
     LauncherOptions,
@@ -102,6 +94,8 @@ export type {
 export type {
     SDKInitConfig,
     BaseEvent,
+    DataPlanConfig,
+    DataPlanResult,
     LogLevelType,
     MParticleWebSDKInstance,
     MParticleWebSDKManager,
@@ -110,6 +104,11 @@ export type {
 
 // User & Identity
 export type {
+    IdentityCallback,
+    IdentityHTTPCode,
+    IdentityModifyResultBody,
+    IdentityResult,
+    IdentityResultBody,
     IMParticleUser,
     ISDKUserIdentity,
     ISDKUserAttributes,
@@ -159,4 +158,4 @@ export type {
 } from './consent';
 
 // Utilities
-export type { valueof } from './utils';
+export type { Dictionary, valueof } from './utils';

src/publicSdkTypes.ts

@@ -1,6 +1,7 @@
 import { Batch } from '@mparticle/event-models';
-
-export type Dictionary<V = any> = Record<string, V>;
+import type { IdentityCallback } from './identity-user-interfaces';
+import type { DataPlanConfig } from './sdkRuntimeModels';
+import type { Dictionary } from './utils';
 
 export type MPID = string;
 
@@ -30,44 +31,6 @@ export interface Logger {
     verbose?: (message: string) => void;
 }
 
-export interface DataPlanResult {
-    dtpn?: {
-        vers: DataPlanVersion;
-        blok: {
-            ev: boolean;
-            ea: boolean;
-            ua: boolean;
-            id: boolean;
-        };
-    };
-    error_message?: string;
-}
-
-export interface DataPlanVersion {
-    version?: number;
-    data_plan_id?: string;
-    last_modified_on?: string;
-    version_document?: Dictionary;
-}
-
-export interface DataPlanConfig {
-    planId?: string;
-    planVersion?: number;
-    document?: DataPlanResult;
-}
-
-export interface KitBlockerOptions {
-    dataPlanVersion: DataPlanVersion;
-    blockUserAttributes: boolean;
-    blockEventAttributes: boolean;
-    blockEvents: boolean;
-    blockUserIdentities: boolean;
-}
-
-export interface KitBlockerDataPlan {
-    document: DataPlanResult;
-}
-
 export type MPForwarder = Dictionary;
 
 export type OnUserAlias = (previousUser: User, newUser: User) => void;
@@ -223,44 +186,6 @@ export interface User {
     getUserAudiences?(callback?: IdentityCallback): void;
 }
 
-export interface IdentityResultBody {
-    context: string | null;
-    is_ephemeral: boolean;
-    is_logged_in: boolean;
-    matched_identities: Record<string, unknown>;
-    mpid?: MPID;
-}
-
-export interface IdentityModifyResultBody {
-    change_results?: {
-        identity_type: string;
-        modified_mpid: MPID;
-    };
-}
-
-export type IdentityHTTPCode =
-    | -1 // noHttpCoverage
-    | -2 // activeIdentityRequest
-    | -3 // activeSession
-    | -4 // validationIssue
-    | -5 // nativeIdentityRequest
-    | -6 // loggingDisabledOrMissingAPIKey
-    | 200
-    | 202
-    | 400
-    | 429;
-
-export interface IdentityResult {
-    httpCode: IdentityHTTPCode;
-    getPreviousUser(): User;
-    getUser(): User;
-    body: IdentityResultBody | IdentityModifyResultBody;
-}
-
-export interface IdentityCallback {
-    (result: IdentityResult): void;
-}
-
 export type AliasRequestScope = 'device' | 'mpid';
 
 export interface UserAliasRequest {

src/sdkRuntimeModels.ts

@@ -1,8 +1,5 @@
 import * as EventsApi from '@mparticle/event-models';
 import {
-    DataPlanConfig,
-    KitBlockerDataPlan,
-    KitBlockerOptions,
     MPConfiguration,
     MPID,
     SDKEventAttrs,
@@ -17,7 +14,7 @@ import {
 } from './store';
 import Validators from './validators';
 import { AttributeValue, Dictionary, Environment, valueof } from './utils';
-import { IKitConfigs } from './configAPIClient';
+import type { IKitConfigs } from './configAPIClient';
 import { SDKConsentApi, SDKConsentState } from './consent';
 import MPSideloadedKit from './sideloadedKit';
 import { ISessionManager } from './sessionManager';
@@ -55,13 +52,6 @@ import RoktManager, { IRoktLauncherOptions } from './roktManager';
 import { IConsoleLogger } from './logger';
 import { ErrorCodes, IErrorReportingService, ILoggingService } from './reporting/types';
 
-export type {
-    DataPlanConfig,
-    DataPlanResult,
-    KitBlockerDataPlan,
-    KitBlockerOptions,
-} from './publicSdkTypes';
-
 // Internal SDK custom flags are normalized before upload and may temporarily
 // contain arrays or other values supported by the legacy public API.
 export type SDKEventCustomFlags = Dictionary<any>;
@@ -373,6 +363,44 @@ export interface SDKInitConfig
     logger?: IConsoleLogger;
 }
 
+export interface DataPlanVersion {
+    version?: number;
+    data_plan_id?: string;
+    last_modified_on?: string;
+    version_document?: Dictionary;
+}
+
+export interface DataPlanConfig {
+    planId?: string;
+    planVersion?: number;
+    document?: DataPlanResult;
+}
+
+export interface KitBlockerOptions {
+    dataPlanVersion: DataPlanVersion;
+    blockUserAttributes: boolean;
+    blockEventAttributes: boolean;
+    blockEvents: boolean;
+    blockUserIdentities: boolean;
+}
+
+export interface KitBlockerDataPlan {
+    document: DataPlanResult;
+}
+
+export interface DataPlanResult {
+    dtpn?: {
+        vers: DataPlanVersion;
+        blok: {
+            ev: boolean;
+            ea: boolean;
+            ua: boolean;
+            id: boolean;
+        };
+    };
+    error_message?: string;
+}
+
 export interface SDKHelpersApi {
     canLog?(): boolean;
     createMainStorageName?(workspaceToken: string): string;

src/store.ts

@@ -1,6 +1,5 @@
 import { Batch, Context } from '@mparticle/event-models';
 import {
-    DataPlanConfig,
     IdentityApiData,
     MPID,
     SDKEventCustomFlags,
@@ -10,6 +9,7 @@ import {
 import { IKitConfigs } from './configAPIClient';
 import Constants from './constants';
 import {
+    DataPlanConfig,
     DataPlanResult,
     KitBlockerOptions,
     LogLevelType,