@das-fed/utils 6.3.0-beta.1 → 6.3.0-beta.10

package/curring-http/type.d.ts

@@ -0,0 +1,89 @@
+import { AxiosInstance, AxiosRequestConfig, AxiosError } from 'axios';
+import { Ref } from 'vue';
+
+
+/** 请求工具配置项 */
+export type CurringConfig = AxiosRequestConfig & {
+  /** 请求实例 */
+  axiosInstance?: AxiosInstance
+
+  /** 请求方法 */
+  method?: Method
+
+  /** 请求的body数据 */
+  data?: any
+
+  /** 请求的query数据 */
+  params?: any
+
+  /** 接口地址前缀 */
+  urlPrefix?: string
+
+  /** 标记为公共接口，不需要鉴权，默认为false */
+  public?: boolean
+
+  /** 请求成功执行的回调 */
+  onSuccess?: (res: any, config: CurringConfig) => Promise<any>
+
+  /** 请求失败执行的回调 */
+  onError?: (error: any, config: CurringConfig) => Promise<any>
+
+  /** 自定义处理请求失败执行的回调 */
+  onCustomError?: (error: any, config: CurringConfig) => Promise<any>
+
+  /** 不管请求成功或失败都会执行的回调 */
+  finally?: (config: CurringConfig) => any
+
+  /** 每次请求之前都会执行的函数 */
+  beforeRun?: (config: CurringConfig) => Promise<CurringConfig>
+
+  /** 自定义错误信息 */
+  customErrorMessage?: (
+    /** 原始错误信息 */
+    message: string,
+
+    /** 原始错误对象 */
+    error: any,
+  ) => string | null | undefined
+
+  /** 忽略错误提示 */
+  ignoreErrorMessage?: boolean
+
+  /** 接口401是否重定向到登录页 */
+  noRedireLogin?: boolean
+
+  /** 开启CSRF安全选项 */
+  csrf?: boolean
+}
+
+export type Method = 'get' | 'post' | 'put' | 'delete' | 'patch'
+
+export type CurringConfigFun = (config: CurringConfig) => CurringConfig | Promise<CurringConfig>
+
+export type CurringRes = {
+  /** 请求时返回的接口数据 */
+  data: Ref<any>
+
+  /** 请求时的错误信息 */
+  error: Ref<any>
+
+  /** 请求时的loading */
+  loading: Ref<boolean>
+
+  /** 发起请求 返回格式 [ error, data ] */
+  run: (payload?: any, config?: CurringConfig) => CurringRunRes
+
+  /** 取消请求控制器 */
+  abortController: Ref<AbortController | null>
+}
+
+/** 返回为数组 [error, data], 请求成功error为null，请求失败data为null */
+export type CurringRunRes = Promise<
+  [
+    /** 请求返回的错误信息，请求成功时为null，请求失败时为错误信息 */
+    error: { code: string | number; msg: string; error: AxiosError } | null,
+
+    /** 请求返回的接口数据，请求成功时为后端数据，请求失败时为null */
+    data: any | null,
+  ]
+>

package/directive/{auth.js → auth/index.js}

