@web-widget/react 1.56.0 → 1.57.0

package/dist/{types-CYxYkOI1.d.ts → components-BlwPaPdf.d.ts}

@@ -1,7 +1,6 @@
 import * as react from 'react';
-import { FunctionComponent, ReactNode, Component } from 'react';
+import { FunctionComponent, ReactNode } from 'react';
 import { WebWidgetRendererOptions, Loader } from '@web-widget/web-widget';
-import { RenderContext, ComponentProps, SerializableValue } from '@web-widget/helpers';
 
 interface ReactWidgetComponent<T> extends FunctionComponent<T & WebWidgetSuspenseProps> {
 }
@@ -28,12 +27,4 @@ interface WebWidgetSuspenseProps {
 }
 declare function defineWebWidget(loader: Loader, options: DefineWebWidgetOptions): react.NamedExoticComponent<WebWidgetSuspenseProps>;
 
-interface SerializableObject {
-    [key: string]: SerializableValue;
-}
-interface CreateReactRenderOptions {
-    /**@deprecated*/
-    onPrefetchData?: (context: RenderContext, component: Component, props: ComponentProps) => Promise<SerializableObject>;
-}
-
-export { type CreateReactRenderOptions as C, type DefineWebWidgetOptions as D, type ReactWidgetComponent as R, type WebWidgetProps as W, type WebWidgetSuspenseProps as a, defineWebWidget as d };
+export { type DefineWebWidgetOptions as D, type ReactWidgetComponent as R, type WebWidgetProps as W, type WebWidgetSuspenseProps as a, defineWebWidget as d };

package/dist/react.client.d.ts

@@ -1,14 +1,10 @@
 import * as _web_widget_helpers from '@web-widget/helpers';
 export * from '@web-widget/helpers';
-import { C as CreateReactRenderOptions } from './types-CYxYkOI1.js';
-export { D as DefineWebWidgetOptions, R as ReactWidgetComponent, W as WebWidgetProps, a as WebWidgetSuspenseProps, d as defineWebWidget } from './types-CYxYkOI1.js';
+import { FunctionComponent } from 'react';
 export { useWidgetSyncState as useWidgetState } from '@web-widget/helpers/state';
-import 'react';
+export { D as DefineWebWidgetOptions, R as ReactWidgetComponent, W as WebWidgetProps, a as WebWidgetSuspenseProps, d as defineWebWidget } from './components-BlwPaPdf.js';
 import '@web-widget/web-widget';
 
-declare const createReactRender: ({ onPrefetchData, }?: CreateReactRenderOptions) => (context: _web_widget_helpers.WidgetRenderContext<unknown>, renderOptions: _web_widget_helpers.WidgetRenderOptions) => Promise<_web_widget_helpers.WidgetRenderResult>;
-/**@deprecated Please use `createReactRender` instead.*/
-declare const defineReactRender: ({ onPrefetchData, }?: CreateReactRenderOptions) => (context: _web_widget_helpers.WidgetRenderContext<unknown>, renderOptions: _web_widget_helpers.WidgetRenderOptions) => Promise<_web_widget_helpers.WidgetRenderResult>;
-declare const render: (context: _web_widget_helpers.WidgetRenderContext<unknown>, renderOptions: _web_widget_helpers.WidgetRenderOptions) => Promise<_web_widget_helpers.WidgetRenderResult>;
+declare const render: _web_widget_helpers.ClientRender<FunctionComponent<{}>, unknown, _web_widget_helpers.ClientRenderOptions, void | _web_widget_helpers.ClientRenderResult<unknown>>;
 
-export { createReactRender, defineReactRender, render };
+export { render };

package/dist/react.client.js

@@ -3,36 +3,24 @@ import {
 } from "./chunk-RYJ3BJDY.js";
 
 // src/client.ts
-import { defineRender, getComponentDescriptor } from "@web-widget/helpers";
+import { defineClientRender } from "@web-widget/helpers";
 import { createElement, StrictMode } from "react";
 import { createRoot, hydrateRoot } from "react-dom/client";
 export * from "@web-widget/helpers";
 import { useWidgetSyncState } from "@web-widget/helpers/state";
