bobe 0.0.61 → 0.0.62

package/dist/index.d.ts

@@ -303,7 +303,7 @@ type ContextNode = Omit<LogicNode, 'data'> & {
 };
 type TpNode = LogicNode & {
     tpData: any;
-    effect: Effect;
+    effect: Scope;
     contentBefore: any;
     contentAfter: any;
     owner: ComponentNode$1 | FragmentNode$1;

package/dist/index.umd.js

@@ -1436,7 +1436,7 @@
     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);
@@ -1496,7 +1496,7 @@
           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) {
@@ -1505,7 +1505,9 @@
                 ctx.prevSibling = ctx.current.realBefore;
               }
               if (ctx.current.__logicType & FakeType.Tp) {
-                ctx.realParent = ctx.current.tpData[aoye.Keys.Raw].node;
+                aoye.runWithPulling(() => {
+                  ctx.realParent = ctx.current.tpData.node;
+                }, null);
                 ctx.prevSibling = ctx.current.contentBefore;
               }
             }
@@ -1541,7 +1543,12 @@
             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 ? aoye.runWithPulling(() => sameNode.tpData.node, null) : sameNode;
+            } else {
+              ctx.realParent = root;
+            }
           } else {
             if (sort & NodeSort.EffectNode) {
               const parentLogic = stack.peekByType(NodeSort.EffectNode)?.node;
@@ -1678,7 +1685,7 @@
       return _node;
     }
     dynamicDeclaration(pData, value, ctx) {
-      const valueIsMapKey = Reflect.has(pData[aoye.Keys.Raw], value);
+      const valueIsMapKey = Boolean(aoye.getProxyHasKey(pData, value));
       let node = {
         __logicType: null,
         realParent: null,
@@ -1762,10 +1769,7 @@
             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;
@@ -1793,7 +1797,13 @@
       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 aoye.Scope(() => {});
+      scope.scope = null;
+      aoye.runWithPulling(() => {
+        scope.get();
+      }, null);
+      node.effect = scope;
+      this.effect(({
         old: oldDom,
         val: dom
       }) => {
@@ -1837,19 +1847,29 @@
             } 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);
+              aoye.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 aoye.Scope(() => {});
+            scope.scope = null;
+            aoye.runWithPulling(() => {
+              scope.get();
+            }, null);
+            node.effect = scope;
           }
         }
         firstRender = false;
         return isDestroy => {
           if (isDestroy) {
             removeTpChild();
+            scope.dispose();
           }
         };
       }, [() => child.node], {
@@ -1861,7 +1881,7 @@
       const child = aoye.deepSignal({}, aoye.getPulling());
       const parentContext = this.ctx.stack.peekByType(NodeSort.Context)?.node?.context;
       if (parentContext) {
-        Object.setPrototypeOf(child, parentContext);
+        aoye.backupSignal(child, parentContext);
       }
       this.onePropParsed = createStoreOnePropParsed(child);
       const node = {
@@ -2249,7 +2269,7 @@
           cells.set(name, new aoye.Computed(() => computedData.get()[name]));
         }
       }
-      Object.setPrototypeOf(data, parentData);
+      aoye.backupSignal(data, parentData);
       return data;
     }
     getData() {
@@ -2290,7 +2310,7 @@
       } else if (ComponentOrRender instanceof InlineFragment) {
         const conf = ComponentOrRender;
         child = aoye.deepSignal({}, aoye.getPulling(), true);
-        Object.setPrototypeOf(child, conf.data);
+        aoye.backupSignal(child, conf.data);
         tokenizer = conf.tokenizer;
         fragmentSnapshot = conf.snapshot;
         __logicType = FakeType.Fragment;
@@ -2300,7 +2320,7 @@
         const boundStore = render.boundStore;
         child = aoye.deepSignal({}, aoye.getPulling(), true);
         if (boundStore) {
-          Object.setPrototypeOf(child, boundStore);
+          aoye.backupSignal(child, boundStore);
         }
         tokenizer = render(true);
         __logicType = FakeType.Fragment;
@@ -2548,7 +2568,7 @@
                 prevKeys.delete(k);
                 if (isComponent) {
                   const savedK = savedDefaults.has(k);
-                  if (!savedK && Object.prototype.hasOwnProperty.call(rawTarget, k)) {
+                  if (!savedK && bobeShared.hasOwn(rawTarget, k)) {
                     savedDefaults.set(k, rawTarget[k]);
                   }
                   const val = props[k];
@@ -2581,7 +2601,7 @@
               }).get();
             }
           } else if (hookType === 'dynamic') {
-            const valueIsMapKey = Reflect.has(data[aoye.Keys.Raw], value);
+            const valueIsMapKey = Boolean(aoye.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') {