solid-js 1.8.3 → 1.8.4

package/dist/dev.cjs

@@ -1664,7 +1664,7 @@ function Suspense(props) {
   if (sharedConfig.context && sharedConfig.load) {
     const key = sharedConfig.context.id + sharedConfig.context.count;
     let ref = sharedConfig.load(key);
-    if (ref && (typeof ref !== "object" || ref.status !== 'success')) p = ref;
+    if (ref && (typeof ref !== "object" || ref.status !== "success")) p = ref;
     if (p && p !== "$$f") {
       const [s, set] = createSignal(undefined, {
         equals: false

package/dist/solid.cjs

@@ -1602,7 +1602,7 @@ function Suspense(props) {
   if (sharedConfig.context && sharedConfig.load) {
     const key = sharedConfig.context.id + sharedConfig.context.count;
     let ref = sharedConfig.load(key);
-    if (ref && (typeof ref !== "object" || ref.status !== 'success')) p = ref;
+    if (ref && (typeof ref !== "object" || ref.status !== "success")) p = ref;
     if (p && p !== "$$f") {
       const [s, set] = createSignal(undefined, {
         equals: false

package/html/types/lit.d.ts

@@ -15,7 +15,9 @@ interface Runtime {
     prev?: {
       [k: string]: boolean;
     }
-  ): void;
+  ): {
+    [k: string]: boolean;
+  };
   style(
     node: Element,
     value: {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "solid-js",
   "description": "A declarative JavaScript library for building user interfaces.",
-  "version": "1.8.3",
+  "version": "1.8.4",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://solidjs.com",
@@ -159,6 +159,10 @@
       "import": "./web/dist/web.js",
       "require": "./web/dist/web.cjs"
     },
+    "./web/storage": {
+      "import": "./web/dist/storage.js",
+      "require": "./web/dist/storage.cjs"
+    },
     "./web/dist/*": "./web/dist/*",
     "./universal": {
       "development": {
@@ -206,7 +210,7 @@
   ],
   "dependencies": {
     "csstype": "^3.1.0",
-    "seroval": "^0.11.6"
+    "seroval": "^0.12.0"
   },
   "scripts": {
     "build": "npm-run-all -nl build:*",
@@ -217,7 +221,7 @@
     "types:copy": "ncp ../../node_modules/dom-expressions/src/jsx.d.ts ./src/jsx.d.ts && ncp ../../node_modules/dom-expressions/src/jsx-h.d.ts ./h/jsx-runtime/src/jsx.d.ts",
     "types:src": "tsc --project ./tsconfig.build.json && ncp ../../node_modules/dom-expressions/src/jsx.d.ts ./types/jsx.d.ts",
     "types:web": "tsc --project ./web/tsconfig.build.json",
-    "types:copy-web": "ncp ../../node_modules/dom-expressions/src/client.d.ts ./web/types/client.d.ts && ncp ../../node_modules/dom-expressions/src/server.d.ts ./web/types/server.d.ts",
+    "types:copy-web": "ncp ../../node_modules/dom-expressions/src/client.d.ts ./web/types/client.d.ts && ncp ../../node_modules/dom-expressions/src/server.d.ts ./web/types/server.d.ts && ncp ./web/storage/storage.d.ts ./web/types/storage.d.ts",
     "types:store": "tsc --project ./store/tsconfig.build.json",
     "types:html": "tsc --project ./html/tsconfig.json && ncp ../../node_modules/lit-dom-expressions/types/index.d.ts ./html/types/lit.d.ts",
     "types:h": "tsc --project ./h/tsconfig.json && ncp ../../node_modules/hyper-dom-expressions/types/index.d.ts ./h/types/hyperscript.d.ts",

package/web/dist/dev.cjs

@@ -537,6 +537,7 @@ function Hydration(props) {
   return props.children;
 }
 function voidFn() {}
+const RequestContext = Symbol();
 function innerHTML(parent, content) {
   !solidJs.sharedConfig.context && (parent.innerHTML = content);
 }
@@ -700,6 +701,7 @@ exports.HydrationScript = voidFn;
 exports.NoHydration = NoHydration;
 exports.Portal = Portal;
 exports.Properties = Properties;
+exports.RequestContext = RequestContext;
 exports.SVGElements = SVGElements;
 exports.SVGNamespace = SVGNamespace;
 exports.addEventListener = addEventListener;
@@ -717,6 +719,7 @@ exports.getNextElement = getNextElement;
 exports.getNextMarker = getNextMarker;
 exports.getNextMatch = getNextMatch;
 exports.getPropAlias = getPropAlias;
+exports.getRequestEvent = voidFn;
 exports.hydrate = hydrate;
 exports.innerHTML = innerHTML;
 exports.insert = insert;

package/web/dist/dev.js

@@ -1012,6 +1012,7 @@ function Hydration(props) {
   return props.children;
 }
 function voidFn() {}
+const RequestContext = Symbol();
 function innerHTML(parent, content) {
   !sharedConfig.context && (parent.innerHTML = content);
 }
@@ -1125,6 +1126,7 @@ export {
   NoHydration,
   Portal,
   Properties,
+  RequestContext,
   SVGElements,
   SVGNamespace,
   addEventListener,
@@ -1142,6 +1144,7 @@ export {
   getNextMarker,
   getNextMatch,
   getPropAlias,
+  voidFn as getRequestEvent,
   hydrate,
   innerHTML,
   insert,

package/web/dist/server.cjs

@@ -18,14 +18,16 @@ const GLOBAL_IDENTIFIER = '_$HY.r';
 function createSerializer({
   onData,
   onDone,
-  scopeId
+  scopeId,
+  onError
 }) {
   return new seroval.Serializer({
     scopeId,
     globalIdentifier: GLOBAL_IDENTIFIER,
     disabledFeatures: ES2017FLAG,
     onData,
-    onDone
+    onDone,
+    onError
   });
 }
 function getGlobalHeaderScript() {
@@ -49,7 +51,8 @@ function renderToString(code, options = {}) {
         scripts = getLocalHeaderScript(renderId);
       }
       scripts += script;
-    }
+    },
+    onError: options.onError
   });
   solidJs.sharedConfig.context = {
     id: renderId || "",
@@ -90,11 +93,13 @@ function renderToStream(code, options = {}) {
     nonce,
     onCompleteShell,
     onCompleteAll,
-    renderId
+    renderId,
+    noScripts
   } = options;
   let dispose;
   const blockingPromises = [];
   const pushTask = task => {
+    if (noScripts) return;
     if (!tasks && !firstFlushed) {
       tasks = getLocalHeaderScript(renderId);
     }
@@ -119,7 +124,8 @@ function renderToStream(code, options = {}) {
   const serializer = createSerializer({
     scopeId: options.renderId,
     onData: pushTask,
-    onDone: checkEnd
+    onDone: checkEnd,
+    onError: options.onError
   });
   const flushEnd = () => {
     if (!registry.size) {
@@ -507,6 +513,10 @@ function replacePlaceholder(html, key, value) {
   const last = html.indexOf(close, first + marker.length);
   return html.slice(0, first) + value + html.slice(last + close.length);
 }
+const RequestContext = Symbol();
+function getRequestEvent() {
+  return globalThis[RequestContext] ? globalThis[RequestContext].getStore() : undefined;
+}
 function Assets(props) {
   useAssets(() => props.children);
 }
@@ -643,12 +653,14 @@ exports.Hydration = Hydration;
 exports.HydrationScript = HydrationScript;
 exports.NoHydration = NoHydration;
 exports.Portal = Portal;
+exports.RequestContext = RequestContext;
 exports.addEventListener = addEventListener;
 exports.delegateEvents = delegateEvents;
 exports.escape = escape;
 exports.generateHydrationScript = generateHydrationScript;
 exports.getAssets = getAssets;
 exports.getHydrationKey = getHydrationKey;
+exports.getRequestEvent = getRequestEvent;
 exports.hydrate = hydrate;
 exports.insert = insert;
 exports.isDev = isDev;

package/web/dist/server.js

@@ -53,13 +53,14 @@ const Aliases = /*#__PURE__*/ Object.assign(Object.create(null), {
 
 const ES2017FLAG = Feature.AggregateError | Feature.BigInt | Feature.BigIntTypedArray;
 const GLOBAL_IDENTIFIER = "_$HY.r";
-function createSerializer({ onData, onDone, scopeId }) {
+function createSerializer({ onData, onDone, scopeId, onError }) {
   return new Serializer({
     scopeId,
     globalIdentifier: GLOBAL_IDENTIFIER,
     disabledFeatures: ES2017FLAG,
     onData,
-    onDone
+    onDone,
+    onError
   });
 }
 function getGlobalHeaderScript() {
@@ -82,7 +83,8 @@ function renderToString(code, options = {}) {
         scripts = getLocalHeaderScript(renderId);
       }
       scripts += script;
-    }
+    },
+    onError: options.onError
   });
   sharedConfig.context = {
     id: renderId || "",
@@ -117,10 +119,11 @@ function renderToStringAsync(code, options = {}) {
   });
 }
 function renderToStream(code, options = {}) {
-  let { nonce, onCompleteShell, onCompleteAll, renderId } = options;
+  let { nonce, onCompleteShell, onCompleteAll, renderId, noScripts } = options;
   let dispose;
   const blockingPromises = [];
   const pushTask = task => {
+    if (noScripts) return;
     if (!tasks && !firstFlushed) {
       tasks = getLocalHeaderScript(renderId);
     }
@@ -146,7 +149,8 @@ function renderToStream(code, options = {}) {
   const serializer = createSerializer({
     scopeId: options.renderId,
     onData: pushTask,
-    onDone: checkEnd
+    onDone: checkEnd,
+    onError: options.onError
   });
   const flushEnd = () => {
     if (!registry.size) {
@@ -551,6 +555,10 @@ function replacePlaceholder(html, key, value) {
   const last = html.indexOf(close, first + marker.length);
   return html.slice(0, first) + value + html.slice(last + close.length);
 }
+const RequestContext = Symbol();
+function getRequestEvent() {
+  return globalThis[RequestContext] ? globalThis[RequestContext].getStore() : undefined;
+}
 function Assets(props) {
   useAssets(() => props.children);
 }
@@ -653,12 +661,14 @@ export {
   HydrationScript,
   NoHydration,
   Portal,
+  RequestContext,
   addEventListener,
   delegateEvents,
   escape,
   generateHydrationScript,
   getAssets,
   getHydrationKey,
+  getRequestEvent,
   hydrate,
   insert,
   isDev,

package/web/dist/storage.cjs

@@ -0,0 +1,12 @@
+'use strict';
+
+var node_async_hooks = require('node:async_hooks');
+var web = require('solid-js/web');
+
+function provideRequestEvent(init, cb) {
+  if (!web.isServer) throw new Error("Attempting to use server context in non-server build");
+  const ctx = globalThis[web.RequestContext] = globalThis[web.RequestContext] || new node_async_hooks.AsyncLocalStorage();
+  return ctx.run(init, cb);
+}
+
+exports.provideRequestEvent = provideRequestEvent;

package/web/dist/storage.js

@@ -0,0 +1,10 @@
+import { AsyncLocalStorage } from "node:async_hooks";
+import { isServer, RequestContext } from "solid-js/web";
+
+function provideRequestEvent(init, cb) {
+  if (!isServer) throw new Error("Attempting to use server context in non-server build");
+  const ctx = (globalThis[RequestContext] = globalThis[RequestContext] || new AsyncLocalStorage());
+  return ctx.run(init, cb);
+}
+
+export { provideRequestEvent };

package/web/dist/web.cjs

@@ -535,6 +535,7 @@ function Hydration(props) {
   return props.children;
 }
 function voidFn() {}
+const RequestContext = Symbol();
 function innerHTML(parent, content) {
   !solidJs.sharedConfig.context && (parent.innerHTML = content);
 }
@@ -695,6 +696,7 @@ exports.HydrationScript = voidFn;
 exports.NoHydration = NoHydration;
 exports.Portal = Portal;
 exports.Properties = Properties;
+exports.RequestContext = RequestContext;
 exports.SVGElements = SVGElements;
 exports.SVGNamespace = SVGNamespace;
 exports.addEventListener = addEventListener;
@@ -712,6 +714,7 @@ exports.getNextElement = getNextElement;
 exports.getNextMarker = getNextMarker;
 exports.getNextMatch = getNextMatch;
 exports.getPropAlias = getPropAlias;
+exports.getRequestEvent = voidFn;
 exports.hydrate = hydrate;
 exports.innerHTML = innerHTML;
 exports.insert = insert;

package/web/dist/web.js

@@ -1005,6 +1005,7 @@ function Hydration(props) {
   return props.children;
 }
 function voidFn() {}
+const RequestContext = Symbol();
 function innerHTML(parent, content) {
   !sharedConfig.context && (parent.innerHTML = content);
 }
@@ -1115,6 +1116,7 @@ export {
   NoHydration,
   Portal,
   Properties,
+  RequestContext,
   SVGElements,
   SVGNamespace,
   addEventListener,
@@ -1132,6 +1134,7 @@ export {
   getNextMarker,
   getNextMatch,
   getPropAlias,
+  voidFn as getRequestEvent,
   hydrate,
   innerHTML,
   insert,

package/web/types/client.d.ts

@@ -44,7 +44,7 @@ export function classList(
   node: Element,
   value: { [k: string]: boolean },
   prev?: { [k: string]: boolean }
-): void;
+): { [k: string]: boolean };
 export function style(
   node: Element,
   value: { [k: string]: string },
@@ -70,3 +70,8 @@ export function generateHydrationScript(): string;
 export function Assets(props: { children?: JSX.Element }): JSX.Element;
 export function Hydration(props: { children?: JSX.Element }): JSX.Element;
 export function NoHydration(props: { children?: JSX.Element }): JSX.Element;
+export interface RequestEvent {
+  request: Request;
+}
+export declare const RequestContext: unique symbol;
+export function getRequestEvent(): RequestEvent | undefined;

package/web/types/server.d.ts

@@ -3,6 +3,7 @@ export function renderToString<T>(
   options?: {
     nonce?: string;
     renderId?: string;
+    onError?: (err: any) => void;
   }
 ): string;
 export function renderToStringAsync<T>(
@@ -11,6 +12,8 @@ export function renderToStringAsync<T>(
     timeoutMs?: number;
     nonce?: string;
     renderId?: string;
+    noScripts?: boolean;
+    onError?: (err: any) => void;
   }
 ): Promise<string>;
 export function renderToStream<T>(
@@ -20,6 +23,7 @@ export function renderToStream<T>(
     renderId?: string;
     onCompleteShell?: (info: { write: (v: string) => void }) => void;
     onCompleteAll?: (info: { write: (v: string) => void }) => void;
+    onError?: (err: any) => void;
   }
 ): {
   pipe: (writable: { write: (v: string) => void }) => void;
@@ -49,7 +53,12 @@ export function createComponent<T>(Comp: (props: T) => JSX.Element, props: T): J
 export function mergeProps(...sources: unknown[]): unknown;
 export function getOwner(): unknown;
 export function generateHydrationScript(options: { nonce?: string; eventNames?: string[] }): string;
-export function stringify(root: unknown): string;
+export declare const RequestContext: unique symbol;
+export interface RequestEvent {
+  request: Request;
+  locals: Record<string | number | symbol, any>;
+}
+export function getRequestEvent(): RequestEvent | undefined;
 
 export function Hydration(props: { children?: JSX.Element }): JSX.Element;
 export function NoHydration(props: { children?: JSX.Element }): JSX.Element;

package/web/types/storage.d.ts

@@ -0,0 +1,2 @@
+import type { RequestEvent } from "solid-js/web";
+export function provideRequestEvent<T extends RequestEvent, U>(init: T, cb: () => U): U;