-var createReactRender = ({
-  onPrefetchData
-} = {}) => {
-  if (onPrefetchData) {
-    throw new Error(`"onPrefetchData" is not supported.`);
-  }
-  return defineRender(async (context) => {
-    const { recovering, container } = context;
-    const componentDescriptor = getComponentDescriptor(context);
-    const { component, props } = componentDescriptor;
+var render = defineClientRender(
+  async (component, context, { recovering, container }) => {
+    if (!component) {
+      throw new TypeError(`Missing component.`);
+    }
     if (!container) {
-      throw new Error(`Container required.`);
+      throw new Error(`Missing container.`);
     }
     let root;
     return {
       async mount() {
-        let vNode;
-        if (typeof component === "function" && component.constructor.name === "AsyncFunction") {
-          vNode = await component(props);
-        } else {
-          vNode = createElement(
-            component,
-            props
-          );
-        }
+        const isAsyncFunction = Object.prototype.toString.call(component) === "[object AsyncFunction]";
+        let vNode = isAsyncFunction ? await component(context) : createElement(component, context);
         vNode = createElement(StrictMode, null, vNode);
         if (recovering) {
           root = hydrateRoot(container, vNode);
@@ -46,13 +34,9 @@ var createReactRender = ({
         root = null;
       }
     };
-  });
-};
-var defineReactRender = createReactRender;
-var render = createReactRender();
+  }
+);
 export {
-  createReactRender,
-  defineReactRender,
   defineWebWidget,
   render,
   useWidgetSyncState as useWidgetState

package/dist/react.server.d.ts

@@ -1,20 +1,21 @@
 import * as _web_widget_helpers from '@web-widget/helpers';
 export * from '@web-widget/helpers';
-import { C as CreateReactRenderOptions } from './types-CYxYkOI1.js';
-export { D as DefineWebWidgetOptions, R as ReactWidgetComponent, W as WebWidgetProps, a as WebWidgetSuspenseProps, d as defineWebWidget } from './types-CYxYkOI1.js';
+import { FunctionComponent } from 'react';
 import { PrerenderOptions } from 'react-dom/static';
 export { useWidgetSyncState as useWidgetState } from '@web-widget/helpers/state';
+export { D as DefineWebWidgetOptions, R as ReactWidgetComponent, W as WebWidgetProps, a as WebWidgetSuspenseProps, d as defineWebWidget } from './components-BlwPaPdf.js';
 import { RenderToReadableStreamOptions } from 'react-dom/server';
-import 'react';
 import '@web-widget/web-widget';
 
+declare global {
+    interface ReadableStream {
+        [Symbol.asyncIterator](): AsyncIterator<ArrayBuffer | ArrayBufferView>;
+    }
+}
 type RenderToStringOptions = PrerenderOptions;
 
 declare module '@web-widget/schema' {
-    interface WidgetRenderOptions {
-        react?: {};
-    }
-    interface RouteRenderOptions {
+    interface ServerRenderOptions {
         react?: StreamOptions;
     }
 }
@@ -25,9 +26,6 @@ type StreamOptions = {
 interface ReactRenderOptions {
     react?: StreamOptions;
 }
-declare const createReactRender: ({ onPrefetchData, }?: CreateReactRenderOptions) => (context: _web_widget_helpers.RouteRenderContext<unknown, Record<string, string>>, renderOptions: _web_widget_helpers.RouteRenderOptions) => Promise<_web_widget_helpers.RouteRenderResult>;
-/**@deprecated Please use `createReactRender` instead.*/
-declare const defineReactRender: ({ onPrefetchData, }?: CreateReactRenderOptions) => (context: _web_widget_helpers.RouteRenderContext<unknown, Record<string, string>>, renderOptions: _web_widget_helpers.RouteRenderOptions) => Promise<_web_widget_helpers.RouteRenderResult>;
-declare const render: (context: _web_widget_helpers.RouteRenderContext<unknown, Record<string, string>>, renderOptions: _web_widget_helpers.RouteRenderOptions) => Promise<_web_widget_helpers.RouteRenderResult>;
+declare const render: _web_widget_helpers.ServerRender<FunctionComponent<{}>, unknown, _web_widget_helpers.ServerRenderOptions, _web_widget_helpers.ServerRenderResult>;
 
-export { type ReactRenderOptions, createReactRender, defineReactRender, render };
+export { type ReactRenderOptions, render };

package/dist/react.server.js

@@ -3,10 +3,7 @@ import {
 } from "./chunk-RYJ3BJDY.js";
 
 // src/server.ts
-import {
-  defineRender,
-  getComponentDescriptor
-} from "@web-widget/helpers";
+import { defineServerRender } from "@web-widget/helpers";
 import { createElement, StrictMode } from "react";
 
 // src/edge.ts
@@ -30,57 +27,38 @@ async function readableStreamToString(readableStream) {
 // src/server.ts
 export * from "@web-widget/helpers";
 import { useWidgetSyncState } from "@web-widget/helpers/state";
-var createReactRender = ({
-  onPrefetchData
-} = {}) => {
-  if (onPrefetchData) {
-    throw new Error(`"onPrefetchData" is not supported.`);
-  }
-  return defineRender(
-    async (context, { progressive, react: options } = {}) => {
-      const reactRenderOptions = Object.create(options != null ? options : null);
-      let error;
-      const componentDescriptor = getComponentDescriptor(context);
-      const { component, props } = componentDescriptor;
-      const onError = reactRenderOptions.onError;
-      const awaitAllReady = reactRenderOptions.awaitAllReady;
-      if (!reactRenderOptions.signal) {
-        reactRenderOptions.signal = AbortSignal.timeout(1e3 * 10);
-      }
-      reactRenderOptions.onError = (e, i) => {
-        error = e;
-        if (onError) {
-          onError(e, i);
-        } else if (progressive && !awaitAllReady) {
-          console.error(e);
-        }
-      };
-      let vNode;
-      if (typeof component === "function" && component.constructor.name === "AsyncFunction") {
-        vNode = await component(props);
-      } else {
-        vNode = createElement(
-          component,
-          props
-        );
-      }
-      vNode = createElement(StrictMode, null, vNode);
-      const html = await (progressive ? renderToReadableStream(vNode, reactRenderOptions) : renderToString(vNode, reactRenderOptions));
-      if (progressive && awaitAllReady) {
-        await html.allReady;
-      }
-      if (error) {
-        throw error;
+var DEFAULT_TIMEOUT_MS = 1e3 * 10;
+var render = defineServerRender(
+  async (component, context, { progressive, react }) => {
+    if (!component) {
+      throw new TypeError(`Missing component.`);
+    }
+    const reactRenderOptions = Object.create(react != null ? react : null);
+    let error;
+    const { onError, awaitAllReady, signal } = reactRenderOptions;
+    reactRenderOptions.signal = signal != null ? signal : AbortSignal.timeout(DEFAULT_TIMEOUT_MS);
+    reactRenderOptions.onError = (e, i) => {
+      error = e;
+      onError == null ? void 0 : onError(e, i);
+      if (!onError && progressive && !awaitAllReady) {
+        console.error(e);
       }
-      return html;
+    };
+    const isAsyncFunction = Object.prototype.toString.call(component) === "[object AsyncFunction]";
+    let vNode = isAsyncFunction ? await component(context) : createElement(component, context);
+    vNode = createElement(StrictMode, null, vNode);
+    const renderMethod = progressive ? renderToReadableStream : renderToString;
+    const result = await renderMethod(vNode, reactRenderOptions);
+    if (progressive && awaitAllReady && "allReady" in result) {
+      await result.allReady;
     }
-  );
-};
-var defineReactRender = createReactRender;
-var render = createReactRender();
+    if (error) {
+      throw error;
+    }
+    return result;
+  }
+);
 export {
-  createReactRender,
-  defineReactRender,
   defineWebWidget,
   render,
   useWidgetSyncState as useWidgetState

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@web-widget/react",
   "description": "React adapter",
-  "version": "1.56.0",
+  "version": "1.57.0",
   "homepage": "https://github.com/web-widget/web-widget#readme",
   "repository": {
     "type": "git",
@@ -14,10 +14,10 @@
   "license": "MIT",
   "dependencies": {
     "@rollup/pluginutils": "^5.1.4",
-    "@web-widget/helpers": "1.56.0",
-    "@web-widget/schema": "1.56.0",
-    "@web-widget/vite-plugin": "1.56.0",
-    "@web-widget/web-widget": "1.56.0"
+    "@web-widget/helpers": "1.57.0",
+    "@web-widget/schema": "1.57.0",
+    "@web-widget/vite-plugin": "1.57.0",
+    "@web-widget/web-widget": "1.57.0"
   },
   "devDependencies": {
     "@types/react": "^19.0.10",