Merge pull request #118 from long-woo/dev

release: v2.14.2

Author: long-woo

.github/workflows/check.yml

@@ -4,7 +4,7 @@ on:
   workflow_call:
 
   pull_request:
-    branches: ['master']
+    branches: ['master', 'main']
 
 jobs:
   check:

.github/workflows/deno-build.yml

@@ -10,7 +10,7 @@ name: Publish to release
 
 on:
   push:
-    branches: ['master']
+    branches: ['master', 'main']
     paths:
       - deno.json
 

.github/workflows/npm.yml

@@ -2,7 +2,7 @@ name: Publish Package to npmjs
 
 on:
   push:
-    branches: ['master']
+    branches: ['master', 'main']
     paths:
       - src/npm/pkg.json
 

README.md

@@ -153,8 +153,8 @@ Create a `myPlugin.ts` file:
 
 ```ts
 // 引用模块
-// import { start } from 'https://deno.land/x/stc@2.14.1/mod.ts'
-import { start } from 'jsr:@lonu/stc@^2.14.1'
+// import { start } from 'https://deno.land/x/stc@2.14.2/mod.ts'
+import { start } from 'jsr:@lonu/stc@^2.14.2'
 
 // Defining plugins
 const myPlugin: IPlugin = {

deno.json

@@ -1,12 +1,12 @@
 {
   "name": "@lonu/stc",
-  "version": "2.14.1",
+  "version": "2.14.2",
   "exports": "./mod.ts",
   "tasks": {
     "pack": "deno run -A src/pack.ts",
-    "dev": "deno task pack && deno run -A --watch=src src/main.ts --url='https://petstore3.swagger.io/api/v3/openapi.json'",
+    "dev": "deno task pack && deno run -A --watch=src src/main.ts --url='https://petstore3.swagger.io/api/v3/openapi.json' --lang=swift",
     "serve": "deno run -A --watch=src src/service.ts",
-    "version": "echo '2.14.1' > release/version",
+    "version": "echo '2.14.2' > release/version",
     "build:npm": "deno run -A src/npm/build.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",

src/app.ts

@@ -148,7 +148,11 @@ export const start = async (options: DefaultConfigOptions): Promise<void> => {
   });
 
   console.log("\n");
-  Logs.success(`${getT("$t(app.generateFileDone)")}\n\t${options.outDir}\n`);
+  Logs.success(
+    `${
+      getT("$t(app.generateFileDone)", { total: actionData.size })
+    }\n\t${options.outDir}\n`,
+  );
   // 触发插件 onEnd 事件
   context.onEnd?.(context.options);
 };

src/core.ts

@@ -126,7 +126,7 @@ const getVirtualProperties = (
 
       // 如果 ref 的自定义类型为基础类型，且 type 为空
       if (
-        !type && !defs[refName].type.includes("object") &&
+        !type && defs[refName] && !defs[refName].type.includes("object") &&
         !defs[refName].enum?.length
       ) {
         type = defs[refName].type;

src/i18n/locales/en.json

@@ -14,11 +14,11 @@
   },
   "path": {
     "notName": "{{url}} [{{method}}] cannot get the method name, so it will be ignored.",
-    "duplicate": "{{url}} [{{method}}] has the same method name {{name}}, you can set the `--actionIndex` option."
+    "duplicate": "{{url}} [{{method}}] has the same method name {{name}}, you can set the `--actionIndex` option, or add `operationId` for each method."
   },
   "app": {
     "apiJsonFileError": "API file parsing failed. Reason: {{error}}",
-    "generateFileDone": "API file is generated:"
+    "generateFileDone": "API file is generated ({{total}} apis):"
   },
   "cli": {
     "checkUpdate": "Check for updates",

src/i18n/locales/zh-CN.json

@@ -14,11 +14,11 @@
   },
   "path": {
     "notName": "{{url}} 【{{method}}】 无法获取方法名称，故忽略。",
-    "duplicate": "{{url}} 【{{method}}】 的 {{name}} 方法名重复，可设置 `--actionIndex` 选项。"
+    "duplicate": "{{url}} 【{{method}}】 的 {{name}} 方法名重复，可设置 `--actionIndex` 选项，或者为每个方法添加 `operationId`。"
   },
   "app": {
     "apiJsonFileError": "API 文件解析失败。原因：{{error}}",
-    "generateFileDone": "API 文件生成完成："
+    "generateFileDone": "API 文件生成完成（共 {{total}} 个接口）："
   },
   "cli": {
     "checkUpdate": "检查更新",

src/npm/pkg.json

@@ -1,6 +1,6 @@
 {
   "name": "@lonu/stc",
-  "version": "2.14.1",
+  "version": "2.14.2",
   "description": "A tool for converting OpenApi/Swagger/Apifox into code.",
   "type": "module",
   "module": "esm/mod.js",