@vtj/coder 0.18.15 → 0.18.16

package/dist/index.mjs

@@ -1,22 +1,22 @@
-import { mitt as ye, base64 as Se, dedupArray as B, toArray as je, kebabCase as F, camelCase as A, isPlainObject as ke, isString as we, template as W, cloneDeep as Ie } from "@vtj/base";
-import { format as H } from "prettier/standalone";
+import { mitt as ye, base64 as Se, dedupArray as M, toArray as je, kebabCase as J, camelCase as A, isPlainObject as ke, isString as we, template as H, cloneDeep as Ie } from "@vtj/base";
+import { format as V } from "prettier/standalone";
 import * as Oe from "prettier/plugins/html";
-import * as Q from "prettier/plugins/babel";
-import * as X from "prettier/plugins/postcss";
-import * as Y from "prettier/plugins/estree";
+import * as X from "prettier/plugins/babel";
+import * as Y from "prettier/plugins/postcss";
+import * as K from "prettier/plugins/estree";
 /**!
  * Copyright (c) 2026, VTJ.PRO All rights reserved.
  * @name @vtj/coder 
  * @author CHC chenhuachun1549@dingtalk.com 
- * @version 0.18.15
+ * @version 0.18.16
  * @license <a href="https://vtj.pro/license.html">MIT License</a>
  */
