@duxweb/dvha-core 0.1.19 → 0.1.21

package/dist/esm/hooks/json/vText.js

@@ -0,0 +1,54 @@
+import { evaluateExpression as h } from "./utils/expressionParser.js";
+function l(r) {
+  return typeof r == "string" && /\{\{.+?\}\}/.test(r);
+}
+function f(r, o) {
+  return l(r) ? r.replace(/\{\{([^}]+)\}\}/g, (c, e) => {
+    try {
+      const n = h(e.trim(), o);
+      return String(n ?? "");
+    } catch (n) {
+      return console.warn(`Interpolation expression evaluation failed: ${e}`, n), c;
+    }
+  }) : r;
+}
+const d = {
+  name: "v-text",
+  priority: 50,
+  process(r, o) {
+    const c = o._context || {};
+    let e = !1, n = !1;
+    const i = {};
+    Object.entries(o).forEach(([t, s]) => {
+      if (typeof s == "string" && l(s)) {
+        const a = f(s, c);
+        a !== s ? (i[t] = a, e = !0) : i[t] = s;
+      } else
+        i[t] = s;
+    });
+    let p = r.children;
+    if (typeof r.children == "string" && l(r.children)) {
+      const t = f(r.children, c);
+      t !== r.children && (p = t, e = !0, n = !0);
+    }
+    if (!e)
+      return null;
+    if (n) {
+      const t = {
+        ...r,
+        attrs: r.attrs,
+        children: p
+      };
+      return {
+        props: i,
+        nodes: [t]
+      };
+    }
+    return {
+      props: i
+    };
+  }
+};
+export {
+  d as vTextAdaptor
+};

package/dist/esm/hooks/json.js

@@ -0,0 +1,80 @@
+import { computed as R, isRef as A, defineComponent as _, h as b, unref as F } from "vue";
+import { defaultAdaptors as G } from "./json/index.js";
+import { injectContext as N } from "./json/utils/contextManager.js";
+function z(t) {
+  const O = (t == null ? void 0 : t.adaptors) || G, j = (t == null ? void 0 : t.components) || {}, P = R(() => A(t == null ? void 0 : t.data) ? t == null ? void 0 : t.data.value : t == null ? void 0 : t.data);
+  function V() {
+    return (A(t == null ? void 0 : t.context) ? t == null ? void 0 : t.context.value : t == null ? void 0 : t.context) || {};
+  }
+  function h(e) {
+    const r = {};
+    return Object.entries(e).forEach(([n, f]) => {
+      if (n === "_context") return;
+      const l = n === "modelValue" || n.startsWith("modelValue") || n !== "value" && (n.includes("model") || n.includes("Model"));
+      r[n] = l && A(f) ? F(f) : f;
+    }), r;
+  }
+  function s(e, r, n) {
+    return typeof e == "string" ? e : typeof e == "function" ? s(e(r), r, n) : Array.isArray(e) ? e.flatMap((f) => s(f, r, n)).filter(Boolean) : e != null && e.tag ? a(e, !0, n) : e;
+  }
+  function E(e, r, n) {
+    if (e)
+      return typeof e == "string" ? e : Array.isArray(e) ? e.flatMap((f) => typeof f == "string" ? f : a(f, r, n)).filter(Boolean) : a(e, r, n);
+  }
+  function a(e, r = !1, n = {}) {
+    const {
+      tag: f,
+      attrs: l = {},
+      children: J,
+      slots: B
+    } = e, c = {
+      ...V(),
+      ...n
+    };
+    let i = {
+      ...l
+    };
+    Object.keys(c).length > 0 && (i = {
+      ...i,
+      ...N({}, c)
+    });
+    for (const o of O) {
+      const u = o.process(e, i);
+      if (u) {
+        if (i = u.props, u.skip) return null;
+        if (u.nodes)
+          return u.nodes.map((m) => {
+            var v;
+            const y = ((v = m.attrs) == null ? void 0 : v._context) || {};
+            return a(m, r, {
+              ...c,
+              ...y
+            });
+          }).filter(Boolean);
+      }
+    }
+    const d = typeof f == "string" && j[f] ? j[f] : f, M = typeof d != "string", g = h(i);
+    if (B && M && !r) {
+      const o = {};
+      return Object.entries(B).forEach(([u, m]) => {
+        o[u] = (y = {}) => s(m, y, c);
+      }), b(d, g, o);
+    }
+    const x = E(J, r, c);
+    return M && x !== void 0 ? b(d, g, {
+      default: () => x
+    }) : b(d, g, x);
+  }
+  return {
+    render: /* @__PURE__ */ _({
+      name: "JsonSchemaRenderer",
+      render() {
+        var e;
+        return (e = P.value) == null ? void 0 : e.map((r) => a(r)).filter(Boolean);
+      }
+    })
+  };
+}
+export {
+  z as useJsonSchema
+};

