Merge pull request #874 from gadget-inc/fixup-combined-error

Fixup combined error

Author: udnay

packages/api-client-core/spec/support.spec.ts

@@ -51,41 +51,38 @@ describe("support utilities", () => {
       ).toThrowErrorMatchingInlineSnapshot(`"[Network] foobar"`);
     });
 
-    test("throws an actual error object and not a string so that the user gets a stack message", () => {
-      try {
+    test("throws the operation error if with the full network error as a string if there is no error message", () => {
+      expect(() =>
         assertOperationSuccess(
           {
             operation: null as any,
             data: null,
-            error: new CombinedError({ networkError: new Error("foobar") }),
+            error: new CombinedError({ networkError: new Error() }),
             stale: false,
             hasNext: false,
           },
 
           ["foo", "bar"]
-        );
-      } catch (error: any) {
-        expect(error).toBeInstanceOf(Error);
-      }
+        )
+      ).toThrow(`[Network] No message, error:`);
     });
 
-    test("throws the operation error if there's multiple network errors on the operation", () => {
-      expect(() =>
+    test("throws an actual error object and not a string so that the user gets a stack message", () => {
+      try {
         assertOperationSuccess(
           {
             operation: null as any,
             data: null,
-            error: new CombinedError({ networkError: [new Error("foo"), new Error("foo")] as any }),
+            error: new CombinedError({ networkError: new Error("foobar") }),
             stale: false,
             hasNext: false,
           },
 
           ["foo", "bar"]
-        )
-      ).toThrowErrorMatchingInlineSnapshot(`
-        "[Network] foo
-        [Network] foo"
-      `);
+        );
+      } catch (error: any) {
+        expect(error).toBeInstanceOf(Error);
+      }
     });
 
     test("throws the operation error if there's a error on the operation", () => {

packages/api-client-core/src/support.ts

@@ -316,8 +316,14 @@ export const getNonNullableError = (response: Result & { fetching: boolean }, da
 
 export const assertOperationSuccess = (response: OperationResult<any>, dataPath: string[], throwOnEmptyData = false) => {
   if (response.error) {
-    if (response.error instanceof CombinedError && (response.error.networkError as any as Error[])?.length) {
-      response.error.message = (response.error.networkError as any as Error[]).map((error) => "[Network] " + error.message).join("\n");
+    if (response.error instanceof CombinedError && response.error.networkError) {
+      if (response.error.networkError?.message) {
+        response.error.message = `[Network] ${response.error.networkError.message}`;
+      } else {
+        response.error.message = `[Network] No message, error: string(response.error.networkError) \nstack: ${String(
+          response.error.networkError.stack
+        )}}`;
+      }
     }
     throw response.error;
   }