-const Tt = "0.18.15";
+const Tt = "0.18.16";
 /**!
  * Copyright (c) 2026, VTJ.PRO All rights reserved.
  * @name @vtj/core 
  * @author CHC chenhuachun1549@dingtalk.com 
- * @version 0.18.15
+ * @version 0.18.16
  * @license <a href="https://vtj.pro/license.html">MIT License</a>
  */
 const Ce = [
@@ -33,7 +33,7 @@ const Ce = [
   "a"
 ];
 ye();
-const V = {
+const q = {
   arrowParens: "always",
   bracketSpacing: !0,
   bracketSameLine: !0,
@@ -54,52 +54,52 @@ const V = {
   vueIndentScriptAndStyle: !0,
   removeBlankLines: !0
 };
-async function K(t, e) {
-  return e ? t : await H(t, {
+async function ee(t, e) {
+  return e ? t : await V(t, {
     parser: "vue",
-    ...V,
-    plugins: [Oe, Q, Y, X]
+    ...q,
+    plugins: [Oe, X, K, Y]
   });
 }
 async function xe(t, e) {
   if (e) return t;
   try {
-    return (await H(t, {
+    return (await V(t, {
       parser: "babel-ts",
-      ...V,
-      plugins: [Q, Y]
+      ...q,
+      plugins: [X, K]
     })).replace(/;\n$/gi, "");
   } catch (s) {
     return console.warn(s), t;
   }
 }
-async function G(t, e) {
-  return e ? t : H(t, {
+async function z(t, e) {
+  return e ? t : V(t, {
     parser: "scss",
-    ...V,
-    plugins: [X]
+    ...q,
+    plugins: [Y]
   });
 }
-function T(t) {
+function R(t) {
   return t && t.type === "JSExpression";
 }
-function R(t) {
+function U(t) {
   return typeof t == "object" && t && t.type === "JSFunction";
 }
 function S(t) {
-  return T(t) || R(t);
+  return R(t) || U(t);
 }
-function ee(t) {
+function te(t) {
   return t.replace(new RegExp("this.", "g"), "");
 }
-function J(t) {
+function W(t) {
   return t.replace(/this\.context\??\./g, "");
 }
 function _(t, e = !0, s = !0, n = [], o = !0) {
   let r = t;
-  return S(t) ? (r = t.value.trim().replace(/;$/, ""), o && (r = r.replace(/\"/g, "'"))) : r = e ? JSON.stringify(r) : t, r = M(r, n), s ? ee(J(r)) : J(r);
+  return S(t) ? (r = t.value.trim().replace(/;$/, ""), o && (r = r.replace(/\"/g, "'"))) : r = e ? JSON.stringify(r) : t, r = D(r, n), s ? te(W(r)) : W(r);
 }
-function M(t = "", e = []) {
+function D(t = "", e = []) {
   let s = t;
   for (const n of e)
     s = s.replace(
@@ -108,7 +108,7 @@ function M(t = "", e = []) {
     );
   return s;
 }
-function te(t) {
+function se(t) {
   let e = t.trim().replace(/;$/, "");
   if (e = /^\((\(|async|function)/.test(e) ? e.substring(1, e.length - 1) : e, e.startsWith("{")) return e;
   if (e.startsWith("async function"))
@@ -124,7 +124,7 @@ function te(t) {
 function Ae(t = {}) {
   return Object.entries(t).map(([e, s]) => `"${e}": ${_(s)}`);
 }
-function se(t = {}, e = !1) {
+function ne(t = {}, e = !1) {
   const s = Object.keys(t);
   return e ? s.map((n) => "." + n) : s;
 }
@@ -140,7 +140,7 @@ function Pe(t) {
 function Ee(t = [], e = []) {
   return t.filter((s) => !e.includes(s));
 }
-function z(t) {
+function Z(t) {
   return Se(JSON.stringify(t));
 }
 class Ne {
@@ -225,7 +225,7 @@ class Ne {
     delete n["uni-h5"], delete n["@dcloudio/uni-h5"], delete n["uni-ui"], delete n["@dcloudio/uni-ui"];
     for (const o of Object.values(n))
       s = s.concat(Array.from(o));
-    return B(s);
+    return M(s);
   }
   collectContext(e, s) {
     const n = new Set(s?.id ? this.context[s.id] : []), o = (e.directives || []).find((a) => a.name === "vFor");
@@ -269,7 +269,7 @@ function Te(t = []) {
             default: ${_(e.default, !0, !1, [], !1)}
         }`);
 }
-function ne(t = []) {
+function re(t = []) {
   const e = (s) => s ? `[${je(s).map((r) => r.replace(/\'|\"/gi, "")).join(",")}]` : void 0;
   return t.map((s) => typeof s == "string" ? `${s}: {}` : (S(s.default) && !s.default.value && (s.default.value = "undefined"), `${s.name}: {
           type:${e(s.type)},
@@ -277,25 +277,25 @@ function ne(t = []) {
           default: ${s.default ? _(s.default, !0, !1, [], !1) : "undefined"}
           }`));
 }
-function re(t = []) {
+function oe(t = []) {
   return t.map((e) => `'${typeof e == "string" ? e : e.name}'`);
 }
-function U(t = {}, e = []) {
+function F(t = {}, e = []) {
   return Object.entries(t).map(([s, n]) => {
-    let o = te(
+    let o = se(
       _(n, !1, !1, [], !1)
     );
-    return o = M(o, e)?.trim(), o.startsWith("async") ? `async ${s}${o.replace(/^async/, "")}` : o.startsWith("(") || o.startsWith("{") ? `${s}${o}` : null;
+    return o = D(o, e)?.trim(), o.startsWith("async") ? `async ${s}${o.replace(/^async/, "")}` : o.startsWith("(") || o.startsWith("{") ? `${s}${o}` : null;
   }).filter((s) => !!s);
 }
 function Me(t = [], e = []) {
   const s = t.reduce(
-    (r, c) => (c.id && R(c.source) && (r[`watcher_${c.id}`] = c.source), r),
+    (r, c) => (c.id && U(c.source) && (r[`watcher_${c.id}`] = c.source), r),
     {}
-  ), n = U(s, e), o = t.map((r) => r.handler && r.handler.value ? `watcher_${r.id}: {
+  ), n = F(s, e), o = t.map((r) => r.handler && r.handler.value ? `watcher_${r.id}: {
         deep: ${r.deep},
         immediate:${r.immediate},
-        handler${te(r.handler.value)}
+        handler${se(r.handler.value)}
       }` : null).filter((r) => !!r);
   return {
     computed: n,
@@ -305,16 +305,16 @@ function Me(t = [], e = []) {
 function Re(t = {}) {
   return Object.values(t).map((e) => {
     if (e.type === "mock") {
-      const s = R(e.mockTemplate) && e.mockTemplate.value || "(params) => ({})";
+      const s = U(e.mockTemplate) && e.mockTemplate.value || "(params) => ({})";
       return `async ${e.name}(...args) {
-        // DataSource: ${z(e)}
+        // DataSource: ${Z(e)}
         const mock = this.provider.createMock(${s});
         return await mock.apply(this, args);
       }`;
     } else {
-      const s = R(e.transform) && e.transform.value || "(res) => res";
+      const s = U(e.transform) && e.transform.value || "(res) => res";
       return `async ${e.name}(...args) {
-          // DataSource: ${z(e)}
+          // DataSource: ${Z(e)}
           return await this.provider.apis['${e.ref}'].apply(this, args).then(${s});
         }`;
     }
@@ -335,7 +335,7 @@ const De = [
   "source",
   "track",
   "wbr"
-], Z = [
+], Q = [
   "vIf",
   "vElseIf",
   "vElse",
@@ -345,61 +345,60 @@ const De = [
   "vBind",
   "vHtml"
 ];
-function q(t, e, s = [], n = {}, o) {
-  const r = [];
-  let c = {}, a = [];
-  const l = [];
-  let p = [];
-  return Le(t).forEach((i) => {
-    const u = [];
-    for (const v of i.children) {
-      let { id: b, name: k, invisible: g, from: m } = v;
-      if (g)
+function G(t, e, s = [], n = {}, o, r = /* @__PURE__ */ new Set()) {
+  const c = [];
+  let a = {}, l = [];
+  const p = [];
+  let m = [];
+  return Le(t).forEach((u) => {
+    const f = [];
+    for (const g of u.children) {
+      let { id: w, name: d, invisible: v, from: h } = g;
+      if (v)
         continue;
-      const h = Fe(k, e, m);
-      h && a.push(h), oe(m) && p.push({ id: m.id, name: k });
-      const { props: y, events: $ } = qe(
-        v,
-        b,
-        v.props,
-        v.events,
+      const y = Fe(d, e, h);
+      y && l.push(y), ce(h) && m.push({ id: h.id, name: d });
+      const { props: $, events: k } = qe(
+        g,
+        w,
+        g.props,
+        g.events,
         n,
         s
-      ), w = Ge(
-        v.directives,
+      ), C = Ge(
+        g.directives,
         s,
-        l
-      ).join(" "), I = v.children ? Qe(
-        v.children,
+        p
+      ).join(" "), O = g.children ? Qe(
+        g.children,
         s,
         e,
         n,
-        v
+        g,
+        r
       ) : "";
-      let C = "";
-      typeof I == "string" ? C = I : (C = (I?.nodes || []).join(`
-`), Object.assign(c, I?.methods || {}), a = a.concat(I?.components || []), p = p.concat(I?.importBlocks || []));
-      const N = ["@dcloudio/uni-h5", "@dcloudio/uni-ui"].includes(
-        m || e.get(k)?.package
-      ) ? F(k) : ce(m) || ae(m) ? "component" : k;
-      u.push(
-        De.includes(N) ? `<${N} ${w} ${y} ${$} />` : `<${N} ${w} ${y} ${$}>${C ? `
-` + C.trim() : ""}</${N}>`
+      let N = "";
+      typeof O == "string" ? N = O : (N = (O?.nodes || []).join(`
+`), Object.assign(a, O?.methods || {}), l = l.concat(O?.components || []), m = m.concat(O?.importBlocks || []));
+      const B = h || e.get(d)?.package, T = r.has(B) ? J(d) : ["@dcloudio/uni-h5", "@dcloudio/uni-ui"].includes(B) ? J(d) : ae(h) || ie(h) ? "component" : d;
+      f.push(
+        De.includes(T) ? `<${T} ${C} ${$} ${k} />` : `<${T} ${C} ${$} ${k}>${N ? `
+` + N.trim() : ""}</${T}>`
       );
     }
-    const f = Xe(i.slot, u.join(`
+    const b = Xe(u.slot, f.join(`
 `), o?.id);
-    r.push(f);
+    c.push(b);
   }), {
-    nodes: r,
-    methods: c,
-    directives: Ue(l),
-    components: B(a),
-    importBlocks: B(p, "id")
+    nodes: c,
+    methods: a,
+    directives: Ue(p),
+    components: M(l),
+    importBlocks: M(m, "id")
   };
 }
 function Ue(t) {
-  return B(t).map((e) => `${e.startsWith("v") ? e.substring(1) : e}:${e}`);
+  return M(t).map((e) => `${e.startsWith("v") ? e.substring(1) : e}:${e}`);
 }
 function Le(t = []) {
   const e = /* @__PURE__ */ new Map();
@@ -416,27 +415,27 @@ function Fe(t, e, s) {
     const o = n.parent ? `${n.parent}.${n.alias}` : n.alias;
     return `${t}: ${o}`;
   }
-  return oe(s) || n ? t : null;
+  return ce(s) || n ? t : null;
 }
-function oe(t) {
+function ce(t) {
   return !!t && typeof t == "object" && t.type === "Schema";
 }
-function ce(t) {
+function ae(t) {
   return typeof t == "object" && t.type === "UrlSchema";
 }
-function ae(t) {
+function ie(t) {
   return typeof t == "object" && t.type === "Plugin";
 }
 function Je(t, e, s = []) {
   return t === "style" ? S(e) ? `:style="${_({
     ...e,
-    value: M(e.value, s)
+    value: D(e.value, s)
   })}"` : "" : t === "__class" && S(e) ? `:class="${_({
     ...e,
-    value: M(e.value, s)
+    value: D(e.value, s)
   })}"` : typeof e == "string" ? `${t}="${e}"` : S(e) ? `:${t}="${_({
     ...e,
-    value: M(e.value, s)
+    value: D(e.value, s)
   })}"` : ke(e) ? `:${t}='{${Ae(
     e
   ).join(", ")}}'` : `:${t}='${JSON.stringify(e)}'`;
@@ -447,20 +446,20 @@ function We(t, e = {}, s = []) {
     e.class ? typeof e.class == "string" ? e.class = [e.class, r].join(" ") : (e.__class = e.class, e.class = r) : e.class = r, S(e.style) || delete e.style;
   }
   const o = t.from;
-  return (ce(o) || ae(o)) && (e.is = {
+  return (ae(o) || ie(o)) && (e.is = {
     type: "JSExpression",
     value: t.name
   }), Object.entries(e).map(([r, c]) => Je(r, c, s));
 }
 function He(t, e, s) {
-  const n = se(e.modifiers, !0);
+  const n = ne(e.modifiers, !0);
   return `@${t}${n.join("")}="${s}"`;
 }
 function Ve(t, e = {}, s = {}) {
   const n = {};
   return {
     binders: Object.entries(e).map(([r, c]) => {
-      const a = ee(J(c.handler.value)).replace(
+      const a = te(W(c.handler.value)).replace(
         /\"/g,
         "'"
       );
@@ -486,7 +485,7 @@ function Ge(t = [], e = [], s = []) {
     vShow: a,
     vModels: l,
     vFor: p,
-    vBind: d,
+    vBind: m,
     vHtml: i,
     customDirectives: u
   } = ze(t);
@@ -494,40 +493,40 @@ function Ge(t = [], e = [], s = []) {
     `v-else-if="${_(c.value, !0, !0, e)}"`
   ), r && n.push("v-else"), a && n.push(
     `v-show="${_(a.value, !0, !0, e)}"`
-  ), d && n.push(
-    `v-bind="${_(d.value, !0, !0, e)}"`
+  ), m && n.push(
+    `v-bind="${_(m.value, !0, !0, e)}"`
   ), l.forEach((f) => {
-    const v = se(f.modifiers, !0), b = f.arg ? T(f.arg) ? `:[${_(f.arg, !0, !0, e)}]` : `:${f.arg}` : "";
+    const b = ne(f.modifiers, !0), g = f.arg ? R(f.arg) ? `:[${_(f.arg, !0, !0, e)}]` : `:${f.arg}` : "";
     n.push(
-      `v-model${b}${v}="${_(f.value, !0, !0, e)}"`
+      `v-model${g}${b}="${_(f.value, !0, !0, e)}"`
     );
   }), p) {
-    const { item: f, index: v } = { item: "item", index: "index", ...p.iterator };
+    const { item: f, index: b } = { item: "item", index: "index", ...p.iterator };
     n.push(
-      `v-for="(${f}, ${v}) in ${_(p.value, !0, !0, e)}"`
+      `v-for="(${f}, ${b}) in ${_(p.value, !0, !0, e)}"`
     );
   }
   return i && n.push(
     `v-html="${_(i.value, !0, !0, e)}"`
   ), u && u.length && u.forEach((f) => {
     if (!f.name) return;
-    let v = "", b = "";
-    T(f.name) ? (b = _(f.name, !0, !0, e), s.push(b)) : b = f.name;
-    const k = b?.startsWith("v") ? F(b) : F("v-" + b);
-    if (v += k, f.arg && (T(f.arg) ? v += `:[${_(f.name, !0, !0, e)}]` : v += `:${f.arg}`), f.modifiers) {
-      const g = Object.keys(f.modifiers);
-      g.length && (v += g.map((m) => "." + m));
+    let b = "", g = "";
+    R(f.name) ? (g = _(f.name, !0, !0, e), s.push(g)) : g = f.name;
+    const w = g?.startsWith("v") ? J(g) : J("v-" + g);
+    if (b += w, f.arg && (R(f.arg) ? b += `:[${_(f.name, !0, !0, e)}]` : b += `:${f.arg}`), f.modifiers) {
+      const d = Object.keys(f.modifiers);
+      d.length && (b += d.map((v) => "." + v));
     }
     f.value ? n.push(
-      `${v}="${_(f.value, !0, !0, e)}"`
-    ) : n.push(v);
+      `${b}="${_(f.value, !0, !0, e)}"`
+    ) : n.push(b);
   }), n;
 }
 function ze(t = []) {
   const e = t.filter(
-    (i) => Z.includes(i.name)
+    (i) => Q.includes(i.name)
   ), s = t.filter(
-    (i) => !Z.includes(i.name)
+    (i) => !Q.includes(i.name)
   ), n = e.find(
     (i) => A(i.name) === "vIf"
   ), o = e.find(
@@ -542,7 +541,7 @@ function ze(t = []) {
     (i) => A(i.name) === "vBind"
   ), p = e.find(
     (i) => A(i.name) === "vHtml"
-  ), d = e.filter(
+  ), m = e.filter(
     (i) => A(i.name) === "vModel"
   );
   return {
@@ -551,7 +550,7 @@ function ze(t = []) {
     vElse: r,
     vFor: c,
     vShow: a,
-    vModels: d,
+    vModels: m,
     vBind: l,
     vHtml: p,
     customDirectives: s
@@ -560,8 +559,15 @@ function ze(t = []) {
 function Ze(t) {
   return t.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
 }
-function Qe(t, e, s, n, o) {
-  return typeof t == "string" ? Ze(t) : T(t) ? `{{ ${_(t, !1, !0, e)} }}` : Array.isArray(t) ? q(t, s, e, n, o) : "";
+function Qe(t, e, s, n, o, r = /* @__PURE__ */ new Set()) {
+  return typeof t == "string" ? Ze(t) : R(t) ? `{{ ${_(t, !1, !0, e)} }}` : Array.isArray(t) ? G(
+    t,
+    s,
+    e,
+    n,
+    o,
+    r
+  ) : "";
 }
 function Xe(t, e, s) {
   if (!t) return e;
@@ -579,24 +585,24 @@ function Ye(t, e = [], s = [], n = {}, o = "web", r = /* @__PURE__ */ new Set())
   ], a = {
     vue: ["defineComponent", "reactive"]
   }, l = [];
-  for (const d of e) {
-    const i = t.get(d.split(":")[0]);
+  for (const m of e) {
+    const i = t.get(m.split(":")[0]);
     if (i && i.package) {
       if (r.has(i.package)) continue;
       const u = a[i.package] ?? (a[i.package] = []), f = i.parent || (i.alias || "").split(".")[0] || i.name;
       u.push(f), o === "uniapp" && c.includes(i.package) && l.push(f);
     }
   }
-  for (const [d, i] of Object.entries(n))
-    (a[d] ?? (a[d] = [])).push(...Array.from(i)), o === "uniapp" && c.includes(d) && l.push(...Array.from(i));
+  for (const [m, i] of Object.entries(n))
+    (a[m] ?? (a[m] = [])).push(...Array.from(i)), o === "uniapp" && c.includes(m) && l.push(...Array.from(i));
   return {
-    imports: Object.entries(a).filter(([d, i]) => o === "uniapp" ? !c.includes(d) && !!i.length : !!i.length).map(([d, i]) => `import { ${B(i).join(
+    imports: Object.entries(a).filter(([m, i]) => o === "uniapp" ? !c.includes(m) && !!i.length : !!i.length).map(([m, i]) => `import { ${M(i).join(
       ","
-    )}} from '${d}';`).concat(s),
+    )}} from '${m}';`).concat(s),
     uniComponents: l
   };
 }
-function ie(t = {}) {
+function le(t = {}) {
   const e = [];
   for (const [s, n] of Object.entries(t))
     e.push(`
@@ -607,7 +613,7 @@ function ie(t = {}) {
   return e.join(`
 `);
 }
-function le(t = {}) {
+function ue(t = {}) {
   const e = [];
   return Object.entries(t).forEach(([s, n]) => {
     e.push(
@@ -615,7 +621,7 @@ function le(t = {}) {
     );
   }), e;
 }
-function ue(t = {}) {
+function pe(t = {}) {
   const e = [];
   return Object.entries(t).forEach(([s, n]) => {
     e.push(
@@ -624,22 +630,24 @@ function ue(t = {}) {
   }), e;
 }
 function Ke(t, e, s = "web") {
-  const { dsl: n } = t, o = Object.keys(n.computed || {}), r = U(n.lifeCycles, o), c = U(n.computed, o), a = Me(n.watch, o), l = Re(n.dataSources), { methods: p, nodes: d, components: i, importBlocks: u, directives: f } = q(
+  const { dsl: n } = t, o = Object.keys(n.computed || {}), r = F(n.lifeCycles, o), c = F(n.computed, o), a = Me(n.watch, o), l = Re(n.dataSources), { methods: p, nodes: m, components: i, importBlocks: u, directives: f } = G(
     n.nodes || [],
     e,
     o,
-    t.context
-  ), v = [...c, ...a.computed], b = U(
+    t.context,
+    void 0,
+    t.easycomPackages
+  ), b = [...c, ...a.computed], g = F(
     {
       ...p,
       ...n.methods || {}
     },
     o
-  ), k = u.map((w) => `import ${w.name} from './${w.id}.vue';`);
-  let { imports: g, uniComponents: m } = Ye(
+  ), w = u.map((k) => `import ${k.name} from './${k.id}.vue';`);
+  let { imports: d, uniComponents: v } = Ye(
     e,
     i,
-    k,
+    w,
     t.imports,
     s,
     t.easycomPackages
@@ -647,36 +655,36 @@ function Ke(t, e, s = "web") {
   const h = Object.keys({
     ...t.urlSchemas,
     ...t.blockPlugins
-  }), y = le(t.urlSchemas), $ = ue(t.blockPlugins);
+  }), y = ue(t.urlSchemas), $ = pe(t.blockPlugins);
   return {
     id: n.id,
     version: n.__VERSION__,
     name: n.name,
     state: Be(n.state).join(","),
     inject: Te(n.inject).join(","),
-    props: ne(n.props).join(","),
-    emits: re(n.emits).join(","),
+    props: re(n.props).join(","),
+    emits: oe(n.emits).join(","),
     expose: n.expose && n.expose.length ? JSON.stringify(n.expose || []) : "",
     watch: a.watches.join(","),
     lifeCycles: r.join(","),
-    computed: v.join(","),
-    methods: [...l, ...b].join(","),
+    computed: b.join(","),
+    methods: [...l, ...g].join(","),
     imports: `
-` + g.join(`
+` + d.join(`
 `),
-    components: Ee(i, m).join(","),
+    components: Ee(i, v).join(","),
     directives: f.join(","),
     returns: t.members.join(","),
-    template: d.join(`
+    template: m.join(`
 `),
     css: n.css || "",
-    style: ie(t.style),
+    style: le(t.style),
     urlSchemas: y.join(`
 `),
     blockPlugins: $.join(`
 `),
     asyncComponents: h.join(","),
-    uniComponents: m,
+    uniComponents: v,
     renderer: s === "uniapp" ? "@vtj/uni-app" : "@vtj/renderer"
   };
 }
@@ -872,7 +880,7 @@ const E = {
     declare: "const __apis = useApis();",
     replace: "__apis"
   }
-}, pe = {
+}, fe = {
   "element-plus": {
     $loading: {
       composable: "ElLoading",
@@ -961,7 +969,7 @@ const E = {
       replace: "message.error"
     }
   }
-}, et = Object.keys(pe);
+}, et = Object.keys(fe);
 function tt(t) {
   for (const [, e] of t)
     if (et.includes(e.package))
@@ -969,7 +977,7 @@ function tt(t) {
   return null;
 }
 function st(t) {
-  const e = t ? pe[t] ?? {} : {};
+  const e = t ? fe[t] ?? {} : {};
   return { ...E, ...e };
 }
 function nt(t, e = E) {
@@ -1023,9 +1031,9 @@ function ct(t, e = E) {
     if (u.destructure && u.destructure.length > 0)
       for (const f of u.destructure) p.add(f);
     else u.name && p.add(u.name);
-  const d = /* @__PURE__ */ new Set();
+  const m = /* @__PURE__ */ new Set();
   for (const u of t.inject ?? [])
-    u.name && d.add(u.name);
+    u.name && m.add(u.name);
   const i = /* @__PURE__ */ new Set();
   for (const [, u] of Object.entries(t.dataSources ?? {}))
     u.name && i.add(u.name);
@@ -1036,7 +1044,7 @@ function ct(t, e = E) {
     methods: a,
     props: l,
     composables: p,
-    injects: d,
+    injects: m,
     dataSources: i,
     hasState: r,
     effectiveApiMap: e
@@ -1156,7 +1164,7 @@ function ht(t = [], e) {
 function gt(t = {}, e) {
   return Object.entries(t).map(([s, n]) => {
     let o;
-    if (R(n)) {
+    if (U(n)) {
       const r = j(
         n.value || "",
         e,
@@ -1167,7 +1175,7 @@ function gt(t = {}, e) {
     return `provide('${s}', ${o});`;
   });
 }
-function fe(t) {
+function me(t) {
   let e = t.trim().replace(/;$/, "");
   /^\((\(|async|function)/.test(e) && (e = e.substring(1, e.length - 1).trim());
   const s = e.match(/^(?:async\s+)?\([^)]*\)\s*=>\s*([\s\S]+)$/);
@@ -1183,14 +1191,14 @@ function fe(t) {
 function vt(t, e) {
   if (!t || !t.value) return "";
   const s = j(t.value, e, "script");
-  return fe(s);
+  return me(s);
 }
 function $t(t = {}, e) {
   const s = [];
   for (const n of ["beforeCreate", "created"]) {
     const o = t[n];
     if (o && o.value) {
-      const r = j(o.value, e, "script"), c = fe(r);
+      const r = j(o.value, e, "script"), c = me(r);
       c && s.push(`// ${n}
 ${c}`);
     }
@@ -1268,7 +1276,7 @@ function jt(t) {
     composableImports: a,
     globalApiImports: l,
     uniHookImports: p,
-    easycomPackages: d
+    easycomPackages: m
   } = t, i = [
     "@dcloudio/uni-h5",
     "uni-h5",
@@ -1276,30 +1284,30 @@ function jt(t) {
     "uni-ui"
   ], u = {
     vue: [...c]
-  }, f = [], v = [], b = {};
-  for (const g of s) {
-    const m = g.split(":")[0], h = e.get(m);
-    if (!h || !h.package || h.parent || d.has(h.package)) continue;
-    const y = u[h.package] ?? (u[h.package] = []), $ = (h.alias || "").split(".")[0] || h.name, w = m, I = $ !== w ? `${$} as ${w}` : $;
-    y.push(I), b[$] = w, r === "uniapp" && i.includes(h.package) && f.push($);
+  }, f = [], b = [], g = {};
+  for (const d of s) {
+    const v = d.split(":")[0], h = e.get(v);
+    if (!h || !h.package || h.parent || m.has(h.package)) continue;
+    const y = u[h.package] ?? (u[h.package] = []), $ = (h.alias || "").split(".")[0] || h.name, k = v, C = $ !== k ? `${$} as ${k}` : $;
+    y.push(C), g[$] = k, r === "uniapp" && i.includes(h.package) && f.push($);
   }
-  for (const g of s) {
-    const m = g.split(":")[0], h = e.get(m);
-    if (!h || !h.package || !h.parent || d.has(h.package)) continue;
-    const y = h.parent, $ = b[y] ?? y, w = h.alias || "";
-    v.push(
-      `const ${m} = ${$}.${w};`
-    ), b[y] || ((u[h.package] ?? (u[h.package] = [])).push(y), b[y] = y);
+  for (const d of s) {
+    const v = d.split(":")[0], h = e.get(v);
+    if (!h || !h.package || !h.parent || m.has(h.package)) continue;
+    const y = h.parent, $ = g[y] ?? y, k = h.alias || "";
+    b.push(
+      `const ${v} = ${$}.${k};`
+    ), g[y] || ((u[h.package] ?? (u[h.package] = [])).push(y), g[y] = y);
   }
-  for (const [g, m] of Object.entries(o))
-    (u[g] ?? (u[g] = [])).push(...Array.from(m)), r === "uniapp" && i.includes(g) && f.push(...Array.from(m));
-  for (const [g, m] of Object.entries(a))
-    (u[g] ?? (u[g] = [])).push(...m);
-  for (const [g, m] of Object.entries(l))
-    (u[g] ?? (u[g] = [])).push(...m);
-  return r === "uniapp" && p.length > 0 && (u["@dcloudio/uni-app"] ?? (u["@dcloudio/uni-app"] = [])).push(...p), { imports: Object.entries(u).filter(([g, m]) => r === "uniapp" ? !i.includes(g) && !!m.length : !!m.length).map(([g, m]) => `import { ${B(m).join(
+  for (const [d, v] of Object.entries(o))
+    (u[d] ?? (u[d] = [])).push(...Array.from(v)), r === "uniapp" && i.includes(d) && f.push(...Array.from(v));
+  for (const [d, v] of Object.entries(a))
+    (u[d] ?? (u[d] = [])).push(...v);
+  for (const [d, v] of Object.entries(l))
+    (u[d] ?? (u[d] = [])).push(...v);
+  return r === "uniapp" && p.length > 0 && (u["@dcloudio/uni-app"] ?? (u["@dcloudio/uni-app"] = [])).push(...p), { imports: Object.entries(u).filter(([d, v]) => r === "uniapp" ? !i.includes(d) && !!v.length : !!v.length).map(([d, v]) => `import { ${M(v).join(
     ","
-  )}} from '${g}';`).concat(n), uniComponents: f, componentDeclarations: v };
+  )}} from '${d}';`).concat(n), uniComponents: f, componentDeclarations: b };
 }
 function kt(t, e = E, s = /* @__PURE__ */ new Set(), n = /* @__PURE__ */ new Set()) {
   const o = Object.entries(e), r = (c) => {
@@ -1308,11 +1316,11 @@ function kt(t, e = E, s = /* @__PURE__ */ new Set(), n = /* @__PURE__ */ new Set
       return c.map(r);
     if (S(c) && typeof c.value == "string") {
       let l = c.value;
-      for (const [p, d] of o) {
+      for (const [p, m] of o) {
         const i = p.replace(/\$/g, "\\$"), u = new RegExp(`this\\.${i}\\b`, "g");
-        l = l.replace(u, d.replace);
+        l = l.replace(u, m.replace);
       }
-      return l = l.replace(/this\.([A-Za-z_$][\w$]*)\.value\b/g, (p, d) => s.has(d) || n.has(d) ? d : p), { ...c, value: l };
+      return l = l.replace(/this\.([A-Za-z_$][\w$]*)\.value\b/g, (p, m) => s.has(m) || n.has(m) ? m : p), { ...c, value: l };
     }
     const a = {};
     for (const [l, p] of Object.entries(c))
@@ -1321,23 +1329,24 @@ function kt(t, e = E, s = /* @__PURE__ */ new Set(), n = /* @__PURE__ */ new Set
   };
   return t.map(r);
 }
-function wt(t, e, s = [], n = {}, o, r = E, c = /* @__PURE__ */ new Set(), a = /* @__PURE__ */ new Set()) {
-  const l = kt(
+function wt(t, e, s = [], n = {}, o, r = E, c = /* @__PURE__ */ new Set(), a = /* @__PURE__ */ new Set(), l = /* @__PURE__ */ new Set()) {
+  const p = kt(
     t,
     r,
     c,
     a
   );
-  return q(
-    l,
+  return G(
+    p,
     e,
     s,
     n,
-    o
+    o,
+    l
   );
 }
 function It(t, e, s = "web") {
-  const { dsl: n } = t, o = tt(e), r = st(o), c = ct(n, r), a = nt(n, r), l = rt(a, r), p = ot(a, r), d = p.__renderer__ || [];
+  const { dsl: n } = t, o = tt(e), r = st(o), c = ct(n, r), a = nt(n, r), l = rt(a, r), p = ot(a, r), m = p.__renderer__ || [];
   delete p.__renderer__;
   const i = wt(
     n.nodes || [],
@@ -1347,41 +1356,42 @@ function It(t, e, s = "web") {
     void 0,
     r,
     c.refs,
-    c.computed
+    c.computed,
+    t.easycomPackages
   ), u = i.importBlocks.map(
-    (O) => `import ${O.name} from './${O.id}.vue';`
-  ), f = at(n.refs || {}, c), v = it(n.reactives || {}, c), b = lt(n.state || {}, c), k = ft(n.computed || {}, c), g = {
+    (I) => `import ${I.name} from './${I.id}.vue';`
+  ), f = at(n.refs || {}, c), b = it(n.reactives || {}, c), g = lt(n.state || {}, c), w = ft(n.computed || {}, c), d = {
     ...i.methods || {},
     ...n.methods || {}
-  }, m = mt(g, c), h = dt(n.dataSources || {}, c), y = ht(n.watch || [], c), $ = pt(n.inject || [], c), w = gt(n.provide || {}, c), I = ut(
+  }, v = mt(d, c), h = dt(n.dataSources || {}, c), y = ht(n.watch || [], c), $ = pt(n.inject || [], c), k = gt(n.provide || {}, c), C = ut(
     n.composables || [],
     c
-  ), C = /* @__PURE__ */ new Set();
-  for (const O of n.composables || [])
-    if (O.destructure && O.destructure.length > 0)
-      for (const D of O.destructure) C.add(D);
-    else O.name && C.add(O.name);
-  const N = l.filter((O) => {
-    const D = O.match(/^const\s+(\w+)\s*=/);
-    return !(D && C.has(D[1]));
-  }), L = St(n.lifeCycles || {}, c), me = $t(
+  ), O = /* @__PURE__ */ new Set();
+  for (const I of n.composables || [])
+    if (I.destructure && I.destructure.length > 0)
+      for (const L of I.destructure) O.add(L);
+    else I.name && O.add(I.name);
+  const N = l.filter((I) => {
+    const L = I.match(/^const\s+(\w+)\s*=/);
+    return !(L && O.has(L[1]));
+  }), B = St(n.lifeCycles || {}, c), T = $t(
     n.lifeCycles || {},
     c
   ), de = vt(n.setup, c), x = /* @__PURE__ */ new Set();
-  f.length > 0 && x.add("ref"), (v.length > 0 || b) && x.add("reactive"), k.length > 0 && x.add("computed"), y.length > 0 && x.add("watch"), $.length > 0 && x.add("inject"), w.length > 0 && x.add("provide");
-  for (const O of L.usedHooks) x.add(O);
-  const he = s === "uniapp" ? Array.from(L.usedUniHooks) : [], { imports: ge, uniComponents: ve, componentDeclarations: $e } = jt({
+  f.length > 0 && x.add("ref"), (b.length > 0 || g) && x.add("reactive"), w.length > 0 && x.add("computed"), y.length > 0 && x.add("watch"), $.length > 0 && x.add("inject"), k.length > 0 && x.add("provide");
+  for (const I of B.usedHooks) x.add(I);
+  const he = s === "uniapp" ? Array.from(B.usedUniHooks) : [], { imports: ge, uniComponents: ve, componentDeclarations: $e } = jt({
     componentMap: e,
     components: i.components,
     importBlocks: u,
     collectImports: t.imports,
     platform: s,
     vueImports: Array.from(x),
-    composableImports: I.imports,
+    composableImports: C.imports,
     globalApiImports: p,
     uniHookImports: he,
     easycomPackages: t.easycomPackages
-  }), be = le(t.urlSchemas), _e = ue(t.blockPlugins);
+  }), be = ue(t.urlSchemas), _e = pe(t.blockPlugins);
   return {
     id: n.id,
     version: n.__VERSION__,
@@ -1389,8 +1399,8 @@ function It(t, e, s = "web") {
     imports: `
 ` + ge.join(`
 `),
-    props: ne(n.props).join(","),
-    emits: re(n.emits).join(","),
+    props: re(n.props).join(","),
+    emits: oe(n.emits).join(","),
     needsProps: a.has("$props"),
     needsEmit: a.has("$emit"),
     expose: n.expose && n.expose.length ? `{ ${n.expose.join(", ")} }` : "",
@@ -1398,38 +1408,38 @@ function It(t, e, s = "web") {
 `),
     injects: $.join(`
 `),
-    composables: I.statements.join(`
+    composables: C.statements.join(`
 `),
-    state: b,
+    state: g,
     refs: f.join(`
 `),
-    reactives: v.join(`
+    reactives: b.join(`
 `),
-    computed: k.join(`
+    computed: w.join(`
 `),
-    methods: m.join(`
+    methods: v.join(`
 `),
     dataSources: h.join(`
 `),
     watch: y.join(`
 `),
-    provide: w.join(`
+    provide: k.join(`
 `),
-    createdStatements: me,
+    createdStatements: T,
     setupStatements: de,
-    lifeCycles: L.statements.join(`
+    lifeCycles: B.statements.join(`
 `),
     template: i.nodes.join(`
 `),
     css: n.css || "",
-    style: ie(t.style),
+    style: le(t.style),
     urlSchemas: be.join(`
 `),
     blockPlugins: _e.join(`
 `),
     uniComponents: ve,
     renderer: s === "uniapp" ? "@vtj/uni-app" : "@vtj/renderer",
-    rendererImports: ["useProvider", ...d].join(", "),
+    rendererImports: ["useProvider", ...m].join(", "),
     componentDeclarations: $e.join(`
 `)
   };
@@ -1500,7 +1510,7 @@ const __provider = useProvider({ id: '<%= id %>', version: '<%= version %>' });
 <%= provide %>
 <%= lifeCycles %>
 <% if(expose) { %>defineExpose(<%= expose %>);<% } %>
-`, At = W(Ot), Pt = W(xt), Et = W(Ct);
+`, At = H(Ot), Pt = H(xt), Et = H(Ct);
 async function Mt(t, e = /* @__PURE__ */ new Map(), s = [], n = "web", o) {
   const r = t, c = typeof r.dsl == "object" && arguments.length === 1 ? r : {
     dsl: t,
@@ -1512,35 +1522,35 @@ async function Mt(t, e = /* @__PURE__ */ new Map(), s = [], n = "web", o) {
     dsl: a,
     componentMap: l = /* @__PURE__ */ new Map(),
     dependencies: p = [],
-    platform: d = "web",
+    platform: m = "web",
     formatterDisabled: i = !1,
     ts: u = !0,
     scss: f = !1
-  } = c, v = new Ne(Ie(a), p), b = a.apiMode === "composition";
-  let k, g, m, h;
-  if (b) {
-    const $ = It(v, l, d);
-    h = Pt($), k = $.template || `
+  } = c, b = new Ne(Ie(a), p), g = a.apiMode === "composition";
+  let w, d, v, h;
+  if (g) {
+    const $ = It(b, l, m);
+    h = Pt($), w = $.template || `
 <!--组件模版内容-->
-`, g = $.css, m = $.style;
+`, d = $.css, v = $.style;
   } else {
-    const $ = Ke(v, l, d);
-    h = At($), k = $.template || `
+    const $ = Ke(b, l, m);
+    h = At($), w = $.template || `
 <!--组件模版内容-->
-`, g = $.css, m = $.style;
+`, d = $.css, v = $.style;
   }
   const y = Et({
-    template: k,
-    css: await G(g, i) || `
+    template: w,
+    css: await z(d, i) || `
 /* 组件样式内容 */
 `,
     script: await xe(h, i),
-    style: await G(m, i),
+    style: await z(v, i),
     scriptLang: u ? "ts" : "js",
     styleLang: f ? "scss" : "css",
-    scriptSetup: b
+    scriptSetup: g
   });
-  return await K(y, i).catch(($) => ($.content = y, Promise.reject($)));
+  return await ee(y, i).catch(($) => ($.content = y, Promise.reject($)));
 }
 async function Rt(t) {
   const e = `
@@ -1555,18 +1565,18 @@ async function Rt(t) {
     <style scoped lang="scss">
     </style>
   `;
-  return await K(e);
+  return await ee(e);
 }
 export {
   E as GLOBAL_API_MAP,
-  pe as UI_GLOBAL_API_MAPS,
+  fe as UI_GLOBAL_API_MAPS,
   et as UI_PACKAGES,
   Tt as VTJ_CODER_VERSION,
   st as buildEffectiveApiMap,
   Rt as createEmptyPage,
-  G as cssFormatter,
+  z as cssFormatter,
   tt as detectUIPackage,
   Mt as generator,
   xe as tsFormatter,
-  K as vueFormatter
+  ee as vueFormatter
 };