Preprocessing - Support x-protobuf-type overrides in composed schemas with proper OpenAPI type+format mapping

Signed-off-by: xil <fridalu66@gmail.com>

Author: lucy66hw

CHANGELOG.md

@@ -13,7 +13,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 - Add HybridQuery protos ([#294](https://github.com/opensearch-project/opensearch-protobufs/pull/294))
 - Preprocessing - Consolidate global parameters into GlobalParams schema ([#295](https://github.com/opensearch-project/opensearch-protobufs/pull/295))
 - Preprocessing - x-protobuf-type override origin type ([#297](https://github.com/opensearch-project/opensearch-protobufs/pull/297))
-
+- Preprocessing - Support x-protobuf-type overrides in composed schemas with proper OpenAPI type+format mapping ([#300](https://github.com/opensearch-project/opensearch-protobufs/pull/300))
 ### Changed
 - Update preprocessing for x-protobuf-excluded ([#266](https://github.com/opensearch-project/opensearch-protobufs/pull/266))
 - Fix aggregations protos ([#270](https://github.com/opensearch-project/opensearch-protobufs/pull/270))

tools/proto-convert/src/VendorExtensionProcessor.ts

@@ -11,6 +11,16 @@ export class VendorExtensionProcessor {
     private static readonly PROTOBUF_EXCLUDED_EXTENSION = 'x-protobuf-excluded';
     private static readonly PROTOBUF_TYPE_EXTENSION = 'x-protobuf-type';
 
+    private static readonly PROTOBUF_TYPE_MAPPING: Record<string, { type: string; format?: string }> = {
+        'int32': { type: 'integer', format: 'int32' },
+        'int64': { type: 'integer', format: 'int64' },
+        'float': { type: 'number', format: 'float' },
+        'double': { type: 'number', format: 'double' },
+        'bool': { type: 'boolean' },
+        'boolean': { type: 'boolean' },
+        'string': { type: 'string' },
+    };
+
     private root: OpenAPIV3.Document;
     private logger: Logger;
 
@@ -28,7 +38,6 @@ export class VendorExtensionProcessor {
         this.removeProtobufExcludedFromPaths();
         traverse(this.root, {
             onSchema: (schema: any, name: string) => {
-                if ('$ref' in schema) return;
                 this.removeProtobufExcludedProperties(schema);
                 this.applyTypeOverride(schema);
             },
@@ -138,10 +147,28 @@ export class VendorExtensionProcessor {
             if ('additionalProperties' in schema) {
                 delete schema.additionalProperties;
             }
+            if ('oneOf' in schema) {
+                delete schema.oneOf;
+            }
+            if ('anyOf' in schema) {
+                delete schema.anyOf;
+            }
+            if ('allOf' in schema) {
+                delete schema.allOf;
+            }
+
+            const typeMapping = VendorExtensionProcessor.PROTOBUF_TYPE_MAPPING[protoType];
+            if (typeMapping) {
+                schema.type = typeMapping.type;
+                if (typeMapping.format) {
+                    schema.format = typeMapping.format;
+                }
+            } else {
+                schema.type = protoType;
+            }
 
-            schema.type = protoType;
             delete schema[VendorExtensionProcessor.PROTOBUF_TYPE_EXTENSION];
-            this.logger.info(`Applied ${VendorExtensionProcessor.PROTOBUF_TYPE_EXTENSION}: ${protoType}`);
+            this.logger.info(`Applied ${VendorExtensionProcessor.PROTOBUF_TYPE_EXTENSION}: ${protoType} -> type: ${schema.type}${schema.format ? `, format: ${schema.format}` : ''}`);
         }
     }
 }

tools/proto-convert/src/config/protobuf-generator-config.yaml

@@ -9,6 +9,7 @@ additionalProperties:
   numberedFieldNumberList: true
   startEnumsWithUnspecified: true
   aggregateModelsName: aggregated_models
+  supportMultipleResponses: false
 inlineSchemaOptions:
   RESOLVE_INLINE_ENUMS: true
   SKIP_SCHEMA_REUSE: true
@@ -17,5 +18,6 @@ typeMappings:
   AnyType: "ObjectMap"
   number: "GeneralNumber"
   bytes: "bytes"
+  NullValue: "NullValue"
 openapiGeneratorIgnoreList:
   - "README.md"