@solidjs/web 2.0.0-beta.24 → 2.0.0-beta.25

package/frames/dist/client.cjs

@@ -1,6 +1,7 @@
 'use strict';
 
 var solidJs = require('solid-js');
+var client = require('@solidjs/web/server-functions/client');
 var seroval = require('seroval');
 var web = require('seroval-plugins/web');
 
@@ -1283,6 +1284,9 @@ function tableFor(id) {
   for (const [root, t] of tables) if (id.startsWith(root + ".")) return t;
   return undefined;
 }
+function beginStream(frameId) {
+  tables.set(frameId, createJSONDataTable());
+}
 function getFrameHost() {
   if (!sharedHost) {
     sharedHost = createFrameHost({
@@ -1452,6 +1456,21 @@ function installServerComponents(host = getFrameHost()) {
     };
   }
   g._$SC.impl = (id, props) => documentBoundary(host, id, props);
+  client.configureServerFunctionsClient({
+    responseHandler: createServerComponentHandler({
+      host,
+      capture: () => solidJs.getOwner() ?? undefined,
+      component: frameId => boundaryComponent(host, frameId),
+      onStream: frameId => beginStream(frameId),
+      documentComponent: functionId => g._$SC.c[functionId],
+      intercept: ({
+        id
+      }) => {
+        if (claimedBoundaries.has(id) || !findBoundaryRange(id)) return undefined;
+        return g._$SC.r(id);
+      }
+    })
+  });
 }
 
 exports.FRAME_APPLIED_EVENT = FRAME_APPLIED_EVENT;

package/frames/dist/client.js

@@ -1,4 +1,5 @@
 import { getOwner, onCleanup, runWithOwner, sharedConfig, createOwner } from 'solid-js';
+import { configureServerFunctionsClient } from '@solidjs/web/server-functions/client';
 import { fromCrossJSON, Feature } from 'seroval';
 import { AbortSignalPlugin, CustomEventPlugin, DOMExceptionPlugin, EventPlugin, FormDataPlugin, HeadersPlugin, ReadableStreamPlugin, RequestPlugin, ResponsePlugin, URLSearchParamsPlugin, URLPlugin } from 'seroval-plugins/web';
 
@@ -1281,6 +1282,9 @@ function tableFor(id) {
   for (const [root, t] of tables) if (id.startsWith(root + ".")) return t;
   return undefined;
 }
+function beginStream(frameId) {
+  tables.set(frameId, createJSONDataTable());
+}
 function getFrameHost() {
   if (!sharedHost) {
     sharedHost = createFrameHost({
@@ -1450,6 +1454,21 @@ function installServerComponents(host = getFrameHost()) {
     };
   }
   g._$SC.impl = (id, props) => documentBoundary(host, id, props);
+  configureServerFunctionsClient({
+    responseHandler: createServerComponentHandler({
+      host,
+      capture: () => getOwner() ?? undefined,
+      component: frameId => boundaryComponent(host, frameId),
+      onStream: frameId => beginStream(frameId),
+      documentComponent: functionId => g._$SC.c[functionId],
+      intercept: ({
+        id
+      }) => {
+        if (claimedBoundaries.has(id) || !findBoundaryRange(id)) return undefined;
+        return g._$SC.r(id);
+      }
+    })
+  });
 }
 
 export { FRAME_APPLIED_EVENT, FRAME_STREAM_HEADER, applyFrameResponse, createFrame, createFrameHost, createFrameInsertable, createJSONDataTable, createServerComponentHandler, getFrameHost, installServerComponents, isFrameStreamResponse };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@solidjs/web",
   "description": "Solid's web runtime: client rendering, hydration, SSR, and DOM-specific control flow (Portal, Dynamic).",
-  "version": "2.0.0-beta.24",
+  "version": "2.0.0-beta.25",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://solidjs.com",
@@ -296,25 +296,26 @@
     "seroval-plugins": "~1.5.4"
   },
   "peerDependencies": {
-    "solid-js": "^2.0.0-beta.24"
+    "solid-js": "^2.0.0-beta.25"
   },
   "devDependencies": {
-    "solid-js": "2.0.0-beta.24"
+    "solid-js": "2.0.0-beta.25"
   },
   "scripts": {
     "build": "npm-run-all -nl build:clean types:copy-jsx build:js",
     "build:clean": "rimraf dist/",
     "build:js": "rollup -c",
     "link": "symlink-dir . node_modules/@solidjs/web",
-    "types": "npm-run-all -nl types:clean types:copy-jsx types:web types:copy-web types:web-storage types:copy-serialization types:copy-server-functions types:copy-frames types:cjs",
-    "types:clean": "rimraf types/ types-cjs/ storage/types/ storage/types-cjs/ serialization/types/ serialization/types-cjs/",
+    "types": "npm-run-all -nl types:clean types:copy-jsx types:web types:copy-web types:web-storage types:copy-server-functions types:web-frames types:copy-serialization types:copy-frames types:cjs",
+    "types:clean": "rimraf types/ types-cjs/ storage/types/ storage/types-cjs/ serialization/types/ serialization/types-cjs/ frames/types/",
     "types:copy-jsx": "ncp ../../node_modules/@dom-expressions/runtime/src/jsx.d.ts ./src/jsx.d.ts && ncp ../../node_modules/@dom-expressions/runtime/src/jsx-properties.d.ts ./src/jsx-properties.d.ts && dom-expressions-jsx-types --input ./src/jsx.d.ts --element \"SolidElement | Node | ArrayElement\" --import 'import type { Element as SolidElement } from \"solid-js\";'",
     "types:web": "tsc --project ./tsconfig.build.json",
     "types:copy-web": "ncp ../../node_modules/@dom-expressions/runtime/src/client.d.ts ./types/client.d.ts && ncp ../../node_modules/@dom-expressions/runtime/src/server.d.ts ./types/server.d.ts && ncp ../../node_modules/@dom-expressions/runtime/src/serializer.d.ts ./types/serializer.d.ts && ncp ../../node_modules/@dom-expressions/runtime/src/response.d.ts ./types/response.d.ts && ncp ./src/jsx.d.ts ./types/jsx.d.ts && ncp ./src/jsx-properties.d.ts ./types/jsx-properties.d.ts",
     "types:web-storage": "tsc --project ./storage/tsconfig.build.json",
+    "types:web-frames": "tsc --project ./frames/tsconfig.build.json",
     "types:copy-serialization": "node -e \"fs.mkdirSync('./serialization/types', { recursive: true }); fs.copyFileSync('../../node_modules/@dom-expressions/runtime/src/serializer.d.ts', './serialization/types/index.d.ts');\"",
     "types:copy-server-functions": "node -e \"fs.mkdirSync('./types/server-functions', { recursive: true }); for (const f of ['shared', 'client', 'server']) fs.copyFileSync('../../node_modules/@dom-expressions/runtime/src/server-functions/' + f + '.d.ts', './types/server-functions/' + f + '.d.ts');\"",
-    "types:copy-frames": "node -e \"fs.mkdirSync('./types/frames', { recursive: true }); for (const f of ['frame-client', 'frame-transport', 'frame-sink', 'serializer']) fs.copyFileSync('../../node_modules/@dom-expressions/runtime/src/' + f + '.d.ts', './types/frames/' + f + '.d.ts'); for (const f of ['client', 'server']) fs.copyFileSync('./frames/types/' + f + '.d.ts', './types/frames/' + f + '.d.ts');\"",
+    "types:copy-frames": "node -e \"fs.mkdirSync('./types/frames', { recursive: true }); for (const f of ['frame-client', 'frame-transport', 'frame-sink', 'serializer']) fs.copyFileSync('../../node_modules/@dom-expressions/runtime/src/' + f + '.d.ts', './types/frames/' + f + '.d.ts'); for (const f of ['client', 'server']) fs.writeFileSync('./types/frames/' + f + '.d.ts', fs.readFileSync('./frames/types/' + f + '.d.ts', 'utf8').replaceAll('@dom-expressions/runtime/src/', './'));\"",
     "types:cjs": "node ../../scripts/sync-dual-types.mjs ./types ./types-cjs ./storage/types ./storage/types-cjs ./serialization/types ./serialization/types-cjs",
     "test": "vitest run && vitest run --config vite.config.server.mjs && vitest run --config vite.config.hydrate.mjs",
     "test:server": "vitest run --config vite.config.server.mjs",

package/types/frames/client.d.ts

@@ -1,53 +1,17 @@
-/**
- * @solidjs/web/frames — client half. Consume frame streams into live DOM
- * boundaries. There is deliberately no server-component API here beyond
- * `installServerComponents()`: `dynamic` + server functions IS the client
- * surface — a server-function call whose response is a frame stream
- * resolves with a stable per-call-site component.
- *
- * Copied next to the runtime's frame d.ts files at publish (see
- * types:copy-frames), so the relative imports below resolve in-place.
- */
-export {
-  createFrame,
-  createFrameHost,
-  createFrameInsertable,
-  FRAME_APPLIED_EVENT
-} from "./frame-client.js";
-export type {
-  Frame,
-  FrameChunk,
-  FrameHost,
-  FrameHostOptions,
-  FrameOptions,
-  FrameWrite,
-  Slot,
-  SlotContext
-} from "./frame-client.js";
-export {
-  FRAME_STREAM_HEADER,
-  applyFrameResponse,
-  isFrameStreamResponse,
-  createServerComponentHandler
-} from "./frame-transport.js";
+export { createFrame, createFrameHost, createFrameInsertable, FRAME_APPLIED_EVENT } from "./frame-client.js";
+export { FRAME_STREAM_HEADER, applyFrameResponse, isFrameStreamResponse, createServerComponentHandler } from "./frame-transport.js";
 export { createJSONDataTable } from "./serializer.js";
-export type { JSONDataTable } from "./serializer.js";
-
-import type { FrameHost } from "./frame-client.js";
-
-/**
- * The app-wide frame host (created on first use): one chunk router, with
- * codec data tables rotated per response — deserializer cross-reference
- * space is stream-scoped by contract.
- */
-export function getFrameHost(): FrameHost;
-
+export declare function getFrameHost(): any;
 /**
  * Installs the server-component transport policy on the server-function
- * client: boundary identity derives from the reactive owner captured at the
- * call site, frame-stream responses resolve to stable per-call-site
- * components, and document-SSR boundaries adopt their server-rendered
- * ranges. Call once in the client entry (the package is sideEffects:false —
- * a bare import would be tree-shaken); call again to rebind a custom host.
+ * client: boundary identity derives from the reactive owner captured at
+ * each call site (`getOwner`), so distinct `dynamic()` sources get
+ * independent boundaries with nothing declared, refetches from the same
+ * source resolve to the identical component, and ownerless calls fall back
+ * to one boundary per function id.
+ *
+ * Call once in the client entry (an explicit call — the package is
+ * `sideEffects: false`, so a bare import would be tree-shaken away);
+ * call again to rebind to a custom host.
  */
-export function installServerComponents(host?: FrameHost): void;
+export declare function installServerComponents(host?: any): void;

package/types/frames/server.d.ts

@@ -1,21 +1,2 @@
-/**
- * @solidjs/web/frames — server half. Render server components (functions
- * returned from server functions) to frame-chunk streams, serve them as
- * framed HTTP responses through the server-function handler's
- * transformResult hook, and render them inline during document SSR.
- *
- * Copied next to the runtime's frame d.ts files at publish (see
- * types:copy-frames), so the relative imports below resolve in-place.
- */
-export {
-  renderToFrameStream,
-  renderServerComponent,
-  serverComponentResponse,
-  frameTransformResult,
-  createFrameSink,
-  frameTransformDirectResult,
-  ServerComponentPlugin,
-  SERVER_COMPONENT_BOOTSTRAP
-} from "./frame-sink.js";
-export type { FrameAddress, FrameStream, FrameStreamOptions } from "./frame-sink.js";
+export { renderToFrameStream, renderServerComponent, serverComponentResponse, frameTransformResult, createFrameSink, frameTransformDirectResult, ServerComponentPlugin, SERVER_COMPONENT_BOOTSTRAP } from "./frame-sink.js";
 export { FRAME_STREAM_HEADER, isFrameStreamResponse } from "./frame-transport.js";

package/types-cjs/frames/client.d.cts

@@ -1,53 +1,17 @@
-/**
- * @solidjs/web/frames — client half. Consume frame streams into live DOM
- * boundaries. There is deliberately no server-component API here beyond
- * `installServerComponents()`: `dynamic` + server functions IS the client
- * surface — a server-function call whose response is a frame stream
- * resolves with a stable per-call-site component.
- *
- * Copied next to the runtime's frame d.ts files at publish (see
- * types:copy-frames), so the relative imports below resolve in-place.
- */
-export {
-  createFrame,
-  createFrameHost,
-  createFrameInsertable,
-  FRAME_APPLIED_EVENT
-} from "./frame-client.cjs";
-export type {
-  Frame,
-  FrameChunk,
-  FrameHost,
-  FrameHostOptions,
-  FrameOptions,
-  FrameWrite,
-  Slot,
-  SlotContext
-} from "./frame-client.cjs";
-export {
-  FRAME_STREAM_HEADER,
-  applyFrameResponse,
-  isFrameStreamResponse,
-  createServerComponentHandler
-} from "./frame-transport.cjs";
+export { createFrame, createFrameHost, createFrameInsertable, FRAME_APPLIED_EVENT } from "./frame-client.cjs";
+export { FRAME_STREAM_HEADER, applyFrameResponse, isFrameStreamResponse, createServerComponentHandler } from "./frame-transport.cjs";
 export { createJSONDataTable } from "./serializer.cjs";
-export type { JSONDataTable } from "./serializer.cjs";
-
-import type { FrameHost } from "./frame-client.cjs";
-
-/**
- * The app-wide frame host (created on first use): one chunk router, with
- * codec data tables rotated per response — deserializer cross-reference
- * space is stream-scoped by contract.
- */
-export function getFrameHost(): FrameHost;
-
+export declare function getFrameHost(): any;
 /**
  * Installs the server-component transport policy on the server-function
- * client: boundary identity derives from the reactive owner captured at the
- * call site, frame-stream responses resolve to stable per-call-site
- * components, and document-SSR boundaries adopt their server-rendered
- * ranges. Call once in the client entry (the package is sideEffects:false —
- * a bare import would be tree-shaken); call again to rebind a custom host.
+ * client: boundary identity derives from the reactive owner captured at
+ * each call site (`getOwner`), so distinct `dynamic()` sources get
+ * independent boundaries with nothing declared, refetches from the same
+ * source resolve to the identical component, and ownerless calls fall back
+ * to one boundary per function id.
+ *
+ * Call once in the client entry (an explicit call — the package is
+ * `sideEffects: false`, so a bare import would be tree-shaken away);
+ * call again to rebind to a custom host.
  */
-export function installServerComponents(host?: FrameHost): void;
+export declare function installServerComponents(host?: any): void;

package/types-cjs/frames/server.d.cts

@@ -1,21 +1,2 @@
-/**
- * @solidjs/web/frames — server half. Render server components (functions
- * returned from server functions) to frame-chunk streams, serve them as
- * framed HTTP responses through the server-function handler's
- * transformResult hook, and render them inline during document SSR.
- *
- * Copied next to the runtime's frame d.ts files at publish (see
- * types:copy-frames), so the relative imports below resolve in-place.
- */
-export {
-  renderToFrameStream,
-  renderServerComponent,
-  serverComponentResponse,
-  frameTransformResult,
-  createFrameSink,
-  frameTransformDirectResult,
-  ServerComponentPlugin,
-  SERVER_COMPONENT_BOOTSTRAP
-} from "./frame-sink.cjs";
-export type { FrameAddress, FrameStream, FrameStreamOptions } from "./frame-sink.cjs";
+export { renderToFrameStream, renderServerComponent, serverComponentResponse, frameTransformResult, createFrameSink, frameTransformDirectResult, ServerComponentPlugin, SERVER_COMPONENT_BOOTSTRAP } from "./frame-sink.cjs";
 export { FRAME_STREAM_HEADER, isFrameStreamResponse } from "./frame-transport.cjs";