fix: handle discriminators in experimental parser

hey-api · Nov 10, 2024 · ff3aa4a · ff3aa4a
1 parent 04c88dd
commit ff3aa4a
Show file tree

Hide file tree

Showing 66 changed files with 1,103 additions and 351 deletions.
diff --git a/.changeset/shiny-bears-double.md b/.changeset/shiny-bears-double.md
@@ -0,0 +1,5 @@
+---
+'@hey-api/openapi-ts': patch
+---
+
+fix: handle discriminators in experimental parser
diff --git a/packages/openapi-ts/src/index.ts b/packages/openapi-ts/src/index.ts
@@ -283,7 +283,7 @@ const getSpec = async ({ config }: { config: Config }) => {
     const absolutePathOrUrl = existsSync(config.input.path)
       ? path.resolve(config.input.path)
       : config.input.path;
-    spec = await $RefParser.bundle(absolutePathOrUrl, absolutePathOrUrl, {});
+    spec = await $RefParser.bundle(absolutePathOrUrl);
   }
 
   return spec;

diff --git a/packages/openapi-ts/src/ir/context.ts b/packages/openapi-ts/src/ir/context.ts
@@ -21,10 +21,23 @@ interface ContextFile {
 }
 
 export class IRContext<Spec extends Record<string, any> = any> {
+  /**
+   * Configuration for parsing and generating the output. This
+   * is a mix of user-provided and default values.
+   */
   public config: Config;
+  /**
+   * A map of files that will be generated from `spec`.
+   */
   public files: Files;
+  /**
+   * Intermediate representation model obtained from `spec`.
+   */
   public ir: IR;
   public parserConfig: ParserConfig;
+  /**
+   * Resolved specification from `input`.
+   */
   public spec: Spec;
 
   constructor({
@@ -62,6 +75,9 @@ export class IRContext<Spec extends Record<string, any> = any> {
     return createdFile;
   }
 
+  /**
+   * Returns a specific file by ID from `files`.
+   */
   public file({ id }: Pick<ContextFile, 'id'>): TypeScriptFile | undefined {
     return this.files[id];
   }
@@ -77,6 +93,9 @@ export class IRContext<Spec extends Record<string, any> = any> {
     });
   }
 
+  /**
+   * Returns a resolved reference from `spec`.
+   */
   public resolveRef<T>($ref: string) {
     return resolveRef<T>({
       $ref,

diff --git a/packages/openapi-ts/src/ir/schema.ts b/packages/openapi-ts/src/ir/schema.ts
@@ -17,7 +17,13 @@ export const deduplicateSchema = <T extends IRSchemaObject>({
 
   for (const item of schema.items) {
     // skip nested schemas for now, handle if necessary
+    if (!item.type && item.items) {
+      uniqueItems.push(item);
+      continue;
+    }
+
     if (
+      // no `type` might still include `$ref` or `const`
       !item.type ||
       item.type === 'boolean' ||
       item.type === 'null' ||

diff --git a/packages/openapi-ts/src/openApi/3.0.x/parser/index.ts b/packages/openapi-ts/src/openApi/3.0.x/parser/index.ts
@@ -238,8 +238,8 @@ export const parseV3_0_X = (context: IRContext<OpenApiV3_0_X>) => {
       const schema = context.spec.components.schemas[name];
 
       parseSchema({
+        $ref,
         context,
-        name,
         schema,
       });
     }