@vtj/coder 0.11.16 → 0.12.0-alpha.0

package/dist/index.cjs

@@ -2,15 +2,15 @@
  * Copyright (c) 2025, VTJ.PRO All rights reserved.
  * @name @vtj/coder 
  * @author CHC chenhuachun1549@dingtalk.com 
- * @version 0.11.16
+ * @version 0.12.0-alpha.0
  * @license <a href="https://vtj.pro/license.html">MIT License</a>
- */const se="0.11.16";/**!
+ */const se="0.12.0-alpha.0";/**!
  * Copyright (c) 2025, VTJ.PRO All rights reserved.
  * @name @vtj/core 
  * @author CHC chenhuachun1549@dingtalk.com 
- * @version 0.11.16
+ * @version 0.12.0-alpha.0
  * @license <a href="https://vtj.pro/license.html">MIT License</a>
- */const re=["slot","template","component","img","div","p","h1","h2","h3","span","a"];f.mitt();const B={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 R(t,e){return e?t:await T.format(t,{parser:"vue",...B,plugins:[ne,D,U,L]})}async function M(t,e){return e?t:await T.format(t,{parser:"babel-ts",...B,plugins:[D,U]})}async function I(t,e){return e?t:T.format(t,{parser:"scss",...B,plugins:[L]})}function S(t){return t&&t.type==="JSExpression"}function A(t){return typeof t=="object"&&t&&t.type==="JSFunction"}function v(t){return S(t)||A(t)}function V(t){return t.replace(new RegExp("this.","g"),"")}function J(t){return t.replace(/this\.context\??\./g,"")}function m(t,e=!0,n=!0,s=[]){let r=v(t)?t.value:e?JSON.stringify(t):t;return r=k(r,s),n?V(J(r)):J(r)}function k(t,e=[]){let n=t;for(const s of e)n=n.replace(new RegExp(`this.${s}.value`,"g"),`this.${s}`);return n}function H(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 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 ie(t={}){return Object.entries(t).map(([e,n])=>`"${e}": ${m(n)}`)}function Q(t={},e=!1){const n=Object.keys(t);return e?n.map(s=>"."+s):n}function oe(t){let e="";for(var n in t)if(t.hasOwnProperty(n)){var s=t[n];e+=n+": "+s+";"}return e}function ce(t=[],e=[]){return t.filter(n=>!e.includes(n))}class ae{constructor(e,n){this.dsl=e,this.dependencies=n,this.libraryRegex=this.collectLibrary(),this.walk(e),this.walkNodes(e),this.members=this.getLibraryMember()}imports={};context={};style={};members=[];urlSchemas={};blockPlugins={};libraryRegex=[];collectLibrary(){return this.dependencies.filter(e=>!!e.library).map(e=>new RegExp(`(this.\\$libs.${e.library}.([\\w]+))`,"g"))}collectImport(e){const n=e.split(".");if(n.length===4){const s=n.pop(),r=n.join(".")+".",i=n.pop();if(s&&i){const c=this.dependencies.find(a=>a.library===i)?.package;c&&(this.imports[c]||(this.imports[c]=new Set)).add(s)}return{name:s,path:r,library:i}}return null}replaceLibraryPath(e){const{libraryRegex:n}=this;let s=e.value;for(const r of n){const i=e.value?.match(r)||[];for(const c of i){const a=this.collectImport(c);if(a){const p=a.path.replace(/\$/g,"\\$");s=s.replace(new RegExp(p,"g"),"")}}}return s}walk(e){const n=s=>{if(!s||typeof s!="object")return;if(Array.isArray(s)){for(let i of s)n(i);return}const r=Object.values(s);for(const i of r)v(i)?i.value=this.replaceLibraryPath(i):n(i)};n(e)}getLibraryMember(e=[]){let n=[...e];const s={...this.imports};delete s["uni-h5"],delete s["@dcloudio/uni-h5"],delete s["uni-ui"],delete s["@dcloudio/uni-ui"];for(const r of Object.values(s))n=n.concat(Array.from(r));return f.dedupArray(n)}collectContext(e,n){const s=new Set(n?.id?this.context[n.id]:[]),r=(e.directives||[]).find(a=>a.name==="vFor");let i=new Set(Array.from(s));if(r){const{item:a="item",index:p="index"}=r.iterator||{};i=new Set([a,p,...Array.from(i)])}const c=e.slot;if(c){const a=typeof c=="string"?[]:c.params||[],p=a.length?a:[`scope_${n?.id}`];i=new Set([...p,...Array.from(i)])}this.context[e.id]=i}collectStyle(e){e.id&&e.props?.style&&Object.keys(e.props.style).length&&!v(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 n=(s,r)=>{this.collectContext(s,r),this.collectStyle(s),this.collectUrlSchema(s),this.collectBlockPlugin(s),Array.isArray(s.children)&&s.children.forEach(i=>n(i,s))};Array.isArray(e.nodes)&&e.nodes.forEach(s=>n(s))}}function ue(t={}){return Object.entries(t).map(([e,n])=>{const s=m(n,!1);return`${e}:${s}`})}function le(t=[]){return t.map(e=>`${e.name}: {
+ */const re=["slot","template","component","img","div","p","h1","h2","h3","span","a"];f.mitt();const B={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 R(t,e){return e?t:await T.format(t,{parser:"vue",...B,plugins:[ne,D,U,L]})}async function M(t,e){if(e)return t;try{return(await T.format(t,{parser:"babel-ts",...B,plugins:[D,U]})).replace(/;\n$/gi,"")}catch(n){return console.warn(n),t}}async function I(t,e){return e?t:T.format(t,{parser:"scss",...B,plugins:[L]})}function S(t){return t&&t.type==="JSExpression"}function A(t){return typeof t=="object"&&t&&t.type==="JSFunction"}function v(t){return S(t)||A(t)}function V(t){return t.replace(new RegExp("this.","g"),"")}function J(t){return t.replace(/this\.context\??\./g,"")}function m(t,e=!0,n=!0,s=[]){let r=v(t)?t.value.replace(/\"/g,"'"):e?JSON.stringify(t):t;return r=k(r,s),n?V(J(r)):J(r)}function k(t,e=[]){let n=t;for(const s of e)n=n.replace(new RegExp(`this.${s}.value`,"g"),`this.${s}`);return n}function H(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 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 ie(t={}){return Object.entries(t).map(([e,n])=>`"${e}": ${m(n)}`)}function Q(t={},e=!1){const n=Object.keys(t);return e?n.map(s=>"."+s):n}function oe(t){let e="";for(var n in t)if(t.hasOwnProperty(n)){var s=t[n];e+=n+": "+s+";"}return e}function ce(t=[],e=[]){return t.filter(n=>!e.includes(n))}class ae{constructor(e,n){this.dsl=e,this.dependencies=n,this.libraryRegex=this.collectLibrary(),this.walk(e),this.walkNodes(e),this.members=this.getLibraryMember()}imports={};context={};style={};members=[];urlSchemas={};blockPlugins={};libraryRegex=[];collectLibrary(){return this.dependencies.filter(e=>!!e.library).map(e=>new RegExp(`(this.\\$libs.${e.library}.([\\w]+))`,"g"))}collectImport(e){const n=e.split(".");if(n.length===4){const s=n.pop(),r=n.join(".")+".",i=n.pop();if(s&&i){const c=this.dependencies.find(a=>a.library===i)?.package;c&&(this.imports[c]||(this.imports[c]=new Set)).add(s)}return{name:s,path:r,library:i}}return null}replaceLibraryPath(e){const{libraryRegex:n}=this;let s=e.value;for(const r of n){const i=e.value?.match(r)||[];for(const c of i){const a=this.collectImport(c);if(a){const p=a.path.replace(/\$/g,"\\$");s=s.replace(new RegExp(p,"g"),"")}}}return s}walk(e){const n=s=>{if(!s||typeof s!="object")return;if(Array.isArray(s)){for(let i of s)n(i);return}const r=Object.values(s);for(const i of r)v(i)?i.value=this.replaceLibraryPath(i):n(i)};n(e)}getLibraryMember(e=[]){let n=[...e];const s={...this.imports};delete s["uni-h5"],delete s["@dcloudio/uni-h5"],delete s["uni-ui"],delete s["@dcloudio/uni-ui"];for(const r of Object.values(s))n=n.concat(Array.from(r));return f.dedupArray(n)}collectContext(e,n){const s=new Set(n?.id?this.context[n.id]:[]),r=(e.directives||[]).find(a=>a.name==="vFor");let i=new Set(Array.from(s));if(r){const{item:a="item",index:p="index"}=r.iterator||{};i=new Set([a,p,...Array.from(i)])}const c=e.slot;if(c){const a=typeof c=="string"?[]:c.params||[],p=a.length?a:[`scope_${n?.id}`];i=new Set([...p,...Array.from(i)])}this.context[e.id]=i}collectStyle(e){e.id&&e.props?.style&&Object.keys(e.props.style).length&&!v(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 n=(s,r)=>{this.collectContext(s,r),this.collectStyle(s),this.collectUrlSchema(s),this.collectBlockPlugin(s),Array.isArray(s.children)&&s.children.forEach(i=>n(i,s))};Array.isArray(e.nodes)&&e.nodes.forEach(s=>n(s))}}function ue(t={}){return Object.entries(t).map(([e,n])=>{const s=m(n,!1);return`${e}:${s}`})}function le(t=[]){return t.map(e=>`${e.name}: {
             from: '${e.from||e.name}',
             default: ${m(e.default,!0,!1)}
         }`)}function pe(t=[]){const e=n=>n?`[${f.toArray(n).map(i=>i.replace(/\'|\"/gi,"")).join(",")}]`:void 0;return t.map(n=>typeof n=="string"?`${n}: {}`:(v(n.default)&&!n.default.value&&(n.default.value="undefined"),`${n.name}: {
@@ -60,7 +60,7 @@ export default defineComponent({
       id: '<%= id %>',
       version: '<%= version %>'
     });
-    const state = reactive<Record<string, any>>({ <%= state %> });
+    const state = reactive({ <%= state %> });
     <%= urlSchemas %>
     <%= blockPlugins %>
     return {

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.11.16
+ * @version 0.12.0-alpha.0
  * @license <a href="https://vtj.pro/license.html">MIT License</a>
  */
-const Le = "0.11.16";
+const Le = "0.12.0-alpha.0";
 /**!
  * Copyright (c) 2025, VTJ.PRO All rights reserved.
  * @name @vtj/core 
  * @author CHC chenhuachun1549@dingtalk.com 
- * @version 0.11.16
+ * @version 0.12.0-alpha.0
  * @license <a href="https://vtj.pro/license.html">MIT License</a>
  */
 const re = [
@@ -33,7 +33,7 @@ const re = [
   "a"
 ];
 K();
-const R = {
+const T = {
   arrowParens: "always",
   bracketSpacing: !0,
   bracketSameLine: !0,
@@ -56,21 +56,26 @@ const R = {
 async function M(t, e) {
   return e ? t : await B(t, {
     parser: "vue",
-    ...R,
+    ...T,
     plugins: [se, D, H, V]
   });
 }
 async function ie(t, e) {
-  return e ? t : await B(t, {
-    parser: "babel-ts",
-    ...R,
-    plugins: [D, H]
-  });
+  if (e) return t;
+  try {
+    return (await B(t, {
+      parser: "babel-ts",
+      ...T,
+      plugins: [D, H]
+    })).replace(/;\n$/gi, "");
+  } catch (n) {
+    return console.warn(n), t;
+  }
 }
 async function W(t, e) {
   return e ? t : B(t, {
     parser: "scss",
-    ...R,
+    ...T,
     plugins: [V]
   });
 }
@@ -90,7 +95,7 @@ function J(t) {
   return t.replace(/this\.context\??\./g, "");
 }
 function f(t, e = !0, n = !0, s = []) {
-  let r = $(t) ? t.value : e ? JSON.stringify(t) : t;
+  let r = $(t) ? t.value.replace(/\"/g, "'") : e ? JSON.stringify(t) : t;
   return r = k(r, s), n ? q(J(r)) : J(r);
 }
 function k(t, e = []) {
@@ -324,7 +329,7 @@ const ye = [
   "vBind",
   "vHtml"
 ];
-function z(t, e, n = [], s = {}, r) {
+function X(t, e, n = [], s = {}, r) {
   const i = [];
   let c = {}, a = [];
   const p = [];
@@ -336,7 +341,7 @@ function z(t, e, n = [], s = {}, r) {
       if (F)
         continue;
       const C = ve(g, e, y);
-      C && a.push(C), X(y) && o.push({ id: y.id, name: g });
+      C && a.push(C), z(y) && o.push({ id: y.id, name: g });
       const { props: P, events: O, handlers: x } = we(
         d,
         b,
@@ -344,7 +349,7 @@ function z(t, e, n = [], s = {}, r) {
         d.events,
         s,
         n
-      ), T = Ce(
+      ), R = Ce(
         d.directives,
         n,
         p
@@ -363,7 +368,7 @@ function z(t, e, n = [], s = {}, r) {
         y
       ) ? I(g) : Y(y) || Z(y) ? "component" : g;
       m.push(
-        ye.includes(_) ? `<${_} ${T} ${P} ${O} />` : `<${_} ${T} ${P} ${O}>${E ? `
+        ye.includes(_) ? `<${_} ${R} ${P} ${O} />` : `<${_} ${R} ${P} ${O}>${E ? `
 ` + E.trim() : ""}</${_}>`
       );
     }
@@ -396,9 +401,9 @@ function ve(t, e, n) {
     const r = s.parent ? `${s.parent}.${s.alias}` : s.alias;
     return `${t}: ${r}`;
   }
-  return X(n) || s ? t : null;
+  return z(n) || s ? t : null;
 }
-function X(t) {
+function z(t) {
   return !!t && typeof t == "object" && t.type === "Schema";
 }
 function Y(t) {
@@ -522,7 +527,7 @@ function Pe(t = []) {
   };
 }
 function Oe(t, e, n, s, r) {
-  return typeof t == "string" ? t : S(t) ? `{{ ${f(t, !1, !0, e)} }}` : Array.isArray(t) ? z(t, n, e, s, r) : "";
+  return typeof t == "string" ? t : S(t) ? `{{ ${f(t, !1, !0, e)} }}` : Array.isArray(t) ? X(t, n, e, s, r) : "";
 }
 function xe(t, e, n) {
   if (!t) return e;
@@ -584,7 +589,7 @@ function Ne(t = {}) {
   }), e;
 }
 function Fe(t, e, n = "web") {
-  const { dsl: s } = t, r = Object.keys(s.computed || {}), i = A(s.lifeCycles, r), c = A(s.computed, r), a = he(s.watch, r), p = de(s.dataSources), { methods: o, nodes: l, components: u, importBlocks: m, directives: h } = z(
+  const { dsl: s } = t, r = Object.keys(s.computed || {}), i = A(s.lifeCycles, r), c = A(s.computed, r), a = he(s.watch, r), p = de(s.dataSources), { methods: o, nodes: l, components: u, importBlocks: m, directives: h } = X(
     s.nodes || [],
     e,
     r,
@@ -655,7 +660,7 @@ export default defineComponent({
       id: '<%= id %>',
       version: '<%= version %>'
     });
-    const state = reactive<Record<string, any>>({ <%= state %> });
+    const state = reactive({ <%= state %> });
     <%= urlSchemas %>
     <%= blockPlugins %>
     return {
@@ -681,9 +686,9 @@ export default defineComponent({
 <%= css %>
 <%= style %>
 </style>
-`, Re = U(Ie), Te = U(Be);
+`, Te = U(Ie), Re = U(Be);
 async function Ue(t, e = /* @__PURE__ */ new Map(), n = [], s = "web", r) {
-  const i = new ue(ne(t), n), c = Fe(i, e, s), a = Re(c), p = Te({
+  const i = new ue(ne(t), n), c = Fe(i, e, s), a = Te(c), p = Re({
     template: c.template,
     css: await W(c.css, r),
     script: await ie(a, r),

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vtj/coder",
   "private": false,
-  "version": "0.11.16",
+  "version": "0.12.0-alpha.0",
   "type": "module",
   "keywords": [
     "低代码引擎",
@@ -22,11 +22,11 @@
   "license": "MIT",
   "dependencies": {
     "prettier": "~3.5.0",
-    "@vtj/core": "~0.11.16",
-    "@vtj/base": "~0.11.2"
+    "@vtj/base": "~0.12.0-alpha.0",
+    "@vtj/core": "~0.12.0-alpha.0"
   },
   "devDependencies": {
-    "@vtj/cli": "~0.11.2"
+    "@vtj/cli": "~0.12.0-alpha.0"
   },
   "exports": {
     ".": {

package/types/version.d.ts

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