fix: test errors

gqty-dev · Sep 8, 2024 · fde673b · fde673b
1 parent 1abad53
commit fde673b
Show file tree

Hide file tree

Showing 10 changed files with 64 additions and 35 deletions.
diff --git a/internal/test-utils/src/client.ts b/internal/test-utils/src/client.ts
@@ -3,6 +3,7 @@ import assert from 'assert';
 import {
   Cache,
   createClient,
+  GQtyError,
   type BaseGeneratedSchema,
   type GQtyClient,
   type QueryPayload,
@@ -295,13 +296,25 @@ export const createInMemoryClient = async <TSchema extends BaseGeneratedSchema>(
       fetcher: async ({ query, variables, operationName }) => {
         await options.onFetch?.({ query, variables, operationName });
 
-        const res = await executor({
+        const result = await executor({
           document: parse(query),
           variables,
           operationName,
+        }).then((result) => {
+          if (Symbol.asyncIterator in result) {
+            return result[Symbol.asyncIterator]()
+              .next()
+              .then((res) => res.value as ExecutionResult<any, any>);
+          } else {
+            return result;
+          }
         });
 
-        return res as never;
+        if (result.errors?.length) {
+          throw GQtyError.fromGraphQLErrors(result.errors);
+        }
+
+        return result;
       },
       subscriber: new MockWsClient(executor),
     },

diff --git a/packages/gqty/src/Accessor/resolve.ts b/packages/gqty/src/Accessor/resolve.ts
@@ -254,10 +254,10 @@ const objectProxyHandler: ProxyHandler<GeneratedSchemaObject> = {
     const { __args, __type } = targetType;
     if (__args) {
       return (args?: Record<string, unknown>) => {
-        const alias = meta.context.aliasGenerator?.(
-          meta.selection.ancestry.map((s) => s.key.toString()).concat(key),
-          args
-        );
+        const keys = meta.selection.ancestry
+          .map((s) => s.key.toString())
+          .concat(key);
+        const alias = meta.context.aliasGenerator?.(keys, args);
         const input: SelectionInput = {};
 
         if (args) {
@@ -270,14 +270,12 @@ const objectProxyHandler: ProxyHandler<GeneratedSchemaObject> = {
           }
         }
 
-        return resolve(
-          proxy,
-          meta.selection.getChild(
-            key,
-            args ? { alias: alias?.field, input } : {}
-          ),
-          __type
+        const child = meta.selection.getChild(
+          key,
+          args ? { alias: alias?.field, input } : {}
         );
+
+        return resolve(proxy, child, __type);
       };
     }
 

diff --git a/packages/gqty/src/Helpers/prepass.ts b/packages/gqty/src/Helpers/prepass.ts
@@ -31,7 +31,7 @@ export function prepass<T extends object | null | undefined>(
             s.input
               ? {
                   field: `${s.key}`,
-                  variables: s.input.values,
+                  variables: s.inputValues,
                 }
               : `${s.key}`
           );

diff --git a/packages/gqty/src/Selection.ts b/packages/gqty/src/Selection.ts
@@ -43,6 +43,18 @@ export class Selection {
     return this.options.input;
   }
 
+  /**
+   * Stripping alias and type information from inputs, returning a bare mapping
+   * of variable names and values.
+   */
+  get inputValues() {
+    if (!this.input) return;
+
+    return Object.fromEntries(
+      Object.entries(this.input).map(([key, { value }]) => [key, value])
+    );
+  }
+
   /** Indicates current selection being a inteface/union key. */
   get isUnion() {
     return this.options.isUnion ?? false;
@@ -142,7 +154,7 @@ export class Selection {
 
   toString() {
     return `Selection(${this.cacheKeys.join('.')}) ${JSON.stringify(
-      this.input?.values ?? {}
+      this.inputValues ?? {}
     )}`;
   }
 }
diff --git a/packages/gqty/src/Utils/pick.ts b/packages/gqty/src/Utils/pick.ts
@@ -9,11 +9,11 @@ export const pick = (
 
   for (const { ancestry } of selections) {
     let srcNode = schema;
-    for (const { key, input } of ancestry) {
+    for (const { key, inputValues } of ancestry) {
       if (srcNode == null) break;
 
       if (typeof srcNode[key] === 'function') {
-        srcNode = srcNode[key](input?.values);
+        srcNode = srcNode[key](inputValues);
       } else {
         srcNode = srcNode[key];
       }

diff --git a/packages/gqty/test/selection.test.ts b/packages/gqty/test/selection.test.ts
@@ -10,8 +10,7 @@ describe('selection creation', () => {
     expect(selectionA.alias).toBe(undefined);
     expect(selectionA.root.key).toBe('mutation');
 
-    expect(selectionA.input?.values).toBe(undefined);
-    expect(selectionA.input?.types).toBe(undefined);
+    expect(selectionA.input).toBe(undefined);
     expect(selectionA.ancestry).toEqual([mutationRoot, selectionA]);
 
     expect(selectionA.cacheKeys).toEqual(['mutation', 'a']);

diff --git a/packages/logger/src/index.ts b/packages/logger/src/index.ts
@@ -162,14 +162,14 @@ export function createLogger(
       console.groupCollapsed(...format(['Selections', headerStyles]));
       for (const [
         ,
-        { key, cacheKeys, alias, input, isUnion },
+        { key, cacheKeys, alias, inputValues, isUnion },
       ] of uniqueSelections) {
         console.log(
           stringifyJSONIfEnabled({
             key,
             cacheKeys: cacheKeys.join('.'),
             alias,
-            input,
+            input: inputValues,
             isUnion,
           })
         );

diff --git a/packages/react/src/query/useQuery.ts b/packages/react/src/query/useQuery.ts
@@ -461,6 +461,7 @@ export const createUseQuery = <TSchema extends BaseGeneratedSchema>(
         fetchInBackground,
         operationName,
         selections,
+        state,
       ]
     );
 

diff --git a/packages/react/test/useQuery.test.tsx b/packages/react/test/useQuery.test.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-unused-expressions */
 import { renderHook, waitFor } from '@testing-library/react';
 import { Cache, type QueryPayload } from 'gqty';
 import { act } from 'react';
@@ -17,7 +18,7 @@ describe('useQuery', () => {
 
         results.push(query.$state.isLoading);
 
-        query.time;
+        Reflect.get(query, 'time');
 
         return query.$state.isLoading;
       });
@@ -146,16 +147,16 @@ describe('useQuery', () => {
       [
         {
           "operationName": undefined,
-          "query": "query($a00425:String){a2c936:human(name:$a00425){__typename id name}}",
+          "query": "query($a69281:String){a7b317:human(name:$a69281){__typename id name}}",
           "variables": {
-            "a00425": "1",
+            "a69281": "1",
           },
         },
         {
           "operationName": undefined,
-          "query": "query($dd0895:String){a657eb:human(name:$dd0895){__typename id name}}",
+          "query": "query($a7c6a0:String){dc91d3:human(name:$a7c6a0){__typename id name}}",
           "variables": {
-            "dd0895": "2",
+            "a7c6a0": "2",
           },
         },
       ]
@@ -281,6 +282,7 @@ describe('useQuery', () => {
     const { result } = renderHook(() => {
       const query = useQuery({
         initialLoadingState: true,
+        suspense: true,
       });
 
       // Empty array
@@ -299,9 +301,11 @@ describe('useQuery', () => {
     // This should NOT trigger a SWR refetch
     await act(() => result.current.$refetch(false));
 
+    expect(result.current.$state.error).toBeUndefined();
+
     expect(queries).toMatchInlineSnapshot(`
       [
-        "query($a2a039:ID!){eb2884:pet(id:$a2a039){__typename id owner{__typename id name}}now peoples{__typename id name}}",
+        "query($a1a2bc:ID!){a1648a:pet(id:$a1a2bc){__typename id owner{__typename id name}}now peoples{__typename id name}}",
       ]
     `);
 
@@ -311,10 +315,12 @@ describe('useQuery', () => {
     // This should trigger a SWR refetch
     await act(() => result.current.$refetch(false));
 
+    expect(result.current.$state.error).toBeUndefined();
+
     expect(queries).toMatchInlineSnapshot(`
       [
-        "query($a2a039:ID!){eb2884:pet(id:$a2a039){__typename id owner{__typename id name}}now peoples{__typename id name}}",
-        "query($a2a039:ID!){eb2884:pet(id:$a2a039){__typename id owner{__typename id name}}now peoples{__typename id name}}",
+        "query($a1a2bc:ID!){a1648a:pet(id:$a1a2bc){__typename id owner{__typename id name}}now peoples{__typename id name}}",
+        "query($a1a2bc:ID!){a1648a:pet(id:$a1a2bc){__typename id owner{__typename id name}}now peoples{__typename id name}}",
       ]
     `);
   });

diff --git a/packages/solid/src/query.test.tsx b/packages/solid/src/query.test.tsx
@@ -179,23 +179,23 @@ describe('createQuery', () => {
               [
                 {
                   "operationName": undefined,
-                  "query": "query($e61a8e:ID!){a02d2c:people(id:$e61a8e){__typename id name}}",
+                  "query": "query($a176f8:ID!){a66965:people(id:$a176f8){__typename id name}}",
                   "variables": {
-                    "e61a8e": "1",
+                    "a176f8": "1",
                   },
                 },
                 {
                   "operationName": undefined,
-                  "query": "query($d6d931:ID!){e084c7:people(id:$d6d931){__typename id name}}",
+                  "query": "query($a482a1:ID!){eebe6f:people(id:$a482a1){__typename id name}}",
                   "variables": {
-                    "d6d931": "2",
+                    "a482a1": "2",
                   },
                 },
                 {
                   "operationName": undefined,
-                  "query": "query($a60dd8:ID!){d2f785:people(id:$a60dd8){__typename id name}}",
+                  "query": "query($b8233c:ID!){c0c0aa:people(id:$b8233c){__typename id name}}",
                   "variables": {
-                    "a60dd8": "3",
+                    "b8233c": "3",
                   },
                 },
               ]