handle minProperties = 1 and maxProperties = 1

Author: lucy66hw

.github/workflows/convert-proto.yml

@@ -10,7 +10,7 @@ on:
 jobs:
   auto-proto-convert:
     runs-on: ubuntu-latest
-    if: github.repository == 'opensearch-project/opensearch-protobufs'
+    #if: github.repository == 'opensearch-project/opensearch-protobufs'
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v4
@@ -34,11 +34,11 @@ jobs:
       - name: Download Release Assets
         uses: robinraju/release-downloader@v1
         with:
-          repository: 'opensearch-project/opensearch-api-specification'
-          latest: true
-          fileName: 'opensearch-openapi.yaml'
-          tag: 'main-latest'
-          preRelease: true
+         repository: 'opensearch-project/opensearch-api-specification'
+         latest: true
+         fileName: 'opensearch-openapi.yaml'
+         tag: 'main-latest'
+         preRelease: true
 
       - name: Get Latest Commit ID
         id: get_commit
@@ -126,7 +126,7 @@ jobs:
 
       - name: Reformat proto files
         run: |
-          buf format -w protos/generated
+         buf format -w protos/generated
 
       - name: Configure Git User
         run: |

package-lock.json

@@ -58,6 +58,7 @@
   "devDependencies": {
     "@types/jest": "^29.5.14",
     "@types/lodash.isequal": "^4.5.8",
+    "@types/semver": "^7.7.1",
     "jest": "^29.7.0",
     "ts-jest": "^29.3.0",
     "typescript": "^5.8.2"

package.json

@@ -1,7 +1,7 @@
 import type {OpenAPIV3} from "openapi-types";
 import {traverse} from './utils/OpenApiTraverser';
 import isEqual from 'lodash.isequal';
-import {compressMultipleUnderscores, isPrimitiveType, resolveObj, isReferenceObject, isEmptyObjectSchema} from './utils/helper';
+import {compressMultipleUnderscores, isPrimitiveType, resolveObj, isReferenceObject, isEmptyObjectSchema, is_simple_ref} from './utils/helper';
 import Logger from "./utils/logger";
 
 
@@ -33,7 +33,6 @@ export class SchemaModifier {
                 this.handleOneOfConst(schema, schemaName)
                 this.collapseOrMergeOneOfArray(schema)
                 this.collapseOneOfObjectPropContainsTitleSchema(schema)
-                this.removeArrayOfMapWrapper(schema)
             },
         });
         const visit = new Set();
@@ -47,6 +46,7 @@ export class SchemaModifier {
                 if (!schema || isReferenceObject(schema)) return;
                 this.simplifySingleMapSchema(schema, visit)
                 this.handleAdditionalPropertiesUndefined(schema)
+                this.markOneOfExtensions(schema);
             },
         });
         return this.root
@@ -475,4 +475,85 @@ export class SchemaModifier {
             }
         }
     }
