@solidjs/web 2.0.0-beta.27 → 2.0.0-beta.29

package/server-functions/dist/client.cjs

@@ -42,6 +42,9 @@ const codecConfig = {
 function configureServerFunctionsCodec(codec) {
   codecConfig.codec = codec;
 }
+function getServerFunctionsCodec() {
+  return codecConfig.codec;
+}
 const flightConfig = {
   consumer: undefined
 };
@@ -54,6 +57,50 @@ function subscribeFlightData(consumer) {
 function getFlightDataConsumer() {
   return flightConfig.consumer;
 }
+function frameAddress(id, args) {
+  return args && args.length ? id + ":" + hashArguments(args) : id;
+}
+function hashArguments(args) {
+  let hash = 0;
+  const text = stableString(args);
+  for (let i = 0; i < text.length; i++) {
+    hash = (hash << 5) - hash + text.charCodeAt(i);
+    hash |= 0;
+  }
+  return (hash >>> 0).toString(36);
+}
+function stableString(value, seen) {
+  if (value === null || typeof value !== "object") {
+    return typeof value === "bigint" ? value + "n" : String(value);
+  }
+  if (value instanceof Date) return "Date:" + value.getTime();
+  seen || (seen = new Set());
+  if (seen.has(value)) return "~";
+  seen.add(value);
+  if (value instanceof Map) {
+    const entries = [];
+    for (const [k, v] of value) {
+      entries.push(stableString(k, seen) + "=>" + stableString(v, seen));
+    }
+    return "Map{" + entries.sort().join(",") + "}";
+  }
+  if (value instanceof Set) {
+    const members = [];
+    for (const v of value) members.push(stableString(v, seen));
+    return "Set{" + members.sort().join(",") + "}";
+  }
+  if (Array.isArray(value)) {
+    let out = "[";
+    for (let i = 0; i < value.length; i++) out += (i ? "," : "") + stableString(value[i], seen);
+    return out + "]";
+  }
+  const keys = Object.keys(value).sort();
+  let out = "{";
+  for (let i = 0; i < keys.length; i++) {
+    out += (i ? "," : "") + keys[i] + ":" + stableString(value[keys[i]], seen);
+  }
+  return out + "}";
+}
 const SERVER_FUNCTION_METADATA = Symbol.for("solid.ServerFunctionMetadata");
 function getServerFunctionMetadata(fn) {
   if (typeof fn !== "function") return undefined;
@@ -211,6 +258,17 @@ async function extractBody(source, codecOptions) {
   }
   return undefined;
 }
+function createChunk(data) {
+  const encodeData = new TextEncoder().encode(data);
+  const bytes = encodeData.length;
+  const baseHex = bytes.toString(16);
+  const totalHex = "00000000".substring(0, 8 - baseHex.length) + baseHex;
+  const head = new TextEncoder().encode(`;0x${totalHex};`);
+  const chunk = new Uint8Array(12 + bytes);
+  chunk.set(head);
+  chunk.set(encodeData, 12);
+  return chunk;
+}
 class ChunkReader {
   constructor(stream) {
     this.reader = stream.getReader();
@@ -287,6 +345,18 @@ async function decodeResponse(response, codecOptions) {
   if (!response.body) return undefined;
   return await extractBody(response, codecOptions === undefined ? codecConfig.codec : codecOptions);
 }
+async function decodeResponsePayload(response, codecOptions) {
+  const decoded = await decodeResponse(response, codecOptions);
+  if (decoded !== undefined && response.headers.has(SINGLE_FLIGHT_HEADER)) {
+    return {
+      value: decoded.value,
+      flightData: decoded.data
+    };
+  }
+  return {
+    value: decoded
+  };
+}
 
 const config = {
   endpoint: "/_server",
@@ -379,6 +449,21 @@ async function initializeResponse(base, id, instance, options, args, meta) {
       }
     }, meta);
   }
+  if (args.length > 1) {
+    const trailing = getHeadersAndBody(args[args.length - 1]);
+    const leading = args.slice(0, -1).map(arg => arg === undefined ? null : arg);
+    if (trailing && isJSONSafe(leading)) {
+      const target = base + (base.includes("?") ? "&" : "?") + "args=" + encodeURIComponent(JSON.stringify(leading));
+      return createRequest(target, id, instance, {
+        ...options,
+        body: trailing.body,
+        headers: {
+          ...options.headers,
+          ...trailing.headers
+        }
+      }, meta);
+    }
+  }
   return createRequest(base, id, instance, {
     ...options,
     body: await serializeArguments(args),
@@ -389,7 +474,7 @@ async function initializeResponse(base, id, instance, options, args, meta) {
     }
   }, meta);
 }
-async function fetchServerFunction(base, id, options, args, meta) {
+async function fetchServerFunction(base, id, options, args, meta, callArgs = args) {
   const instance = `server-function:${INSTANCE++}`;
   const handler = config.responseHandler;
   const context = handler && handler.capture ? handler.capture({
@@ -401,7 +486,7 @@ async function fetchServerFunction(base, id, options, args, meta) {
     const handled = handler.handle(response, {
       id,
       meta,
-      args,
+      args: callArgs,
       context
     });
     if (handled !== undefined) return handled;
@@ -480,7 +565,7 @@ function GET(fn) {
     }
     return fetchServerFunction(base, id, {
       method: "GET"
-    }, [], metadata);
+    }, [], metadata, args);
   };
   wrapped[SERVER_FUNCTION_METADATA] = metadata;
   wrapped.id = id;
@@ -495,20 +580,32 @@ function GET(fn) {
 function registerServerReference() {
   throw new Error("registerServerReference must not be called in the client build");
 }
+function getServerFunctionInvocation() {
+  return undefined;
+}
 
+exports.ChunkReader = ChunkReader;
 exports.ERROR_HEADER = ERROR_HEADER;
 exports.FLASH_COOKIE = FLASH_COOKIE;
 exports.FUNCTION_HEADER = FUNCTION_HEADER;
 exports.GET = GET;
 exports.INSTANCE_HEADER = INSTANCE_HEADER;
+exports.REVALIDATE_HEADER = REVALIDATE_HEADER;
 exports.SINGLE_FLIGHT_HEADER = SINGLE_FLIGHT_HEADER;
 exports.clearFlashCookie = clearFlashCookie;
 exports.configureServerFunctionsClient = configureServerFunctionsClient;
+exports.createChunk = createChunk;
 exports.createServerReference = createServerReference;
 exports.decodeErrorHeaderValue = decodeErrorHeaderValue;
 exports.decodeResponse = decodeResponse;
+exports.decodeResponsePayload = decodeResponsePayload;
+exports.deserializeStream = deserializeStream;
 exports.encodeErrorHeaderValue = encodeErrorHeaderValue;
+exports.frameAddress = frameAddress;
+exports.getFlightDataConsumer = getFlightDataConsumer;
+exports.getServerFunctionInvocation = getServerFunctionInvocation;
 exports.getServerFunctionMetadata = getServerFunctionMetadata;
+exports.getServerFunctionsCodec = getServerFunctionsCodec;
 exports.hasFlashCookie = hasFlashCookie;
 exports.isServerFunction = isServerFunction;
 exports.registerServerReference = registerServerReference;

package/server-functions/dist/client.js

@@ -40,6 +40,9 @@ const codecConfig = {
 function configureServerFunctionsCodec(codec) {
   codecConfig.codec = codec;
 }
+function getServerFunctionsCodec() {
+  return codecConfig.codec;
+}
 const flightConfig = {
   consumer: undefined
 };
@@ -52,6 +55,50 @@ function subscribeFlightData(consumer) {
 function getFlightDataConsumer() {
   return flightConfig.consumer;
 }
+function frameAddress(id, args) {
+  return args && args.length ? id + ":" + hashArguments(args) : id;
+}
+function hashArguments(args) {
+  let hash = 0;
+  const text = stableString(args);
+  for (let i = 0; i < text.length; i++) {
+    hash = (hash << 5) - hash + text.charCodeAt(i);
+    hash |= 0;
+  }
+  return (hash >>> 0).toString(36);
+}
+function stableString(value, seen) {
+  if (value === null || typeof value !== "object") {
+    return typeof value === "bigint" ? value + "n" : String(value);
+  }
+  if (value instanceof Date) return "Date:" + value.getTime();
+  seen || (seen = new Set());
+  if (seen.has(value)) return "~";
+  seen.add(value);
+  if (value instanceof Map) {
+    const entries = [];
+    for (const [k, v] of value) {
+      entries.push(stableString(k, seen) + "=>" + stableString(v, seen));
+    }
+    return "Map{" + entries.sort().join(",") + "}";
+  }
+  if (value instanceof Set) {
+    const members = [];
+    for (const v of value) members.push(stableString(v, seen));
+    return "Set{" + members.sort().join(",") + "}";
+  }
+  if (Array.isArray(value)) {
+    let out = "[";
+    for (let i = 0; i < value.length; i++) out += (i ? "," : "") + stableString(value[i], seen);
+    return out + "]";
+  }
+  const keys = Object.keys(value).sort();
+  let out = "{";
+  for (let i = 0; i < keys.length; i++) {
+    out += (i ? "," : "") + keys[i] + ":" + stableString(value[keys[i]], seen);
+  }
+  return out + "}";
+}
 const SERVER_FUNCTION_METADATA = Symbol.for("solid.ServerFunctionMetadata");
 function getServerFunctionMetadata(fn) {
   if (typeof fn !== "function") return undefined;
@@ -209,6 +256,17 @@ async function extractBody(source, codecOptions) {
   }
   return undefined;
 }
+function createChunk(data) {
+  const encodeData = new TextEncoder().encode(data);
+  const bytes = encodeData.length;
+  const baseHex = bytes.toString(16);
+  const totalHex = "00000000".substring(0, 8 - baseHex.length) + baseHex;
+  const head = new TextEncoder().encode(`;0x${totalHex};`);
+  const chunk = new Uint8Array(12 + bytes);
+  chunk.set(head);
+  chunk.set(encodeData, 12);
+  return chunk;
+}
 class ChunkReader {
   constructor(stream) {
     this.reader = stream.getReader();
@@ -285,6 +343,18 @@ async function decodeResponse(response, codecOptions) {
   if (!response.body) return undefined;
   return await extractBody(response, codecOptions === undefined ? codecConfig.codec : codecOptions);
 }
+async function decodeResponsePayload(response, codecOptions) {
+  const decoded = await decodeResponse(response, codecOptions);
+  if (decoded !== undefined && response.headers.has(SINGLE_FLIGHT_HEADER)) {
+    return {
+      value: decoded.value,
+      flightData: decoded.data
+    };
+  }
+  return {
+    value: decoded
+  };
+}
 
 const config = {
   endpoint: "/_server",
@@ -377,6 +447,21 @@ async function initializeResponse(base, id, instance, options, args, meta) {
       }
     }, meta);
   }
+  if (args.length > 1) {
+    const trailing = getHeadersAndBody(args[args.length - 1]);
+    const leading = args.slice(0, -1).map(arg => arg === undefined ? null : arg);
+    if (trailing && isJSONSafe(leading)) {
+      const target = base + (base.includes("?") ? "&" : "?") + "args=" + encodeURIComponent(JSON.stringify(leading));
+      return createRequest(target, id, instance, {
+        ...options,
+        body: trailing.body,
+        headers: {
+          ...options.headers,
+          ...trailing.headers
+        }
+      }, meta);
+    }
+  }
   return createRequest(base, id, instance, {
     ...options,
     body: await serializeArguments(args),
@@ -387,7 +472,7 @@ async function initializeResponse(base, id, instance, options, args, meta) {
     }
   }, meta);
 }
-async function fetchServerFunction(base, id, options, args, meta) {
+async function fetchServerFunction(base, id, options, args, meta, callArgs = args) {
   const instance = `server-function:${INSTANCE++}`;
   const handler = config.responseHandler;
   const context = handler && handler.capture ? handler.capture({
@@ -399,7 +484,7 @@ async function fetchServerFunction(base, id, options, args, meta) {
     const handled = handler.handle(response, {
       id,
       meta,
-      args,
+      args: callArgs,
       context
     });
     if (handled !== undefined) return handled;
@@ -478,7 +563,7 @@ function GET(fn) {
     }
     return fetchServerFunction(base, id, {
       method: "GET"
-    }, [], metadata);
+    }, [], metadata, args);
   };
   wrapped[SERVER_FUNCTION_METADATA] = metadata;
   wrapped.id = id;
@@ -493,5 +578,8 @@ function GET(fn) {
 function registerServerReference() {
   throw new Error("registerServerReference must not be called in the client build");
 }
+function getServerFunctionInvocation() {
+  return undefined;
+}
 
-export { ERROR_HEADER, FLASH_COOKIE, FUNCTION_HEADER, GET, INSTANCE_HEADER, SINGLE_FLIGHT_HEADER, clearFlashCookie, configureServerFunctionsClient, createServerReference, decodeErrorHeaderValue, decodeResponse, encodeErrorHeaderValue, getServerFunctionMetadata, hasFlashCookie, isServerFunction, registerServerReference, subscribeFlightData, withMeta };
+export { ChunkReader, ERROR_HEADER, FLASH_COOKIE, FUNCTION_HEADER, GET, INSTANCE_HEADER, REVALIDATE_HEADER, SINGLE_FLIGHT_HEADER, clearFlashCookie, configureServerFunctionsClient, createChunk, createServerReference, decodeErrorHeaderValue, decodeResponse, decodeResponsePayload, deserializeStream, encodeErrorHeaderValue, frameAddress, getFlightDataConsumer, getServerFunctionInvocation, getServerFunctionMetadata, getServerFunctionsCodec, hasFlashCookie, isServerFunction, registerServerReference, subscribeFlightData, withMeta };

package/server-functions/dist/server.cjs

@@ -8,6 +8,7 @@ const ENVELOPE = Symbol.for("solid.ResponseEnvelope");
 function isResponseEnvelope(value) {
   return !!(value && typeof value === "object" && value[ENVELOPE]);
 }
+const REVALIDATE_HEADER = "X-Revalidate";
 
 seroval.Feature.AggregateError | seroval.Feature.BigIntTypedArray;
 const serializeOnlyDisabledFeatures = () => process.env.NODE_ENV === "development" ? 0 : seroval.Feature.ErrorPrototypeStack;
@@ -343,6 +344,18 @@ async function decodeResponse(response, codecOptions) {
   if (!response.body) return undefined;
   return await extractBody(response, codecOptions === undefined ? codecConfig.codec : codecOptions);
 }
+async function decodeResponsePayload(response, codecOptions) {
+  const decoded = await decodeResponse(response, codecOptions);
+  if (decoded !== undefined && response.headers.has(SINGLE_FLIGHT_HEADER)) {
+    return {
+      value: decoded.value,
+      flightData: decoded.data
+    };
+  }
+  return {
+    value: decoded
+  };
+}
 
 function encodeInputValue(value) {
   if (value instanceof FormData) return {
@@ -397,6 +410,7 @@ const config = {
   provideEvent: undefined,
   collectFlightData: undefined,
   transformResult: undefined,
+  transformFlightResult: undefined,
   transformDirectResult: undefined,
   handleNoJS: undefined,
   endpoint: "/_server"
@@ -405,6 +419,7 @@ function configureServerFunctionsServer({
   provideEvent,
   collectFlightData,
   transformResult,
+  transformFlightResult,
   transformDirectResult,
   handleNoJS,
   endpoint,
@@ -413,6 +428,7 @@ function configureServerFunctionsServer({
   if (provideEvent !== undefined) config.provideEvent = provideEvent;
   if (collectFlightData !== undefined) config.collectFlightData = collectFlightData;
   if (transformResult !== undefined) config.transformResult = transformResult;
+  if (transformFlightResult !== undefined) config.transformFlightResult = transformFlightResult;
   if (transformDirectResult !== undefined) config.transformDirectResult = transformDirectResult;
   if (handleNoJS !== undefined) config.handleNoJS = handleNoJS;
   if (endpoint !== undefined) config.endpoint = endpoint;
@@ -426,6 +442,7 @@ function provideEvent(event, fn) {
 }
 const REGISTRATIONS = new Map();
 const METHODS = new Map();
+const INVOCATIONS = new WeakMap();
 function registerServerFunction(id, callback) {
   REGISTRATIONS.set(id, callback);
   return callback;
@@ -469,9 +486,9 @@ function createServerReference({
       const evt = {
         ...ogEvt
       };
-      evt.locals.serverFunctionMeta = {
+      INVOCATIONS.set(evt, {
         id
-      };
+      });
       evt.serverOnly = true;
       const result = provideEvent(evt, () => {
         return fn.apply(thisArg, args);
@@ -480,11 +497,13 @@ function createServerReference({
       if (transform && result && typeof result.then === "function") {
         return result.then(value => transform(value, {
           id,
+          args,
           event: evt
         }));
       }
       return transform ? transform(result, {
         id,
+        args,
         event: evt
       }) : result;
     }
@@ -499,9 +518,11 @@ function GET(fn) {
     method: "GET"
   });
 }
-function getServerFunctionMeta() {
-  const event = getRequestEvent();
-  return event && event.locals.serverFunctionMeta;
+function getServerFunctionInvocation() {
+  return getEventServerFunctionInvocation(getRequestEvent());
+}
+function getEventServerFunctionInvocation(event) {
+  return event && INVOCATIONS.get(event);
 }
 function resolveFunctionId(request, url) {
   const reference = request.headers.get(FUNCTION_HEADER);
@@ -531,15 +552,49 @@ async function parseArguments(request, url, instance, codec) {
   }
   return parsed;
 }
-async function foldFlightData(hook, event, headers, outcome) {
+async function foldFlightData(hook, event, headers, outcome, context = {}) {
+  if (outcome.value instanceof Response && outcome.value.body) return outcome.value;
+  digestOutcome(event, outcome);
   const data = await hook(event, outcome);
   if (data === undefined) return outcome.value;
   headers.set(SINGLE_FLIGHT_HEADER, "true");
+  if (context.transformFlightResult) {
+    const transformed = await context.transformFlightResult(event, {
+      value: outcome.value,
+      data
+    }, context);
+    if (transformed !== undefined) {
+      for (const cookie of headers.getSetCookie()) transformed.headers.append("Set-Cookie", cookie);
+      headers.forEach((value, key) => {
+        if (key !== "set-cookie" && !transformed.headers.has(key)) {
+          transformed.headers.set(key, value);
+        }
+      });
+      return transformed;
+    }
+  }
   return {
     value: outcome.value,
     data
   };
 }
+function digestOutcome(event, outcome) {
+  const {
+    request,
+    response
+  } = outcome;
+  outcome.revalidateKeys = response?.headers.get(REVALIDATE_HEADER)?.split(",");
+  outcome.foldedHeaders = foldSetCookies(request.headers, [...(event.response?.headers?.getSetCookie() ?? []), ...(response?.headers?.getSetCookie() ?? [])]);
+  try {
+    const referrer = request.headers.get("referer");
+    if (referrer) {
+      const location = response?.headers.get("Location");
+      const target = location ? new URL(location, request.url) : new URL(referrer);
+      if (target.origin === new URL(request.url).origin) outcome.targetUrl = target.toString();
+    }
+  } catch {
+  }
+}
 function parseSetCookie(setCookie) {
   const [pair, ...attributes] = setCookie.split(";");
   const eq = pair.indexOf("=");
@@ -678,22 +733,29 @@ async function handleServerFunctionRequest(request, options = {}) {
   const provide = options.provideEvent || provideEvent;
   const flightHook = options.collectFlightData !== undefined ? options.collectFlightData : config.collectFlightData;
   const transformResult = options.transformResult !== undefined ? options.transformResult : config.transformResult;
+  const transformFlightResult = options.transformFlightResult !== undefined ? options.transformFlightResult : config.transformFlightResult;
   const handleNoJS = options.handleNoJS !== undefined ? options.handleNoJS : config.handleNoJS !== undefined ? config.handleNoJS : isFormPost(request) ? defaultNoJSHandler || (defaultNoJSHandler = createNoJSHandler()) : undefined;
   const collectsFlight = !!(flightHook && instance && request.headers.has(SINGLE_FLIGHT_HEADER));
   const parsed = await parseArguments(request, url, instance, codec);
+  const flightContext = {
+    id: functionId,
+    args: parsed,
+    instance,
+    request,
+    collectsFlight,
+    codec,
+    transformFlightResult
+  };
   const headers = new Headers();
   try {
     let result = await provide(event, async () => {
-      event.locals.serverFunctionMeta = {
+      INVOCATIONS.set(event, {
         id: functionId
-      };
+      });
       return serverFunction(...parsed);
     });
     if (transformResult) {
-      result = await transformResult(event, result, {
-        instance,
-        request
-      });
+      result = await transformResult(event, result, flightContext);
     }
     let status = 200;
     let metadata;
@@ -735,7 +797,8 @@ async function handleServerFunctionRequest(request, options = {}) {
         response: metadata,
         request,
         thrown: false
-      });
+      }, flightContext);
+      if (result instanceof Response && result.headers.has("X-Content-Raw")) return result;
     }
     if (!instance) {
       if (handleNoJS) return handleNoJS(result, request, parsed);
@@ -747,8 +810,7 @@ async function handleServerFunctionRequest(request, options = {}) {
     if (x instanceof Response || isResponseEnvelope(x)) {
       if (transformResult) {
         x = await transformResult(event, x, {
-          instance,
-          request,
+          ...flightContext,
           thrown: true
         });
       }
@@ -786,7 +848,11 @@ async function handleServerFunctionRequest(request, options = {}) {
           response: metadata,
           request,
           thrown: true
-        });
+        }, flightContext);
+        if (x instanceof Response && x.headers.has("X-Content-Raw")) {
+          x.headers.set(ERROR_HEADER, "true");
+          return x;
+        }
       }
       headers.set(ERROR_HEADER, "true");
       if (!instance) {
@@ -821,11 +887,13 @@ exports.createServerReference = createServerReference;
 exports.decodeErrorHeaderValue = decodeErrorHeaderValue;
 exports.decodeFlashCookie = decodeFlashCookie;
 exports.decodeResponse = decodeResponse;
+exports.decodeResponsePayload = decodeResponsePayload;
 exports.encodeErrorHeaderValue = encodeErrorHeaderValue;
 exports.encodeFlashCookie = encodeFlashCookie;
 exports.foldSetCookies = foldSetCookies;
+exports.getEventServerFunctionInvocation = getEventServerFunctionInvocation;
 exports.getServerFunction = getServerFunction;
-exports.getServerFunctionMeta = getServerFunctionMeta;
+exports.getServerFunctionInvocation = getServerFunctionInvocation;
 exports.getServerFunctionMetadata = getServerFunctionMetadata;
 exports.handleServerFunctionRequest = handleServerFunctionRequest;
 exports.hasFlashCookie = hasFlashCookie;