bobe 0.0.58 → 0.0.60

package/dist/bobe.cjs.js

@@ -244,7 +244,6 @@ class Tokenizer {
   }
   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) {
@@ -261,6 +260,7 @@ class Tokenizer {
       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();
@@ -1430,6 +1430,14 @@ class InlineFragment {
 }
 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;
@@ -1477,6 +1485,9 @@ class Interpreter {
       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;
@@ -1488,6 +1499,7 @@ class Interpreter {
           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) {
@@ -1496,6 +1508,12 @@ class Interpreter {
           }
         } 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;
@@ -1508,6 +1526,7 @@ class Interpreter {
           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();
@@ -1542,6 +1561,7 @@ class Interpreter {
             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();
@@ -1564,13 +1584,13 @@ class Interpreter {
     }
     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;
@@ -1624,7 +1644,7 @@ class Interpreter {
           _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);
@@ -1654,11 +1674,11 @@ class Interpreter {
       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
@@ -1667,7 +1687,7 @@ class Interpreter {
         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) {
@@ -1694,11 +1714,13 @@ class Interpreter {
         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;
@@ -1707,7 +1729,7 @@ class Interpreter {
         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);
@@ -1719,6 +1741,7 @@ class Interpreter {
               prevSibling = _this$ctx2.prevSibling;
             this.handleInsert(realParent, textNode, prevSibling);
           }
+          this.leaveNode?.(textNode, false);
         }
       }
       isUpdate = true;
@@ -1749,7 +1772,7 @@ class Interpreter {
       realBefore: null,
       realAfter: null
     };
-    node.realAfter = this.insertAfterAnchor('context-after');
+    node.realAfter = this.insertAnchor('context-after');
     return node;
   }
   formatForCollection(collection) {
@@ -1839,7 +1862,8 @@ class Interpreter {
       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();
@@ -1847,7 +1871,7 @@ class Interpreter {
     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;
@@ -1870,8 +1894,8 @@ class Interpreter {
         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;
         }
@@ -2038,7 +2062,7 @@ class Interpreter {
     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;
@@ -2207,11 +2231,11 @@ class Interpreter {
       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()}`;
@@ -2302,7 +2326,7 @@ class Interpreter {
         break;
     }
     ifNode.condition = signal;
-    ifNode.realAfter = this.insertAfterAnchor(`${keyWord.value}-after`);
+    ifNode.realAfter = this.insertAnchor(`${keyWord.value}-after`);
     const ef = this.effect(({
       val
     }) => {
@@ -2487,10 +2511,11 @@ class Interpreter {
   firstChild(node) {
     return node.firstChild;
   }
-  createAnchor(name) {
+  createAnchor(name, isBefore) {
     return {
       name,
-      nextSibling: null
+      nextSibling: null,
+      isBefore
     };
   }
   insertAfter(parent, node, prev) {
@@ -2560,6 +2585,7 @@ function bobe(fragments, ...values) {
     return tokenizer;
   };
   ui.boundStore = aoye.Store.Current;
+  ui[aoye.Keys.ProxyFreeObject] = true;
   ui.__BOBE_IS_UI = true;
   return ui;
 }
@@ -2576,6 +2602,7 @@ function customRender(option) {
       tokenizer
     };
     terp.program(root, componentNode);
+    option.onBeforeFlush?.();
     aoye.flushMicroEffectManual();
     return [componentNode, store];
   };