@stackframe/stack-shared 2.6.25 → 2.6.26

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @stackframe/stack-shared
 
+## 2.6.26
+
+### Patch Changes
+
+- Various bugfixes
+- Updated dependencies
+  - @stackframe/stack-sc@2.6.26
+
 ## 2.6.25
 
 ### Patch Changes

package/dist/utils/errors.d.ts

@@ -2,6 +2,7 @@ import { Json } from "./json";
 export declare function throwErr(errorMessage: string, extraData?: any): never;
 export declare function throwErr(error: Error): never;
 export declare function throwErr(...args: StatusErrorConstructorParameters): never;
+export declare function concatStacktraces(first: Error, ...errors: Error[]): void;
 export declare class StackAssertionError extends Error implements ErrorWithCustomCapture {
     readonly extraData?: Record<string, any> | undefined;
     constructor(message: string, extraData?: Record<string, any> | undefined, options?: ErrorOptions);

package/dist/utils/errors.js

@@ -11,6 +11,23 @@ export function throwErr(...args) {
         throw new StatusError(...args);
     }
 }
+function removeStacktraceNameLine(stack) {
+    // some browsers (eg. Chrome) prepend the stack with an extra line with the error name
+    const addsNameLine = new Error().stack?.startsWith("Error\n");
+    return stack.split("\n").slice(addsNameLine ? 1 : 0).join("\n");
+}
+export function concatStacktraces(first, ...errors) {
+    // some browsers (eg. Firefox) add an extra empty line at the end
+    const addsEmptyLineAtEnd = first.stack?.endsWith("\n");
+    // Add a reference to this function itself so that we know that stacktraces were concatenated
+    // If you are coming here from a stacktrace, please know that the two parts before and after this line are different
+    // stacktraces that were concatenated with concatStacktraces
+    const separator = removeStacktraceNameLine(new Error().stack ?? "").split("\n")[0];
+    for (const error of errors) {
+        const toAppend = removeStacktraceNameLine(error.stack ?? "");
+        first.stack += (addsEmptyLineAtEnd ? "" : "\n") + separator + "\n" + toAppend;
+    }
+}
 export class StackAssertionError extends Error {
     constructor(message, extraData, options) {
         const disclaimer = `\n\nThis is likely an error in Stack. Please make sure you are running the newest version and report it.`;
@@ -33,7 +50,7 @@ export function registerErrorSink(sink) {
     errorSinks.add(sink);
 }
 registerErrorSink((location, ...args) => {
-    console.error(`\x1b[41mError in ${location}:`, ...args, "\x1b[0m");
+    console.error(`\x1b[41mCaptured error in ${location}:`, ...args, "\x1b[0m");
 });
 registerErrorSink((location, error, ...extraArgs) => {
     globalVar.stackCapturedErrors = globalVar.stackCapturedErrors ?? [];

package/dist/utils/promises.js

@@ -1,4 +1,4 @@
-import { StackAssertionError, captureError } from "./errors";
+import { StackAssertionError, captureError, concatStacktraces } from "./errors";
 import { DependenciesMap } from "./maps";
 import { Result } from "./results";
 import { generateUuid } from "./uuids";
@@ -101,12 +101,6 @@ export async function wait(ms) {
 export async function waitUntil(date) {
     return await wait(date.getTime() - Date.now());
 }
-class ErrorDuringRunAsynchronously extends Error {
-    constructor() {
-        super("The error above originated in a runAsynchronously() call. Here is the stacktrace associated with it.");
-        this.name = "ErrorDuringRunAsynchronously";
-    }
-}
 export function runAsynchronouslyWithAlert(...args) {
     return runAsynchronously(args[0], {
         ...args[1],
@@ -120,13 +114,10 @@ export function runAsynchronously(promiseOrFunc, options = {}) {
     if (typeof promiseOrFunc === "function") {
         promiseOrFunc = promiseOrFunc();
     }
-    const duringError = new ErrorDuringRunAsynchronously();
+    const duringError = new Error();
     promiseOrFunc?.catch(error => {
-        const newError = new StackAssertionError("Uncaught error in asynchronous function: " + error.toString(), {
-            duringError,
-        }, {
-            cause: error,
-        });
+        const newError = new StackAssertionError("Uncaught error in asynchronous function: " + error.toString(), { cause: error });
+        concatStacktraces(newError, duringError);
         options.onError?.(newError);
         if (!options.noErrorLogging) {
             captureError("runAsynchronously", newError);

package/dist/utils/react.d.ts

@@ -9,6 +9,13 @@ export declare function getNodeText(node: React.ReactNode): string;
  * You can use this to translate older query- or AsyncResult-based code to new the Suspense system, for example: `if (query.isLoading) suspend();`
  */
 export declare function suspend(): never;
+export declare class NoSuspenseBoundaryError extends Error {
+    digest: string;
+    reason: string;
+    constructor(options: {
+        caller?: string;
+    });
+}
 /**
  * Use this in a component or a hook to disable SSR. Should be wrapped in a Suspense boundary, or it will throw an error.
  */

package/dist/utils/react.js

@@ -1,7 +1,7 @@
 import React from "react";
+import { isBrowserLike } from "./env";
 import { neverResolve } from "./promises";
 import { deindent } from "./strings";
-import { isBrowserLike } from "./env";
 export function forwardRefIfNeeded(render) {
     // TODO: when we drop support for react 18, remove this
     const version = React.version;
@@ -37,41 +37,45 @@ export function suspend() {
     React.use(neverResolve());
     throw new Error("Somehow a Promise that never resolves was resolved?");
 }
-/**
- * Use this in a component or a hook to disable SSR. Should be wrapped in a Suspense boundary, or it will throw an error.
- */
-export function suspendIfSsr(caller) {
-    if (!isBrowserLike()) {
-        const error = Object.assign(new Error(deindent `
-        ${caller ?? "This code path"} attempted to display a loading indicator during SSR by falling back to the nearest Suspense boundary. If you see this error, it means no Suspense boundary was found, and no loading indicator could be displayed.
-        
-        This usually has one of three causes:
-        
-        1. You are missing a loading.tsx file in your app directory. Fix it by adding a loading.tsx file in your app directory.
+export class NoSuspenseBoundaryError extends Error {
+    constructor(options) {
+        super(deindent `
+      ${options.caller ?? "This code path"} attempted to display a loading indicator, but didn't find a Suspense boundary above it. Please read the error message below carefully.
+      
+      The fix depends on which of the 3 scenarios caused it:
+      
+      1. You are missing a loading.tsx file in your app directory. Fix it by adding a loading.tsx file in your app directory.
 
-        2. The component is rendered in the root (outermost) layout.tsx or template.tsx file. Next.js does not wrap those files in a Suspense boundary, even if there is a loading.tsx file in the same folder. To fix it, wrap your layout inside a route group like this:
+      2. The component is rendered in the root (outermost) layout.tsx or template.tsx file. Next.js does not wrap those files in a Suspense boundary, even if there is a loading.tsx file in the same folder. To fix it, wrap your layout inside a route group like this:
 
-          - app
-          - - layout.tsx  // contains <html> and <body>, alongside providers and other components that don't need ${caller ?? "this code path"}
-          - - loading.tsx  // required for suspense
-          - - (main)
-          - - - layout.tsx  // contains the main layout of your app, like a sidebar or a header, and can use ${caller ?? "this code path"}
-          - - - route.tsx  // your actual main page
-          - - - the rest of your app
+        - app
+        - - layout.tsx  // contains <html> and <body>, alongside providers and other components that don't need ${options.caller ?? "this code path"}
+        - - loading.tsx  // required for suspense
+        - - (main)
+        - - - layout.tsx  // contains the main layout of your app, like a sidebar or a header, and can use ${options.caller ?? "this code path"}
+        - - - route.tsx  // your actual main page
+        - - - the rest of your app
 
-          For more information on this approach, see Next's documentation on route groups: https://nextjs.org/docs/app/building-your-application/routing/route-groups
-        
-        3. You caught this error with try-catch or a custom error boundary. Fix this by rethrowing the error or not catching it in the first place.
+        For more information on this approach, see Next's documentation on route groups: https://nextjs.org/docs/app/building-your-application/routing/route-groups
+      
+      3. You caught this error with try-catch or a custom error boundary. Fix this by rethrowing the error or not catching it in the first place.
 
-        See: https://nextjs.org/docs/messages/missing-suspense-with-csr-bailout
+      See: https://nextjs.org/docs/messages/missing-suspense-with-csr-bailout
 
-        More information on SSR and Suspense boundaries: https://react.dev/reference/react/Suspense#providing-a-fallback-for-server-errors-and-client-only-content
-      `), {
-            // set the digest so nextjs doesn't log the error
-            // https://github.com/vercel/next.js/blob/d01d6d9c35a8c2725b3d74c1402ab76d4779a6cf/packages/next/src/shared/lib/lazy-dynamic/bailout-to-csr.ts#L14
-            digest: "BAILOUT_TO_CLIENT_SIDE_RENDERING",
-            reason: caller ?? "suspendIfSsr()",
-        });
-        throw error;
+      More information on SSR and Suspense boundaries: https://react.dev/reference/react/Suspense#providing-a-fallback-for-server-errors-and-client-only-content
+    `);
+        this.name = "NoSuspenseBoundaryError";
+        this.reason = options.caller ?? "suspendIfSsr()";
+        // set the digest so nextjs doesn't log the error
+        // https://github.com/vercel/next.js/blob/d01d6d9c35a8c2725b3d74c1402ab76d4779a6cf/packages/next/src/shared/lib/lazy-dynamic/bailout-to-csr.ts#L14
+        this.digest = "BAILOUT_TO_CLIENT_SIDE_RENDERING";
+    }
+}
+/**
+ * Use this in a component or a hook to disable SSR. Should be wrapped in a Suspense boundary, or it will throw an error.
+ */
+export function suspendIfSsr(caller) {
+    if (!isBrowserLike()) {
+        throw new NoSuspenseBoundaryError({ caller });
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stackframe/stack-shared",
-  "version": "2.6.25",
+  "version": "2.6.26",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "files": [
@@ -50,7 +50,7 @@
     "oauth4webapi": "^2.10.3",
     "semver": "^7.6.3",
     "uuid": "^9.0.1",
-    "@stackframe/stack-sc": "2.6.25"
+    "@stackframe/stack-sc": "2.6.26"
   },
   "devDependencies": {
     "@simplewebauthn/types": "^11.0.0",