@neeloong/form 0.10.0 → 0.11.0

package/README.md

@@ -144,8 +144,7 @@ render(store, layouts, app);
 
 #### **2.2 变量优先级**
 变量优先级从高到低：  
-1. **显式变量（`+var`）**  
-2. **别名（`*alias`）**  
+1. **显式变量（`+var`）与别名（`*alias`）**  
 3. **计算值（`*computed`）**  
 4. **字段变量（`field$value`）**  
 5. **全局变量（通过 `render` 的 `global` 参数传入）**  
@@ -286,8 +285,7 @@ render(store, layouts, app);
 1. 条件: `!if` `!else`
 1. 子属性: `!value`
 1. 枚举: `!enum`
-1. 别名与计算名: `*别名` `*计算名`
-1. 显式变量: `+变量`
+1. 别名、计算名与显式变量: `*别名` `*计算名` `+变量`
 1. 片段与模板调用: `!fragment` 
 1. 属性与事件: `:绑定属性` `@事件` `普通属性` `!bind`
 1. 子内容: `!text` `!html`

package/index.d.mts

@@ -1,5 +1,5 @@
 /*!
-* @neeloong/form v0.10.0
+* @neeloong/form v0.11.0
 * (c) 2024-2025 Fierflame
 * @license Apache-2.0
 */
@@ -11,17 +11,9 @@ export { Signal } from 'signal-polyfill';
  * 解析模板内容
  * @param {string} source 输入源字符串
  * @param {Layout.Options} [options] 解析选项
- * @returns {(Layout.Node | string)[]}
+ * @returns {Layout.Child[]}
  */
