@vtj/coder 0.8.67 → 0.8.68

package/dist/index.cjs

@@ -2,13 +2,13 @@
  * Copyright (c) 2024, VTJ.PRO All rights reserved.
  * @name @vtj/coder 
  * @author CHC chenhuachun1549@dingtalk.com 
- * @version 0.8.67
+ * @version 0.8.68
  * @license <a href="https://vtj.pro/license.html">MIT License</a>
- */const ee="0.8.67";/**!
+ */const ee="0.8.68";/**!
  * Copyright (c) 2024, VTJ.PRO All rights reserved.
  * @name @vtj/core 
  * @author CHC chenhuachun1549@dingtalk.com 
- * @version 0.8.67
+ * @version 0.8.68
  * @license <a href="https://vtj.pro/license.html">MIT License</a>
  */const te=["slot","template","component","img","div","p","h1","h2","h3","span","a"];l.mitt();const _={arrowParens:"always",bracketSpacing:!0,bracketSameLine:!0,endOfLine:"lf",htmlWhitespaceSensitivity:"css",insertPragma:!1,jsxBracketSameLine:!0,jsxSingleQuote:!0,printWidth:80,proseWrap:"preserve",quoteProps:"as-needed",requirePragma:!1,semi:!0,singleQuote:!0,tabWidth:2,trailingComma:"none",useTabs:!1,vueIndentScriptAndStyle:!0};async function L(t,e){return e?t:await x.format(t,{parser:"vue",..._,plugins:[K,J,q,T]})}async function ne(t,e){return e?t:await x.format(t,{parser:"babel-ts",..._,plugins:[J,q]})}async function W(t,e){return e?t:x.format(t,{parser:"scss",..._,plugins:[T]})}function E(t){return t&&t.type==="JSExpression"}function A(t){return typeof t=="object"&&t&&t.type==="JSFunction"}function $(t){return E(t)||A(t)}function F(t){return t.replace(new RegExp("this.","g"),"")}function I(t){return t.replace(/this\.context\??\./g,"")}function u(t,e=!0,n=!0,r=[]){let i=$(t)?t.value:e?JSON.stringify(t):t;return i=b(i,r),n?F(I(i)):I(i)}function b(t,e=[]){let n=t;for(const r of e)n=n.replace(new RegExp(`this.${r}.value`,"g"),`this.${r}`);return n}function U(t){let e=t.trim();if(e=/^\((\(|async|function)/.test(e)?e.substring(1,e.length-1):e,e.startsWith("{"))return e;if(e.startsWith("async function"))e=e.replace(/^async function/,"async");else if(e.startsWith("function"))e=e.replace(/^function/,"");else{const i=/^(async\s)?\([\w]*\)\s+\=\>\s([\w\W]+)/,s=e.match(i);s&&s[2]&&(s[2].startsWith("{")||(e=e.replace(s[2],`{ return ${s[2]} }`))),e=e.replace("=>","")}return e}function re(t={}){return Object.entries(t).map(([e,n])=>`"${e}": ${u(n)}`)}function V(t={},e=!1){const n=Object.keys(t);return e?n.map(r=>"."+r):n}function se(t){let e="";for(var n in t)if(t.hasOwnProperty(n)){var r=t[n];e+=n+": "+r+";"}return e}class ie{constructor(e,n){this.dsl=e,this.dependencies=n,this.libraryRegex=this.collectLibrary(),this.walk(e),this.walkNodes(e),this.members=this.getLibraryMember()}imports={};context={};style={};members=[];urlSchemas={};blockPlugins={};libraryRegex=[];collectLibrary(){return this.dependencies.filter(e=>!!e.library).map(e=>new RegExp(`(this.\\$libs.${e.library}.([\\w]+))`,"g"))}collectImport(e){const n=e.split(".");if(n.length===4){const r=n.pop(),i=n.join(".")+".",s=n.pop();if(r&&s){const o=this.dependencies.find(a=>a.library===s)?.package;o&&(this.imports[o]||(this.imports[o]=new Set)).add(r)}return{name:r,path:i,library:s}}return null}replaceLibraryPath(e){const{libraryRegex:n}=this;let r=e.value;for(const i of n){const s=e.value.match(i)||[];for(const o of s){const a=this.collectImport(o);if(a){const c=a.path.replace(/\$/g,"\\$");r=r.replace(new RegExp(c,"g"),"")}}}return r}walk(e){const n=r=>{if(!r||typeof r!="object")return;if(Array.isArray(r)){for(let s of r)n(s);return}const i=Object.values(r);for(const s of i)$(s)?s.value=this.replaceLibraryPath(s):n(s)};n(e)}getLibraryMember(e=[]){let n=[...e];for(const r of Object.values(this.imports))n=n.concat(Array.from(r));return l.dedupArray(n)}collectContext(e,n){const r=new Set(n?.id?this.context[n.id]:[]),i=(e.directives||[]).find(a=>a.name==="vFor");let s=new Set(Array.from(r));if(i){const{item:a="item",index:c="index"}=i.iterator||{};s=new Set([a,c,...Array.from(s)])}const o=e.slot;if(o){const a=typeof o=="string"?[]:o.params||[],c=a.length?a:[`scope_${n?.id}`];s=new Set([...c,...Array.from(s)])}this.context[e.id]=s}collectStyle(e){e.id&&e.props?.style&&Object.keys(e.props.style).length&&(this.style[`.${e.name}_${e.id}`]=e.props.style)}collectUrlSchema(e){typeof e.from=="object"&&e.from.type==="UrlSchema"&&(this.urlSchemas[e.name]=e.from)}collectBlockPlugin(e){typeof e.from=="object"&&e.from.type==="Plugin"&&(this.blockPlugins[e.name]=e.from)}walkNodes(e){const n=(r,i)=>{this.collectContext(r,i),this.collectStyle(r),this.collectUrlSchema(r),this.collectBlockPlugin(r),Array.isArray(r.children)&&r.children.forEach(s=>n(s,r))};Array.isArray(e.nodes)&&e.nodes.forEach(r=>n(r))}}function oe(t={}){return Object.entries(t).map(([e,n])=>{const r=u(n,!1);return`${e}:${r}`})}function ae(t=[]){return t.map(e=>`${e.name}: {
             from: '${e.from||e.name}',
@@ -23,20 +23,20 @@
         handler${U(s.handler.value)}
       }`);return{computed:r,watches:i}}function pe(t={}){return Object.values(t).map(e=>{const n=A(e.transform)&&e.transform.value||"(res) => res";return`async ${e.name}(...args:any[]) {
           return await this.provider.apis['${e.ref}'].apply(this, args).then(${n});
-        }`})}function M(t,e,n=[],r={},i){const s=[];let o={},a=[],c=[];return fe(t).forEach(f=>{const j=[];for(const p of f.children){let{id:O,name:h,invisible:C,from:d}=p;if(C)continue;const v=me(h,e,d);v&&a.push(v),D(d)&&c.push({id:d.id,name:h});const{props:g,events:N,handlers:G}=$e(p,O,p.props,p.events,r,n),B=be(p.directives,n).join(" "),y=p.children?ve(p.children,n,e,r,p):"";Object.assign(o,G);let S="";typeof y=="string"?S=y:(S=(y?.nodes||[]).join(`
+        }`})}function M(t,e,n=[],r={},i){const s=[];let o={},a=[],c=[];return fe(t).forEach(m=>{const j=[];for(const p of m.children){let{id:O,name:h,invisible:C,from:d}=p;if(C)continue;const v=me(h,e,d);v&&a.push(v),D(d)&&c.push({id:d.id,name:h});const{props:g,events:N,handlers:G}=$e(p,O,p.props,p.events,r,n),B=be(p.directives,n).join(" "),y=p.children?ve(p.children,n,e,r,p):"";Object.assign(o,G);let S="";typeof y=="string"?S=y:(S=(y?.nodes||[]).join(`
 `),Object.assign(o,y?.methods||{}),a=a.concat(y?.components||[]),c=c.concat(y?.importBlocks||[]));const R=z(d)||Q(d)?"component":h;j.push(h==="img"?`<${h} ${B} ${g} ${N} />`:`<${R} ${B} ${g} ${N}>${S?`
-`+S.trim():""}</${R}>`)}const P=Se(f.slot,j.join(`
-`),i?.id);s.push(P)}),{nodes:s,methods:o,components:l.dedupArray(a),importBlocks:l.dedupArray(c,"id")}}function fe(t=[]){const e=new Map;for(const n of t){const r=typeof n.slot=="string"?n.slot:n.slot?.name,i=e.get(r);i?i.children.push(n):e.set(r,{slot:n.slot,children:[n]})}return e}function me(t,e,n){if(te.includes(t))return null;const r=e.get(t);if(r&&r.alias){const i=r.parent?`${r.parent}.${r.alias}`:r.alias;return`${t}: ${i}`}return D(n)||r?t:null}function D(t){return!!t&&typeof t=="object"&&t.type==="Schema"}function z(t){return typeof t=="object"&&t.type==="UrlSchema"}function Q(t){return typeof t=="object"&&t.type==="Plugin"}function he(t,e,n=[]){return t==="style"?"":t==="__class"&&$(e)?`:class="${u({...e,value:b(e.value,n)})}"`:typeof e=="string"?`${t}="${e}"`:$(e)?`:${t}="${u({...e,value:b(e.value,n)})}"`:l.isPlainObject(e)?`:${t}='{${re(e).join(", ")}}'`:`:${t}='${JSON.stringify(e)}'`}function de(t,e={},n=[]){if(!!Object.keys(e.style||{}).length){const s=`${t.name}_${t.id}`;e.class?typeof e.class=="string"?e.class=[e.class,s].join(" "):(e.__class=e.class,e.class=s):(e.class=s,delete e.style)}const i=t.from;return(z(i)||Q(i))&&(e.is={type:"JSExpression",value:t.name}),Object.entries(e).map(([s,o])=>he(s,o,n))}function ye(t,e,n,r){const i=V(e.modifiers,!0);return r&&r.length>0?`@${t}${i.join("")}="(...args:any[]) => ${n}"`:`@${t}${i.join("")}="${n}"`}function ge(t,e={},n={}){const r={},i=Array.from(n[t]||new Set([])),s=i.length?`({${i.join(", ")}}, args)`:"";return{binders:Object.entries(e).map(([a,c])=>{const m=c.handler.value.startsWith("this."),f=m?F(c.handler.value):`${l.camelCase(a)}_${t}${s}`;return m||(r[f]=i.length?{type:"JSFunction",value:`{
+`+S.trim():""}</${R}>`)}const P=Se(m.slot,j.join(`
+`),i?.id);s.push(P)}),{nodes:s,methods:o,components:l.dedupArray(a),importBlocks:l.dedupArray(c,"id")}}function fe(t=[]){const e=new Map;for(const n of t){const r=typeof n.slot=="string"?n.slot:n.slot?.name,i=e.get(r);i?i.children.push(n):e.set(r,{slot:n.slot,children:[n]})}return e}function me(t,e,n){if(te.includes(t))return null;const r=e.get(t);if(r&&r.alias){const i=r.parent?`${r.parent}.${r.alias}`:r.alias;return`${t}: ${i}`}return D(n)||r?t:null}function D(t){return!!t&&typeof t=="object"&&t.type==="Schema"}function z(t){return typeof t=="object"&&t.type==="UrlSchema"}function Q(t){return typeof t=="object"&&t.type==="Plugin"}function he(t,e,n=[]){return t==="style"?"":t==="__class"&&$(e)?`:class="${u({...e,value:b(e.value,n)})}"`:typeof e=="string"?`${t}="${e}"`:$(e)?`:${t}="${u({...e,value:b(e.value,n)})}"`:l.isPlainObject(e)?`:${t}='{${re(e).join(", ")}}'`:`:${t}='${JSON.stringify(e)}'`}function de(t,e={},n=[]){if(!!Object.keys(e.style||{}).length){const s=`${t.name}_${t.id}`;e.class?typeof e.class=="string"?e.class=[e.class,s].join(" "):(e.__class=e.class,e.class=s):(e.class=s,delete e.style)}const i=t.from;return(z(i)||Q(i))&&(e.is={type:"JSExpression",value:t.name}),Object.entries(e).map(([s,o])=>he(s,o,n))}function ye(t,e,n,r,i){const s=V(e.modifiers,!0);return i?`@${t}${s.join("")}="${n}"`:r&&r.length>0?`@${t}${s.join("")}="(...args:any[]) => ${n}"`:`@${t}${s.join("")}="${n}"`}function ge(t,e={},n={}){const r={},i=Array.from(n[t]||new Set([])),s=i.length?`({${i.join(", ")}}, args)`:"";return{binders:Object.entries(e).map(([a,c])=>{const f=c.handler.value.startsWith("this."),m=f?F(c.handler.value):`${l.camelCase(a)}_${t}${s}`;return f||(r[m]=i.length?{type:"JSFunction",value:`{
           return (${c.handler.value}).apply(this, args);
-        }`}:c.handler),ye(a,c,f,i)}),handlers:r}}function $e(t,e,n={},r={},i={},s){const{binders:o,handlers:a}=ge(e,r,i);return{props:de(t,n,s).join(" "),handlers:a,binders:o,events:o.join(" ")}}function be(t=[],e=[]){const n=[],{vIf:r,vShow:i,vModels:s,vFor:o}=je(t);if(r&&n.push(`v-if="${u(r.value,!0,!0,e)}"`),i&&n.push(`v-show="${u(i.value,!0,!0,e)}"`),s.forEach(a=>{const c=V(a.modifiers,!0),m=a.arg?E(a.arg)?`:[${u(a.arg,!0,!0,e)}]`:`:${a.arg}`:"";n.push(`v-model${m}${c}="${u(a.value,!0,!0,e)}"`)}),o){const{item:a,index:c}={item:"item",index:"index",...o.iterator};n.push(`v-for="(${a}, ${c}) in ${u(o.value,!0,!0,e)}"`)}return n}function je(t=[]){const e=t.find(o=>l.camelCase(o.name)==="vIf"),n=t.find(o=>l.camelCase(o.name)==="vFor"),r=t.find(o=>l.camelCase(o.name)==="vShow"),i=t.find(o=>l.camelCase(o.name)==="vBind"),s=t.filter(o=>l.camelCase(o.name)==="vModel");return{vIf:e,vFor:n,vShow:r,vModels:s,vBind:i}}function ve(t,e,n,r,i){if(typeof t=="string")return t;if(E(t)){let s=u(t,!1);return s=b(s,e),s=F(s),`{{ ${s} }}`}return Array.isArray(t)?M(t,n,e,r,i):""}function Se(t,e,n){if(!t)return e;const r=typeof t=="string"?{name:t,params:[]}:{params:[],...t};return`<template ${`#${r.name}="${r.params?.length>0?`{${r.params?.join(",")}}`:`scope_${n}`}"`}>
+        }`}:c.handler),ye(a,c,m,i,f)}),handlers:r}}function $e(t,e,n={},r={},i={},s){const{binders:o,handlers:a}=ge(e,r,i);return{props:de(t,n,s).join(" "),handlers:a,binders:o,events:o.join(" ")}}function be(t=[],e=[]){const n=[],{vIf:r,vShow:i,vModels:s,vFor:o}=je(t);if(r&&n.push(`v-if="${u(r.value,!0,!0,e)}"`),i&&n.push(`v-show="${u(i.value,!0,!0,e)}"`),s.forEach(a=>{const c=V(a.modifiers,!0),f=a.arg?E(a.arg)?`:[${u(a.arg,!0,!0,e)}]`:`:${a.arg}`:"";n.push(`v-model${f}${c}="${u(a.value,!0,!0,e)}"`)}),o){const{item:a,index:c}={item:"item",index:"index",...o.iterator};n.push(`v-for="(${a}, ${c}) in ${u(o.value,!0,!0,e)}"`)}return n}function je(t=[]){const e=t.find(o=>l.camelCase(o.name)==="vIf"),n=t.find(o=>l.camelCase(o.name)==="vFor"),r=t.find(o=>l.camelCase(o.name)==="vShow"),i=t.find(o=>l.camelCase(o.name)==="vBind"),s=t.filter(o=>l.camelCase(o.name)==="vModel");return{vIf:e,vFor:n,vShow:r,vModels:s,vBind:i}}function ve(t,e,n,r,i){if(typeof t=="string")return t;if(E(t)){let s=u(t,!1);return s=b(s,e),s=F(s),`{{ ${s} }}`}return Array.isArray(t)?M(t,n,e,r,i):""}function Se(t,e,n){if(!t)return e;const r=typeof t=="string"?{name:t,params:[]}:{params:[],...t};return`<template ${`#${r.name}="${r.params?.length>0?`{${r.params?.join(",")}}`:`scope_${n}`}"`}>
     ${e}
     </template>`}function we(t,e=[],n=[],r={}){const i={vue:["defineComponent","reactive"]};for(const s of e){const o=t.get(s.split(":")[0]);o&&o.package&&(i[o.package]??(i[o.package]=[])).push(o.parent||(o.alias||"").split(".")[0]||o.name)}for(const[s,o]of Object.entries(r))(i[s]??(i[s]=[])).push(...Array.from(o));return Object.entries(i).filter(([s,o])=>!!o.length).map(([s,o])=>`import { ${l.dedupArray(o).join(",")}} from '${s}';`).concat(n)}function ke(t={}){const e=[];for(const[n,r]of Object.entries(t))e.push(`
     ${n} {
         ${se(r)}
     }
     `);return e.join(`
-`)}function Pe(t={}){const e=[];return Object.entries(t).forEach(([n,r])=>{e.push(`const ${n} = provider.defineUrlSchemaComponent('${r.url}');`)}),e}function Oe(t={}){const e=[];return Object.entries(t).forEach(([n,r])=>{e.push(`const ${n} = provider.definePluginComponent(${JSON.stringify(r)});`)}),e}function Ce(t,e){const{dsl:n}=t,r=Object.keys(n.computed||{}),i=w(n.lifeCycles,r),s=w(n.computed,r),o=ue(n.watch,r),a=pe(n.dataSources),{methods:c,nodes:m,components:f,importBlocks:j}=M(n.nodes||[],e,r,t.context),P=[...s,...o.computed],p=w({...c,...n.methods||{}},r),O=j.map(g=>`import ${g.name} from './${g.id}.vue';`),h=we(e,f,O,t.imports),C=Object.keys({...t.urlSchemas,...t.blockPlugins}),d=Pe(t.urlSchemas),v=Oe(t.blockPlugins);return{id:n.id,version:n.__VERSION__,name:n.name,state:oe(n.state).join(","),inject:ae(n.inject).join(","),props:ce(n.props).join(","),emits:le(n.emits).join(","),watch:o.watches.join(","),lifeCycles:i.join(","),computed:P.join(","),methods:[...a,...p].join(","),imports:h.join(`
-`),components:f.join(","),returns:t.members.join(","),template:m.join(`
+`)}function Pe(t={}){const e=[];return Object.entries(t).forEach(([n,r])=>{e.push(`const ${n} = provider.defineUrlSchemaComponent('${r.url}');`)}),e}function Oe(t={}){const e=[];return Object.entries(t).forEach(([n,r])=>{e.push(`const ${n} = provider.definePluginComponent(${JSON.stringify(r)});`)}),e}function Ce(t,e){const{dsl:n}=t,r=Object.keys(n.computed||{}),i=w(n.lifeCycles,r),s=w(n.computed,r),o=ue(n.watch,r),a=pe(n.dataSources),{methods:c,nodes:f,components:m,importBlocks:j}=M(n.nodes||[],e,r,t.context),P=[...s,...o.computed],p=w({...c,...n.methods||{}},r),O=j.map(g=>`import ${g.name} from './${g.id}.vue';`),h=we(e,m,O,t.imports),C=Object.keys({...t.urlSchemas,...t.blockPlugins}),d=Pe(t.urlSchemas),v=Oe(t.blockPlugins);return{id:n.id,version:n.__VERSION__,name:n.name,state:oe(n.state).join(","),inject:ae(n.inject).join(","),props:ce(n.props).join(","),emits:le(n.emits).join(","),watch:o.watches.join(","),lifeCycles:i.join(","),computed:P.join(","),methods:[...a,...p].join(","),imports:h.join(`
+`),components:m.join(","),returns:t.members.join(","),template:f.join(`
 `),css:n.css||"",style:ke(t.style),urlSchemas:d.join(`
 `),blockPlugins:v.join(`
 `),asyncComponents:C.join(",")}}const xe=`

package/dist/index.mjs

@@ -8,15 +8,15 @@ import * as U from "prettier/plugins/estree";
  * Copyright (c) 2024, VTJ.PRO All rights reserved.
  * @name @vtj/coder 
  * @author CHC chenhuachun1549@dingtalk.com 
- * @version 0.8.67
+ * @version 0.8.68
  * @license <a href="https://vtj.pro/license.html">MIT License</a>
  */
-const Bt = "0.8.67";
+const Bt = "0.8.68";
 /**!
  * Copyright (c) 2024, VTJ.PRO All rights reserved.
  * @name @vtj/core 
  * @author CHC chenhuachun1549@dingtalk.com 
- * @version 0.8.67
+ * @version 0.8.68
  * @license <a href="https://vtj.pro/license.html">MIT License</a>
  */
 const et = [
@@ -91,9 +91,9 @@ function I(e) {
 }
 function l(e, t = !0, n = !0, s = []) {
   let i = $(e) ? e.value : t ? JSON.stringify(e) : e;
-  return i = b(i, s), n ? F(I(i)) : I(i);
+  return i = v(i, s), n ? F(I(i)) : I(i);
 }
-function b(e, t = []) {
+function v(e, t = []) {
   let n = e;
   for (const s of t)
     n = n.replace(
@@ -159,7 +159,7 @@ class it {
       const s = n.pop(), i = n.join(".") + ".", r = n.pop();
       if (s && r) {
         const o = this.dependencies.find(
-          (a) => a.library === r
+          (c) => c.library === r
         )?.package;
         o && (this.imports[o] || (this.imports[o] = /* @__PURE__ */ new Set())).add(s);
       }
@@ -178,10 +178,10 @@ class it {
     for (const i of n) {
       const r = t.value.match(i) || [];
       for (const o of r) {
-        const a = this.collectImport(o);
-        if (a) {
-          const c = a.path.replace(/\$/g, "\\$");
-          s = s.replace(new RegExp(c, "g"), "");
+        const c = this.collectImport(o);
+        if (c) {
+          const a = c.path.replace(/\$/g, "\\$");
+          s = s.replace(new RegExp(a, "g"), "");
         }
       }
     }
@@ -208,16 +208,16 @@ class it {
     return k(n);
   }
   collectContext(t, n) {
-    const s = new Set(n?.id ? this.context[n.id] : []), i = (t.directives || []).find((a) => a.name === "vFor");
+    const s = new Set(n?.id ? this.context[n.id] : []), i = (t.directives || []).find((c) => c.name === "vFor");
     let r = new Set(Array.from(s));
     if (i) {
-      const { item: a = "item", index: c = "index" } = i.iterator || {};
-      r = /* @__PURE__ */ new Set([a, c, ...Array.from(r)]);
+      const { item: c = "item", index: a = "index" } = i.iterator || {};
+      r = /* @__PURE__ */ new Set([c, a, ...Array.from(r)]);
     }
     const o = t.slot;
     if (o) {
-      const a = typeof o == "string" ? [] : o.params || [], c = a.length ? a : [`scope_${n?.id}`];
-      r = /* @__PURE__ */ new Set([...c, ...Array.from(r)]);
+      const c = typeof o == "string" ? [] : o.params || [], a = c.length ? c : [`scope_${n?.id}`];
+      r = /* @__PURE__ */ new Set([...a, ...Array.from(r)]);
     }
     this.context[t.id] = r;
   }
@@ -243,13 +243,13 @@ function ot(e = {}) {
     return `${t}:${s}`;
   });
 }
-function at(e = []) {
+function ct(e = []) {
   return e.map((t) => `${t.name}: {
             from: '${t.from || t.name}',
             default: ${l(t.default, !0, !1)}
         }`);
 }
-function ct(e = []) {
+function at(e = []) {
   const t = (n) => n ? `[${Y(n).map((r) => r.replace(/\'|\"/gi, "")).join(",")}]` : void 0;
   return e.map((n) => typeof n == "string" ? `${n}: {}` : ($(n.default) && !n.default.value && (n.default.value = "undefined"), `${n.name}: {
           type:${t(n.type)},
@@ -263,7 +263,7 @@ function lt(e = []) {
 function w(e = {}, t = []) {
   return Object.entries(e).map(([n, s]) => {
     let i = q(l(s, !1, !1));
-    return i = b(i, t), i.startsWith("async") ? `async ${n}${i.replace(/^async/, "")}` : `${n}${i}`;
+    return i = v(i, t), i.startsWith("async") ? `async ${n}${i.replace(/^async/, "")}` : `${n}${i}`;
   });
 }
 function ut(e = [], t = []) {
@@ -290,15 +290,15 @@ function pt(e = {}) {
 }
 function D(e, t, n = [], s = {}, i) {
   const r = [];
-  let o = {}, a = [], c = [];
-  return ft(e).forEach((p) => {
-    const v = [];
-    for (const u of p.children) {
+  let o = {}, c = [], a = [];
+  return ft(e).forEach((f) => {
+    const b = [];
+    for (const u of f.children) {
       let { id: x, name: m, invisible: O, from: h } = u;
       if (O)
         continue;
       const j = mt(m, t, h);
-      j && a.push(j), Q(h) && c.push({ id: h.id, name: m });
+      j && c.push(j), Q(h) && a.push({ id: h.id, name: m });
       const { props: g, events: N, handlers: H } = $t(
         u,
         x,
@@ -306,7 +306,7 @@ function D(e, t, n = [], s = {}, i) {
         u.events,
         s,
         n
-      ), B = bt(u.directives, n).join(
+      ), B = vt(u.directives, n).join(
         " "
       ), d = u.children ? jt(
         u.children,
@@ -318,21 +318,21 @@ function D(e, t, n = [], s = {}, i) {
       Object.assign(o, H);
       let S = "";
       typeof d == "string" ? S = d : (S = (d?.nodes || []).join(`
-`), Object.assign(o, d?.methods || {}), a = a.concat(d?.components || []), c = c.concat(d?.importBlocks || []));
+`), Object.assign(o, d?.methods || {}), c = c.concat(d?.components || []), a = a.concat(d?.importBlocks || []));
       const R = z(h) || G(h) ? "component" : m;
-      v.push(
+      b.push(
         m === "img" ? `<${m} ${B} ${g} ${N} />` : `<${R} ${B} ${g} ${N}>${S ? `
 ` + S.trim() : ""}</${R}>`
       );
     }
-    const P = St(p.slot, v.join(`
+    const P = St(f.slot, b.join(`
 `), i?.id);
     r.push(P);
   }), {
     nodes: r,
     methods: o,
-    components: k(a),
-    importBlocks: k(c, "id")
+    components: k(c),
+    importBlocks: k(a, "id")
   };
 }
 function ft(e = []) {
@@ -364,10 +364,10 @@ function G(e) {
 function ht(e, t, n = []) {
   return e === "style" ? "" : e === "__class" && $(t) ? `:class="${l({
     ...t,
-    value: b(t.value, n)
+    value: v(t.value, n)
   })}"` : typeof t == "string" ? `${e}="${t}"` : $(t) ? `:${e}="${l({
     ...t,
-    value: b(t.value, n)
+    value: v(t.value, n)
   })}"` : Z(t) ? `:${e}='{${st(
     t
   ).join(", ")}}'` : `:${e}='${JSON.stringify(t)}'`;
@@ -383,52 +383,52 @@ function dt(e, t = {}, n = []) {
     value: e.name
   }), Object.entries(t).map(([r, o]) => ht(r, o, n));
 }
-function yt(e, t, n, s) {
-  const i = M(t.modifiers, !0);
-  return s && s.length > 0 ? `@${e}${i.join("")}="(...args:any[]) => ${n}"` : `@${e}${i.join("")}="${n}"`;
+function yt(e, t, n, s, i) {
+  const r = M(t.modifiers, !0);
+  return i ? `@${e}${r.join("")}="${n}"` : s && s.length > 0 ? `@${e}${r.join("")}="(...args:any[]) => ${n}"` : `@${e}${r.join("")}="${n}"`;
 }
 function gt(e, t = {}, n = {}) {
   const s = {}, i = Array.from(n[e] || /* @__PURE__ */ new Set([])), r = i.length ? `({${i.join(", ")}}, args)` : "";
   return {
-    binders: Object.entries(t).map(([a, c]) => {
-      const f = c.handler.value.startsWith("this."), p = f ? F(c.handler.value) : `${y(a)}_${e}${r}`;
-      return f || (s[p] = i.length ? {
+    binders: Object.entries(t).map(([c, a]) => {
+      const p = a.handler.value.startsWith("this."), f = p ? F(a.handler.value) : `${y(c)}_${e}${r}`;
+      return p || (s[f] = i.length ? {
         type: "JSFunction",
         value: `{
-          return (${c.handler.value}).apply(this, args);
+          return (${a.handler.value}).apply(this, args);
         }`
-      } : c.handler), yt(a, c, p, i);
+      } : a.handler), yt(c, a, f, i, p);
     }),
     handlers: s
   };
 }
 function $t(e, t, n = {}, s = {}, i = {}, r) {
-  const { binders: o, handlers: a } = gt(t, s, i);
+  const { binders: o, handlers: c } = gt(t, s, i);
   return {
     props: dt(e, n, r).join(" "),
-    handlers: a,
+    handlers: c,
     binders: o,
     events: o.join(" ")
   };
 }
-function bt(e = [], t = []) {
-  const n = [], { vIf: s, vShow: i, vModels: r, vFor: o } = vt(e);
+function vt(e = [], t = []) {
+  const n = [], { vIf: s, vShow: i, vModels: r, vFor: o } = bt(e);
   if (s && n.push(`v-if="${l(s.value, !0, !0, t)}"`), i && n.push(
     `v-show="${l(i.value, !0, !0, t)}"`
-  ), r.forEach((a) => {
-    const c = M(a.modifiers, !0), f = a.arg ? _(a.arg) ? `:[${l(a.arg, !0, !0, t)}]` : `:${a.arg}` : "";
+  ), r.forEach((c) => {
+    const a = M(c.modifiers, !0), p = c.arg ? _(c.arg) ? `:[${l(c.arg, !0, !0, t)}]` : `:${c.arg}` : "";
     n.push(
-      `v-model${f}${c}="${l(a.value, !0, !0, t)}"`
+      `v-model${p}${a}="${l(c.value, !0, !0, t)}"`
     );
   }), o) {
-    const { item: a, index: c } = { item: "item", index: "index", ...o.iterator };
+    const { item: c, index: a } = { item: "item", index: "index", ...o.iterator };
     n.push(
-      `v-for="(${a}, ${c}) in ${l(o.value, !0, !0, t)}"`
+      `v-for="(${c}, ${a}) in ${l(o.value, !0, !0, t)}"`
     );
   }
   return n;
 }
-function vt(e = []) {
+function bt(e = []) {
   const t = e.find((o) => y(o.name) === "vIf"), n = e.find((o) => y(o.name) === "vFor"), s = e.find((o) => y(o.name) === "vShow"), i = e.find((o) => y(o.name) === "vBind"), r = e.filter((o) => y(o.name) === "vModel");
   return {
     vIf: t,
@@ -443,7 +443,7 @@ function jt(e, t, n, s, i) {
     return e;
   if (_(e)) {
     let r = l(e, !1);
-    return r = b(r, t), r = F(r), `{{ ${r} }}`;
+    return r = v(r, t), r = F(r), `{{ ${r} }}`;
   }
   return Array.isArray(e) ? D(e, n, t, s, i) : "";
 }
@@ -496,20 +496,20 @@ function xt(e = {}) {
   }), t;
 }
 function Ot(e, t) {
-  const { dsl: n } = e, s = Object.keys(n.computed || {}), i = w(n.lifeCycles, s), r = w(n.computed, s), o = ut(n.watch, s), a = pt(n.dataSources), { methods: c, nodes: f, components: p, importBlocks: v } = D(
+  const { dsl: n } = e, s = Object.keys(n.computed || {}), i = w(n.lifeCycles, s), r = w(n.computed, s), o = ut(n.watch, s), c = pt(n.dataSources), { methods: a, nodes: p, components: f, importBlocks: b } = D(
     n.nodes || [],
     t,
     s,
     e.context
   ), P = [...r, ...o.computed], u = w(
     {
-      ...c,
+      ...a,
       ...n.methods || {}
     },
     s
-  ), x = v.map((g) => `import ${g.name} from './${g.id}.vue';`), m = wt(
+  ), x = b.map((g) => `import ${g.name} from './${g.id}.vue';`), m = wt(
     t,
-    p,
+    f,
     x,
     e.imports
   ), O = Object.keys({
@@ -521,18 +521,18 @@ function Ot(e, t) {
     version: n.__VERSION__,
     name: n.name,
     state: ot(n.state).join(","),
-    inject: at(n.inject).join(","),
-    props: ct(n.props).join(","),
+    inject: ct(n.inject).join(","),
+    props: at(n.props).join(","),
     emits: lt(n.emits).join(","),
     watch: o.watches.join(","),
     lifeCycles: i.join(","),
     computed: P.join(","),
-    methods: [...a, ...u].join(","),
+    methods: [...c, ...u].join(","),
     imports: m.join(`
 `),
-    components: p.join(","),
+    components: f.join(","),
     returns: e.members.join(","),
-    template: f.join(`
+    template: p.join(`
 `),
     css: n.css || "",
     style: kt(e.style),
@@ -585,13 +585,13 @@ export default defineComponent({
 </style>
 `, _t = J(Ct), At = J(Et);
 async function Rt(e, t = /* @__PURE__ */ new Map(), n = [], s) {
-  const i = new it(K(e), n), r = Ot(i, t), o = _t(r), a = At({
+  const i = new it(K(e), n), r = Ot(i, t), o = _t(r), c = At({
     template: r.template,
     css: await W(r.css, s),
     script: await nt(o, s),
     style: await W(r.style, s)
   });
-  return await V(a, s).catch((c) => (c.content = a, c));
+  return await V(c, s).catch((a) => (a.content = c, a));
 }
 async function Wt(e) {
   const t = `

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@vtj/coder",
   "private": false,
-  "version": "0.8.67",
+  "version": "0.8.68",
   "type": "module",
   "dependencies": {
     "prettier": "~3.3.0",
-    "@vtj/core": "~0.8.67",
-    "@vtj/base": "~0.8.6"
+    "@vtj/base": "~0.8.6",
+    "@vtj/core": "~0.8.68"
   },
   "devDependencies": {
     "@vtj/cli": "~0.8.17"

package/types/version.d.ts

@@ -2,7 +2,7 @@
  * Copyright (c) 2024, VTJ.PRO All rights reserved.
  * @name @vtj/coder
  * @author CHC chenhuachun1549@dingtalk.com
- * @version 0.8.66
+ * @version 0.8.67
  * @license <a href="https://vtj.pro/license.html">MIT License</a>
  */
-export declare const version = "0.8.66";
+export declare const version = "0.8.67";