aoye 0.0.8 → 0.0.9

package/dist/index.umd.js

@@ -200,8 +200,10 @@
     Keys2["Raw"] = "__AOYE_RAW";
     Keys2["Deep"] = "__AOYE_DEEP";
     Keys2["Scope"] = "__AOYE_SCOPE";
+    Keys2["Cells"] = "__AOYE_CELLS";
     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 +266,7 @@
     onOneSetEffectsAdded(subQueue, queue) {
       subQueue.forEach((effect, item) => {
         effect.runIfDirty();
-        subQueue.delete(item);
+        queue.delete(item);
       });
     }
   }
@@ -277,7 +279,7 @@
       const task = () => {
         subQueue.forEach((effect, item) => {
           effect.runIfDirty();
-          subQueue.delete(item);
+          queue.delete(item);
         });
         return {
           finished: true,
@@ -297,7 +299,7 @@
       const task = () => {
         subQueue.forEach((effect, item) => {
           effect.runIfDirty();
-          subQueue.delete(item);
+          queue.delete(item);
         });
       };
       task.time = Date.now();
@@ -313,7 +315,7 @@
       const task = () => {
         subQueue.forEach((effect, item) => {
           effect.runIfDirty();
-          subQueue.delete(item);
+          queue.delete(item);
         });
       };
       task.time = Date.now();
@@ -918,11 +920,13 @@
   };
   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 proxy = new Proxy(target, {
       get(obj, prop, receiver) {
         switch (prop) {
@@ -932,6 +936,16 @@
             return deep;
           case Keys.Scope:
             return scope;
+          case Keys.Cells:
+            return cells;
+        }
+        if (targetIsStore && obj.constructor[StoreIgnoreKeys].includes(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 +969,9 @@
         return s.v;
       },
       set(obj, prop, value, receiver) {
+        if (targetIsStore && obj.constructor[StoreIgnoreKeys].includes(prop)) {
+          return Reflect.set(obj, prop, value, receiver);
+        }
         batch.start();
         const success = Reflect.set(obj, prop, value, receiver);
         if (cells.has(prop)) {
@@ -969,6 +986,9 @@
       },
       // 【核心修改】拦截 delete 操作
       deleteProperty(obj, prop) {
+        if (targetIsStore && obj.constructor[StoreIgnoreKeys].includes(prop)) {
+          return Reflect.deleteProperty(obj, prop);
+        }
         if (cells.has(prop)) {
           cells.delete(prop);
         }
@@ -986,6 +1006,47 @@
     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.Cells].get(fromKey);
+        const { target: toTarget, key: toKey } = getTargetAndKey(to, toPaths);
+        toTarget[Keys.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 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;
@@ -1288,6 +1349,38 @@
     args[0] = wrapCb;
   }
 
+  var _a, _b;
+  _b = IsStore, _a = StoreIgnoreKeys;
+  const _Store = class _Store {
+    constructor() {
+      const proxy = deepSignal(this, G.PullingSignal, true);
+      _Store.Current = proxy;
+      return proxy;
+    }
+    static new(keyMap = {}) {
+      const parentStore = _Store.Current;
+      const child = new this();
+      if (parentStore) {
+        for (const childKey in keyMap) {
+          const parentKey = keyMap[childKey];
+          shareSignal(parentStore, parentKey, child, childKey);
+        }
+      }
+      _Store.Current = parentStore;
+      return child;
+    }
+    set(fn) {
+      effect(() => {
+        const props = fn();
+        Object.assign(this, props);
+      });
+    }
+  };
+  _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 +1493,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;