openapi-ts-request 1.6.5 → 1.6.7

package/dist/generator/serviceGenarator.js

@@ -121,9 +121,10 @@ class ServiceGenerator {
                             return;
                         }
                     }
+                    const tagTypeName = (0, util_2.resolveTypeName)(tag);
                     const tagKey = this.config.isCamelCase
-                        ? (0, util_1.camelCase)((0, util_2.resolveTypeName)(tag))
-                        : (0, util_2.resolveTypeName)(tag);
+                        ? (0, util_1.camelCase)(tagTypeName)
+                        : (0, lodash_1.lowerFirst)(tagTypeName);
                     if (!this.apiData[tagKey]) {
                         this.apiData[tagKey] = [];
                     }
@@ -366,7 +367,7 @@ class ServiceGenerator {
             }
             if (this.config.isGenJsonSchemas) {
                 this.schemaList.push({
-                    typeName: `$${(0, util_2.resolveTypeName)(schemaKey)}`,
+                    typeName: `$${(0, lodash_1.lowerFirst)((0, util_2.resolveTypeName)(schemaKey))}`,
                     type: JSON.stringify((0, patchSchema_1.patchSchema)(schema, (_a = this.openAPIData.components) === null || _a === void 0 ? void 0 : _a.schemas)),
                 });
             }
@@ -584,7 +585,7 @@ class ServiceGenerator {
         var _a, _b, _c;
         const namespace = this.config.namespace ? `${this.config.namespace}.` : '';
         const typeName = ((_c = (_b = (_a = this.config) === null || _a === void 0 ? void 0 : _a.hook) === null || _b === void 0 ? void 0 : _b.customTypeName) === null || _c === void 0 ? void 0 : _c.call(_b, data)) || this.getFunctionName(data);
-        return (0, util_2.resolveTypeName)(`${namespace}${typeName !== null && typeName !== void 0 ? typeName : data.operationId}Params`);
+        return (0, lodash_1.upperFirst)((0, util_2.resolveTypeName)(`${namespace}${typeName !== null && typeName !== void 0 ? typeName : data.operationId}Params`));
     }
     getBodyTP(requestBody, namespace) {
         var _a;

package/dist/generator/util.js

@@ -72,10 +72,10 @@ function resolveTypeName(typeName) {
         return `Pinyin_${name}`;
     }
     if (!/[\u3220-\uFA29]/.test(name) && !/^\d$/.test(name)) {
-        return name;
+        return (0, lodash_1.upperFirst)(name);
     }
     const noBlankName = name.replace(/ +/g, '');
-    return tiny_pinyin_1.default.convertToPinyin(noBlankName, '', true);
+    return (0, lodash_1.upperFirst)(tiny_pinyin_1.default.convertToPinyin(noBlankName, '', true));
 }
 function getRefName(refObject) {
     if (!isReferenceObject(refObject)) {

package/dist/util.js

@@ -11,6 +11,7 @@ const https_1 = tslib_1.__importDefault(require("https"));
 const yaml = tslib_1.__importStar(require("js-yaml"));
 const lodash_1 = require("lodash");
 const node_fs_1 = require("node:fs");
+const promises_1 = require("node:fs/promises");
 const swagger2openapi_1 = tslib_1.__importDefault(require("swagger2openapi"));
 const log_1 = tslib_1.__importStar(require("./log"));
 const getImportStatement = (requestLibPath) => {
@@ -201,10 +202,40 @@ function isJSONString(str) {
         return false;
     }
 }
+function readFileSafelySync(filePath) {
+    if (!(0, node_fs_1.existsSync)(filePath)) {
+        (0, log_1.logError)(`文件 ${filePath} 不存在`);
+        return null;
+    }
+    try {
+        return (0, node_fs_1.readFileSync)(filePath, 'utf-8');
+    }
+    catch (error) {
+        (0, log_1.logError)(`读取文件 ${filePath} 时出错:`, error);
+        return null;
+    }
+}
+function writeFileAsync(filePath, content) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        try {
+            yield (0, promises_1.writeFile)(filePath, content, 'utf8');
+        }
+        catch (error) {
+            (0, log_1.logError)(`文件 ${filePath} 写入失败`);
+        }
+    });
+}
 function translateChineseModuleNodeToEnglish(openAPI) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const content = readFileSafelySync(process.cwd() + '/openapi-ts-request.cache.json');
+        let i18n = {};
+        if (content !== null) {
+            if (isJSONString(content)) {
+                i18n = JSON.parse(content);
+            }
+        }
         return new Promise((resolve, reject) => {
-            const translateMap = {};
+            const translateMap = i18n;
             const operations = [];
             let tags = [];
             (0, lodash_1.forEach)((0, lodash_1.keys)(openAPI.paths), (path) => {
@@ -219,7 +250,7 @@ function translateChineseModuleNodeToEnglish(openAPI) {
             });
             void Promise.all((0, lodash_1.map)((0, lodash_1.uniq)(tags), (tagName) => {
                 return new Promise((resolve) => {
-                    if (tagName && /[\u3220-\uFA29]/.test(tagName)) {
+                    if (tagName && /[\u3220-\uFA29]/.test(tagName) && !i18n[tagName]) {
                         void (0, bing_translate_api_1.translate)(tagName, null, 'en')
                             .then((translateRes) => {
                             const text = (0, exports.camelCase)(translateRes === null || translateRes === void 0 ? void 0 : translateRes.translation);
@@ -246,6 +277,7 @@ function translateChineseModuleNodeToEnglish(openAPI) {
                     });
                 });
                 resolve(translateMap);
+                void writeFileAsync(process.cwd() + '/openapi-ts-request.cache.json', JSON.stringify(translateMap, null, 2));
             })
                 .catch(() => {
                 reject(false);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openapi-ts-request",
-  "version": "1.6.5",
+  "version": "1.6.7",
   "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",
@@ -70,7 +70,7 @@
     "openapi-types": "^12.1.3",
     "sanitize-filename": "^1.6.3",
     "ts-node": "^10.9.2",
-    "typescript": "5.8.3",
+    "typescript": "5.9.2",
     "vitest": "^2.1.9"
   },
   "keywords": [