Fix OpenAPI generation (#2664)

elastic · Jul 1, 2024 · ad93fc7 · ad93fc7
1 parent 3f5c846
commit ad93fc7
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 30 deletions.
diff --git a/compiler-rs/compiler-wasm-lib/pkg/compiler_wasm_lib_bg.wasm b/compiler-rs/compiler-wasm-lib/pkg/compiler_wasm_lib_bg.wasm
diff --git a/compiler/src/model/metamodel.ts b/compiler/src/model/metamodel.ts
@@ -209,7 +209,7 @@ export class Container extends VariantBase {
 
 export class Untagged extends VariantBase {
   kind: 'untagged'
-  untypedVariant: Inherits
+  untypedVariant: TypeName
 }
 
 /**
@@ -223,7 +223,7 @@ export class Inherits {
 export class Behavior {
   type: TypeName
   generics?: ValueOf[]
-  meta?: { [p: string]: string }
+  meta?: Record<string, string>
 }
 
 /**

diff --git a/compiler/src/model/utils.ts b/compiler/src/model/utils.ts
@@ -1129,10 +1129,8 @@ export function parseVariantsTag (jsDoc: JSDoc[]): model.Variants | undefined {
       kind: 'untagged',
       nonExhaustive: nonExhaustive,
       untypedVariant: {
-        type: {
-          namespace: fqn.slice(0, fqn.length - 1).join('.'),
-          name: fqn[fqn.length - 1]
-        }
+        namespace: fqn.slice(0, fqn.length - 1).join('.'),
+        name: fqn[fqn.length - 1]
       }
     }
   }

diff --git a/compiler/src/steps/validate-model.ts b/compiler/src/steps/validate-model.ts
@@ -617,9 +617,9 @@ export default async function validateModel (apiModel: model.Model, restSpec: Ma
         throw new Error(`Please contact the devtools team before adding new untagged variant ${fqn(parentName)}`)
       }
 
-      const untypedVariant = getTypeDef(variants.untypedVariant.type)
+      const untypedVariant = getTypeDef(variants.untypedVariant)
       if (untypedVariant == null) {
-        modelError(`Type ${fqn(variants.untypedVariant.type)} not found`)
+        modelError(`Type ${fqn(variants.untypedVariant)} not found`)
       }
 
       const items = flattenUnionMembers(valueOf)

diff --git a/output/schema/schema.json b/output/schema/schema.json
diff --git a/output/typescript/types.ts b/output/typescript/types.ts
diff --git a/typescript-generator/src/metamodel.ts b/typescript-generator/src/metamodel.ts
@@ -209,7 +209,7 @@ export class Container extends VariantBase {
 
 export class Untagged extends VariantBase {
   kind: 'untagged'
-  untypedVariant: Inherits
+  untypedVariant: TypeName
 }
 
 /**
@@ -223,7 +223,7 @@ export class Inherits {
 export class Behavior {
   type: TypeName
   generics?: ValueOf[]
-  meta?: { [p: string]: string }
+  meta?: Record<string, string>
 }
 
 /**