swagger2api-v3 1.0.4 → 1.0.6

package/dist/core/parser.js

@@ -18,7 +18,15 @@ class SwaggerParser {
         const apis = [];
         const paths = this.document.paths;
         for (const [path, pathItem] of Object.entries(paths)) {
-            const methods = ['get', 'post', 'put', 'delete', 'patch', 'head', 'options'];
+            const methods = [
+                'get',
+                'post',
+                'put',
+                'delete',
+                'patch',
+                'head',
+                'options'
+            ];
             for (const method of methods) {
                 const operation = pathItem[method];
                 if (!operation)
@@ -71,11 +79,15 @@ class SwaggerParser {
         // 获取响应类型
         const responseType = (0, utils_1.getResponseType)(operation.responses);
         // 获取请求体类型
-        const bodyParam = allParameters.find(p => p.in === 'body');
-        const requestBodyType = bodyParam ? (0, utils_1.swaggerTypeToTsType)(bodyParam.schema) : undefined;
+        const bodyParam = allParameters.find((p) => p.in === 'body');
+        const requestBodyType = bodyParam
+            ? (0, utils_1.swaggerTypeToTsType)(bodyParam.schema)
+            : undefined;
         // 解析参数信息
-        const parameters = allParameters.map(param => {
-            const type = param.schema ? (0, utils_1.swaggerTypeToTsType)(param.schema) : (0, utils_1.swaggerTypeToTsType)({ type: param.type || 'string' });
+        const parameters = allParameters.map((param) => {
+            const type = param.schema
+                ? (0, utils_1.swaggerTypeToTsType)(param.schema)
+                : (0, utils_1.swaggerTypeToTsType)({ type: param.type || 'string' });
             return {
                 name: param.name,
                 type,
@@ -133,7 +145,9 @@ class SwaggerParser {
                 .map(([key, value]) => {
                 const optional = schema.required?.includes(key) ? '' : '?';
                 const type = (0, utils_1.swaggerTypeToTsType)(value);
-                const comment = value.description ? ` /** ${value.description} */` : '';
+                const comment = value.description
+                    ? ` /** ${value.description} */`
+                    : '';
                 return `${comment}\n  ${key}${optional}: ${type};`;
             })
                 .join('\n');
@@ -147,9 +161,9 @@ class SwaggerParser {
         else if (schema.enum) {
             // 枚举类型
             const enumValues = schema.enum
-                .map((value) => `  ${JSON.stringify(value)}`)
-                .join(' |\n');
-            definition = `export type ${typeName} =\n${enumValues};`;
+                .map((value) => `  ${value.toUpperCase()} = '${value}'`)
+                .join(',\n');
+            definition = `export enum ${typeName} {\n${enumValues}\n}`;
         }
         else {
             // 其他类型
@@ -188,15 +202,23 @@ class SwaggerParser {
         const tags = new Set();
         // 从文档标签中获取
         if (this.document.tags) {
-            this.document.tags.forEach(tag => tags.add(tag.name));
+            this.document.tags.forEach((tag) => tags.add(tag.name));
         }
         // 从路径操作中获取
         for (const pathItem of Object.values(this.document.paths)) {
-            const methods = ['get', 'post', 'put', 'delete', 'patch', 'head', 'options'];
+            const methods = [
+                'get',
+                'post',
+                'put',
+                'delete',
+                'patch',
+                'head',
+                'options'
+            ];
             for (const method of methods) {
                 const operation = pathItem[method];
                 if (operation?.tags) {
-                    operation.tags.forEach(tag => tags.add(tag));
+                    operation.tags.forEach((tag) => tags.add(tag));
                 }
             }
         }

package/dist/utils/index.js

@@ -65,7 +65,7 @@ function pathToFunctionName(method, path) {
     // 移除路径参数的大括号
     const cleanPath = path.replace(/\{([^}]+)\}/g, '$1');
     // 分割路径并过滤空字符串
-    const segments = cleanPath.split('/').filter(segment => segment.length > 0);
+    const segments = cleanPath.split('/').filter((segment) => segment.length > 0);
     // 将路径段转换为驼峰命名
     const pathParts = segments.map((part, index) => {
         // 移除特殊字符并转换为小驼峰
@@ -99,8 +99,8 @@ function toKebabCase(str) {
  */
 function toPascalCase(str) {
     return str
-        .replace(/[\s-_]+(.)?/g, (_, char) => char ? char.toUpperCase() : '')
-        .replace(/^(.)/, char => char.toUpperCase());
+        .replace(/[\s-_]+(.)?/g, (_, char) => (char ? char.toUpperCase() : ''))
+        .replace(/^(.)/, (char) => char.toUpperCase());
 }
 /**
  * 将字符串转换为camelCase
@@ -120,6 +120,20 @@ function swaggerTypeToTsType(schema) {
     if (!schema) {
         return 'any';
     }
+    // 处理 allOf 类型组合
+    if (schema.allOf && schema.allOf.length > 0) {
+        // 对于 allOf，通常第一个元素是引用类型
+        const firstSchema = schema.allOf[0];
+        if (firstSchema.$ref) {
+            const refName = firstSchema.$ref.split('/').pop();
+            return refName || 'any';
+        }
+        // 如果不是引用，尝试合并所有类型
+        const types = schema.allOf
+            .map((s) => swaggerTypeToTsType(s))
+            .filter((t) => t !== 'any');
+        return types.length > 0 ? types[0] : 'any';
+    }
     // 处理引用类型
     if (schema.$ref) {
         const refName = schema.$ref.split('/').pop();
@@ -151,7 +165,7 @@ function swaggerTypeToTsType(schema) {
             return 'number';
         case 'string':
             if (schema.enum) {
-                return schema.enum.map(value => `'${value}'`).join(' | ');
+                return schema.enum.map((value) => `'${value}'`).join(' | ');
             }
             return 'string';
         case 'boolean':
@@ -171,27 +185,27 @@ function generateParameterTypes(parameters) {
     if (!parameters || parameters.length === 0) {
         return '';
     }
-    const queryParams = parameters.filter(p => p.in === 'query');
-    const pathParams = parameters.filter(p => p.in === 'path');
-    const bodyParams = parameters.filter(p => p.in === 'body');
-    const formParams = parameters.filter(p => p.in === 'formData');
+    const queryParams = parameters.filter((p) => p.in === 'query');
+    const pathParams = parameters.filter((p) => p.in === 'path');
+    const bodyParams = parameters.filter((p) => p.in === 'body');
+    const formParams = parameters.filter((p) => p.in === 'formData');
     const types = [];
     // 路径参数
     if (pathParams.length > 0) {
         const pathType = pathParams
-            .map(p => `${p.name}: ${swaggerTypeToTsType({ type: p.type || 'string' })}`)
+            .map((p) => `${p.name}: ${swaggerTypeToTsType({ type: p.type || 'string' })}`)
             .join(', ');
         types.push(`pathParams: { ${pathType} }`);
     }
     // 查询参数
     if (queryParams.length > 0) {
         const queryType = queryParams
-            .map(p => {
+            .map((p) => {
             const optional = p.required ? '' : '?';
             return `${p.name}${optional}: ${swaggerTypeToTsType({ type: p.type || 'string' })}`;
         })
             .join(', ');
-        types.push(`queryParams${queryParams.every(p => !p.required) ? '?' : ''}: { ${queryType} }`);
+        types.push(`queryParams${queryParams.every((p) => !p.required) ? '?' : ''}: { ${queryType} }`);
     }
     // 请求体参数
     if (bodyParams.length > 0) {
@@ -202,7 +216,7 @@ function generateParameterTypes(parameters) {
     // 表单参数
     if (formParams.length > 0) {
         const formType = formParams
-            .map(p => {
+            .map((p) => {
             const optional = p.required ? '' : '?';
             return `${p.name}${optional}: ${swaggerTypeToTsType({ type: p.type || 'string' })}`;
         })
@@ -277,7 +291,7 @@ function generateApiComment(operation, parameters) {
     }
     if (parameters && parameters.length > 0) {
         comments.push(' *');
-        parameters.forEach(param => {
+        parameters.forEach((param) => {
             const description = param.description || '';
             comments.push(` * @param ${param.name} ${description}`);
         });
@@ -308,7 +322,9 @@ function getResponseType(responses) {
         return 'any';
     }
     // 支持OpenAPI 3.0格式 (content.application/json.schema)
-    if (successResponse.content && successResponse.content['application/json'] && successResponse.content['application/json'].schema) {
+    if (successResponse.content &&
+        successResponse.content['application/json'] &&
+        successResponse.content['application/json'].schema) {
         return swaggerTypeToTsType(successResponse.content['application/json'].schema);
     }
     // 支持Swagger 2.0格式 (直接schema)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "swagger2api-v3",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "从 Swagger/OpenAPI 文档生成 TypeScript API 接口的命令行工具",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",