@vtj/coder 0.13.5 → 0.13.6

package/dist/index.cjs

@@ -2,45 +2,45 @@
  * Copyright (c) 2025, VTJ.PRO All rights reserved.
  * @name @vtj/coder 
  * @author CHC chenhuachun1549@dingtalk.com 
- * @version 0.13.5
+ * @version 0.13.6
  * @license <a href="https://vtj.pro/license.html">MIT License</a>
- */const re="0.13.5";/**!
+ */const re="0.13.6";/**!
  * Copyright (c) 2025, VTJ.PRO All rights reserved.
  * @name @vtj/core 
  * @author CHC chenhuachun1549@dingtalk.com 
- * @version 0.13.5
+ * @version 0.13.6
  * @license <a href="https://vtj.pro/license.html">MIT License</a>
- */const ie=["slot","template","component","img","div","p","h1","h2","h3","span","a"];f.mitt();const T={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 B(t,e){return e?t:await D.format(t,{parser:"vue",...T,plugins:[ne,q,U,M]})}async function V(t,e){if(e)return t;try{return(await D.format(t,{parser:"babel-ts",...T,plugins:[q,U]})).replace(/;\n$/gi,"")}catch(s){return console.warn(s),t}}async function N(t,e){return e?t:D.format(t,{parser:"scss",...T,plugins:[M]})}function k(t){return t&&t.type==="JSExpression"}function I(t){return typeof t=="object"&&t&&t.type==="JSFunction"}function j(t){return k(t)||I(t)}function H(t){return t.replace(new RegExp("this.","g"),"")}function R(t){return t.replace(/this\.context\??\./g,"")}function d(t,e=!0,s=!0,n=[]){let r=j(t)?t.value.trim().replace(/;$/,""):e?JSON.stringify(t):t;return r=w(r,n),s?H(R(r)):R(r)}function w(t="",e=[]){let s=t;for(const n of e)s=s.replace(new RegExp(`this.${n}.value`,"g"),`this.${n}`);return s}function Q(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"))e=e.replace(/^async function/,"async");else if(e.startsWith("function"))e=e.replace(/^function/,"");else{const r=/^(async\s)?\([\w]*\)\s+\=\>\s([\w\W]+)/,i=e.match(r);i&&i[2]&&(i[2].startsWith("{")||(e=e.replace(i[2],`{ return ${i[2]} }`))),e=e.replace("=>","")}return e}function oe(t={}){return Object.entries(t).map(([e,s])=>`"${e}": ${d(s)}`)}function z(t={},e=!1){const s=Object.keys(t);return e?s.map(n=>"."+n):s}function ae(t){let e="";for(var s in t)if(t.hasOwnProperty(s)){var n=t[s];e+=s+": "+n+";"}return e}function ce(t=[],e=[]){return t.filter(s=>!e.includes(s))}function W(t){return f.base64(JSON.stringify(t))}class le{constructor(e,s){this.dsl=e,this.dependencies=s,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 s=e.split(".");if(s.length===4){const n=s.pop(),r=s.join(".")+".",i=s.pop();if(n&&i){const o=this.dependencies.find(a=>a.library===i)?.package;o&&(this.imports[o]||(this.imports[o]=new Set)).add(n)}return{name:n,path:r,library:i}}return null}replaceLibraryPath(e){const{libraryRegex:s}=this;let n=e.value;for(const r of s){const i=e.value?.match(r)||[];for(const o of i){const a=this.collectImport(o);if(a){const m=a.path.replace(/\$/g,"\\$");n=n.replace(new RegExp(m,"g"),"")}}}return n}walk(e){const s=n=>{if(!n||typeof n!="object")return;if(Array.isArray(n)){for(let i of n)s(i);return}const r=Object.values(n);for(const i of r)j(i)?i.value=this.replaceLibraryPath(i):s(i)};s(e)}getLibraryMember(e=[]){let s=[...e];const n={...this.imports};delete n["uni-h5"],delete n["@dcloudio/uni-h5"],delete n["uni-ui"],delete n["@dcloudio/uni-ui"];for(const r of Object.values(n))s=s.concat(Array.from(r));return f.dedupArray(s)}collectContext(e,s){const n=new Set(s?.id?this.context[s.id]:[]),r=(e.directives||[]).find(a=>a.name==="vFor");let i=new Set(Array.from(n));if(r){const{item:a="item",index:m="index"}=r.iterator||{};i=new Set([a,m,...Array.from(i)])}const o=e.slot;if(o){const a=typeof o=="string"?[]:o.params||[],m=a.length?a:[`scope_${s?.id}`];i=new Set([...m,...Array.from(i)])}this.context[e.id]=i}collectStyle(e){e.id&&e.props?.style&&Object.keys(e.props.style).length&&!j(e.props.style)&&(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 s=(n,r)=>{this.collectContext(n,r),this.collectStyle(n),this.collectUrlSchema(n),this.collectBlockPlugin(n),Array.isArray(n.children)&&n.children.forEach(i=>s(i,n))};Array.isArray(e.nodes)&&e.nodes.forEach(n=>s(n))}}function ue(t={}){return Object.entries(t).map(([e,s])=>{const n=d(s,!1);return`${e}:${n}`})}function pe(t=[]){return t.map(e=>`${e.name}: {
+ */const ie=["slot","template","component","img","div","p","h1","h2","h3","span","a"];f.mitt();const T={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 B(t,e){return e?t:await D.format(t,{parser:"vue",...T,plugins:[ne,q,U,M]})}async function V(t,e){if(e)return t;try{return(await D.format(t,{parser:"babel-ts",...T,plugins:[q,U]})).replace(/;\n$/gi,"")}catch(s){return console.warn(s),t}}async function N(t,e){return e?t:D.format(t,{parser:"scss",...T,plugins:[M]})}function k(t){return t&&t.type==="JSExpression"}function I(t){return typeof t=="object"&&t&&t.type==="JSFunction"}function j(t){return k(t)||I(t)}function H(t){return t.replace(new RegExp("this.","g"),"")}function R(t){return t.replace(/this\.context\??\./g,"")}function d(t,e=!0,s=!0,n=[]){let i=j(t)?t.value.trim().replace(/;$/,""):e?JSON.stringify(t):t;return i=w(i,n),s?H(R(i)):R(i)}function w(t="",e=[]){let s=t;for(const n of e)s=s.replace(new RegExp(`this.${n}.value`,"g"),`this.${n}`);return s}function Q(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"))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]+)/,r=e.match(i);r&&r[2]&&(r[2].startsWith("{")||(e=e.replace(r[2],`{ return ${r[2]} }`))),e=e.replace("=>","")}return e}function oe(t={}){return Object.entries(t).map(([e,s])=>`"${e}": ${d(s)}`)}function z(t={},e=!1){const s=Object.keys(t);return e?s.map(n=>"."+n):s}function ae(t){let e="";for(var s in t)if(t.hasOwnProperty(s)){var n=t[s];e+=s+": "+n+";"}return e}function ce(t=[],e=[]){return t.filter(s=>!e.includes(s))}function W(t){return f.base64(JSON.stringify(t))}class le{constructor(e,s){this.dsl=e,this.dependencies=s,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 s=e.split(".");if(s.length===4){const n=s.pop(),i=s.join(".")+".",r=s.pop();if(n&&r){const o=this.dependencies.find(a=>a.library===r)?.package;o&&(this.imports[o]||(this.imports[o]=new Set)).add(n)}return{name:n,path:i,library:r}}return null}replaceLibraryPath(e){const{libraryRegex:s}=this;let n=e.value;for(const i of s){const r=e.value?.match(i)||[];for(const o of r){const a=this.collectImport(o);if(a){const m=a.path.replace(/\$/g,"\\$");n=n.replace(new RegExp(m,"g"),"")}}}return n}walk(e){const s=n=>{if(!n||typeof n!="object")return;if(Array.isArray(n)){for(let r of n)s(r);return}const i=Object.values(n);for(const r of i)j(r)?r.value=this.replaceLibraryPath(r):s(r)};s(e)}getLibraryMember(e=[]){let s=[...e];const n={...this.imports};delete n["uni-h5"],delete n["@dcloudio/uni-h5"],delete n["uni-ui"],delete n["@dcloudio/uni-ui"];for(const i of Object.values(n))s=s.concat(Array.from(i));return f.dedupArray(s)}collectContext(e,s){const n=new Set(s?.id?this.context[s.id]:[]),i=(e.directives||[]).find(a=>a.name==="vFor");let r=new Set(Array.from(n));if(i){const{item:a="item",index:m="index"}=i.iterator||{};r=new Set([a,m,...Array.from(r)])}const o=e.slot;if(o){const a=typeof o=="string"?[]:o.params||[],m=a.length?a:[`scope_${s?.id}`];r=new Set([...m,...Array.from(r)])}this.context[e.id]=r}collectStyle(e){e.id&&e.props?.style&&Object.keys(e.props.style).length&&!j(e.props.style)&&(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 s=(n,i)=>{this.collectContext(n,i),this.collectStyle(n),this.collectUrlSchema(n),this.collectBlockPlugin(n),Array.isArray(n.children)&&n.children.forEach(r=>s(r,n))};Array.isArray(e.nodes)&&e.nodes.forEach(n=>s(n))}}function ue(t={}){return Object.entries(t).map(([e,s])=>{const n=d(s,!1);return`${e}:${n}`})}function pe(t=[]){return t.map(e=>`${e.name}: {
             from: '${e.from||e.name}',
             default: ${d(e.default,!0,!1)}
-        }`)}function fe(t=[]){const e=s=>s?`[${f.toArray(s).map(i=>i.replace(/\'|\"/gi,"")).join(",")}]`:void 0;return t.map(s=>typeof s=="string"?`${s}: {}`:(j(s.default)&&!s.default.value&&(s.default.value="undefined"),`${s.name}: {
+        }`)}function fe(t=[]){const e=s=>s?`[${f.toArray(s).map(r=>r.replace(/\'|\"/gi,"")).join(",")}]`:void 0;return t.map(s=>typeof s=="string"?`${s}: {}`:(j(s.default)&&!s.default.value&&(s.default.value="undefined"),`${s.name}: {
           type:${e(s.type)},
           required: ${d(!!s.required,!0,!1)},
           default: ${d(s.default,!0,!1)}
-          }`))}function me(t=[]){return t.map(e=>`'${typeof e=="string"?e:e.name}'`)}function A(t={},e=[]){return Object.entries(t).map(([s,n])=>{let r=Q(d(n,!1,!1));return r=w(r,e),r.startsWith("async")?`async ${s}${r.replace(/^async/,"")}`:`${s}${r}`})}function he(t=[],e=[]){const s=t.reduce((i,o)=>(o.id&&I(o.source)&&(i[`watcher_${o.id}`]=o.source),i),{}),n=A(s,e),r=t.map(i=>`watcher_${i.id}: {
-        deep: ${i.deep},
-        immediate:${i.immediate},
-        handler${Q(i.handler.value)}
-      }`);return{computed:n,watches:r}}function de(t={}){return Object.values(t).map(e=>{if(e.type==="mock"){const s=I(e.mockTemplate)&&e.mockTemplate.value||"(params) => ({})";return`async ${e.name}(...args) {
+          }`))}function me(t=[]){return t.map(e=>`'${typeof e=="string"?e:e.name}'`)}function A(t={},e=[]){return Object.entries(t).map(([s,n])=>{let i=Q(d(n,!1,!1));return i=w(i,e),i.startsWith("async")?`async ${s}${i.replace(/^async/,"")}`:`${s}${i}`})}function he(t=[],e=[]){const s=t.reduce((r,o)=>(o.id&&I(o.source)&&(r[`watcher_${o.id}`]=o.source),r),{}),n=A(s,e),i=t.map(r=>r.handler&&r.handler.value?`watcher_${r.id}: {
+        deep: ${r.deep},
+        immediate:${r.immediate},
+        handler${Q(r.handler.value)}
+      }`:null).filter(r=>!!r);return{computed:n,watches:i}}function de(t={}){return Object.values(t).map(e=>{if(e.type==="mock"){const s=I(e.mockTemplate)&&e.mockTemplate.value||"(params) => ({})";return`async ${e.name}(...args) {
         // DataSource: ${W(e)}
         const mock = this.provider.createMock(${s});
         return await mock.apply(this, args);
       }`}else{const s=I(e.transform)&&e.transform.value||"(res) => res";return`async ${e.name}(...args) {
           // DataSource: ${W(e)}
           return await this.provider.apis['${e.ref}'].apply(this, args).then(${s});
-        }`}})}const ye=["img","input","br","hr","area","base","col","embed","link","meta","param","source","track","wbr"],J=["vIf","vElseIf","vElse","vShow","vModel","vFor","vBind","vHtml"];function G(t,e,s=[],n={},r){const i=[];let o={},a=[];const m=[];let u=[];return ve(t).forEach(c=>{const v=[];for(const h of c.children){let{id:y,name:$,invisible:b,from:g}=h;if(b)continue;const C=$e($,e,g);C&&a.push(C),X(g)&&u.push({id:g.id,name:$});const{props:P,events:O,handlers:E}=we(h,y,h.props,h.events,n,s),L=Ce(h.directives,s,m).join(" "),S=h.children?Oe(h.children,s,e,n,h):"";Object.assign(o,E);let x="";typeof S=="string"?x=S:(x=(S?.nodes||[]).join(`
+        }`}})}const ye=["img","input","br","hr","area","base","col","embed","link","meta","param","source","track","wbr"],J=["vIf","vElseIf","vElse","vShow","vModel","vFor","vBind","vHtml"];function G(t,e,s=[],n={},i){const r=[];let o={},a=[];const m=[];let u=[];return ve(t).forEach(c=>{const v=[];for(const h of c.children){let{id:y,name:$,invisible:b,from:g}=h;if(b)continue;const C=$e($,e,g);C&&a.push(C),X(g)&&u.push({id:g.id,name:$});const{props:P,events:O,handlers:E}=we(h,y,h.props,h.events,n,s),L=Ce(h.directives,s,m).join(" "),S=h.children?Oe(h.children,s,e,n,h):"";Object.assign(o,E);let x="";typeof S=="string"?x=S:(x=(S?.nodes||[]).join(`
 `),Object.assign(o,S?.methods||{}),a=a.concat(S?.components||[]),u=u.concat(S?.importBlocks||[]));const _=["@dcloudio/uni-h5","@dcloudio/uni-ui"].includes(g||e.get($)?.package)?f.kebabCase($):Y(g)||Z(g)?"component":$;v.push(ye.includes(_)?`<${_} ${L} ${P} ${O} />`:`<${_} ${L} ${P} ${O}>${x?`
 `+x.trim():""}</${_}>`)}const p=Ee(c.slot,v.join(`
-`),r?.id);i.push(p)}),{nodes:i,methods:o,directives:ge(m),components:f.dedupArray(a),importBlocks:f.dedupArray(u,"id")}}function ge(t){return f.dedupArray(t).map(e=>`${e.startsWith("v")?e.substring(1):e}:${e}`)}function ve(t=[]){const e=new Map;for(const s of t){const n=typeof s.slot=="string"?s.slot:s.slot?.name,r=e.get(n);r?r.children.push(s):e.set(n,{slot:s.slot,children:[s]})}return e}function $e(t,e,s){if(ie.includes(t))return null;const n=e.get(t);if(n&&n.alias){const r=n.parent?`${n.parent}.${n.alias}`:n.alias;return`${t}: ${r}`}return X(s)||n?t:null}function X(t){return!!t&&typeof t=="object"&&t.type==="Schema"}function Y(t){return typeof t=="object"&&t.type==="UrlSchema"}function Z(t){return typeof t=="object"&&t.type==="Plugin"}function be(t,e,s=[]){return t==="style"?j(e)?`:style="${d({...e,value:w(e.value,s)})}"`:"":t==="__class"&&j(e)?`:class="${d({...e,value:w(e.value,s)})}"`:typeof e=="string"?`${t}="${e}"`:j(e)?`:${t}="${d({...e,value:w(e.value,s)})}"`:f.isPlainObject(e)?`:${t}='{${oe(e).join(", ")}}'`:`:${t}='${JSON.stringify(e)}'`}function je(t,e={},s=[]){if(!!Object.keys(e.style||{}).length){const i=`${t.name}_${t.id}`;e.class?typeof e.class=="string"?e.class=[e.class,i].join(" "):(e.__class=e.class,e.class=i):e.class=i,j(e.style)||delete e.style}const r=t.from;return(Y(r)||Z(r))&&(e.is={type:"JSExpression",value:t.name}),Object.entries(e).map(([i,o])=>be(i,o,s))}function Se(t,e,s,n,r){const i=z(e.modifiers,!0);return r?`@${t}${i.join("")}="${s}"`:n&&n.length>0?`@${t}${i.join("")}="(...args:any[]) => ${s}"`:`@${t}${i.join("")}="${s}"`}function ke(t,e={},s={}){const n={},r=Array.from(s[t]||new Set([])),i=r.length?`({${r.join(", ")}}, args)`:"";return{binders:Object.entries(e).map(([a,m])=>{const u=m.handler.value.startsWith("this."),l=u?H(m.handler.value):`${f.camelCase(a)}_${t}${i}`;return u||(n[l]=r.length?{type:"JSFunction",value:`{
+`),i?.id);r.push(p)}),{nodes:r,methods:o,directives:ge(m),components:f.dedupArray(a),importBlocks:f.dedupArray(u,"id")}}function ge(t){return f.dedupArray(t).map(e=>`${e.startsWith("v")?e.substring(1):e}:${e}`)}function ve(t=[]){const e=new Map;for(const s of t){const n=typeof s.slot=="string"?s.slot:s.slot?.name,i=e.get(n);i?i.children.push(s):e.set(n,{slot:s.slot,children:[s]})}return e}function $e(t,e,s){if(ie.includes(t))return null;const n=e.get(t);if(n&&n.alias){const i=n.parent?`${n.parent}.${n.alias}`:n.alias;return`${t}: ${i}`}return X(s)||n?t:null}function X(t){return!!t&&typeof t=="object"&&t.type==="Schema"}function Y(t){return typeof t=="object"&&t.type==="UrlSchema"}function Z(t){return typeof t=="object"&&t.type==="Plugin"}function be(t,e,s=[]){return t==="style"?j(e)?`:style="${d({...e,value:w(e.value,s)})}"`:"":t==="__class"&&j(e)?`:class="${d({...e,value:w(e.value,s)})}"`:typeof e=="string"?`${t}="${e}"`:j(e)?`:${t}="${d({...e,value:w(e.value,s)})}"`:f.isPlainObject(e)?`:${t}='{${oe(e).join(", ")}}'`:`:${t}='${JSON.stringify(e)}'`}function je(t,e={},s=[]){if(!!Object.keys(e.style||{}).length){const r=`${t.name}_${t.id}`;e.class?typeof e.class=="string"?e.class=[e.class,r].join(" "):(e.__class=e.class,e.class=r):e.class=r,j(e.style)||delete e.style}const i=t.from;return(Y(i)||Z(i))&&(e.is={type:"JSExpression",value:t.name}),Object.entries(e).map(([r,o])=>be(r,o,s))}function Se(t,e,s,n,i){const r=z(e.modifiers,!0);return i?`@${t}${r.join("")}="${s}"`:n&&n.length>0?`@${t}${r.join("")}="(...args:any[]) => ${s}"`:`@${t}${r.join("")}="${s}"`}function ke(t,e={},s={}){const n={},i=Array.from(s[t]||new Set([])),r=i.length?`({${i.join(", ")}}, args)`:"";return{binders:Object.entries(e).map(([a,m])=>{const u=m.handler.value.startsWith("this."),l=u?H(m.handler.value):`${f.camelCase(a)}_${t}${r}`;return u||(n[l]=i.length?{type:"JSFunction",value:`{
           return (${m.handler.value}).apply(this, args);
-        }`}:m.handler),Se(a,m,l,r,u)}),handlers:n}}function we(t,e,s={},n={},r={},i){const{binders:o,handlers:a}=ke(e,n,r);return{props:je(t,s,i).join(" "),handlers:a,binders:o,events:o.join(" ")}}function Ce(t=[],e=[],s=[]){const n=[],{vIf:r,vElse:i,vElseIf:o,vShow:a,vModels:m,vFor:u,vBind:l,vHtml:c,customDirectives:v}=Pe(t);if(r&&n.push(`v-if="${d(r.value,!0,!0,e)}"`),o&&n.push(`v-else-if="${d(o.value,!0,!0,e)}"`),i&&n.push("v-else"),a&&n.push(`v-show="${d(a.value,!0,!0,e)}"`),l&&n.push(`v-bind="${d(l.value,!0,!0,e)}"`),m.forEach(p=>{const h=z(p.modifiers,!0),y=p.arg?k(p.arg)?`:[${d(p.arg,!0,!0,e)}]`:`:${p.arg}`:"";n.push(`v-model${y}${h}="${d(p.value,!0,!0,e)}"`)}),u){const{item:p,index:h}={item:"item",index:"index",...u.iterator};n.push(`v-for="(${p}, ${h}) in ${d(u.value,!0,!0,e)}"`)}return c&&n.push(`v-html="${d(c.value,!0,!0,e)}"`),v&&v.length&&v.forEach(p=>{if(!p.name)return;let h="",y="";k(p.name)?(y=d(p.name,!0,!0,e),s.push(y)):y=p.name;const $=y?.startsWith("v")?f.kebabCase(y):f.kebabCase("v-"+y);if(h+=$,p.arg&&(k(p.arg)?h+=`:[${d(p.name,!0,!0,e)}]`:h+=`:${p.arg}`),p.modifiers){const b=Object.keys(p.modifiers);b.length&&(h+=b.map(g=>"."+g))}p.value?n.push(`${h}="${d(p.value,!0,!0,e)}"`):n.push(h)}),n}function Pe(t=[]){const e=t.filter(c=>J.includes(c.name)),s=t.filter(c=>!J.includes(c.name)),n=e.find(c=>f.camelCase(c.name)==="vIf"),r=e.find(c=>f.camelCase(c.name)==="vElseIf"),i=e.find(c=>f.camelCase(c.name)==="vElse"),o=e.find(c=>f.camelCase(c.name)==="vFor"),a=e.find(c=>f.camelCase(c.name)==="vShow"),m=e.find(c=>f.camelCase(c.name)==="vBind"),u=e.find(c=>f.camelCase(c.name)==="vHtml"),l=e.filter(c=>f.camelCase(c.name)==="vModel");return{vIf:n,vElseIf:r,vElse:i,vFor:o,vShow:a,vModels:l,vBind:m,vHtml:u,customDirectives:s}}function Oe(t,e,s,n,r){return typeof t=="string"?t:k(t)?`{{ ${d(t,!1,!0,e)} }}`:Array.isArray(t)?G(t,s,e,n,r):""}function Ee(t,e,s){if(!t)return e;const n=typeof t=="string"?{name:t,params:[],scope:""}:{params:[],scope:"",...t};return`<template ${`#${n.name}="${n.scope?n.scope:n.params?.length>0?`{${n.params?.join(",")}}`:`scope_${s}`}"`}>
+        }`}:m.handler),Se(a,m,l,i,u)}),handlers:n}}function we(t,e,s={},n={},i={},r){const{binders:o,handlers:a}=ke(e,n,i);return{props:je(t,s,r).join(" "),handlers:a,binders:o,events:o.join(" ")}}function Ce(t=[],e=[],s=[]){const n=[],{vIf:i,vElse:r,vElseIf:o,vShow:a,vModels:m,vFor:u,vBind:l,vHtml:c,customDirectives:v}=Pe(t);if(i&&n.push(`v-if="${d(i.value,!0,!0,e)}"`),o&&n.push(`v-else-if="${d(o.value,!0,!0,e)}"`),r&&n.push("v-else"),a&&n.push(`v-show="${d(a.value,!0,!0,e)}"`),l&&n.push(`v-bind="${d(l.value,!0,!0,e)}"`),m.forEach(p=>{const h=z(p.modifiers,!0),y=p.arg?k(p.arg)?`:[${d(p.arg,!0,!0,e)}]`:`:${p.arg}`:"";n.push(`v-model${y}${h}="${d(p.value,!0,!0,e)}"`)}),u){const{item:p,index:h}={item:"item",index:"index",...u.iterator};n.push(`v-for="(${p}, ${h}) in ${d(u.value,!0,!0,e)}"`)}return c&&n.push(`v-html="${d(c.value,!0,!0,e)}"`),v&&v.length&&v.forEach(p=>{if(!p.name)return;let h="",y="";k(p.name)?(y=d(p.name,!0,!0,e),s.push(y)):y=p.name;const $=y?.startsWith("v")?f.kebabCase(y):f.kebabCase("v-"+y);if(h+=$,p.arg&&(k(p.arg)?h+=`:[${d(p.name,!0,!0,e)}]`:h+=`:${p.arg}`),p.modifiers){const b=Object.keys(p.modifiers);b.length&&(h+=b.map(g=>"."+g))}p.value?n.push(`${h}="${d(p.value,!0,!0,e)}"`):n.push(h)}),n}function Pe(t=[]){const e=t.filter(c=>J.includes(c.name)),s=t.filter(c=>!J.includes(c.name)),n=e.find(c=>f.camelCase(c.name)==="vIf"),i=e.find(c=>f.camelCase(c.name)==="vElseIf"),r=e.find(c=>f.camelCase(c.name)==="vElse"),o=e.find(c=>f.camelCase(c.name)==="vFor"),a=e.find(c=>f.camelCase(c.name)==="vShow"),m=e.find(c=>f.camelCase(c.name)==="vBind"),u=e.find(c=>f.camelCase(c.name)==="vHtml"),l=e.filter(c=>f.camelCase(c.name)==="vModel");return{vIf:n,vElseIf:i,vElse:r,vFor:o,vShow:a,vModels:l,vBind:m,vHtml:u,customDirectives:s}}function Oe(t,e,s,n,i){return typeof t=="string"?t:k(t)?`{{ ${d(t,!1,!0,e)} }}`:Array.isArray(t)?G(t,s,e,n,i):""}function Ee(t,e,s){if(!t)return e;const n=typeof t=="string"?{name:t,params:[],scope:""}:{params:[],scope:"",...t};return`<template ${`#${n.name}="${n.scope?n.scope:n.params?.length>0?`{${n.params?.join(",")}}`:`scope_${s}`}"`}>
     ${e}
-    </template>`}function xe(t,e=[],s=[],n={},r="web"){const i=["@dcloudio/uni-h5","uni-h5","@dcloudio/uni-ui","uni-ui"],o={vue:["defineComponent","reactive"]},a=[];for(const u of e){const l=t.get(u.split(":")[0]);if(l&&l.package){const c=o[l.package]??(o[l.package]=[]),v=l.parent||(l.alias||"").split(".")[0]||l.name;c.push(v),r==="uniapp"&&i.includes(l.package)&&a.push(v)}}for(const[u,l]of Object.entries(n))(o[u]??(o[u]=[])).push(...Array.from(l)),r==="uniapp"&&i.includes(u)&&a.push(...Array.from(l));return{imports:Object.entries(o).filter(([u,l])=>r==="uniapp"?!i.includes(u)&&!!l.length:!!l.length).map(([u,l])=>`import { ${f.dedupArray(l).join(",")}} from '${u}';`).concat(s),uniComponents:a}}function _e(t={}){const e=[];for(const[s,n]of Object.entries(t))e.push(`
+    </template>`}function xe(t,e=[],s=[],n={},i="web"){const r=["@dcloudio/uni-h5","uni-h5","@dcloudio/uni-ui","uni-ui"],o={vue:["defineComponent","reactive"]},a=[];for(const u of e){const l=t.get(u.split(":")[0]);if(l&&l.package){const c=o[l.package]??(o[l.package]=[]),v=l.parent||(l.alias||"").split(".")[0]||l.name;c.push(v),i==="uniapp"&&r.includes(l.package)&&a.push(v)}}for(const[u,l]of Object.entries(n))(o[u]??(o[u]=[])).push(...Array.from(l)),i==="uniapp"&&r.includes(u)&&a.push(...Array.from(l));return{imports:Object.entries(o).filter(([u,l])=>i==="uniapp"?!r.includes(u)&&!!l.length:!!l.length).map(([u,l])=>`import { ${f.dedupArray(l).join(",")}} from '${u}';`).concat(s),uniComponents:a}}function _e(t={}){const e=[];for(const[s,n]of Object.entries(t))e.push(`
     ${s} {
         ${ae(n)}
     }
     `);return e.join(`
-`)}function Ae(t={}){const e=[];return Object.entries(t).forEach(([s,n])=>{e.push(`const ${s} = provider.defineUrlSchemaComponent('${n.url}');`)}),e}function Ie(t={}){const e=[];return Object.entries(t).forEach(([s,n])=>{e.push(`const ${s} = provider.definePluginComponent(${JSON.stringify(n)});`)}),e}function Fe(t,e,s="web"){const{dsl:n}=t,r=Object.keys(n.computed||{}),i=A(n.lifeCycles,r),o=A(n.computed,r),a=he(n.watch,r),m=de(n.dataSources),{methods:u,nodes:l,components:c,importBlocks:v,directives:p}=G(n.nodes||[],e,r,t.context),h=[...o,...a.computed],y=A({...u,...n.methods||{}},r),$=v.map(E=>`import ${E.name} from './${E.id}.vue';`);let{imports:b,uniComponents:g}=xe(e,c,$,t.imports,s);const C=Object.keys({...t.urlSchemas,...t.blockPlugins}),P=Ae(t.urlSchemas),O=Ie(t.blockPlugins);return{id:n.id,version:n.__VERSION__,name:n.name,state:ue(n.state).join(","),inject:pe(n.inject).join(","),props:fe(n.props).join(","),emits:me(n.emits).join(","),watch:a.watches.join(","),lifeCycles:i.join(","),computed:h.join(","),methods:[...m,...y].join(","),imports:`
+`)}function Ae(t={}){const e=[];return Object.entries(t).forEach(([s,n])=>{e.push(`const ${s} = provider.defineUrlSchemaComponent('${n.url}');`)}),e}function Ie(t={}){const e=[];return Object.entries(t).forEach(([s,n])=>{e.push(`const ${s} = provider.definePluginComponent(${JSON.stringify(n)});`)}),e}function Fe(t,e,s="web"){const{dsl:n}=t,i=Object.keys(n.computed||{}),r=A(n.lifeCycles,i),o=A(n.computed,i),a=he(n.watch,i),m=de(n.dataSources),{methods:u,nodes:l,components:c,importBlocks:v,directives:p}=G(n.nodes||[],e,i,t.context),h=[...o,...a.computed],y=A({...u,...n.methods||{}},i),$=v.map(E=>`import ${E.name} from './${E.id}.vue';`);let{imports:b,uniComponents:g}=xe(e,c,$,t.imports,s);const C=Object.keys({...t.urlSchemas,...t.blockPlugins}),P=Ae(t.urlSchemas),O=Ie(t.blockPlugins);return{id:n.id,version:n.__VERSION__,name:n.name,state:ue(n.state).join(","),inject:pe(n.inject).join(","),props:fe(n.props).join(","),emits:me(n.emits).join(","),watch:a.watches.join(","),lifeCycles:r.join(","),computed:h.join(","),methods:[...m,...y].join(","),imports:`
 `+b.join(`
 `),components:ce(c,g).join(","),directives:p.join(","),returns:t.members.join(","),template:l.join(`
 `),css:n.css||"",style:_e(t.style),urlSchemas:P.join(`
@@ -88,7 +88,7 @@ export default defineComponent({
 <%= css %>
 <%= style %>
 </style>
-`,Te=f.template(Ne),Be=f.template(De);async function Le(t,e=new Map,s=[],n="web",r){const i=t,o=typeof i.dsl=="object"&&arguments.length===1?i:{dsl:t,componentMap:e,dependencies:s,platform:n,formatterDisabled:r},{dsl:a,componentMap:m=new Map,dependencies:u=[],platform:l="web",formatterDisabled:c=!1,ts:v=!0,scss:p=!1}=o,h=new le(f.cloneDeep(a),u),y=Fe(h,m,l),$=Te(y),b=Be({template:y.template,css:await N(y.css,c),script:await V($,c),style:await N(y.style,c),scriptLang:v?"ts":"js",styleLang:p?"scss":"css"});return await B(b,c).catch(g=>(g.content=b,Promise.reject(g)))}async function Re(t){const e=`
+`,Te=f.template(Ne),Be=f.template(De);async function Le(t,e=new Map,s=[],n="web",i){const r=t,o=typeof r.dsl=="object"&&arguments.length===1?r:{dsl:t,componentMap:e,dependencies:s,platform:n,formatterDisabled:i},{dsl:a,componentMap:m=new Map,dependencies:u=[],platform:l="web",formatterDisabled:c=!1,ts:v=!0,scss:p=!1}=o,h=new le(f.cloneDeep(a),u),y=Fe(h,m,l),$=Te(y),b=Be({template:y.template,css:await N(y.css,c),script:await V($,c),style:await N(y.style,c),scriptLang:v?"ts":"js",styleLang:p?"scss":"css"});return await B(b,c).catch(g=>(g.content=b,Promise.reject(g)))}async function Re(t){const e=`
     <template>
       <div>
         <h3>源码模式页面</h3>

package/dist/index.mjs

@@ -8,15 +8,15 @@ import * as H from "prettier/plugins/estree";
  * Copyright (c) 2025, VTJ.PRO All rights reserved.
  * @name @vtj/coder 
  * @author CHC chenhuachun1549@dingtalk.com 
- * @version 0.13.5
+ * @version 0.13.6
  * @license <a href="https://vtj.pro/license.html">MIT License</a>
  */
-const Ue = "0.13.5";
+const Ue = "0.13.6";
 /**!
  * Copyright (c) 2025, VTJ.PRO All rights reserved.
  * @name @vtj/core 
  * @author CHC chenhuachun1549@dingtalk.com 
- * @version 0.13.5
+ * @version 0.13.6
  * @license <a href="https://vtj.pro/license.html">MIT License</a>
  */
 const oe = [
@@ -95,8 +95,8 @@ function R(t) {
   return t.replace(/this\.context\??\./g, "");
 }
 function h(t, e = !0, s = !0, n = []) {
-  let r = j(t) ? t.value.trim().replace(/;$/, "") : e ? JSON.stringify(t) : t;
-  return r = w(r, n), s ? Q(R(r)) : R(r);
+  let i = j(t) ? t.value.trim().replace(/;$/, "") : e ? JSON.stringify(t) : t;
+  return i = w(i, n), s ? Q(R(i)) : R(i);
 }
 function w(t = "", e = []) {
   let s = t;
@@ -115,8 +115,8 @@ function G(t) {
   else if (e.startsWith("function"))
     e = e.replace(/^function/, "");
   else {
-    const r = /^(async\s)?\([\w]*\)\s+\=\>\s([\w\W]+)/, i = e.match(r);
-    i && i[2] && (i[2].startsWith("{") || (e = e.replace(i[2], `{ return ${i[2]} }`))), e = e.replace("=>", "");
+    const i = /^(async\s)?\([\w]*\)\s+\=\>\s([\w\W]+)/, r = e.match(i);
+    r && r[2] && (r[2].startsWith("{") || (e = e.replace(r[2], `{ return ${r[2]} }`))), e = e.replace("=>", "");
   }
   return e;
 }
@@ -167,17 +167,17 @@ class pe {
   collectImport(e) {
     const s = e.split(".");
     if (s.length === 4) {
-      const n = s.pop(), r = s.join(".") + ".", i = s.pop();
-      if (n && i) {
+      const n = s.pop(), i = s.join(".") + ".", r = s.pop();
+      if (n && r) {
         const o = this.dependencies.find(
-          (c) => c.library === i
+          (c) => c.library === r
         )?.package;
         o && (this.imports[o] || (this.imports[o] = /* @__PURE__ */ new Set())).add(n);
       }
       return {
         name: n,
-        path: r,
-        library: i
+        path: i,
+        library: r
       };
     }
     return null;
@@ -186,9 +186,9 @@ class pe {
   replaceLibraryPath(e) {
     const { libraryRegex: s } = this;
     let n = e.value;
-    for (const r of s) {
-      const i = e.value?.match(r) || [];
-      for (const o of i) {
+    for (const i of s) {
+      const r = e.value?.match(i) || [];
+      for (const o of r) {
         const c = this.collectImport(o);
         if (c) {
           const f = c.path.replace(/\$/g, "\\$");
@@ -202,13 +202,13 @@ class pe {
     const s = (n) => {
       if (!n || typeof n != "object") return;
       if (Array.isArray(n)) {
-        for (let i of n)
-          s(i);
+        for (let r of n)
+          s(r);
         return;
       }
-      const r = Object.values(n);
-      for (const i of r)
-        j(i) ? i.value = this.replaceLibraryPath(i) : s(i);
+      const i = Object.values(n);
+      for (const r of i)
+        j(r) ? r.value = this.replaceLibraryPath(r) : s(r);
     };
     s(e);
   }
@@ -216,23 +216,23 @@ class pe {
     let s = [...e];
     const n = { ...this.imports };
     delete n["uni-h5"], delete n["@dcloudio/uni-h5"], delete n["uni-ui"], delete n["@dcloudio/uni-ui"];
-    for (const r of Object.values(n))
-      s = s.concat(Array.from(r));
+    for (const i of Object.values(n))
+      s = s.concat(Array.from(i));
     return C(s);
   }
   collectContext(e, s) {
-    const n = new Set(s?.id ? this.context[s.id] : []), r = (e.directives || []).find((c) => c.name === "vFor");
-    let i = new Set(Array.from(n));
-    if (r) {
-      const { item: c = "item", index: f = "index" } = r.iterator || {};
-      i = /* @__PURE__ */ new Set([c, f, ...Array.from(i)]);
+    const n = new Set(s?.id ? this.context[s.id] : []), i = (e.directives || []).find((c) => c.name === "vFor");
+    let r = new Set(Array.from(n));
+    if (i) {
+      const { item: c = "item", index: f = "index" } = i.iterator || {};
+      r = /* @__PURE__ */ new Set([c, f, ...Array.from(r)]);
     }
     const o = e.slot;
     if (o) {
       const c = typeof o == "string" ? [] : o.params || [], f = c.length ? c : [`scope_${s?.id}`];
-      i = /* @__PURE__ */ new Set([...f, ...Array.from(i)]);
+      r = /* @__PURE__ */ new Set([...f, ...Array.from(r)]);
     }
-    this.context[e.id] = i;
+    this.context[e.id] = r;
   }
   collectStyle(e) {
     e.id && e.props?.style && Object.keys(e.props.style).length && !j(e.props.style) && (this.style[`.${e.name}_${e.id}`] = e.props.style);
@@ -244,8 +244,8 @@ class pe {
     typeof e.from == "object" && e.from.type === "Plugin" && (this.blockPlugins[e.name] = e.from);
   }
   walkNodes(e) {
-    const s = (n, r) => {
-      this.collectContext(n, r), this.collectStyle(n), this.collectUrlSchema(n), this.collectBlockPlugin(n), Array.isArray(n.children) && n.children.forEach((i) => s(i, n));
+    const s = (n, i) => {
+      this.collectContext(n, i), this.collectStyle(n), this.collectUrlSchema(n), this.collectBlockPlugin(n), Array.isArray(n.children) && n.children.forEach((r) => s(r, n));
     };
     Array.isArray(e.nodes) && e.nodes.forEach((n) => s(n));
   }
@@ -263,7 +263,7 @@ function me(t = []) {
         }`);
 }
 function he(t = []) {
-  const e = (s) => s ? `[${se(s).map((i) => i.replace(/\'|\"/gi, "")).join(",")}]` : void 0;
+  const e = (s) => s ? `[${se(s).map((r) => r.replace(/\'|\"/gi, "")).join(",")}]` : void 0;
   return t.map((s) => typeof s == "string" ? `${s}: {}` : (j(s.default) && !s.default.value && (s.default.value = "undefined"), `${s.name}: {
           type:${e(s.type)},
           required: ${h(!!s.required, !0, !1)},
@@ -275,22 +275,22 @@ function de(t = []) {
 }
 function A(t = {}, e = []) {
   return Object.entries(t).map(([s, n]) => {
-    let r = G(h(n, !1, !1));
-    return r = w(r, e), r.startsWith("async") ? `async ${s}${r.replace(/^async/, "")}` : `${s}${r}`;
+    let i = G(h(n, !1, !1));
+    return i = w(i, e), i.startsWith("async") ? `async ${s}${i.replace(/^async/, "")}` : `${s}${i}`;
   });
 }
 function ge(t = [], e = []) {
   const s = t.reduce(
-    (i, o) => (o.id && N(o.source) && (i[`watcher_${o.id}`] = o.source), i),
+    (r, o) => (o.id && N(o.source) && (r[`watcher_${o.id}`] = o.source), r),
     {}
-  ), n = A(s, e), r = t.map((i) => `watcher_${i.id}: {
-        deep: ${i.deep},
-        immediate:${i.immediate},
-        handler${G(i.handler.value)}
-      }`);
+  ), n = A(s, e), i = t.map((r) => r.handler && r.handler.value ? `watcher_${r.id}: {
+        deep: ${r.deep},
+        immediate:${r.immediate},
+        handler${G(r.handler.value)}
+      }` : null).filter((r) => !!r);
   return {
     computed: n,
-    watches: r
+    watches: i
   };
 }
 function ye(t = {}) {
@@ -336,8 +336,8 @@ const $e = [
   "vBind",
   "vHtml"
 ];
-function z(t, e, s = [], n = {}, r) {
-  const i = [];
+function z(t, e, s = [], n = {}, i) {
+  const r = [];
   let o = {}, c = [];
   const f = [];
   let u = [];
@@ -380,10 +380,10 @@ function z(t, e, s = [], n = {}, r) {
       );
     }
     const p = _e(a.slot, y.join(`
-`), r?.id);
-    i.push(p);
+`), i?.id);
+    r.push(p);
   }), {
-    nodes: i,
+    nodes: r,
     methods: o,
     directives: ve(f),
     components: C(c),
@@ -396,8 +396,8 @@ function ve(t) {
 function be(t = []) {
   const e = /* @__PURE__ */ new Map();
   for (const s of t) {
-    const n = typeof s.slot == "string" ? s.slot : s.slot?.name, r = e.get(n);
-    r ? r.children.push(s) : e.set(n, { slot: s.slot, children: [s] });
+    const n = typeof s.slot == "string" ? s.slot : s.slot?.name, i = e.get(n);
+    i ? i.children.push(s) : e.set(n, { slot: s.slot, children: [s] });
   }
   return e;
 }
@@ -405,8 +405,8 @@ function je(t, e, s) {
   if (oe.includes(t)) return null;
   const n = e.get(t);
   if (n && n.alias) {
-    const r = n.parent ? `${n.parent}.${n.alias}` : n.alias;
-    return `${t}: ${r}`;
+    const i = n.parent ? `${n.parent}.${n.alias}` : n.alias;
+    return `${t}: ${i}`;
   }
   return Y(s) || n ? t : null;
 }
@@ -435,38 +435,38 @@ function Se(t, e, s = []) {
 }
 function ke(t, e = {}, s = []) {
   if (!!Object.keys(e.style || {}).length) {
-    const i = `${t.name}_${t.id}`;
-    e.class ? typeof e.class == "string" ? e.class = [e.class, i].join(" ") : (e.__class = e.class, e.class = i) : e.class = i, j(e.style) || delete e.style;
+    const r = `${t.name}_${t.id}`;
+    e.class ? typeof e.class == "string" ? e.class = [e.class, r].join(" ") : (e.__class = e.class, e.class = r) : e.class = r, j(e.style) || delete e.style;
   }
-  const r = t.from;
-  return (Z(r) || K(r)) && (e.is = {
+  const i = t.from;
+  return (Z(i) || K(i)) && (e.is = {
     type: "JSExpression",
     value: t.name
-  }), Object.entries(e).map(([i, o]) => Se(i, o, s));
+  }), Object.entries(e).map(([r, o]) => Se(r, o, s));
 }
-function we(t, e, s, n, r) {
-  const i = X(e.modifiers, !0);
-  return r ? `@${t}${i.join("")}="${s}"` : n && n.length > 0 ? `@${t}${i.join("")}="(...args:any[]) => ${s}"` : `@${t}${i.join("")}="${s}"`;
+function we(t, e, s, n, i) {
+  const r = X(e.modifiers, !0);
+  return i ? `@${t}${r.join("")}="${s}"` : n && n.length > 0 ? `@${t}${r.join("")}="(...args:any[]) => ${s}"` : `@${t}${r.join("")}="${s}"`;
 }
 function Ce(t, e = {}, s = {}) {
-  const n = {}, r = Array.from(s[t] || /* @__PURE__ */ new Set([])), i = r.length ? `({${r.join(", ")}}, args)` : "";
+  const n = {}, i = Array.from(s[t] || /* @__PURE__ */ new Set([])), r = i.length ? `({${i.join(", ")}}, args)` : "";
   return {
     binders: Object.entries(e).map(([c, f]) => {
-      const u = f.handler.value.startsWith("this."), l = u ? Q(f.handler.value) : `${b(c)}_${t}${i}`;
-      return u || (n[l] = r.length ? {
+      const u = f.handler.value.startsWith("this."), l = u ? Q(f.handler.value) : `${b(c)}_${t}${r}`;
+      return u || (n[l] = i.length ? {
         type: "JSFunction",
         value: `{
           return (${f.handler.value}).apply(this, args);
         }`
-      } : f.handler), we(c, f, l, r, u);
+      } : f.handler), we(c, f, l, i, u);
     }),
     handlers: n
   };
 }
-function Ee(t, e, s = {}, n = {}, r = {}, i) {
-  const { binders: o, handlers: c } = Ce(e, n, r);
+function Ee(t, e, s = {}, n = {}, i = {}, r) {
+  const { binders: o, handlers: c } = Ce(e, n, i);
   return {
-    props: ke(t, s, i).join(" "),
+    props: ke(t, s, r).join(" "),
     handlers: c,
     binders: o,
     events: o.join(" ")
@@ -474,8 +474,8 @@ function Ee(t, e, s = {}, n = {}, r = {}, i) {
 }
 function Oe(t = [], e = [], s = []) {
   const n = [], {
-    vIf: r,
-    vElse: i,
+    vIf: i,
+    vElse: r,
     vElseIf: o,
     vShow: c,
     vModels: f,
@@ -484,9 +484,9 @@ function Oe(t = [], e = [], s = []) {
     vHtml: a,
     customDirectives: y
   } = Pe(t);
-  if (r && n.push(`v-if="${h(r.value, !0, !0, e)}"`), o && n.push(
+  if (i && n.push(`v-if="${h(i.value, !0, !0, e)}"`), o && n.push(
     `v-else-if="${h(o.value, !0, !0, e)}"`
-  ), i && n.push("v-else"), c && n.push(
+  ), r && n.push("v-else"), c && n.push(
     `v-show="${h(c.value, !0, !0, e)}"`
   ), l && n.push(
     `v-bind="${h(l.value, !0, !0, e)}"`
@@ -524,9 +524,9 @@ function Pe(t = []) {
     (a) => !J.includes(a.name)
   ), n = e.find(
     (a) => b(a.name) === "vIf"
-  ), r = e.find(
-    (a) => b(a.name) === "vElseIf"
   ), i = e.find(
+    (a) => b(a.name) === "vElseIf"
+  ), r = e.find(
     (a) => b(a.name) === "vElse"
   ), o = e.find(
     (a) => b(a.name) === "vFor"
@@ -541,8 +541,8 @@ function Pe(t = []) {
   );
   return {
     vIf: n,
-    vElseIf: r,
-    vElse: i,
+    vElseIf: i,
+    vElse: r,
     vFor: o,
     vShow: c,
     vModels: l,
@@ -551,8 +551,8 @@ function Pe(t = []) {
     customDirectives: s
   };
 }
-function xe(t, e, s, n, r) {
-  return typeof t == "string" ? t : k(t) ? `{{ ${h(t, !1, !0, e)} }}` : Array.isArray(t) ? z(t, s, e, n, r) : "";
+function xe(t, e, s, n, i) {
+  return typeof t == "string" ? t : k(t) ? `{{ ${h(t, !1, !0, e)} }}` : Array.isArray(t) ? z(t, s, e, n, i) : "";
 }
 function _e(t, e, s) {
   if (!t) return e;
@@ -561,8 +561,8 @@ function _e(t, e, s) {
     ${e}
     </template>`;
 }
-function Ie(t, e = [], s = [], n = {}, r = "web") {
-  const i = [
+function Ie(t, e = [], s = [], n = {}, i = "web") {
+  const r = [
     "@dcloudio/uni-h5",
     "uni-h5",
     "@dcloudio/uni-ui",
@@ -574,13 +574,13 @@ function Ie(t, e = [], s = [], n = {}, r = "web") {
     const l = t.get(u.split(":")[0]);
     if (l && l.package) {
       const a = o[l.package] ?? (o[l.package] = []), y = l.parent || (l.alias || "").split(".")[0] || l.name;
-      a.push(y), r === "uniapp" && i.includes(l.package) && c.push(y);
+      a.push(y), i === "uniapp" && r.includes(l.package) && c.push(y);
     }
   }
   for (const [u, l] of Object.entries(n))
-    (o[u] ?? (o[u] = [])).push(...Array.from(l)), r === "uniapp" && i.includes(u) && c.push(...Array.from(l));
+    (o[u] ?? (o[u] = [])).push(...Array.from(l)), i === "uniapp" && r.includes(u) && c.push(...Array.from(l));
   return {
-    imports: Object.entries(o).filter(([u, l]) => r === "uniapp" ? !i.includes(u) && !!l.length : !!l.length).map(([u, l]) => `import { ${C(l).join(
+    imports: Object.entries(o).filter(([u, l]) => i === "uniapp" ? !r.includes(u) && !!l.length : !!l.length).map(([u, l]) => `import { ${C(l).join(
       ","
     )}} from '${u}';`).concat(s),
     uniComponents: c
@@ -614,17 +614,17 @@ function Fe(t = {}) {
   }), e;
 }
 function Be(t, e, s = "web") {
-  const { dsl: n } = t, r = Object.keys(n.computed || {}), i = A(n.lifeCycles, r), o = A(n.computed, r), c = ge(n.watch, r), f = ye(n.dataSources), { methods: u, nodes: l, components: a, importBlocks: y, directives: p } = z(
+  const { dsl: n } = t, i = Object.keys(n.computed || {}), r = A(n.lifeCycles, i), o = A(n.computed, i), c = ge(n.watch, i), f = ye(n.dataSources), { methods: u, nodes: l, components: a, importBlocks: y, directives: p } = z(
     n.nodes || [],
     e,
-    r,
+    i,
     t.context
   ), m = [...o, ...c.computed], d = A(
     {
       ...u,
       ...n.methods || {}
     },
-    r
+    i
   ), $ = y.map((x) => `import ${x.name} from './${x.id}.vue';`);
   let { imports: v, uniComponents: g } = Ie(
     e,
@@ -646,7 +646,7 @@ function Be(t, e, s = "web") {
     props: he(n.props).join(","),
     emits: de(n.emits).join(","),
     watch: c.watches.join(","),
-    lifeCycles: i.join(","),
+    lifeCycles: r.join(","),
     computed: m.join(","),
     methods: [...f, ...d].join(","),
     imports: `
@@ -712,13 +712,13 @@ export default defineComponent({
 <%= style %>
 </style>
 `, Le = U(De), Re = U(Te);
-async function Me(t, e = /* @__PURE__ */ new Map(), s = [], n = "web", r) {
-  const i = t, o = typeof i.dsl == "object" && arguments.length === 1 ? i : {
+async function Me(t, e = /* @__PURE__ */ new Map(), s = [], n = "web", i) {
+  const r = t, o = typeof r.dsl == "object" && arguments.length === 1 ? r : {
     dsl: t,
     componentMap: e,
     dependencies: s,
     platform: n,
-    formatterDisabled: r
+    formatterDisabled: i
   }, {
     dsl: c,
     componentMap: f = /* @__PURE__ */ new Map(),

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vtj/coder",
   "private": false,
-  "version": "0.13.5",
+  "version": "0.13.6",
   "type": "module",
   "keywords": [
     "低代码引擎",
@@ -23,7 +23,7 @@
   "dependencies": {
     "prettier": "~3.6.0",
     "@vtj/base": "~0.12.2",
-    "@vtj/core": "~0.13.5"
+    "@vtj/core": "~0.13.6"
   },
   "devDependencies": {
     "@vtj/cli": "~0.12.10"

package/types/parser/watch.d.ts

@@ -1,5 +1,5 @@
 import { BlockWatch } from '@vtj/core';
 export declare function parseWatch(watch?: BlockWatch[], computedKeys?: string[]): {
     computed: string[];
-    watches: string[];
+    watches: (string | null)[];
 };