openapi-ts-request 1.12.4 → 1.12.6

package/dist/generator/serviceGenarator.js

@@ -752,6 +752,7 @@ class ServiceGenerator {
                 autoescape: false,
             });
             env.addFilter('capitalizeFirst', util_2.capitalizeFirstLetter);
+            env.addFilter('escapeJs', util_2.escapeStringForJs);
             const destPath = (0, path_1.join)(this.config.serversPath, fileName);
             const destCode = nunjucks_1.default.renderString(template, Object.assign({ disableTypeCheck: false }, processedParams));
             let mergerProps = {};

package/dist/generator/util.d.ts

@@ -29,6 +29,11 @@ export declare function resolveRefs(obj: OpenAPIObject, fields: string[]): unkno
 export declare function isAllNumeric(arr: any): boolean;
 export declare function isAllNumber(arr: any): boolean;
 export declare function capitalizeFirstLetter(str: string): string;
+/**
+ * 转义字符串，用于 JavaScript 字符串字面量
+ * 将换行符、单引号等特殊字符转义为转义序列
+ */
+export declare function escapeStringForJs(str: string): string;
 export declare const parseDescriptionEnum: (description: string) => Map<number, string>;
 /**
  * 通过自定义正则表达式解析 description 中的枚举翻译

package/dist/generator/util.js

@@ -24,6 +24,7 @@ exports.resolveRefs = resolveRefs;
 exports.isAllNumeric = isAllNumeric;
 exports.isAllNumber = isAllNumber;
 exports.capitalizeFirstLetter = capitalizeFirstLetter;
+exports.escapeStringForJs = escapeStringForJs;
 const tslib_1 = require("tslib");
 const lodash_1 = require("lodash");
 const reserved_words_1 = tslib_1.__importDefault(require("reserved-words"));
@@ -400,6 +401,20 @@ function isAllNumber(arr) {
 function capitalizeFirstLetter(str) {
     return str.replace(/^[a-z]/, (match) => match.toUpperCase());
 }
+/**
+ * 转义字符串，用于 JavaScript 字符串字面量
+ * 将换行符、单引号等特殊字符转义为转义序列
+ */
+function escapeStringForJs(str) {
+    if (!str)
+        return str;
+    return str
+        .replace(/\\/g, '\\\\') // 先转义反斜杠
+        .replace(/'/g, "\\'") // 转义单引号
+        .replace(/\n/g, '\\n') // 转义换行符
+        .replace(/\r/g, '\\r') // 转义回车符
+        .replace(/\t/g, '\\t'); // 转义制表符
+}
 // 解析 description 中的枚举翻译
 const parseDescriptionEnum = (description) => {
     const enumMap = new Map();

package/dist/util.js

@@ -254,7 +254,15 @@ function translateChineseModuleNodeToEnglish(openAPI) {
                     });
                 });
                 resolve(translateMap);
-                void writeFileAsync(process.cwd() + '/openapi-ts-request.cache.json', JSON.stringify(translateMap, null, 2));
+                // 在写入前再次读取缓存，合并多个任务的翻译结果
+                const existingContent = readFileSafelySync(process.cwd() + '/openapi-ts-request.cache.json');
+                let existingCache = {};
+                if (existingContent !== null && isJSONString(existingContent)) {
+                    existingCache = JSON.parse(existingContent);
+                }
+                // 合并现有缓存和新的翻译结果（新结果优先）
+                const mergedCache = Object.assign(Object.assign({}, existingCache), translateMap);
+                void writeFileAsync(process.cwd() + '/openapi-ts-request.cache.json', JSON.stringify(mergedCache, null, 2));
             })
                 .catch(() => {
                 reject(false);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openapi-ts-request",
-  "version": "1.12.4",
+  "version": "1.12.6",
   "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",

package/templates/displayTypeLabel.njk

@@ -23,7 +23,7 @@ import * as {{ namespace }} from './{{ interfaceFileName }}';
             {%- if p["$ref"] and not p.name %}
               display{{ p.type | safe }}(field as keyof {{ namespace }}.{{ p.type }})
             {%- else %}
-              {{ p.name }}: '{{ p.desc if p.desc else p.name }}',
+              {{ p.name }}: '{{ (p.desc if p.desc else p.name) | escapeJs }}',
             {%- endif %}
           {%- endfor %}
         {%- if prop.length > 1 %}