@dazhicheng/utils 1.3.38 → 1.3.39

package/dist/tool.d.ts

@@ -42,6 +42,20 @@ export declare function setDifferenceObj(keyObj: any, oldObj: any, v: any, k: an
 export declare function setDifferenceArr(keyObj: any, oldObj: any, v: any[], k: any, r: any): void;
 /** 脏数据检测方法--设置普通字段 */
 export declare function setDifferenceField(keyObj: any, oldObj: any, v: any[], k: any, r: any): void;
+/**
+ * 对比两个对象的差异，返回差异的字段和值
+ * @param o - 原始对象
+ * @param n - 新对象
+ * @param option - 可选参数，包含排除的字段，排除字段不参与对比 e.g { excludeAll: [], exclude: [], xxx: { exclude: [] } }
+ * @param option.excludeAll - 全局排除的字段，所有对比都会排除这些字段
+ * @param option.exclude - 局部排除的字段，只有当前对比会排除这些字段
+ * @returns 差异的字段和值
+ */
+export declare function compareObjects(o: Record<string, any>, n: Record<string, any>, option?: {
+    excludeAll?: string[];
+    exclude?: string[];
+    [k: string]: any;
+}): Record<string, any>;
 export declare function deepMerge<T = any>(src?: any, target?: any): T;
 export declare function toCssUnit(val?: number | string, unit?: string): string;
 /** 响应式绑定 */
@@ -117,7 +131,7 @@ export declare function omit<T, TKeys extends keyof T>(obj: T, keys: TKeys[]): O
  */
 export declare function debounce<TArgs extends any[], TReturn = any>(func: (...args: TArgs) => TReturn, delay?: number, options?: DebounceSettings): DebounceFunction<TArgs, TReturn>;
 export type DebounceFunction<TArgs extends any[], TReturn = any> = {
-    (...args: TArgs): TReturn;
+    (...args: TArgs): TReturn | undefined;
     /**
      * Cancels the debounced function
      */
@@ -129,5 +143,5 @@ export type DebounceFunction<TArgs extends any[], TReturn = any> = {
     /**
      * Runs the debounced function immediately
      */
-    flush: (...args: TArgs) => TReturn;
+    flush: (...args: TArgs) => TReturn | undefined;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dazhicheng/utils",
-  "version": "1.3.38",
+  "version": "1.3.39",
   "description": "工具库",
   "main": "./dist/index.esm.js",
   "type": "module",
@@ -51,13 +51,13 @@
     "defu": "^6.1.4",
     "klona": "^2.0.6",
     "tailwind-merge": "^3.5.0",
-    "@dazhicheng/openapi": "1.1.10"
+    "@dazhicheng/openapi": "1.1.11"
   },
   "peerDependencies": {
-    "axios": "^1.0.0",
-    "element-plus": "^2.7.0",
-    "lodash-es": "^4.0.0",
-    "vue": "^3.5.0"
+    "axios": "^1.13.4",
+    "element-plus": "^2.13.7",
+    "lodash-es": "^4.17.23",
+    "vue": "^3.5.21"
   },
   "scripts": {
     "build": "rimraf dist && node ../../scripts/build.js utils",

package/src/openapi.ts

@@ -1,168 +1,168 @@
-import type { GenerateServiceProps } from "@dazhicheng/openapi";
-import type { APIDataType } from "@dazhicheng/openapi/serviceGenerator";
-import { ttOpenAPI } from "@dazhicheng/openapi";
-import process from "node:process";
-
-type DevConfig = "dev" | "sit" | "main";
-
-/**
- * 将 kebab-case 或 snake_case 转为 PascalCase，如 user-center → UserCenter
- */
-function toPascalCase(str: string): string {
-  return str
-    .split(/[-_]/)
-    .map(s => s.charAt(0).toUpperCase() + s.slice(1))
-    .join("");
-}
-
-type BasicAuthCredential = {
-  username: string;
-  password: string;
-};
-
-function toBasicAuthorization(credential?: BasicAuthCredential) {
-  if (!credential?.username || !credential?.password) {
-    return undefined;
-  }
-  return `Basic ${Buffer.from(`${credential.username}:${credential.password}`).toString("base64")}`;
-}
-
-export async function runOpenAPI(
-  envConfig: Record<string, string> = {
-    dev: "192.168.128.215:11000",
-    sit: "192.168.129.178:9768",
-    main: "192.168.129.178:9768",
-  },
-  servicesData: Record<string, string[]> = {
-    // iam: [],
-    // rule: ["/procurementTicketConfig/delete"],
-    //   basic: [],
-  },
-  authorization?:
-    | string
-    | ((ctx: { env: DevConfig; host: string }) => Promise<string | undefined> | string | undefined),
-  authConfig: Record<DevConfig, BasicAuthCredential> = {
-    dev: { username: "swadmin", password: "tt123456!" },
-    sit: { username: "swadmin", password: "tt123456!" },
-    main: { username: "swadmin", password: "tt123456!" },
-  },
-) {
-  const _envConfig = envConfig;
-
-  const envs = Object.keys(_envConfig) as Env[];
-
-  const env = process.argv[2];
-
-  if (!env || !envs.includes(env as any)) {
-    console.error(`❌ 请传入环境参数: pnpm openapi ${envs.join(" | ")}`);
-    process.exit(1);
-  }
-
-  type Env = keyof typeof _envConfig;
-
-  const microServices = servicesData;
-
-  function getServices(env: Env): GenerateServiceProps[] {
-    const host = _envConfig[env];
-    return Object.entries(microServices).map(([name, paths]) => ({
-      schemaPath: `http://${host}/${name}/v3/api-docs`,
-      serversPath: "./src/api",
-      projectName: name,
-      namespace: `${toPascalCase(name)}API`,
-      requestLibPath: "import request from '@/utils/http'",
-      // 指定生成某些接口，不传则全量生成
-      specifiedPaths: paths,
-      apiPrefix: name,
-    }));
-  }
-
-  const services = getServices(env as DevConfig);
-  const host = _envConfig[env as Env];
-
-  async function resolveAuthorization() {
-    if (!authorization) {
-      return toBasicAuthorization(authConfig?.[env as DevConfig]);
-    }
-    if (typeof authorization === "string") {
-      return authorization;
-    }
-    return authorization({ env: env as DevConfig, host: host as string });
-  }
-
-  /**
-   * @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: 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);
-      return segments[0] ? [segments[0]] : [];
-    },
-  };
-
-  for (const config of services) {
-    console.log(`🚀 [${env}] 正在生成: ${config.projectName} -> ${config.schemaPath}`);
-    try {
-      const authHeader = await resolveAuthorization();
-      await ttOpenAPI({
-        ...config,
-        authorization: authHeader,
-        isCamelCase: true,
-        hook: commonHook,
-      });
-      console.log(`✅ ${config.projectName} 生成完成`);
-    } catch (error: any) {
-      console.error(`❌ ${config.projectName} 生成失败: ${error.message}`);
-    }
-  }
-}
+import type { GenerateServiceProps } from "@dazhicheng/openapi";
+import type { APIDataType } from "@dazhicheng/openapi/serviceGenerator";
+import { ttOpenAPI } from "@dazhicheng/openapi";
+import process from "node:process";
+
+type DevConfig = "dev" | "sit" | "main";
+
+/**
+ * 将 kebab-case 或 snake_case 转为 PascalCase，如 user-center → UserCenter
+ */
+function toPascalCase(str: string): string {
+  return str
+    .split(/[-_]/)
+    .map(s => s.charAt(0).toUpperCase() + s.slice(1))
+    .join("");
+}
+
+type BasicAuthCredential = {
+  username: string;
+  password: string;
+};
+
+function toBasicAuthorization(credential?: BasicAuthCredential) {
+  if (!credential?.username || !credential?.password) {
+    return undefined;
+  }
+  return `Basic ${Buffer.from(`${credential.username}:${credential.password}`).toString("base64")}`;
+}
+
+export async function runOpenAPI(
+  envConfig: Record<string, string> = {
+    dev: "192.168.128.215:11000",
+    sit: "192.168.129.178:9768",
+    main: "192.168.129.178:9768",
+  },
+  servicesData: Record<string, string[]> = {
+    // iam: [],
+    // rule: ["/procurementTicketConfig/delete"],
+    //   basic: [],
+  },
+  authorization?:
+    | string
+    | ((ctx: { env: DevConfig; host: string }) => Promise<string | undefined> | string | undefined),
+  authConfig: Record<DevConfig, BasicAuthCredential> = {
+    dev: { username: "swadmin", password: "tt123456!" },
+    sit: { username: "swadmin", password: "tt123456!" },
+    main: { username: "swadmin", password: "tt123456!" },
+  },
+) {
+  const _envConfig = envConfig;
+
+  const envs = Object.keys(_envConfig) as Env[];
+
+  const env = process.argv[2];
+
+  if (!env || !envs.includes(env as any)) {
+    console.error(`❌ 请传入环境参数: pnpm openapi ${envs.join(" | ")}`);
+    process.exit(1);
+  }
+
+  type Env = keyof typeof _envConfig;
+
+  const microServices = servicesData;
+
+  function getServices(env: Env): GenerateServiceProps[] {
+    const host = _envConfig[env];
+    return Object.entries(microServices).map(([name, paths]) => ({
+      schemaPath: `http://${host}/${name}/v3/api-docs`,
+      serversPath: "./src/api",
+      projectName: name,
+      namespace: `${toPascalCase(name)}API`,
+      requestLibPath: "import request from '@/utils/http'",
+      // 指定生成某些接口，不传则全量生成
+      specifiedPaths: paths,
+      apiPrefix: name,
+    }));
+  }
+
+  const services = getServices(env as DevConfig);
+  const host = _envConfig[env as Env];
+
+  async function resolveAuthorization() {
+    if (!authorization) {
+      return toBasicAuthorization(authConfig?.[env as DevConfig]);
+    }
+    if (typeof authorization === "string") {
+      return authorization;
+    }
+    return authorization({ env: env as DevConfig, host: host as string });
+  }
+
+  /**
+   * @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: 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);
+      return segments[0] ? [segments[0]] : [];
+    },
+  };
+
+  for (const config of services) {
+    console.log(`🚀 [${env}] 正在生成: ${config.projectName} -> ${config.schemaPath}`);
+    try {
+      const authHeader = await resolveAuthorization();
+      await ttOpenAPI({
+        ...config,
+        authorization: authHeader,
+        isCamelCase: true,
+        hook: commonHook,
+      });
+      console.log(`✅ ${config.projectName} 生成完成`);
+    } catch (error: any) {
+      console.error(`❌ ${config.projectName} 生成失败: ${error.message}`);
+    }
+  }
+}