Merge pull request #67 from long-woo/fix/action_name

v1.6.2

.vscode/settings.json

@@ -14,5 +14,14 @@
   },
   "[typescript]": {
     "editor.defaultFormatter": "denoland.vscode-deno" 
+  },
+  "[json]": {
+    "editor.defaultFormatter": "denoland.vscode-deno" 
+  },
+  "[jsonc]": {
+    "editor.defaultFormatter": "denoland.vscode-deno" 
+  },
+  "[jsonl]": {
+    "editor.defaultFormatter": "denoland.vscode-deno"
   }
 }

deno.json

@@ -1,11 +1,11 @@
 {
   "name": "@loongwoo/stc",
-  "version": "1.6.1",
+  "version": "1.6.2",
   "exports": "./mod.ts",
   "tasks": {
     "dev": "deno run -A --watch=src src/main.ts --url 'https://petstore3.swagger.io/api/v3/openapi.json'",
     "serve": "deno run -A --watch=src src/service.ts",
-    "version": "echo '1.6.1' > release/version",
+    "version": "echo '1.6.2' > release/version",
     "build:npm": "deno run -A src/npm/index.ts",
     "build:mac": "deno compile -A --target x86_64-apple-darwin --output release/stc src/main.ts",
     "build:mac-m": "deno compile -A --target aarch64-apple-darwin --output release/stc-m src/main.ts",
@@ -33,8 +33,7 @@
     ],
     "exclude": [
       "out/**/*",
-      "dist",
-      "**/npm/package.json"
+      "dist"
     ]
   },
   "test": {

src/i18n/index.ts

@@ -14,6 +14,9 @@ i18next.init({
       translation: zhCNTranslation,
     },
   },
+  interpolation: {
+    escapeValue: false,
+  },
 });
 
 const i18n = (lng?: string) => i18next.getFixedT(lng || locale);

src/npm/index.ts

@@ -1,6 +1,6 @@
 import * as dnt from "x/[email protected]/mod.ts";
 // import * as esbuild from "x/[email protected]/mod.js";
-import pkg from "./package.json" with { type: "json" };
+import pkg from "./pkg.json" with { type: "json" };
 
 // const res = await esbuild.build({
 //   entryPoints: ["./src/cli.ts"],

src/npm/package.json → src/npm/pkg.json

@@ -1,6 +1,6 @@
 {
   "name": "@loongwoo/stc",
-  "version": "1.6.1",
+  "version": "1.6.2",
   "description": "OpenApi/Swagger/Apifox document conversion tool.\nOpenAPI(Swagger)、Apifox 文档转换为接口文件。",
   "type": "module",
   "module": "esm/mod.js",
@@ -44,4 +44,4 @@
       }
     }
   }
-}
+}

src/path.ts

@@ -260,8 +260,13 @@ export const getApiPath = (
         return;
       }
 
-      // 添加请求方式标识，如 GET，POST 等，防止重名。
-      if (!name.toLowerCase().includes(method)) {
+      // 添加请求方式标识，如 GET，POST 等，防止重名。设置了 operationId，以 operationId 为准
+      if (
+        !currentMethod.operationId &&
+        !/^(get|post|put|delete|options|head|patch)$/i.test(
+          name.slice(0, method.length),
+        )
+      ) {
         name = `${method}${upperCase(name)}`;
       }