fix

Author: lucy66hw

tools/proto-convert/src/utils/helper.ts

@@ -51,35 +51,19 @@ export function resolveObj(
 ): OpenAPIV3.SchemaObject | undefined {
     if (!obj) return undefined;
 
+    if ("$ref" in obj) {
+        return resolveRef(obj.$ref, root);
+    }
     return obj as OpenAPIV3.SchemaObject;
 }
 
-export function resolveRef(
-    ref: string,
-    root: OpenAPIV3.Document
-): OpenAPIV3.SchemaObject | undefined {
-    if (!ref.startsWith("#/")) {
-        return undefined;
-    }
-
-    const pathParts = ref.replace(/^#\//, "").split("/");
-
-    let current: any = root;
-    for (const part of pathParts) {
-        if (current == null || typeof current !== "object") {
-            return undefined;
-        }
-        current = current[part];
-    }
-
-    if (!current) {
-        return undefined;
+export function resolveRef (ref: string, root: Record<string, any>): Record<string, any> | undefined {
+    const paths = ref.replace('#/', '').split('/')
+    for (const p of paths) {
+        root = root[p]
+        if (root === undefined) break
     }
-    if ("$ref" in current) {
-        return resolveObj(current, root);
-    }
-
-    return current as OpenAPIV3.SchemaObject;
+    return root
 }
 
 export function isPrimitiveType(schema: OpenAPIV3.SchemaObject): boolean {
@@ -135,39 +119,32 @@ export function deleteMatchingKeys(obj: any, condition: (item: any) => boolean):
 
 /**
  * Find all $ref references in the spec, including nested references.
- * Important: We must capture $refs without recursively resolving them,
- * so we can find transitive references (e.g., schema A -> schema B -> schema C)
  */
-export function find_refs(
-    current: Record<string, any>,
-    root?: Record<string, any>,
-    call_stack: string[] = []
-): Set<string> {
-    const results = new Set<string>();
+export function find_refs (current: Record<string, any>, root?: Record<string, any>, call_stack: string[] = []): Set<string> {
+    var results = new Set<string>()
 
     if (root === undefined) {
-        root = current;
-        current = current.paths;
+        root = current
+        current = current.paths
     }
 
     if (current?.$ref != null) {
-        const ref = current.$ref as string;
-        results.add(ref);
-
-        const ref_node = resolveRef(ref, root as OpenAPIV3.Document);
+        const ref = current.$ref as string
+        results.add(ref)
+        const ref_node = resolveRef(ref, root as OpenAPIV3.Document)
         if (ref_node !== undefined && !call_stack.includes(ref)) {
-            call_stack.push(ref);
-            find_refs(ref_node as Record<string, any>, root, call_stack).forEach((ref) => results.add(ref));
+            call_stack.push(ref)
+            find_refs(ref_node, root, call_stack).forEach((ref) => results.add(ref))
         }
     }
 
     if (_.isObject(current)) {
         _.forEach(current, (v) => {
             find_refs(v as Record<string, any>, root, call_stack).forEach((ref) => results.add(ref));
-        });
+        })
     }
 
-    return results;
+    return results
 }
 
 /**