+
+    /**
+     * Marks schemas and properties with oneOf extensions.
+     * Adds x-oneof-property to properties when schema has minProperties=1 and maxProperties=1.
+     * Adds x-oneof-schema to schemas that have the min/max pattern AND to parent schemas
+     * that contain nested schemas with the pattern.
+     **/
+    markOneOfExtensions(schema: OpenAPIV3.SchemaObject): void {
+        const hasDirectPattern = schema.minProperties === 1 && schema.maxProperties === 1;
+        const hasNestedPattern = this.hasNestedOneOfPattern(schema);
+
+        if (!hasDirectPattern && !hasNestedPattern) {
+            return;
+        }
+
+        if (hasDirectPattern) {
+            if (schema.properties) {
+                for (const propName in schema.properties) {
+                    const prop = schema.properties[propName] as any;
+                    if (prop && typeof prop === 'object') {
+                        prop['x-oneof-property'] = true;
+
+                        if ('$ref' in prop) {
+                            this.markReferencedSchemaAsOneof(prop.$ref);
+                        }
+                    }
+                }
+            }
+            (schema as any)['x-oneof-schema'] = true;
+            this.logger.info(`Added x-oneof-property to properties and marked schema with x-oneof-schema`);
+        } else if (hasNestedPattern) {
+            (schema as any)['x-oneof-schema'] = true;
+            this.logger.info(`Marked parent schema with x-oneof-schema (contains nested oneOf pattern)`);
+        }
+    }
+
+    /**
+     * Recursively marks $ref schemas that are part of a oneOf, but stops when reaching a schema with actual content.
+     **/
+    private markReferencedSchemaAsOneof(ref: string, visited: Set<string> = new Set()): void {
+        if (visited.has(ref)) {
+            return;
+        }
+        visited.add(ref);
+
+        const schemaName = ref.split('/').pop();
+        if (!schemaName || !this.root.components?.schemas) {
+            return;
+        }
+
+        const schema = this.root.components.schemas[schemaName];
+        if (!schema) {
+            return;
+        }
+
+        if (is_simple_ref(schema)) {
+            (schema as any)['x-oneof-property'] = true;
+            this.markReferencedSchemaAsOneof((schema as any).$ref, visited);
+        }
+    }
+
+    /**
+     * Checks if schema has nested items (in allOf/anyOf/oneOf) with oneOf pattern.
+     **/
+    private hasNestedOneOfPattern(schema: OpenAPIV3.SchemaObject): boolean {
+        const composedKeys = ['allOf', 'anyOf', 'oneOf'] as const;
+        for (const key of composedKeys) {
+            const items = schema[key];
+            if (Array.isArray(items)) {
+                for (const item of items) {
+                    if (item && typeof item === 'object' && !('$ref' in item)) {
+                        const itemSchema = item as any;
+                        if (itemSchema.minProperties === 1 && itemSchema.maxProperties === 1) {
+                            return true;
+                        }
+                    }
+                }
+            }
+        }
+        return false;
+    }
 }

tools/proto-convert/src/SchemaModifier.ts

@@ -30,6 +30,7 @@ import "{{{import}}}.proto";
 {{/oneOf}}
 {{^oneOf}}
   {{#vars}}
+  {{^vendorExtensions.x-oneof-property}}
   {{#description}}
   // {{{.}}}
   {{/description}}
@@ -48,7 +49,20 @@ import "{{{import}}}.proto";
   {{enumName}} {{name}} = {{vendorExtensions.x-protobuf-index}};
   {{/isEnum}}
 
+{{/vendorExtensions.x-oneof-property}}
+{{/vars}}
+{{#vendorExtensions.x-oneof-schema}}
+  oneof {{classVarName}} {
+  {{#vars}}
+    {{#vendorExtensions.x-oneof-property}}
+    {{#description}}
+    // {{{.}}}
+    {{/description}}
+    {{#vendorExtensions.x-protobuf-type}}{{{.}}} {{/vendorExtensions.x-protobuf-type}}{{{vendorExtensions.x-protobuf-data-type}}} {{{name}}} = {{vendorExtensions.x-protobuf-index}}{{#vendorExtensions.x-protobuf-packed}} [packed=true]{{/vendorExtensions.x-protobuf-packed}}{{#vendorExtensions.x-protobuf-json-name}} [json_name="{{vendorExtensions.x-protobuf-json-name}}"]{{/vendorExtensions.x-protobuf-json-name}};
+    {{/vendorExtensions.x-oneof-property}}
   {{/vars}}
+  }
+{{/vendorExtensions.x-oneof-schema}}
 {{/oneOf}}
 }
 {{/isEnum}}

tools/proto-convert/src/config/protobuf-schema-template/model.mustache

@@ -200,3 +200,14 @@ export function remove_unused(spec: OpenAPIV3.Document): void {
         obj.$ref !== undefined && !_.includes(remaining, obj.$ref)
     );
 }
+
+/**
+ * Checks if a schema object is a simple $ref with no other properties.
+ */
+export function is_simple_ref(schema: any): boolean {
+    if (!schema || typeof schema !== 'object') {
+        return false;
+    }
+    const keys = Object.keys(schema);
+    return keys.length === 1 && '$ref' in schema;
+}