@async/framework 0.11.6 → 0.11.8

package/server.js

@@ -2380,9 +2380,10 @@ const __componentModule = (() => {
 })();
 
 const __serverModule = (() => {
-  const serverEnvelopeKeys = new Set(["value", "signals", "boundary", "html", "redirect", "error"]);
-  const appliedServerResult = Symbol.for("@async/framework.appliedServerResult");
-  const appliedServerValues = new WeakSet();
+  const serverEnvelopeKind = Symbol.for("@async/framework.serverResult");
+  const serverEnvelopeWireKey = "__async_server_result__";
+  const serverEnvelopeWireVersion = 1;
+  const serverResultInvocation = Symbol("@async/framework.serverResultInvocation");
 
   function createServerProxy({
     endpoint = "/__async/server",
@@ -2402,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),
@@ -2425,9 +2426,7 @@ const __serverModule = (() => {
         throw new Error(`Server function "${id}" failed with ${response.status}.`);
       }
 
-      const result = await readServerResponse(id, response);
-      await applyServerResult(result, runContext);
-      return markAppliedServerValue(unwrapServerResult(result));
+      return consumeServerResult(await readServerResponse(id, response), runContext);
     }
 
     return createServerNamespace(run, {
@@ -2462,12 +2461,13 @@ const __serverModule = (() => {
     if (!isServerEnvelope(result)) {
       return result;
     }
-    if (result[appliedServerResult] || appliedServerValues.has(result)) {
+    const invocation = getServerResultInvocation(context);
+    if (invocation.applied.has(result)) {
       return result;
     }
+    invocation.applied.add(result);
 
     if (result.error) {
-      markAppliedServerResult(result);
       throw toError(result.error);
     }
 
@@ -2489,32 +2489,35 @@ const __serverModule = (() => {
       await context.router?.navigate?.(result.redirect);
     }
 
-    markAppliedServerResult(result);
-
     return result;
   }
 
+  async function consumeServerResult(result, context = {}) {
+    await applyServerResult(result, context);
+    return unwrapServerResult(result);
+  }
+
   function unwrapServerResult(result) {
-    if (isServerEnvelope(result) && Object.hasOwn(result, "value")) {
-      return result.value;
+    if (isServerEnvelope(result)) {
+      return Object.hasOwn(result, "value") ? result.value : undefined;
     }
     return result;
   }
 
-  function markAppliedServerValue(value) {
-    if (value && typeof value === "object") {
-      appliedServerValues.add(value);
-    }
-    return value;
+  function createServerResultContext(context = {}) {
+    const invocation = context[serverResultInvocation] ?? {
+      applied: new WeakSet()
+    };
+    return {
+      ...context,
+      [serverResultInvocation]: invocation
+    };
   }
 
-  function markAppliedServerResult(result) {
-    Object.defineProperty(result, appliedServerResult, {
-      configurable: true,
-      enumerable: false,
-      value: true
-    });
-    return result;
+  function getServerResultInvocation(context = {}) {
+    return context[serverResultInvocation] ?? {
+      applied: new WeakSet()
+    };
   }
 
   function defaultInput(context = {}) {
@@ -2549,9 +2552,7 @@ const __serverModule = (() => {
           throw new Error("Server namespace is not directly callable.");
         }
         const context = contextProvider() ?? {};
-        const result = await run(parts.join("."), args, context);
-        await applyServerResult(result, context);
-        return unwrapServerResult(result);
+        return run(parts.join("."), args, context);
       };
 
       const proxy = new Proxy(callable, {
@@ -2608,7 +2609,7 @@ const __serverModule = (() => {
 
   async function readServerResponse(id, response) {
     if (response.status === 204) {
-      return { value: undefined };
+      return undefined;
     }
     const type = response.headers.get("content-type") ?? "";
     if (type.includes("application/json")) {
@@ -2626,7 +2627,7 @@ const __serverModule = (() => {
     if (typeof response.text !== "function") {
       throw new Error(`Server function "${id}" transport returned an invalid response: missing text().`);
     }
-    return { value: await response.text() };
+    return response.text();
   }
 
   function snapshotSignalPaths(paths = [], signals) {
@@ -2771,7 +2772,8 @@ const __serverModule = (() => {
     if (!value || typeof value !== "object" || Array.isArray(value)) {
       return false;
     }
-    return Object.keys(value).some((key) => serverEnvelopeKeys.has(key));
+    return value[serverEnvelopeKind] === true
+      || value[serverEnvelopeWireKey] === serverEnvelopeWireVersion;
   }
 
   function toError(value) {
@@ -2793,11 +2795,11 @@ const __serverModule = (() => {
       throw new TypeError("Server function id must be a non-empty string.");
     }
   }
-  return { createServerProxy, resolveServerCommandArguments, applyServerResult, unwrapServerResult, defaultInput, createServerNamespace, createSignalReader, assertServerId };
+  return { createServerProxy, resolveServerCommandArguments, applyServerResult, consumeServerResult, unwrapServerResult, createServerResultContext, defaultInput, createServerNamespace, createSignalReader, assertServerId };
 })();
 
 const __handlersModule = (() => {
-  const { applyServerResult, defaultInput, resolveServerCommandArguments, unwrapServerResult } = __serverModule;
+  const { defaultInput, resolveServerCommandArguments } = __serverModule;
   const { attachRegistryInspection, createRegistryStore } = __registryStoreModule;
   const { createLazyRegistry, isLazyDescriptor } = __lazyRegistryModule;
   const builtInTokens = new Set(["prevent", "preventDefault", "stopPropagation", "stopImmediatePropagation"]);
@@ -2895,8 +2897,7 @@ const __handlersModule = (() => {
               signalPaths: resolved.signalPaths,
               signalValues: resolved.signalValues
             });
-            await applyServerResult(result, runContext);
-            results.push(unwrapServerResult(result));
+            results.push(result);
             continue;
           }
 
@@ -5751,7 +5752,7 @@ const __requestContextModule = (() => {
 const __serverRegistryModule = (() => {
   const { readRequestContext } = __requestContextModule;
   const { attachRegistryInspection, createRegistryStore } = __registryStoreModule;
-  const { assertServerId, createServerNamespace, createSignalReader } = __serverModule;
+  const { assertServerId, consumeServerResult, createServerNamespace, createServerResultContext, createSignalReader } = __serverModule;
   function createServerRegistry(initialMap = {}, options = {}) {
     const registryStore = options.registry ?? createRegistryStore();
     const type = options.type ?? "server";
@@ -5806,7 +5807,7 @@ const __serverRegistryModule = (() => {
           cache: defaults.cache ?? context.cache
         });
 
-        runContext = {
+        runContext = createServerResultContext({
           ...mergedContext,
           id,
           args,
@@ -5815,9 +5816,9 @@ const __serverRegistryModule = (() => {
           abort: mergedContext.abort,
           cache: mergedContext.cache,
           server
-        };
+        });
 
-        return fn.call(runContext, ...args);
+        return consumeServerResult(await fn.call(runContext, ...args), runContext);
       },
 
       _setContext(context = {}) {