@stackframe/stack 2.4.25 → 2.4.27

package/dist/esm/lib/stack-app.js

@@ -4,7 +4,7 @@ import { KnownError, KnownErrors, StackAdminInterface, StackClientInterface, Sta
 import { deleteCookie, getCookie, setOrDeleteCookie } from "./cookie";
 import { StackAssertionError, throwErr } from "@stackframe/stack-shared/dist/utils/errors";
 import { generateUuid } from "@stackframe/stack-shared/dist/utils/uuids";
-import { AsyncResult, Result } from "@stackframe/stack-shared/dist/utils/results";
+import { Result } from "@stackframe/stack-shared/dist/utils/results";
 import { suspendIfSsr } from "@stackframe/stack-shared/dist/utils/react";
 import { Store } from "@stackframe/stack-shared/dist/utils/stores";
 import { getProductionModeErrors } from "@stackframe/stack-shared/dist/interface/clientInterface";
@@ -13,7 +13,7 @@ import { addNewOAuthProviderOrScope, callOAuthCallback, signInWithOAuth } from "
 import * as NextNavigationUnscrambled from "next/navigation";
 import { constructRedirectUrl } from "../utils/url";
 import { deepPlainEquals, filterUndefined, omit, pick } from "@stackframe/stack-shared/dist/utils/objects";
-import { neverResolve, resolved, runAsynchronously, wait } from "@stackframe/stack-shared/dist/utils/promises";
+import { neverResolve, runAsynchronously, wait } from "@stackframe/stack-shared/dist/utils/promises";
 import { AsyncCache } from "@stackframe/stack-shared/dist/utils/caches";
 import { suspend } from "@stackframe/stack-shared/dist/utils/react";
 import { scrambleDuringCompileTime } from "@stackframe/stack-shared/dist/utils/compile-time";
@@ -23,7 +23,7 @@ import { InternalSession } from "@stackframe/stack-shared/dist/sessions";
 import { useTrigger } from "@stackframe/stack-shared/dist/hooks/use-trigger";
 import { mergeScopeStrings } from "@stackframe/stack-shared/dist/utils/strings";
 var NextNavigation = scrambleDuringCompileTime(NextNavigationUnscrambled);
-var clientVersion = "js @stackframe/stack@2.4.25";
+var clientVersion = "js @stackframe/stack@2.4.27";
 function permissionDefinitionScopeToType(scope) {
   return { "any-team": "team", "specific-team": "team", "global": "global" }[scope.type];
 }
@@ -83,21 +83,29 @@ function createEmptyTokenStore() {
   });
 }
 var loadingSentinel = Symbol("stackAppCacheLoadingSentinel");
+var cachePromiseByComponentId = /* @__PURE__ */ new Map();
 function useAsyncCache(cache, dependencies, caller) {
   suspendIfSsr(caller);
+  const id = React.useId();
   const subscribe = useCallback((cb) => {
-    const { unsubscribe } = cache.onChange(dependencies, () => cb());
+    const { unsubscribe } = cache.onStateChange(dependencies, () => {
+      cachePromiseByComponentId.delete(id);
+      cb();
+    });
     return unsubscribe;
   }, [cache, ...dependencies]);
   const getSnapshot = useCallback(() => {
-    return AsyncResult.or(cache.getIfCached(dependencies), loadingSentinel);
+    if (!cachePromiseByComponentId.has(id)) {
+      cachePromiseByComponentId.set(id, cache.getOrWait(dependencies, "read-write"));
+    }
+    return cachePromiseByComponentId.get(id);
   }, [cache, ...dependencies]);
-  const value = React.useSyncExternalStore(subscribe, getSnapshot, getSnapshot);
-  if (value === loadingSentinel) {
-    return use(cache.getOrWait(dependencies, "read-write"));
-  } else {
-    return use(resolved(value));
-  }
+  const promise = React.useSyncExternalStore(
+    subscribe,
+    getSnapshot,
+    () => throwErr(new Error("getServerSnapshot should never be called in useAsyncCache because we restrict to CSR earlier"))
+  );
+  return use(promise);
 }
 var stackAppInternalsSymbol = Symbol.for("StackAppInternals");
 var allClientApps = /* @__PURE__ */ new Map();
@@ -349,17 +357,14 @@ var _StackClientAppImpl = class __StackClientAppImpl {
         if (tokenStoreInit === null) {
           return createEmptyTokenStore();
         } else if (typeof tokenStoreInit === "object" && "headers" in tokenStoreInit) {
-          if (this._requestTokenStores.has(tokenStoreInit))
-            return this._requestTokenStores.get(tokenStoreInit);
+          if (this._requestTokenStores.has(tokenStoreInit)) return this._requestTokenStores.get(tokenStoreInit);
           const stackAuthHeader = tokenStoreInit.headers.get("x-stack-auth");
           if (stackAuthHeader) {
             let parsed2;
             try {
               parsed2 = JSON.parse(stackAuthHeader);
-              if (typeof parsed2 !== "object")
-                throw new Error("x-stack-auth header must be a JSON object");
-              if (parsed2 === null)
-                throw new Error("x-stack-auth header must not be null");
+              if (typeof parsed2 !== "object") throw new Error("x-stack-auth header must be a JSON object");
+              if (parsed2 === null) throw new Error("x-stack-auth header must not be null");
             } catch (e) {
               throw new Error(`Invalid x-stack-auth header: ${stackAuthHeader}`, { cause: e });
             }
@@ -400,8 +405,7 @@ var _StackClientAppImpl = class __StackClientAppImpl {
     const tokenObj = tokenStore.get();
     const sessionKey = InternalSession.calculateSessionKey(tokenObj);
     const existing = sessionKey ? this._sessionsByTokenStoreAndSessionKey.get(tokenStore)?.get(sessionKey) : null;
-    if (existing)
-      return existing;
+    if (existing) return existing;
     const session = this._interface.createSession({
       refreshToken: tokenObj.refreshToken,
       accessToken: tokenObj.accessToken
@@ -485,8 +489,7 @@ var _StackClientAppImpl = class __StackClientAppImpl {
     };
   }
   _teamMemberFromJson(json) {
-    if (json === null)
-      return null;
+    if (json === null) return null;
     return {
       teamId: json.teamId,
       userId: json.userId,
@@ -1165,8 +1168,7 @@ var _StackServerAppImpl = class extends _StackClientAppImpl {
     return currentUser;
   }
   _serverTeamMemberFromJson(json) {
-    if (json === null)
-      return null;
+    if (json === null) return null;
     const app = this;
     return {
       ...app._teamMemberFromJson(json),
@@ -1399,10 +1401,8 @@ var _StackAdminAppImpl = class extends _StackServerAppImpl {
         return this.whyInvalid() === null;
       },
       whyInvalid() {
-        if (this.expiresAt.getTime() < Date.now())
-          return "expired";
-        if (this.manuallyRevokedAt)
-          return "manually-revoked";
+        if (this.expiresAt.getTime() < Date.now()) return "expired";
+        if (this.manuallyRevokedAt) return "manually-revoked";
         return null;
       },
       async revoke() {