aoye 0.0.9 → 0.0.10

package/dist/aoye.cjs.js

@@ -196,9 +196,7 @@ class TaskQueue {
 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");
@@ -925,19 +923,20 @@ const deepSignal = (target, scope, deep = true) => {
   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);
@@ -967,7 +966,7 @@ const deepSignal = (target, scope, deep = true) => {
       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();
@@ -978,18 +977,21 @@ const deepSignal = (target, scope, deep = true) => {
       }
       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) {
@@ -1011,9 +1013,9 @@ const shareSignal = (from, fromPath, to, toPath) => {
     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");
@@ -1032,6 +1034,12 @@ function getTargetAndKey(obj, paths) {
   }
   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;
@@ -1048,7 +1056,14 @@ function handleGetterAsComputed(obj, prop, receiver, cells, scope) {
 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) => {
@@ -1087,8 +1102,8 @@ const arrayMethodReWrites = {};
     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 = () => {
@@ -1108,8 +1123,8 @@ const arrayMethodReWrites = {};
   };
 });
 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;
@@ -1127,8 +1142,8 @@ arrayMethodReWrites.filter = function(callback, thisArg) {
   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;
@@ -1154,8 +1169,8 @@ arrayMethodReWrites.slice = function(start, end) {
   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);
@@ -1168,8 +1183,8 @@ arrayMethodReWrites.toReversed = function() {
   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;
@@ -1201,8 +1216,8 @@ arrayMethodReWrites.toSpliced = function(start, deleteCount, ...items) {
   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;
@@ -1222,8 +1237,8 @@ arrayMethodReWrites.with = function(index, value) {
   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;
@@ -1303,9 +1318,9 @@ const GetMethodConf = {
   })
 ].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);
@@ -1318,8 +1333,8 @@ const GetMethodConf = {
 });
 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);
@@ -1351,11 +1366,12 @@ 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 = {}) {
+  static new(keyMap = {}, staticMap = {}) {
     const parentStore = _Store.Current;
     const child = new this();
     if (parentStore) {
@@ -1364,14 +1380,23 @@ const _Store = class _Store {
         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;
@@ -1506,4 +1531,5 @@ exports.isSignal = isSignal;
 exports.registerScheduler = registerScheduler;
 exports.runWithPulling = runWithPulling;
 exports.scope = scope;
+exports.shareSignal = shareSignal;
 //# sourceMappingURL=aoye.cjs.js.map