aoye 0.0.8 → 0.0.10

package/dist/index.umd.js

@@ -198,10 +198,10 @@
   var Keys = /* @__PURE__ */ ((Keys2) => {
     Keys2["Iterator"] = "__AOYE_ITERATOR";
     Keys2["Raw"] = "__AOYE_RAW";
-    Keys2["Deep"] = "__AOYE_DEEP";
-    Keys2["Scope"] = "__AOYE_SCOPE";
+    Keys2["Meta"] = "__AOYE_META";
     return Keys2;
   })(Keys || {});
+  const IsStore = /* @__PURE__ */ Symbol("__AOYE_IS_STORE"), StoreIgnoreKeys = /* @__PURE__ */ Symbol("__AOYE_IGNORE_KEYS");
 
   let channel = globalThis.MessageChannel ? new MessageChannel() : null;
   if (globalThis.MessageChannel) {
@@ -264,7 +264,7 @@
     onOneSetEffectsAdded(subQueue, queue) {
       subQueue.forEach((effect, item) => {
         effect.runIfDirty();
-        subQueue.delete(item);
+        queue.delete(item);
       });
     }
   }
@@ -277,7 +277,7 @@
       const task = () => {
         subQueue.forEach((effect, item) => {
           effect.runIfDirty();
-          subQueue.delete(item);
+          queue.delete(item);
         });
         return {
           finished: true,
@@ -297,7 +297,7 @@
       const task = () => {
         subQueue.forEach((effect, item) => {
           effect.runIfDirty();
-          subQueue.delete(item);
+          queue.delete(item);
         });
       };
       task.time = Date.now();
@@ -313,7 +313,7 @@
       const task = () => {
         subQueue.forEach((effect, item) => {
           effect.runIfDirty();
-          subQueue.delete(item);
+          queue.delete(item);
         });
       };
       task.time = Date.now();
@@ -918,20 +918,33 @@
   };
   var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
   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 cells = /* @__PURE__ */ new Map();
     const targetIsArray = Array.isArray(target);
+    const targetIsStore = Boolean((_a = target.constructor) == null ? void 0 : _a[IsStore]);
+    const meta = {
+      deep,
+      scope,
+      cells
+    };
     const proxy = new Proxy(target, {
       get(obj, prop, receiver) {
         switch (prop) {
           case Keys.Raw:
             return target;
-          case Keys.Deep:
-            return deep;
-          case Keys.Scope:
-            return scope;
+          case Keys.Meta:
+            return meta;
+        }
+        if (targetIsStore && isIgnoreKey(obj.constructor[StoreIgnoreKeys], prop)) {
+          return Reflect.get(obj, prop, receiver);
+        }
+        const desc = Reflect.getOwnPropertyDescriptor(obj, prop);
+        const isGetter = desc && typeof desc.get === "function";
+        if (isGetter) {
+          return handleGetterAsComputed(obj, prop, receiver, cells, scope);
         }
         const value = Reflect.get(obj, prop, receiver);
         const valueIsFn = typeof value === "function";
@@ -955,6 +968,9 @@
         return s.v;
       },
       set(obj, prop, value, receiver) {
+        if (targetIsStore && isIgnoreKey(obj.constructor[StoreIgnoreKeys], prop)) {
+          return Reflect.set(obj, prop, value, receiver);
+        }
         batch.start();
         const success = Reflect.set(obj, prop, value, receiver);
         if (cells.has(prop)) {
@@ -963,15 +979,21 @@
         }
         if (targetIsArray) {
           handleArraySet(obj, prop, value, receiver);
+        } else {
+          triggerIter(obj, prop, value, receiver);
         }
         batch.end();
         return success;
       },
       // 【核心修改】拦截 delete 操作
       deleteProperty(obj, prop) {
+        if (targetIsStore && isIgnoreKey(obj.constructor[StoreIgnoreKeys], prop)) {
+          return Reflect.deleteProperty(obj, prop);
+        }
         if (cells.has(prop)) {
           cells.delete(prop);
         }
+        triggerIter(obj, prop, void 0, proxy);
         return Reflect.deleteProperty(obj, prop);
       },
       ownKeys(obj) {
@@ -986,10 +1008,64 @@
     rawToProxy.set(target, proxy);
     return proxy;
   };
+  const shareSignal = (from, fromPath, to, toPath) => {
+    try {
+      const toPaths = toPath.split(".");
+      const formPaths = Array.isArray(fromPath) ? fromPath : fromPath.split(".");
+      runWithPulling(() => {
+        const { target: fromTarget, key: fromKey } = getTargetAndKey(from, formPaths);
+        fromTarget[fromKey];
+        const fromSignal = fromTarget[Keys.Meta].cells.get(fromKey);
+        const { target: toTarget, key: toKey } = getTargetAndKey(to, toPaths);
+        toTarget[Keys.Meta].cells.set(toKey, fromSignal);
+      }, null);
+    } catch (error) {
+      console.error("\u6620\u5C04\u4E86\u4E0D\u5B58\u5728\u7684Key\uFF01");
+      throw error;
+    }
+  };
+  function getTargetAndKey(obj, paths) {
+    let target = obj;
+    let key = "";
+    const len = paths.length;
+    for (let i = 0; i < len; i++) {
+      key = paths[i];
+      if (i < len - 1) {
+        target = target[key];
+      }
+    }
+    return { target, key };
+  }
+  function isIgnoreKey(ignores, key) {
+    if (typeof key !== "string") {
+      return ignores.includes(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;
+    }
+    const s = Signal.create(null, {
+      customPull: () => Reflect.get(obj, prop, receiver),
+      scheduler: Scheduler.Sync,
+      isScope: false,
+      scope
+    });
+    cells.set(prop, s);
+    return s.v;
+  }
   function handleArraySet(arr, prop, value, receiver) {
     if (prop === "length") ; else if (bobeShared.isNatureNumStr(prop)) {
       receiver[Keys.Iterator] = (arr[Keys.Iterator] || 0) + 1;
-    } else ;
+    } else {
+      triggerIter(arr, prop, value, receiver);
+    }
+  }
+  function triggerIter(obj, prop, value, receiver) {
+    if (!Reflect.has(obj, prop)) {
+      receiver[Keys.Iterator] = receiver[Keys.Raw][Keys.Iterator] + 1;
+    }
   }
   const arrayMethodReWrites = {};
   ["pop", "push", "shift", "splice", "unshift", "copyWithin", "reverse", "fill"].forEach((key) => {
@@ -1028,8 +1104,8 @@
       const fn = Array.prototype[key];
       const rawArray = toRaw(this);
       const iter = fn.call(rawArray, ...args);
-      const scope = this[Keys.Scope];
-      const isDeep = this[Keys.Deep];
+      const meta = this[Keys.Meta];
+      const { deep: isDeep, scope } = meta;
       if (isDeep) {
         const rawNext = iter.next.bind(iter);
         iter.next = () => {
@@ -1049,8 +1125,8 @@
     };
   });
   arrayMethodReWrites.filter = function(callback, thisArg) {
-    const scope = this[Keys.Scope];
-    const isDeep = this[Keys.Deep];
+    const meta = this[Keys.Meta];
+    const { deep: isDeep, scope } = meta;
     const that = toRaw(this);
     const result = [];
     let resultIndex = 0;
@@ -1068,8 +1144,8 @@
     return result;
   };
   arrayMethodReWrites.slice = function(start, end) {
-    const scope = this[Keys.Scope];
-    const isDeep = this[Keys.Deep];
+    const meta = this[Keys.Meta];
+    const { deep: isDeep, scope } = meta;
     const that = toRaw(this);
     const len = that.length;
     let k = start || 0;
@@ -1095,8 +1171,8 @@
     return result;
   };
   arrayMethodReWrites.toReversed = function() {
-    const scope = this[Keys.Scope];
-    const isDeep = this[Keys.Deep];
+    const meta = this[Keys.Meta];
+    const { deep: isDeep, scope } = meta;
     const that = toRaw(this);
     const len = that.length;
     const result = new Array(len);
@@ -1109,8 +1185,8 @@
     return result;
   };
   arrayMethodReWrites.toSpliced = function(start, deleteCount, ...items) {
-    const scope = this[Keys.Scope];
-    const isDeep = this[Keys.Deep];
+    const meta = this[Keys.Meta];
+    const { deep: isDeep, scope } = meta;
     const that = toRaw(this);
     const len = that.length;
     let relativeStart = start >> 0;
@@ -1142,8 +1218,8 @@
     return result;
   };
   arrayMethodReWrites.with = function(index, value) {
-    const scope = this[Keys.Scope];
-    const isDeep = this[Keys.Deep];
+    const meta = this[Keys.Meta];
+    const { deep: isDeep, scope } = meta;
     const that = toRaw(this);
     const len = that.length;
     let relativeIndex = Number(index) || 0;
@@ -1163,8 +1239,8 @@
     return result;
   };
   arrayMethodReWrites.concat = function(...items) {
-    const scope = this[Keys.Scope];
-    const isDeep = this[Keys.Deep];
+    const meta = this[Keys.Meta];
+    const { deep: isDeep, scope } = meta;
     const that = toRaw(this);
     const selfLen = that.length;
     let totalLength = selfLen;
@@ -1244,9 +1320,9 @@
     })
   ].forEach(({ key, wrapReturn, wrapArgs }) => {
     arrayMethodReWrites[key] = function(...args) {
-      const scope = this[Keys.Scope];
+      const meta = this[Keys.Meta];
       const fn = Array.prototype[key];
-      const isDeep = this[Keys.Deep];
+      const { deep: isDeep, scope } = meta;
       const that = toRaw(this);
       warpCallbackArgs(isDeep, args, scope, wrapArgs);
       let result = fn.call(that, ...args);
@@ -1259,8 +1335,8 @@
   });
   arrayMethodReWrites.toSorted = function(...args) {
     const fn = Array.prototype["toSorted"];
-    const scope = this[Keys.Scope];
-    const isDeep = this[Keys.Deep];
+    const meta = this[Keys.Meta];
+    const { deep: isDeep, scope } = meta;
     const that = toRaw(this);
     warpCallbackArgs(isDeep, args, scope, 3);
     let result = fn.call(that, ...args);
@@ -1288,6 +1364,48 @@
     args[0] = wrapCb;
   }
 
+  var _a, _b;
+  _b = IsStore, _a = StoreIgnoreKeys;
+  const _Store = class _Store {
+    constructor() {
+      this.parent = () => null;
+      const proxy = deepSignal(this, G.PullingSignal, true);
+      _Store.Current = proxy;
+      return proxy;
+    }
+    static new(keyMap = {}, staticMap = {}) {
+      const parentStore = _Store.Current;
+      const child = new this();
+      if (parentStore) {
+        for (const childKey in keyMap) {
+          const parentKey = keyMap[childKey];
+          shareSignal(parentStore, parentKey, child, childKey);
+        }
+      }
+      for (const key in staticMap) {
+        const value = staticMap[key];
+        child[key] = value;
+      }
+      child.parent = () => parentStore;
+      _Store.Current = parentStore;
+      return child;
+    }
+    map(keyMap = {}) {
+      const parentStore = this.parent();
+      if (parentStore) {
+        for (const childKey in keyMap) {
+          const parentKey = keyMap[childKey];
+          shareSignal(parentStore, parentKey, this, childKey);
+        }
+      }
+      this.parent = null;
+    }
+  };
+  _Store[_b] = true;
+  _Store[_a] = ["ui", "raw"];
+  _Store.Current = null;
+  let Store = _Store;
+
   var __defProp = Object.defineProperty;
   var __getOwnPropSymbols = Object.getOwnPropertySymbols;
   var __hasOwnProp = Object.prototype.hasOwnProperty;
@@ -1400,8 +1518,11 @@
   };
 
   exports.$ = $;
+  exports.IsStore = IsStore;
   exports.Keys = Keys;
   exports.Scheduler = Scheduler;
+  exports.Store = Store;
+  exports.StoreIgnoreKeys = StoreIgnoreKeys;
   exports.TaskQueue = TaskQueue;
   exports.batch = batch;
   exports.clean = clean;
@@ -1412,6 +1533,7 @@
   exports.registerScheduler = registerScheduler;
   exports.runWithPulling = runWithPulling;
   exports.scope = scope;
+  exports.shareSignal = shareSignal;
 
 }));
 //# sourceMappingURL=index.umd.js.map