@async/framework 0.11.7 → 0.11.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@async/framework",
-  "version": "0.11.7",
+  "version": "0.11.9",
   "description": "No-build Loader app runtime with browser and server entrypoints, signals, command events, route partials, cache split, SSR activation, and streaming boundaries.",
   "type": "module",
   "main": "./server.js",

package/server.js

@@ -2383,7 +2383,7 @@ const __serverModule = (() => {
   const serverEnvelopeKind = Symbol.for("@async/framework.serverResult");
   const serverEnvelopeWireKey = "__async_server_result__";
   const serverEnvelopeWireVersion = 1;
-  const appliedServerResult = Symbol.for("@async/framework.appliedServerResult");
+  const serverResultInvocation = Symbol("@async/framework.serverResultInvocation");
 
   function createServerProxy({
     endpoint = "/__async/server",
@@ -2403,7 +2403,7 @@ const __serverModule = (() => {
 
     async function run(id, args = [], context = {}) {
       assertServerId(id);
-      const runContext = { ...defaults, ...context };
+      const runContext = createServerResultContext({ ...defaults, ...context });
       const body = {
         args,
         input: context.input ?? defaultInput(runContext),
@@ -2461,12 +2461,13 @@ const __serverModule = (() => {
     if (!isServerEnvelope(result)) {
       return result;
     }
-    if (result[appliedServerResult]) {
+    const invocation = getServerResultInvocation(context);
+    if (invocation.applied.has(result)) {
       return result;
     }
+    invocation.applied.add(result);
 
     if (result.error) {
-      markAppliedServerResult(result);
       throw toError(result.error);
     }
 
@@ -2488,8 +2489,6 @@ const __serverModule = (() => {
       await context.router?.navigate?.(result.redirect);
     }
 
-    markAppliedServerResult(result);
-
     return result;
   }
 
@@ -2505,13 +2504,20 @@ const __serverModule = (() => {
     return result;
   }
 
-  function markAppliedServerResult(result) {
-    Object.defineProperty(result, appliedServerResult, {
-      configurable: true,
-      enumerable: false,
-      value: true
-    });
-    return result;
+  function createServerResultContext(context = {}) {
+    const invocation = context[serverResultInvocation] ?? {
+      applied: new WeakSet()
+    };
+    return {
+      ...context,
+      [serverResultInvocation]: invocation
+    };
+  }
+
+  function getServerResultInvocation(context = {}) {
+    return context[serverResultInvocation] ?? {
+      applied: new WeakSet()
+    };
   }
 
   function defaultInput(context = {}) {
@@ -2789,7 +2795,7 @@ const __serverModule = (() => {
       throw new TypeError("Server function id must be a non-empty string.");
     }
   }
-  return { createServerProxy, resolveServerCommandArguments, applyServerResult, consumeServerResult, unwrapServerResult, defaultInput, createServerNamespace, createSignalReader, assertServerId };
+  return { createServerProxy, resolveServerCommandArguments, applyServerResult, consumeServerResult, unwrapServerResult, createServerResultContext, defaultInput, createServerNamespace, createSignalReader, assertServerId };
 })();
 
 const __handlersModule = (() => {
@@ -3048,7 +3054,7 @@ const __schedulerModule = (() => {
           const value = fn();
           if (value && typeof value.then === "function") {
             asyncBatch = true;
-            return value.finally(() => {
+            return Promise.resolve(value).finally(() => {
               batchDepth -= 1;
               requestFlush();
             });
@@ -5746,7 +5752,7 @@ const __requestContextModule = (() => {
 const __serverRegistryModule = (() => {
   const { readRequestContext } = __requestContextModule;
   const { attachRegistryInspection, createRegistryStore } = __registryStoreModule;
-  const { assertServerId, consumeServerResult, createServerNamespace, createSignalReader } = __serverModule;
+  const { assertServerId, consumeServerResult, createServerNamespace, createServerResultContext, createSignalReader } = __serverModule;
   function createServerRegistry(initialMap = {}, options = {}) {
     const registryStore = options.registry ?? createRegistryStore();
     const type = options.type ?? "server";
@@ -5801,7 +5807,7 @@ const __serverRegistryModule = (() => {
           cache: defaults.cache ?? context.cache
         });
 
-        runContext = {
+        runContext = createServerResultContext({
           ...mergedContext,
           id,
           args,
@@ -5810,7 +5816,7 @@ const __serverRegistryModule = (() => {
           abort: mergedContext.abort,
           cache: mergedContext.cache,
           server
-        };
+        });
 
         return consumeServerResult(await fn.call(runContext, ...args), runContext);
       },