openapi-ts-request 1.12.5 → 1.12.7

package/dist/generator/mockGenarator.js

@@ -6,12 +6,12 @@ const fs_1 = tslib_1.__importDefault(require("fs"));
 const lodash_1 = require("lodash");
 const mockjs_1 = tslib_1.__importDefault(require("mockjs"));
 const path_1 = require("path");
-const tiny_pinyin_1 = tslib_1.__importDefault(require("tiny-pinyin"));
 const log_1 = tslib_1.__importDefault(require("../log"));
 const index_1 = tslib_1.__importDefault(require("../parser-mock/index"));
 const util_1 = require("../parser-mock/util");
 const config_1 = require("./config");
 const file_1 = require("./file");
+const util_2 = require("./util");
 mockjs_1.default.Random.extend({
     country() {
         const data = [
@@ -162,7 +162,7 @@ const mockGenerator = ({ openAPI, mockFolder, }) => {
                     ((_a = methodConfig === null || methodConfig === void 0 ? void 0 : methodConfig.tags) === null || _a === void 0 ? void 0 : _a.join('/')) ||
                     path.replace('/', '').split('/')[1])) === null || _b === void 0 ? void 0 : _b.replace(/[^\w^\s^\u4e00-\u9fa5]/gi, '');
                 if (/[\u3220-\uFA29]/.test(conte)) {
-                    conte = tiny_pinyin_1.default.convertToPinyin(conte, '', true);
+                    conte = (0, util_2.toPlainPinyin)(conte);
                 }
                 if (!conte) {
                     return;

package/dist/generator/util.d.ts

@@ -1,5 +1,9 @@
 import type { ArraySchemaObject, BinaryArraySchemaObject, ComponentsObject, ISchemaObject, NonArraySchemaObject, OpenAPIObject, OperationObject, ReferenceObject, SchemaObject } from '../type';
 import type { ITypeItem } from './type';
+/**
+ * 汉字转连续无音调小写拼音（对齐原 tiny-pinyin 的 convertToPinyin(str, '', true)）
+ */
+export declare function toPlainPinyin(str: string): string;
 export declare function stripDot(str: string): string;
 export declare function resolveTypeName(typeName: string): string;
 export declare function getRefName(refObject: ReferenceObject | string): string;

package/dist/generator/util.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAxiosResponseType = exports.getBinaryResponseType = exports.isBinaryMediaType = exports.getBinaryMediaTypes = exports.getDefaultBinaryMediaTypes = exports.parseDescriptionEnumByReg = exports.parseDescriptionEnum = void 0;
+exports.toPlainPinyin = toPlainPinyin;
 exports.stripDot = stripDot;
 exports.resolveTypeName = resolveTypeName;
 exports.getRefName = getRefName;
@@ -27,11 +28,17 @@ exports.capitalizeFirstLetter = capitalizeFirstLetter;
 exports.escapeStringForJs = escapeStringForJs;
 const tslib_1 = require("tslib");
 const lodash_1 = require("lodash");
+const pinyin_pro_1 = require("pinyin-pro");
 const reserved_words_1 = tslib_1.__importDefault(require("reserved-words"));
-const tiny_pinyin_1 = tslib_1.__importDefault(require("tiny-pinyin"));
 const config_1 = require("../config");
 const log_1 = tslib_1.__importDefault(require("../log"));
 const config_2 = require("./config");
+/**
+ * 汉字转连续无音调小写拼音（对齐原 tiny-pinyin 的 convertToPinyin(str, '', true)）
+ */
+function toPlainPinyin(str) {
+    return (0, pinyin_pro_1.pinyin)(str, { toneType: 'none', type: 'string', separator: '' });
+}
 function stripDot(str) {
     return str.replace(/[-_ .](\w)/g, (_all, letter) => letter.toUpperCase());
 }
@@ -77,7 +84,7 @@ function resolveTypeName(typeName) {
         return (0, lodash_1.upperFirst)(name);
     }
     const noBlankName = name.replace(/ +/g, '');
-    return (0, lodash_1.upperFirst)(tiny_pinyin_1.default.convertToPinyin(noBlankName, '', true));
+    return (0, lodash_1.upperFirst)(toPlainPinyin(noBlankName));
 }
 function getRefName(refObject) {
     if (!isReferenceObject(refObject)) {

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.5",
+  "version": "1.12.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",
@@ -40,11 +40,11 @@
     "minimatch": "^9.0.5",
     "mockjs": "^1.1.0",
     "nunjucks": "^3.2.4",
+    "pinyin-pro": "^3.28.0",
     "prettier": "^3.3.2",
     "reserved-words": "^0.1.2",
     "rimraf": "^5.0.10",
     "swagger2openapi": "^7.0.8",
-    "tiny-pinyin": "^1.3.2",
     "ts-morph": "^25.0.1",
     "tslib": "^2.6.3"
   },