czh-api 1.0.4 → 1.0.6

package/src/core/parser.ts

@@ -111,7 +111,7 @@ function getModuleName(path: string, pathPrefixes: Array<{ path: string; package
     return parts[0] || 'default';
 }
 
-function convertOpenApiTypeToTypeScript(openApiType: string | undefined): string {
+function convertOpenApiTypeToTypeScript(openApiType: string | undefined): string {
     if (!openApiType) return 'any';
     
     switch (openApiType) {
@@ -125,12 +125,88 @@ function convertOpenApiTypeToTypeScript(openApiType: string | undefined): string
             return 'boolean';
         case 'string':
             return 'string';
-        case 'number':
-            return 'number';
-        default:
-            return 'any';
-    }
-}
+        case 'number':
+            return 'number';
+        default:
+            return openApiType;
+    }
+}
+
+function resolveSchemaToTypeScript(
+    schema: OpenAPIV3.SchemaObject | OpenAPIV3.ReferenceObject | undefined,
+    allSchemas: { [key: string]: any }
+): string {
+    if (!schema) return 'any';
+
+    if (isReferenceObject(schema)) {
+        return getSchemaName(schema.$ref) || 'any';
+    }
+
+    if (schema.anyOf && Array.isArray(schema.anyOf) && schema.anyOf.length > 0) {
+        const unionTypes = schema.anyOf
+            .map(item => resolveSchemaToTypeScript(item as OpenAPIV3.SchemaObject | OpenAPIV3.ReferenceObject, allSchemas))
+            .filter(Boolean);
+        if (unionTypes.length > 0) {
+            return [...new Set(unionTypes)].join(' | ');
+        }
+    }
+
+    if (schema.oneOf && Array.isArray(schema.oneOf) && schema.oneOf.length > 0) {
+        const unionTypes = schema.oneOf
+            .map(item => resolveSchemaToTypeScript(item as OpenAPIV3.SchemaObject | OpenAPIV3.ReferenceObject, allSchemas))
+            .filter(Boolean);
+        if (unionTypes.length > 0) {
+            return [...new Set(unionTypes)].join(' | ');
+        }
+    }
+
+    if (schema.allOf && Array.isArray(schema.allOf) && schema.allOf.length > 0) {
+        const intersectionTypes = schema.allOf
+            .map(item => resolveSchemaToTypeScript(item as OpenAPIV3.SchemaObject | OpenAPIV3.ReferenceObject, allSchemas))
+            .filter(Boolean);
+        if (intersectionTypes.length > 0) {
+            return [...new Set(intersectionTypes)].join(' & ');
+        }
+    }
+
+    if (schema.type === 'array') {
+        const itemType = resolveSchemaToTypeScript(
+            schema.items as OpenAPIV3.SchemaObject | OpenAPIV3.ReferenceObject | undefined,
+            allSchemas
+        );
+        return `${itemType || 'any'}[]`;
+    }
+
+    if (schema.type === 'object') {
+        if (schema.properties && Object.keys(schema.properties).length > 0) {
+            const requiredSet = new Set(schema.required || []);
+            const inlineFields = Object.entries(schema.properties).map(([key, value]) => {
+                const fieldType = resolveSchemaToTypeScript(
+                    value as OpenAPIV3.SchemaObject | OpenAPIV3.ReferenceObject,
+                    allSchemas
+                );
+                const optional = requiredSet.has(key) ? '' : '?';
+                return `${key}${optional}: ${fieldType || 'any'}`;
+            });
+            return `{ ${inlineFields.join('; ')} }`;
+        }
+        if (schema.additionalProperties) {
+            if (schema.additionalProperties === true) {
+                return 'Record<string, any>';
+            }
+            const valueType = resolveSchemaToTypeScript(
+                schema.additionalProperties as OpenAPIV3.SchemaObject | OpenAPIV3.ReferenceObject,
+                allSchemas
+            );
+            return `Record<string, ${valueType || 'any'}>`;
+        }
+        return 'any';
+    }
+
+    const baseType = convertOpenApiTypeToTypeScript(schema.type);
+    const nullable = schema.nullable ? ' | null' : '';
+    return `${baseType}${nullable}`;
+}
 
 function extractJsdocParamsFromSchema(schema: OpenAPIV3.SchemaObject | OpenAPIV3.ReferenceObject, allSchemas: { [key: string]: any }): Required<Endpoint>['jsdocParams'] {
     const params: Required<Endpoint>['jsdocParams'] = [];
@@ -146,13 +222,15 @@ function extractJsdocParamsFromSchema(schema: OpenAPIV3.SchemaObject | OpenAPIV3
 
     if (targetSchema?.properties) {
         for (const propName in targetSchema.properties) {
-            const prop = targetSchema.properties[propName] as OpenAPIV3.SchemaObject;
-            
-            let propType = 'any';
+            const prop = targetSchema.properties[propName] as OpenAPIV3.SchemaObject | OpenAPIV3.ReferenceObject;
+            let propType = resolveSchemaToTypeScript(prop, allSchemas);
+            const propDescription = isReferenceObject(prop)
+                ? ((allSchemas[getSchemaName(prop.$ref)] as OpenAPIV3.SchemaObject | undefined)?.description || '')
+                : (prop?.description || '');
             
             // 处理 anyOf 数组 (FastAPI 常用的联合类型)
-            if (prop.anyOf && Array.isArray(prop.anyOf)) {
-                const types = prop.anyOf.map(item => {
+            if (false && (prop as OpenAPIV3.SchemaObject).anyOf && Array.isArray((prop as OpenAPIV3.SchemaObject).anyOf)) {
+                const types = (prop as OpenAPIV3.SchemaObject).anyOf!.map(item => {
                     if (isReferenceObject(item)) {
                         return getSchemaName(item.$ref);
                     } else {
@@ -173,8 +251,8 @@ function extractJsdocParamsFromSchema(schema: OpenAPIV3.SchemaObject | OpenAPIV3
                 }
             }
             // 处理 oneOf 数组
-            else if (prop.oneOf && Array.isArray(prop.oneOf)) {
-                const types = prop.oneOf.map(item => {
+            else if (false && (prop as OpenAPIV3.SchemaObject).oneOf && Array.isArray((prop as OpenAPIV3.SchemaObject).oneOf)) {
+                const types = (prop as OpenAPIV3.SchemaObject).oneOf!.map(item => {
                     if (isReferenceObject(item)) {
                         return getSchemaName(item.$ref);
                     } else {
@@ -195,16 +273,26 @@ function extractJsdocParamsFromSchema(schema: OpenAPIV3.SchemaObject | OpenAPIV3
                 }
             }
             // 处理普通类型
-            else if (prop.type) {
-                propType = convertOpenApiTypeToTypeScript(prop.type);
-            }
+            else if (false && (prop as OpenAPIV3.SchemaObject).type) {
+                const propSchema: any = prop as any;
+                if (propSchema.type === 'array' && propSchema.items) {
+                    if (isReferenceObject(propSchema.items)) {
+                        propType = `${getSchemaName(propSchema.items.$ref)}[]`;
+                    } else {
+                        const itemType = convertOpenApiTypeToTypeScript((propSchema.items as OpenAPIV3.SchemaObject).type);
+                        propType = `${itemType}[]`;
+                    }
+                } else {
+                    propType = convertOpenApiTypeToTypeScript(propSchema.type);
+                }
+            }
 
-            params.push({
-                name: propName,
-                type: propType,
-                description: prop?.description || '',
-                required: targetSchema.required?.includes(propName)
-            });
+            params.push({
+                name: propName,
+                type: propType || 'any',
+                description: propDescription,
+                required: targetSchema.required?.includes(propName)
+            });
         }
     }
     return params;