bobe 0.0.27 → 0.0.29

package/dist/bobe.cjs.js

@@ -196,6 +196,8 @@ function macInc(arr) {
   return candyLast;
 }
 
+const KEY_INDEX = '__BOBE_KEY_INDEX';
+
 const _excluded = ["dentStack", "isFirstToken"];
 class Interpreter {
   constructor(tokenizer) {
@@ -223,6 +225,7 @@ class Interpreter {
         prev: null
       }, (ctxProvider.__logicType & LogicalBit ? NodeSort.Logic : 0) | NodeSort.CtxProvider);
     }
+    const rootLen = stack.length;
     const ctx = this.ctx = {
       realParent: root,
       prevSibling: before,
@@ -262,7 +265,7 @@ class Interpreter {
         continue;
       }
       if (ctx.current) {
-        if (stack.length === 2 && !ctx.prevSibling) {
+        if (stack.length === rootLen && !ctx.prevSibling) {
           ctx.prevSibling = before;
         }
         this.handleInsert(ctx.realParent, ctx.current, ctx.prevSibling);
@@ -540,9 +543,9 @@ class Interpreter {
           }
           if (s > e1) {
             if (s <= e2) {
-              const lastAfter = children.at(-1)?.realAfter || forNode.realBefore;
+              const firstBefore = s > 0 ? children.at(-1)?.realAfter || forNode.realBefore : forNode.realBefore;
               for (let i = e2; i >= s; i--) {
-                this.insertForItem(forNode, i, data, newChildren, lastAfter, snapshotForUpdate);
+                this.insertForItem(forNode, i, data, newChildren, firstBefore, snapshotForUpdate);
               }
             }
           } else if (s > e2) {
@@ -665,6 +668,9 @@ class Interpreter {
       if (indexName) {
         child.data[indexName] = i;
       }
+    } else {
+      indexName = indexName || KEY_INDEX;
+      child.data[indexName] = i;
     }
   }
   forItemId = 0;
@@ -694,9 +700,10 @@ class Interpreter {
   getItemData(forNode, i, parentData) {
     const arr = forNode.arr,
       itemExp = forNode.itemExp,
-      indexName = forNode.indexName,
       vars = forNode.vars,
-      arrSignal = forNode.arrSignal;
+      arrSignal = forNode.arrSignal,
+      getKey = forNode.getKey;
+    let indexName = forNode.indexName;
     let data;
     if (typeof itemExp === 'string') {
       data = aoye.deepSignal(indexName ? {
@@ -706,13 +713,16 @@ class Interpreter {
         [itemExp]: arr[i]
       }, aoye.getPulling());
     } else {
-      data = aoye.deepSignal(indexName ? {
+      indexName = indexName ?? KEY_INDEX;
+      const rawData = {
         [indexName]: i
-      } : {}, aoye.getPulling());
-      const computedData = new aoye.Computed(() => itemExp(arrSignal.get()[i]));
+      };
+      data = aoye.deepSignal(rawData, aoye.getPulling());
+      const computedData = new aoye.Computed(() => itemExp(arrSignal.get()[getKey ? data[indexName] : i]));
       const cells = data[aoye.Keys.Meta].cells;
       for (let i = 0; i < vars.length; i++) {
         const name = vars[i];
+        rawData[name] = undefined;
         cells.set(name, new aoye.Computed(() => computedData.get()[name]));
       }
     }
@@ -722,7 +732,7 @@ class Interpreter {
   getData() {
     const _this$ctx$stack$peekB = this.ctx.stack.peekByType(NodeSort.CtxProvider),
       node = _this$ctx$stack$peekB.node;
-    return node.data || node.owner.data;
+    return node.data;
   }
   onePropParsed(data, node, key, value, valueIsMapKey, isFn, hookI) {
     if (isFn) {
@@ -810,7 +820,8 @@ class Interpreter {
       preCond: preIsCond ? prevSibling : null,
       isFirstRender: true,
       effect: null,
-      owner
+      owner,
+      data
     };
     let signal;
     switch (keyWord.value) {