@cedarjs/web 7.0.0-canary.3137 → 7.0.0-canary.3138

package/dist/apollo/ApolloProviderWithFetchConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ApolloProviderWithFetchConfig.d.ts","sourceRoot":"","sources":["../../src/apollo/ApolloProviderWithFetchConfig.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,KAAK,EAAE,WAAW,EAAgB,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAchF,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAQ5C,OAAO,KAAK,EAEV,uBAAuB,EACxB,MAAM,sBAAsB,CAAA;AAoC7B,UAAU,KAAK;IACb,MAAM,EAAE,IAAI,CAAC,uBAAuB,EAAE,aAAa,GAAG,OAAO,CAAC,GAAG;QAC/D,KAAK,EAAE,WAAW,CAAA;KACnB,CAAA;IACD;;;;OAIG;IACH,WAAW,EAAE,MAAM,WAAW,CAAA;IAC9B,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,QAAQ,EAAE,UAAU,CAAC,OAAO,eAAe,CAAC,CAAA;IAC5C,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;CAC1B;AAED,wBAAgB,6BAA6B,CAAC,EAC5C,MAAM,EACN,WAAW,EACX,QAAQ,EACR,OAAmB,EACnB,QAAQ,GACT,EAAE,KAAK,qBAmMP"}
+{"version":3,"file":"ApolloProviderWithFetchConfig.d.ts","sourceRoot":"","sources":["../../src/apollo/ApolloProviderWithFetchConfig.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,KAAK,EAAE,WAAW,EAAgB,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAchF,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAQ5C,OAAO,KAAK,EAEV,uBAAuB,EACxB,MAAM,sBAAsB,CAAA;AAqC7B,UAAU,KAAK;IACb,MAAM,EAAE,IAAI,CAAC,uBAAuB,EAAE,aAAa,GAAG,OAAO,CAAC,GAAG;QAC/D,KAAK,EAAE,WAAW,CAAA;KACnB,CAAA;IACD;;;;OAIG;IACH,WAAW,EAAE,MAAM,WAAW,CAAA;IAC9B,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,QAAQ,EAAE,UAAU,CAAC,OAAO,eAAe,CAAC,CAAA;IAC5C,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;CAC1B;AAED,wBAAgB,6BAA6B,CAAC,EAC5C,MAAM,EACN,WAAW,EACX,QAAQ,EACR,OAAmB,EACnB,QAAQ,GACT,EAAE,KAAK,qBAsMP"}

package/dist/apollo/ApolloProviderWithFetchConfig.js

@@ -16,6 +16,7 @@ import { UploadHttpLink } from "../bundled/apollo-upload-client.js";
 import { useFetchConfig } from "../components/FetchConfigProvider.js";
 import { ApolloClientFactoryContext } from "./ApolloClientFactoryContext.js";
 import { ErrorBoundary } from "./ErrorBoundary.js";
+import { getOperationKind } from "./links.js";
 import * as SSELinkExports from "./sseLink.js";
 const { SSELink, isSubscription, isLiveQuery } = SSELinkExports;
 function ApolloProviderWithFetchConfig({
@@ -35,7 +36,10 @@ function ApolloProviderWithFetchConfig({
     const { operationName, query, variables } = operation;
     data.mostRecentRequest = {};
     data.mostRecentRequest.operationName = operationName;
-    data.mostRecentRequest.operationKind = query?.kind.toString();
+    data.mostRecentRequest.operationKind = getOperationKind(
+      query,
+      operationName
+    );
     data.mostRecentRequest.variables = variables;
     data.mostRecentRequest.query = query && print(operation.query);
     return forward(operation).pipe(

package/dist/apollo/links.d.ts

@@ -1,5 +1,7 @@
 import { ApolloLink, HttpLink } from '@apollo/client';
 import { SetContextLink } from '@apollo/client/link/context';
+import type { DocumentNode, OperationTypeNode } from 'graphql';
+export declare function getOperationKind(query: DocumentNode, operationName?: string): OperationTypeNode | undefined;
 export declare function createHttpLink(uri: string, httpLinkConfig: HttpLink.Options | undefined, cookieHeader?: string | null): HttpLink;
 export declare function createUpdateDataLink(): ApolloLink;
 export declare function createAuthApolloLink(authProviderType: string, headersFromFetchProvider: {

package/dist/apollo/links.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"links.d.ts","sourceRoot":"","sources":["../../src/apollo/links.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAA;AAI5D,wBAAgB,cAAc,CAC5B,GAAG,EAAE,MAAM,EACX,cAAc,EAAE,QAAQ,CAAC,OAAO,GAAG,SAAS,EAC5C,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,YAc7B;AAeD,wBAAgB,oBAAoB,eAqBnC;AACD,wBAAgB,oBAAoB,CAClC,gBAAgB,EAAE,MAAM,EACxB,wBAAwB,EACpB;IACE,eAAe,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IACpC,aAAa,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CACnC,GACD,SAAS,cA6Bd;AACD,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,kBAMrE;AAED,wBAAgB,eAAe,CAAC,EAC9B,kBAAkB,EAClB,YAAY,GACb,EAAE;IACD,kBAAkB,CAAC,EAAE,UAAU,GAAG,wBAAwB,CAAA;IAC1D,YAAY,EAAE,kBAAkB,CAAA;CACjC,GAAG,UAAU,CAUb;AAID,MAAM,MAAM,iBAAiB,CAC3B,IAAI,SAAS,qBAAqB,EAClC,IAAI,SAAS,UAAU,GAAG,UAAU,IAClC;IACF,IAAI,EAAE,IAAI,CAAA;IACV,IAAI,EAAE,IAAI,CAAA;CACX,CAAA;AAED,MAAM,MAAM,kBAAkB,GAAG,CAC7B,iBAAiB,CAAC,WAAW,CAAC,GAC9B,iBAAiB,CAAC,gBAAgB,CAAC,GACnC,iBAAiB,CAAC,kBAAkB,CAAC,GACrC,iBAAiB,CAAC,UAAU,EAAE,QAAQ,CAAC,CAC1C,EAAE,CAAA;AAMH,KAAK,SAAS,CAAC,CAAC,SAAS,MAAM,IAAI;IAAE,IAAI,EAAE,CAAC,CAAA;CAAE,CAAA;AAC9C,KAAK,gBAAgB,CAAC,CAAC,IAAI,CAAC,SAAS,SAAS,CAAC,MAAM,IAAI,CAAC,EAAE,GAAG,IAAI,GAAG,KAAK,CAAA;AAC3E,MAAM,MAAM,qBAAqB,GAAG,gBAAgB,CAAC,kBAAkB,CAAC,CAAA;AAExE,MAAM,MAAM,wBAAwB,GAAG,CAAC,KAAK,EAAE,kBAAkB,KAAK,UAAU,CAAA"}
+{"version":3,"file":"links.d.ts","sourceRoot":"","sources":["../../src/apollo/links.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAA;AAC5D,OAAO,KAAK,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAA;AAK9D,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,YAAY,EACnB,aAAa,CAAC,EAAE,MAAM,GACrB,iBAAiB,GAAG,SAAS,CAE/B;AAED,wBAAgB,cAAc,CAC5B,GAAG,EAAE,MAAM,EACX,cAAc,EAAE,QAAQ,CAAC,OAAO,GAAG,SAAS,EAC5C,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,YAc7B;AAeD,wBAAgB,oBAAoB,eAqBnC;AACD,wBAAgB,oBAAoB,CAClC,gBAAgB,EAAE,MAAM,EACxB,wBAAwB,EACpB;IACE,eAAe,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IACpC,aAAa,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CACnC,GACD,SAAS,cA6Bd;AACD,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,kBAMrE;AAED,wBAAgB,eAAe,CAAC,EAC9B,kBAAkB,EAClB,YAAY,GACb,EAAE;IACD,kBAAkB,CAAC,EAAE,UAAU,GAAG,wBAAwB,CAAA;IAC1D,YAAY,EAAE,kBAAkB,CAAA;CACjC,GAAG,UAAU,CAUb;AAID,MAAM,MAAM,iBAAiB,CAC3B,IAAI,SAAS,qBAAqB,EAClC,IAAI,SAAS,UAAU,GAAG,UAAU,IAClC;IACF,IAAI,EAAE,IAAI,CAAA;IACV,IAAI,EAAE,IAAI,CAAA;CACX,CAAA;AAED,MAAM,MAAM,kBAAkB,GAAG,CAC7B,iBAAiB,CAAC,WAAW,CAAC,GAC9B,iBAAiB,CAAC,gBAAgB,CAAC,GACnC,iBAAiB,CAAC,kBAAkB,CAAC,GACrC,iBAAiB,CAAC,UAAU,EAAE,QAAQ,CAAC,CAC1C,EAAE,CAAA;AAMH,KAAK,SAAS,CAAC,CAAC,SAAS,MAAM,IAAI;IAAE,IAAI,EAAE,CAAC,CAAA;CAAE,CAAA;AAC9C,KAAK,gBAAgB,CAAC,CAAC,IAAI,CAAC,SAAS,SAAS,CAAC,MAAM,IAAI,CAAC,EAAE,GAAG,IAAI,GAAG,KAAK,CAAA;AAC3E,MAAM,MAAM,qBAAqB,GAAG,gBAAgB,CAAC,kBAAkB,CAAC,CAAA;AAExE,MAAM,MAAM,wBAAwB,GAAG,CAAC,KAAK,EAAE,kBAAkB,KAAK,UAAU,CAAA"}

package/dist/apollo/links.js

@@ -1,7 +1,11 @@
 import { ApolloLink, HttpLink } from "@apollo/client";
 import { SetContextLink } from "@apollo/client/link/context";
+import { getOperationAST } from "graphql";
 import { print } from "graphql/language/printer.js";
 import { Observable } from "rxjs";
+function getOperationKind(query, operationName) {
+  return getOperationAST(query, operationName)?.operation;
+}
 function createHttpLink(uri, httpLinkConfig, cookieHeader) {
   const headers = {};
   if (cookieHeader) {
@@ -18,7 +22,7 @@ function enhanceError(operation, error) {
   const { operationName, query, variables } = operation;
   error.__RedwoodEnhancedError = {
     operationName,
-    operationKind: query?.kind.toString(),
+    operationKind: getOperationKind(query, operationName),
     variables,
     query: query && print(query)
   };
@@ -90,5 +94,6 @@ export {
   createFinalLink,
   createHttpLink,
   createTokenLink,
-  createUpdateDataLink
+  createUpdateDataLink,
+  getOperationKind
 };

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;AAiGD,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,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"}

package/dist/components/DevFatalErrorPage.js

@@ -10,73 +10,90 @@ if (/^[A-Z]:\\/.test(srcRoot)) {
 } else {
   appRoot = srcRoot.substring(1);
 }
-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("");
+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;
   if (mostRecentRequest) {
-    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:");
+    let variables;
     try {
-      lines.push(JSON.stringify(mostRecentRequest.variables, null, 2));
+      variables = JSON.stringify(mostRecentRequest.variables, null, 2) ?? "undefined";
     } catch {
-      lines.push("Unable to stringify variables");
+      variables = "Unable to stringify variables";
     }
-    lines.push("");
-    lines.push("Query:");
-    lines.push(mostRecentRequest.query);
-    lines.push("");
+    sections.push(
+      [
+        "## Request",
+        "",
+        `${mostRecentRequest.operationKind} ${mostRecentRequest.operationName}`,
+        "",
+        "### Variables",
+        "",
+        formatMarkdownCodeBlock(variables, "json"),
+        "",
+        "### Query",
+        "",
+        formatMarkdownCodeBlock(mostRecentRequest.query, "graphql")
+      ].join("\n")
+    );
   }
   if (errorWithMeta.mostRecentResponse) {
-    lines.push("-".repeat(80));
-    lines.push("RESPONSE CONTEXT");
-    lines.push("-".repeat(80));
+    let response;
     try {
-      lines.push(JSON.stringify(errorWithMeta.mostRecentResponse, null, 2));
+      response = JSON.stringify(errorWithMeta.mostRecentResponse, null, 2) ?? "undefined";
     } catch {
-      lines.push("Unable to stringify response");
+      response = "Unable to stringify response";
     }
-    lines.push("");
+    sections.push(`## Response
+
+${formatMarkdownCodeBlock(response, "json")}`);
   }
-  lines.push("-".repeat(80));
-  lines.push("STACK TRACE");
-  lines.push("-".repeat(80));
-  stack.items.forEach((entry, i) => {
-    const fileShort = entry.fileShort || "[Unknown]";
+  const stackEntries = stack.items.map((entry, i) => {
+    const file = entry.fileShort || "[Unknown]";
     const callee = entry.callee || "[Anonymous]";
-    const line = entry.line || "?";
-    const column = entry.column || "?";
-    lines.push(`[${i}] ${fileShort}:${line}:${column} in ${callee}`);
+    const location = `${file}:${entry.line || "?"}:${entry.column || "?"}`;
+    const lines = [`${i + 1}. \`${location}\` in \`${callee}\``];
     const sourceFile = entry.sourceFile;
-    if (sourceFile?.lines && sourceFile.lines.length > 0) {
-      const lineIndex = (entry.line || 1) - 1;
+    if (sourceFile?.lines.length && entry.line && entry.line <= sourceFile.lines.length && !entry.thirdParty) {
+      const lineIndex = entry.line - 1;
       const window = 2;
       const start = Math.max(0, lineIndex - window);
       const end = Math.min(sourceFile.lines.length, lineIndex + window + 1);
-      lines.push("  Source context:");
+      const sourceLines = [];
       for (let idx = start; idx < end; idx++) {
-        const marker = idx === lineIndex ? "> " : "  ";
-        lines.push(
-          `  ${marker}${(idx + 1).toString().padStart(4)} | ${sourceFile.lines[idx]}`
+        const marker = idx === lineIndex ? ">" : " ";
+        sourceLines.push(
+          `${marker} ${(idx + 1).toString().padStart(4)} | ${sourceFile.lines[idx]}`
         );
       }
-      lines.push("");
+      lines.push("", formatMarkdownCodeBlock(sourceLines.join("\n"), "text"));
     }
+    return lines.join("\n");
   });
-  lines.push("");
-  lines.push("=".repeat(80));
-  return lines.join("\n");
+  sections.push(`## Stack trace
+
+${stackEntries.join("\n\n")}`);
+  return sections.join("\n\n");
 }
 const DevFatalErrorPage = (props) => {
   const [copyFeedback, setCopyFeedback] = useState("");
@@ -99,7 +116,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(err, stack, typeName, msg, err);
+    const errorText = formatErrorForClipboard(stack, typeName, msg, err);
     try {
       await navigator.clipboard.writeText(errorText);
       setCopyFeedback("\u2713 Copied to clipboard");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/web",
-  "version": "7.0.0-canary.3137",
+  "version": "7.0.0-canary.3138",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/cedarjs/cedar.git",
@@ -79,7 +79,7 @@
   },
   "dependencies": {
     "@apollo/client": "4.2.12",
-    "@cedarjs/server-store": "7.0.0-canary.3137",
+    "@cedarjs/server-store": "7.0.0-canary.3138",
     "@dr.pogodin/react-helmet": "2.0.4",
     "@whatwg-node/fetch": "0.10.13",
     "apollo-upload-client": "19.0.0",
@@ -95,9 +95,9 @@
   "devDependencies": {
     "@apollo/client-react-streaming": "0.14.5",
     "@arethetypeswrong/cli": "0.18.5",
-    "@cedarjs/auth": "7.0.0-canary.3137",
-    "@cedarjs/framework-tools": "7.0.0-canary.3137",
-    "@cedarjs/internal": "7.0.0-canary.3137",
+    "@cedarjs/auth": "7.0.0-canary.3138",
+    "@cedarjs/framework-tools": "7.0.0-canary.3138",
+    "@cedarjs/internal": "7.0.0-canary.3138",
     "@testing-library/dom": "10.4.1",
     "@testing-library/jest-dom": "6.9.1",
     "@testing-library/react": "16.3.3",
@@ -114,7 +114,7 @@
     "vitest": "4.1.11"
   },
   "peerDependencies": {
-    "@cedarjs/auth": "7.0.0-canary.3137",
+    "@cedarjs/auth": "7.0.0-canary.3138",
     "react": "19.2.8",
     "react-dom": "19.2.8"
   },