DXOC-828 Updated codegen (#220)

amplitude · May 18, 2023 · ba07cce · ba07cce
1 parent ab202d6
commit ba07cce
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/browser/typescript/v2/react-app/src/ampli/index.ts b/browser/typescript/v2/react-app/src/ampli/index.ts
@@ -547,7 +547,8 @@ export class Ampli {
       this.amplitude = options.client.instance;
     } else if (apiKey) {
       this.amplitude = amplitude.createInstance();
-      return this.amplitude.init(apiKey, undefined, { ...DefaultConfiguration, ...options.client?.configuration });
+      const configuration = (options.client && 'configuration' in options.client) ? options.client.configuration : {};
+      return this.amplitude.init(apiKey, undefined, { ...DefaultConfiguration, ...configuration });
     } else {
       console.error("ERROR: ampli.load() requires 'environment', 'client.apiKey', or 'client.instance'");
     }

diff --git a/node/typescript/v2/AmpliApp/src/ampli/index.ts b/node/typescript/v2/AmpliApp/src/ampli/index.ts
@@ -554,7 +554,8 @@ export class Ampli {
       this.amplitude = options.client.instance;
     } else if (apiKey) {
       this.amplitude = amplitude.createInstance();
-      return this.amplitude.init(apiKey, { ...DefaultConfiguration, ...options.client?.configuration });
+      const configuration = (options.client && 'configuration' in options.client) ? options.client.configuration : {};
+      return this.amplitude.init(apiKey, { ...DefaultConfiguration, ...configuration });
     } else {
       console.error("ERROR: ampli.load() requires 'environment', 'client.apiKey', or 'client.instance'");
     }

diff --git a/react-native/typescript/v2/AmpliApp/src/App.tsx b/react-native/typescript/v2/AmpliApp/src/App.tsx
@@ -171,6 +171,7 @@ function App() {
 
             ampli.eventWithArrayTypes({
               requiredBooleanArray: [true, false],
+              requiredEnumArray: ['enum1'],
               requiredNumberArray: [1.2, 3, 4.56],
               requiredObjectArray: [{'key-1': 'value-1'}, {'key-2': 'value-2'}],
               requiredStringArray: ['string-1', 'string-2', 'string-3'],

diff --git a/react-native/typescript/v2/AmpliApp/src/ampli/index.ts b/react-native/typescript/v2/AmpliApp/src/ampli/index.ts
@@ -555,7 +555,8 @@ export class Ampli {
       this.amplitude = options.client.instance;
     } else if (apiKey) {
       this.amplitude = amplitude.createInstance();
-      return this.amplitude.init(apiKey, undefined, { ...DefaultConfiguration, ...options.client?.configuration });
+      const configuration = (options.client && 'configuration' in options.client) ? options.client.configuration : {};
+      return this.amplitude.init(apiKey, undefined, { ...DefaultConfiguration, ...configuration });
     } else {
       console.error("ERROR: ampli.load() requires 'environment', 'client.apiKey', or 'client.instance'");
     }