@dazhicheng/utils 1.3.14 → 1.3.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dazhicheng/utils",
-  "version": "1.3.14",
+  "version": "1.3.16",
   "description": "工具库",
   "main": "./dist/index.esm.js",
   "type": "module",

package/src/openapi.ts

@@ -1,4 +1,5 @@
 import type { GenerateServiceProps } from "@dazhicheng/openapi";
+import type { APIDataType } from "@dazhicheng/openapi/serviceGenerator";
 import { ttOpenAPI } from "@dazhicheng/openapi";
 import process from "node:process";
 
@@ -55,35 +56,60 @@ export async function runOpenAPI(
 
   const services = getServices(env as any);
 
+  /**
+   * @description 将路径模板转成名称：按 `/` 分段，去掉路径变量（如 `${id}`、`{id}`），
+   * 再把剩余段从右往左拼成驼峰（最后一段保持原样作为基底，向左各段首字母大写后拼到前面）。
+   * 例如：`/api/user/${id}/profile` → `profileUserApi`，`/order/{orderId}` → `order`。
+   */
+  function pathToName(pathTemplate: string): string {
+    // 同时过滤 ${var} 与 {var} 形式的路径变量
+    const VARIABLE_PATTERN = /^\$?\{[^}]+\}$/;
+    const parts = pathTemplate.split("/").filter(part => part && !VARIABLE_PATTERN.test(part));
+    return parts
+      .slice()
+      .reverse()
+      .reduce<string>(
+        (name, tag, index) => (index === 0 ? tag : name + tag.charAt(0).toUpperCase() + tag.slice(1)),
+        "",
+      );
+  }
+
   const commonHook = {
-    customFunctionName(data: any) {
-      const name = data.operationId!.split("_")[0];
-      const reserved = [
-        "export",
-        "import",
-        "delete",
-        "default",
-        "class",
-        "new",
-        "return",
-        "switch",
-        "case",
-        "throw",
-        "try",
-        "catch",
-        "finally",
-        "const",
-        "let",
-        "var",
-        "function",
-        "page",
-        "list",
-      ];
-      if (reserved.includes(name)) {
-        const tag = data.path?.split("/").filter(Boolean)[0] || "";
-        return `${name}${tag.charAt(0).toUpperCase() + tag.slice(1)}`;
-      }
-      return name!;
+    customFunctionName(data: APIDataType & { _namesWithNumericSuffix: Set<string> }) {
+      // const reserved = [
+      //   "export",
+      //   "import",
+      //   "delete",
+      //   "default",
+      //   "class",
+      //   "new",
+      //   "return",
+      //   "switch",
+      //   "case",
+      //   "throw",
+      //   "try",
+      //   "catch",
+      //   "finally",
+      //   "const",
+      //   "let",
+      //   "var",
+      //   "function",
+      //   // 配合后端的特殊字段
+      //   "page",
+      //   "list",
+      //   "matchConfig",
+      //   "enableDisable",
+      //   "exportExcel",
+      //   "selectList",
+      //   "queryById",
+      // ];
+      // const name = data.operationId!.split("_")[0]!;
+      // if (reserved.includes(name)) {
+      //   const tag = data.path?.split("/").filter(Boolean)[0] || "";
+      //   return `${name}${tag.charAt(0).toUpperCase() + tag.slice(1)}`;
+      // }
+      // return name;
+      return pathToName(data.path);
     },
     customFileNames(operationObject: any, apiPath: string) {
       const segments = apiPath.split("/").filter(Boolean);