@vtj/coder 0.7.12 → 0.7.14

package/dist/index.cjs

@@ -1,31 +1,37 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const p=require("@vtj/base"),C=require("prettier/standalone"),B=require("prettier/plugins/html"),V=require("prettier/plugins/babel"),D=require("prettier/plugins/postcss"),M=require("prettier/plugins/estree");function v(t){const e=Object.create(null,{[Symbol.toStringTag]:{value:"Module"}});if(t){for(const r in t)if(r!=="default"){const n=Object.getOwnPropertyDescriptor(t,r);Object.defineProperty(e,r,n.get?n:{enumerable:!0,get:()=>t[r]})}}return e.default=t,Object.freeze(e)}const Q=v(B),z=v(V),G=v(D),H=v(M);/**!
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const p=require("@vtj/base"),k=require("prettier/standalone"),L=require("prettier/plugins/html"),M=require("prettier/plugins/babel"),V=require("prettier/plugins/postcss"),D=require("prettier/plugins/estree");function b(t){const e=Object.create(null,{[Symbol.toStringTag]:{value:"Module"}});if(t){for(const r in t)if(r!=="default"){const n=Object.getOwnPropertyDescriptor(t,r);Object.defineProperty(e,r,n.get?n:{enumerable:!0,get:()=>t[r]})}}return e.default=t,Object.freeze(e)}const Q=b(L),z=b(M),G=b(V),H=b(D);/**!
  * Copyright (c) 2024, VTJ.PRO All rights reserved.
  * @name @vtj/coder 
  * @author CHC chenhuachun1549@dingtalk.com 
- * @version 0.7.12
+ * @version 0.7.14
  * @license <a href="https://vtj.pro/license.html">MIT License</a>
- */const U="0.7.12";p.mitt();const O={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 F(t,e){return e?t:await C.format(t,{parser:"html",...O,plugins:[Q]})}async function X(t,e){return e?t:await C.format(t,{parser:"babel-ts",...O,plugins:[z,H]})}async function Y(t,e){return e?t:C.format(t,{parser:"scss",...O,plugins:[G]})}function k(t){return t&&t.type==="JSExpression"}function x(t){return typeof t=="object"&&t&&t.type==="JSFunction"}function P(t){return k(t)||x(t)}function N(t){return t.replace(new RegExp("this.","g"),"")}function E(t){return t.replace(new RegExp("this.context.","g"),"")}function u(t,e=!0,r=!0){const n=P(t)?t.value:e?JSON.stringify(t):t;return r?N(E(n)):E(n)}function _(t,e=[]){let r=t;for(const n of e)r=r.replace(new RegExp(`this.${n}.value`,"g"),`this.${n}`);return r}function I(t){let e=t.trim();return e.startsWith("{")||(e.startsWith("async function")?e=e.replace(/^async function/,"async"):e.startsWith("function")?e=e.replace(/^function/,""):e=e.replace("=>","")),e}function Z(t={}){return Object.entries(t).map(([e,r])=>`"${e}": ${u(r)}`)}function R(t={},e=!1){const r=Object.keys(t);return e?r.map(n=>"."+n):r}class K{constructor(e,r){this.dsl=e,this.dependencies=r,this.libraryRegex=this.collectLibrary(),this.walk(e),this.walkNodes(e),this.members=this.getLibraryMember()}imports={};context={};members=[];libraryRegex=[];collectLibrary(){return this.dependencies.filter(e=>!!e.library).map(e=>new RegExp(`(this.\\$libs.${e.library}.([\\w]+))`,"g"))}collectImport(e){const r=e.split(".");if(r.length===4){const n=r.pop(),i=r.join(".")+".",s=r.pop();if(n&&s){const o=this.dependencies.find(a=>a.library===s)?.package;o&&(this.imports[o]||(this.imports[o]=new Set)).add(n)}return{name:n,path:i,library:s}}return null}replaceLibraryPath(e){const{libraryRegex:r}=this;let n=e.value;for(const i of r){const s=e.value.match(i)||[];for(const o of s){const a=this.collectImport(o);if(a){const c=a.path.replace(/\$/g,"\\$");n=n.replace(new RegExp(c,"g"),"")}}}return n}walk(e){const r=n=>{if(!n||typeof n!="object")return;if(Array.isArray(n)){for(let s of n)r(s);return}const i=Object.values(n);for(const s of i)P(s)?s.value=this.replaceLibraryPath(s):r(s)};r(e)}getLibraryMember(e=[]){let r=[...e];for(const n of Object.values(this.imports))r=r.concat(Array.from(n));return p.dedupArray(r)}collectContext(e,r){const n=new Set(r?.id?this.context[r.id]:[]),i=(e.directives||[]).find(a=>a.name==="vFor");let s=new Set(Array.from(n));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_${r?.id}`];s=new Set([...c,...Array.from(s)])}this.context[e.id]=s}walkNodes(e){const r=(n,i)=>{this.collectContext(n,i),Array.isArray(n.children)&&n.children.forEach(s=>r(s,n))};Array.isArray(e.nodes)&&e.nodes.forEach(n=>r(n))}}function ee(t={}){return Object.entries(t).map(([e,r])=>{const n=u(r,!1);return`${e}:${n}`})}function te(t=[]){return t.map(e=>`${e.name}: {
+ */const U="0.7.14";/**!
+ * Copyright (c) 2024, VTJ.PRO All rights reserved.
+ * @name @vtj/core 
+ * @author CHC chenhuachun1549@dingtalk.com 
+ * @version 0.7.14
+ * @license <a href="https://vtj.pro/license.html">MIT License</a>
+ */const X=["slot","template","component","img","div","p","h1","h2","h3","span","a"];p.mitt();const x={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 I(t,e){return e?t:await k.format(t,{parser:"html",...x,plugins:[Q]})}async function Y(t,e){return e?t:await k.format(t,{parser:"babel-ts",...x,plugins:[z,H]})}async function Z(t,e){return e?t:k.format(t,{parser:"scss",...x,plugins:[G]})}function C(t){return t&&t.type==="JSExpression"}function O(t){return typeof t=="object"&&t&&t.type==="JSFunction"}function P(t){return C(t)||O(t)}function _(t){return t.replace(new RegExp("this.","g"),"")}function W(t){return t.replace(/this\.context\??\./g,"")}function u(t,e=!0,r=!0){const n=P(t)?t.value:e?JSON.stringify(t):t;return r?_(W(n)):W(n)}function A(t,e=[]){let r=t;for(const n of e)r=r.replace(new RegExp(`this.${n}.value`,"g"),`this.${n}`);return r}function q(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 K(t={}){return Object.entries(t).map(([e,r])=>`"${e}": ${u(r)}`)}function B(t={},e=!1){const r=Object.keys(t);return e?r.map(n=>"."+n):r}class ee{constructor(e,r){this.dsl=e,this.dependencies=r,this.libraryRegex=this.collectLibrary(),this.walk(e),this.walkNodes(e),this.members=this.getLibraryMember()}imports={};context={};members=[];libraryRegex=[];collectLibrary(){return this.dependencies.filter(e=>!!e.library).map(e=>new RegExp(`(this.\\$libs.${e.library}.([\\w]+))`,"g"))}collectImport(e){const r=e.split(".");if(r.length===4){const n=r.pop(),i=r.join(".")+".",s=r.pop();if(n&&s){const o=this.dependencies.find(a=>a.library===s)?.package;o&&(this.imports[o]||(this.imports[o]=new Set)).add(n)}return{name:n,path:i,library:s}}return null}replaceLibraryPath(e){const{libraryRegex:r}=this;let n=e.value;for(const i of r){const s=e.value.match(i)||[];for(const o of s){const a=this.collectImport(o);if(a){const c=a.path.replace(/\$/g,"\\$");n=n.replace(new RegExp(c,"g"),"")}}}return n}walk(e){const r=n=>{if(!n||typeof n!="object")return;if(Array.isArray(n)){for(let s of n)r(s);return}const i=Object.values(n);for(const s of i)P(s)?s.value=this.replaceLibraryPath(s):r(s)};r(e)}getLibraryMember(e=[]){let r=[...e];for(const n of Object.values(this.imports))r=r.concat(Array.from(n));return p.dedupArray(r)}collectContext(e,r){const n=new Set(r?.id?this.context[r.id]:[]),i=(e.directives||[]).find(a=>a.name==="vFor");let s=new Set(Array.from(n));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_${r?.id}`];s=new Set([...c,...Array.from(s)])}this.context[e.id]=s}walkNodes(e){const r=(n,i)=>{this.collectContext(n,i),Array.isArray(n.children)&&n.children.forEach(s=>r(s,n))};Array.isArray(e.nodes)&&e.nodes.forEach(n=>r(n))}}function te(t={}){return Object.entries(t).map(([e,r])=>{const n=u(r,!1);return`${e}:${n}`})}function re(t=[]){return t.map(e=>`${e.name}: {
             from: '${e.from||e.name}',
             default: ${u(e.default,!0,!1)}
-        }`)}function re(t=[]){const e=r=>r?`[${p.toArray(r).map(s=>s.replace(/\'|\"/gi,"")).join(",")}]`:void 0;return t.map(r=>typeof r=="string"?`${r}: {}`:`${r.name}: {
+        }`)}function ne(t=[]){const e=r=>r?`[${p.toArray(r).map(s=>s.replace(/\'|\"/gi,"")).join(",")}]`:void 0;return t.map(r=>typeof r=="string"?`${r}: {}`:`${r.name}: {
           type:${e(r.type)},
           required: ${r.required},
           default: ${u(r.default,!0,!1)}
-          }`)}function ne(t=[]){return t.map(e=>`'${e}'`)}function $(t={},e=[]){return Object.entries(t).map(([r,n])=>{let i=I(u(n,!1,!1));return i=_(i,e),i.startsWith("async")?`async ${r}${i.replace(/^async/,"")}`:`${r}${i}`})}function se(t=[],e=[]){const r=t.reduce((s,o)=>(o.id&&x(o.source)&&(s[`watcher_${o.id}`]=o.source),s),{}),n=$(r,e),i=t.map(s=>`watcher_${s.id}: {
+          }`)}function se(t=[]){return t.map(e=>`'${e}'`)}function $(t={},e=[]){return Object.entries(t).map(([r,n])=>{let i=q(u(n,!1,!1));return i=A(i,e),i.startsWith("async")?`async ${r}${i.replace(/^async/,"")}`:`${r}${i}`})}function oe(t=[],e=[]){const r=t.reduce((s,o)=>(o.id&&O(o.source)&&(s[`watcher_${o.id}`]=o.source),s),{}),n=$(r,e),i=t.map(s=>`watcher_${s.id}: {
         deep: ${s.deep},
         immediate:${s.immediate},
-        handler${I(s.handler.value)}
-      }`);return{computed:n,watches:i}}function oe(t={}){return Object.values(t).map(e=>{const r=x(e.transform)&&e.transform.value||"(res) => res";return`async ${e.name}(...args:any[]) {
+        handler${q(s.handler.value)}
+      }`);return{computed:n,watches:i}}function ie(t={}){return Object.values(t).map(e=>{const r=O(e.transform)&&e.transform.value||"(res) => res";return`async ${e.name}(...args:any[]) {
           return await this.provider.apis.${e.ref}.apply(this, args).then(${r});
-        }`})}function q(t,e,r=[],n={},i){const s=[];let o={},a=[],c=[];return ie(t).forEach(h=>{const y=[];for(const l of h.children){let{id:j,name:f,invisible:g,from:w}=l;if(g)continue;const A=ae(f,e,w);A&&a.push(A),ce(w)&&c.push({id:w.id,name:f});const{props:T,events:J,handlers:L}=me(j,l.props,l.events,n,r),W=de(l.directives).join(" "),m=l.children?ye(l.children,r,e,n,l):"";Object.assign(o,L);let S="";typeof m=="string"?S=m:(S=(m?.nodes||[]).join(`
-`),Object.assign(o,m?.methods||{}),a=a.concat(m?.components||[]),c=c.concat(m?.importBlocks||[])),y.push(`<${f} ${W} ${T} ${J}>${S.trim()}</${f}>`)}const b=ge(h.slot,y.join(`
-`),i?.id);s.push(b)}),{nodes:s,methods:o,components:p.dedupArray(a),importBlocks:p.dedupArray(c,"id")}}function ie(t=[]){const e=new Map;for(const r of t){const n=typeof r.slot=="string"?r.slot:r.slot?.name,i=e.get(n);i?i.children.push(r):e.set(n,{slot:r.slot,children:[r]})}return e}function ae(t,e,r){if(["slot","component","template"].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 r||n?t:null}function ce(t){return!!t&&typeof t=="object"&&t.type==="Schema"}function pe(t,e,r=[]){return typeof e=="string"?`${t}="${e}"`:P(e)?`:${t}="${u({...e,value:_(e.value,r)})}"`:p.isPlainObject(e)?`:${t}='{${Z(e).join(", ")}}'`:`:${t}='${JSON.stringify(e)}'`}function ue(t={},e=[]){return Object.entries(t).map(([r,n])=>pe(r,n,e))}function le(t,e,r,n){const i=R(e.modifiers,!0);return n&&n.length>0?`@${t}${i.join("")}="(...args:any[]) => ${r}"`:`@${t}${i.join("")}="${r}"`}function fe(t,e={},r={}){const n={},i=Array.from(r[t]||new Set([])),s=i.length?`({${i.join(", ")}}, args)`:"";return{binders:Object.entries(e).map(([a,c])=>{const d=`${p.camelCase(a)}_handler_${t}${s}`;return n[d]=i.length?{type:"JSFunction",value:`{
+        }`})}function T(t,e,r=[],n={},i){const s=[];let o={},a=[],c=[];return ae(t).forEach(f=>{const g=[];for(const l of f.children){let{id:j,name:m,invisible:y,from:w}=l;if(y)continue;const E=ce(m,e,w);E&&a.push(E),pe(w)&&c.push({id:w.id,name:m});const{props:F,events:N,handlers:J}=de(j,l.props,l.events,n,r),R=he(l.directives).join(" "),d=l.children?ye(l.children,r,e,n,l):"";Object.assign(o,J);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||[])),g.push(m==="img"?`<${m} ${R} ${F} ${N} />`:`<${m} ${R} ${F} ${N}>${S.trim()}</${m}>`)}const v=$e(f.slot,g.join(`
+`),i?.id);s.push(v)}),{nodes:s,methods:o,components:p.dedupArray(a),importBlocks:p.dedupArray(c,"id")}}function ae(t=[]){const e=new Map;for(const r of t){const n=typeof r.slot=="string"?r.slot:r.slot?.name,i=e.get(n);i?i.children.push(r):e.set(n,{slot:r.slot,children:[r]})}return e}function ce(t,e,r){if(X.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 r||n?t:null}function pe(t){return!!t&&typeof t=="object"&&t.type==="Schema"}function ue(t,e,r=[]){return typeof e=="string"?`${t}="${e}"`:P(e)?`:${t}="${u({...e,value:A(e.value,r)})}"`:p.isPlainObject(e)?`:${t}='{${K(e).join(", ")}}'`:`:${t}='${JSON.stringify(e)}'`}function le(t={},e=[]){return Object.entries(t).map(([r,n])=>ue(r,n,e))}function fe(t,e,r,n){const i=B(e.modifiers,!0);return n&&n.length>0?`@${t}${i.join("")}="(...args:any[]) => ${r}"`:`@${t}${i.join("")}="${r}"`}function me(t,e={},r={}){const n={},i=Array.from(r[t]||new Set([])),s=i.length?`({${i.join(", ")}}, args)`:"";return{binders:Object.entries(e).map(([a,c])=>{const h=c.handler.value.startsWith("this."),f=h?_(c.handler.value):`${p.camelCase(a)}_handler_${t}${s}`;return h||(n[f]=i.length?{type:"JSFunction",value:`{
           return (${c.handler.value}).apply(this, args);
-        }`}:c.handler,le(a,c,d,i)}),handlers:n}}function me(t,e={},r={},n={},i){const{binders:s,handlers:o}=fe(t,r,n);return{props:ue(e,i).join(" "),handlers:o,binders:s,events:s.join(" ")}}function de(t=[]){const e=[],{vIf:r,vShow:n,vModels:i,vFor:s}=he(t);if(r&&e.push(`v-if="${u(r.value)}"`),n&&e.push(`v-show="${u(n.value)}"`),i.forEach(o=>{const a=R(o.modifiers,!0),c=o.arg?k(o.arg)?`:[${u(o.arg)}]`:`:${o.arg}`:"";e.push(`v-model${c}${a}="${u(o.value)}"`)}),s){const{item:o,index:a}={item:"item",index:"index",...s.iterator};e.push(`v-for="(${o}, ${a}) in ${u(s.value)}"`)}return e}function he(t=[]){const e=t.find(o=>p.camelCase(o.name)==="vIf"),r=t.find(o=>p.camelCase(o.name)==="vFor"),n=t.find(o=>p.camelCase(o.name)==="vShow"),i=t.find(o=>p.camelCase(o.name)==="vBind"),s=t.filter(o=>p.camelCase(o.name)==="vModel");return{vIf:e,vFor:r,vShow:n,vModels:s,vBind:i}}function ye(t,e,r,n,i){if(typeof t=="string")return t;if(k(t)){let s=u(t,!1);return s=_(s,e),s=N(s),`{{ ${s} }}`}return Array.isArray(t)?q(t,r,e,n,i):""}function ge(t,e,r){if(!t)return e;const n=typeof t=="string"?{name:t,params:[]}:{params:[],...t};return`<template ${`#${n.name}="${n.params?.length>0?`{${n.params?.join(",")}}`:`scope_${r}`}"`}>
+        }`}:c.handler),fe(a,c,f,i)}),handlers:n}}function de(t,e={},r={},n={},i){const{binders:s,handlers:o}=me(t,r,n);return{props:le(e,i).join(" "),handlers:o,binders:s,events:s.join(" ")}}function he(t=[]){const e=[],{vIf:r,vShow:n,vModels:i,vFor:s}=ge(t);if(r&&e.push(`v-if="${u(r.value)}"`),n&&e.push(`v-show="${u(n.value)}"`),i.forEach(o=>{const a=B(o.modifiers,!0),c=o.arg?C(o.arg)?`:[${u(o.arg)}]`:`:${o.arg}`:"";e.push(`v-model${c}${a}="${u(o.value)}"`)}),s){const{item:o,index:a}={item:"item",index:"index",...s.iterator};e.push(`v-for="(${o}, ${a}) in ${u(s.value)}"`)}return e}function ge(t=[]){const e=t.find(o=>p.camelCase(o.name)==="vIf"),r=t.find(o=>p.camelCase(o.name)==="vFor"),n=t.find(o=>p.camelCase(o.name)==="vShow"),i=t.find(o=>p.camelCase(o.name)==="vBind"),s=t.filter(o=>p.camelCase(o.name)==="vModel");return{vIf:e,vFor:r,vShow:n,vModels:s,vBind:i}}function ye(t,e,r,n,i){if(typeof t=="string")return t;if(C(t)){let s=u(t,!1);return s=A(s,e),s=_(s),`{{ ${s} }}`}return Array.isArray(t)?T(t,r,e,n,i):""}function $e(t,e,r){if(!t)return e;const n=typeof t=="string"?{name:t,params:[]}:{params:[],...t};return`<template ${`#${n.name}="${n.params?.length>0?`{${n.params?.join(",")}}`:`scope_${r}`}"`}>
     ${e}
-    </template>`}function $e(t,e=[],r=[],n={}){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(n))(i[s]??(i[s]=[])).push(...Array.from(o));return Object.entries(i).filter(([s,o])=>!!o.length).map(([s,o])=>`import { ${p.dedupArray(o).join(",")}} from '${s}';`).concat(r)}function ve(t,e){const{dsl:r}=t,n=Object.keys(r.computed||{}),i=$(r.lifeCycles,n),s=$(r.computed,n),o=se(r.watch,n),a=oe(r.dataSources),{methods:c,nodes:d,components:h,importBlocks:y}=q(r.nodes||[],e,n,t.context),b=[...s,...o.computed],l=$({...c,...r.methods||{}},n),j=y.map(g=>`import ${g.name} from './${g.id}.vue';`),f=$e(e,h,j,t.imports);return{id:r.id,version:r.__VERSION__,name:r.name,state:ee(r.state).join(","),inject:te(r.inject).join(","),props:re(r.props).join(","),emits:ne(r.emits).join(","),watch:o.watches.join(","),lifeCycles:i.join(","),computed:b.join(","),methods:[...a,...l].join(","),imports:f.join(`
-`),components:h.join(","),returns:t.members.join(","),template:d.join(`
-`),css:r.css||""}}const be=`
+    </template>`}function be(t,e=[],r=[],n={}){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(n))(i[s]??(i[s]=[])).push(...Array.from(o));return Object.entries(i).filter(([s,o])=>!!o.length).map(([s,o])=>`import { ${p.dedupArray(o).join(",")}} from '${s}';`).concat(r)}function ve(t,e){const{dsl:r}=t,n=Object.keys(r.computed||{}),i=$(r.lifeCycles,n),s=$(r.computed,n),o=oe(r.watch,n),a=ie(r.dataSources),{methods:c,nodes:h,components:f,importBlocks:g}=T(r.nodes||[],e,n,t.context),v=[...s,...o.computed],l=$({...c,...r.methods||{}},n),j=g.map(y=>`import ${y.name} from './${y.id}.vue';`),m=be(e,f,j,t.imports);return{id:r.id,version:r.__VERSION__,name:r.name,state:te(r.state).join(","),inject:re(r.inject).join(","),props:ne(r.props).join(","),emits:se(r.emits).join(","),watch:o.watches.join(","),lifeCycles:i.join(","),computed:v.join(","),methods:[...a,...l].join(","),imports:m.join(`
+`),components:f.join(","),returns:t.members.join(","),template:h.join(`
+`),css:r.css||""}}const je=`
 <%= imports %>
 import { useProvider } from '@vtj/renderer';
 export default defineComponent({
@@ -51,7 +57,7 @@ export default defineComponent({
   <% if(methods) { %> methods: { <%= methods %> }, <% } %>
   <% if(watch) { %> watch: { <%= watch %> }, <% } %> <%= lifeCycles %>
 });
-`.replace(/(\n|\r|\t)/g,""),je=`
+`.replace(/(\n|\r|\t)/g,""),we=`
 <template>
 <%= template %>
 </template>
@@ -61,7 +67,7 @@ export default defineComponent({
 <style lang="scss" scoped>
 <%= css %>
 </style>
-`,we=p.template(be),Se=p.template(je);async function Ce(t,e=new Map,r=[],n){const i=new K(p.cloneDeep(t),r),s=ve(i,e),o=we(s),a=Se({template:s.template,css:await Y(s.css,n),script:await X(o,n)});return await F(a,n)}async function Oe(t){const e=`
+`,Se=p.template(je),ke=p.template(we);async function xe(t,e=new Map,r=[],n){const i=new ee(p.cloneDeep(t),r),s=ve(i,e),o=Se(s),a=ke({template:s.template,css:await Z(s.css,n),script:await Y(o,n)});return await I(a,n)}async function Ce(t){const e=`
     <template>
       <div>
         <h3>源码模式页面</h3>
@@ -72,4 +78,4 @@ export default defineComponent({
     <\/script>
     <style scoped lang="scss">
     </style>
-  `;return await F(e)}exports.VTJ_CODER_VERSION=U;exports.createEmptyPage=Oe;exports.generator=Ce;
+  `;return await I(e)}exports.VTJ_CODER_VERSION=U;exports.createEmptyPage=Ce;exports.generator=xe;

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { mitt as q, dedupArray as v, toArray as D, camelCase as m, isPlainObject as M, template as F, cloneDeep as Q } from "@vtj/base";
+import { mitt as q, dedupArray as v, toArray as M, camelCase as d, isPlainObject as D, template as I, cloneDeep as Q } from "@vtj/base";
 import { format as x } from "prettier/standalone";
 import * as z from "prettier/plugins/html";
 import * as G from "prettier/plugins/babel";
@@ -8,10 +8,30 @@ 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.7.12
+ * @version 0.7.14
  * @license <a href="https://vtj.pro/license.html">MIT License</a>
  */
-const Ce = "0.7.12";
+const Oe = "0.7.14";
+/**!
+ * Copyright (c) 2024, VTJ.PRO All rights reserved.
+ * @name @vtj/core 
+ * @author CHC chenhuachun1549@dingtalk.com 
+ * @version 0.7.14
+ * @license <a href="https://vtj.pro/license.html">MIT License</a>
+ */
+const X = [
+  "slot",
+  "template",
+  "component",
+  "img",
+  "div",
+  "p",
+  "h1",
+  "h2",
+  "h3",
+  "span",
+  "a"
+];
 q();
 const k = {
   arrowParens: "always",
@@ -33,21 +53,21 @@ const k = {
   useTabs: !1,
   vueIndentScriptAndStyle: !0
 };
-async function N(t, e) {
+async function B(t, e) {
   return e ? t : await x(t, {
     parser: "html",
     ...k,
     plugins: [z]
   });
 }
-async function X(t, e) {
+async function Y(t, e) {
   return e ? t : await x(t, {
     parser: "babel-ts",
     ...k,
     plugins: [G, U]
   });
 }
-async function Y(t, e) {
+async function Z(t, e) {
   return e ? t : x(t, {
     parser: "scss",
     ...k,
@@ -63,17 +83,17 @@ function O(t) {
 function E(t) {
   return C(t) || O(t);
 }
-function I(t) {
+function P(t) {
   return t.replace(new RegExp("this.", "g"), "");
 }
-function _(t) {
-  return t.replace(new RegExp("this.context.", "g"), "");
+function W(t) {
+  return t.replace(/this\.context\??\./g, "");
 }
 function p(t, e = !0, r = !0) {
   const n = E(t) ? t.value : e ? JSON.stringify(t) : t;
-  return r ? I(_(n)) : _(n);
+  return r ? P(W(n)) : W(n);
 }
-function P(t, e = []) {
+function A(t, e = []) {
   let r = t;
   for (const n of e)
     r = r.replace(
@@ -82,18 +102,28 @@ function P(t, e = []) {
     );
   return r;
 }
-function R(t) {
+function J(t) {
   let e = t.trim();
-  return e.startsWith("{") || (e.startsWith("async function") ? e = e.replace(/^async function/, "async") : e.startsWith("function") ? e = e.replace(/^function/, "") : e = e.replace("=>", "")), e;
+  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 Z(t = {}) {
+function K(t = {}) {
   return Object.entries(t).map(([e, r]) => `"${e}": ${p(r)}`);
 }
-function J(t = {}, e = !1) {
+function L(t = {}, e = !1) {
   const r = Object.keys(t);
   return e ? r.map((n) => "." + n) : r;
 }
-class K {
+class ee {
   constructor(e, r) {
     this.dsl = e, this.dependencies = r, this.libraryRegex = this.collectLibrary(), this.walk(e), this.walkNodes(e), this.members = this.getLibraryMember();
   }
@@ -188,50 +218,50 @@ class K {
     Array.isArray(e.nodes) && e.nodes.forEach((n) => r(n));
   }
 }
-function ee(t = {}) {
+function te(t = {}) {
   return Object.entries(t).map(([e, r]) => {
     const n = p(r, !1);
     return `${e}:${n}`;
   });
 }
-function te(t = []) {
+function re(t = []) {
   return t.map((e) => `${e.name}: {
             from: '${e.from || e.name}',
             default: ${p(e.default, !0, !1)}
         }`);
 }
-function re(t = []) {
-  const e = (r) => r ? `[${D(r).map((s) => s.replace(/\'|\"/gi, "")).join(",")}]` : void 0;
+function ne(t = []) {
+  const e = (r) => r ? `[${M(r).map((s) => s.replace(/\'|\"/gi, "")).join(",")}]` : void 0;
   return t.map((r) => typeof r == "string" ? `${r}: {}` : `${r.name}: {
           type:${e(r.type)},
           required: ${r.required},
           default: ${p(r.default, !0, !1)}
           }`);
 }
-function ne(t = []) {
+function se(t = []) {
   return t.map((e) => `'${e}'`);
 }
-function g(t = {}, e = []) {
+function y(t = {}, e = []) {
   return Object.entries(t).map(([r, n]) => {
-    let i = R(p(n, !1, !1));
-    return i = P(i, e), i.startsWith("async") ? `async ${r}${i.replace(/^async/, "")}` : `${r}${i}`;
+    let i = J(p(n, !1, !1));
+    return i = A(i, e), i.startsWith("async") ? `async ${r}${i.replace(/^async/, "")}` : `${r}${i}`;
   });
 }
-function se(t = [], e = []) {
+function oe(t = [], e = []) {
   const r = t.reduce(
     (s, o) => (o.id && O(o.source) && (s[`watcher_${o.id}`] = o.source), s),
     {}
-  ), n = g(r, e), i = t.map((s) => `watcher_${s.id}: {
+  ), n = y(r, e), i = t.map((s) => `watcher_${s.id}: {
         deep: ${s.deep},
         immediate:${s.immediate},
-        handler${R(s.handler.value)}
+        handler${J(s.handler.value)}
       }`);
   return {
     computed: n,
     watches: i
   };
 }
-function oe(t = {}) {
+function ie(t = {}) {
   return Object.values(t).map((e) => {
     const r = O(e.transform) && e.transform.value || "(res) => res";
     return `async ${e.name}(...args:any[]) {
@@ -239,40 +269,40 @@ function oe(t = {}) {
         }`;
   });
 }
-function L(t, e, r = [], n = {}, i) {
+function T(t, e, r = [], n = {}, i) {
   const s = [];
   let o = {}, a = [], c = [];
-  return ie(t).forEach((h) => {
-    const y = [];
-    for (const u of h.children) {
-      let { id: b, name: l, invisible: $, from: w } = u;
-      if ($)
+  return ae(t).forEach((l) => {
+    const $ = [];
+    for (const u of l.children) {
+      let { id: j, name: f, invisible: g, from: w } = u;
+      if (g)
         continue;
-      const A = ae(l, e, w);
-      A && a.push(A), ce(w) && c.push({ id: w.id, name: l });
-      const { props: W, events: B, handlers: T } = me(
-        b,
+      const _ = ce(f, e, w);
+      _ && a.push(_), pe(w) && c.push({ id: w.id, name: f });
+      const { props: F, events: N, handlers: V } = de(
+        j,
         u.props,
         u.events,
         n,
         r
-      ), V = de(u.directives).join(" "), f = u.children ? ye(
+      ), R = he(u.directives).join(" "), m = u.children ? ge(
         u.children,
         r,
         e,
         n,
         u
       ) : "";
-      Object.assign(o, T);
+      Object.assign(o, V);
       let S = "";
-      typeof f == "string" ? S = f : (S = (f?.nodes || []).join(`
-`), Object.assign(o, f?.methods || {}), a = a.concat(f?.components || []), c = c.concat(f?.importBlocks || [])), y.push(
-        `<${l} ${V} ${W} ${B}>${S.trim()}</${l}>`
+      typeof m == "string" ? S = m : (S = (m?.nodes || []).join(`
+`), Object.assign(o, m?.methods || {}), a = a.concat(m?.components || []), c = c.concat(m?.importBlocks || [])), $.push(
+        f === "img" ? `<${f} ${R} ${F} ${N} />` : `<${f} ${R} ${F} ${N}>${S.trim()}</${f}>`
       );
     }
-    const j = $e(h.slot, y.join(`
+    const b = ye(l.slot, $.join(`
 `), i?.id);
-    s.push(j);
+    s.push(b);
   }), {
     nodes: s,
     methods: o,
@@ -280,7 +310,7 @@ function L(t, e, r = [], n = {}, i) {
     importBlocks: v(c, "id")
   };
 }
-function ie(t = []) {
+function ae(t = []) {
   const e = /* @__PURE__ */ new Map();
   for (const r of t) {
     const n = typeof r.slot == "string" ? r.slot : r.slot?.name, i = e.get(n);
@@ -288,8 +318,8 @@ function ie(t = []) {
   }
   return e;
 }
-function ae(t, e, r) {
-  if (["slot", "component", "template"].includes(t))
+function ce(t, e, r) {
+  if (X.includes(t))
     return null;
   const n = e.get(t);
   if (n && n.alias) {
@@ -298,52 +328,52 @@ function ae(t, e, r) {
   }
   return r || n ? t : null;
 }
-function ce(t) {
+function pe(t) {
   return !!t && typeof t == "object" && t.type === "Schema";
 }
-function pe(t, e, r = []) {
+function ue(t, e, r = []) {
   return typeof e == "string" ? `${t}="${e}"` : E(e) ? `:${t}="${p({
     ...e,
-    value: P(e.value, r)
-  })}"` : M(e) ? `:${t}='{${Z(
+    value: A(e.value, r)
+  })}"` : D(e) ? `:${t}='{${K(
     e
   ).join(", ")}}'` : `:${t}='${JSON.stringify(e)}'`;
 }
-function ue(t = {}, e = []) {
-  return Object.entries(t).map(([r, n]) => pe(r, n, e));
+function le(t = {}, e = []) {
+  return Object.entries(t).map(([r, n]) => ue(r, n, e));
 }
-function le(t, e, r, n) {
-  const i = J(e.modifiers, !0);
+function fe(t, e, r, n) {
+  const i = L(e.modifiers, !0);
   return n && n.length > 0 ? `@${t}${i.join("")}="(...args:any[]) => ${r}"` : `@${t}${i.join("")}="${r}"`;
 }
-function fe(t, e = {}, r = {}) {
+function me(t, e = {}, r = {}) {
   const n = {}, i = Array.from(r[t] || /* @__PURE__ */ new Set([])), s = i.length ? `({${i.join(", ")}}, args)` : "";
   return {
     binders: Object.entries(e).map(([a, c]) => {
-      const d = `${m(a)}_handler_${t}${s}`;
-      return n[d] = i.length ? {
+      const h = c.handler.value.startsWith("this."), l = h ? P(c.handler.value) : `${d(a)}_handler_${t}${s}`;
+      return h || (n[l] = i.length ? {
         type: "JSFunction",
         value: `{
           return (${c.handler.value}).apply(this, args);
         }`
-      } : c.handler, le(a, c, d, i);
+      } : c.handler), fe(a, c, l, i);
     }),
     handlers: n
   };
 }
-function me(t, e = {}, r = {}, n = {}, i) {
-  const { binders: s, handlers: o } = fe(t, r, n);
+function de(t, e = {}, r = {}, n = {}, i) {
+  const { binders: s, handlers: o } = me(t, r, n);
   return {
-    props: ue(e, i).join(" "),
+    props: le(e, i).join(" "),
     handlers: o,
     binders: s,
     events: s.join(" ")
   };
 }
-function de(t = []) {
-  const e = [], { vIf: r, vShow: n, vModels: i, vFor: s } = he(t);
+function he(t = []) {
+  const e = [], { vIf: r, vShow: n, vModels: i, vFor: s } = $e(t);
   if (r && e.push(`v-if="${p(r.value)}"`), n && e.push(`v-show="${p(n.value)}"`), i.forEach((o) => {
-    const a = J(o.modifiers, !0), c = o.arg ? C(o.arg) ? `:[${p(o.arg)}]` : `:${o.arg}` : "";
+    const a = L(o.modifiers, !0), c = o.arg ? C(o.arg) ? `:[${p(o.arg)}]` : `:${o.arg}` : "";
     e.push(`v-model${c}${a}="${p(o.value)}"`);
   }), s) {
     const { item: o, index: a } = { item: "item", index: "index", ...s.iterator };
@@ -351,8 +381,8 @@ function de(t = []) {
   }
   return e;
 }
-function he(t = []) {
-  const e = t.find((o) => m(o.name) === "vIf"), r = t.find((o) => m(o.name) === "vFor"), n = t.find((o) => m(o.name) === "vShow"), i = t.find((o) => m(o.name) === "vBind"), s = t.filter((o) => m(o.name) === "vModel");
+function $e(t = []) {
+  const e = t.find((o) => d(o.name) === "vIf"), r = t.find((o) => d(o.name) === "vFor"), n = t.find((o) => d(o.name) === "vShow"), i = t.find((o) => d(o.name) === "vBind"), s = t.filter((o) => d(o.name) === "vModel");
   return {
     vIf: e,
     vFor: r,
@@ -361,16 +391,16 @@ function he(t = []) {
     vBind: i
   };
 }
-function ye(t, e, r, n, i) {
+function ge(t, e, r, n, i) {
   if (typeof t == "string")
     return t;
   if (C(t)) {
     let s = p(t, !1);
-    return s = P(s, e), s = I(s), `{{ ${s} }}`;
+    return s = A(s, e), s = P(s), `{{ ${s} }}`;
   }
-  return Array.isArray(t) ? L(t, r, e, n, i) : "";
+  return Array.isArray(t) ? T(t, r, e, n, i) : "";
 }
-function $e(t, e, r) {
+function ye(t, e, r) {
   if (!t)
     return e;
   const n = typeof t == "string" ? { name: t, params: [] } : { params: [], ...t };
@@ -378,7 +408,7 @@ function $e(t, e, r) {
     ${e}
     </template>`;
 }
-function ge(t, e = [], r = [], n = {}) {
+function ve(t, e = [], r = [], n = {}) {
   const i = {
     vue: ["defineComponent", "reactive"]
   };
@@ -392,41 +422,41 @@ function ge(t, e = [], r = [], n = {}) {
     ","
   )}} from '${s}';`).concat(r);
 }
-function ve(t, e) {
-  const { dsl: r } = t, n = Object.keys(r.computed || {}), i = g(r.lifeCycles, n), s = g(r.computed, n), o = se(r.watch, n), a = oe(r.dataSources), { methods: c, nodes: d, components: h, importBlocks: y } = L(
+function be(t, e) {
+  const { dsl: r } = t, n = Object.keys(r.computed || {}), i = y(r.lifeCycles, n), s = y(r.computed, n), o = oe(r.watch, n), a = ie(r.dataSources), { methods: c, nodes: h, components: l, importBlocks: $ } = T(
     r.nodes || [],
     e,
     n,
     t.context
-  ), j = [...s, ...o.computed], u = g(
+  ), b = [...s, ...o.computed], u = y(
     {
       ...c,
       ...r.methods || {}
     },
     n
-  ), b = y.map(($) => `import ${$.name} from './${$.id}.vue';`), l = ge(
+  ), j = $.map((g) => `import ${g.name} from './${g.id}.vue';`), f = ve(
     e,
-    h,
-    b,
+    l,
+    j,
     t.imports
   );
   return {
     id: r.id,
     version: r.__VERSION__,
     name: r.name,
-    state: ee(r.state).join(","),
-    inject: te(r.inject).join(","),
-    props: re(r.props).join(","),
-    emits: ne(r.emits).join(","),
+    state: te(r.state).join(","),
+    inject: re(r.inject).join(","),
+    props: ne(r.props).join(","),
+    emits: se(r.emits).join(","),
     watch: o.watches.join(","),
     lifeCycles: i.join(","),
-    computed: j.join(","),
+    computed: b.join(","),
     methods: [...a, ...u].join(","),
-    imports: l.join(`
+    imports: f.join(`
 `),
-    components: h.join(","),
+    components: l.join(","),
     returns: t.members.join(","),
-    template: d.join(`
+    template: h.join(`
 `),
     css: r.css || ""
   };
@@ -457,7 +487,7 @@ export default defineComponent({
   <% if(methods) { %> methods: { <%= methods %> }, <% } %>
   <% if(watch) { %> watch: { <%= watch %> }, <% } %> <%= lifeCycles %>
 });
-`.replace(/(\n|\r|\t)/g, ""), be = `
+`.replace(/(\n|\r|\t)/g, ""), we = `
 <template>
 <%= template %>
 </template>
@@ -467,16 +497,16 @@ export default defineComponent({
 <style lang="scss" scoped>
 <%= css %>
 </style>
-`, we = F(je), Se = F(be);
-async function Oe(t, e = /* @__PURE__ */ new Map(), r = [], n) {
-  const i = new K(Q(t), r), s = ve(i, e), o = we(s), a = Se({
+`, Se = I(je), xe = I(we);
+async function Ee(t, e = /* @__PURE__ */ new Map(), r = [], n) {
+  const i = new ee(Q(t), r), s = be(i, e), o = Se(s), a = xe({
     template: s.template,
-    css: await Y(s.css, n),
-    script: await X(o, n)
+    css: await Z(s.css, n),
+    script: await Y(o, n)
   });
-  return await N(a, n);
+  return await B(a, n);
 }
-async function Ee(t) {
+async function Pe(t) {
   const e = `
     <template>
       <div>
@@ -489,10 +519,10 @@ async function Ee(t) {
     <style scoped lang="scss">
     </style>
   `;
-  return await N(e);
+  return await B(e);
 }
 export {
-  Ce as VTJ_CODER_VERSION,
-  Ee as createEmptyPage,
-  Oe as generator
+  Oe as VTJ_CODER_VERSION,
+  Pe as createEmptyPage,
+  Ee as generator
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vtj/coder",
   "private": false,
-  "version": "0.7.12",
+  "version": "0.7.14",
   "type": "module",
   "scripts": {
     "build": "vue-tsc && vite build",
@@ -11,11 +11,11 @@
   },
   "dependencies": {
     "@vtj/base": "^0.7.5",
-    "@vtj/core": "^0.7.12",
+    "@vtj/core": "^0.7.14",
     "prettier": "~3.2.1"
   },
   "devDependencies": {
-    "@vtj/cli": "^0.7.9"
+    "@vtj/cli": "^0.7.10"
   },
   "exports": {
     ".": {
@@ -31,7 +31,7 @@
     "dist",
     "types"
   ],
-  "gitHead": "e893df5593e0df19de9fdc35c486faef1a31f273",
+  "gitHead": "8e69e3eea31f488f318f28013b7ef3df02ee8174",
   "publishConfig": {
     "access": "public"
   }

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.7.12
+ * @version 0.7.13
  * @license <a href="https://vtj.pro/license.html">MIT License</a>
  */
-export declare const version = "0.7.12";
+export declare const version = "0.7.13";