@vtj/coder 0.7.10 → 0.7.12

package/dist/index.cjs

@@ -2,9 +2,9 @@
  * Copyright (c) 2024, VTJ.PRO All rights reserved.
  * @name @vtj/coder 
  * @author CHC chenhuachun1549@dingtalk.com 
- * @version 0.7.10
+ * @version 0.7.12
  * @license <a href="https://vtj.pro/license.html">MIT License</a>
- */const U="0.7.10",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.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}: {
             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}: {

package/dist/index.mjs

@@ -1,17 +1,19 @@
-import { dedupArray as v, toArray as q, camelCase as m, isPlainObject as D, template as F, cloneDeep as M } from "@vtj/base";
+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 { format as x } from "prettier/standalone";
-import * as Q from "prettier/plugins/html";
-import * as z from "prettier/plugins/babel";
-import * as G from "prettier/plugins/postcss";
-import * as H from "prettier/plugins/estree";
+import * as z from "prettier/plugins/html";
+import * as G from "prettier/plugins/babel";
+import * as H from "prettier/plugins/postcss";
+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.10
+ * @version 0.7.12
  * @license <a href="https://vtj.pro/license.html">MIT License</a>
  */
-const ke = "0.7.10", k = {
+const Ce = "0.7.12";
+q();
+const k = {
   arrowParens: "always",
   bracketSpacing: !0,
   bracketSameLine: !0,
@@ -35,21 +37,21 @@ async function N(t, e) {
   return e ? t : await x(t, {
     parser: "html",
     ...k,
-    plugins: [Q]
+    plugins: [z]
   });
 }
-async function U(t, e) {
+async function X(t, e) {
   return e ? t : await x(t, {
     parser: "babel-ts",
     ...k,
-    plugins: [z, H]
+    plugins: [G, U]
   });
 }
-async function X(t, e) {
+async function Y(t, e) {
   return e ? t : x(t, {
     parser: "scss",
     ...k,
-    plugins: [G]
+    plugins: [H]
   });
 }
 function C(t) {
@@ -84,14 +86,14 @@ function R(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 Y(t = {}) {
+function Z(t = {}) {
   return Object.entries(t).map(([e, r]) => `"${e}": ${p(r)}`);
 }
 function J(t = {}, e = !1) {
   const r = Object.keys(t);
   return e ? r.map((n) => "." + n) : r;
 }
-class Z {
+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();
   }
@@ -186,27 +188,27 @@ class Z {
     Array.isArray(e.nodes) && e.nodes.forEach((n) => r(n));
   }
 }
-function K(t = {}) {
+function ee(t = {}) {
   return Object.entries(t).map(([e, r]) => {
     const n = p(r, !1);
     return `${e}:${n}`;
   });
 }
-function ee(t = []) {
+function te(t = []) {
   return t.map((e) => `${e.name}: {
             from: '${e.from || e.name}',
             default: ${p(e.default, !0, !1)}
         }`);
 }
-function te(t = []) {
-  const e = (r) => r ? `[${q(r).map((s) => s.replace(/\'|\"/gi, "")).join(",")}]` : void 0;
+function re(t = []) {
+  const e = (r) => r ? `[${D(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 re(t = []) {
+function ne(t = []) {
   return t.map((e) => `'${e}'`);
 }
 function g(t = {}, e = []) {
@@ -215,7 +217,7 @@ function g(t = {}, e = []) {
     return i = P(i, e), i.startsWith("async") ? `async ${r}${i.replace(/^async/, "")}` : `${r}${i}`;
   });
 }
-function ne(t = [], e = []) {
+function se(t = [], e = []) {
   const r = t.reduce(
     (s, o) => (o.id && O(o.source) && (s[`watcher_${o.id}`] = o.source), s),
     {}
@@ -229,7 +231,7 @@ function ne(t = [], e = []) {
     watches: i
   };
 }
-function se(t = {}) {
+function oe(t = {}) {
   return Object.values(t).map((e) => {
     const r = O(e.transform) && e.transform.value || "(res) => res";
     return `async ${e.name}(...args:any[]) {
@@ -240,21 +242,21 @@ function se(t = {}) {
 function L(t, e, r = [], n = {}, i) {
   const s = [];
   let o = {}, a = [], c = [];
-  return oe(t).forEach((h) => {
+  return ie(t).forEach((h) => {
     const y = [];
     for (const u of h.children) {
       let { id: b, name: l, invisible: $, from: w } = u;
       if ($)
         continue;
-      const A = ie(l, e, w);
-      A && a.push(A), ae(w) && c.push({ id: w.id, name: l });
-      const { props: W, events: B, handlers: T } = fe(
+      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,
         u.props,
         u.events,
         n,
         r
-      ), V = me(u.directives).join(" "), f = u.children ? he(
+      ), V = de(u.directives).join(" "), f = u.children ? ye(
         u.children,
         r,
         e,
@@ -268,7 +270,7 @@ function L(t, e, r = [], n = {}, i) {
         `<${l} ${V} ${W} ${B}>${S.trim()}</${l}>`
       );
     }
-    const j = ye(h.slot, y.join(`
+    const j = $e(h.slot, y.join(`
 `), i?.id);
     s.push(j);
   }), {
@@ -278,7 +280,7 @@ function L(t, e, r = [], n = {}, i) {
     importBlocks: v(c, "id")
   };
 }
-function oe(t = []) {
+function ie(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);
@@ -286,7 +288,7 @@ function oe(t = []) {
   }
   return e;
 }
-function ie(t, e, r) {
+function ae(t, e, r) {
   if (["slot", "component", "template"].includes(t))
     return null;
   const n = e.get(t);
@@ -296,25 +298,25 @@ function ie(t, e, r) {
   }
   return r || n ? t : null;
 }
-function ae(t) {
+function ce(t) {
   return !!t && typeof t == "object" && t.type === "Schema";
 }
-function ce(t, e, r = []) {
+function pe(t, e, r = []) {
   return typeof e == "string" ? `${t}="${e}"` : E(e) ? `:${t}="${p({
     ...e,
     value: P(e.value, r)
-  })}"` : D(e) ? `:${t}='{${Y(
+  })}"` : M(e) ? `:${t}='{${Z(
     e
   ).join(", ")}}'` : `:${t}='${JSON.stringify(e)}'`;
 }
-function pe(t = {}, e = []) {
-  return Object.entries(t).map(([r, n]) => ce(r, n, e));
+function ue(t = {}, e = []) {
+  return Object.entries(t).map(([r, n]) => pe(r, n, e));
 }
-function ue(t, e, r, n) {
+function le(t, e, r, n) {
   const i = J(e.modifiers, !0);
   return n && n.length > 0 ? `@${t}${i.join("")}="(...args:any[]) => ${r}"` : `@${t}${i.join("")}="${r}"`;
 }
-function le(t, e = {}, r = {}) {
+function fe(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]) => {
@@ -324,22 +326,22 @@ function le(t, e = {}, r = {}) {
         value: `{
           return (${c.handler.value}).apply(this, args);
         }`
-      } : c.handler, ue(a, c, d, i);
+      } : c.handler, le(a, c, d, i);
     }),
     handlers: n
   };
 }
-function fe(t, e = {}, r = {}, n = {}, i) {
-  const { binders: s, handlers: o } = le(t, r, n);
+function me(t, e = {}, r = {}, n = {}, i) {
+  const { binders: s, handlers: o } = fe(t, r, n);
   return {
-    props: pe(e, i).join(" "),
+    props: ue(e, i).join(" "),
     handlers: o,
     binders: s,
     events: s.join(" ")
   };
 }
-function me(t = []) {
-  const e = [], { vIf: r, vShow: n, vModels: i, vFor: s } = de(t);
+function de(t = []) {
+  const e = [], { vIf: r, vShow: n, vModels: i, vFor: s } = he(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}` : "";
     e.push(`v-model${c}${a}="${p(o.value)}"`);
@@ -349,7 +351,7 @@ function me(t = []) {
   }
   return e;
 }
-function de(t = []) {
+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");
   return {
     vIf: e,
@@ -359,7 +361,7 @@ function de(t = []) {
     vBind: i
   };
 }
-function he(t, e, r, n, i) {
+function ye(t, e, r, n, i) {
   if (typeof t == "string")
     return t;
   if (C(t)) {
@@ -368,7 +370,7 @@ function he(t, e, r, n, i) {
   }
   return Array.isArray(t) ? L(t, r, e, n, i) : "";
 }
-function ye(t, e, r) {
+function $e(t, e, r) {
   if (!t)
     return e;
   const n = typeof t == "string" ? { name: t, params: [] } : { params: [], ...t };
@@ -376,7 +378,7 @@ function ye(t, e, r) {
     ${e}
     </template>`;
 }
-function $e(t, e = [], r = [], n = {}) {
+function ge(t, e = [], r = [], n = {}) {
   const i = {
     vue: ["defineComponent", "reactive"]
   };
@@ -390,8 +392,8 @@ function $e(t, e = [], r = [], n = {}) {
     ","
   )}} from '${s}';`).concat(r);
 }
-function ge(t, e) {
-  const { dsl: r } = t, n = Object.keys(r.computed || {}), i = g(r.lifeCycles, n), s = g(r.computed, n), o = ne(r.watch, n), a = se(r.dataSources), { methods: c, nodes: d, components: h, importBlocks: y } = L(
+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(
     r.nodes || [],
     e,
     n,
@@ -402,7 +404,7 @@ function ge(t, e) {
       ...r.methods || {}
     },
     n
-  ), b = y.map(($) => `import ${$.name} from './${$.id}.vue';`), l = $e(
+  ), b = y.map(($) => `import ${$.name} from './${$.id}.vue';`), l = ge(
     e,
     h,
     b,
@@ -412,10 +414,10 @@ function ge(t, e) {
     id: r.id,
     version: r.__VERSION__,
     name: r.name,
-    state: K(r.state).join(","),
-    inject: ee(r.inject).join(","),
-    props: te(r.props).join(","),
-    emits: re(r.emits).join(","),
+    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: j.join(","),
@@ -429,7 +431,7 @@ function ge(t, e) {
     css: r.css || ""
   };
 }
-const ve = `
+const je = `
 <%= imports %>
 import { useProvider } from '@vtj/renderer';
 export default defineComponent({
@@ -455,7 +457,7 @@ export default defineComponent({
   <% if(methods) { %> methods: { <%= methods %> }, <% } %>
   <% if(watch) { %> watch: { <%= watch %> }, <% } %> <%= lifeCycles %>
 });
-`.replace(/(\n|\r|\t)/g, ""), je = `
+`.replace(/(\n|\r|\t)/g, ""), be = `
 <template>
 <%= template %>
 </template>
@@ -465,16 +467,16 @@ export default defineComponent({
 <style lang="scss" scoped>
 <%= css %>
 </style>
-`, be = F(ve), we = F(je);
-async function Ce(t, e = /* @__PURE__ */ new Map(), r = [], n) {
-  const i = new Z(M(t), r), s = ge(i, e), o = be(s), a = we({
+`, 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({
     template: s.template,
-    css: await X(s.css, n),
-    script: await U(o, n)
+    css: await Y(s.css, n),
+    script: await X(o, n)
   });
   return await N(a, n);
 }
-async function Oe(t) {
+async function Ee(t) {
   const e = `
     <template>
       <div>
@@ -490,7 +492,7 @@ async function Oe(t) {
   return await N(e);
 }
 export {
-  ke as VTJ_CODER_VERSION,
-  Oe as createEmptyPage,
-  Ce as generator
+  Ce as VTJ_CODER_VERSION,
+  Ee as createEmptyPage,
+  Oe as generator
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vtj/coder",
   "private": false,
-  "version": "0.7.10",
+  "version": "0.7.12",
   "type": "module",
   "scripts": {
     "build": "vue-tsc && vite build",
@@ -10,12 +10,12 @@
     "coverage": "vitest run --coverage"
   },
   "dependencies": {
-    "@vtj/base": "^0.7.3",
-    "@vtj/core": "^0.7.10",
+    "@vtj/base": "^0.7.5",
+    "@vtj/core": "^0.7.12",
     "prettier": "~3.2.1"
   },
   "devDependencies": {
-    "@vtj/cli": "^0.7.7"
+    "@vtj/cli": "^0.7.9"
   },
   "exports": {
     ".": {
@@ -31,7 +31,7 @@
     "dist",
     "types"
   ],
-  "gitHead": "6c54f72d57ad363d1ed75a36f25aed10d6b6a262",
+  "gitHead": "e893df5593e0df19de9fdc35c486faef1a31f273",
   "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.10
+ * @version 0.7.12
  * @license <a href="https://vtj.pro/license.html">MIT License</a>
  */
-export declare const version = "0.7.10";
+export declare const version = "0.7.12";