@@ -2,8 +2,7 @@ import { getUrlParams as i, flatTree as P } from "@das-fed/utils/common-tools";
 import { getSubApps as v, getPageAuth as o } from "@das-fed/utils/common-info";
 import { getEl as h } from "@das-fed/utils/directive/utils";
 const A = (e, t) => {
-  if (!e || !t)
-    return !1;
+  if (!e || !t) return !1;
   if (typeof t == "string")
     return !!e.find((s) => s.code === t);
   {
@@ -51,8 +50,7 @@ const A = (e, t) => {
       });
     else {
       const a = m(t.oldValue), n = l;
-      if (a === n)
-        return;
+      if (a === n) return;
       h(e, r).then((c) => {
         n ? b(c, s) : g(c, s);
       });

package/dom-check-in/index.js

@@ -1,8 +1,8 @@
-const o = (e) => {
-  const r = window.event;
-  let t = Number(r.clientX), n = Number(r.clientY), i = Number(e.getBoundingClientRect().left), u = Number(i + e.clientWidth), l = Number(e.getBoundingClientRect().top), c = Number(l + e.clientHeight);
-  return console.log(t, i, u, n, l, c), t > i && t < u && n > l && n < c;
+const d = (e) => {
+  const t = window.event;
+  let i = Number(t.clientX), n = Number(t.clientY), l = Number(e.getBoundingClientRect().left), u = Number(l + e.clientWidth), r = Number(e.getBoundingClientRect().top), c = Number(r + e.clientHeight);
+  return i > l && i < u && n > r && n < c;
 };
 export {
-  o as domCheckIn
+  d as domCheckIn
 };

package/dom-watcher/index.d.ts

@@ -21,5 +21,5 @@ interface Config {
  * @param config 配置
  * @returns
  */
-declare const DomWatcher: (cb: (list: MutationRecord[]) => void, dom: HTMLElement, config?: Config) => MutationObserver;
+declare const DomWatcher: (cb: (list: MutationRecord[]) => void, dom: HTMLElement, config?: Config) => any;
 export { DomWatcher };

package/esm-map.json

@@ -0,0 +1,8 @@
+{
+  "SFCWithInstall": "/with-install/index",
+  "withInstall": "/with-install/index",
+  "vAuth": "/directive/auth/index",
+  "vHoverInside": "/directive/hoverInside/index",
+  "vClickOutside": "/directive/clickOutside/index",
+  "getEl": "/directive/utils/index"
+}

package/hooks/use-get-auth/index.d.ts

@@ -1,9 +1,9 @@
 export declare const useGetAuth: () => {
-    getApplication: (code?: string, appName?: 'superadmin' | 'enterpriseadmin') => Promise<any>;
-    getMenu: (code: string, menuCode?: string, path?: string, appName?: 'superadmin' | 'enterpriseadmin') => Promise<any>;
+    getApplication: (code?: string, appName?: "superadmin" | "enterpriseadmin") => unknown;
+    getMenu: (code: string, menuCode?: string, path?: string, appName?: "superadmin" | "enterpriseadmin") => unknown;
     getAuth: (options: {
         applicationCode: string;
         menuCode: string;
         code: string;
-    }, appName?: 'superadmin' | 'enterpriseadmin') => Promise<any>;
+    }, appName?: "superadmin" | "enterpriseadmin") => unknown;
 };

package/hooks/use-get-auth/index.js

@@ -7,8 +7,7 @@ const v = T.get("/appcategory"), B = y.get("/appcategory"), C = U.get("/permissi
     let t = null, s = {};
     await A(), i === "superadmin" ? t = B().run : (s = { userType: 1 }, t = v().run);
     const [a, l] = await t(s);
-    if (a || !l || !l.length)
-      return null;
+    if (a || !l || !l.length) return null;
     const f = l.map((o) => o.apps).flat();
     return r ? f.find((o) => o.code === r) : f;
   }, g = async (r, i, t, s = "enterpriseadmin") => {
@@ -22,8 +21,7 @@ const v = T.get("/appcategory"), B = y.get("/appcategory"), C = U.get("/permissi
     const [f, e] = await a(l);
     if (f || !e || !e.length)
       return i || t ? void 0 : [];
-    if (!i && !t)
-      return e;
+    if (!i && !t) return e;
     const o = e != null && e.length ? e.filter((n) => n.routeUrl) : [], m = e != null && e.length ? e.filter((n) => !n.routeUrl && n.children).map((n) => n.children).flat() : [], p = [...o, ...m];
     let u;
     if (i)
@@ -40,10 +38,8 @@ const v = T.get("/appcategory"), B = y.get("/appcategory"), C = U.get("/permissi
     getAuth: async (r, i = "enterpriseadmin") => {
       var p;
       const t = (r == null ? void 0 : r.applicationCode) ?? "", s = (r == null ? void 0 : r.menuCode) ?? "", a = (r == null ? void 0 : r.code) ?? "";
-      if (JSON.parse(sessionStorage.getItem("permission-btn") || "{}")[s])
-        return M(null, { applicationCode: t, menuCode: s, code: a });
-      if (!await d(t, i))
-        return !1;
+      if (JSON.parse(sessionStorage.getItem("permission-btn") || "{}")[s]) return M(null, { applicationCode: t, menuCode: s, code: a });
+      if (!await d(t, i)) return !1;
       const e = await g(t, s, i);
       return !e || !(e != null && e.children) || !((p = e.children) != null && p.length) ? !1 : !!w(e.children).find((u) => {
         let c = (u == null ? void 0 : u.originalCode) ?? u.code;

package/load-js/index.d.ts

@@ -1,3 +1,3 @@
 /** 使用promise加载js的工具 */
-declare const loadJs: (src: string) => Promise<unknown>;
+declare const loadJs: (src: string) => any;
 export { loadJs };

package/load-js/index.js

@@ -1,8 +1,7 @@
 import { getConfig as r } from "@das-fed/utils/config";
 const c = (t) => {
   let { baseURL: i, publicPath: n = "" } = r();
-  if (document.getElementById(t))
-    return;
+  if (document.getElementById(t)) return;
   const e = document.createElement("script");
   return t.startsWith("/") && (t = `${i}/${n}/${t}`), t = t.replace(/\/\//g, "/").replace(/\/\//g, "/").replace("http:/", "http://").replace("https:/", "https://"), e.src = t, e.id = t, document.body.appendChild(e), new Promise((o, p) => {
     e.onload = o, e.onerror = p;

package/nextTiken/index.js

@@ -2,32 +2,28 @@ import { getToken as r, getProjectInfo as c, getPersonalInfo as s, getTenantInfo
 const k = () => new Promise((n) => {
   const e = () => {
     const t = r();
-    if (t)
-      return n(t);
+    if (t) return n(t);
     setTimeout(() => e(), 50);
   };
   e();
 }), m = () => new Promise((n) => {
   const e = () => {
     const t = c().id ? c().id : "";
-    if (t)
-      return n(t);
+    if (t) return n(t);
     setTimeout(() => e(), 50);
   };
   e();
 }), T = () => new Promise((n) => {
   const e = () => {
     const t = r(), o = c().id ? c().id : "";
-    if (t && o)
-      return n(!0);
+    if (t && o) return n(!0);
     setTimeout(() => e(), 50);
   };
   e();
 }), f = () => new Promise((n) => {
   const e = () => {
     const t = s();
-    if (t != null && t.id)
-      return n(t);
+    if (t != null && t.id) return n(t);
     setTimeout(() => e(), 50);
   };
   e();
@@ -35,8 +31,7 @@ const k = () => new Promise((n) => {
   const e = () => {
     var o;
     const t = i();
-    if ((o = t == null ? void 0 : t.tenant) != null && o.id)
-      return n(t);
+    if ((o = t == null ? void 0 : t.tenant) != null && o.id) return n(t);
     setTimeout(() => e(), 50);
   };
   e();

package/oss/index.d.ts

@@ -1,2 +1,2 @@
-declare const oss: (urlName: any) => string;
+declare const oss: (urlName: any) => any;
 export { oss };

package/oss/index.js

@@ -1,8 +1,7 @@
 import { getConfig as o } from "@das-fed/utils/config";
 const n = (r) => {
   let t = r;
-  if (!t)
-    return t;
+  if (!t) return t;
   t.startsWith("/") || (t = `/${t}`), new URL(t, import.meta.url);
   let { baseURL: e } = o();
   return `${e}/oss/resource/front-end/auto-upload/pc${t}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@das-fed/utils",
-  "version": "6.3.0-beta.1",
+  "version": "6.3.0-beta.10",
   "description": "",
   "type": "module",
   "main": "./index.js",
@@ -9,31 +9,36 @@
   "license": "ISC",
   "dependencies": {
     "@antv/x6": "^2.18.1",
+    "@das-fed/utils": "6.3.0-beta.10",
     "@vue/shared": "^3.4.21",
     "@vueuse/core": "^9.6.0",
     "axios": "^1.6.7",
     "dayjs": "^1.11.10",
     "konva": "^9.3.6",
+    "lodash-es": "^4.17.21",
     "nanoid": "3.2.0",
     "pinyin-pro": "^3.19.6",
     "vue": "^3.4.21"
   },
   "devDependencies": {
+    "@das-fed/cli": "6.3.0-beta.10",
+    "@types/lodash-es": "^4.17.12",
     "@vitejs/plugin-vue": "^5.0.4",
     "@vitejs/plugin-vue-jsx": "^3.1.0",
     "ant-design-vue": "3.2.20",
     "consola": "^3.2.3",
     "element-plus": "2.4.2",
+    "execa": "^9.3.0",
     "fast-glob": "^3.3.2",
     "fs-extra": "^11.2.0",
     "js-cookie": "^3.0.5",
-    "lodash": "^4.17.21",
+    "minimist": "^1.2.8",
     "qs": "^6.11.2",
     "vite": "^5.1.6",
     "vite-plugin-dts": "^3.7.3"
   },
   "peerDependencies": {
-    "@das-fed/utils": ">=1.0.0"
+    "vue": ">=3.4.21"
   },
   "publishConfig": {
     "access": "public",

package/pinyin-first-character/index.js

@@ -1,4 +1,4 @@
-const W = /^[\uD800-\uDBFF]$/, B = /^[\uDC00-\uDFFF]$/, H = /[\uD800-\uDBFF][\uDC00-\uDFFF]/g;
+const A = /^[\uD800-\uDBFF]$/, B = /^[\uDC00-\uDFFF]$/, H = /[\uD800-\uDBFF][\uDC00-\uDFFF]/g;
 var a;
 (function(n) {
   n[n.Unknown = 1e-13] = "Unknown", n[n.Rule = 1e-12] = "Rule", n[n.DICT = 2e-8] = "DICT", n[n.Surname = 1] = "Surname", n[n.Custom = 1] = "Custom";
@@ -9,14 +9,15 @@ const j = {
   Custom: 100
 };
 function d(n) {
-  return n.replace(H, "_").length;
+  var i;
+  return n.length - (((i = n.match(H)) === null || i === void 0 ? void 0 : i.length) || 0);
 }
 function w(n) {
   const i = [];
   let g = 0;
   for (; g < n.length; ) {
-    const h = n.charAt(g);
-    W.test(h) && B.test(n.charAt(g + 1)) ? (i.push(n.substring(g, g + 2)), g += 2) : (i.push(h), g += 1);
+    const h = n[g];
+    A.test(h) && B.test(n[g + 1]) ? (i.push(n.substring(g, g + 2)), g += 2) : (i.push(h), g += 1);
   }
   return i;
 }
@@ -4433,7 +4434,7 @@ const k = {
   ],
   "xián xuán": ["伭"],
   "nú nǔ": ["伮"],
-  "bǎi bó": ["伯"],
+  "bó bǎi": ["伯"],
   "gū gù": ["估"],
   nǐ: ["伱", "你", "儞", "孴", "拟", "擬", "旎", "晲", "狔", "苨", "薿", "隬"],
   "nì ní": ["伲"],
@@ -18868,7 +18869,7 @@ function hn(n, i, g) {
   if (gn.indexOf(n) === -1)
     return r(n);
   if (i === g && i && r(i) !== i)
-    return m(r(n));
+    return q(r(n));
   if (g && !nn[n].includes(g)) {
     const h = r(g);
     if (h !== g) {
@@ -19009,7 +19010,7 @@ const p = {
   花: "huā",
   方: "fāng",
   俞: "yú",
-  任: "rèn",
+  任: "rén",
   袁: "yuán",
   柳: "liǔ",
   酆: "fēng",
@@ -19381,8 +19382,8 @@ const p = {
   撒: "sǎ",
   甯: "nìng",
   六: "lù",
-  啜: "chuài"
-  // https://baike.baidu.com/item/%E5%95%9C%E5%A7%93/9563772
+  啜: "chuài",
+  行: "xíng"
 }, zn = Object.keys(p).map((n) => ({
   zh: n,
   pinyin: p[n],
@@ -19652,6 +19653,7 @@ const p = {
   委屈: "wěi qu",
   为期: "wéi qī",
   伯伯: "bó bo",
+  伯子: "bǎi zi",
   圈子: "quān zi",
   见识: "jiàn shi",
   笼罩: "lǒng zhào",
@@ -21467,10 +21469,7 @@ const p = {
   逐一: "zhú yī",
   周一: "zhōu yī",
   初一: "chū yī",
-  高一: "gāo yī",
-  大一: "dà yī",
   研一: "yán yī",
-  守一: "shǒu yī",
   归一: "guī yī",
   假一: "jiǎ yī",
   闻一: "wén yī",
@@ -21504,11 +21503,8 @@ const p = {
   一八: "yī bā",
   一九: "yī jiǔ",
   一又: "yī yòu",
-  // TODO:  添加更多为(二声)的词
-  一更: "yī gēng",
   一饼: "yī bǐng",
   一楼: "yī lóu",
-  一期: "yī qī",
   为例: "wéi lì",
   为准: "wéi zhǔn",
   沧海: "cāng hǎi",
@@ -21535,8 +21531,6 @@ const p = {
   空难: "kōng nàn",
   喜欢: "xǐ huan",
   朝朝: "zhāo zhāo",
-  行行: "háng háng",
-  哪行: "nǎ háng",
   不行: "bù xíng",
   轧轧: "yà yà",
   弯曲: "wān qū",
@@ -21552,7 +21546,8 @@ const p = {
   九曲: "jiǔ qū",
   曲折: "qū zhé",
   曲肱: "qū gōng",
-  曲意: "qū yì"
+  曲意: "qū yì",
+  仡佬: "gē lǎo"
 }, on = Object.keys(C).map((n) => ({
   zh: n,
   pinyin: C[n],
@@ -21583,7 +21578,6 @@ const p = {
   运输量: "yùn shū liàng",
   发脾气: "fā pí qi",
   士大夫: "shì dà fū",
-  仡佬族: "gē lǎo zú",
   鸭绿江: "yā lù jiāng",
   压根儿: "yà gēn er",
   对得起: "duì de qǐ",
@@ -21617,6 +21611,7 @@ const p = {
   充其量: "chōng qí liàng",
   靠得住: "kào de zhù",
   车行道: "chē xíng dào",
+  人行道: "rén xíng dào",
   中郎将: "zhōng láng jiàng",
   照明弹: "zhào míng dàn",
   烟幕弹: "yān mù dàn",
@@ -23013,7 +23008,6 @@ const p = {
   将取固予: "jiāng qǔ gù yǔ",
   将门有将: "jiàng mén yǒu jiàng",
   将夺固与: "jiāng duó gù yǔ",
-  将伯之助: "qiāng bó zhī zhù",
   槛花笼鹤: "jiàn huā lóng hè",
   鉴影度形: "jiàn yǐng duó xíng",
   渐不可长: "jiàn bù kě zhǎng",
@@ -23486,9 +23480,10 @@ const p = {
   一路公交: "yī lù gōng jiāo",
   一路汽车: "yī lù qì chē",
   一路巴士: "yī lù bā shì",
-  不行一行: "bù xíng yì háng",
   朝朝朝落: "zhāo cháo zhāo luò",
-  曲意逢迎: "qū yì féng yíng"
+  曲意逢迎: "qū yì féng yíng",
+  一行不行: "yì háng bù xíng",
+  行行不行: "háng háng bù xíng"
 }, ln = Object.keys(Z).map((n) => ({
   zh: n,
   pinyin: Z[n],
@@ -23523,7 +23518,7 @@ const p = {
 function N(n, i) {
   return n && (n.decimal < i.decimal || n.decimal === i.decimal && n.probability > i.probability) ? n : i;
 }
-function F(n) {
+function v(n) {
   n.probability < 1e-300 && (n.probability *= 1e300, n.decimal += 1);
 }
 function tn(n) {
@@ -23541,18 +23536,18 @@ function jn(n, i) {
         patterns: z.patterns,
         concatPattern: u
       };
-      F(y), g[l] = N(g[l], y), u = n[--h];
+      v(y), g[l] = N(g[l], y), u = n[--h];
     }
     const o = {
       probability: 1e-13 * z.probability,
       decimal: 0,
       patterns: z.patterns
     };
-    F(o), g[s] = N(g[s], o), g[s].concatPattern && (g[s].patterns = g[s].patterns.concat(g[s].concatPattern), g[s].concatPattern = void 0, delete g[s + 1]);
+    v(o), g[s] = N(g[s], o), g[s].concatPattern && (g[s].patterns = g[s].patterns.concat(g[s].concatPattern), g[s].concatPattern = void 0, delete g[s + 1]);
   }
   return g[0].patterns.reverse();
 }
-function O(n, i) {
+function F(n, i) {
   return n && n.count <= i.count ? n : i;
 }
 function dn(n) {
@@ -23569,13 +23564,13 @@ function xn(n, i) {
         patterns: z.patterns,
         concatPattern: u
       };
-      g[l] = O(g[l], y), u = n[--h];
+      g[l] = F(g[l], y), u = n[--h];
     }
     const o = {
       count: 1 + z.count,
       patterns: z.patterns
     };
-    g[s] = O(g[s], o), g[s].concatPattern && (g[s].patterns = g[s].patterns.concat(g[s].concatPattern), g[s].concatPattern = void 0, delete g[s + 1]);
+    g[s] = F(g[s], o), g[s].concatPattern && (g[s].patterns = g[s].patterns.concat(g[s].concatPattern), g[s].concatPattern = void 0, delete g[s + 1]);
   }
   return g[0].patterns.reverse();
 }
@@ -23593,18 +23588,18 @@ function rn(n) {
   }
   return i.reverse();
 }
-var _;
+var O;
 (function(n) {
   n[n.ReverseMaxMatch = 1] = "ReverseMaxMatch", n[n.MaxProbability = 2] = "MaxProbability", n[n.MinTokenization = 3] = "MinTokenization";
-})(_ || (_ = {}));
-class v {
+})(O || (O = {}));
+class _ {
   constructor(i, g = "", h = "") {
     this.children = /* @__PURE__ */ new Map(), this.fail = null, this.patterns = [], this.parent = i, this.prefix = g, this.key = h;
   }
 }
 class en {
   constructor() {
-    this.dictMap = /* @__PURE__ */ new Map(), this.queues = [], this.root = new v(null);
+    this.dictMap = /* @__PURE__ */ new Map(), this.queues = [], this.root = new _(null);
   }
   build(i) {
     this.buildTrie(i), this.buildFailPointer();
@@ -23617,7 +23612,7 @@ class en {
       for (let s = 0; s < h.length; s++) {
         let z = h[s];
         if (!u.children.has(z)) {
-          const o = new v(u, h.slice(0, s).join(""), z);
+          const o = new _(u, h.slice(0, s).join(""), z);
           u.children.set(z, o), this.addNodeToQueues(o);
         }
         u = u.children.get(z);
@@ -23701,7 +23696,7 @@ const wn = [
   ...zn
 ], R = new en();
 R.build(wn);
-const qn = new $(), mn = () => qn, r = (n) => {
+const mn = new $(), qn = () => mn, r = (n) => {
   const i = x.get(n);
   return i ? i.split(" ")[0] : n;
 }, fn = (n, i, g, h) => {
@@ -23746,8 +23741,8 @@ const qn = new $(), mn = () => qn, r = (n) => {
     }
   }
   return i;
-}, m = (n) => n.replace(/(ā|á|ǎ|à)/g, "a").replace(/(ō|ó|ǒ|ò)/g, "o").replace(/(ē|é|ě|è)/g, "e").replace(/(ī|í|ǐ|ì)/g, "i").replace(/(ū|ú|ǔ|ù)/g, "u").replace(/(ǖ|ǘ|ǚ|ǜ)/g, "ü").replace(/(n̄|ń|ň|ǹ)/g, "n").replace(/(m̄|ḿ|m̌|m̀)/g, "m").replace(/(ê̄|ế|ê̌|ề)/g, "ê"), A = (n, i = "off") => {
-  const g = mn();
+}, q = (n) => n.replace(/(ā|á|ǎ|à)/g, "a").replace(/(ō|ó|ǒ|ò)/g, "o").replace(/(ē|é|ě|è)/g, "e").replace(/(ī|í|ǐ|ì)/g, "i").replace(/(ū|ú|ǔ|ù)/g, "u").replace(/(ǖ|ǘ|ǚ|ǜ)/g, "ü").replace(/(n̄|ń|ň|ǹ)/g, "n").replace(/(m̄|ḿ|m̌|m̀)/g, "m").replace(/(ê̄|ế|ê̌|ề)/g, "ê"), U = (n, i = "off") => {
+  const g = qn();
   let h = x.get(n) ? x.get(n).split(" ") : [];
   if (g.get(n))
     h = g.get(n).split(" ");
@@ -23757,7 +23752,7 @@ const qn = new $(), mn = () => qn, r = (n) => {
   }
   return h;
 }, pn = (n, i = "off") => {
-  let g = A(n, i);
+  let g = U(n, i);
   return g.length > 0 ? g.map((h) => ({
     origin: n,
     result: h,
@@ -23771,7 +23766,7 @@ const qn = new $(), mn = () => qn, r = (n) => {
       originPinyin: n
     }
   ];
-}, q = (n) => {
+}, m = (n) => {
   const i = n.split(" "), g = [], h = [];
   for (let u of i)
     for (let s of Q)
@@ -23786,25 +23781,25 @@ const qn = new $(), mn = () => qn, r = (n) => {
     // 声母
   };
 }, e = (n) => {
-  const { final: i } = q(n);
+  const { final: i } = m(n);
   let g = "", h = "", u = "";
-  return K.indexOf(m(i)) !== -1 ? (g = i[0], h = i[1], u = i.slice(2)) : (h = i[0] || "", u = i.slice(1) || ""), { head: g, body: h, tail: u };
+  return K.indexOf(q(i)) !== -1 ? (g = i[0], h = i[1], u = i.slice(2)) : (h = i[0] || "", u = i.slice(1) || ""), { head: g, body: h, tail: u };
 }, f = (n) => {
   const i = /(ā|ō|ē|ī|ū|ǖ|n̄|m̄|ê̄)/, g = /(á|ó|é|í|ú|ǘ|ń|ḿ|ế)/, h = /(ǎ|ǒ|ě|ǐ|ǔ|ǚ|ň|m̌|ê̌)/, u = /(à|ò|è|ì|ù|ǜ|ǹ|m̀|ề)/, s = /(a|o|e|i|u|ü|ê)/, z = /(n|m)$/, o = [];
   return n.split(" ").forEach((y) => {
     i.test(y) ? o.push("1") : g.test(y) ? o.push("2") : h.test(y) ? o.push("3") : u.test(y) ? o.push("4") : s.test(y) || z.test(y) ? o.push("0") : o.push("");
   }), o.join(" ");
 }, an = (n, i) => {
-  const g = m(n).split(" "), h = f(i).split(" "), u = [];
+  const g = q(n).split(" "), h = f(i).split(" "), u = [];
   return g.forEach((s, z) => {
     u.push(`${s}${h[z]}`);
   }), u.join(" ");
-}, U = (n) => {
+}, W = (n) => {
   const i = [];
   return n.split(" ").forEach((h) => {
     i.push(h[0]);
   }), i.join(" ");
-}, kn = (n) => typeof n != "string" ? (console.error("The first param of pinyin is error: " + n + ' is not assignable to type "string".'), !1) : !0, Pn = (n, i) => {
+}, kn = (n) => typeof n == "string", Pn = (n, i) => {
   let g = i.nonZh;
   if (g === "removed")
     return n.filter((h) => h.isZh);
@@ -23827,17 +23822,17 @@ const qn = new $(), mn = () => qn, r = (n) => {
       break;
     case "initial":
       n.forEach((g) => {
-        g.result = g.isZh ? q(g.result).initial : "";
+        g.result = g.isZh ? m(g.result).initial : "";
       });
       break;
     case "final":
       n.forEach((g) => {
-        g.result = g.isZh ? q(g.result).final : "";
+        g.result = g.isZh ? m(g.result).final : "";
       });
       break;
     case "first":
       n.forEach((g) => {
-        g.result = U(g.result);
+        g.result = W(g.result);
       });
       break;
     case "finalHead":
@@ -23862,7 +23857,7 @@ const qn = new $(), mn = () => qn, r = (n) => {
       break;
     case "none":
       n.forEach((g) => {
-        g.isZh && (g.result = m(g.result));
+        g.isZh && (g.result = q(g.result));
       });
       break;
     case "num": {
@@ -23885,14 +23880,14 @@ const qn = new $(), mn = () => qn, r = (n) => {
     });
   }
   return i.type === "array" ? n.map((h) => h.result) : i.type === "all" ? n.map((h) => {
-    const u = h.isZh ? h.result : "", { initial: s, final: z } = q(u), { head: o, body: l, tail: y } = e(u);
+    const u = h.isZh ? h.result : "", { initial: s, final: z } = m(u), { head: o, body: l, tail: y } = e(u);
     let c = [];
-    return u !== "" && (c = [u].concat(A(h.origin, i.surname).filter((t) => t !== u))), {
+    return u !== "" && (c = [u].concat(U(h.origin, i.surname).filter((t) => t !== u))), {
       origin: h.origin,
       pinyin: u,
       initial: s,
       final: z,
-      first: h.isZh ? U(h.result) : "",
+      first: h.isZh ? W(h.result) : "",
       finalHead: o,
       finalBody: l,
       finalTail: y,