fixing contract test initializer parsing

Author: tanderson-ld

contract-tests/src/sdkClientEntity.ts

@@ -35,8 +35,8 @@ interface SdkConfigOptions {
     filter?: string;
   };
   dataSystem?: {
-    initializers?: SDKDataSystemDataSourceParams;
-    synchronizers?: SDKDataSystemDataSourceParams;
+    initializers?: SDKDataSystemInitializerParams[];
+    synchronizers?: SDKDataSystemSynchronizerParams;
     payloadFilter?: string;
   };
   events?: {
@@ -73,13 +73,7 @@ interface SdkConfigOptions {
   };
 }
 
-export interface SDKDataSystemParams {
-  initializers?: SDKDataSystemDataSourceParams;
-  synchronizers?: SDKDataSystemDataSourceParams;
-  payloadFilter?: string;
-}
-
-export interface SDKDataSystemDataSourceParams {
+export interface SDKDataSystemSynchronizerParams {
   primary?: {
     streaming?: SDKDataSourceStreamingParams;
     polling?: SDKDataSourcePollingParams;
@@ -90,6 +84,10 @@ export interface SDKDataSystemDataSourceParams {
   };
 }
 
+export interface SDKDataSystemInitializerParams {
+  polling?: SDKDataSourcePollingParams;
+}
+
 export interface SDKDataSourceStreamingParams {
   baseUri?: string;
   initialRetryDelayMs?: number;
@@ -224,9 +222,14 @@ export function makeSdkConfig(options: SdkConfigOptions, tag: string): LDOptions
   }
 
   if (options.dataSystem) {
-    const dataSourceStreamingOptions = options.dataSystem.synchronizers?.primary?.streaming ?? options.dataSystem.synchronizers?.secondary?.streaming;
-    const dataSourcePollingOptions = options.dataSystem.synchronizers?.primary?.polling ?? options.dataSystem.synchronizers?.secondary?.polling;
-    
+    const dataSourceStreamingOptions: SDKDataSourceStreamingParams | undefined =
+      options.dataSystem.synchronizers?.primary?.streaming ??
+      options.dataSystem.synchronizers?.secondary?.streaming;
+    const dataSourcePollingOptions: SDKDataSourcePollingParams | undefined =
+      options.dataSystem.initializers?.[0]?.polling ??
+      options.dataSystem.synchronizers?.primary?.polling ??
+      options.dataSystem.synchronizers?.secondary?.polling;
+
     if (dataSourceStreamingOptions) {
       cf.streamUri = dataSourceStreamingOptions.baseUri;
       cf.streamInitialReconnectDelay = maybeTime(dataSourceStreamingOptions.initialRetryDelayMs);
@@ -237,27 +240,31 @@ export function makeSdkConfig(options: SdkConfigOptions, tag: string): LDOptions
       cf.pollInterval = maybeTime(dataSourcePollingOptions.pollIntervalMs);
     }
 
-    let dataSourceOptions : DataSourceOptions | undefined;
+    let dataSourceOptions: DataSourceOptions | undefined;
     if (dataSourceStreamingOptions && dataSourcePollingOptions) {
       dataSourceOptions = {
         dataSourceOptionsType: 'standard',
-        ...(dataSourceStreamingOptions.initialRetryDelayMs != null && 
-          { streamInitialReconnectDelay: maybeTime(dataSourceStreamingOptions.initialRetryDelayMs) }),
-       ...(dataSourcePollingOptions.pollIntervalMs != null && 
-          { pollInterval: dataSourcePollingOptions.pollIntervalMs }),
-      }
+        ...(dataSourceStreamingOptions.initialRetryDelayMs != null && {
+          streamInitialReconnectDelay: maybeTime(dataSourceStreamingOptions.initialRetryDelayMs),
+        }),
+        ...(dataSourcePollingOptions.pollIntervalMs != null && {
+          pollInterval: dataSourcePollingOptions.pollIntervalMs,
+        }),
+      };
     } else if (dataSourceStreamingOptions) {
       dataSourceOptions = {
         dataSourceOptionsType: 'streamingOnly',
-        ...(dataSourceStreamingOptions.initialRetryDelayMs != null && 
-          { streamInitialReconnectDelay: maybeTime(dataSourceStreamingOptions.initialRetryDelayMs) }),
-      }
+        ...(dataSourceStreamingOptions.initialRetryDelayMs != null && {
+          streamInitialReconnectDelay: maybeTime(dataSourceStreamingOptions.initialRetryDelayMs),
+        }),
+      };
     } else if (dataSourcePollingOptions) {
       dataSourceOptions = {
         dataSourceOptionsType: 'pollingOnly',
-        ...(dataSourcePollingOptions.pollIntervalMs != null && 
-          { pollInterval: dataSourcePollingOptions.pollIntervalMs }),
-      }
+        ...(dataSourcePollingOptions.pollIntervalMs != null && {
+          pollInterval: dataSourcePollingOptions.pollIntervalMs,
+        }),
+      };
     } else {
       // No data source options were specified
       dataSourceOptions = undefined;
@@ -269,7 +276,7 @@ export function makeSdkConfig(options: SdkConfigOptions, tag: string): LDOptions
 
     cf.dataSystem = {
       dataSource: dataSourceOptions,
-    }
+    };
   }
 
   return cf;