@das-fed/upf-utils 6.4.0-dev.186 → 6.4.0-dev.188

package/common-tools/handle-data/index.js

@@ -1,130 +1,149 @@
-import { getConfig as I } from "@das-fed/upf-utils/config";
-const m = /* @__PURE__ */ new Map(), E = /* @__PURE__ */ new Map(), M = 3e5, F = (c) => c === null || typeof c > "u" || c === "", O = (c) => {
-  var t;
-  return (((t = I()) == null ? void 0 : t.systemLangList) || ["zh-CN", "en-US", "zh-MO"]).includes(c);
-}, S = async (c) => {
-  const U = c || {};
+import { getConfig as _ } from "@das-fed/upf-utils/config";
+const M = (f) => f === null || typeof f > "u" || f === "", z = (f) => {
+  var n;
+  return (((n = _()) == null ? void 0 : n.systemLangList) || ["zh-CN", "en-US", "zh-MO"]).includes(f);
+}, A = async (f) => {
+  const x = f || {};
   let {
-    currentLang: t = "zh-CN",
-    baseUrl: o = "/",
-    appName: g = "jc",
-    isPullFrontEnd: _ = !0,
+    currentLang: n = "zh-CN",
+    baseUrl: c = "/",
+    appName: h = "jc",
+    isPullFrontEnd: L = !0,
     isPullBack: N = !1,
-    isDasUI: x = !1,
-    fallbackBaseUrl: r = ""
-  } = U;
-  (typeof t != "string" || !t) && (t = "zh-CN");
-  let f = [];
-  Array.isArray(g) ? (f = g.filter((a) => typeof a == "string" && a), f.length === 0 && (f = ["jc"])) : typeof g == "string" && g ? f = [g] : f = ["jc"], typeof o != "string" && (o = "/"), o || (o = "/"), o.endsWith("/") || (o = o + "/"), typeof r != "string" && (r = ""), r && !r.endsWith("/") && (r = r + "/");
-  const d = {
+    isDasUI: O = !1,
+    fallbackBaseUrl: a = ""
+  } = x;
+  (typeof n != "string" || !n) && (n = "zh-CN");
+  let l = [];
+  Array.isArray(h) ? (l = h.filter((r) => typeof r == "string" && r), l.length === 0 && (l = ["jc"])) : typeof h == "string" && h ? l = [h] : l = ["jc"], typeof c != "string" && (c = "/"), c || (c = "/"), c.endsWith("/") || (c = c + "/"), typeof a != "string" && (a = ""), a && !a.endsWith("/") && (a = a + "/");
+  const y = {
     frontEnd: null,
     // 统一格式：{ appName1: data1, appName2: data2, ... }
     dasUiEnd: null,
     backMsg: null
     // 统一格式：{ appName1: data1, appName2: data2, ... }
   };
-  let w = !1;
-  const k = async (a, s, h = "zh-CN", $ = "资源") => {
-    const u = async (l) => {
+  let m = !1;
+  const j = async (r, s, $ = "zh-CN", w = "资源") => {
+    const u = async (i) => {
       try {
         if (typeof window < "u" && typeof window.fetch == "function") {
-          const n = await window.fetch(l, { cache: "no-cache" });
-          return !n || !n.ok ? null : await n.text();
+          const o = await window.fetch(i, { cache: "no-cache" });
+          return !o || !o.ok ? null : await o.text();
         } else
-          return await new Promise((n) => {
+          return await new Promise((o) => {
             try {
-              const e = new XMLHttpRequest();
-              e.open("GET", l, !0), e.onreadystatechange = function() {
-                e.readyState === 4 && n(e.status >= 200 && e.status < 300 ? e.responseText : null);
-              }, e.onerror = function() {
-                n(null);
-              }, e.send();
+              const t = new XMLHttpRequest();
+              t.open("GET", i, !0), t.onreadystatechange = function() {
+                t.readyState === 4 && o(t.status >= 200 && t.status < 300 ? t.responseText : null);
+              }, t.onerror = function() {
+                o(null);
+              }, t.send();
             } catch {
-              n(null);
+              o(null);
             }
           });
       } catch {
         return null;
       }
-    }, C = (l) => {
-      const n = (l || "").replace(/^\uFEFF/, "");
+    }, F = (i) => {
+      if (!i || typeof i != "string")
+        return null;
+      const t = i.replace(/^\uFEFF/, "").trim();
+      if (t.startsWith("{"))
+        try {
+          const e = JSON.parse(t);
+          if (e && typeof e == "object")
+            return e;
+        } catch {
+        }
+      const b = t.match(/export\s+default\s*/);
+      if (!b || b.index === void 0)
+        return null;
       try {
-        const e = n.trim();
-        if (/^export\s+default\s*\{[\s\S]*\}\s*;?$/m.test(e)) {
-          let i = e.replace(/\/\*[\s\S]*?\*\//g, "").replace(/(^|\n)\s*\/\/.*(?=\n|$)/g, "$1");
-          const p = i.indexOf("{"), y = i.lastIndexOf("}");
-          if (p !== -1 && y !== -1 && y > p)
-            return i = i.slice(p, y + 1), i = i.replace(/,\s*([}\]])/g, "$1"), JSON.parse(i);
+        let e = t.substring(b.index);
+        if (e = e.replace(/\/\*[\s\S]*?\*\//g, "").replace(/(^|\n)\s*\/\/.*(?=\n|$)/g, "$1").trim(), e = e.replace(/^\s*export\s+default\s*/, "").replace(/;?\s*$/, "").trim(), !e)
+          return null;
+        try {
+          const d = new Function(`return ${e}`)();
+          if (d && typeof d == "object")
+            return d;
+        } catch {
+        }
+        try {
+          const g = e.indexOf("{"), d = e.lastIndexOf("}");
+          if (g === -1 || d === -1 || d <= g)
+            return null;
+          let p = e.slice(g, d + 1);
+          p = p.replace(
+            /([{,]\s*)([a-zA-Z_$][a-zA-Z0-9_$]*)\s*:/g,
+            '$1"$2":'
+          ), p = p.replace(/'([^'\\]*(\\.[^'\\]*)*)'/g, '"$1"'), p = p.replace(/,\s*([}\]])/g, "$1");
+          const E = JSON.parse(p);
+          if (E && typeof E == "object")
+            return E;
+        } catch {
         }
+        return null;
       } catch {
         return null;
       }
-    }, b = async (l) => {
-      if (!l) return null;
-      const n = l, e = Date.now(), i = E.get(n);
-      if (i && e - i.t <= M)
-        return i.ok ? i.value ?? null : null;
-      if (m.has(n)) return m.get(n);
-      const p = (async () => {
-        const y = await u(n);
-        if (!y)
-          return E.set(n, { ok: !1, value: null, t: e }), null;
-        const L = C(y);
-        return E.set(n, { ok: !0, value: L, t: Date.now() }), L ?? null;
-      })();
-      m.set(n, p);
-      try {
-        return await p;
-      } finally {
-        m.delete(n);
-      }
-    }, j = await b(a);
-    if (j) return j;
-    if (s && O(h)) {
-      const l = await b(s);
-      if (l) return l;
+    }, U = async (i) => {
+      if (!i) return null;
+      const o = await u(i);
+      if (!o)
+        return null;
+      const t = F(o);
+      return t !== null && typeof t == "object" ? t : null;
+    }, k = await U(r);
+    if (k)
+      return k;
+    if (s && z($)) {
+      const i = await U(s);
+      if (i)
+        return i;
     }
     return null;
   };
-  if (_) {
-    const a = {};
-    for (const s of f) {
-      const h = `${o}front-end/i18n/front-end-page/${s}_${t}.js`, $ = r ? `${r}front-end/i18n/front-end-page/${s}_${t}.js` : void 0, u = await k(
-        h,
+  if (L) {
+    const r = {};
+    for (const s of l) {
+      const $ = `${c}front-end/i18n/front-end-page/${s}_${n}.js`, w = a ? `${a}front-end/i18n/front-end-page/${s}_${n}.js` : void 0, u = await j(
         $,
-        t,
+        w,
+        n,
         `前端业务语言资源(${s})`
       );
-      u && (a[s] = u, w = !0);
+      u && (r[s] = u, m = !0);
     }
-    Object.keys(a).length > 0 && (d.frontEnd = a);
+    Object.keys(r).length > 0 && (y.frontEnd = r);
   }
   if (N) {
-    const a = {};
-    for (const s of f) {
-      const h = `${o}front-end/i18n/return-msg/${s}_${t}.js`, $ = r ? `${r}front-end/i18n/return-msg/${s}_${t}.js` : void 0, u = await k(
-        h,
+    const r = {};
+    for (const s of l) {
+      const $ = `${c}front-end/i18n/return-msg/${s}_${n}.js`, w = a ? `${a}front-end/i18n/return-msg/${s}_${n}.js` : void 0, u = await j(
         $,
-        t,
+        w,
+        n,
         `后端语言资源(${s})`
       );
-      u && (a[s] = u, w = !0);
+      u && (r[s] = u, m = !0);
     }
-    Object.keys(a).length > 0 && (d.backMsg = a);
+    Object.keys(r).length > 0 && (y.backMsg = r);
   }
-  if (x) {
-    const a = `${o}front-end/i18n/front-end-page/dasui_${t}.js`, s = r ? `${r}front-end/i18n/front-end-page/dasui_${t}.js` : void 0;
-    d.dasUiEnd = await k(
-      a,
+  if (O) {
+    const r = `${c}front-end/i18n/front-end-page/dasui_${n}.js`, s = a ? `${a}front-end/i18n/front-end-page/dasui_${n}.js` : void 0;
+    y.dasUiEnd = await j(
+      r,
       s,
-      t,
+      n,
       "UI组件库语言资源"
-    ), d.dasUiEnd && (w = !0);
+    ), y.dasUiEnd && (m = !0);
   }
-  return d;
+  return y;
 };
 export {
-  S as handleI18nData,
-  O as isCurrentLangInSysLang,
-  F as isEmpty
+  A as handleI18nData,
+  z as isCurrentLangInSysLang,
+  M as isEmpty
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@das-fed/upf-utils",
-  "version": "6.4.0-dev.186",
+  "version": "6.4.0-dev.188",
   "description": "",
   "type": "module",
   "main": "./index.js",
@@ -9,7 +9,7 @@
   "license": "ISC",
   "dependencies": {
     "@antv/x6": "^2.18.1",
-    "@das-fed/upf-utils": "6.4.0-dev.186",
+    "@das-fed/upf-utils": "6.4.0-dev.188",
     "@vue/shared": "^3.4.21",
     "@vueuse/core": "^9.6.0",
     "axios": "^1.6.7",
@@ -22,8 +22,8 @@
   },
   "devDependencies": {
     "@babel/preset-env": "7.26.0",
-    "@das-fed/upf-cli": "6.4.0-dev.186",
-    "@das-fed/upf-web": "6.4.0-dev.186",
+    "@das-fed/upf-cli": "6.4.0-dev.188",
+    "@das-fed/upf-web": "6.4.0-dev.188",
     "@rollup/plugin-babel": "6.0.4",
     "@types/js-cookie": "^3.0.6",
     "@types/lodash-es": "^4.17.12",