merge duplicate child schemas into one (#1507)

orval-labs · Jul 7, 2024 · 6b9eaf9 · 6b9eaf9
1 parent 648fc6c
commit 6b9eaf9
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 19 deletions.
diff --git a/packages/core/src/generators/schema-definition.ts b/packages/core/src/generators/schema-definition.ts
@@ -102,6 +102,16 @@ export const generateSchemasDefinition = (
           }
         }
       } else {
+        resolvedValue.schemas = resolvedValue.schemas.filter((schema) => {
+          if (schema.name !== schemaName) {
+            return true;
+          }
+
+          output += `${schema.model}\n`;
+          imports = imports.concat(schema.imports);
+
+          return false;
+        });
         output += `export type ${schemaName} = ${resolvedValue.value};\n`;
       }
 

diff --git a/packages/core/src/getters/combine.ts b/packages/core/src/getters/combine.ts
@@ -157,36 +157,31 @@ export const combineSchemas = ({
 
   const isAllEnums = resolvedData.isEnum.every((v) => v);
 
-  let resolvedValue: ScalarValue | undefined;
-
-  if (schema.properties) {
-    resolvedValue = getScalar({ item: omit(schema, separator), name, context });
-  }
-
-  const value = combineValues({
-    resolvedData,
-    separator,
-    resolvedValue,
-    context,
-  });
-
   if (isAllEnums && name && items.length > 1) {
     const newEnum = `// eslint-disable-next-line @typescript-eslint/no-redeclare\nexport const ${pascal(
       name,
     )} = ${getCombineEnumValue(resolvedData)}`;
 
     return {
-      value: `typeof ${pascal(name)}[keyof typeof ${pascal(name)}] ${nullable}\n\n${newEnum}`,
+      value: `typeof ${pascal(name)}[keyof typeof ${pascal(name)}] ${nullable}`,
       imports: [
         {
           name: pascal(name),
         },
-        ...resolvedData.imports.map<GeneratorImport>((toImport) => ({
-          ...toImport,
-          values: true,
-        })),
       ],
-      schemas: [...resolvedData.schemas],
+      schemas: [
+        ...resolvedData.schemas,
+        {
+          imports: [
+            ...resolvedData.imports.map<GeneratorImport>((toImport) => ({
+              ...toImport,
+              values: true,
+            })),
+          ],
+          model: newEnum,
+          name: name,
+        },
+      ],
       isEnum: false,
       type: 'object' as SchemaType,
       isRef: false,
@@ -196,6 +191,19 @@ export const combineSchemas = ({
     };
   }
 
+  let resolvedValue: ScalarValue | undefined;
+
+  if (schema.properties) {
+    resolvedValue = getScalar({ item: omit(schema, separator), name, context });
+  }
+
+  const value = combineValues({
+    resolvedData,
+    separator,
+    resolvedValue,
+    context,
+  });
+
   return {
     value: value + nullable,
     imports: resolvedValue