bobe 0.0.58 → 0.0.60

package/dist/index.d.ts

@@ -20,7 +20,7 @@ declare class Interpreter {
     ctx: ProgramCtx;
     rootComponent: ComponentNode$1 | null;
     program(root: any, componentNode?: ComponentNode$1, before?: any, ctxProvider?: any): ComponentNode$1;
-    insertAfterAnchor(name?: string): any;
+    insertAnchor(name?: string, isBefore?: boolean): any;
     /** 处理
      *                    是逻辑                               是普通
      * 父节点       将子节点加入 directList         调用 insert 方法挨个插入子节点
@@ -97,12 +97,16 @@ declare class Interpreter {
     createNode(name: string): any;
     nextSib(node: any): any;
     firstChild(node: any): any;
-    createAnchor(name: string): any;
+    createAnchor(name: string, isBefore?: boolean): any;
     insertAfter(parent: any, node: any, prev: any): void;
     defaultInsert(parent: any, node: any, prev: any): void;
     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): any | (() => void);
+    beforeIndent?: (node: any) => boolean | void;
+    leaveNode?: (node: any, isDedent: boolean) => void;
+    beforeLogicIndent?: (node: any) => void;
+    leaveLogicNode?: (node: any, isDedent: boolean) => void;
     Effect: typeof Effect;
     effect: typeof effect$1;
 }
@@ -193,10 +197,13 @@ 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' | 'beforeIndent' | 'leaveNode' | 'leaveLogicNode' | 'beforeLogicIndent'>> & {
     noopEffect?: boolean;
 };
-type CustomRenderConf = Pick<TerpConf, 'createNode' | 'setProp' | 'insertAfter' | 'remove' | 'createAnchor' | 'firstChild' | 'nextSib'>;
+type CustomRenderConf = Pick<TerpConf, 'createNode' | 'setProp' | 'insertAfter' | 'remove' | 'createAnchor' | 'firstChild' | 'nextSib' | 'beforeIndent' | 'leaveNode' | 'leaveLogicNode' | 'beforeLogicIndent' | 'noopEffect'> & {
+    /** program() 之后、flushMicroEffectManual() 之前调用 */
+    onBeforeFlush?: () => void;
+};
 type Hook = (props: HookProps) => any;
 type HookType = 'dynamic' | 'static';
 declare enum ParseErrorCode {
@@ -588,4 +595,4 @@ declare const context: IContext;
 declare const effect: (callback: (...args: ValueDiff[]) => void, depOrOpt?: Dep[] | Dep | CustomEffectOpt, opt?: CustomEffectOpt) => aoye.Effect;
 
 export { Compiler, FakeType, 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 };
+export type { ASTNodeType, BaseNode, CommentNode, ComponentNode, ConditionalNode, DynamicValue, ElementNode, FragmentNode, IContext, InterpolationNode, LogicNode, LoopNode, ParseError, Program, Property, PropertyKeyNode, PropertyValue, SourceLocation, StaticValue, TemplateNode, TextNode };

package/dist/index.umd.js

@@ -245,7 +245,6 @@
     }
     isEof() {
       if (!this.token) return false;
-      if (this.i >= this.code.length && !this.waitingTokens.len) return true;
       return this.token.type & TokenType.Identifier && this.token.value === Tokenizer.EofId;
     }
     setToken(type, value, dt = 1) {
@@ -262,6 +261,7 @@
         if (this.isEof()) {
           return this.token;
         }
+        if (this.i >= this.code.length && !this.waitingTokens.len) return this.token;
         this.token = undefined;
         if (this.waitingTokens.len) {
           const item = this.waitingTokens.shift();
@@ -1431,6 +1431,14 @@
   }
   const isUI = fn => typeof fn === 'function' && fn.__BOBE_IS_UI;
   const isRenderAble = val => aoye.isStore(val) || isUI(val) || val instanceof InlineFragment;
+  const SAFE_HANDLER = {
+    has: () => true,
+    get: (t, k) => {
+      if (typeof k === 'symbol') return t[k];
+      return k in t ? t[k] : undefined;
+    }
+  };
+  const safe = data => new Proxy(data, SAFE_HANDLER);
 
   const KEY_INDEX = '__BOBE_KEY_INDEX';
   let _ctxStack;
@@ -1478,6 +1486,9 @@
         if (this.tokenizer.isEof()) {
           if (!ctx.prevSibling) ctx.prevSibling = before;
           this.handleInsert(root, ctx.current, ctx.prevSibling, componentNode);
+          if (ctx.current) {
+            ctx.current.__logicType ? this.leaveLogicNode?.(ctx.current, false) : this.leaveNode?.(ctx.current, false);
+          }
           break;
         }
         const token = this.tokenizer.token;
@@ -1489,6 +1500,7 @@
             prev: ctx.prevSibling
           }, !ctx.current.__logicType ? NodeSort.Real : (ctx.current.__logicType & LogicalBit ? NodeSort.Logic : 0) | (ctx.current.__logicType & TokenizerSwitcherBit ? NodeSort.TokenizerSwitcher : 0) | (ctx.current.__logicType & ContextBit ? NodeSort.Context : 0) | (ctx.current.__logicType === FakeType.Component ? NodeSort.Component : 0) | (ctx.current.__logicType & CtxProviderBit ? NodeSort.CtxProvider : 0));
           if (ctx.current.__logicType) {
+            this.beforeLogicIndent?.(ctx.current);
             if (isLogicNode) {
               aoye.setPulling(ctx.current.effect);
               if (ctx.current.__logicType & FakeType.ForItem) {
@@ -1497,6 +1509,12 @@
             }
           } else {
             if (ctx.current) {
+              if (this.beforeIndent?.(ctx.current) === false) {
+                const dentLen = this.tokenizer.dentStack[this.tokenizer.dentStack.length - 1];
+                this.tokenizer.skip(dentLen);
+                ctx.current = null;
+                continue;
+              }
               ctx.realParent = ctx.current;
             }
             ctx.prevSibling = null;
@@ -1509,6 +1527,7 @@
             ctx.prevSibling = before;
           }
           this.handleInsert(ctx.realParent, ctx.current, ctx.prevSibling);
+          ctx.current.__logicType ? this.leaveLogicNode?.(ctx.current, false) : this.leaveNode?.(ctx.current, false);
         }
         if (this.tokenizer.token.type & TokenType.Dedent) {
           this.tokenizer.nextToken();
@@ -1543,6 +1562,7 @@
               const i = forNode.i,
                 arr = forNode.arr,
                 snapshot = forNode.snapshot;
+              this.leaveLogicNode?.(parent, false);
               if (i + 1 < arr.length) {
                 this.tokenizer.resume(snapshot);
                 this.tokenizer.nextToken();
@@ -1565,13 +1585,13 @@
       }
       return componentNode;
     }
