@web-widget/react 0.2.0 → 0.3.1

package/dist/react.client.d.ts

@@ -43,11 +43,11 @@ type JSONValue = string | number | boolean | {
 type JSONProps = {
     [x: string]: JSONValue;
 };
-interface DefineVueRenderOptions {
+interface DefineReactRenderOptions {
     onPrefetchData?: (context: RenderContext, component: Component, props: ComponentProps) => Promise<JSONProps>;
 }
 
-declare const defineReactRender: ({ onPrefetchData, }?: DefineVueRenderOptions) => (context: _web_widget_schema.ClientWidgetRenderContext<unknown> | _web_widget_schema.ClientRouteRenderContext<unknown, Record<string, string>>) => Promise<void | {
+declare const defineReactRender: ({ onPrefetchData, }?: DefineReactRenderOptions) => (context: _web_widget_schema.ClientWidgetRenderContext<unknown> | _web_widget_schema.ClientRouteRenderContext<unknown, Record<string, string>>, renderOptions: any) => Promise<void | {
     mount?: (() => void | Promise<void>) | undefined;
     unmount?: (() => void | Promise<void>) | undefined;
     update?: (({ data }: {
@@ -60,7 +60,7 @@ declare const defineReactRender: ({ onPrefetchData, }?: DefineVueRenderOptions)
         data: Record<string, any>;
     }) => void | Promise<void>) | undefined;
 }>;
-declare const render: (context: _web_widget_schema.ClientWidgetRenderContext<unknown> | _web_widget_schema.ClientRouteRenderContext<unknown, Record<string, string>>) => Promise<void | {
+declare const render: (context: _web_widget_schema.ClientWidgetRenderContext<unknown> | _web_widget_schema.ClientRouteRenderContext<unknown, Record<string, string>>, renderOptions: any) => Promise<void | {
     mount?: (() => void | Promise<void>) | undefined;
     unmount?: (() => void | Promise<void>) | undefined;
     update?: (({ data }: {

package/dist/react.client.js

@@ -30,6 +30,14 @@ var __objRest = (source, exclude) => {
   return target;
 };
 
+// src/client.ts
+import {
+  defineRender,
+  getComponentDescriptor
+} from "@web-widget/schema/client-helpers";
+import { createElement as createElement2 } from "react";
+import { createRoot, hydrateRoot } from "react-dom/client";
+
 // src/web-widget.tsx
 import { parse } from "@web-widget/web-widget";
 import { Suspense, createElement, lazy } from "react";
@@ -100,9 +108,6 @@ function defineWebWidget(loader, options) {
 }
 
 // src/client.ts
-import { createElement as createElement2 } from "react";
-import { createRoot, hydrateRoot } from "react-dom/client";
-import { defineRender } from "@web-widget/schema/client-helpers";
 export * from "@web-widget/schema/client-helpers";
 Reflect.defineProperty(__ENV__, "server", {
   value: false
@@ -110,8 +115,10 @@ Reflect.defineProperty(__ENV__, "server", {
 var defineReactRender = ({
   onPrefetchData
 } = {}) => {
-  return defineRender(async (context, component, props) => {
+  return defineRender(async (context) => {
     const { recovering, container } = context;
+    const componentDescriptor = getComponentDescriptor(context);
+    const { component, props } = componentDescriptor;
     if (!container) {
       throw new Error(`Container required.`);
     }
@@ -128,10 +135,7 @@ var defineReactRender = ({
         if (typeof component === "function" && component.constructor.name === "AsyncFunction") {
           vNode = await component(mergedProps);
         } else {
-          vNode = createElement2(
-            component,
-            mergedProps
-          );
+          vNode = createElement2(component, mergedProps);
         }
         if (recovering) {
           root = hydrateRoot(context.container, vNode);

package/dist/react.server.d.ts

@@ -1,5 +1,6 @@
 import * as _web_widget_schema from '@web-widget/schema';
 import { RenderContext, ComponentProps } from '@web-widget/schema';
+import { RenderToReadableStreamOptions } from 'react-dom/server';
 import * as react from 'react';
 import { ReactNode, Component } from 'react';
 export * from '@web-widget/schema/server-helpers';
@@ -43,11 +44,16 @@ type JSONValue = string | number | boolean | {
 type JSONProps = {
     [x: string]: JSONValue;
 };
-interface DefineVueRenderOptions {
+interface DefineReactRenderOptions {
     onPrefetchData?: (context: RenderContext, component: Component, props: ComponentProps) => Promise<JSONProps>;
 }
 
-declare const defineReactRender: ({ onPrefetchData, }?: DefineVueRenderOptions) => (context: _web_widget_schema.ServerWidgetRenderContext<unknown> | _web_widget_schema.ServerRouteRenderContext<unknown, Record<string, string>>) => Promise<string | ReadableStream<any>>;
-declare const render: (context: _web_widget_schema.ServerWidgetRenderContext<unknown> | _web_widget_schema.ServerRouteRenderContext<unknown, Record<string, string>>) => Promise<string | ReadableStream<any>>;
+interface ReactRenderOptions {
+    react?: {
+        awaitAllReady?: boolean;
+    } & RenderToReadableStreamOptions;
+}
+declare const defineReactRender: ({ onPrefetchData, }?: DefineReactRenderOptions) => (context: _web_widget_schema.ServerWidgetRenderContext<unknown> | _web_widget_schema.ServerRouteRenderContext<unknown, Record<string, string>>, renderOptions: ResponseInit & ReactRenderOptions) => Promise<string | ReadableStream<any> | ReadableStream<any>>;
+declare const render: (context: _web_widget_schema.ServerWidgetRenderContext<unknown> | _web_widget_schema.ServerRouteRenderContext<unknown, Record<string, string>>, renderOptions: ResponseInit & ReactRenderOptions) => Promise<string | ReadableStream<any> | ReadableStream<any>>;
 
-export { DefineWebWidgetOptions, WebWidget, WebWidgetProps, WebWidgetSuspenseProps, __ENV__, defineReactRender, defineWebWidget, render };
+export { DefineWebWidgetOptions, ReactRenderOptions, WebWidget, WebWidgetProps, WebWidgetSuspenseProps, __ENV__, defineReactRender, defineWebWidget, render };

package/dist/react.server.js

@@ -30,6 +30,13 @@ var __objRest = (source, exclude) => {
   return target;
 };
 
+// src/server.ts
+import {
+  defineRender,
+  getComponentDescriptor
+} from "@web-widget/schema/server-helpers";
+import { Fragment, createElement as createElement2 } from "react";
+
 // src/web-widget.tsx
 import { parse } from "@web-widget/web-widget";
 import { Suspense, createElement, lazy } from "react";
@@ -100,10 +107,7 @@ function defineWebWidget(loader, options) {
 }
 
 // src/server.ts
-import { Fragment } from "react";
-import { createElement as createElement2 } from "react";
 import * as ReactDOMServer from "react-dom/server.browser";
-import { defineRender } from "@web-widget/schema/server-helpers";
 export * from "@web-widget/schema/server-helpers";
 Reflect.defineProperty(__ENV__, "server", {
   value: true
@@ -118,20 +122,25 @@ var ESCAPE_REGEX = /[><\u2028\u2029]/g;
 function htmlEscapeJsonString(str) {
   return str.replace(ESCAPE_REGEX, (match) => ESCAPE_LOOKUP[match]);
 }
+function renderToReadableStream2(vNode, renderOptions) {
+  return ReactDOMServer.renderToReadableStream(vNode, renderOptions);
+}
 var defineReactRender = ({
   onPrefetchData
 } = {}) => {
-  return defineRender(async (context, component, props) => {
-    const state = onPrefetchData ? await onPrefetchData(context, component, props) : void 0;
-    const mergedProps = state ? Object.assign({}, state, props) : props;
-    let vNode;
-    if (typeof component === "function" && component.constructor.name === "AsyncFunction") {
-      vNode = await component(mergedProps);
-    } else {
-      vNode = createElement2(component, mergedProps);
-    }
-    if (state) {
-      return ReactDOMServer.renderToReadableStream(
+  return defineRender(
+    async (context, { react: reactRenderOptions } = {}) => {
+      const componentDescriptor = getComponentDescriptor(context);
+      const { component, props } = componentDescriptor;
+      const state = onPrefetchData ? await onPrefetchData(context, component, props) : void 0;
+      const mergedProps = state ? Object.assign({}, state, props) : props;
+      let vNode;
+      if (typeof component === "function" && component.constructor.name === "AsyncFunction") {
+        vNode = await component(mergedProps);
+      } else {
+        vNode = createElement2(component, mergedProps);
+      }
+      const stream = state ? await renderToReadableStream2(
         createElement2(Fragment, null, [
           vNode,
           createElement2("script", {
@@ -141,12 +150,15 @@ var defineReactRender = ({
               __html: htmlEscapeJsonString(JSON.stringify(state))
             }
           })
-        ])
-      );
-    } else {
-      return ReactDOMServer.renderToReadableStream(vNode);
+        ]),
+        reactRenderOptions
+      ) : await renderToReadableStream2(vNode, reactRenderOptions);
+      if (reactRenderOptions == null ? void 0 : reactRenderOptions.awaitAllReady) {
+        await stream.allReady;
+      }
+      return stream;
     }
-  });
+  );
 };
 var render = defineReactRender();
 export {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@web-widget/react",
-  "version": "0.2.0",
+  "version": "0.3.1",
   "type": "module",
   "exports": {
     ".": {
@@ -29,9 +29,9 @@
     "globals.d.ts"
   ],
   "dependencies": {
-    "@web-widget/vite": "1.1.0",
-    "@web-widget/schema": "0.0.10",
-    "@web-widget/web-widget": "1.0.0-alpha.10"
+    "@web-widget/vite": "2.0.1",
+    "@web-widget/schema": "0.1.1",
+    "@web-widget/web-widget": "1.0.0"
   },
   "devDependencies": {
     "@types/react": "^18.2.9",