fix importing generic schema issue

Author: omermecitoglu

src/core/renderers/declaration.ts

@@ -1,5 +1,6 @@
 import type { OpenAPI } from "~/core/openapi";
 import { type DeclaredOperation, resolveDeclaredOperations } from "~/core/resolvers/declared-operation";
+import { resolveSchemas } from "~/core/resolvers/imported-schema";
 import getTemplate from "~/core/template";
 import declarationTemplate from "~/templates/declaration.hbs";
 
@@ -8,10 +9,10 @@ type DeclarationTemplate = {
   operations: DeclaredOperation[],
 };
 
-export default function generateDeclaration(importedSchemas: string[], paths: OpenAPI["paths"]) {
+export default function generateDeclaration(paths: OpenAPI["paths"]) {
   const template = getTemplate<DeclarationTemplate>(declarationTemplate);
   return template({
-    importedSchemas,
+    importedSchemas: resolveSchemas(paths),
     operations: resolveDeclaredOperations(paths),
   });
 }

src/core/resolvers/imported-schema.ts

@@ -10,10 +10,9 @@ function resolveRequestSchemas(requestBody: Operation["requestBody"]) {
 
 function resolveResponseSchemas(responses: Operation["responses"]) {
   return Object.values(responses).map(response => {
-    const resolvedSchemas = Object.values(response.content ?? {}).map(content => {
+    return Object.values(response.content ?? {}).map(content => {
       return simplifySchema(resolveSchema(content.schema));
-    });
-    return filterGenericSchemas(resolvedSchemas).flat();
+    }).flat();
   }).flat();
 }
 
@@ -22,7 +21,8 @@ export function resolveSchemas(paths: OpenAPI["paths"]) {
     ...resolveRequestSchemas(operation.requestBody),
     ...resolveResponseSchemas(operation.responses),
   ])).flat();
-  return Array.from(new Set(collection)).toSorted();
+  const uniqueCollection = Array.from(new Set(collection));
+  return filterGenericSchemas(uniqueCollection).toSorted();
 }
 
 function resolvePropDefinition(definition: SchemaDefinition) {
@@ -43,6 +43,6 @@ function resolvePropDefinition(definition: SchemaDefinition) {
 
 export function resolveSchemasFromProps(props: Record<string, SchemaDefinition>) {
   const collection = Object.values(props).map(resolvePropDefinition).flat();
-  collection.sort();
-  return Array.from(new Set(filterGenericSchemas(collection)));
+  const uniqueCollection = Array.from(new Set(collection));
+  return filterGenericSchemas(uniqueCollection).toSorted();
 }

src/index.ts

@@ -9,7 +9,7 @@ import generateDeclaration from "./core/renderers/declaration";
 import generateDocumentation from "./core/renderers/documentation";
 import generateInterface from "./core/renderers/interface";
 import generateSchema from "./core/renderers/schema";
-import { resolveSchemas, resolveSchemasFromProps } from "./core/resolvers/imported-schema";
+import { resolveSchemasFromProps } from "./core/resolvers/imported-schema";
 import resolveOperations from "./core/resolvers/operation";
 import resolveProperties from "./core/resolvers/property";
 import generateSwaggerJson from "./core/swagger";
@@ -38,13 +38,12 @@ import generateSwaggerJson from "./core/swagger";
   const serviceName = capitalize(appName.replace(/-/g, " "));
   const envName = `${appName.replace(/-/g, "_").toUpperCase()}_BASE_URL`;
 
-  const schemas = resolveSchemas(data.paths);
   const resolvedPaths = resolveOperations(data.paths);
 
   const content = generateInterface(envName, resolvedPaths);
   await createFile(content, "index.js", outputDir);
 
-  const declaration = generateDeclaration(schemas, data.paths);
+  const declaration = generateDeclaration(data.paths);
   await createFile(declaration, "index.d.ts", outputDir);
 
   const doc = generateDocumentation(serviceName, packageName, envName, data.paths);