aoye 0.0.53 → 0.0.54

package/dist/aoye.esm.js

@@ -765,10 +765,10 @@ const trackIterator = (cells, scope) => {
   }
   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) => {
@@ -820,7 +820,7 @@ const createSharedHandler = (cells, scope, deep, targetIsMap) => {
       if (had) {
         triggerKey(cells, key);
         cells.delete(key);
-        triggerIterator(cells, target);
+        triggerIterator(cells);
       }
       batchEnd();
       return result;
@@ -834,7 +834,7 @@ const createSharedHandler = (cells, scope, deep, targetIsMap) => {
       cells.clear();
       if (iterCell) cells.set(Keys.Iterator, iterCell);
       if (hadItems) {
-        triggerIterator(cells, target);
+        triggerIterator(cells);
       }
       batchEnd();
     },
@@ -879,7 +879,7 @@ const createMapHandler = (cells, scope, deep) => ({
     } else {
       cell.set(value);
     }
-    triggerIterator(cells, target);
+    triggerIterator(cells);
     batchEnd();
     return this;
   }
@@ -899,7 +899,7 @@ const createSetHandler = (cells, scope, _deep) => ({
       cell.set(value);
     }
     if (!had) {
-      triggerIterator(cells, target);
+      triggerIterator(cells);
     }
     batchEnd();
     return this;
@@ -1402,6 +1402,7 @@ function warpCallbackArgs(isDeep, args, scope, wrapArgs = 0b01) {
   args[0] = wrapCb;
 }
 
+const isParentKey = (parentStore, expr) => expr in parentStore[Keys.Raw];
 class Store {
   static [IsStore] = true;
   static [StoreIgnoreKeys] = ['ui', 'raw'];
@@ -1412,18 +1413,31 @@ class Store {
     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;