fix(cli): namespacing no longer breaks when objects conflict across n…

…amespaces (#4673)
fern-api · Sep 17, 2024 · a97860e · a97860e
1 parent 9ddf483
commit a97860e
Show file tree

Hide file tree

Showing 119 changed files with 417,834 additions and 394,163 deletions.
diff --git a/packages/cli/cli/src/commands/generate-overrides/writeOverridesForWorkspaces.ts b/packages/cli/cli/src/commands/generate-overrides/writeOverridesForWorkspaces.ts
@@ -1,4 +1,5 @@
 import { dirname, join, RelativeFilePath } from "@fern-api/fs-utils";
+import { Schema } from "@fern-api/openapi-ir-sdk";
 import { getEndpointLocation } from "@fern-api/openapi-ir-to-fern";
 import { parse } from "@fern-api/openapi-parser";
 import { Project } from "@fern-api/project-loader";
@@ -100,15 +101,9 @@ async function writeDefinitionForOpenAPIWorkspace({
             ? (existingOverrides.path as Record<string, Record<string, unknown>>)
             : {};
         if (includeModels) {
-            for (const [schemaId, schema] of Object.entries(ir.schemas)) {
-                if (schemaId in schemas) {
-                    continue;
-                }
-                // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                const typeNameOverride: Record<string, any> = {};
-                typeNameOverride["x-fern-type-name"] =
-                    "nameOverride" in schema ? schema.nameOverride ?? schemaId : schemaId;
-                schemas[schemaId] = typeNameOverride;
+            writeModels(schemas, ir.groupedSchemas.rootSchemas);
+            for (const [_, namespacedSchemas] of Object.entries(ir.groupedSchemas.namespacedSchemas)) {
+                writeModels(schemas, namespacedSchemas);
             }
         }
         const components: Record<string, Record<string, unknown>> = { schemas };
@@ -119,3 +114,15 @@ async function writeDefinitionForOpenAPIWorkspace({
         );
     }
 }
+
+function writeModels(existingSchemas: Record<string, Record<string, unknown>>, schemas: Record<string, Schema>) {
+    for (const [schemaId, schema] of Object.entries(schemas)) {
+        if (schemaId in existingSchemas) {
+            continue;
+        }
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        const typeNameOverride: Record<string, any> = {};
+        typeNameOverride["x-fern-type-name"] = "nameOverride" in schema ? schema.nameOverride ?? schemaId : schemaId;
+        existingSchemas[schemaId] = typeNameOverride;
+    }
+}