openapi-ts-request 1.8.0 → 1.8.2

package/dist/generator/serviceGenarator.d.ts

@@ -55,6 +55,7 @@ export default class ServiceGenerator {
     private resolveEnumObject;
     private resolveAllOfObject;
     private getProps;
+    private resolveParameterRef;
     private resolveRefObject;
     log(message: string): void;
     private generateInfoLog;

package/dist/generator/serviceGenarator.js

@@ -280,26 +280,35 @@ class ServiceGenerator {
                 }
                 // 筛选出 pathItem 包含的 $ref 对应的schema
                 (0, util_2.markAllowedSchema)(JSON.stringify(pathItem), this.openAPIData);
-                operationObject.parameters = (_b = operationObject.parameters) === null || _b === void 0 ? void 0 : _b.filter((item) => (item === null || item === void 0 ? void 0 : item.in) !== `${config_2.parametersInsEnum.header}`);
+                operationObject.parameters = (_b = operationObject.parameters) === null || _b === void 0 ? void 0 : _b.filter((item) => {
+                    const parameter = this.resolveParameterRef(item);
+                    return (parameter === null || parameter === void 0 ? void 0 : parameter.in) !== `${config_2.parametersInsEnum.header}`;
+                });
                 const props = [];
-                (_c = operationObject.parameters) === null || _c === void 0 ? void 0 : _c.forEach((parameter) => {
+                (_c = operationObject.parameters) === null || _c === void 0 ? void 0 : _c.forEach((param) => {
                     var _a;
-                    props.push({
-                        name: parameter.name,
-                        desc: ((_a = parameter.description) !== null && _a !== void 0 ? _a : '').replace(config_2.lineBreakReg, ''),
-                        required: parameter.required || false,
-                        type: this.getType(parameter.schema),
-                    });
+                    const parameter = this.resolveParameterRef(param);
+                    if (parameter) {
+                        props.push({
+                            name: parameter.name,
+                            desc: ((_a = parameter.description) !== null && _a !== void 0 ? _a : '').replace(config_2.lineBreakReg, ''),
+                            required: parameter.required || false,
+                            type: this.getType(parameter.schema),
+                        });
+                    }
                 });
                 // parameters may be in path
-                (_d = pathItem.parameters) === null || _d === void 0 ? void 0 : _d.forEach((parameter) => {
+                (_d = pathItem.parameters) === null || _d === void 0 ? void 0 : _d.forEach((param) => {
                     var _a;
-                    props.push({
-                        name: parameter.name,
-                        desc: ((_a = parameter.description) !== null && _a !== void 0 ? _a : '').replace(config_2.lineBreakReg, ''),
-                        required: parameter.required,
-                        type: this.getType(parameter.schema),
-                    });
+                    const parameter = this.resolveParameterRef(param);
+                    if (parameter) {
+                        props.push({
+                            name: parameter.name,
+                            desc: ((_a = parameter.description) !== null && _a !== void 0 ? _a : '').replace(config_2.lineBreakReg, ''),
+                            required: parameter.required,
+                            type: this.getType(parameter.schema),
+                        });
+                    }
                 });
                 const typeName = this.getFunctionParamsTypeName(Object.assign(Object.assign({}, operationObject), { method, path: pathKey }));
                 if (props.length > 0 && typeName) {
@@ -997,6 +1006,16 @@ class ServiceGenerator {
                     : false });
         });
     }
+    resolveParameterRef(param) {
+        var _a, _b;
+        if (!(0, util_2.isReferenceObject)(param)) {
+            return param;
+        }
+        // 解析 $ref 引用，从 components.parameters 中获取实际定义
+        const refName = (0, util_2.getLastRefName)(param.$ref);
+        const parameter = (_b = (_a = this.openAPIData.components) === null || _a === void 0 ? void 0 : _a.parameters) === null || _b === void 0 ? void 0 : _b[refName];
+        return parameter || null;
+    }
     resolveRefObject(refObject) {
         if (!(0, util_2.isReferenceObject)(refObject)) {
             return refObject;

package/dist/util.js

@@ -21,7 +21,7 @@ const getImportStatement = (requestLibPath) => {
         }
         return `import request from '${requestLibPath}';`;
     }
-    return `import { request } from 'axios';`;
+    return `import request from 'axios';`;
 };
 exports.getImportStatement = getImportStatement;
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openapi-ts-request",
-  "version": "1.8.0",
+  "version": "1.8.2",
   "description": "Swagger2/OpenAPI3/Apifox to TypeScript/JavaScript, request client(support any client), request mock service, enum and enum translation, react-query/vue-query, type field label, JSON Schemas",
   "engines": {
     "node": ">=18.0.0",