bobe 0.0.47 → 0.0.49

package/dist/index.d.ts

@@ -1,6 +1,7 @@
 import { Queue } from 'bobe-shared';
-import { Store, Scope, Signal, Computed, Effect, SignalNode } from 'aoye';
-export * from 'aoye';
+import * as aoye from 'aoye';
+import { Store, Keys, Effect, effect as effect$1, Scope, Signal, Computed, SignalNode, ValueDiff, CustomEffectOpt } from 'aoye';
+export { Store } from 'aoye';
 
 declare class Interpreter {
     private tokenizer;
@@ -26,7 +27,7 @@ declare class Interpreter {
     /**
      * 声明部分：
      * 包含首行定义和（可选的）多行属性扩展
-     * <declaration> ::= <tagName=token> <headerLine> <extensionLines>
+     * <declaration> ::= <tagName=token> <headerLineAndExtensions>
      *  */
     declaration(ctx: ProgramCtx): any;
     createContextNode(): ContextNode;
@@ -48,22 +49,25 @@ declare class Interpreter {
      *  */
     onePropParsed(data: Store, node: any, key: string, value: any, valueIsMapKey: boolean, isFn: boolean, hookI?: number): void;
     oneRealPropParsed: Interpreter['onePropParsed'];
-    componentOrFragmentDeclaration(ComponentOrRender: BobeUI | typeof Store, ctx: ProgramCtx): ComponentNode$1;
+    componentOrFragmentDeclaration(ComponentOrRender: UI | typeof Store | InlineFragment, ctx: ProgramCtx): ComponentNode$1;
     getFn(data: any, expression: string | number): any;
     getAssignFn(data: any, expression: string | number): any;
     condDeclaration(ctx: ProgramCtx): IfNode;
     removeLogicNode(node: LogicNode): void;
     /**
-     * <extensionLines> ::= PIPE <attributeList> NEWLINE <extensionLines>
-     *                    | ε
+     * 首行属性 + 可选的 pipe 扩展行
+     * <headerLineAndExtensions> ::= <attributeList> NEWLINE (PIPE <attributeList> NEWLINE)*
      */
-    extensionLines(_node: any): void;
+    headerLineAndExtensions(_node: any): void;
     /**
-     * 首行：
-     * 节点名称 + 属性列表 + 换行
-     * <headerLine> ::= <attributeList> NEWLINE
+     * 1. 快照
+     * 2. 跳过 行内模板片段
+     * 3. 准备
+     *    1. tokenizer
+     *    2. 快照
+     *    3. 使用 CtxProvider 中 数据作为 data
      */
-    headerLine(_node: any): void;
+    inlineFragment(_node: any, snapshot: Partial<Tokenizer>, data: any, key?: string): void;
     /**
      * 属性列表：
      * 可以是空的，或者包含多个属性
@@ -74,7 +78,7 @@ declare class Interpreter {
      * 1. 普通节点 执行 setProps 🪝
      * 2. 组件节点 收集映射关系，或 产生 computed
      */
-    attributeList(_node: any): void;
+    attributeList(_node: any, data: any): string;
     config(opt: TerpConf): void;
     createNode(name: string): {
         name: string;
@@ -92,6 +96,16 @@ declare class Interpreter {
     remove(node: any, parent?: any, prev?: any): void;
     defaultRemove(node: any, parent: any, prevSibling: any): void;
     setProp(node: any, key: string, value: any, hookI?: number): void | undefined | (() => void);
+    Effect: typeof Effect;
+    effect: typeof effect$1;
+}
+declare class InlineFragment {
+    snapshot: Partial<Tokenizer>;
+    data: any;
+    key: string;
+    tokenizer: Tokenizer;
+    [Keys.ProxyFreeObject]: boolean;
+    constructor(snapshot: Partial<Tokenizer>, data: any, key: string, tokenizer: Tokenizer);
 }
 
 interface StackNode<T> {
@@ -179,7 +193,9 @@ type HookProps = {
     /** 父节点 */
     parentNode?: any;
 };
-type TerpConf = Partial<Pick<Interpreter, 'createNode' | 'setProp' | 'insertAfter' | 'remove' | 'createAnchor' | 'firstChild' | 'nextSib'>>;
+type TerpConf = Partial<Pick<Interpreter, 'createNode' | 'setProp' | 'insertAfter' | 'remove' | 'createAnchor' | 'firstChild' | 'nextSib'>> & {
+    noopEffect?: boolean;
+};
 type CustomRenderConf = Pick<TerpConf, 'createNode' | 'setProp' | 'insertAfter' | 'remove' | 'createAnchor' | 'firstChild' | 'nextSib'>;
 type Hook = (props: HookProps) => any;
 type HookType = 'dynamic' | 'static';
@@ -221,9 +237,9 @@ type ProgramCtx = {
     before: any;
 };
 /** 返回值是用户自定义的节点 */
-type BobeUI = {
+type UI<T = any> = {
     /** 在哪个 Store 声明的 */
-    boundStore: Store;
+    boundStore: T;
     (isSub: boolean): Tokenizer;
 };
 type LogicNode = {
@@ -272,7 +288,12 @@ type FragmentNode$1 = LogicNode & {
 };
 type ComponentNode$1 = LogicNode & {
     tokenizer: Tokenizer;
+    /** 模版片段快照 */
+    fragmentSnapshot?: ReturnType<Tokenizer['snapshot']>;
+    /** 渲染模版片段前的 快照，渲染完成后用于恢复 */
+    resumeSnapshot?: ReturnType<Tokenizer['snapshot']>;
 };
+type Dep = Signal | Computed | (() => any) | string;
 
 declare class Tokenizer {
     private hook;
@@ -314,19 +335,22 @@ declare class Tokenizer {
     /** 当前文件路径 */
     source: string;
     constructor(hook: Hook, useDedentAsEof: boolean);
+    initIndentWhenUseDedentAsEof(): void;
     private next;
     getCurrentPos(): Position;
     /** 构造从当前扫描起始位置到模板结尾的 SourceLocation，用于未闭合错误 */
     private unclosedLoc;
     private throwUnclosed;
-    resume(_snapshot: ReturnType<Tokenizer['snapshot']>): void;
-    snapshot(keys?: (keyof Tokenizer)[]): Partial<Tokenizer>;
-    skip(): string;
+    resume({ dentStack, waitingTokens, ..._snapshot }: ReturnType<Tokenizer['snapshot']>): void;
+    snapshot(keys?: (keyof Tokenizer)[], dtI?: number): Partial<Tokenizer>;
+    skip(targetDentLen?: number): string;
     setCode(code: string): void;
     tokenize(): void;
     isEof(): boolean;
     private setToken;
     nextToken(): Token;
+    locStart(): void;
+    locEnd(): void;
     getComment(): string;
     /**
      * 处理处于行末尾的 comment 例如：
@@ -356,7 +380,7 @@ declare class Tokenizer {
     private dent;
     private shorterThanBaseDentEof;
     private identifier;
-    private getStr;
+    getStr(head: string, parseEscape?: boolean): string;
     private str;
     private number;
     private eof;
@@ -422,7 +446,7 @@ interface Property extends BaseNode {
 type PropertyValue = StaticValue | DynamicValue;
 interface StaticValue extends BaseNode {
     type: NodeType.StaticValue;
-    value: string | number | boolean;
+    value: string | number | boolean | TemplateNode[];
 }
 interface PropertyKeyNode extends BaseNode {
     type: NodeType.PropertyKey;
@@ -497,6 +521,8 @@ declare class Compiler {
      */
     private attributeList;
     parseProperty(node?: Property): Property;
+    handleOnlyKeyLoc(node: Property): void;
+    handleKeyValueLoc(node: Property): void;
     /**
      * 根据值类型创建属性 key 节点
      */
@@ -509,6 +535,7 @@ declare class Compiler {
      * 根据值类型创建属性值节点
      */
     parsePropertyValue(node?: PropertyValue): PropertyValue;
+    parsePropertyInlineFragment(node?: PropertyValue): PropertyValue;
     /**
      * 根据值类型创建名称
      */
@@ -526,7 +553,7 @@ type ParseHooks = Partial<{
     };
 }>;
 
-declare function bobe(fragments: TemplateStringsArray, ...values: any[]): BobeUI;
+declare function bobe<T extends Record<any, any> = any>(fragments: TemplateStringsArray, ...values: any[]): UI<T>;
 declare function customRender(option: CustomRenderConf): <T>(Ctor: typeof Store, root: any) => (ComponentNode$1 | Store)[];
 
 type IContext = {
@@ -535,5 +562,7 @@ type IContext = {
 };
 declare const context: IContext;
 
-export { Compiler, NodeType, ParseErrorCode, ParseSyntaxError, Tokenizer, bobe, context, customRender };
+declare const effect: (callback: (...args: ValueDiff[]) => void, depOrOpt?: Dep[] | Dep | CustomEffectOpt, opt?: CustomEffectOpt) => aoye.Effect;
+
+export { Compiler, NodeType, ParseErrorCode, ParseSyntaxError, Tokenizer, bobe, context, customRender, effect };
 export type { ASTNodeType, BaseNode, CommentNode, ComponentNode, ConditionalNode, DynamicValue, ElementNode, FragmentNode, IContext, InterpolationNode, LoopNode, ParseError, Program, Property, PropertyKeyNode, PropertyValue, SourceLocation, StaticValue, TemplateNode, TextNode };