fix: use optional property rather than change existing property

astahmer · Feb 25, 2024 · 989320e · 989320e
1 parent 04dd1b5
commit 989320e
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 11 deletions.
diff --git a/lib/src/CodeMeta.ts b/lib/src/CodeMeta.ts
@@ -7,7 +7,8 @@ import { getSchemaComplexity } from "./schema-complexity";
 export type ConversionTypeContext = {
     resolver: DocumentResolver;
     zodSchemaByName: Record<string, string>;
-    schemaByName: Record<string, string[]>;
+    schemaByName: Record<string, string>;
+    schemasByName?: Record<string, string[]>;
 };
 
 export type CodeMetaData = {

diff --git a/lib/src/getZodiosEndpointDefinitionList.test.ts b/lib/src/getZodiosEndpointDefinitionList.test.ts
@@ -439,9 +439,7 @@ test("getZodiosEndpointDefinitionList /pet without schema ref", () => {
               "resolveSchemaName": [Function],
           },
           "schemaByName": {
-              "Pet.and(Reason)": [
-                  "updatePet_Body",
-              ],
+              "Pet.and(Reason)": "updatePet_Body",
           },
           "zodSchemaByName": {
               "Category": "z.object({ id: z.number().int(), name: z.string() }).partial().passthrough()",

diff --git a/lib/src/getZodiosEndpointDefinitionList.ts b/lib/src/getZodiosEndpointDefinitionList.ts
@@ -65,6 +65,10 @@ export const getZodiosEndpointDefinitionList = (doc: OpenAPIObject, options?: Te
         .otherwise((fn) => fn);
 
     const ctx: ConversionTypeContext = { resolver, zodSchemaByName: {}, schemaByName: {} };
+    if (options?.exportAllNamedSchemas) {
+        ctx.schemasByName = {};
+    }
+
     const complexityThreshold = options?.complexityThreshold ?? 4;
     const getZodVarName = (input: CodeMeta, fallbackName?: string) => {
         const result = input.toString();
@@ -84,7 +88,7 @@ export const getZodiosEndpointDefinitionList = (doc: OpenAPIObject, options?: Te
 
             // if schema is already assigned to a variable, re-use that variable name
             if (!options?.exportAllNamedSchemas && ctx.schemaByName[result]) {
-                return ctx.schemaByName[result]![0]!;
+                return ctx.schemaByName[result]!;
             }
 
             // result is complex and would benefit from being re-used
@@ -95,7 +99,7 @@ export const getZodiosEndpointDefinitionList = (doc: OpenAPIObject, options?: Te
             let isVarNameAlreadyUsed = false;
             while ((isVarNameAlreadyUsed = Boolean(ctx.zodSchemaByName[formatedName]))) {
                 if (isVarNameAlreadyUsed) {
-                    if (options?.exportAllNamedSchemas && ctx.schemaByName[result]?.includes(formatedName)) {
+                    if (options?.exportAllNamedSchemas && ctx.schemasByName?.[result]?.includes(formatedName)) {
                         return formatedName;
                     } else if (ctx.zodSchemaByName[formatedName] === safeName) {
                         return formatedName;
@@ -107,11 +111,10 @@ export const getZodiosEndpointDefinitionList = (doc: OpenAPIObject, options?: Te
             }
 
             ctx.zodSchemaByName[formatedName] = result;
+            ctx.schemaByName[result] = formatedName;
 
-            if (options?.exportAllNamedSchemas) {
-                ctx.schemaByName[result] = (ctx.schemaByName[result] ?? []).concat(formatedName);
-            } else {
-                ctx.schemaByName[result] = [formatedName];
+            if (options?.exportAllNamedSchemas && ctx.schemasByName) {
+                ctx.schemasByName[result] = (ctx.schemasByName[result] ?? []).concat(formatedName);
             }
 
             return formatedName;
@@ -315,7 +318,11 @@ export const getZodiosEndpointDefinitionList = (doc: OpenAPIObject, options?: Te
                 }
 
                 if (endpointDefinition.responses !== undefined) {
-                    endpointDefinition.responses.push({ statusCode, schema: schemaString ?? voidSchema, description: responseItem.description });
+                    endpointDefinition.responses.push({
+                        statusCode,
+                        schema: schemaString ?? voidSchema,
+                        description: responseItem.description,
+                    });
                 }
 
                 if (schemaString) {