bobe 0.0.61 → 0.0.62

package/dist/bobe.esm.js

@@ -1,5 +1,5 @@
-import { Queue, isNum, matchIdStart2, matchId, escapeMap, pickInPlace, jsVarRegexp, date32 } from 'bobe-shared';
-import { Signal, Computed, Keys, isStore, getPulling, setPulling, deepSignal, toRaw, ScheduleType, runWithPulling, Scope, Store, noopEffect, NoopEffect, Effect, effect as effect$1, shareSignal, flushMicroEffectManual } from 'aoye';
+import { Queue, isNum, matchIdStart2, matchId, escapeMap, pickInPlace, jsVarRegexp, date32, hasOwn } from 'bobe-shared';
+import { Signal, Computed, Keys, isStore, getPulling, setPulling, runWithPulling, getProxyHasKey, deepSignal, Scope, backupSignal, toRaw, ScheduleType, Store, noopEffect, NoopEffect, Effect, effect as effect$1, shareSignal, flushMicroEffectManual } from 'aoye';
 export { Store } from 'aoye';
 
 let TokenType = function (TokenType) {
@@ -1434,7 +1434,7 @@ const SAFE_HANDLER = {
   has: () => true,
   get: (t, k) => {
     if (typeof k === 'symbol') return t[k];
-    return k in t ? t[k] : undefined;
+    return t[k];
   }
 };
 const safe = data => new Proxy(data, SAFE_HANDLER);
@@ -1494,7 +1494,7 @@ class Interpreter {
         stack.push({
           node: ctx.current,
           prev: ctx.prevSibling
-        }, !ctx.current.__logicType ? NodeSort.Real : (isEffectNode ? NodeSort.EffectNode : 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));
+        }, !ctx.current.__logicType ? NodeSort.Real : (isEffectNode ? NodeSort.EffectNode : 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 === FakeType.Tp ? NodeSort.Real : 0) | (ctx.current.__logicType & CtxProviderBit ? NodeSort.CtxProvider : 0));
         if (ctx.current.__logicType) {
           this.beforeLogicIndent?.(ctx.current);
           if (isEffectNode) {
@@ -1503,7 +1503,9 @@ class Interpreter {
               ctx.prevSibling = ctx.current.realBefore;
             }
             if (ctx.current.__logicType & FakeType.Tp) {
-              ctx.realParent = ctx.current.tpData[Keys.Raw].node;
+              runWithPulling(() => {
+                ctx.realParent = ctx.current.tpData.node;
+              }, null);
               ctx.prevSibling = ctx.current.contentBefore;
             }
           }
@@ -1539,7 +1541,12 @@ class Interpreter {
           sort = _stack$pop2[1];
         if (!parent.__logicType) {
           const prevSameType = stack.peekByType(NodeSort.Real);
-          ctx.realParent = prevSameType?.node || root;
+          const sameNode = prevSameType?.node;
+          if (sameNode) {
+            ctx.realParent = sameNode.__logicType === FakeType.Tp ? runWithPulling(() => sameNode.tpData.node, null) : sameNode;
+          } else {
+            ctx.realParent = root;
+          }
         } else {
           if (sort & NodeSort.EffectNode) {
             const parentLogic = stack.peekByType(NodeSort.EffectNode)?.node;
@@ -1676,7 +1683,7 @@ class Interpreter {
     return _node;
   }
   dynamicDeclaration(pData, value, ctx) {
-    const valueIsMapKey = Reflect.has(pData[Keys.Raw], value);
+    const valueIsMapKey = Boolean(getProxyHasKey(pData, value));
     let node = {
       __logicType: null,
       realParent: null,
@@ -1760,10 +1767,7 @@ class Interpreter {
           this.removeLogicNode(node);
         }
       };
-    }, [() => {
-      const val = valueIsMapKey ? pData[value] : this.getFn(pData, value)();
-      return val;
-    }], {
+    }, [valueIsMapKey ? () => pData[value] : this.getFn(pData, value)], {
       type: 'render'
     });
     return node;
@@ -1791,7 +1795,13 @@ class Interpreter {
     const before = node.contentBefore = this.createAnchor('tp-content-before', true);
     const after = node.contentAfter = this.createAnchor('tp-content-after', true);
     let firstRender = true;
-    node.effect = this.effect(({
+    let scope = new Scope(() => {});
+    scope.scope = null;
+    runWithPulling(() => {
+      scope.get();
+    }, null);
+    node.effect = scope;
+    this.effect(({
       old: oldDom,
       val: dom
     }) => {
@@ -1835,19 +1845,29 @@ class Interpreter {
           } else {
             this.handleInsert(dom, after, null);
             this.handleInsert(dom, before, null);
-            this.tokenizer = node.owner.tokenizer;
-            this.tokenizer.resume(node.snapshot);
-            this.tokenizer.useDedentAsEof = false;
-            this.program(dom, node.owner, before, node);
+            runWithPulling(() => {
+              this.tokenizer = node.owner.tokenizer;
+              this.tokenizer.resume(node.snapshot);
+              this.tokenizer.useDedentAsEof = false;
+              this.program(dom, node.owner, before, node);
+            }, scope);
           }
         } else {
           removeTpChild();
+          scope.dispose();
+          scope = new Scope(() => {});
+          scope.scope = null;
+          runWithPulling(() => {
+            scope.get();
+          }, null);
+          node.effect = scope;
         }
       }
       firstRender = false;
       return isDestroy => {
         if (isDestroy) {
           removeTpChild();
+          scope.dispose();
         }
       };
     }, [() => child.node], {
@@ -1859,7 +1879,7 @@ class Interpreter {
     const child = deepSignal({}, getPulling());
     const parentContext = this.ctx.stack.peekByType(NodeSort.Context)?.node?.context;
     if (parentContext) {
-      Object.setPrototypeOf(child, parentContext);
+      backupSignal(child, parentContext);
     }
     this.onePropParsed = createStoreOnePropParsed(child);
     const node = {
@@ -2247,7 +2267,7 @@ class Interpreter {
         cells.set(name, new Computed(() => computedData.get()[name]));
       }
     }
-    Object.setPrototypeOf(data, parentData);
+    backupSignal(data, parentData);
     return data;
   }
   getData() {
@@ -2288,7 +2308,7 @@ class Interpreter {
     } else if (ComponentOrRender instanceof InlineFragment) {
       const conf = ComponentOrRender;
       child = deepSignal({}, getPulling(), true);
-      Object.setPrototypeOf(child, conf.data);
+      backupSignal(child, conf.data);
       tokenizer = conf.tokenizer;
       fragmentSnapshot = conf.snapshot;
       __logicType = FakeType.Fragment;
@@ -2298,7 +2318,7 @@ class Interpreter {
       const boundStore = render.boundStore;
       child = deepSignal({}, getPulling(), true);
       if (boundStore) {
-        Object.setPrototypeOf(child, boundStore);
+        backupSignal(child, boundStore);
       }
       tokenizer = render(true);
       __logicType = FakeType.Fragment;
@@ -2546,7 +2566,7 @@ class Interpreter {
               prevKeys.delete(k);
               if (isComponent) {
                 const savedK = savedDefaults.has(k);
-                if (!savedK && Object.prototype.hasOwnProperty.call(rawTarget, k)) {
+                if (!savedK && hasOwn(rawTarget, k)) {
                   savedDefaults.set(k, rawTarget[k]);
                 }
                 const val = props[k];
@@ -2579,7 +2599,7 @@ class Interpreter {
             }).get();
           }
         } else if (hookType === 'dynamic') {
-          const valueIsMapKey = Reflect.has(data[Keys.Raw], value);
+          const valueIsMapKey = Boolean(getProxyHasKey(data, value));
           const fn = isFn ? rawVal : valueIsMapKey ? value : this.getFn(data, value);
           this.onePropParsed(data, _node, key, fn, valueIsMapKey, isFn, hookI);
         } else if (hookType === 'static') {