aoye 0.0.9 → 0.0.10

package/dist/index.umd.js

@@ -198,9 +198,7 @@
   var Keys = /* @__PURE__ */ ((Keys2) => {
     Keys2["Iterator"] = "__AOYE_ITERATOR";
     Keys2["Raw"] = "__AOYE_RAW";
-    Keys2["Deep"] = "__AOYE_DEEP";
-    Keys2["Scope"] = "__AOYE_SCOPE";
-    Keys2["Cells"] = "__AOYE_CELLS";
+    Keys2["Meta"] = "__AOYE_META";
     return Keys2;
   })(Keys || {});
   const IsStore = /* @__PURE__ */ Symbol("__AOYE_IS_STORE"), StoreIgnoreKeys = /* @__PURE__ */ Symbol("__AOYE_IGNORE_KEYS");
@@ -927,19 +925,20 @@
     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.Cells:
-            return cells;
+          case Keys.Meta:
+            return meta;
         }
-        if (targetIsStore && obj.constructor[StoreIgnoreKeys].includes(prop)) {
+        if (targetIsStore && isIgnoreKey(obj.constructor[StoreIgnoreKeys], prop)) {
           return Reflect.get(obj, prop, receiver);
         }
         const desc = Reflect.getOwnPropertyDescriptor(obj, prop);
@@ -969,7 +968,7 @@
         return s.v;
       },
       set(obj, prop, value, receiver) {
-        if (targetIsStore && obj.constructor[StoreIgnoreKeys].includes(prop)) {
+        if (targetIsStore && isIgnoreKey(obj.constructor[StoreIgnoreKeys], prop)) {
           return Reflect.set(obj, prop, value, receiver);
         }
         batch.start();
@@ -980,18 +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 && obj.constructor[StoreIgnoreKeys].includes(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) {
@@ -1013,9 +1015,9 @@
       runWithPulling(() => {
         const { target: fromTarget, key: fromKey } = getTargetAndKey(from, formPaths);
         fromTarget[fromKey];
-        const fromSignal = fromTarget[Keys.Cells].get(fromKey);
+        const fromSignal = fromTarget[Keys.Meta].cells.get(fromKey);
         const { target: toTarget, key: toKey } = getTargetAndKey(to, toPaths);
-        toTarget[Keys.Cells].set(toKey, fromSignal);
+        toTarget[Keys.Meta].cells.set(toKey, fromSignal);
       }, null);
     } catch (error) {
       console.error("\u6620\u5C04\u4E86\u4E0D\u5B58\u5728\u7684Key\uFF01");
@@ -1034,6 +1036,12 @@
     }
     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;
@@ -1050,7 +1058,14 @@
   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) => {
@@ -1089,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 = () => {
@@ -1110,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;
@@ -1129,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;
@@ -1156,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);
@@ -1170,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;
@@ -1203,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;
@@ -1224,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;
@@ -1305,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);
@@ -1320,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);
@@ -1353,11 +1368,12 @@
   _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 = {}) {
+    static new(keyMap = {}, staticMap = {}) {
       const parentStore = _Store.Current;
       const child = new this();
       if (parentStore) {
@@ -1366,14 +1382,23 @@
           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;
     }
-    set(fn) {
-      effect(() => {
-        const props = fn();
-        Object.assign(this, props);
-      });
+    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;
@@ -1508,6 +1533,7 @@
   exports.registerScheduler = registerScheduler;
   exports.runWithPulling = runWithPulling;
   exports.scope = scope;
+  exports.shareSignal = shareSignal;
 
 }));
 //# sourceMappingURL=index.umd.js.map