use x-protobuf-type

Author: lucy66hw

tools/proto-convert/src/VendorExtensionProcessor.ts

@@ -21,7 +21,7 @@ export class VendorExtensionProcessor {
 
     /**
      * Process the spec by pruning anything marked with x-protobuf-excluded
-     * and applying vendor extensions (x-protobuf-name, x-protobuf-type)
+     * and applying vendor extensions (x-protobuf-name, x-protobuf-data-type)
      */
     public process(): OpenAPIV3.Document {
         deleteMatchingKeys(this.root, (item: any) => this.hasProtobufExcluded(item));
@@ -130,39 +130,25 @@ export class VendorExtensionProcessor {
     }
 
     /**
-     * Apply type override to a schema if it has x-protobuf-type
+     * Apply type override to simplify complex schemas to a single protobuf type.
      */
     private applyTypeOverride(schema: any): void {
         if (!schema) return;
 
         if (VendorExtensionProcessor.PROTOBUF_TYPE_EXTENSION in schema) {
             const protoType = schema[VendorExtensionProcessor.PROTOBUF_TYPE_EXTENSION];
 
-            // Clear structural properties that might conflict
-            if ('$ref' in schema) {
-                delete schema.$ref;
-            }
-            if ('properties' in schema) {
-                delete schema.properties;
-            }
-            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;
-            }
+            // Clear structural properties that conflict with simple type
+            delete schema.$ref;
+            delete schema.properties;
+            delete schema.additionalProperties;
+            delete schema.oneOf;
+            delete schema.anyOf;
+            delete schema.allOf;
 
-            // Directly use the x-protobuf-type value as the OpenAPI type
+            // Set type to x-protobuf-type value (preserves x-protobuf-type for template)
             schema.type = protoType;
-
-            delete schema[VendorExtensionProcessor.PROTOBUF_TYPE_EXTENSION];
-            logger.info(`Applied ${VendorExtensionProcessor.PROTOBUF_TYPE_EXTENSION}: ${protoType} -> type: ${schema.type}`);
+            logger.info(`Applied ${VendorExtensionProcessor.PROTOBUF_TYPE_EXTENSION}: ${protoType} -> simplified to type: ${schema.type}`);
         }
     }
 

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

@@ -17,21 +17,5 @@ typeMappings:
   object: "ObjectMap"
   AnyType: "ObjectMap"
   number: "GeneralNumber"
-  bytes: "bytes"
-  NullValue: "NullValue"
-  double: "double"
-  float: "float"
-  int32: "int32"
-  int64: "int64"
-  uint32: "uint32"
-  uint64: "uint64"
-  sint32: "sint32"
-  sint64: "sint64"
-  fixed32: "fixed32"
-  fixed64: "fixed64"
-  sfixed32: "sfixed32"
-  sfixed64: "sfixed64"
-  bool: "bool"
-  string: "string"
 openapiGeneratorIgnoreList:
   - "README.md"