@vtj/core 0.17.8 → 0.18.0

package/dist/index.mjs

@@ -1,12 +1,12 @@
-import { uid as m, timestamp as G, isString as N, uuid as R, cloneDeep as T, upperFirstCamelCase as D, delay as O, merge as I, toArray as j, mitt as F } from "@vtj/base";
+import { uid as m, timestamp as G, isString as N, uuid as R, cloneDeep as T, upperFirstCamelCase as k, delay as O, merge as I, toArray as j, mitt as F } from "@vtj/base";
 /**!
  * Copyright (c) 2026, VTJ.PRO All rights reserved.
  * @name @vtj/core 
  * @author CHC chenhuachun1549@dingtalk.com 
- * @version 0.17.8
+ * @version 0.18.0
  * @license <a href="https://vtj.pro/license.html">MIT License</a>
  */
-const z = "0.17.8", W = "BuiltIn", H = "VueMaterial", L = "VueRouterMaterial", q = [H, L], Q = {
+const z = "0.18.0", W = "BuiltIn", H = "VueMaterial", L = "VueRouterMaterial", q = [H, L], Q = {
   vue: "Vue",
   "vue-router": "VueRouter"
 }, X = {
@@ -95,8 +95,8 @@ class C {
   }
   static toDsl(e) {
     return Object.entries(e).reduce((t, [i, s]) => {
-      const { handler: a, modifiers: r } = s;
-      return t[i] = { name: i, handler: a, modifiers: r }, t;
+      const { handler: a, modifiers: o } = s;
+      return t[i] = { name: i, handler: a, modifiers: o }, t;
     }, {});
   }
   static parse(e = {}) {
@@ -106,7 +106,7 @@ class C {
     );
   }
 }
-class v {
+class E {
   constructor(e) {
     this.schema = e, this.id = e.id || m(), this.update(e);
   }
@@ -136,22 +136,22 @@ class v {
   iterator;
   update(e) {
     Object.assign(this.schema, e);
-    const { name: t, arg: i, modifiers: s, value: a, iterator: r } = this.schema;
-    this.name = t, this.arg = i, this.modifiers = s, this.value = a, this.iterator = r;
+    const { name: t, arg: i, modifiers: s, value: a, iterator: o } = this.schema;
+    this.name = t, this.arg = i, this.modifiers = s, this.value = a, this.iterator = o;
   }
   static parse(e = []) {
-    return e.map((t) => new v(t));
+    return e.map((t) => new E(t));
   }
   static toDsl(e = []) {
     return e.map((t) => {
-      const { name: i, arg: s, modifiers: a, value: r, iterator: o, id: h } = t;
+      const { name: i, arg: s, modifiers: a, value: o, iterator: r, id: h } = t;
       return {
         id: h,
         name: i,
         arg: s,
         modifiers: a,
-        value: r,
-        iterator: o
+        value: o,
+        iterator: r
       };
     });
   }
@@ -225,12 +225,12 @@ class _ {
       invisible: i = !1,
       locked: s = !1,
       children: a = [],
-      slot: r,
-      props: o = {},
+      slot: o,
+      props: r = {},
       events: h = {},
       directives: p = []
     } = e;
-    this.invisible = i, this.locked = s, this.setChildren(a, !0), this.setSlot(r, !0), this.props = A.parse(o), this.events = C.parse(h), this.directives = v.parse(p), t || n.emit(c, this);
+    this.invisible = i, this.locked = s, this.setChildren(a, !0), this.setSlot(o, !0), this.props = A.parse(r), this.events = C.parse(h), this.directives = E.parse(p), t || n.emit(c, this);
   }
   /**
    * 设置子节点
@@ -300,7 +300,7 @@ class _ {
    * @param silent
    */
   setDirective(e, t = !1) {
-    const i = e instanceof v ? e : new v(e), s = this.directives.findIndex((a) => a.id === e.id);
+    const i = e instanceof E ? e : new E(e), s = this.directives.findIndex((a) => a.id === e.id);
     s >= 0 ? this.directives.splice(s, 1, i) : this.directives.push(i), t || n.emit(c, this);
   }
   /**
@@ -323,7 +323,7 @@ class _ {
   removeChild(e, t = !1) {
     const { children: i, disposed: s } = this;
     if (s || !Array.isArray(i)) return;
-    const a = i.findIndex((r) => r === e);
+    const a = i.findIndex((o) => o === e);
     e.parent = null, i.splice(a, 1), t || n.emit(c, this);
   }
   /**
@@ -395,22 +395,22 @@ class _ {
       from: i,
       invisible: s,
       locked: a,
-      slot: r,
-      children: o,
+      slot: o,
+      children: r,
       props: h,
       directives: p,
       events: P
-    } = this, E = Array.isArray(o) ? o.map((U) => U.toDsl()) : o;
+    } = this, v = Array.isArray(r) ? r.map((U) => U.toDsl()) : r;
     return {
       id: e,
       name: t,
       from: i,
       invisible: s,
       locked: a,
-      slot: r,
-      children: E,
+      slot: o,
+      children: v,
       props: A.toDsl(h),
-      directives: v.toDsl(p),
+      directives: E.toDsl(p),
       events: C.toDsl(P)
     };
   }
@@ -457,17 +457,23 @@ class _ {
     return Array.isArray(this.children) ? this.children.findIndex((t) => t === e || t.id === e.id) : -1;
   }
 }
-const l = "EVENT_BLOCK_CHANGE";
+const d = "EVENT_BLOCK_CHANGE";
 class u {
   __VTJ_BLOCK__ = !0;
   id;
   name = "";
+  apiMode = "options";
   inject = [];
   state = {};
+  refs = {};
+  reactives = {};
   lifeCycles = {};
   methods = {};
   computed = {};
   watch = [];
+  composables = [];
+  setup = void 0;
+  provide = {};
   css = "";
   props = [];
   emits = [];
@@ -480,12 +486,18 @@ class u {
   static normalAttrs = [
     "name",
     "locked",
+    "apiMode",
     "inject",
     "state",
+    "refs",
+    "reactives",
     "lifeCycles",
     "methods",
     "computed",
     "watch",
+    "composables",
+    "setup",
+    "provide",
     "css",
     "props",
     "emits",
@@ -501,10 +513,10 @@ class u {
   update(e, t = !1) {
     for (const s of u.normalAttrs) {
       const a = e[s];
-      a !== void 0 && (this[s] = a);
+      (a !== void 0 || s === "setup") && (this[s] = a);
     }
     const { nodes: i = [] } = e;
-    i.length ? this.nodes = i.map((s) => new _(s)) : this.nodes = [], t || n.emit(l, this);
+    i.length ? this.nodes = i.map((s) => new _(s)) : this.nodes = [], t || n.emit(d, this);
   }
   /**
    * 获取DSL
@@ -514,13 +526,13 @@ class u {
     const { __VTJ_BLOCK__: t, id: i, nodes: s } = this;
     return {
       ...u.normalAttrs.reduce(
-        (r, o) => (r[o] = this[o], r),
+        (o, r) => (o[r] = this[r], o),
         {}
       ),
       __VTJ_BLOCK__: t,
       __VERSION__: e || G().toString(),
       id: i,
-      nodes: s.map((r) => r.toDsl())
+      nodes: s.map((o) => o.toDsl())
     };
   }
   /**
@@ -529,6 +541,9 @@ class u {
   dispose() {
     this.nodes.map((e) => e.dispose(!0)), this.nodes = [], this.disposed = !0;
   }
+  isExistName(e) {
+    return e in this.refs || e in this.reactives || e in this.computed || e in this.methods;
+  }
   /**
    * 设置通用函数属性
    * @param type
@@ -537,7 +552,7 @@ class u {
    * @param silent
    */
   setFunction(e, t, i, s = !1) {
-    this[e][t] = i, s || n.emit(l, this);
+    this[e][t] = i, s || n.emit(d, this);
   }
   /**
    * 删除通用函数属性
@@ -546,7 +561,10 @@ class u {
    * @param silent
    */
   removeFunction(e, t, i = !1) {
-    delete this[e][t], i || n.emit(l, this);
+    delete this[e][t], i || n.emit(d, this);
+  }
+  setComputed(e, t, i = !1) {
+    t ? this.computed[e] = t : delete this.computed[e], i || n.emit(d, this);
   }
   /**
    * 设置状态
@@ -555,7 +573,7 @@ class u {
    * @param silent
    */
   setState(e, t, i = !1) {
-    this.state[e] = t, i || n.emit(l, this);
+    this.state[e] = t, i || n.emit(d, this);
   }
   /**
    * 删除状态
@@ -563,7 +581,7 @@ class u {
    * @param silent
    */
   removeState(e, t = !1) {
-    delete this.state[e], t || n.emit(l, this);
+    delete this.state[e], t || n.emit(d, this);
   }
   /**
    * 更新CSS
@@ -571,7 +589,7 @@ class u {
    * @param silent
    */
   setCss(e, t = !1) {
-    this.css = e, t || n.emit(l, this);
+    this.css = e, t || n.emit(d, this);
   }
   /**
    * 新增或更新 watch
@@ -583,7 +601,7 @@ class u {
     const i = this.watch.findIndex(
       (s) => s.id && s.id === e.id || s === e
     );
-    i > -1 ? this.watch.splice(i, 1, e) : this.watch.push(e), t || n.emit(l, this);
+    i > -1 ? this.watch.splice(i, 1, e) : this.watch.push(e), t || n.emit(d, this);
   }
   /**
    * 删除 watch
@@ -594,7 +612,7 @@ class u {
     const i = this.watch.findIndex(
       (s) => s.id && s.id === e.id || s === e
     );
-    i > -1 && (this.watch.splice(i, 1), t || n.emit(l, this));
+    i > -1 && (this.watch.splice(i, 1), t || n.emit(d, this));
   }
   /**
    * 定义属性参数
@@ -605,7 +623,7 @@ class u {
     const i = this.props.findIndex(
       (s) => typeof s == "string" ? s === e.name : s.name === e.name
     );
-    i > -1 ? this.props.splice(i, 1, e) : this.props.push(e), t || n.emit(l, this);
+    i > -1 ? this.props.splice(i, 1, e) : this.props.push(e), t || n.emit(d, this);
   }
   /**
    * 删除属性
@@ -616,7 +634,7 @@ class u {
     const i = this.props.findIndex(
       (s) => typeof s == "string" ? s === e.name : s.name === e.name
     );
-    i > -1 && (this.props.splice(i, 1), t || n.emit(l, this));
+    i > -1 && (this.props.splice(i, 1), t || n.emit(d, this));
   }
   /**
    * 设置事件
@@ -627,7 +645,7 @@ class u {
     const i = N(e) ? { name: e, params: [] } : e, s = this.emits.findIndex(
       (a) => a === i.name || a.name === i.name
     );
-    s > -1 ? this.emits.splice(s, 1, i) : this.emits.push(i), t || n.emit(l, this);
+    s > -1 ? this.emits.splice(s, 1, i) : this.emits.push(i), t || n.emit(d, this);
   }
   /**
    * 删除事件
@@ -638,10 +656,10 @@ class u {
     const i = this.emits.findIndex(
       (s) => N(s) ? s === e : s.name === e
     );
-    i > -1 && (this.emits.splice(i, 1), t || n.emit(l, this));
+    i > -1 && (this.emits.splice(i, 1), t || n.emit(d, this));
   }
   setExpose(e, t = !1) {
-    this.expose = e, t || n.emit(l, this);
+    this.expose = e, t || n.emit(d, this);
   }
   /**
    * 设置插槽
@@ -652,7 +670,7 @@ class u {
     const i = N(e) ? { name: e, params: [] } : e, s = this.slots.findIndex(
       (a) => a === i.name || a.name === i.name
     );
-    s > -1 ? this.slots.splice(s, 1, i) : this.slots.push(i), t || n.emit(l, this);
+    s > -1 ? this.slots.splice(s, 1, i) : this.slots.push(i), t || n.emit(d, this);
   }
   /**
    * 删除插槽
@@ -663,7 +681,7 @@ class u {
     const i = this.slots.findIndex(
       (s) => N(s) ? s === e : s.name === e
     );
-    i > -1 && (this.slots.splice(i, 1), t || n.emit(l, this));
+    i > -1 && (this.slots.splice(i, 1), t || n.emit(d, this));
   }
   /**
    * 设置注入
@@ -672,7 +690,7 @@ class u {
    */
   setInject(e, t = !1) {
     const i = this.inject.findIndex((s) => s.name === e.name);
-    i > -1 ? this.inject.splice(i, 1, e) : this.inject.push(e), t || n.emit(l, this);
+    i > -1 ? this.inject.splice(i, 1, e) : this.inject.push(e), t || n.emit(d, this);
   }
   /**
    * 删除注入
@@ -681,7 +699,7 @@ class u {
    */
   removeInject(e, t = !1) {
     const i = this.inject.findIndex((s) => s.name === e.name);
-    i > -1 && (this.inject.splice(i, 1), t || n.emit(l, this));
+    i > -1 && (this.inject.splice(i, 1), t || n.emit(d, this));
   }
   /**
    * 设置数据源
@@ -689,7 +707,7 @@ class u {
    * @param silent
    */
   setDataSource(e, t = !1) {
-    this.dataSources[e.name] = e, t || n.emit(l, this);
+    this.dataSources[e.name] = e, t || n.emit(d, this);
   }
   /**
    * 删除数据源
@@ -697,20 +715,105 @@ class u {
    * @param silent
    */
   removeDataSource(e, t = !1) {
-    delete this.dataSources[e], t || n.emit(l, this);
+    delete this.dataSources[e], t || n.emit(d, this);
+  }
+  /**
+   * 设置 API 风格
+   * @param mode
+   * @param silent
+   */
+  setApiMode(e, t = !1) {
+    this.apiMode = e, t || n.emit(d, this);
+  }
+  /**
+   * 设置 ref 声明
+   * @param name
+   * @param value
+   * @param silent
+   */
+  setRef(e, t, i = !1) {
+    this.refs[e] = t, i || n.emit(d, this);
+  }
+  /**
+   * 删除 ref 声明
+   * @param name
+   * @param silent
+   */
+  removeRef(e, t = !1) {
+    delete this.refs[e], t || n.emit(d, this);
+  }
+  /**
+   * 设置 reactive 声明
+   * @param name
+   * @param value
+   * @param silent
+   */
+  setReactive(e, t, i = !1) {
+    this.reactives[e] = t, i || n.emit(d, this);
+  }
+  /**
+   * 删除 reactive 声明
+   * @param name
+   * @param silent
+   */
+  removeReactive(e, t = !1) {
+    delete this.reactives[e], t || n.emit(d, this);
+  }
+  /**
+   * 设置组合函数调用
+   * @param composable
+   * @param silent
+   */
+  setComposable(e, t = !1) {
+    const i = this.composables.findIndex((s) => s.name === e.name);
+    i > -1 ? this.composables.splice(i, 1, e) : this.composables.push(e), t || n.emit(d, this);
+  }
+  /**
+   * 删除组合函数调用
+   * @param name
+   * @param silent
+   */
+  removeComposable(e, t = !1) {
+    const i = this.composables.findIndex((s) => s.name === e);
+    i > -1 && (this.composables.splice(i, 1), t || n.emit(d, this));
+  }
+  /**
+   * 设置 provide
+   * @param key
+   * @param value
+   * @param silent
+   */
+  setProvide(e, t, i = !1) {
+    this.provide[e] = t, i || n.emit(d, this);
+  }
+  /**
+   * 删除 provide
+   * @param key
+   * @param silent
+   */
+  removeProvide(e, t = !1) {
+    delete this.provide[e], t || n.emit(d, this);
+  }
+  /**
+   * 设置 setup 初始化代码
+   * @param code
+   * @param silent
+   */
+  setSetup(e, t = !1) {
+    this.setup = e, t || n.emit(d, this);
   }
   insertAfter(e, t, i = !1) {
     e.parent = null;
     const s = this.nodes.indexOf(t);
-    this.nodes.splice(s + 1, 0, e), i || n.emit(l, this);
+    this.nodes.splice(s + 1, 0, e), i || n.emit(d, this);
   }
   insertBefore(e, t, i = !1) {
     e.parent = null;
     const s = this.nodes.indexOf(t);
-    this.nodes.splice(s, 0, e), i || n.emit(l, this);
+    this.nodes.splice(s, 0, e), i || n.emit(d, this);
   }
   appendNode(e, t = !1) {
-    e.parent = null, this.nodes.push(e), t || n.emit(l, this);
+    e.parent = null, this.nodes.push(e), t || n.emit(d, this);
   }
   /**
    * 添加节点
@@ -724,7 +827,7 @@ class u {
   }
   __removeNode(e, t = !1) {
     const i = this.nodes.findIndex((s) => s.id === e.id);
-    i > -1 && (this.nodes.splice(i, 1), t || n.emit(l, this));
+    i > -1 && (this.nodes.splice(i, 1), t || n.emit(d, this));
   }
   /**
    * 删除节点
@@ -754,7 +857,7 @@ class u {
       e.movePrev(t);
     else {
       const i = this.nodes, s = i.indexOf(e);
-      s > 0 && (i.splice(s, 1), i.splice(s - 1, 0, e), t || n.emit(l, this));
+      s > 0 && (i.splice(s, 1), i.splice(s - 1, 0, e), t || n.emit(d, this));
     }
   }
   /**
@@ -767,7 +870,7 @@ class u {
       e.moveNext(t);
     else {
       const i = this.nodes, s = i.indexOf(e);
-      s > -1 && s < i.length - 1 && (i.splice(s, 1), i.splice(s + 1, 0, e), t || n.emit(l, this));
+      s > -1 && s < i.length - 1 && (i.splice(s, 1), i.splice(s + 1, 0, e), t || n.emit(d, this));
     }
   }
   /**
@@ -784,13 +887,13 @@ class u {
     this.locked = !0;
     for (const t of this.nodes)
       t.lock(!0);
-    e || n.emit(l, this);
+    e || n.emit(d, this);
   }
   unlock(e = !1) {
     this.locked = !1;
     for (const t of this.nodes)
       t.unlock(!0);
-    e || n.emit(l, this);
+    e || n.emit(d, this);
   }
   isChild(e) {
     let t = !1;
@@ -803,8 +906,8 @@ class u {
     return t;
   }
 }
-const d = "EVENT_PROJECT_CHANGE", b = "EVENT_PROJECT_ACTIVED", B = "EVENT_PROJECT_DEPS_CHANGE", g = "EVENT_PROJECT_PAGES_CHANGE", y = "EVENT_PROJECT_BLOCKS_CHANGE", V = "EVENT_PROJECT_APIS_CHANGE", w = "EVENT_PROJECT_META_CHANGE", $ = "EVENT_PROJECT_PUBLISH", M = "EVENT_PROJECT_FILE_PUBLISH", K = "EVENT_PROJECT_GEN_SOURCE";
-class k {
+const l = "EVENT_PROJECT_CHANGE", D = "EVENT_PROJECT_ACTIVED", B = "EVENT_PROJECT_DEPS_CHANGE", g = "EVENT_PROJECT_PAGES_CHANGE", y = "EVENT_PROJECT_BLOCKS_CHANGE", V = "EVENT_PROJECT_APIS_CHANGE", w = "EVENT_PROJECT_META_CHANGE", M = "EVENT_PROJECT_PUBLISH", $ = "EVENT_PROJECT_FILE_PUBLISH", K = "EVENT_PROJECT_GEN_SOURCE";
+class b {
   id = "";
   locked = "";
   platform = "web";
@@ -852,11 +955,11 @@ class k {
     this.id = t || m(), this.__UID__ = i || R(!0), this.update(e, !0);
   }
   update(e, t = !1) {
-    for (const i of k.attrs) {
+    for (const i of b.attrs) {
       const s = e[i];
       s && (this[i] = s);
     }
-    t || n.emit(d, {
+    t || n.emit(l, {
       model: this,
       type: "update",
       data: e
@@ -870,7 +973,7 @@ class k {
       delete t.dsl, t.children && t.children.length && this.cleanPagesDsl(t.children);
   }
   toDsl(e) {
-    const { id: t } = this, i = k.attrs.reduce(
+    const { id: t } = this, i = b.attrs.reduce(
       (s, a) => (s[a] = this[a], s),
       {}
     );
@@ -892,7 +995,7 @@ class k {
    * @param silent
    */
   active(e, t = !1) {
-    this.currentFile = e, t || n.emit(b, {
+    this.currentFile = e, t || n.emit(D, {
       model: this,
       type: "update",
       data: e
@@ -903,7 +1006,7 @@ class k {
    * @param silent
    */
   deactivate(e = !1) {
-    this.currentFile = null, e || n.emit(b, {
+    this.currentFile = null, e || n.emit(D, {
       model: this,
       type: "update",
       data: null
@@ -915,18 +1018,18 @@ class k {
    * @param silent
    */
   setDeps(e, t = !1) {
-    const i = this.dependencies, s = i.findIndex((r) => r.package === e.package);
+    const i = this.dependencies, s = i.findIndex((o) => o.package === e.package);
     let a;
     if (s > -1 ? (a = "update", i.splice(s, 1, {
       ...i[s],
       ...e
     })) : (a = "create", i.push(e)), !t) {
-      const r = {
+      const o = {
         model: this,
         type: a,
         data: e
       };
-      n.emit(B, r), n.emit(d, r);
+      n.emit(B, o), n.emit(l, o);
     }
   }
   /**
@@ -942,7 +1045,7 @@ class k {
         type: "delete",
         data: e
       };
-      n.emit(B, a), n.emit(d, a);
+      n.emit(B, a), n.emit(l, a);
     }
   }
   /**
@@ -956,9 +1059,9 @@ class k {
         if (a.id === i)
           return a;
         if (a.children && a.children.length) {
-          const r = t(i, a.children);
-          if (r)
-            return r;
+          const o = t(i, a.children);
+          if (o)
+            return o;
         }
       }
     };
@@ -989,7 +1092,8 @@ class k {
   async createPage(e, t, i = !1) {
     if (e.id = e.raw ? e.name : e.id || m(), e.type = "page", e.dir ? e.children = [] : e.dsl = e.dsl || new u({
       id: e.id,
-      name: D(e.name)
+      name: k(e.name),
+      apiMode: "composition"
     }).toDsl(), t) {
       const s = this.getPage(t);
       s ? s.children ? s.children.push(e) : s.children = [e] : console.warn(`not found PageFile for id: ${t} `);
@@ -1001,7 +1105,7 @@ class k {
         type: "create",
         data: e
       };
-      n.emit(g, s), n.emit(d, s);
+      n.emit(g, s), n.emit(l, s);
     }
     return !this.currentFile && !e.dir && (this.active(e, !0), await O(1e3), this.active(e, i)), e;
   }
@@ -1018,19 +1122,19 @@ class k {
         type: "update",
         data: e
       };
-      n.emit(g, s), n.emit(d, s);
+      n.emit(g, s), n.emit(l, s);
     }
     return i;
   }
   findParent(e) {
     const t = (i, s = [], a) => {
-      for (const r of s) {
-        if (r.id === i)
+      for (const o of s) {
+        if (o.id === i)
           return a;
-        if (r.children && r.children.length) {
-          const o = t(i, r.children, r);
-          if (o)
-            return o;
+        if (o.children && o.children.length) {
+          const r = t(i, o.children, o);
+          if (r)
+            return r;
         }
       }
     };
@@ -1039,16 +1143,16 @@ class k {
   movePageTo(e, t, i = !1) {
     const s = t ? this.getPage(t) : null, a = this.getPage(e);
     if (!a) return !1;
-    const r = this.findParent(e);
-    if (r ? r.children = r.children?.filter(
-      (o) => o.id !== e
-    ) : this.pages = this.pages.filter((o) => o.id !== e), s ? (s.dir || s.layout) && (s.children ? s.children.push(a) : s.children = [a]) : this.pages.push(a), !i) {
-      const o = {
+    const o = this.findParent(e);
+    if (o ? o.children = o.children?.filter(
+      (r) => r.id !== e
+    ) : this.pages = this.pages.filter((r) => r.id !== e), s ? (s.dir || s.layout) && (s.children ? s.children.push(a) : s.children = [a]) : this.pages.push(a), !i) {
+      const r = {
         model: this,
         type: "update",
         data: a
       };
-      n.emit(g, o), n.emit(d, o);
+      n.emit(g, r), n.emit(l, r);
     }
     return !0;
   }
@@ -1063,12 +1167,13 @@ class k {
    * @param silent
    */
   clonePage(e, t, i = !1) {
-    const s = m(), a = `${e.name}Copy`, r = `${e.title}_副本`, o = new u({
+    const s = m(), a = `${e.name}Copy`, o = `${e.title}_副本`, r = new u({
       id: s,
-      name: a
-    }).toDsl(), h = I({}, e, { id: s, name: a, title: r, dsl: o }), p = t ? this.getPage(t)?.children || [] : this.pages, P = p.findIndex((E) => E.id === e.id);
+      name: a,
+      apiMode: "composition"
+    }).toDsl(), h = I({}, e, { id: s, name: a, title: o, dsl: r }), p = t ? this.getPage(t)?.children || [] : this.pages, P = p.findIndex((v) => v.id === e.id);
     if (p.splice(P + 1, 0, h), !i) {
-      const E = {
+      const v = {
         model: this,
         type: "clone",
         data: {
@@ -1076,30 +1181,30 @@ class k {
           target: h
         }
       };
-      n.emit(g, E), n.emit(d, E);
+      n.emit(g, v), n.emit(l, v);
     }
   }
   async saveToBlock(e, t = !1) {
     this.active(e, t), await O(1e3);
-    const i = m(), s = e.name, a = e.title, r = new u({
+    const i = m(), s = e.name, a = e.title, o = new u({
       ...e.dsl,
       id: i,
       name: s
-    }).toDsl(), o = I({}, e, {
+    }).toDsl(), r = I({}, e, {
       id: i,
       name: s,
       title: a,
-      dsl: r,
+      dsl: o,
       type: "block",
       fromType: "Schema"
     });
-    if (this.blocks.push(o), !t) {
+    if (this.blocks.push(r), !t) {
       const h = {
         model: this,
         type: "create",
-        data: o
+        data: r
       };
-      n.emit(y, h), n.emit(d, h);
+      n.emit(y, h), n.emit(l, h);
     }
   }
   /**
@@ -1108,13 +1213,13 @@ class k {
    * @param silent
    */
   removePage(e, t = !1) {
-    const i = this.getPage(e), s = (a, r) => {
-      const o = r.findIndex((h) => h.id === a);
-      if (o >= 0) {
-        r.splice(o, 1);
+    const i = this.getPage(e), s = (a, o) => {
+      const r = o.findIndex((h) => h.id === a);
+      if (r >= 0) {
+        o.splice(r, 1);
         return;
       }
-      for (const h of r)
+      for (const h of o)
         h.children && h.children.length && s(a, h.children);
     };
     if (s(e, this.pages), e === this.homepage && (this.homepage = ""), this.currentFile?.id === e && this.deactivate(t), !t) {
@@ -1123,7 +1228,7 @@ class k {
         type: "delete",
         data: i
       };
-      n.emit(g, a), n.emit(d, a);
+      n.emit(g, a), n.emit(l, a);
     }
   }
   /**
@@ -1143,16 +1248,16 @@ class k {
    * @param silent
    */
   async createBlock(e, t = !1) {
-    const i = e.id || m(), s = D(e.name);
-    e.id = i, e.type = "block", e.fromType = e.fromType || "Schema", e.dsl = new u({ id: i, name: s }).toDsl(), this.blocks.push(e);
+    const i = e.id || m(), s = k(e.name);
+    e.id = i, e.type = "block", e.fromType = e.fromType || "Schema", e.dsl = new u({ id: i, name: s, apiMode: "composition" }).toDsl(), this.blocks.push(e);
     const a = e.fromType || "Schema";
     if (!t) {
-      const r = {
+      const o = {
         model: this,
         type: "create",
         data: e
       };
-      n.emit(y, r), n.emit(d, r);
+      n.emit(y, o), n.emit(l, o);
     }
     return !this.currentFile && a === "Schema" && (this.active(e, !0), await O(1e3), this.active(e, t)), e;
   }
@@ -1169,25 +1274,26 @@ class k {
         type: "update",
         data: e
       };
-      n.emit(y, s), n.emit(d, s);
+      n.emit(y, s), n.emit(l, s);
     }
     return i;
   }
   cloneBlock(e, t = !1) {
-    const i = m(), s = `${e.name}Copy`, a = `${e.title}_副本`, r = new u({
+    const i = m(), s = `${e.name}Copy`, a = `${e.title}_副本`, o = new u({
       id: i,
-      name: s
-    }).toDsl(), o = I({}, e, { id: i, name: s, title: a, dsl: r }), h = this.blocks.findIndex((p) => p.id === e.id);
-    if (this.blocks.splice(h + 1, 0, o), !t) {
+      name: s,
+      apiMode: "composition"
+    }).toDsl(), r = I({}, e, { id: i, name: s, title: a, dsl: o }), h = this.blocks.findIndex((p) => p.id === e.id);
+    if (this.blocks.splice(h + 1, 0, r), !t) {
       const p = {
         model: this,
         type: "clone",
         data: {
           source: e,
-          target: o
+          target: r
         }
       };
-      n.emit(y, p), n.emit(d, p);
+      n.emit(y, p), n.emit(l, p);
     }
   }
   /**
@@ -1196,14 +1302,14 @@ class k {
    * @param silent
    */
   removeBlock(e, t = !1) {
-    const i = this.getBlock(e), s = this.blocks, a = s.findIndex((r) => r.id === e);
+    const i = this.getBlock(e), s = this.blocks, a = s.findIndex((o) => o.id === e);
     if (a > -1 ? (s.splice(a, 1), this.currentFile?.id === e && this.deactivate(t)) : console.warn(`not found PageFile for id: ${e} `), !t) {
-      const r = {
+      const o = {
         model: this,
         type: "delete",
         data: i
       };
-      n.emit(y, r), n.emit(d, r);
+      n.emit(y, o), n.emit(l, o);
     }
   }
   /**
@@ -1240,7 +1346,7 @@ class k {
         type: s,
         data: e
       };
-      n.emit(V, a), n.emit(d, a);
+      n.emit(V, a), n.emit(l, a);
     }
     return i || e;
   }
@@ -1253,7 +1359,7 @@ class k {
         type: "create",
         data: e
       };
-      n.emit(V, i), n.emit(d, i);
+      n.emit(V, i), n.emit(l, i);
     }
   }
   /**
@@ -1269,7 +1375,7 @@ class k {
         type: "delete",
         data: e
       };
-      n.emit(V, s), n.emit(d, s);
+      n.emit(V, s), n.emit(l, s);
     }
   }
   existApiName(e, t = []) {
@@ -1286,7 +1392,7 @@ class k {
         type: s,
         data: e
       };
-      n.emit(w, a), n.emit(d, a);
+      n.emit(w, a), n.emit(l, a);
     }
   }
   removeMeta(e, t = !1) {
@@ -1297,7 +1403,7 @@ class k {
         type: "delete",
         data: e
       };
-      n.emit(w, s), n.emit(d, s);
+      n.emit(w, s), n.emit(l, s);
     }
   }
   existMetaCode(e, t = []) {
@@ -1310,7 +1416,7 @@ class k {
         type: "update",
         data: e
       };
-      n.emit(d, i);
+      n.emit(l, i);
     }
   }
   setConfig(e, t = !1) {
@@ -1320,7 +1426,7 @@ class k {
         type: "update",
         data: e
       };
-      n.emit(d, i);
+      n.emit(l, i);
     }
   }
   setUniConfig(e, t, i = !1) {
@@ -1330,7 +1436,7 @@ class k {
         type: "update",
         data: this.uniConfig
       };
-      n.emit(d, s);
+      n.emit(l, s);
     }
   }
   setGloblas(e, t, i = !1) {
@@ -1340,7 +1446,7 @@ class k {
         type: "update",
         data: this.globals
       };
-      n.emit(d, s);
+      n.emit(l, s);
     }
   }
   setI18n(e, t = !1) {
@@ -1350,7 +1456,7 @@ class k {
         type: "update",
         data: this.i18n
       };
-      n.emit(d, i);
+      n.emit(l, i);
     }
   }
   setEnv(e, t = !1) {
@@ -1360,7 +1466,7 @@ class k {
         type: "update",
         data: this.env
       };
-      n.emit(d, i);
+      n.emit(l, i);
     }
   }
   publish(e) {
@@ -1369,7 +1475,7 @@ class k {
       type: "publish",
       data: e || this
     };
-    e ? n.emit(M, t) : n.emit($, t);
+    e ? n.emit($, t) : n.emit(M, t);
   }
   genSource() {
     const e = {
@@ -1386,7 +1492,7 @@ class k {
       type: "update",
       data: e
     };
-    n.emit(d, t);
+    n.emit(l, t);
   }
   unlock(e) {
     if (e !== this.locked)
@@ -1397,16 +1503,16 @@ class k {
       type: "update",
       data: null
     };
-    n.emit(d, t);
+    n.emit(l, t);
   }
   getPageRoutes(e, t) {
-    const i = this.platform === "uniapp", s = e || (i ? "pages" : "page"), a = this.getPages(), r = t || "";
-    return a.map((o) => ({
-      id: o.id,
-      path: `${r}/${s}/${o.id}`,
-      name: o.name,
-      title: o.title,
-      meta: o.meta
+    const i = this.platform === "uniapp", s = e || (i ? "pages" : "page"), a = this.getPages(), o = t || "";
+    return a.map((r) => ({
+      id: r.id,
+      path: `${o}/${s}/${r.id}`,
+      name: r.name,
+      title: r.title,
+      meta: r.meta
     }));
   }
 }
@@ -1453,13 +1559,13 @@ class se {
       dsl: T(e)
     };
     this.items.unshift(a);
-    const r = this.items.filter((o) => !o.remark);
-    if (r.length > s) {
-      const o = r.splice(s).map((h) => h.id);
-      this.items = this.items.filter((h) => !o.includes(h.id)), i || n.emit(x, {
+    const o = this.items.filter((r) => !r.remark);
+    if (o.length > s) {
+      const r = o.splice(s).map((h) => h.id);
+      this.items = this.items.filter((h) => !r.includes(h.id)), i || n.emit(x, {
         model: this,
         type: "delete",
-        data: o
+        data: r
       });
     }
     this.index = -1, i || n.emit(x, {
@@ -1490,7 +1596,7 @@ class se {
   remove(e, t = !1) {
     const i = j(e);
     for (const s of i) {
-      const a = this.items.findIndex((r) => r.id === s);
+      const a = this.items.findIndex((o) => o.id === s);
       a > -1 ? (this.items.splice(a, 1), a === this.index ? this.index = -1 : this.index >= this.items.length && (this.index = this.items.length - 1)) : console.warn(`not found HistoryItem for id: ${e} `);
     }
     t || n.emit(x, {
@@ -1546,14 +1652,14 @@ function ne(f) {
 function ae(f) {
   return f instanceof _;
 }
-function re(f) {
+function oe(f) {
   return !!f.__VTJ_BLOCK__;
 }
 function J(f) {
   const e = T(f);
   return delete e.id, Array.isArray(e.children) && (e.children = e.children.map((t) => J(t))), e;
 }
-function oe(f) {
+function re(f) {
   const e = f.fromType || "Schema";
   return e === "Schema" ? {
     type: "Schema",
@@ -1577,33 +1683,33 @@ export {
   L as BUILT_IN_VUE_ROUTER,
   ie as Base,
   u as BlockModel,
-  v as DirectiveModel,
-  l as EVENT_BLOCK_CHANGE,
+  E as DirectiveModel,
+  d as EVENT_BLOCK_CHANGE,
   x as EVENT_HISTORY_CHANGE,
   S as EVENT_HISTORY_LOAD,
   c as EVENT_NODE_CHANGE,
-  b as EVENT_PROJECT_ACTIVED,
+  D as EVENT_PROJECT_ACTIVED,
   V as EVENT_PROJECT_APIS_CHANGE,
   y as EVENT_PROJECT_BLOCKS_CHANGE,
-  d as EVENT_PROJECT_CHANGE,
+  l as EVENT_PROJECT_CHANGE,
   B as EVENT_PROJECT_DEPS_CHANGE,
-  M as EVENT_PROJECT_FILE_PUBLISH,
+  $ as EVENT_PROJECT_FILE_PUBLISH,
   K as EVENT_PROJECT_GEN_SOURCE,
   w as EVENT_PROJECT_META_CHANGE,
   g as EVENT_PROJECT_PAGES_CHANGE,
-  $ as EVENT_PROJECT_PUBLISH,
+  M as EVENT_PROJECT_PUBLISH,
   C as EventModel,
   se as HistoryModel,
   ee as I18N_LOCALES,
   _ as NodeModel,
-  k as ProjectModel,
+  b as ProjectModel,
   A as PropModel,
   te as Service,
   z as VTJ_CORE_VERSION,
   J as cloneDsl,
-  oe as createNodeFrom,
+  re as createNodeFrom,
   n as emitter,
   ne as isBlock,
-  re as isBlockSchema,
+  oe as isBlockSchema,
   ae as isNode
 };