aoye 0.0.16 → 0.0.18

package/dist/aoye.cjs.js

@@ -434,7 +434,7 @@ class Line {
     for (const key in head) {
       head[key] = null;
     }
-    if (line && v2.scope && v1.scope !== v2.scope && !(v1.state & State.IsScope)) {
+    if (line && v2.scope && v1.scope !== v2.scope && (v1.state & State.IsScope) === 0) {
       const first = v2.scope.outLink;
       if (!first) {
         v2.scope.outLink = line;
@@ -602,7 +602,7 @@ function dispose() {
       dfs(upstream, {
         isUp: true,
         begin: ({ node }) => {
-          if (!(node.state & State.IsScope) || node.state & ScopeAbort) return true;
+          if ((node.state & State.IsScope) === 0 || node.state & ScopeAbort) return true;
         },
         complete: ({ node: scope, notGoDeep }) => {
           const shouldAbort = !notGoDeep;
@@ -721,11 +721,12 @@ const markDeep = (signal) => {
   }
 };
 const pullingPostprocess = (node) => {
-  node.state &= ~State.Pulling;
-  if (node.state & State.PullingUnknown) {
-    node.state &= ~State.PullingUnknown;
-    node.state |= State.Unknown;
+  let s = node.state;
+  s &= ~State.Pulling;
+  if (s & State.PullingUnknown) {
+    s = s & ~State.PullingUnknown | State.Unknown;
   }
+  node.state = s;
 };
 const _Signal = class _Signal {
   constructor(nextValue, customPull) {
@@ -774,7 +775,7 @@ const _Signal = class _Signal {
     if (this !== downstream && // 1. 外部支持 link
     shouldLink && // 2. 有下游
     downstream && // 3. 下游是 watcher，不链接非 scope
-    (!(downstream.state & State.LinkScopeOnly) || isScope)) {
+    ((downstream.state & State.LinkScopeOnly) === 0 || isScope)) {
       Line.link(this, downstream);
     }
     try {
@@ -813,7 +814,7 @@ const _Signal = class _Signal {
       dfs(signal, {
         isUp: true,
         begin: ({ node }) => {
-          if (node.state & (State.Pulling | State.Dirty) || !(node.state & DirtyState) || node.isDisabled()) {
+          if (node.state & (State.Pulling | State.Dirty) || (node.state & DirtyState) === 0 || node.isDisabled()) {
             return true;
           }
           node.state |= State.Pulling;
@@ -857,7 +858,7 @@ const _Signal = class _Signal {
     const downstream = G.PullingSignal;
     if (this !== downstream && // 2. 有下游
     downstream && // 3. 下游是 watcher 不是 watch，或 是watcher 但 当前是 scope
-    (!(downstream.state & State.LinkScopeOnly) || this.state & State.IsScope)) {
+    ((downstream.state & State.LinkScopeOnly) === 0 || this.state & State.IsScope)) {
       Line.link(this, downstream);
     }
     return this.value;
@@ -933,7 +934,8 @@ const deepSignal = (target, scope, deep = true) => {
   var _a;
   const isObj = typeof target === "object" && target !== null;
   if (!isObj || target[Keys.Raw]) return target;
-  if (rawToProxy.has(target)) return rawToProxy.get(target);
+  const p = rawToProxy.get(target);
+  if (p) return p;
   const cells = /* @__PURE__ */ new Map();
   const targetIsArray = Array.isArray(target);
   const targetIsStore = Boolean((_a = target.constructor) == null ? void 0 : _a[IsStore]);
@@ -968,11 +970,12 @@ const deepSignal = (target, scope, deep = true) => {
           return value;
         }
       }
-      if (cells.has(prop)) {
-        return cells.get(prop).v;
+      let s = cells.get(prop);
+      if (s) {
+        return s.v;
       }
       const wrappedValue = deep ? deepSignal(value, scope) : value;
-      const s = Signal.create(wrappedValue, {
+      s = Signal.create(wrappedValue, {
         scheduler: Scheduler.Sync,
         isScope: false,
         scope
@@ -986,8 +989,8 @@ const deepSignal = (target, scope, deep = true) => {
       }
       batch.start();
       const success = Reflect.set(obj, prop, value, receiver);
-      if (cells.has(prop)) {
-        const cell = cells.get(prop);
+      const cell = cells.get(prop);
+      if (cell) {
         cell.v = deep ? deepSignal(value, scope) : value;
       }
       if (targetIsArray) {
@@ -1003,9 +1006,7 @@ const deepSignal = (target, scope, deep = true) => {
       if (targetIsStore && isIgnoreKey(obj.constructor[StoreIgnoreKeys], prop) || typeof obj[prop] === "function") {
         return Reflect.deleteProperty(obj, prop);
       }
-      if (cells.has(prop)) {
-        cells.delete(prop);
-      }
+      cells.delete(prop);
       triggerIter(obj, prop, void 0, proxy);
       return Reflect.deleteProperty(obj, prop);
     },
@@ -1056,10 +1057,11 @@ function isIgnoreKey(ignores, key) {
   return ignores.some((it) => typeof it === "string" && key.startsWith(it));
 }
 function handleGetterAsComputed(obj, prop, receiver, cells, scope) {
-  if (cells.has(prop)) {
-    return cells.get(prop).v;
+  let s = cells.get(prop);
+  if (s) {
+    return s.v;
   }
-  const s = Signal.create(null, {
+  s = Signal.create(null, {
     customPull: () => Reflect.get(obj, prop, receiver),
     scheduler: Scheduler.Sync,
     isScope: false,
@@ -1102,8 +1104,9 @@ const arrayMethodReWrites = {};
         args[0] = value[Keys.Raw];
         result = fn.call(that, ...args);
       }
-      if (rawToProxy.has(value)) {
-        args[0] = rawToProxy.get(value);
+      const p = rawToProxy.get(value);
+      if (p) {
+        args[0] = p;
         result = fn.call(that, ...args);
       }
     }
@@ -1540,6 +1543,7 @@ exports.TaskQueue = TaskQueue;
 exports.batch = batch;
 exports.clean = clean;
 exports.customEffect = customEffect;
+exports.deepSignal = deepSignal;
 exports.effect = effect;
 exports.getPulling = getPulling;
 exports.isScope = isScope;