-    insertAfterAnchor(name = 'anchor') {
+    insertAnchor(name = 'anchor', isBefore = false) {
       const _this$ctx = this.ctx,
         realParent = _this$ctx.realParent,
         prevSibling = _this$ctx.prevSibling,
         stack = _this$ctx.stack,
         before = _this$ctx.before;
-      const afterAnchor = this.createAnchor(name);
+      const afterAnchor = this.createAnchor(name, isBefore);
       this.ctx.prevSibling = stack.length === 2 && !prevSibling ? before : prevSibling;
       this.handleInsert(realParent, afterAnchor, prevSibling);
       return afterAnchor;
@@ -1625,7 +1645,7 @@
             _node = this.componentOrFragmentDeclaration(value, ctx);
           } else {
             _node = this.createNode('text');
-            _node.text = String(value);
+            this.setProp(_node, 'text', String(value));
           }
         } else {
           return this.dynamicDeclaration(data, value, ctx);
@@ -1655,11 +1675,11 @@
         effect: null,
         textNode: null,
         owner: ctx.stack.peekByType(NodeSort.TokenizerSwitcher)?.node,
-        snapshot: this.tokenizer.snapshot(['dentStack']),
+        snapshot: this.tokenizer.snapshot(['dentStack', 'isFirstToken']),
         parentDataProvider: ctx.stack.peekByType(NodeSort.CtxProvider)?.node
       };
       let isUpdate = false;
