fix: dependency graph

Author: mnahkies

packages/openapi-code-generator/src/core/dependency-graph.spec.ts

@@ -41,6 +41,11 @@ describe.each(testVersions)("%s - core/dependency-graph", (version) => {
       graph.order.indexOf("s_AOrdering"),
     )
 
+    // check record values schemas are handled correctly.
+    expect(graph.order.indexOf("s_NamedNullableStringEnum")).toBeLessThan(
+      graph.order.indexOf("s_AdditionalPropertiesSchema"),
+    )
+
     expect(graph.order.indexOf("s_Recursive")).toBe(-1)
 
     expect(graph.circular).toStrictEqual(new Set(["s_Recursive"]))

packages/openapi-code-generator/src/core/dependency-graph.ts

@@ -32,14 +32,15 @@ const getAllSourcesFromSchema = (it: IRModel) => {
       allSources.push(...it.anyOf)
     }
 
-    if (
-      it.additionalProperties &&
-      typeof it.additionalProperties !== "boolean"
-    ) {
-      allSources.push(it.additionalProperties)
+    if (it.additionalProperties) {
+      allSources.push(it.additionalProperties.key)
+      allSources.push(it.additionalProperties.value)
     }
   } else if (it.type === "array") {
     allSources.push(it.items)
+  } else if (it.type === "record") {
+    allSources.push(it.key)
+    allSources.push(it.value)
   }
 
   return allSources

packages/openapi-code-generator/src/typescript/common/schema-builders/joi-schema-builder.spec.ts

@@ -370,18 +370,18 @@ describe.each(
       expect(schemas).toMatchInlineSnapshot(`
           "import joi from "joi"
 
-          export const s_AdditionalPropertiesSchema = joi
-            .object()
-            .pattern(joi.any(), s_NamedNullableStringEnum.required())
-            .required()
-            .id("s_AdditionalPropertiesSchema")
-
           export const s_NamedNullableStringEnum = joi
             .string()
             .valid("", "one", "two", "three")
             .allow(null)
             .required()
-            .id("s_NamedNullableStringEnum")"
+            .id("s_NamedNullableStringEnum")
+
+          export const s_AdditionalPropertiesSchema = joi
+            .object()
+            .pattern(joi.any(), s_NamedNullableStringEnum.required())
+            .required()
+            .id("s_AdditionalPropertiesSchema")"
         `)
     })
 

packages/openapi-code-generator/src/typescript/common/schema-builders/zod-v3-schema-builder.spec.ts

@@ -295,11 +295,11 @@ describe.each(
       expect(schemas).toMatchInlineSnapshot(`
           "import { z } from "zod/v3"
 
-          export const s_AdditionalPropertiesSchema = z.record(s_NamedNullableStringEnum)
-
           export const s_NamedNullableStringEnum = z
             .enum(["", "one", "two", "three"])
-            .nullable()"
+            .nullable()
+
+          export const s_AdditionalPropertiesSchema = z.record(s_NamedNullableStringEnum)"
         `)
     })
 
@@ -1477,7 +1477,7 @@ describe.each(
         },
         config,
       )
-      expect(code).toMatchInlineSnapshot(`"const x = z.object({})"`)
+      expect(code).toMatchInlineSnapshot('"const x = z.object({})"')
       await expect(execute({any: "object"})).resolves.toEqual({})
       await expect(execute("some string")).rejects.toThrow(
         "Expected object, received string",
@@ -1575,7 +1575,7 @@ describe.each(
         },
         config,
       )
-      expect(code).toMatchInlineSnapshot(`"const x = z.object({})"`)
+      expect(code).toMatchInlineSnapshot('"const x = z.object({})"')
       await expect(execute({any: "object"})).resolves.toEqual({})
       await expect(execute("some string")).rejects.toThrow(
         "Expected object, received string",

packages/openapi-code-generator/src/typescript/common/schema-builders/zod-v4-schema-builder.spec.ts

@@ -296,14 +296,14 @@ describe.each(
       expect(schemas).toMatchInlineSnapshot(`
           "import { z } from "zod/v4"
 
+          export const s_NamedNullableStringEnum = z
+            .enum(["", "one", "two", "three"])
+            .nullable()
+
           export const s_AdditionalPropertiesSchema = z.record(
             z.string(),
             s_NamedNullableStringEnum,
-          )
-
-          export const s_NamedNullableStringEnum = z
-            .enum(["", "one", "two", "three"])
-            .nullable()"
+          )"
         `)
     })
 
@@ -1502,7 +1502,7 @@ describe.each(
         },
         config,
       )
-      expect(code).toMatchInlineSnapshot(`"const x = z.object({})"`)
+      expect(code).toMatchInlineSnapshot('"const x = z.object({})"')
       await expect(execute({any: "object"})).resolves.toEqual({})
       await expect(execute("some string")).rejects.toThrow(
         "Invalid input: expected object, received string",
@@ -1602,7 +1602,7 @@ describe.each(
         },
         config,
       )
-      expect(code).toMatchInlineSnapshot(`"const x = z.object({})"`)
+      expect(code).toMatchInlineSnapshot('"const x = z.object({})"')
       await expect(execute({any: "object"})).resolves.toEqual({})
       await expect(execute("some string")).rejects.toThrow(
         "Invalid input: expected object, received string",