@nifrajs/web-solid 5.0.0 → 5.1.0

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AAUjD,6EAA6E;AAC7E,eAAO,MAAM,YAAY,EAAE,aA2B1B,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AAgDjD,6EAA6E;AAC7E,eAAO,MAAM,YAAY,EAAE,aA8B1B,CAAA"}

package/dist/index.js

@@ -1,6 +1,39 @@
+import { sharedConfig } from "solid-js";
 import { generateHydrationScript, renderToStream as solidRenderToStream, renderToString as solidRenderToString, } from "solid-js/web";
 import { compose } from "./compose.js";
 const HYDRATION_HEAD = generateHydrationScript();
+// An unset NODE_ENV counts as production, as for the framework's own error pages.
+const showsErrors = () => {
+    const nodeEnv = typeof process === "undefined" ? undefined : process.env?.NODE_ENV;
+    return nodeEnv === "development" || nodeEnv === "test";
+};
+/** What the browser receives for an error Solid hands to hydration: its text names server internals. */
+function redactedError() {
+    // Built bare: a constructed Error carries a stack and, on Bun, the line, column and file it was made
+    // at, and Solid serializes every own property.
+    // biome-ignore lint/plugin/requireSafetyCommentForTypeAssertion: Object.create over Error.prototype with a message is an Error minus its stack.
+    return Object.create(Error.prototype, {
+        message: { value: "Internal Server Error", writable: true, configurable: true },
+    });
+}
+/**
+ * Render `app` with every Error that Solid serializes for hydration replaced. An `<ErrorBoundary>` that
+ * caught on the server, or a failed resource, otherwise ships the message and stack in an inline script.
+ * Nested contexts copy this one, so they keep the wrapped `serialize`.
+ */
+function redactingErrors(app) {
+    if (showsErrors())
+        return app;
+    return () => {
+        // biome-ignore lint/plugin/requireSafetyCommentForTypeAssertion: Solid's server renderers set a context with serialize; the check below handles its absence.
+        const context = sharedConfig.context;
+        const serialize = context?.serialize;
+        if (context !== undefined && serialize !== undefined) {
+            context.serialize = (id, value) => serialize(id, value instanceof Error ? redactedError() : value);
+        }
+        return app();
+    };
+}
 /** The Solid server render adapter - pass to @nifrajs/web's `renderPage`. */
 export const solidAdapter = {
     // Synchronous one-pass render for non-deferred pages (renderPage's buffered fast path). Solid's
@@ -8,8 +41,11 @@ export const solidAdapter = {
     // `generateHydrationScript()`) as `renderToStream`, but skips the TransformStream + Solid's
     // streaming machinery - the heaviest of the five renderers on Bun. A page that defer()s/Suspends
     // takes `renderToStream` below (progressive resolution needs it).
-    renderToString(chain, props) {
-        return solidRenderToString(compose(chain, props));
+    renderToString(chain, props, options) {
+        const app = redactingErrors(compose(chain, props));
+        return options?.nonce === undefined
+            ? solidRenderToString(app)
+            : solidRenderToString(app, { nonce: options.nonce });
     },
     renderToStream(chain, props, options) {
         // Solid's `renderToStream` streams `Uint8Array` chunks into a Web `WritableStream` via
@@ -18,7 +54,7 @@ export const solidAdapter = {
         // <head>) seeds client hydration. A render failure errors `ts.readable`, which `renderPage`
         // surfaces on the response body. The nonce reaches the resource and boundary scripts Solid streams.
         const ts = new TransformStream();
-        const app = compose(chain, props);
+        const app = redactingErrors(compose(chain, props));
         const stream = options?.nonce === undefined
             ? solidRenderToStream(app)
             : solidRenderToStream(app, { nonce: options.nonce });

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,uBAAuB,EACvB,cAAc,IAAI,mBAAmB,EACrC,cAAc,IAAI,mBAAmB,GACtC,MAAM,cAAc,CAAA;AACrB,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAEtC,MAAM,cAAc,GAAG,uBAAuB,EAAE,CAAA;AAEhD,6EAA6E;AAC7E,MAAM,CAAC,MAAM,YAAY,GAAkB;IACzC,gGAAgG;IAChG,mFAAmF;IACnF,4FAA4F;IAC5F,iGAAiG;IACjG,kEAAkE;IAClE,cAAc,CAAC,KAAK,EAAE,KAAK;QACzB,OAAO,mBAAmB,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAA;IACnD,CAAC;IACD,cAAc,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO;QAClC,uFAAuF;QACvF,2FAA2F;QAC3F,6FAA6F;QAC7F,4FAA4F;QAC5F,oGAAoG;QACpG,MAAM,EAAE,GAAG,IAAI,eAAe,EAA0B,CAAA;QACxD,MAAM,GAAG,GAAG,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAA;QACjC,MAAM,MAAM,GACV,OAAO,EAAE,KAAK,KAAK,SAAS;YAC1B,CAAC,CAAC,mBAAmB,CAAC,GAAG,CAAC;YAC1B,CAAC,CAAC,mBAAmB,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,CAAC,CAAA;QACxD,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAA;QAC1B,OAAO,EAAE,CAAC,QAAQ,CAAA;IACpB,CAAC;IACD,aAAa;QACX,OAAO,cAAc,CAAA;IACvB,CAAC;CACF,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AACvC,OAAO,EACL,uBAAuB,EACvB,cAAc,IAAI,mBAAmB,EACrC,cAAc,IAAI,mBAAmB,GACtC,MAAM,cAAc,CAAA;AACrB,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAEtC,MAAM,cAAc,GAAG,uBAAuB,EAAE,CAAA;AAEhD,kFAAkF;AAClF,MAAM,WAAW,GAAG,GAAY,EAAE;IAChC,MAAM,OAAO,GAAG,OAAO,OAAO,KAAK,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,QAAQ,CAAA;IAClF,OAAO,OAAO,KAAK,aAAa,IAAI,OAAO,KAAK,MAAM,CAAA;AACxD,CAAC,CAAA;AAED,wGAAwG;AACxG,SAAS,aAAa;IACpB,qGAAqG;IACrG,+CAA+C;IAC/C,gJAAgJ;IAChJ,OAAO,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,EAAE;QACpC,OAAO,EAAE,EAAE,KAAK,EAAE,uBAAuB,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE;KAChF,CAAU,CAAA;AACb,CAAC;AAED;;;;GAIG;AACH,SAAS,eAAe,CAAI,GAAY;IACtC,IAAI,WAAW,EAAE;QAAE,OAAO,GAAG,CAAA;IAC7B,OAAO,GAAG,EAAE;QACV,6JAA6J;QAC7J,MAAM,OAAO,GAAG,YAAY,CAAC,OAEhB,CAAA;QACb,MAAM,SAAS,GAAG,OAAO,EAAE,SAAS,CAAA;QACpC,IAAI,OAAO,KAAK,SAAS,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;YACrD,OAAO,CAAC,SAAS,GAAG,CAAC,EAAE,EAAE,KAAK,EAAE,EAAE,CAChC,SAAS,CAAC,EAAE,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;QACnE,CAAC;QACD,OAAO,GAAG,EAAE,CAAA;IACd,CAAC,CAAA;AACH,CAAC;AAED,6EAA6E;AAC7E,MAAM,CAAC,MAAM,YAAY,GAAkB;IACzC,gGAAgG;IAChG,mFAAmF;IACnF,4FAA4F;IAC5F,iGAAiG;IACjG,kEAAkE;IAClE,cAAc,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO;QAClC,MAAM,GAAG,GAAG,eAAe,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAA;QAClD,OAAO,OAAO,EAAE,KAAK,KAAK,SAAS;YACjC,CAAC,CAAC,mBAAmB,CAAC,GAAG,CAAC;YAC1B,CAAC,CAAC,mBAAmB,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,CAAC,CAAA;IACxD,CAAC;IACD,cAAc,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO;QAClC,uFAAuF;QACvF,2FAA2F;QAC3F,6FAA6F;QAC7F,4FAA4F;QAC5F,oGAAoG;QACpG,MAAM,EAAE,GAAG,IAAI,eAAe,EAA0B,CAAA;QACxD,MAAM,GAAG,GAAG,eAAe,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAA;QAClD,MAAM,MAAM,GACV,OAAO,EAAE,KAAK,KAAK,SAAS;YAC1B,CAAC,CAAC,mBAAmB,CAAC,GAAG,CAAC;YAC1B,CAAC,CAAC,mBAAmB,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,CAAC,CAAA;QACxD,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAA;QAC1B,OAAO,EAAE,CAAC,QAAQ,CAAA;IACpB,CAAC;IACD,aAAa;QACX,OAAO,cAAc,CAAA;IACvB,CAAC;CACF,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nifrajs/web-solid",
-  "version": "5.0.0",
+  "version": "5.1.0",
   "description": "Solid render adapter for @nifrajs/web - SSR + hydration, with the Solid Babel build plugin (@nifrajs/web-solid/plugin).",
   "keywords": [
     "bun",
@@ -121,10 +121,10 @@
   "dependencies": {
     "@babel/core": "^7.26.0",
     "@babel/preset-typescript": "^7.26.0",
-    "@nifrajs/core": "5.0.0",
-    "@nifrajs/i18n": "5.0.0",
-    "@nifrajs/image": "5.0.0",
-    "@nifrajs/web": "5.0.0",
+    "@nifrajs/core": "5.1.0",
+    "@nifrajs/i18n": "5.1.0",
+    "@nifrajs/image": "5.1.0",
+    "@nifrajs/web": "5.1.0",
     "babel-preset-solid": "^1.9.3",
     "solid-refresh": "^0.7.8"
   },

package/src/index.ts

@@ -5,6 +5,7 @@
  * Bun-plugin in `@nifrajs/web-solid/plugin`.
  */
 import type { RenderAdapter } from "@nifrajs/web"
+import { sharedConfig } from "solid-js"
 import {
   generateHydrationScript,
   renderToStream as solidRenderToStream,
@@ -14,6 +15,43 @@ import { compose } from "./compose.ts"
 
 const HYDRATION_HEAD = generateHydrationScript()
 
+// An unset NODE_ENV counts as production, as for the framework's own error pages.
+const showsErrors = (): boolean => {
+  const nodeEnv = typeof process === "undefined" ? undefined : process.env?.NODE_ENV
+  return nodeEnv === "development" || nodeEnv === "test"
+}
+
+/** What the browser receives for an error Solid hands to hydration: its text names server internals. */
+function redactedError(): Error {
+  // Built bare: a constructed Error carries a stack and, on Bun, the line, column and file it was made
+  // at, and Solid serializes every own property.
+  // biome-ignore lint/plugin/requireSafetyCommentForTypeAssertion: Object.create over Error.prototype with a message is an Error minus its stack.
+  return Object.create(Error.prototype, {
+    message: { value: "Internal Server Error", writable: true, configurable: true },
+  }) as Error
+}
+
+/**
+ * Render `app` with every Error that Solid serializes for hydration replaced. An `<ErrorBoundary>` that
+ * caught on the server, or a failed resource, otherwise ships the message and stack in an inline script.
+ * Nested contexts copy this one, so they keep the wrapped `serialize`.
+ */
+function redactingErrors<T>(app: () => T): () => T {
+  if (showsErrors()) return app
+  return () => {
+    // biome-ignore lint/plugin/requireSafetyCommentForTypeAssertion: Solid's server renderers set a context with serialize; the check below handles its absence.
+    const context = sharedConfig.context as
+      | { serialize?: (id: string, value: unknown) => void }
+      | undefined
+    const serialize = context?.serialize
+    if (context !== undefined && serialize !== undefined) {
+      context.serialize = (id, value) =>
+        serialize(id, value instanceof Error ? redactedError() : value)
+    }
+    return app()
+  }
+}
+
 /** The Solid server render adapter - pass to @nifrajs/web's `renderPage`. */
 export const solidAdapter: RenderAdapter = {
   // Synchronous one-pass render for non-deferred pages (renderPage's buffered fast path). Solid's
@@ -21,8 +59,11 @@ export const solidAdapter: RenderAdapter = {
   // `generateHydrationScript()`) as `renderToStream`, but skips the TransformStream + Solid's
   // streaming machinery - the heaviest of the five renderers on Bun. A page that defer()s/Suspends
   // takes `renderToStream` below (progressive resolution needs it).
-  renderToString(chain, props) {
-    return solidRenderToString(compose(chain, props))
+  renderToString(chain, props, options) {
+    const app = redactingErrors(compose(chain, props))
+    return options?.nonce === undefined
+      ? solidRenderToString(app)
+      : solidRenderToString(app, { nonce: options.nonce })
   },
   renderToStream(chain, props, options) {
     // Solid's `renderToStream` streams `Uint8Array` chunks into a Web `WritableStream` via
@@ -31,7 +72,7 @@ export const solidAdapter: RenderAdapter = {
     // <head>) seeds client hydration. A render failure errors `ts.readable`, which `renderPage`
     // surfaces on the response body. The nonce reaches the resource and boundary scripts Solid streams.
     const ts = new TransformStream<Uint8Array, Uint8Array>()
-    const app = compose(chain, props)
+    const app = redactingErrors(compose(chain, props))
     const stream =
       options?.nonce === undefined
         ? solidRenderToStream(app)