-declare function parse(source: string, { createCalc, createInit, createEvent, simpleTag, enableHTML, }?: Options): (Node | string)[];
-
-/**
- * 将模板转为字符串
- * @param {Layout.Node | (Layout.Node |string)[]} value 要转换的节点或节点数组
- * @param {boolean} [formable] 是否对代码进行格式化
- * @returns {string}
- */
-declare function stringify(value: Node | (Node | string)[], formable?: boolean): string;
+declare function parse(source: string, { createCalc, createInit, createEvent, simpleTag, enableHTML, }?: Options): Child[];
 
 /**
  * 增强信息
@@ -73,6 +65,12 @@ type Options = {
  * 布局节点
  */
 type Node = {
+    /**
+     * 局部变量/别名/计算名
+     */
+    vars?: Variable<unknown>[] | null | undefined;
+    templates?: Record<string, Template> | undefined;
+    type?: null | undefined;
     /**
      * 标签名
      */
@@ -83,10 +81,6 @@ type Node = {
      * 属性
      */
     attrs: Record<string, Node.Name | Node.Calc | Node.Value>;
-    /**
-     * 模板参数定义
-     */
-    params: Record<string, Node.Name | Node.Calc | Node.Value>;
     /**
      * 类名
      */
@@ -99,54 +93,14 @@ type Node = {
      * 事件
      */
     events: Record<string, Node.Name | Node.Event>;
-    /**
-     * 局部变量
-     */
-    vars: Record<string, Node.Name | Node.Calc | Node.Value>;
-    /**
-     * 别名/计算名
-     */
-    aliases: Record<string, Node.Name | Node.Calc | Node.Value>;
     /**
      * 增强
      */
     enhancements: Record<string, Enhancement$1>;
-    /**
-     * 模板定义的名称
-     */
-    template?: string | undefined;
-    /**
-     * 是否为片段或模板调用
-     */
-    fragment?: string | boolean | undefined;
-    /**
-     * 分歧条件
-     */
-    if?: Node.Name | Node.Calc | Node.Value<any> | undefined;
-    /**
-     * 否定
-     */
-    else?: boolean | undefined;
-    /**
-     * 值关联
-     */
-    value?: string | undefined;
-    /**
-     * 列表属性枚举
-     */
-    enum?: Node.Name | Node.Calc | Node.Value<any> | undefined;
     /**
      * 绑定内容
      */
     bind?: string | boolean | undefined;
-    /**
-     * 文本渲染
-     */
-    text?: Node.Name | Node.Calc | Node.Value<any> | undefined;
-    /**
-     * HTML 渲染
-     */
-    html?: Node.Name | Node.Calc | Node.Value<any> | undefined;
     /**
      * 注释
      */
@@ -154,7 +108,7 @@ type Node = {
     /**
      * 子元素
      */
-    children: (Node | string)[];
+    children: Child[];
 };
 declare namespace Node {
     /**
@@ -194,6 +148,187 @@ declare namespace Node {
         event?: undefined;
     };
 }
+/**
+ * 分歧
+ */
+type Child = Divergent | Select | Enum | Content | CallTemplate | Fragment | Node | string;
+/**
+ * 变量定义
+ */
+type Variable<T = unknown> = {
+    variable: string;
+    name?: string | undefined;
+    calc?: Calc | undefined;
+    value?: T | undefined;
+    /**
+     * 是否普通变量
+     */
+    init?: boolean | undefined;
+    /**
+     * 注释
+     */
+    comment?: string | undefined;
+};
+type Template = {
+    /**
+     * 局部变量/别名/计算名
+     */
+    vars?: Variable<unknown>[] | null | undefined;
+    templates?: Record<string, Template> | undefined;
+    /**
+     * 模板参数定义
+     */
+    params: Record<string, Node.Name | Node.Calc | Node.Value>;
+    /**
+     * 子元素
+     */
+    children: Child[];
+    /**
+     * 注释
+     */
+    comment?: string | undefined;
+};
+/**
+ * 分歧项
+ */
+type DivergentChildren = {
+    /**
+     * 局部变量/别名/计算名
+     */
+    vars?: Variable<unknown>[] | null | undefined;
+    templates?: Record<string, Template> | undefined;
+    /**
+     * 子元素
+     */
+    children: Child[];
+    /**
+     * 注释
+     */
+    comment?: string | undefined;
+};
+/**
+ * 分歧
+ */
+type Divergent = {
+    /**
+     * 局部变量/别名/计算名
+     */
+    vars?: Variable<unknown>[] | null | undefined;
+    templates?: Record<string, Template> | undefined;
+    type: "divergent";
+    children: [children: DivergentChildren, condition?: Node.Name | Node.Calc | Node.Value | null][];
+    /**
+     * 注释
+     */
+    comment?: string | undefined;
+};
+/**
+ * 选值
+ */
+type Select = {
+    /**
+     * 局部变量/别名/计算名
+     */
+    vars?: Variable<unknown>[] | null | undefined;
+    templates?: Record<string, Template> | undefined;
+    type: "value";
+    name: string;
+    /**
+     * 子元素
+     */
+    children: Child[];
+    /**
+     * 注释
+     */
+    comment?: string | undefined;
+};
+/**
+ * 枚举
+ */
+type Enum = {
+    /**
+     * 局部变量/别名/计算名
+     */
+    vars?: Variable<unknown>[] | null | undefined;
+    templates?: Record<string, Template> | undefined;
+    type: "enum";
+    value: Node.Name | Node.Calc | Node.Value;
+    /**
+     * 子元素
+     */
+    children: Child[];
+    /**
+     * 注释
+     */
+    comment?: string | undefined;
+};
+/**
+ * 内容填充
+ */
+type Content = {
+    /**
+     * 局部变量/别名/计算名
+     */
+    vars?: Variable<unknown>[] | null | undefined;
+    templates?: Record<string, Template> | undefined;
+    type: "content";
+    value: Node.Name | Node.Calc | Node.Value;
+    html?: boolean | undefined;
+    /**
+     * 注释
+     */
+    comment?: string | undefined;
+};
+/**
+ * 模板调用
+ */
+type CallTemplate = {
+    /**
+     * 局部变量/别名/计算名
+     */
+    vars?: Variable<unknown>[] | null | undefined;
+    templates?: Record<string, Template> | undefined;
+    type: "template";
+    /**
+     * 模板名
+     */
+    template: string;
+    /**
+     * 属性
+     */
+    attrs: Record<string, Node.Name | Node.Calc | Node.Value>;
+    /**
+     * 绑定内容
+     */
+    bind?: string | boolean | undefined;
+    /**
+     * 子元素
+     */
+    children: Child[];
+    /**
+     * 注释
+     */
+    comment?: string | undefined;
+};
+/**
+ * 片段
+ */
+type Fragment = {
+    /**
+     * 局部变量/别名/计算名
+     */
+    vars?: Variable<unknown>[] | null | undefined;
+    templates?: Record<string, Template> | undefined;
+    type: "fragment";
+    /**
+     * 子元素
+     */
+    children: Child[];
+    /**
+     * 注释
+     */
+    comment?: string | undefined;
+};
 /**
  * 计算函数
  */
@@ -204,13 +339,22 @@ type Calc = (env: Record<string, any>) => any;
 type EventListener = ($event: any, env: Record<string, any>) => void;
 
 type index_d_Calc = Calc;
+type index_d_CallTemplate = CallTemplate;
+type index_d_Child = Child;
+type index_d_Content = Content;
+type index_d_Divergent = Divergent;
+type index_d_DivergentChildren = DivergentChildren;
+type index_d_Enum = Enum;
 type index_d_EventListener = EventListener;
+type index_d_Fragment = Fragment;
 declare const index_d_Node: typeof Node;
 type index_d_Options = Options;
+type index_d_Select = Select;
+type index_d_Template = Template;
+type index_d_Variable<T = unknown> = Variable<T>;
 declare const index_d_parse: typeof parse;
-declare const index_d_stringify: typeof stringify;
 declare namespace index_d {
-  export { type index_d_Calc as Calc, type Enhancement$1 as Enhancement, type index_d_EventListener as EventListener, index_d_Node as Node, type index_d_Options as Options, index_d_parse as parse, index_d_stringify as stringify };
+  export { type index_d_Calc as Calc, type index_d_CallTemplate as CallTemplate, type index_d_Child as Child, type index_d_Content as Content, type index_d_Divergent as Divergent, type index_d_DivergentChildren as DivergentChildren, type Enhancement$1 as Enhancement, type index_d_Enum as Enum, type index_d_EventListener as EventListener, type index_d_Fragment as Fragment, index_d_Node as Node, type index_d_Options as Options, type index_d_Select as Select, type index_d_Template as Template, type index_d_Variable as Variable, index_d_parse as parse };
 }
 
 type VerifyError = any;
@@ -913,7 +1057,7 @@ declare class Store<T = any> {
 
 /**
  * @param {Store} store 存储实例
- * @param {(Layout.Node | string)[]} layouts 布局信息
+ * @param {Layout.Child[]} layouts 布局信息
  * @param {Element} parent 渲染节点
  * @param {object} [options] 选项
  * @param {Record<string, Store | {get?(): any; set?(v: any): void; exec?(...p: any[]): any; calc?(...p: any[]): any }>} [options.global] 全局数据
@@ -922,7 +1066,7 @@ declare class Store<T = any> {
  * @param {Record<string, Enhancement>} [options.enhancements] 增强信息
  * @returns {() => void}
  */
-declare function _default(store: Store, layouts: (Node | string)[], parent: Element, { component, global, relate, enhancements }?: {
+declare function render(store: Store, layouts: Child[], parent: Element, { component, global, relate, enhancements }?: {
     global?: Record<string, Store<any> | {
         get?(): any;
         set?(v: any): void;
@@ -951,4 +1095,4 @@ declare function watch<T>(getter: () => T, callback: (value: T) => void, immedia
  */
 declare function effect(fn: () => void): () => void;
 
-export { type AsyncValidator, Component, Enhancement, index_d as Layout, type Ref, type Relatedness, Schema, Store, type Validator, type VerifyError, effect, _default as render, watch };
+export { type AsyncValidator, Component, Enhancement, index_d as Layout, type Ref, type Relatedness, Schema, Store, type Validator, type VerifyError, effect, render, watch };