try catch on pipe

holochain-open-dev · Dec 18, 2023 · e9f665d · e9f665d
1 parent dd273a3
commit e9f665d
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 30 deletions.
diff --git a/packages/stores/package.json b/packages/stores/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@holochain-open-dev/stores",
-  "version": "0.8.3",
+  "version": "0.8.4",
   "description": "Re-export of svelte/store, with additional utilities to build reusable holochain-open-dev modules",
   "author": "[email protected]",
   "main": "dist/index.js",

diff --git a/packages/stores/src/pipe.ts b/packages/stores/src/pipe.ts
@@ -16,37 +16,43 @@ function pipeStep<T, U>(
     if (value.status === "error") set(value);
     else if (value.status === "pending") set(value);
     else {
-      const v = stepFn(
-        value.value,
-        ...values
-          .slice(1)
-          .map((v) => (v as any).value)
-          .reverse()
-      );
+      try {
+        const v = stepFn(
+          value.value,
+          ...values
+            .slice(1)
+            .map((v) => (v as any).value)
+            .reverse()
+        );
 
-      if ((v as Readable<any>).subscribe) {
-        return (v as Readable<any>).subscribe((value) => {
-          if ((value as AsyncStatus<U>).status) {
-            set(value);
-          } else {
-            set({ status: "complete", value });
-          }
-        });
-      } else if (is_promise(v)) {
-        set({ status: "pending" });
-        Promise.resolve(v)
-          .then((v) => {
-            set({ status: "complete", value: v });
-          })
-          .catch((error) => {
-            set({
-              status: "error",
-              error,
-            });
+        if ((v as Readable<any>).subscribe) {
+          return (v as Readable<any>).subscribe((value) => {
+            if ((value as AsyncStatus<U>).status) {
+              set(value);
+            } else {
+              set({ status: "complete", value });
+            }
           });
-        return () => {};
-      } else {
-        set({ status: "complete", value: v as U });
+        } else if (is_promise(v)) {
+          set({ status: "pending" });
+          Promise.resolve(v)
+            .then((v) => {
+              set({ status: "complete", value: v });
+            })
+            .catch((error) => {
+              set({
+                status: "error",
+                error,
+              });
+            });
+          return () => {};
+        } else {
+          set({ status: "complete", value: v as U });
+          return () => {};
+        }
+      } catch (e) {
+        const status: AsyncStatus<U> = { status: "error", error: e };
+        set(status);
         return () => {};
       }
     }