-      node.realAfter = this.insertAfterAnchor(`dynamic-after`);
+      node.realAfter = this.insertAnchor(`dynamic-after`);
       node.effect = this.effect(({
         old,
         val
@@ -1668,7 +1688,7 @@
           oldTextNode = node.textNode;
         if (oldLogicType) {
           this.removeLogicNode(node);
-          bobeShared.pickInPlace(node, ['realParent', 'realBefore', 'realAfter',, 'owner', 'snapshot', 'parentDataProvider']);
+          bobeShared.pickInPlace(node, ['realParent', 'realBefore', 'realAfter', 'owner', 'snapshot', 'parentDataProvider']);
         }
         if (isRenderAble(val)) {
           if (oldTextNode) {
@@ -1695,11 +1715,13 @@
           this.tokenizer = node.tokenizer;
           if (node.fragmentSnapshot) {
             this.tokenizer.resume(node.fragmentSnapshot);
-            this.tokenizer.useDedentAsEof = true;
-            this.tokenizer.initIndentWhenUseDedentAsEof();
           }
           if (isUpdate) {
-            this.program(node.realParent, node.owner, node.realBefore, node);
+            this.tokenizer.useDedentAsEof = false;
+            this.program(node.realParent, node, node.realBefore);
+          } else {
+            this.tokenizer.useDedentAsEof = true;
+            this.tokenizer.initIndentWhenUseDedentAsEof();
           }
         } else {
           node.__logicType = FakeType.DynamicText;
@@ -1708,7 +1730,7 @@
           if (isNewTextNode) {
             textNode = node.textNode = this.createNode('text');
           }
-          textNode.text = String(val);
+          this.setProp(textNode, 'text', String(val));
           if (isNewTextNode) {
             if (isUpdate) {
               this.handleInsert(node.realParent, textNode, node.realBefore);
@@ -1720,6 +1742,7 @@
                 prevSibling = _this$ctx2.prevSibling;
               this.handleInsert(realParent, textNode, prevSibling);
             }
+            this.leaveNode?.(textNode, false);
           }
         }
         isUpdate = true;
@@ -1750,7 +1773,7 @@
         realBefore: null,
         realAfter: null
       };
-      node.realAfter = this.insertAfterAnchor('context-after');
+      node.realAfter = this.insertAnchor('context-after');
       return node;
     }
     formatForCollection(collection) {
@@ -1840,7 +1863,8 @@
         i: 0
       };
       if (keyExp) {
-        forNode.getKey = new Function('data', `let v;with(data){v=${keyExp}\n};return v;`);
+        const rawGetKey = new Function('data', `with(data){return (${keyExp})}`);
+        forNode.getKey = data => rawGetKey(safe(data));
       }
       window['for1'] = forNode;
       const data = this.getData();
@@ -1848,7 +1872,7 @@
       const hasArrExpKey = Reflect.has(data[aoye.Keys.Raw], arrExp);
       const arrSignal = hasArrExpKey ? (data[arrExp], cells.get(arrExp)) : new aoye.Computed(this.getFn(data, arrExp));
       forNode.arrSignal = arrSignal;
-      forNode.realAfter = this.insertAfterAnchor('for-after');
+      forNode.realAfter = this.insertAnchor('for-after');
       const _forNode$snapshot = forNode.snapshot;
         _forNode$snapshot.dentStack;
         _forNode$snapshot.isFirstToken;
@@ -1871,8 +1895,8 @@
           const len = arr.length;
           for (let i = len; i--;) {
             const item = this.createForItem(forNode, i, data);
-            item.realAfter = this.insertAfterAnchor('for-item-after');
-            item.realBefore = this.insertAfterAnchor('for-item-before');
+            item.realAfter = this.insertAnchor('for-item-after');
+            item.realBefore = this.insertAnchor('for-item-before', true);
             item.realParent = forNode.realParent;
             children[i] = item;
           }
@@ -2039,7 +2063,7 @@
       newChildren[i] = item;
       let realAfter = this.createAnchor('for-item-after');
       this.handleInsert(forNode.realParent, realAfter, before);
-      let realBefore = this.createAnchor('for-item-before');
+      let realBefore = this.createAnchor('for-item-before', true);
       this.handleInsert(forNode.realParent, realBefore, before);
       item.realBefore = realBefore;
       item.realAfter = realAfter;
@@ -2208,11 +2232,11 @@
         resumeSnapshot
       };
       this.onePropParsed = onePropParsed;
-      node.realAfter = this.insertAfterAnchor('component-after');
+      node.realAfter = this.insertAnchor('component-after');
       return node;
     }
     getFn(data, expression) {
-      return new Function('data', `let v;with(data){v=${expression}};return v;`).bind(undefined, data);
+      return new Function('data', `with(data){return (${expression})}`).bind(undefined, safe(data));
     }
     getAssignFn(data, expression) {
       const valueId = `value_bobe_${bobeShared.date32()}`;
@@ -2303,7 +2327,7 @@
           break;
       }
       ifNode.condition = signal;
-      ifNode.realAfter = this.insertAfterAnchor(`${keyWord.value}-after`);
+      ifNode.realAfter = this.insertAnchor(`${keyWord.value}-after`);
       const ef = this.effect(({
         val
       }) => {
@@ -2488,10 +2512,11 @@
     firstChild(node) {
       return node.firstChild;
     }
-    createAnchor(name) {
+    createAnchor(name, isBefore) {
       return {
         name,
-        nextSibling: null
+        nextSibling: null,
+        isBefore
       };
     }
     insertAfter(parent, node, prev) {
@@ -2561,6 +2586,7 @@
       return tokenizer;
     };
     ui.boundStore = aoye.Store.Current;
+    ui[aoye.Keys.ProxyFreeObject] = true;
     ui.__BOBE_IS_UI = true;
     return ui;
   }
@@ -2577,6 +2603,7 @@
         tokenizer
       };
       terp.program(root, componentNode);
+      option.onBeforeFlush?.();
       aoye.flushMicroEffectManual();
       return [componentNode, store];
     };