bobe 0.0.57 → 0.0.59

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();
@@ -1477,6 +1477,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 +1491,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 +1500,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 +1518,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 +1553,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 +1576,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 +1636,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);
@@ -1658,7 +1670,7 @@ class Interpreter {
       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
@@ -1694,11 +1706,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.tokenizer.useDedentAsEof = false;
           this.program(node.realParent, node.owner, node.realBefore, node);
+        } else {
+          this.tokenizer.useDedentAsEof = true;
+          this.tokenizer.initIndentWhenUseDedentAsEof();
         }
       } else {
         node.__logicType = FakeType.DynamicText;
@@ -1707,7 +1721,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 +1733,7 @@ class Interpreter {
               prevSibling = _this$ctx2.prevSibling;
             this.handleInsert(realParent, textNode, prevSibling);
           }
+          this.leaveNode?.(textNode, false);
         }
       }
       isUpdate = true;
@@ -1749,7 +1764,7 @@ class Interpreter {
       realBefore: null,
       realAfter: null
     };
-    node.realAfter = this.insertAfterAnchor('context-after');
+    node.realAfter = this.insertAnchor('context-after');
     return node;
   }
   formatForCollection(collection) {
@@ -1847,7 +1862,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 +1885,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 +2053,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,7 +2222,7 @@ class Interpreter {
       resumeSnapshot
     };
     this.onePropParsed = onePropParsed;
-    node.realAfter = this.insertAfterAnchor('component-after');
+    node.realAfter = this.insertAnchor('component-after');
     return node;
   }
   getFn(data, expression) {
@@ -2302,7 +2317,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
     }) => {
@@ -2386,7 +2401,51 @@ class Interpreter {
           hookI = _this$tokenizer$_hook4[2];
         const rawVal = data[aoye.Keys.Raw][value];
         const isFn = typeof rawVal === 'function';
-        if (key === 'ref') {
+        if (key === 'props') {
+          let prevKeys = new Set();
+          const savedDefaults = new Map();
+          new this.Effect(() => {
+            const props = isFn ? rawVal : Reflect.has(data[aoye.Keys.Raw], value) ? data[value] : this.getFn(data, value)();
+            const isComponent = _node.__logicType & TokenizerSwitcherBit;
+            const rawTarget = isComponent ? _node.data[aoye.Keys.Raw] : null;
+            const cleanupKeys = keysToClean => {
+              for (const k of keysToClean) {
+                if (k.startsWith('on')) continue;
+                if (isComponent) {
+                  _node.data[k] = savedDefaults.has(k) ? savedDefaults.get(k) : undefined;
+                } else {
+                  this.setProp(_node, k, undefined, hookI);
+                }
+              }
+            };
+            if (!props || typeof props !== 'object') {
+              cleanupKeys(prevKeys);
+              prevKeys.clear();
+              return;
+            }
+            props[aoye.Keys.Iterator];
+            const raw = props[aoye.Keys.Raw] || props;
+            const keys = Object.keys(raw);
+            const newKeys = new Set();
+            for (let i = 0; i < keys.length; i++) {
+              const k = keys[i];
+              newKeys.add(k);
+              prevKeys.delete(k);
+              if (isComponent) {
+                const savedK = savedDefaults.has(k);
+                if (!savedK && Object.prototype.hasOwnProperty.call(rawTarget, k)) {
+                  savedDefaults.set(k, rawTarget[k]);
+                }
+                const val = props[k];
+                _node.data[k] = val === undefined && savedK ? savedDefaults.get(k) : val;
+              } else {
+                this.onePropParsed(props, _node, k, k, true, false, hookI);
+              }
+            }
+            cleanupKeys(prevKeys);
+            prevKeys = newKeys;
+          }, aoye.ScheduleType.Render);
+        } else if (key === 'ref') {
           const valueIsMapKey = Reflect.has(data[aoye.Keys.Raw], value);
           let refValue = _node;
           if (_node.__logicType & TokenizerSwitcherBit) {
@@ -2443,10 +2502,11 @@ class Interpreter {
   firstChild(node) {
     return node.firstChild;
   }
-  createAnchor(name) {
+  createAnchor(name, isBefore) {
     return {
       name,
-      nextSibling: null
+      nextSibling: null,
+      isBefore
     };
   }
   insertAfter(parent, node, prev) {
@@ -2532,6 +2592,7 @@ function customRender(option) {
       tokenizer
     };
     terp.program(root, componentNode);
+    option.onBeforeFlush?.();
     aoye.flushMicroEffectManual();
     return [componentNode, store];
   };