@cedarjs/web 7.0.0-canary.3258 → 7.0.0-rc.123

package/dist/components/DevFatalErrorPage.d.ts

@@ -1,17 +1,17 @@
 import React from 'react';
-import type { GraphQLFormattedError } from 'graphql';
+import type { GraphQLError } from 'graphql';
 type RequestDetails = {
     query: string;
     operationName: string;
     operationKind: string;
     variables: any;
 };
-interface EnhancedGqlError extends GraphQLFormattedError {
+interface EnhancedGqlError extends GraphQLError {
     __RedwoodEnhancedError: RequestDetails;
 }
 type ErrorWithRequestMeta = Error & {
     mostRecentRequest?: RequestDetails;
-    errors?: EnhancedGqlError[];
+    graphQLErrors?: EnhancedGqlError[];
     mostRecentResponse?: any;
 };
 export declare const DevFatalErrorPage: (props: {

package/dist/components/DevFatalErrorPage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DevFatalErrorPage.d.ts","sourceRoot":"","sources":["../../src/components/DevFatalErrorPage.tsx"],"names":[],"mappings":"AAKA,OAAO,KAAsC,MAAM,OAAO,CAAA;AAE1D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAA;AAmBpD,KAAK,cAAc,GAAG;IACpB,KAAK,EAAE,MAAM,CAAA;IACb,aAAa,EAAE,MAAM,CAAA;IACrB,aAAa,EAAE,MAAM,CAAA;IACrB,SAAS,EAAE,GAAG,CAAA;CACf,CAAA;AAED,UAAU,gBAAiB,SAAQ,qBAAqB;IACtD,sBAAsB,EAAE,cAAc,CAAA;CACvC;AAID,KAAK,oBAAoB,GAAG,KAAK,GAAG;IAClC,iBAAiB,CAAC,EAAE,cAAc,CAAA;IAClC,MAAM,CAAC,EAAE,gBAAgB,EAAE,CAAA;IAC3B,kBAAkB,CAAC,EAAE,GAAG,CAAA;CACzB,CAAA;AA+GD,eAAO,MAAM,iBAAiB,GAAI,OAAO;IAAE,KAAK,CAAC,EAAE,oBAAoB,CAAA;CAAE,sBA4FxE,CAAA"}
+{"version":3,"file":"DevFatalErrorPage.d.ts","sourceRoot":"","sources":["../../src/components/DevFatalErrorPage.tsx"],"names":[],"mappings":"AAKA,OAAO,KAAsC,MAAM,OAAO,CAAA;AAE1D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAmB3C,KAAK,cAAc,GAAG;IACpB,KAAK,EAAE,MAAM,CAAA;IACb,aAAa,EAAE,MAAM,CAAA;IACrB,aAAa,EAAE,MAAM,CAAA;IACrB,SAAS,EAAE,GAAG,CAAA;CACf,CAAA;AAED,UAAU,gBAAiB,SAAQ,YAAY;IAC7C,sBAAsB,EAAE,cAAc,CAAA;CACvC;AAGD,KAAK,oBAAoB,GAAG,KAAK,GAAG;IAClC,iBAAiB,CAAC,EAAE,cAAc,CAAA;IAClC,aAAa,CAAC,EAAE,gBAAgB,EAAE,CAAA;IAClC,kBAAkB,CAAC,EAAE,GAAG,CAAA;CACzB,CAAA;AAiGD,eAAO,MAAM,iBAAiB,GAAI,OAAO;IAAE,KAAK,CAAC,EAAE,oBAAoB,CAAA;CAAE,sBA4FxE,CAAA"}

package/dist/components/DevFatalErrorPage.js

@@ -10,90 +10,73 @@ if (/^[A-Z]:\\/.test(srcRoot)) {
 } else {
   appRoot = srcRoot.substring(1);
 }
-function formatMarkdownCode(value) {
-  const fence = "`".repeat(longestBacktickRun(value) + 1);
-  const padding = value.startsWith("`") || value.endsWith("`") ? " " : "";
-  return `${fence}${padding}${value}${padding}${fence}`;
-}
-function formatMarkdownCodeBlock(value, language) {
-  const fence = "`".repeat(Math.max(3, longestBacktickRun(value) + 1));
-  return `${fence}${language}
-${value}
-${fence}`;
-}
-function longestBacktickRun(value) {
-  return Array.from(value.matchAll(/`+/g)).reduce(
-    (longest, [run]) => Math.max(longest, run.length),
-    0
-  );
-}
-function formatErrorForClipboard(stack, typeName, msg, errorWithMeta) {
-  const sections = [
-    `## Error
-
-${formatMarkdownCode(typeName)}: ${formatMarkdownCode(msg)}`
-  ];
-  const mostRecentRequest = errorWithMeta.mostRecentRequest || errorWithMeta.errors?.find((gqlErr) => gqlErr.__RedwoodEnhancedError)?.__RedwoodEnhancedError;
+function formatErrorForClipboard(err, stack, typeName, msg, errorWithMeta) {
+  const lines = [];
+  lines.push("=".repeat(80));
+  lines.push("FATAL ERROR REPORT");
+  lines.push("=".repeat(80));
+  lines.push("");
+  lines.push(`ERROR TYPE: ${typeName}`);
+  lines.push(`ERROR MESSAGE: ${msg}`);
+  lines.push("");
+  const mostRecentRequest = errorWithMeta.mostRecentRequest || errorWithMeta.graphQLErrors?.find((gqlErr) => gqlErr.__RedwoodEnhancedError)?.__RedwoodEnhancedError;
   if (mostRecentRequest) {
-    let variables;
+    lines.push("-".repeat(80));
+    lines.push("REQUEST CONTEXT");
+    lines.push("-".repeat(80));
+    lines.push(`Operation: ${mostRecentRequest.operationName}`);
+    lines.push(`Kind: ${mostRecentRequest.operationKind}`);
+    lines.push("");
+    lines.push("Variables:");
     try {
-      variables = JSON.stringify(mostRecentRequest.variables, null, 2) ?? "undefined";
+      lines.push(JSON.stringify(mostRecentRequest.variables, null, 2));
     } catch {
-      variables = "Unable to stringify variables";
+      lines.push("Unable to stringify variables");
     }
-    sections.push(
-      [
-        "## Request",
-        "",
-        `${mostRecentRequest.operationKind} ${mostRecentRequest.operationName}`,
-        "",
-        "### Variables",
-        "",
-        formatMarkdownCodeBlock(variables, "json"),
-        "",
-        "### Query",
-        "",
-        formatMarkdownCodeBlock(mostRecentRequest.query, "graphql")
-      ].join("\n")
-    );
+    lines.push("");
+    lines.push("Query:");
+    lines.push(mostRecentRequest.query);
+    lines.push("");
   }
   if (errorWithMeta.mostRecentResponse) {
-    let response;
+    lines.push("-".repeat(80));
+    lines.push("RESPONSE CONTEXT");
+    lines.push("-".repeat(80));
     try {
-      response = JSON.stringify(errorWithMeta.mostRecentResponse, null, 2) ?? "undefined";
+      lines.push(JSON.stringify(errorWithMeta.mostRecentResponse, null, 2));
     } catch {
-      response = "Unable to stringify response";
+      lines.push("Unable to stringify response");
     }
-    sections.push(`## Response
-
-${formatMarkdownCodeBlock(response, "json")}`);
+    lines.push("");
   }
-  const stackEntries = stack.items.map((entry, i) => {
-    const file = entry.fileShort || "[Unknown]";
+  lines.push("-".repeat(80));
+  lines.push("STACK TRACE");
+  lines.push("-".repeat(80));
+  stack.items.forEach((entry, i) => {
+    const fileShort = entry.fileShort || "[Unknown]";
     const callee = entry.callee || "[Anonymous]";
-    const location = `${file}:${entry.line || "?"}:${entry.column || "?"}`;
-    const lines = [`${i + 1}. \`${location}\` in \`${callee}\``];
+    const line = entry.line || "?";
+    const column = entry.column || "?";
+    lines.push(`[${i}] ${fileShort}:${line}:${column} in ${callee}`);
     const sourceFile = entry.sourceFile;
-    if (sourceFile?.lines.length && entry.line && entry.line <= sourceFile.lines.length && !entry.thirdParty) {
-      const lineIndex = entry.line - 1;
+    if (sourceFile?.lines && sourceFile.lines.length > 0) {
+      const lineIndex = (entry.line || 1) - 1;
       const window = 2;
       const start = Math.max(0, lineIndex - window);
       const end = Math.min(sourceFile.lines.length, lineIndex + window + 1);
-      const sourceLines = [];
+      lines.push("  Source context:");
       for (let idx = start; idx < end; idx++) {
-        const marker = idx === lineIndex ? ">" : " ";
-        sourceLines.push(
-          `${marker} ${(idx + 1).toString().padStart(4)} | ${sourceFile.lines[idx]}`
+        const marker = idx === lineIndex ? "> " : "  ";
+        lines.push(
+          `  ${marker}${(idx + 1).toString().padStart(4)} | ${sourceFile.lines[idx]}`
         );
       }
-      lines.push("", formatMarkdownCodeBlock(sourceLines.join("\n"), "text"));
+      lines.push("");
     }
-    return lines.join("\n");
   });
-  sections.push(`## Stack trace
-
-${stackEntries.join("\n\n")}`);
-  return sections.join("\n\n");
+  lines.push("");
+  lines.push("=".repeat(80));
+  return lines.join("\n");
 }
 const DevFatalErrorPage = (props) => {
   const [copyFeedback, setCopyFeedback] = useState("");
@@ -116,7 +99,7 @@ const DevFatalErrorPage = (props) => {
   const msg = String(err?.message);
   const FileRef = stack.items[0] ? /* @__PURE__ */ React.createElement("a", { href: toVSCodeURL(stack.items[0]) }, stack.items[0].fileName) : null;
   const handleCopyAll = async () => {
-    const errorText = formatErrorForClipboard(stack, typeName, msg, err);
+    const errorText = formatErrorForClipboard(err, stack, typeName, msg, err);
     try {
       await navigator.clipboard.writeText(errorText);
       setCopyFeedback("\u2713 Copied to clipboard");
@@ -211,7 +194,7 @@ function ResponseRequest(props) {
   if (!props.error) {
     return null;
   }
-  const mostRecentRequest = props.error.mostRecentRequest || props.error.errors?.find((gqlErr) => gqlErr.__RedwoodEnhancedError)?.__RedwoodEnhancedError;
+  const mostRecentRequest = props.error.mostRecentRequest || props.error.graphQLErrors?.find((gqlErr) => gqlErr.__RedwoodEnhancedError)?.__RedwoodEnhancedError;
   const mostRecentResponse = props.error.mostRecentResponse;
   return /* @__PURE__ */ React.createElement("div", { className: "request-response" }, mostRecentRequest ? /* @__PURE__ */ React.createElement("div", null, /* @__PURE__ */ React.createElement("h4", null, "Request: ", mostRecentRequest.operationName), /* @__PURE__ */ React.createElement("div", null, /* @__PURE__ */ React.createElement("h5", null, "Variables:"), /* @__PURE__ */ React.createElement("code", null, /* @__PURE__ */ React.createElement("pre", null, JSON.stringify(mostRecentRequest.variables, null, "  ")))), /* @__PURE__ */ React.createElement("div", null, /* @__PURE__ */ React.createElement("h5", null, "Query:"), /* @__PURE__ */ React.createElement("code", null, /* @__PURE__ */ React.createElement(
     "pre",

package/dist/components/FatalErrorBoundary.d.ts

@@ -18,7 +18,7 @@ declare class FatalErrorBoundary extends React.Component<PropsFatalErrorBoundary
         hasError: boolean;
         error: Error;
     };
-    render(): string | number | bigint | boolean | Iterable<React.ReactNode> | Promise<string | number | bigint | boolean | React.ReactPortal | React.ReactElement<unknown, string | React.JSXElementConstructor<any>> | Iterable<React.ReactNode> | null | undefined> | React.JSX.Element | null | undefined;
+    render(): string | number | boolean | Iterable<React.ReactNode> | React.PromiseLikeOfReactNode | React.JSX.Element | null | undefined;
 }
 export { FatalErrorBoundary };
 //# sourceMappingURL=FatalErrorBoundary.d.ts.map

package/dist/components/cell/CellErrorBoundary.d.ts

@@ -1,8 +1,8 @@
 import React from 'react';
-import type { useQuery } from '@apollo/client/react';
+import type { QueryResult } from '@apollo/client';
 import type { CellFailureProps } from './cellTypes.js';
 export type FallbackProps = {
-    error: useQuery.Result['error'];
+    error: QueryResult['error'];
     resetErrorBoundary: () => void;
 };
 export type CellErrorBoundaryProps = {
@@ -11,7 +11,7 @@ export type CellErrorBoundaryProps = {
 };
 interface ErrState {
     hasError: boolean;
-    error?: useQuery.Result['error'];
+    error?: QueryResult['error'];
 }
 export declare class CellErrorBoundary extends React.Component<CellErrorBoundaryProps, ErrState> {
     constructor(props: CellErrorBoundaryProps);

package/dist/components/cell/CellErrorBoundary.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CellErrorBoundary.d.ts","sourceRoot":"","sources":["../../../src/components/cell/CellErrorBoundary.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAEpD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAA;AAEtD,MAAM,MAAM,aAAa,GAAG;IAC1B,KAAK,EAAE,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;IAC/B,kBAAkB,EAAE,MAAM,IAAI,CAAA;CAC/B,CAAA;AAED,MAAM,MAAM,sBAAsB,GAAG;IAGnC,cAAc,EAAE,CACd,OAAO,EAAE,aAAa,KACnB,KAAK,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAA;IACzC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;CAC1B,CAAA;AAED,UAAU,QAAQ;IAChB,QAAQ,EAAE,OAAO,CAAA;IACjB,KAAK,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;CACjC;AAED,qBAAa,iBAAkB,SAAQ,KAAK,CAAC,SAAS,CACpD,sBAAsB,EACtB,QAAQ,CACT;gBACa,KAAK,EAAE,sBAAsB;IAKzC,MAAM,CAAC,wBAAwB,CAAC,KAAK,EAAE,KAAK;;;;IAI5C,iBAAiB,CAAC,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS;IAQ1D,MAAM;CAgBP"}
+{"version":3,"file":"CellErrorBoundary.d.ts","sourceRoot":"","sources":["../../../src/components/cell/CellErrorBoundary.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAEjD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAA;AAEtD,MAAM,MAAM,aAAa,GAAG;IAC1B,KAAK,EAAE,WAAW,CAAC,OAAO,CAAC,CAAA;IAC3B,kBAAkB,EAAE,MAAM,IAAI,CAAA;CAC/B,CAAA;AAED,MAAM,MAAM,sBAAsB,GAAG;IAGnC,cAAc,EAAE,CACd,OAAO,EAAE,aAAa,KACnB,KAAK,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAA;IACzC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;CAC1B,CAAA;AAED,UAAU,QAAQ;IAChB,QAAQ,EAAE,OAAO,CAAA;IACjB,KAAK,CAAC,EAAE,WAAW,CAAC,OAAO,CAAC,CAAA;CAC7B;AAED,qBAAa,iBAAkB,SAAQ,KAAK,CAAC,SAAS,CACpD,sBAAsB,EACtB,QAAQ,CACT;gBACa,KAAK,EAAE,sBAAsB;IAKzC,MAAM,CAAC,wBAAwB,CAAC,KAAK,EAAE,KAAK;;;;IAI5C,iBAAiB,CAAC,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS;IAQ1D,MAAM;CAgBP"}

package/dist/components/cell/cellTypes.d.ts

@@ -1,6 +1,5 @@
-import type { ComponentProps, JSX, JSXElementConstructor } from 'react';
-import type { ApolloClient, NetworkStatus, OperationVariables, TypedDocumentNode } from '@apollo/client';
-import type { QueryRef, SkipToken, useBackgroundQuery, useQuery } from '@apollo/client/react';
+import type { ComponentProps, JSXElementConstructor } from 'react';
+import type { ApolloClient, NetworkStatus, OperationVariables, QueryRef, QueryResult, UseBackgroundQueryResult } from '@apollo/client';
 import type { DocumentNode } from 'graphql';
 import type { A, L, O, U } from 'ts-toolbelt';
 /**
@@ -22,7 +21,7 @@ type CellPropsVariables<Cell, GQLVariables> = Cell extends {
  * Cell component props which is the combination of query variables and Success props.
  */
 export type CellProps<CellSuccess extends keyof JSX.IntrinsicElements | JSXElementConstructor<any>, GQLResult, CellType, GQLVariables> = A.Compute<Omit<ComponentProps<CellSuccess>, keyof CellPropsVariables<CellType, GQLVariables> | keyof (GQLVariables extends Record<string, never> ? unknown : GQLVariables) | keyof GQLResult | 'updating' | 'queryResult'> & CellPropsVariables<CellType, GQLVariables>>;
-type InputVarProps<T> = unknown extends T ? unknown : T extends {
+type InputVarProps<T> = T extends {
     [key: string]: never;
 } ? unknown : T;
 export type CellLoadingProps<TVariables extends OperationVariables = any> = {
@@ -30,7 +29,7 @@ export type CellLoadingProps<TVariables extends OperationVariables = any> = {
 } & InputVarProps<TVariables>;
 export type CellFailureProps<TVariables extends OperationVariables = any> = {
     queryResult?: NonSuspenseCellQueryResult<TVariables, any> | SuspenseCellQueryResult;
-    error?: useQuery.Result['error'] | Error;
+    error?: QueryResult['error'] | Error;
     /**
      * @see {@link https://www.apollographql.com/docs/apollo-server/data/errors/#error-codes}
      */
@@ -76,50 +75,17 @@ export type CellSuccessProps<TData = any, TVariables extends OperationVariables
 export type DataObject = {
     [key: string]: unknown;
 };
-/**
- * What `beforeQuery` returns is handed straight to the GraphQL client's query
- * hook, so any of that hook's options can be set here.
- */
-export type CellBeforeQueryOptions<CellVariables> = {
-    variables: CellVariables;
-} & Omit<useQuery.Options<DataObject, OperationVariables>, 'variables'>;
-/**
- * `beforeQuery` can return `skipToken` instead of an options object to keep the
- * query from being executed at all. A skipped Cell renders nothing -- none of
- * `Loading`, `Empty`, `Failure` or `Success` are rendered.
- *
- * @see {@link https://www.apollographql.com/docs/react/api/react/hooks#skiptoken}
- *
- * @example
- * ```ts
- * import { skipToken } from '@apollo/client/react'
- *
- * export const beforeQuery = ({ id }) => {
- *   const otherId = useStore((state) => state.getOther(id))
- *
- *   return otherId ? { variables: { id, otherId } } : skipToken
- * }
- * ```
- */
-export type CellBeforeQueryResult<CellVariables> = CellBeforeQueryOptions<CellVariables> | SkipToken;
 /**
  * The main interface.
- *
- * @param GQLResult - The shape of the data returned by `QUERY` (or, for
- * fragment Cells, the shape of the fragment's data). This is what
- * `Success`/`Empty` receive their data as. Defaults to `any` so Cells that
- * don't -- or can't -- type their `QUERY` with `TypedDocumentNode` (e.g. in
- * tests, or Cells built from a plain string) keep the pre-existing loose
- * behavior instead of erroring.
  */
-export interface CreateCellProps<CellProps, CellVariables extends OperationVariables = OperationVariables, GQLResult = any> {
+export interface CreateCellProps<CellProps, CellVariables> {
     /**
      * The GraphQL syntax tree to execute or function to call that returns it.
      * If `QUERY` is a function, it's called with the result of `beforeQuery`.
      *
      * Either `QUERY` or `FRAGMENT` must be provided.
      */
-    QUERY?: TypedDocumentNode<GQLResult, CellVariables> | DocumentNode | ((variables: Record<string, unknown>) => DocumentNode);
+    QUERY?: DocumentNode | ((variables: Record<string, unknown>) => DocumentNode);
     /**
      * A GraphQL fragment that declares this Cell's data requirements. Fragment
      * Cells don't fire their own query. Instead a parent Cell spreads the
@@ -133,11 +99,12 @@ export interface CreateCellProps<CellProps, CellVariables extends OperationVaria
     FRAGMENT?: DocumentNode;
     /**
      * Parse `props` into query variables. Most of the time `props` are appropriate variables as is.
-     *
-     * Any other option the GraphQL client's query hook accepts can be returned
-     * here as well. Return `skipToken` to not execute the query at all.
      */
-    beforeQuery?: ((props: CellProps) => CellBeforeQueryResult<CellVariables>) | (() => CellBeforeQueryResult<CellVariables>);
+    beforeQuery?: ((props: CellProps) => {
+        variables: CellVariables;
+    }) | (() => {
+        variables: CellVariables;
+    });
     /**
      * Sanitize the data returned from the query.
      */
@@ -167,19 +134,19 @@ export interface CreateCellProps<CellProps, CellVariables extends OperationVaria
     /**
      * If the query's in flight and there's no stale data, render this.
      */
-    Loading?: React.FC<CellLoadingProps<CellVariables> & Partial<CellProps>>;
+    Loading?: React.FC<CellLoadingProps & Partial<CellProps>>;
     /**
      * If something went wrong, render this.
      */
-    Failure?: React.FC<CellFailureProps<CellVariables> & Partial<CellProps>>;
+    Failure?: React.FC<CellFailureProps & Partial<CellProps>>;
     /**
      * If no data was returned, render this.
      */
-    Empty?: React.FC<CellSuccessProps<GQLResult, CellVariables> & Partial<CellProps>>;
+    Empty?: React.FC<CellSuccessProps & Partial<CellProps>>;
     /**
      * If data was returned, render this.
      */
-    Success: React.FC<CellSuccessProps<GQLResult, CellVariables> & Partial<CellProps>>;
+    Success: React.FC<CellSuccessProps & Partial<CellProps>>;
     /**
      * What to call the Cell. Defaults to the filename.
      */
@@ -190,9 +157,9 @@ export type SuspendingSuccessProps = React.PropsWithChildren<Record<string, unkn
     suspenseQueryResult: SuspenseCellQueryResult<DataObject, any>;
     userProps: Record<string, any>;
 };
-export type NonSuspenseCellQueryResult<TVariables extends OperationVariables = any, TData = any> = Partial<Omit<useQuery.Result<TData, TVariables>, 'loading' | 'error' | 'data'>>;
-export interface SuspenseCellQueryResult<_TData = any, _TVariables extends OperationVariables = any> extends useBackgroundQuery.Result<DataObject> {
-    client: ApolloClient;
+export type NonSuspenseCellQueryResult<TVariables extends OperationVariables = any, TData = any> = Partial<Omit<QueryResult<TData, TVariables>, 'loading' | 'error' | 'data'>>;
+export interface SuspenseCellQueryResult<_TData = any, _TVariables extends OperationVariables = any> extends UseBackgroundQueryResult {
+    client: ApolloClient<any>;
     networkStatus?: NetworkStatus;
     called: boolean;
 }

package/dist/components/cell/cellTypes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cellTypes.d.ts","sourceRoot":"","sources":["../../../src/components/cell/cellTypes.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cellTypes.d.ts","sourceRoot":"","sources":["../../../src/components/cell/cellTypes.ts"],"names":[],"mappings":"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"}

package/dist/components/cell/createCell.d.ts

@@ -1,5 +1,4 @@
 import React from 'react';
-import type { OperationVariables } from '@apollo/client';
 import type { CreateCellProps } from './cellTypes.js';
-export declare function createCell<CellProps extends Record<string, unknown>, CellVariables extends OperationVariables = OperationVariables, GQLResult = any>(createCellProps: CreateCellProps<CellProps, CellVariables, GQLResult>): React.FC<CellProps>;
+export declare function createCell<CellProps extends Record<string, unknown>, CellVariables extends Record<string, unknown>>(createCellProps: CreateCellProps<CellProps, CellVariables>): React.FC<CellProps>;
 //# sourceMappingURL=createCell.d.ts.map

package/dist/components/cell/createCell.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createCell.d.ts","sourceRoot":"","sources":["../../../src/components/cell/createCell.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;AAQxD,OAAO,KAAK,EAAE,eAAe,EAAc,MAAM,gBAAgB,CAAA;AAKjE,wBAAgB,UAAU,CACxB,SAAS,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACzC,aAAa,SAAS,kBAAkB,GAAG,kBAAkB,EAC7D,SAAS,GAAG,GAAG,EAEf,eAAe,EAAE,eAAe,CAAC,SAAS,EAAE,aAAa,EAAE,SAAS,CAAC,GACpE,KAAK,CAAC,EAAE,CAAC,SAAS,CAAC,CAoCrB"}
+{"version":3,"file":"createCell.d.ts","sourceRoot":"","sources":["../../../src/components/cell/createCell.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAQzB,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAKrD,wBAAgB,UAAU,CACxB,SAAS,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACzC,aAAa,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAE7C,eAAe,EAAE,eAAe,CAAC,SAAS,EAAE,aAAa,CAAC,GACzD,KAAK,CAAC,EAAE,CAAC,SAAS,CAAC,CAiCrB"}

package/dist/components/cell/createCell.js

@@ -1,6 +1,5 @@
 import React from "react";
-import { CombinedGraphQLErrors } from "@apollo/client";
-import { useQuery } from "@apollo/client/react";
+import { useQuery } from "@apollo/client/react/hooks/hooks.cjs";
 import { fragmentRegistry } from "../../apollo/fragmentRegistry.js";
 import { getOperationName } from "../../graphql.js";
 import { useCellCacheContext } from "./CellCacheContext.js";
@@ -16,9 +15,7 @@ function createCell(createCellProps) {
   }
   if (RWJS_ENV.RWJS_EXP_STREAMING_SSR) {
     const suspendingCellProps = createCellProps;
-    return createSuspendingCell(
-      suspendingCellProps
-    );
+    return createSuspendingCell(suspendingCellProps);
   }
   return createNonSuspendingCell(createCellProps);
 }
@@ -53,9 +50,7 @@ function createNonSuspendingCell({
   function NamedCell(props) {
     const { children: _, ...variables } = props;
     const options = beforeQuery(variables);
-    const queryOptions = typeof options === "symbol" ? void 0 : options;
-    const skipped = !queryOptions || queryOptions.skip === true;
-    const query = typeof cellQuery === "function" ? cellQuery(queryOptions ?? {}) : cellQuery;
+    const query = typeof cellQuery === "function" ? cellQuery(options) : cellQuery;
     let {
       // eslint-disable-next-line prefer-const
       error,
@@ -65,77 +60,77 @@ function createNonSuspendingCell({
     } = useQuery(query, options);
     if (globalThis.__REDWOOD__PRERENDERING) {
       const { queryCache } = useCellCacheContext();
-      if (!skipped) {
-        const operationName = getOperationName(query);
-        const transformedQuery = fragmentRegistry.transform(query);
-        let cacheKey;
-        if (operationName) {
-          cacheKey = operationName + "_" + JSON.stringify(variables);
+      const operationName = getOperationName(query);
+      const transformedQuery = fragmentRegistry.transform(query);
+      let cacheKey;
+      if (operationName) {
+        cacheKey = operationName + "_" + JSON.stringify(variables);
+      } else {
+        const cellName = displayName === "Cell" ? "the cell" : displayName;
+        throw new Error(
+          `The gql query in ${cellName} is missing an operation name. Something like FindBlogPostQuery in \`query FindBlogPostQuery($id: Int!)\``
+        );
+      }
+      const queryInfo = queryCache[cacheKey];
+      if (queryInfo?.renderLoading) {
+        loading = true;
+      } else {
+        if (queryInfo?.hasProcessed) {
+          loading = false;
+          data = queryInfo.data;
+          queryResult = { variables };
         } else {
-          const cellName = displayName === "Cell" ? "the cell" : displayName;
-          throw new Error(
-            `The gql query in ${cellName} is missing an operation name. Something like FindBlogPostQuery in \`query FindBlogPostQuery($id: Int!)\``
-          );
-        }
-        const queryInfo = queryCache[cacheKey];
-        if (queryInfo?.renderLoading) {
-          loading = true;
-        } else {
-          if (queryInfo?.hasProcessed) {
-            loading = false;
-            data = queryInfo.data;
-            queryResult = { variables };
-          } else {
-            queryCache[cacheKey] ||= {
-              query: transformedQuery,
-              variables: queryOptions.variables,
-              hasProcessed: false
-            };
-          }
+          queryCache[cacheKey] ||= {
+            query: transformedQuery,
+            variables: options.variables,
+            hasProcessed: false
+          };
         }
       }
     }
-    if (skipped) {
-      return null;
-    }
     if (error) {
       if (Failure) {
-        const failureProps = {
-          error,
-          errorCode: (
-            // Use the ad-hoc QueryResultWithErrorCode type to access the errorCode
-            queryResult.errorCode ?? (CombinedGraphQLErrors.is(error) ? error.errors[0]?.extensions?.["code"] : void 0)
-          ),
-          ...props,
-          updating: loading,
-          queryResult
-        };
-        return /* @__PURE__ */ React.createElement(Failure, { ...failureProps });
+        return /* @__PURE__ */ React.createElement(
+          Failure,
+          {
+            error,
+            errorCode: (
+              // Use the ad-hoc QueryResultWithErrorCode type to access the errorCode
+              queryResult.errorCode ?? error.graphQLErrors?.[0]?.extensions?.["code"]
+            ),
+            ...props,
+            updating: loading,
+            queryResult
+          }
+        );
       } else {
-        throw error instanceof Error ? error : new Error(error.message);
+        throw error;
       }
     } else if (data) {
       const afterQueryData = afterQuery(data);
       if (isEmpty(data, { isDataEmpty }) && Empty) {
-        const emptyProps = {
-          ...props,
-          ...afterQueryData,
-          updating: loading,
-          queryResult
-        };
-        return /* @__PURE__ */ React.createElement(Empty, { ...emptyProps });
+        return /* @__PURE__ */ React.createElement(
+          Empty,
+          {
+            ...props,
+            ...afterQueryData,
+            updating: loading,
+            queryResult
+          }
+        );
       } else {
-        const successProps = {
-          ...props,
-          ...afterQueryData,
-          updating: loading,
-          queryResult
-        };
-        return /* @__PURE__ */ React.createElement(Success, { ...successProps });
+        return /* @__PURE__ */ React.createElement(
+          Success,
+          {
+            ...props,
+            ...afterQueryData,
+            updating: loading,
+            queryResult
+          }
+        );
       }
     } else if (loading) {
-      const loadingProps = { ...props, queryResult };
-      return /* @__PURE__ */ React.createElement(Loading, { ...loadingProps });
+      return /* @__PURE__ */ React.createElement(Loading, { ...props, queryResult });
     } else {
       console.warn(
         `If you're using Apollo Client, check for its debug logs here in the console, which may help explain the error.`

package/dist/components/cell/createFragmentCell.d.ts

@@ -1,5 +1,4 @@
 import React from 'react';
-import type { OperationVariables } from '@apollo/client';
 import type { CreateCellProps } from './cellTypes.js';
 /**
  * Creates a Cell out of a GraphQL fragment and components that render its
@@ -16,5 +15,5 @@ import type { CreateCellProps } from './cellTypes.js';
  * mutations update the underlying entity. If the cache read is incomplete,
  * the passed-in object itself is used as the data snapshot.
  */
-export declare function createFragmentCell<CellProps extends Record<string, unknown>, CellVariables extends OperationVariables = OperationVariables, GQLResult = any>({ FRAGMENT, afterQuery, isEmpty, Empty, Success, displayName, }: CreateCellProps<CellProps, CellVariables, GQLResult>): React.FC<CellProps>;
+export declare function createFragmentCell<CellProps extends Record<string, unknown>, CellVariables extends Record<string, unknown>>({ FRAGMENT, afterQuery, isEmpty, Empty, Success, displayName, }: CreateCellProps<CellProps, CellVariables>): React.FC<CellProps>;
 //# sourceMappingURL=createFragmentCell.d.ts.map

package/dist/components/cell/createFragmentCell.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createFragmentCell.d.ts","sourceRoot":"","sources":["../../../src/components/cell/createFragmentCell.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;AAMxD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAqDrD;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,kBAAkB,CAChC,SAAS,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACzC,aAAa,SAAS,kBAAkB,GAAG,kBAAkB,EAC7D,SAAS,GAAG,GAAG,EACf,EACA,QAAQ,EACR,UAA2B,EAC3B,OAAqB,EACrB,KAAK,EACL,OAAO,EACP,WAAoB,GACrB,EAAE,eAAe,CAAC,SAAS,EAAE,aAAa,EAAE,SAAS,CAAC,GAAG,KAAK,CAAC,EAAE,CAAC,SAAS,CAAC,CAiF5E"}
+{"version":3,"file":"createFragmentCell.d.ts","sourceRoot":"","sources":["../../../src/components/cell/createFragmentCell.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAOzB,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAqDrD;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,kBAAkB,CAChC,SAAS,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACzC,aAAa,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7C,EACA,QAAQ,EACR,UAA2B,EAC3B,OAAqB,EACrB,KAAK,EACL,OAAO,EACP,WAAoB,GACrB,EAAE,eAAe,CAAC,SAAS,EAAE,aAAa,CAAC,GAAG,KAAK,CAAC,EAAE,CAAC,SAAS,CAAC,CAkEjE"}

package/dist/components/cell/createFragmentCell.js

@@ -58,12 +58,10 @@ function createFragmentCell({
     }
     const data = fragmentResult.complete ? fragmentResult.data : dataRef ?? null;
     const afterQueryData = afterQuery({ [propName]: data });
-    const restProps = rest;
-    const successProps = { ...restProps, ...afterQueryData };
     if (isEmpty({ [propName]: data }, { isDataEmpty }) && Empty) {
-      return /* @__PURE__ */ React.createElement(Empty, { ...successProps });
+      return /* @__PURE__ */ React.createElement(Empty, { ...rest, ...afterQueryData });
     }
-    return /* @__PURE__ */ React.createElement(Success, { ...successProps });
+    return /* @__PURE__ */ React.createElement(Success, { ...rest, ...afterQueryData });
   }
   NamedCell.displayName = displayName;
   return (props) => {

package/dist/components/cell/createServerCell.d.ts

@@ -1,7 +1,6 @@
 import React from 'react';
-import type { OperationVariables } from '@apollo/client';
 import type { CreateCellProps } from './cellTypes.js';
-type CreateServerCellProps<CellProps, CellVariables extends OperationVariables = OperationVariables, GQLResult = any> = Omit<CreateCellProps<CellProps, CellVariables, GQLResult>, 'QUERY' | 'Failure'> & {
+type CreateServerCellProps<CellProps, CellVariables> = Omit<CreateCellProps<CellProps, CellVariables>, 'QUERY' | 'Failure'> & {
     data: (variables?: AnyObj) => any;
     Failure?: React.ComponentType<{
         error: unknown;
@@ -11,6 +10,6 @@ type CreateServerCellProps<CellProps, CellVariables extends OperationVariables =
     }>;
 };
 type AnyObj = Record<string, unknown>;
-export declare function createServerCell<CellProps extends AnyObj, CellVariables extends OperationVariables = OperationVariables, GQLResult = any>(createCellProps: CreateServerCellProps<CellProps, CellVariables, GQLResult>): React.FC<CellProps>;
+export declare function createServerCell<CellProps extends AnyObj, CellVariables extends AnyObj>(createCellProps: CreateServerCellProps<CellProps, CellVariables>): React.FC<CellProps>;
 export {};
 //# sourceMappingURL=createServerCell.d.ts.map

package/dist/components/cell/createServerCell.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createServerCell.d.ts","sourceRoot":"","sources":["../../../src/components/cell/createServerCell.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAmB,MAAM,OAAO,CAAA;AAEvC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;AAMxD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAIrD,KAAK,qBAAqB,CACxB,SAAS,EACT,aAAa,SAAS,kBAAkB,GAAG,kBAAkB,EAC7D,SAAS,GAAG,GAAG,IACb,IAAI,CACN,eAAe,CAAC,SAAS,EAAE,aAAa,EAAE,SAAS,CAAC,EACpD,OAAO,GAAG,SAAS,CACpB,GAAG;IACF,IAAI,EAAE,CAAC,SAAS,CAAC,EAAE,MAAM,KAAK,GAAG,CAAA;IACjC,OAAO,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;QAC5B,KAAK,EAAE,OAAO,CAAA;QACd,WAAW,EAAE;YAAE,OAAO,EAAE,CAAC,SAAS,EAAE,SAAS,KAAK,MAAM,CAAA;SAAE,CAAA;KAC3D,CAAC,CAAA;CACH,CAAA;AAED,KAAK,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;AAErC,wBAAgB,gBAAgB,CAC9B,SAAS,SAAS,MAAM,EACxB,aAAa,SAAS,kBAAkB,GAAG,kBAAkB,EAC7D,SAAS,GAAG,GAAG,EAEf,eAAe,EAAE,qBAAqB,CAAC,SAAS,EAAE,aAAa,EAAE,SAAS,CAAC,GAC1E,KAAK,CAAC,EAAE,CAAC,SAAS,CAAC,CAuFrB"}
+{"version":3,"file":"createServerCell.d.ts","sourceRoot":"","sources":["../../../src/components/cell/createServerCell.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAmB,MAAM,OAAO,CAAA;AAMvC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAIrD,KAAK,qBAAqB,CAAC,SAAS,EAAE,aAAa,IAAI,IAAI,CACzD,eAAe,CAAC,SAAS,EAAE,aAAa,CAAC,EACzC,OAAO,GAAG,SAAS,CACpB,GAAG;IACF,IAAI,EAAE,CAAC,SAAS,CAAC,EAAE,MAAM,KAAK,GAAG,CAAA;IACjC,OAAO,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;QAC5B,KAAK,EAAE,OAAO,CAAA;QACd,WAAW,EAAE;YAAE,OAAO,EAAE,CAAC,SAAS,EAAE,SAAS,KAAK,MAAM,CAAA;SAAE,CAAA;KAC3D,CAAC,CAAA;CACH,CAAA;AAED,KAAK,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;AAErC,wBAAgB,gBAAgB,CAC9B,SAAS,SAAS,MAAM,EACxB,aAAa,SAAS,MAAM,EAE5B,eAAe,EAAE,qBAAqB,CAAC,SAAS,EAAE,aAAa,CAAC,GAC/D,KAAK,CAAC,EAAE,CAAC,SAAS,CAAC,CA2ErB"}