openapi-ts-request 1.5.0 → 1.5.2

package/dist/generator/serviceGenarator.js

@@ -245,10 +245,11 @@ class ServiceGenerator {
         (0, log_1.default)('✅ 成功生成 api 文件目录-> ', this.config.serversPath);
     }
     getInterfaceTPConfigs() {
-        var _a, _b;
+        var _a, _b, _c;
         const schemas = (_a = this.openAPIData.components) === null || _a === void 0 ? void 0 : _a.schemas;
         const lastTypes = this.interfaceTPConfigs;
         const includeTags = ((_b = this.config) === null || _b === void 0 ? void 0 : _b.includeTags) || [];
+        const includePaths = ((_c = this.config) === null || _c === void 0 ? void 0 : _c.includePaths) || [];
         // 强行替换掉请求参数params的类型，生成方法对应的 xxxxParams 类型
         (0, lodash_1.keys)(this.openAPIData.paths).forEach((pathKey) => {
             const pathItem = this.openAPIData.paths[pathKey];
@@ -260,11 +261,14 @@ class ServiceGenerator {
                     return;
                 }
                 const tags = hookCustomFileNames(operationObject, pathKey, method);
-                if ((0, lodash_1.isEmpty)(includeTags) || (!(0, lodash_1.isEmpty)(includeTags) && (0, lodash_1.isEmpty)(tags))) {
+                if ((0, lodash_1.isEmpty)(includeTags) ||
+                    (!(0, lodash_1.isEmpty)(includeTags) && (0, lodash_1.isEmpty)(tags)) ||
+                    (0, lodash_1.isEmpty)(includePaths)) {
                     return;
                 }
                 const flag = this.validateRegexp((0, lodash_1.filter)((0, lodash_1.map)(tags, (tag) => (tag === null || tag === void 0 ? void 0 : tag.toLowerCase) ? tag.toLowerCase() : undefined), (tag) => !!tag), includeTags);
-                if (!flag) {
+                const pathFlag = this.validateRegexp(pathKey, includePaths);
+                if (!flag || !pathFlag) {
                     return;
                 }
                 // 筛选出 pathItem 包含的 $ref 对应的schema
@@ -792,7 +796,7 @@ class ServiceGenerator {
             enumStr = `{${(0, lodash_1.map)(enumArray, (value) => `"STRING_NUMBER_${value}"="${value}"`).join(',')}}`;
         }
         else {
-            enumStr = `{${(0, lodash_1.map)(enumArray, (value) => `${value}="${value}"`).join(',')}}`;
+            enumStr = `{${(0, lodash_1.map)(enumArray, (value) => `"${value}"="${value}"`).join(',')}}`;
         }
         // 翻译枚举
         if (schemaObject['x-enum-varnames'] && schemaObject['x-enum-comments']) {
@@ -831,7 +835,7 @@ class ServiceGenerator {
                 enumLabelTypeStr = `{${(0, lodash_1.map)(enumArray, (value) => `"${value}":"STRING_NUMBER_${value}"`).join(',')}}`;
             }
             else {
-                enumLabelTypeStr = `{${(0, lodash_1.map)(enumArray, (value) => `${value}:"${value}"`).join(',')}}`;
+                enumLabelTypeStr = `{${(0, lodash_1.map)(enumArray, (value) => `"${value}":"${value}"`).join(',')}}`;
             }
         }
         return {

package/dist/index.d.ts

@@ -206,4 +206,4 @@ export type GenerateServiceProps = {
         };
     };
 };
-export declare function generateService({ requestLibPath, schemaPath, mockFolder, includeTags, excludeTags, authorization, isTranslateToEnglishTag, priorityRule, timeout, reactQueryMode, apifoxConfig, ...rest }: GenerateServiceProps): Promise<void>;
+export declare function generateService({ requestLibPath, schemaPath, mockFolder, includeTags, excludeTags, includePaths, excludePaths, authorization, isTranslateToEnglishTag, priorityRule, timeout, reactQueryMode, apifoxConfig, ...rest }: GenerateServiceProps): Promise<void>;

package/dist/index.js

@@ -11,7 +11,7 @@ const util_1 = require("./util");
 tslib_1.__exportStar(require("./generator/patchSchema"), exports);
 function generateService(_a) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        var { requestLibPath, schemaPath, mockFolder, includeTags, excludeTags, authorization, isTranslateToEnglishTag, priorityRule = config_1.PriorityRule.include, timeout = 60000, reactQueryMode = config_1.ReactQueryMode.react, apifoxConfig } = _a, rest = tslib_1.__rest(_a, ["requestLibPath", "schemaPath", "mockFolder", "includeTags", "excludeTags", "authorization", "isTranslateToEnglishTag", "priorityRule", "timeout", "reactQueryMode", "apifoxConfig"]);
+        var { requestLibPath, schemaPath, mockFolder, includeTags, excludeTags, includePaths, excludePaths, authorization, isTranslateToEnglishTag, priorityRule = config_1.PriorityRule.include, timeout = 60000, reactQueryMode = config_1.ReactQueryMode.react, apifoxConfig } = _a, rest = tslib_1.__rest(_a, ["requestLibPath", "schemaPath", "mockFolder", "includeTags", "excludeTags", "includePaths", "excludePaths", "authorization", "isTranslateToEnglishTag", "priorityRule", "timeout", "reactQueryMode", "apifoxConfig"]);
         if (!schemaPath && !apifoxConfig) {
             return;
         }
@@ -31,10 +31,18 @@ function generateService(_a) {
         const requestImportStatement = (0, util_1.getImportStatement)(requestLibPath);
         const serviceGenerator = new serviceGenarator_1.default(Object.assign({ schemaPath, serversPath: './src/apis', requestImportStatement, enableLogging: false, priorityRule, includeTags: includeTags
                 ? (0, lodash_1.map)(includeTags, (item) => typeof item === 'string' ? item.toLowerCase() : item)
-                : priorityRule === config_1.PriorityRule.include
+                : priorityRule === config_1.PriorityRule.include ||
+                    priorityRule === config_1.PriorityRule.both
+                    ? [/.*/g]
+                    : null, includePaths: includePaths
+                ? (0, lodash_1.map)(includePaths, (item) => typeof item === 'string' ? item.toLowerCase() : item)
+                : priorityRule === config_1.PriorityRule.include ||
+                    priorityRule === config_1.PriorityRule.both
                     ? [/.*/g]
                     : null, excludeTags: excludeTags
                 ? (0, lodash_1.map)(excludeTags, (item) => typeof item === 'string' ? item.toLowerCase() : item)
+                : null, excludePaths: excludePaths
+                ? (0, lodash_1.map)(excludePaths, (item) => typeof item === 'string' ? item.toLowerCase() : item)
                 : null, requestOptionsType: '{[key: string]: unknown}', namespace: 'API', isGenReactQuery: false, reactQueryMode, isGenJavaScript: false, isDisplayTypeLabel: false, isGenJsonSchemas: false, nullable: false, isOnlyGenTypeScriptType: false, isCamelCase: true, isSupportParseEnumDesc: false, full: true }, rest), openAPI);
         serviceGenerator.genFile();
         if (mockFolder) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openapi-ts-request",
-  "version": "1.5.0",
+  "version": "1.5.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",
@@ -24,7 +24,7 @@
     "prettier.config.cjs"
   ],
   "dependencies": {
-    "@prettier/sync": "^0.5.2",
+    "@prettier/sync": "^0.6.1",
     "@trivago/prettier-plugin-sort-imports": "^5.2.1",
     "axios": "^1.7.2",
     "bing-translate-api": "^4.0.2",
@@ -66,7 +66,7 @@
     "@typescript-eslint/parser": "^7.9.0",
     "eslint": "^8.57.1",
     "husky": "^9.0.11",
-    "lint-staged": "^15.3.0",
+    "lint-staged": "^16.0.0",
     "openapi-types": "^12.1.3",
     "ts-node": "^10.9.2",
     "typescript": "5.8.3"