aoye 0.0.53 → 0.0.54

package/dist/index.d.ts

@@ -206,7 +206,17 @@ declare class Store {
     static Current: Store;
     constructor();
     parent: () => Store | null;
-    static new<T extends Store = any, P extends Store = any, O extends string = ''>(this: new (...args: any[]) => T, keyMap?: PRecord<keyof T, keyof Omit<P, O> | DeepOmitPath<P, O>>, staticMap?: PRecord<keyof T, any>): T;
+    /**
+     * 创建子 Store 实例并传递属性：
+     * Store.new({ prop1: `v1+v2`, prop2: (p) => p.v3 * p.v4 }, { prop3: 123 })
+     *
+     * keyMap：childKey → 表达式
+     *   - string：解析为 with(parentStore) { ... } 表达式，结果包装为 Computed
+     *   - Function：直接包装为 Computed(() => fn(parentStore))
+     *
+     * staticMap：childKey → 静态值，直接赋值
+     */
+    static new<T extends Store = any, P extends Store = any, O extends string = ''>(this: new (...args: any[]) => T, keyMap?: PRecord<keyof T, keyof Omit<P, O> | DeepOmitPath<P, O>> | Record<string, string | Function>, staticMap?: PRecord<keyof T, any>): T;
     map<P extends Store = any, O extends string = ''>(keyMap?: PRecord<keyof this, keyof Omit<P, O> | DeepOmitPath<P, O>>): void;
 }
 

package/dist/index.umd.js

@@ -769,10 +769,10 @@
     }
     iter.get();
   };
-  const triggerIterator = (cells, raw) => {
+  const triggerIterator = cells => {
     const iter = cells.get(Keys.Iterator);
     if (iter) {
-      iter.set((raw[Keys.Iterator] || 0) + 1);
+      iter.set((iter.value || 0) + 1);
     }
   };
   const trackKey = (cells, scope, key) => {
@@ -824,7 +824,7 @@
         if (had) {
           triggerKey(cells, key);
           cells.delete(key);
-          triggerIterator(cells, target);
+          triggerIterator(cells);
         }
         batchEnd();
         return result;
@@ -838,7 +838,7 @@
         cells.clear();
         if (iterCell) cells.set(Keys.Iterator, iterCell);
         if (hadItems) {
-          triggerIterator(cells, target);
+          triggerIterator(cells);
         }
         batchEnd();
       },
@@ -883,7 +883,7 @@
       } else {
         cell.set(value);
       }
-      triggerIterator(cells, target);
+      triggerIterator(cells);
       batchEnd();
       return this;
     }
@@ -903,7 +903,7 @@
         cell.set(value);
       }
       if (!had) {
-        triggerIterator(cells, target);
+        triggerIterator(cells);
       }
       batchEnd();
       return this;
@@ -1406,6 +1406,7 @@
     args[0] = wrapCb;
   }
 
+  const isParentKey = (parentStore, expr) => expr in parentStore[Keys.Raw];
   class Store {
     static [IsStore] = true;
     static [StoreIgnoreKeys] = ['ui', 'raw'];
@@ -1416,18 +1417,31 @@
       return proxy;
     }
     parent = () => null;
-    static new(keyMap = {}, staticMap = {}) {
+    static new(keyMap, staticMap) {
       const parentStore = Store.Current;
       const child = new this();
-      if (parentStore) {
+      if (parentStore && keyMap) {
+        const cells = child[Keys.Meta].cells;
         for (const childKey in keyMap) {
-          const parentKey = keyMap[childKey];
-          shareSignal(parentStore, parentKey, child, childKey);
+          const expr = keyMap[childKey];
+          if (typeof expr === 'function') {
+            cells.set(childKey, new Computed(() => expr(parentStore)));
+            child[Keys.Raw][childKey] = undefined;
+          } else if (typeof expr === 'string') {
+            if (isParentKey(parentStore, expr)) {
+              shareSignal(parentStore, expr, child, childKey);
+            } else {
+              const fn = new Function('data', `let v;with(data){v=${expr};}return v;`);
+              cells.set(childKey, new Computed(() => fn(parentStore)));
+              child[Keys.Raw][childKey] = undefined;
+            }
+          } else {
+            shareSignal(parentStore, expr, child, childKey);
+          }
         }
       }
       for (const key in staticMap) {
-        const value = staticMap[key];
-        child[key] = value;
+        child[key] = staticMap[key];
       }
       child.parent = () => parentStore;
       Store.Current = parentStore;