Fix issue parsing polymorphic schemas

Azure · Apr 24, 2024 · de67233 · de67233
1 parent a5f0805
commit de67233
Show file tree

Hide file tree

Showing 9 changed files with 29,207 additions and 1 deletion.
diff --git a/src/autorest.bicep/src/schema-generator.ts b/src/autorest.bicep/src/schema-generator.ts
@@ -324,14 +324,32 @@ export function generateSchema(host: AutorestExtensionHost, definition: Provider
       ancestorsToExclude.add(putSchema);
     }
 
+    const discriminatorName = putSchema?.discriminator?.property.serializedName;
+
     const oneOf: JSONSchema4[] = [];
     for (const { putSubType } of getDiscriminatedSubTypes(putSchema)) {
       const childSchema = parseObjectType(putSubType, ancestorsToExclude);
+
+      if (!putSubType.discriminatorValue) {
+        continue;
+      }
+
       if (childSchema.type !== 'object') {
         logWarning(`Found unexpected element of discriminated type '${childSchema.type}'`);
         continue;
       }
 
+      if (discriminatorName) {
+        childSchema.properties ??= {};
+        childSchema.properties[discriminatorName] = {
+          type: 'string',
+          enum: [putSubType.discriminatorValue],
+        };
+
+        childSchema.required = Array.isArray(childSchema.required) ? childSchema.required : [];
+        childSchema.required.push(discriminatorName);
+      }
+
       oneOf.push(childSchema);
     }