package/dist/esm/hooks/list.js

@@ -0,0 +1,179 @@
+import { reactiveComputed as V, useCountdown as W } from "@vueuse/core";
+import { toRef as f, ref as r, watch as P, computed as o } from "vue";
+import { useList as X } from "./data.js";
+import { useExportCsv as I } from "./exportCsv.js";
+import { useImportCsv as Y } from "./importCsv.js";
+function ae(t) {
+  const c = f(t, "filters", {}), g = f(t, "sorters", {}), l = f(typeof t.pagination == "object" ? t.pagination : {
+    page: 1,
+    pageSize: 20
+  }), h = [10, 20, 30, 40, 50, 100], x = (e) => h.includes(e) ? h : Array.from({
+    length: 5
+  }, (a, u) => e * (u + 1)), s = r(x(l.value.pageSize));
+  P(() => l.value.pageSize, (e) => {
+    s.value.includes(e) || (s.value = x(e));
+  });
+  const k = (e) => {
+    l.value.pageSize = e, l.value.page = 1;
+  }, L = (e) => {
+    l.value.page = e;
+  }, {
+    data: i,
+    isLoading: R,
+    refetch: w
+  } = X({
+    path: t.path,
+    pagination: t.pagination ? l.value : !1,
+    filters: c.value,
+    sorters: g.value
+  }), F = o(() => {
+    var e;
+    return ((e = i.value) == null ? void 0 : e.data) || [];
+  }), S = o(() => {
+    var e;
+    return ((e = i.value) == null ? void 0 : e.meta) || {};
+  }), E = o(() => {
+    var e, a;
+    return ((e = t.total) == null ? void 0 : e.call(t, i.value)) || ((a = S.value) == null ? void 0 : a[t.totalField || "total"]) || 0;
+  }), U = o(() => Math.ceil(E.value / l.value.pageSize) || 0), A = (e) => {
+    c.value = e;
+  }, y = (e) => {
+    g.value = e;
+  }, n = r([]), z = o(() => {
+    var e, a;
+    return n.value.length > 0 && n.value.length === ((a = (e = i.value) == null ? void 0 : e.data) == null ? void 0 : a.length);
+  }), M = o(() => {
+    var e, a;
+    return n.value.length > 0 && n.value.length < (((a = (e = i.value) == null ? void 0 : e.data) == null ? void 0 : a.length) || 0);
+  }), b = (e) => {
+    const a = n.value.indexOf(e);
+    a > -1 ? n.value.splice(a, 1) : n.value.push(e);
+  }, j = (e) => {
+    n.value = e;
+  }, O = (e) => n.value.includes(e), _ = () => {
+    var e, a;
+    z.value ? n.value = [] : n.value = ((a = (e = i.value) == null ? void 0 : e.data) == null ? void 0 : a.map((u) => u[t.key || "id"]).filter((u) => u != null)) || [];
+  };
+  P(() => {
+    var e;
+    return (e = i.value) == null ? void 0 : e.data;
+  }, () => {
+    n.value = [];
+  });
+  const d = () => {
+    n.value = [], w();
+  }, m = r({
+    page: 1,
+    pageSize: 100
+  }), {
+    trigger: q,
+    isLoading: B
+  } = I({
+    path: t.path,
+    filters: c.value || {},
+    sorters: g.value || {},
+    maxPage: () => l.value.pageSize || t.exportMaxPage || 10,
+    pagination: m.value,
+    filename: t.exportFilename || "data.csv",
+    onSuccess: (e) => {
+      var a;
+      (a = t.onExportSuccess) == null || a.call(t, e), m.value.page = 1;
+    },
+    onProgress: (e) => {
+      var a;
+      (a = t.onExportProgress) == null || a.call(t, e);
+    },
+    onError: (e) => {
+      var a;
+      (a = t.onExportError) == null || a.call(t, e), m.value.page = 1;
+    }
+  }), D = V(() => ({
+    ids: n.value
+  })), {
+    trigger: G,
+    isLoading: H
+  } = I({
+    path: t.path,
+    filters: D,
+    maxPage: 1,
+    filename: t.exportFilename || "rows.csv",
+    onSuccess: (e) => {
+      var a;
+      (a = t.onExportSuccess) == null || a.call(t, e);
+    },
+    onError: (e) => {
+      var a;
+      (a = t.onExportError) == null || a.call(t, e);
+    }
+  }), {
+    open: J,
+    isLoading: K
+  } = Y({
+    path: t.path,
+    onComplete: (e) => {
+      var a;
+      (a = t.onImportSuccess) == null || a.call(t, e);
+    },
+    onProgress: (e) => {
+      var a;
+      (a = t.onImportProgress) == null || a.call(t, e);
+    },
+    onError: (e) => {
+      var a;
+      (a = t.onImportError) == null || a.call(t, e);
+    }
+  }), v = r(!1), {
+    remaining: N,
+    start: C,
+    stop: Q
+  } = W(10, {
+    onComplete: () => {
+      d(), C();
+    }
+  }), T = () => {
+    v.value = !v.value, v.value ? (d(), C()) : Q();
+  };
+  return {
+    // 数据
+    list: F,
+    meta: S,
+    isLoading: R,
+    pagination: l,
+    filters: c,
+    sorters: g,
+    onRefresh: d,
+    onUpdateFilters: A,
+    onUpdateSorters: y,
+    // 选中
+    checkeds: n,
+    isAllChecked: z,
+    isIndeterminate: M,
+    toggleChecked: b,
+    isChecked: O,
+    toggleSelectAll: _,
+    onUpdateChecked: j,
+    // 分页
+    total: E,
+    page: o(() => l.value.page),
+    pageSize: o(() => l.value.pageSize),
+    pageSizes: s.value,
+    pageCount: U,
+    onUpdatePage: L,
+    onUpdatePageSize: k,
+    // 导出
+    onExport: q,
+    isExporting: B,
+    onExportRows: G,
+    isExportingRows: H,
+    // 导入
+    onImport: J,
+    isImporting: K,
+    // 自动刷新
+    autoRefetch: v,
+    onAutoRefetch: T,
+    autoCountdown: N
+  };
+}
+export {
+  ae as useExtendList
+};

