fix

Author: lucy66hw

tools/proto-convert/src/SchemaModifier.ts

@@ -33,7 +33,6 @@ export class SchemaModifier {
                 this.handleOneOfConst(schema, schemaName)
                 this.collapseOrMergeOneOfArray(schema)
                 this.collapseOneOfObjectPropContainsTitleSchema(schema)
-                // Mark oneOf extensions (x-oneof on properties, x-oneof-constraint on schema)
                 this.markOneOfExtensions(schema, schemaName);
             },
         });
@@ -439,33 +438,6 @@ export class SchemaModifier {
         this.logger.info(`Converted additionalProperties to named property '${propertyName}' with type: object`);
     }
 
-    /**
-     * Marks schemas and properties with oneOf extensions.
-     * Adds x-oneof to properties when schema has minProperties=1 and maxProperties=1.
-     * Adds x-oneof-constraint to top-level schemas that contain such patterns.
-     **/
-    markOneOfExtensions(schema: OpenAPIV3.SchemaObject, schemaName?: string): void {
-        // Check if this schema or nested items have the oneOf pattern
-        const hasDirectPattern = schema.minProperties === 1 && schema.maxProperties === 1;
-        const hasNestedPattern = this.hasNestedOneOfPattern(schema);
-
-        if (!hasDirectPattern && !hasNestedPattern) {
-            return;
-        }
-
-        // Add x-oneof to properties of this schema if it has the pattern
-        if (hasDirectPattern && schema.properties) {
-            for (const propName in schema.properties) {
-                const prop = schema.properties[propName] as any;
-                if (prop && typeof prop === 'object') {
-                    prop['x-oneof'] = true;
-                }
-            }
-            this.logger.info(`Added x-oneof to properties with minProperties=1 and maxProperties=1`);
-        }
-
-        // Add x-oneof-constraint to top-level schemas (not nested in allOf/anyOf/oneOf)
-        if (schemaName && !['allOf', 'anyOf', 'oneOf'].includes(schemaName)) {
     /**
      * Removes the array wrapper if the schema is an array of maps (additionalProperties).
      * Converts array of objects with only additionalProperties into just the additionalProperties schema.
@@ -504,8 +476,33 @@ export class SchemaModifier {
         }
     }
 
-    markTopLevelOneOfConstraint(schema: OpenAPIV3.SchemaObject): void {
-        if (schema.minProperties === 1 && schema.maxProperties === 1) {
+    /**
+     * Marks schemas and properties with oneOf extensions.
+     * Adds x-oneof to properties when schema has minProperties=1 and maxProperties=1.
+     * Adds x-oneof-constraint to top-level schemas that contain such patterns.
+     **/
+    markOneOfExtensions(schema: OpenAPIV3.SchemaObject, schemaName?: string): void {
+        // Check if this schema or nested items have the oneOf pattern
+        const hasDirectPattern = schema.minProperties === 1 && schema.maxProperties === 1;
+        const hasNestedPattern = this.hasNestedOneOfPattern(schema);
+
+        if (!hasDirectPattern && !hasNestedPattern) {
+            return;
+        }
+
+        // Add x-oneof to properties of this schema if it has the pattern
+        if (hasDirectPattern && schema.properties) {
+            for (const propName in schema.properties) {
+                const prop = schema.properties[propName] as any;
+                if (prop && typeof prop === 'object') {
+                    prop['x-oneof'] = true;
+                }
+            }
+            this.logger.info(`Added x-oneof to properties with minProperties=1 and maxProperties=1`);
+        }
+
+        // Add x-oneof-constraint to top-level schemas (not nested in allOf/anyOf/oneOf)
+        if (schemaName && !['allOf', 'anyOf', 'oneOf'].includes(schemaName)) {
             (schema as any)['x-oneof-constraint'] = true;
             this.logger.info(`Marked schema with x-oneof-constraint`);
         }