bobe 0.0.53 → 0.0.56

package/dist/bobe.esm.js

@@ -1,5 +1,5 @@
 import { Queue, isNum, matchIdStart2, matchId, escapeMap, jsVarRegexp, date32 } from 'bobe-shared';
-import { Signal, Computed, Keys, getPulling, setPulling, deepSignal, toRaw, ScheduleType, runWithPulling, Scope, Store, noopEffect, NoopEffect, Effect, effect as effect$1, shareSignal } from 'aoye';
+import { Signal, Computed, Keys, getPulling, setPulling, deepSignal, toRaw, ScheduleType, runWithPulling, Scope, Store, noopEffect, NoopEffect, Effect, effect as effect$1, shareSignal, flushMicroEffectManual } from 'aoye';
 export { Store } from 'aoye';
 
 let TokenType = function (TokenType) {
@@ -242,6 +242,7 @@ 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) {
@@ -1655,6 +1656,44 @@ class Interpreter {
     node.realAfter = this.insertAfterAnchor('context-after');
     return node;
   }
+  formatForCollection(collection) {
+    const res = {
+      arr: [],
+      keys: null
+    };
+    if (Array.isArray(collection)) {
+      res.arr = collection;
+      return res;
+    }
+    if (collection instanceof Map) {
+      res.keys = [];
+      collection.forEach((v, k) => {
+        res.arr.push(v);
+        res.keys.push(k);
+      });
+      return res;
+    }
+    if (typeof collection === 'object' && collection !== null) {
+      if (collection[Symbol.iterator]) {
+        res.arr = Array.from(collection);
+        return res;
+      }
+      res.arr = Object.values(collection);
+      res.keys = Object.keys(collection);
+      return res;
+    }
+    if (typeof collection === 'number') {
+      res.arr = Array.from({
+        length: collection
+      });
+      return res;
+    }
+    if (typeof collection === 'string') {
+      res.arr = collection.split('');
+      return res;
+    }
+    return res;
+  }
   forDeclaration() {
     const arrExp = this.tokenizer.jsExp().value;
     this.tokenizer.nextToken();
@@ -1691,6 +1730,8 @@ class Interpreter {
       realBefore: prevSibling?.realAfter || prevSibling,
       realAfter: null,
       arr: null,
+      reactiveArr: null,
+      keys: null,
       arrSignal: null,
       itemExp,
       indexName,
@@ -1717,11 +1758,17 @@ class Interpreter {
       const snapshotForUpdate = _objectWithoutProperties(_forNode$snapshot, _excluded);
     let isFirstRender = true;
     forNode.effect = new this.Effect(() => {
-      let arr = arrSignal.get();
+      const collection = arrSignal.get();
+      const _this$formatForCollec = this.formatForCollection(collection),
+        formattedArr = _this$formatForCollec.arr,
+        keys = _this$formatForCollec.keys;
+      let arr = formattedArr;
       arr[Keys.Iterator];
       const prevCtx = getPulling();
       setPulling(null);
-      forNode.arr = arr = toRaw(arr);
+      forNode.reactiveArr = formattedArr;
+      forNode.arr = Array.isArray(collection) ? toRaw(arr) : arr;
+      forNode.keys = keys;
       const children = forNode.children;
       if (isFirstRender) {
         const len = arr.length;
@@ -1759,7 +1806,7 @@ class Interpreter {
           for (let i = minLen; i--;) {
             const child = children[i];
             newChildren[i] = child;
-            this.reuseForItem(child, arr[i], itemExp, i, indexName);
+            this.reuseForItem(child, arr[i], itemExp, i, indexName, keys?.[i]);
           }
         } else {
           let s = 0,
@@ -1772,7 +1819,7 @@ class Interpreter {
             const key = forNode.getKey(itemData);
             if (old === key) {
               newChildren[s] = child;
-              this.reuseForItem(child, arr[s], itemExp, s, indexName);
+              this.reuseForItem(child, arr[s], itemExp, s, indexName, keys?.[s]);
               s++;
             } else {
               break;
@@ -1785,7 +1832,7 @@ class Interpreter {
             const key = forNode.getKey(itemData);
             if (old === key) {
               newChildren[e2] = child;
-              this.reuseForItem(child, arr[e2], itemExp, e2, indexName);
+              this.reuseForItem(child, arr[e2], itemExp, e2, indexName, keys?.[e2]);
               e1--;
               e2--;
             } else {
@@ -1827,7 +1874,7 @@ class Interpreter {
               }
               const child = children[i];
               newChildren[newI] = child;
-              this.reuseForItem(child, arr[newI], itemExp, newI, indexName);
+              this.reuseForItem(child, arr[newI], itemExp, newI, indexName, keys?.[newI]);
               new2oldI[newI - s2] = i;
               key2new.delete(key);
               if (newI < maxIncNewI) {
@@ -1913,15 +1960,15 @@ class Interpreter {
     this.remove(child.realAfter);
     child.effect.dispose();
   }
-  reuseForItem(child, data, itemExp, i, indexName) {
+  reuseForItem(child, data, itemExp, i, indexName, indexValue) {
     if (typeof itemExp === 'string') {
       child.data[itemExp] = data;
       if (indexName) {
-        child.data[indexName] = i;
+        child.data[indexName] = indexValue ?? i;
       }
     } else {
       indexName = indexName || KEY_INDEX;
-      child.data[indexName] = i;
+      child.data[indexName] = indexValue ?? i;
     }
   }
   forItemId = 0;
@@ -1955,23 +2002,24 @@ class Interpreter {
       itemExp = forNode.itemExp,
       vars = forNode.vars,
       arrSignal = forNode.arrSignal,
-      getKey = forNode.getKey;
+      getKey = forNode.getKey,
+      keys = forNode.keys;
     let indexName = forNode.indexName;
     let data;
     if (typeof itemExp === 'string') {
       data = deepSignal(indexName ? {
         [itemExp]: arr[i],
-        [indexName]: i
+        [indexName]: keys?.[i] ?? i
       } : {
         [itemExp]: arr[i]
       }, getPulling());
     } else {
       indexName = indexName ?? KEY_INDEX;
       const rawData = {
-        [indexName]: i
+        [indexName]: keys?.[i] ?? i
       };
       data = deepSignal(rawData, getPulling());
-      const computedData = new Computed(() => itemExp(arrSignal.get()[getKey ? data[indexName] : i]));
+      const computedData = new Computed(() => itemExp((arrSignal.get(), forNode.reactiveArr)[getKey ? data[indexName] : keys ? (data[indexName], i) : i]));
       const cells = data[Keys.Meta].cells;
       for (let i = 0; i < vars.length; i++) {
         const name = vars[i];
@@ -2376,6 +2424,7 @@ function customRender(option) {
       tokenizer
     };
     terp.program(root, componentNode);
+    flushMicroEffectManual();
     return [componentNode, store];
   };
 }
@@ -2419,5 +2468,5 @@ const effect = (callback, depOrOpt, opt) => {
   return effect$1(callback, newDeps, option);
 };
 
-export { Compiler, NodeType, ParseSyntaxError, Tokenizer, bobe, context, customRender, effect };
+export { Compiler, FakeType, NodeType, ParseSyntaxError, Tokenizer, bobe, context, customRender, effect };
 //# sourceMappingURL=bobe.esm.js.map