package/dist/esm/hooks/manage.js

@@ -1,22 +1,27 @@
 import { trimStart as c } from "lodash-es";
-import { inject as p } from "vue";
+import { inject as h, toRaw as w } from "vue";
+import { useRoute as x } from "vue-router";
 import "pinia";
-import { useManageStore as s } from "../stores/manage.js";
-function w(o) {
-  const e = p("dux.manage");
-  if (o || (o = e == null ? void 0 : e.value), !o)
+import { useManageStore as m } from "../stores/manage.js";
+function U(e) {
+  const n = h("dux.manage");
+  if (e || (e = n == null ? void 0 : n.value), !e)
     throw new Error("manage name is not defined");
-  const { config: t } = s(o);
+  const { config: t } = m(e), s = (o) => `${t == null ? void 0 : t.routePrefix}/${c(o || "", "/")}`, p = (o, i) => {
+    var u, f;
+    const r = (u = t == null ? void 0 : t.dataProvider) == null ? void 0 : u[i || "default"];
+    return ((f = r == null ? void 0 : r.apiUrl) == null ? void 0 : f.call(r, o)) || "";
+  }, l = x(), g = () => {
+    const o = l.path, i = (t == null ? void 0 : t.routePrefix) || "";
+    return c(o.replace(i, ""), "/");
+  };
   return {
-    config: t,
-    getRoutePath: (i) => `${t == null ? void 0 : t.routePrefix}/${c(i || "", "/")}`,
-    getApiUrl: (i, f) => {
-      var n, u;
-      const r = (n = t == null ? void 0 : t.dataProvider) == null ? void 0 : n[f || "default"];
-      return ((u = r == null ? void 0 : r.apiUrl) == null ? void 0 : u.call(r, i)) || "";
-    }
+    config: w(t),
+    getRoutePath: s,
+    getApiUrl: p,
+    getPath: g
   };
 }
 export {
-  w as useManage
+  U as useManage
 };

package/dist/esm/hooks/overlay.js

@@ -1,21 +1,24 @@
 import { useOverlayInject as t } from "@overlastic/vue";
 import "vue";
-import "clsx";
 import "vue-router";
-import { DuxOverlay as m } from "../components/overlay/overlay.js";
 import "pinia";
 import "lodash-es";
 import "@tanstack/vue-query";
 import "json-2-csv";
+import "@vee-validate/rules";
+import "vee-validate";
 import "@vueuse/core";
+import "./json/index.js";
 import "colorizr";
 import "axios";
-function h() {
+import "clsx";
+import { DuxOverlay as m } from "../components/overlay/overlay.js";
+function j() {
   const r = t(m);
   return {
     show: (o) => r(o)
   };
 }
 export {
-  h as useOverlay
+  j as useOverlay
 };

package/dist/esm/hooks/theme.js

@@ -1,16 +1,16 @@
 import { useColorMode as Q, useCycleList as W } from "@vueuse/core";
 import { hex2rgb as X } from "colorizr";
 import { storeToRefs as Y } from "pinia";
-import { watchEffect as Z, computed as m, watch as _, readonly as I } from "vue";
+import { watchEffect as Z, computed as g, watch as _, readonly as I } from "vue";
+import { themeColor as N } from "../config/color.js";
 import "lodash-es";
-import { useThemeStore as N } from "../stores/theme.js";
-import { useManage as ee } from "./manage.js";
-import { themeColor as te } from "./themeColor.js";
+import { useThemeStore as ee } from "../stores/theme.js";
+import { useManage as te } from "./manage.js";
 function de() {
   var V, M;
-  const f = N(), { mode: L } = Y(f), C = Q({
+  const f = ee(), { mode: L } = Y(f), C = Q({
     storageRef: L
-  }), h = ee(), { state: x, next: O, go: p } = W(["dark", "light", "auto"], {
+  }), h = te(), { state: x, next: O, go: p } = W(["dark", "light", "auto"], {
     initialValue: C.store.value
   });
   Z(() => {
@@ -28,20 +28,20 @@ function de() {
         p(0);
         break;
     }
-  }, b = m(() => {
+  }, b = g(() => {
     const { system: t, store: e } = C;
     return e.value === "auto" ? t.value === "dark" : e.value === "dark";
-  }), z = m(() => {
-    var t, e, r, c, i, l, o, s;
+  }), z = g(() => {
+    var t, e, o, c, i, l, r, s;
     return b.value ? {
       logo: (e = (t = h.config) == null ? void 0 : t.theme) == null ? void 0 : e.darkLogo,
-      banner: (c = (r = h.config) == null ? void 0 : r.theme) == null ? void 0 : c.darkBanner
+      banner: (c = (o = h.config) == null ? void 0 : o.theme) == null ? void 0 : c.darkBanner
     } : {
       logo: (l = (i = h.config) == null ? void 0 : i.theme) == null ? void 0 : l.logo,
-      banner: (s = (o = h.config) == null ? void 0 : o.theme) == null ? void 0 : s.banner
+      banner: (s = (r = h.config) == null ? void 0 : r.theme) == null ? void 0 : s.banner
     };
   }), n = { ...{
-    colors: te,
+    colors: N,
     // 色彩类型
     colorTypes: ["primary", "info", "success", "warning", "error", "gray"],
     // 色彩色阶
@@ -49,7 +49,7 @@ function de() {
     // 色彩场景
     colorScenes: {
       light: {
-        default: { default: "500", hover: "600", pressed: "700", focus: "500", disabled: "300" }
+        default: { default: "600", hover: "600", pressed: "700", focus: "500", disabled: "300" }
       },
       dark: {
         default: { default: "500", hover: "400", pressed: "300", focus: "500", disabled: "600" }
@@ -58,39 +58,39 @@ function de() {
     // 语义颜色
     colorSemantic: {
       light: {
-        text: { dimmed: "400", muted: "500", toned: "600", base: "700", highlighted: "900", inverted: "white" },
+        text: { dimmed: "300", muted: "400", toned: "600", base: "800", highlighted: "900", inverted: "white" },
         bg: { base: "white", muted: "50", elevated: "100", accented: "200", inverted: "900" },
-        border: { base: "200", muted: "200", accented: "300", inverted: "900" }
+        border: { base: "100", muted: "200", accented: "300", inverted: "900" }
       },
       dark: {
-        text: { dimmed: "600", muted: "500", toned: "400", base: "300", highlighted: "100", inverted: "black" },
+        text: { dimmed: "600", muted: "500", toned: "300", base: "400", highlighted: "100", inverted: "black" },
         bg: { base: "950", muted: "900", elevated: "800", accented: "700", inverted: "100" },
-        border: { base: "900", muted: "800", accented: "700", inverted: "100" }
+        border: { base: "600", muted: "800", accented: "700", inverted: "100" }
       }
     },
     colorBase: { white: "#ffffff", black: "#000000" }
-  }, ...(M = (V = h.config) == null ? void 0 : V.theme) == null ? void 0 : M.config }, { colorShades: k, colorTypes: w } = n, g = m(() => f.theme), $ = m(() => Object.keys(n.colors)), T = ["default", "hover", "pressed", "focus", "disabled"];
+  }, ...(M = (V = h.config) == null ? void 0 : V.theme) == null ? void 0 : M.config }, { colorShades: k, colorTypes: w } = n, m = g(() => f.theme), v = g(() => Object.keys(n.colors)), T = ["default", "hover", "pressed", "focus", "disabled"];
   function y() {
     return b.value ? n.colorScenes.dark : n.colorScenes.light;
   }
   function E(t, e) {
     var i;
-    const r = y(), c = r.default;
-    if ((i = r.overrides) != null && i[t]) {
-      const l = r.overrides[t], o = l == null ? void 0 : l[e];
-      if (o)
-        return o;
+    const o = y(), c = o.default;
+    if ((i = o.overrides) != null && i[t]) {
+      const l = o.overrides[t], r = l == null ? void 0 : l[e];
+      if (r)
+        return r;
     }
     return c[e] || "500";
   }
   function j(t, e) {
     var c;
-    const r = g.value[t];
-    return ((c = n.colors[r]) == null ? void 0 : c[e]) || "";
+    const o = m.value[t];
+    return ((c = n.colors[o]) == null ? void 0 : c[e]) || "";
   }
-  function a(t, e, r) {
+  function a(t, e, o) {
     const i = (b.value ? n.colorSemantic.dark : n.colorSemantic.light)[t][e];
-    return i === "white" || i === "black" ? `var(--ui-color-${i})` : `var(--base-color-${r}-${i})`;
+    return i === "white" || i === "black" ? `var(--ui-color-${i})` : `var(--base-color-${o}-${i})`;
   }
   const S = (t) => {
     const e = X(t);
@@ -99,43 +99,43 @@ function de() {
   function D() {
     var i, l;
     const t = [];
-    Object.entries(n.colors).forEach(([o, s]) => {
+    Object.entries(n.colors).forEach(([r, s]) => {
       typeof s == "object" && Object.entries(s).forEach(([u, d]) => {
         try {
-          t.push(`--base-color-${o}-${u}: ${S(d)};`);
+          t.push(`--base-color-${r}-${u}: ${S(d)};`);
         } catch {
-          t.push(`--base-color-${o}-${u}: ${d};`);
+          t.push(`--base-color-${r}-${u}: ${d};`);
         }
       });
     });
     const e = [];
-    w.forEach((o) => {
-      const s = g.value[o];
+    w.forEach((r) => {
+      const s = m.value[r];
       k.forEach((u) => {
-        e.push(`--ui-color-${o}-${u}: var(--base-color-${s}-${u});`);
+        e.push(`--ui-color-${r}-${u}: var(--base-color-${s}-${u});`);
       }), T.forEach((u) => {
-        const d = E(o, u);
-        u === "default" ? e.push(`--ui-color-${o}: var(--base-color-${s}-${d});`) : e.push(`--ui-color-${o}-${u}: var(--base-color-${s}-${d});`);
+        const d = E(r, u);
+        u === "default" ? e.push(`--ui-color-${r}: var(--base-color-${s}-${d});`) : e.push(`--ui-color-${r}-${u}: var(--base-color-${s}-${d});`);
       });
     });
-    const r = g.value.gray, c = [
+    const o = m.value.gray, c = [
       `--ui-color-white: ${S(((i = n.colorBase) == null ? void 0 : i.white) || "#ffffff")};`,
       `--ui-color-black: ${S(((l = n.colorBase) == null ? void 0 : l.black) || "#000000")};`,
-      `--ui-text-dimmed: ${a("text", "dimmed", r)};`,
-      `--ui-text-muted: ${a("text", "muted", r)};`,
-      `--ui-text-toned: ${a("text", "toned", r)};`,
-      `--ui-text: ${a("text", "base", r)};`,
-      `--ui-text-highlighted: ${a("text", "highlighted", r)};`,
-      `--ui-text-inverted: ${a("text", "inverted", r)};`,
-      `--ui-bg: ${a("bg", "base", r)};`,
-      `--ui-bg-muted: ${a("bg", "muted", r)};`,
-      `--ui-bg-elevated: ${a("bg", "elevated", r)};`,
-      `--ui-bg-accented: ${a("bg", "accented", r)};`,
-      `--ui-bg-inverted: ${a("bg", "inverted", r)};`,
-      `--ui-border: ${a("border", "base", r)};`,
-      `--ui-border-muted: ${a("border", "muted", r)};`,
-      `--ui-border-accented: ${a("border", "accented", r)};`,
-      `--ui-border-inverted: ${a("border", "inverted", r)};`
+      `--ui-text-dimmed: ${a("text", "dimmed", o)};`,
+      `--ui-text-muted: ${a("text", "muted", o)};`,
+      `--ui-text-toned: ${a("text", "toned", o)};`,
+      `--ui-text: ${a("text", "base", o)};`,
+      `--ui-text-highlighted: ${a("text", "highlighted", o)};`,
+      `--ui-text-inverted: ${a("text", "inverted", o)};`,
+      `--ui-bg: ${a("bg", "base", o)};`,
+      `--ui-bg-muted: ${a("bg", "muted", o)};`,
+      `--ui-bg-elevated: ${a("bg", "elevated", o)};`,
+      `--ui-bg-accented: ${a("bg", "accented", o)};`,
+      `--ui-bg-inverted: ${a("bg", "inverted", o)};`,
+      `--ui-border: ${a("border", "base", o)};`,
+      `--ui-border-muted: ${a("border", "muted", o)};`,
+      `--ui-border-accented: ${a("border", "accented", o)};`,
+      `--ui-border-inverted: ${a("border", "inverted", o)};`
     ];
     return `:root {
   ${t.join(`
@@ -146,19 +146,19 @@ function de() {
   `)}
 }`;
   }
-  let v = null;
+  let $ = null;
   function B() {
     const t = D();
-    v || (v = document.createElement("style"), v.id = "dvha-variables", document.head.appendChild(v)), v.textContent = t;
+    $ || ($ = document.createElement("style"), $.id = "dvha-variables", document.head.appendChild($)), $.textContent = t;
   }
   function G() {
     f.cssInit || (f.setCssInit(), B());
   }
-  _([g, b], () => {
+  _([m, b], () => {
     f.cssInit && B();
   }, { deep: !0, immediate: !1 });
   function U(t, e) {
-    $.value.includes(e) ? f.setThemeColor(t, e) : console.warn(`Color "${e}" is not available`);
+    v.value.includes(e) ? f.setThemeColor(t, e) : console.warn(`Color "${e}" is not available`);
   }
   function q(t) {
     f.setThemeColors(t);
@@ -166,18 +166,18 @@ function de() {
   function A() {
     f.resetTheme();
   }
-  function F(t, e, r = !1) {
-    return r ? `rgb(var(--ui-color-${t}-${e}))` : j(t, e);
+  function F(t, e, o = !1) {
+    return o ? `--ui-color-${t}-${e}` : j(t, e);
   }
-  function H(t, e, r = !1) {
-    if (e || (e = "default"), r)
-      return e === "default" ? `rgb(var(--ui-color-${t}))` : `rgb(var(--ui-color-${t}-${e}))`;
+  function H(t, e, o = !1) {
+    if (e || (e = "default"), o)
+      return e === "default" ? `--ui-color-${t})` : `--ui-color-${t}-${e})`;
     const c = E(t, e);
     return j(t, c);
   }
-  function J(t, e, r = !1) {
-    var o, s, u;
-    if (r) {
+  function J(t, e, o = !1) {
+    var r, s, u;
+    if (o) {
       let d;
       switch (t) {
         case "text":
@@ -192,17 +192,17 @@ function de() {
         default:
           d = `--ui-${t}-${e}`;
       }
-      return `rgb(var(${d}))`;
+      return `${d}`;
     }
-    const c = g.value.gray, l = (b.value ? n.colorSemantic.dark : n.colorSemantic.light)[t][e];
-    return l === "white" ? ((o = n.colorBase) == null ? void 0 : o.white) || "#ffffff" : l === "black" ? ((s = n.colorBase) == null ? void 0 : s.black) || "#000000" : ((u = n.colors[c]) == null ? void 0 : u[l]) || "";
+    const c = m.value.gray, l = (b.value ? n.colorSemantic.dark : n.colorSemantic.light)[t][e];
+    return l === "white" ? ((r = n.colorBase) == null ? void 0 : r.white) || "#ffffff" : l === "black" ? ((s = n.colorBase) == null ? void 0 : s.black) || "#000000" : ((u = n.colors[c]) == null ? void 0 : u[l]) || "";
   }
-  const K = m(() => {
+  const K = g(() => {
     var t;
-    return (t = $.value) == null ? void 0 : t.filter((e) => ["slate", "gray", "zinc", "neutral", "stone"].includes(e));
-  }), P = m(() => {
+    return (t = v.value) == null ? void 0 : t.filter((e) => ["slate", "gray", "zinc", "neutral", "stone"].includes(e));
+  }), P = g(() => {
     var t;
-    return (t = $.value) == null ? void 0 : t.filter((e) => !["slate", "gray", "zinc", "neutral", "stone"].includes(e));
+    return (t = v.value) == null ? void 0 : t.filter((e) => !["slate", "gray", "zinc", "neutral", "stone"].includes(e));
   });
   return {
     toggle: O,
@@ -211,8 +211,8 @@ function de() {
     isDark: b,
     resources: z,
     config: I(n),
-    colorMapping: I(g),
-    colors: $,
+    colorMapping: I(m),
+    colors: v,
     neutralColors: K,
     primaryColors: P,
     colorShades: k,