@cascateer/core 2.3.20 → 2.3.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cascateer/core",
-  "version": "2.3.20",
+  "version": "2.3.22",
   "repository": {
     "type": "git",
     "url": "https://github.com/cascateer/core.git"

package/src/observable/Signal.ts

@@ -134,10 +134,10 @@ export class Signal<T> extends ProxyObservable<T> {
   }
 
   list<U>(
-    iteratee: UnaryFunction<Signal<EnumerableItem<T>>, U>,
+    iteratee: (item: Signal<EnumerableItem<T>>, index: number) => U,
   ): Observable<U[]> {
-    const memoizedIteratee = memoize<UnaryFunction<PropertyKey, U>>((key) =>
-      iteratee(this.item(key)),
+    const memoizedIteratee = memoize<(key: PropertyKey, index: number) => U>(
+      (key, index) => iteratee(this.item(key), index),
     );
 
     return this.pipe(

package/src/serializable.ts

@@ -69,21 +69,21 @@ export abstract class Serializable<O> {
       return value;
     });
 
-    return nodes
-      .reduce(
-        (acc, node) =>
-          acc.then(() =>
-            Serializable.fromJSON(JSON.stringify(node.value))
-              .catch(() => node.value)
-              .then((value) => {
-                if (node.parent != null) {
-                  node.parent[node.key] = value;
-                }
-              }),
-          ),
-        Promise.resolve(),
-      )
-      .then(() => obj);
+    return nodes.reduce(
+      (value, node) =>
+        value.then(() =>
+          Serializable.fromJSON(JSON.stringify(node.value))
+            .catch(() => node.value)
+            .then((value) => {
+              if (node.parent != null) {
+                node.parent[node.key] = value;
+              }
+
+              return value;
+            }),
+        ),
+      Promise.resolve(obj),
+    );
   }
 
   abstract toObject(): O;