fix: avoid naming conflict with client prop

packages/web/src/components/createCell.tsx

@@ -18,7 +18,7 @@ import { useQuery } from './GraphQLHooksProvider'
  *
  * If the Cell does not have a `beforeQuery` function, then the variables are required.
  *
- * Note that a query that doesnt take any variables is defined as {[x: string]: never}
+ * Note that a query that doesn't take any variables is defined as {[x: string]: never}
  * The ternary at the end makes sure we don't include it, otherwise it won't allow merging any
  * other custom props from the Success component.
  *
@@ -293,8 +293,13 @@ export function createCell<
 
     // queryRest includes `variables: { ... }`, with any variables returned
     // from beforeQuery
-    // eslint-disable-next-line prefer-const
-    let { error, loading, data, ...queryRest } = useQuery(query, options)
+    let {
+      // eslint-disable-next-line prefer-const
+      error,
+      loading,
+      data,
+      ...queryResult
+    } = useQuery(query, options)
 
     if (globalThis.__REDWOOD__PRERENDERING) {
       // __REDWOOD__PRERENDERING will always either be set, or not set. So
@@ -331,7 +336,7 @@ export function createCell<
 
           // All of the gql client's props aren't available when pre-rendering,
           // so using `any` here
-          queryRest = { variables } as any
+          queryResult = { variables } as any
         } else {
           queryCache[cacheKey] ||
             (queryCache[cacheKey] = {
@@ -345,13 +350,23 @@ export function createCell<
 
     if (error) {
       if (Failure) {
+        // errorCode is not part of the type returned by useQuery
+        // but it is returned as part of the queryResult
+        type QueryResultWithErrorCode = typeof queryResult & {
+          errorCode: string
+        }
+
         return (
           <Failure
             error={error}
-            errorCode={error.graphQLErrors?.[0]?.extensions?.['code'] as string}
+            errorCode={
+              // Use the ad-hoc QueryResultWithErrorCode type to access the errorCode
+              (queryResult as QueryResultWithErrorCode).errorCode ??
+              (error.graphQLErrors?.[0]?.extensions?.['code'] as string)
+            }
             {...props}
             updating={loading}
-            {...queryRest}
+            queryResult={queryResult}
           />
         )
       } else {
@@ -366,7 +381,7 @@ export function createCell<
             {...props}
             {...afterQueryData}
             updating={loading}
-            {...queryRest}
+            queryResult={queryResult}
           />
         )
       } else {
@@ -375,12 +390,19 @@ export function createCell<
             {...props}
             {...afterQueryData}
             updating={loading}
-            {...queryRest}
+            queryResult={queryResult}
           />
         )
       }
     } else if (loading) {
-      return <Loading {...{ ...queryRest, ...props }} />
+      return (
+        <Loading
+          {...{
+            queryResult,
+            ...props,
+          }}
+        />
+      )
     } else {
       /**
        * There really shouldn't be an `else` here, but like any piece of software, GraphQL clients have bugs.