fix: add nested prop for array type any and enum for union (#110)

* fix: add nested prop for array type any and enum for union * fix: refactor
rudderlabs · Jan 10, 2025 · 55c22c1 · 55c22c1
1 parent dfa0942
commit 55c22c1
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 6 deletions.
diff --git a/src/generators/android/android.ts b/src/generators/android/android.ts
@@ -111,7 +111,7 @@ export const android: Generator<
   },
   generateUnion: async (client, schema, _, parentPath) => {
     // TODO: support unions
-    return defaultPropertyContext(client, schema, 'Object', parentPath);
+    return defaultPropertyContext(client, schema, 'Object', parentPath, !!schema.enum);
   },
   generateTrackCall: async (_client, schema, functionName, propertiesObject) => {
     const { properties } = getPropertiesSchema(schema);

diff --git a/src/generators/ast.ts b/src/generators/ast.ts
@@ -208,6 +208,14 @@ function parseTypeSpecificFields(raw: JSONSchema7, type: Type): TypeSpecificFiel
 
       if (schemas.length === 1) {
         const schema = schemas[0];
+
+        if (
+          schema.properties &&
+          Object.keys(schema.properties).length > 0 &&
+          schema.type === undefined
+        ) {
+          schema.type = ['array', 'object'];
+        }
         fields.items = parseTypeSpecificFields(schema, getType(schema));
       } else if (schemas.length > 1) {
         fields.items = {

diff --git a/src/generators/gen.ts b/src/generators/gen.ts
@@ -6,6 +6,7 @@ import {
   Type,
   PrimitiveTypeSchema,
   getTraitsSchema,
+  UnionTypeSchema,
 } from './ast.js';
 import { javascript } from './javascript/index.js';
 import { objc } from './objc/index.js';
@@ -162,7 +163,7 @@ export declare type Generator<
   ) => Promise<{ property: P; object?: O }>;
   generateUnion: (
     client: GeneratorClient,
-    schema: Schema,
+    schema: UnionTypeSchema,
     types: (P & BasePropertyContext)[],
     parentPath: string,
   ) => Promise<P>;

diff --git a/src/generators/javascript/javascript.ts b/src/generators/javascript/javascript.ts
@@ -151,10 +151,14 @@ export const javascript: Generator<
     }
   },
   generateUnion: async (client, schema, types) =>
-    conditionallyNullable(schema, {
-      name: client.namer.escapeString(schema.name),
-      type: types.map((t) => t.type).join(' | '),
-    }),
+    conditionallyNullable(
+      schema,
+      {
+        name: client.namer.escapeString(schema.name),
+        type: types.map((t) => t.type).join(' | '),
+      },
+      !!schema.enum,
+    ),
   generateTrackCall: async (client, _schema, functionName, propertiesObject) => ({
     functionName: functionName,
     propertiesType: propertiesObject.type,