@makeswift/runtime 0.28.10-canary.5 → 0.28.10-canary.7

package/dist/cjs/api/graphql-api-client.js

@@ -27,7 +27,7 @@ class MakeswiftGraphQLApiClient {
   graphqlClient;
   constructor({ endpoint }) {
     this.graphqlClient = new import_client.GraphQLClient(endpoint, {
-      "makeswift-runtime-version": "0.28.10-canary.5"
+      "makeswift-runtime-version": "0.28.10-canary.7"
     });
   }
   async getUnversionedResources({

package/dist/cjs/api/rest-api-client.js

@@ -185,7 +185,7 @@ class MakeswiftRestAPIClient {
     const requestHeaders = new Headers({
       "x-api-key": this.apiKey,
       "makeswift-site-api-key": this.apiKey,
-      "makeswift-runtime-version": "0.28.10-canary.5"
+      "makeswift-runtime-version": "0.28.10-canary.7"
     });
     if (siteVersion?.token) {
       requestUrl.searchParams.set("version", siteVersion.version);

package/dist/cjs/api-handler/handlers/manifest.js

@@ -28,7 +28,7 @@ async function manifestHandler(req, { apiKey, manifest }) {
     return import_request_response.ApiResponse.json({ message: "Unauthorized" }, { status: 401 });
   }
   return import_request_response.ApiResponse.json({
-    version: "0.28.10-canary.5",
+    version: "0.28.10-canary.7",
     interactionMode: true,
     clientSideNavigation: false,
     elementFromPoint: false,

package/dist/cjs/controls/rich-text/control.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/controls/rich-text/control.ts"],"sourcesContent":["import { Editor } from 'slate'\n\nimport { BuilderEditMode } from '../../state/modules/builder-edit-mode'\n\nimport {\n  ControlInstance,\n  richTextDAOToDTO,\n  type BoxDisplayModel,\n  type RichTextValue,\n} from '@makeswift/controls'\n\ntype ChangeBuilderEditModeMessage = {\n  type: typeof RichTextControl.CHANGE_BUILDER_EDIT_MODE\n  payload: { editMode: BuilderEditMode }\n}\n\ntype InitializeEditorMessage = {\n  type: typeof RichTextControl.INITIALIZE_EDITOR\n  value: RichTextValue\n}\n\ntype ChangeEditorValueMessage = {\n  type: typeof RichTextControl.CHANGE_EDITOR_VALUE\n  value: RichTextValue\n}\n\ntype FocusMessage = {\n  type: typeof RichTextControl.FOCUS\n}\n\ntype BlurMessage = {\n  type: typeof RichTextControl.BLUR\n}\n\ntype UndoMessage = {\n  type: typeof RichTextControl.UNDO\n}\n\ntype RedoMessage = {\n  type: typeof RichTextControl.REDO\n}\n\ntype BoxModelChangeMessage = {\n  type: typeof RichTextControl.CHANGE_BOX_MODEL\n  payload: { boxModel: BoxDisplayModel | null }\n}\n\ntype Message =\n  | ChangeBuilderEditModeMessage\n  | InitializeEditorMessage\n  | ChangeEditorValueMessage\n  | FocusMessage\n  | BlurMessage\n  | UndoMessage\n  | RedoMessage\n  | BoxModelChangeMessage\n\nexport class RichTextControl extends ControlInstance<Message> {\n  static readonly CHANGE_BUILDER_EDIT_MODE = 'CHANGE_BUILDER_EDIT_MODE'\n  static readonly INITIALIZE_EDITOR = 'INITIALIZE_EDITOR'\n  static readonly CHANGE_EDITOR_VALUE = 'CHANGE_EDITOR_VALUE'\n  static readonly FOCUS = 'FOCUS'\n  static readonly BLUR = 'BLUR'\n  static readonly UNDO = 'UNDO'\n  static readonly REDO = 'REDO'\n  static readonly CHANGE_BOX_MODEL = 'CHANGE_BOX_MODEL'\n\n  private editor: Editor | null = null\n\n  recv = (message: Message): void => {\n    if (!this.editor) return\n\n    switch (message.type) {\n      case RichTextControl.CHANGE_BUILDER_EDIT_MODE: {\n        switch (message.payload.editMode) {\n          case BuilderEditMode.BUILD:\n          case BuilderEditMode.INTERACT:\n            this.editor.deselectAndBlur()\n        }\n        break\n      }\n\n      case RichTextControl.FOCUS: {\n        this.editor.focusAndSelectAll()\n        break\n      }\n    }\n  }\n\n  subscribe(_listener: () => void): () => void {\n    // No mutable state, nothing to subscribe to\n    return () => {}\n  }\n\n  isCompositeProp(): boolean {\n    return false\n  }\n\n  children(): ControlInstance[] {\n    return []\n  }\n\n  child(_key: string): ControlInstance | undefined {\n    return undefined\n  }\n\n  resolvesToRenderableNode(): boolean {\n    return true\n  }\n\n  setSlateEditor(editor: Editor) {\n    this.editor = editor\n\n    this.sendMessage({\n      type: RichTextControl.INITIALIZE_EDITOR,\n      value: richTextDAOToDTO(editor.children, editor.selection),\n    })\n\n    const _onChange = editor.onChange\n    this.editor.onChange = options => {\n      _onChange(options)\n\n      // if onChange is local then it will include an operation(s)\n      // that is the only case in which we want to push updates\n      // this prevent infinite loops that can occur when collaborating\n      if (options?.operation != null) {\n        this.sendMessage({\n          type: RichTextControl.CHANGE_EDITOR_VALUE,\n          value: richTextDAOToDTO(editor.children, editor.selection),\n        })\n      }\n    }\n  }\n\n  focus() {\n    this.sendMessage({ type: RichTextControl.FOCUS })\n  }\n\n  blur() {\n    this.sendMessage({ type: RichTextControl.BLUR })\n  }\n\n  undo() {\n    this.sendMessage({ type: RichTextControl.UNDO })\n  }\n\n  redo() {\n    this.sendMessage({ type: RichTextControl.REDO })\n  }\n\n  changeBoxModel(boxModel: BoxDisplayModel | null): void {\n    this.sendMessage({\n      type: RichTextControl.CHANGE_BOX_MODEL,\n      payload: { boxModel },\n    })\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,+BAAgC;AAEhC,sBAKO;AAgDA,MAAM,wBAAwB,gCAAyB;AAAA,EAC5D,OAAgB,2BAA2B;AAAA,EAC3C,OAAgB,oBAAoB;AAAA,EACpC,OAAgB,sBAAsB;AAAA,EACtC,OAAgB,QAAQ;AAAA,EACxB,OAAgB,OAAO;AAAA,EACvB,OAAgB,OAAO;AAAA,EACvB,OAAgB,OAAO;AAAA,EACvB,OAAgB,mBAAmB;AAAA,EAE3B,SAAwB;AAAA,EAEhC,OAAO,CAAC,YAA2B;AACjC,QAAI,CAAC,KAAK;AAAQ;AAElB,YAAQ,QAAQ,MAAM;AAAA,MACpB,KAAK,gBAAgB,0BAA0B;AAC7C,gBAAQ,QAAQ,QAAQ,UAAU;AAAA,UAChC,KAAK,yCAAgB;AAAA,UACrB,KAAK,yCAAgB;AACnB,iBAAK,OAAO,gBAAgB;AAAA,QAChC;AACA;AAAA,MACF;AAAA,MAEA,KAAK,gBAAgB,OAAO;AAC1B,aAAK,OAAO,kBAAkB;AAC9B;AAAA,MACF;AAAA,IACF;AAAA,EACF;AAAA,EAEA,UAAU,WAAmC;AAE3C,WAAO,MAAM;AAAA,IAAC;AAAA,EAChB;AAAA,EAEA,kBAA2B;AACzB,WAAO;AAAA,EACT;AAAA,EAEA,WAA8B;AAC5B,WAAO,CAAC;AAAA,EACV;AAAA,EAEA,MAAM,MAA2C;AAC/C,WAAO;AAAA,EACT;AAAA,EAEA,2BAAoC;AAClC,WAAO;AAAA,EACT;AAAA,EAEA,eAAe,QAAgB;AAC7B,SAAK,SAAS;AAEd,SAAK,YAAY;AAAA,MACf,MAAM,gBAAgB;AAAA,MACtB,WAAO,kCAAiB,OAAO,UAAU,OAAO,SAAS;AAAA,IAC3D,CAAC;AAED,UAAM,YAAY,OAAO;AACzB,SAAK,OAAO,WAAW,aAAW;AAChC,gBAAU,OAAO;AAKjB,UAAI,SAAS,aAAa,MAAM;AAC9B,aAAK,YAAY;AAAA,UACf,MAAM,gBAAgB;AAAA,UACtB,WAAO,kCAAiB,OAAO,UAAU,OAAO,SAAS;AAAA,QAC3D,CAAC;AAAA,MACH;AAAA,IACF;AAAA,EACF;AAAA,EAEA,QAAQ;AACN,SAAK,YAAY,EAAE,MAAM,gBAAgB,MAAM,CAAC;AAAA,EAClD;AAAA,EAEA,OAAO;AACL,SAAK,YAAY,EAAE,MAAM,gBAAgB,KAAK,CAAC;AAAA,EACjD;AAAA,EAEA,OAAO;AACL,SAAK,YAAY,EAAE,MAAM,gBAAgB,KAAK,CAAC;AAAA,EACjD;AAAA,EAEA,OAAO;AACL,SAAK,YAAY,EAAE,MAAM,gBAAgB,KAAK,CAAC;AAAA,EACjD;AAAA,EAEA,eAAe,UAAwC;AACrD,SAAK,YAAY;AAAA,MACf,MAAM,gBAAgB;AAAA,MACtB,SAAS,EAAE,SAAS;AAAA,IACtB,CAAC;AAAA,EACH;AACF;","names":[]}
+{"version":3,"sources":["../../../../src/controls/rich-text/control.ts"],"sourcesContent":["import { Editor } from 'slate'\n\nimport { BuilderEditMode } from '../../state/modules/builder-edit-mode'\n\nimport {\n  ControlInstance,\n  richTextDAOToDTO,\n  type BoxDisplayModel,\n  type RichTextValue,\n} from '@makeswift/controls'\n\ntype ChangeBuilderEditModeMessage = {\n  type: typeof RichTextControl.CHANGE_BUILDER_EDIT_MODE\n  payload: { editMode: BuilderEditMode }\n}\n\ntype InitializeEditorMessage = {\n  type: typeof RichTextControl.INITIALIZE_EDITOR\n  value: RichTextValue\n}\n\ntype ChangeEditorValueMessage = {\n  type: typeof RichTextControl.CHANGE_EDITOR_VALUE\n  value: RichTextValue\n}\n\ntype FocusMessage = {\n  type: typeof RichTextControl.FOCUS\n}\n\ntype BlurMessage = {\n  type: typeof RichTextControl.BLUR\n}\n\ntype UndoMessage = {\n  type: typeof RichTextControl.UNDO\n}\n\ntype RedoMessage = {\n  type: typeof RichTextControl.REDO\n}\n\ntype BoxModelChangeMessage = {\n  type: typeof RichTextControl.CHANGE_BOX_MODEL\n  payload: { boxModel: BoxDisplayModel | null }\n}\n\ntype Message =\n  | ChangeBuilderEditModeMessage\n  | InitializeEditorMessage\n  | ChangeEditorValueMessage\n  | FocusMessage\n  | BlurMessage\n  | UndoMessage\n  | RedoMessage\n  | BoxModelChangeMessage\n\nexport class RichTextControl extends ControlInstance<Message> {\n  static readonly CHANGE_BUILDER_EDIT_MODE = 'CHANGE_BUILDER_EDIT_MODE'\n  static readonly INITIALIZE_EDITOR = 'INITIALIZE_EDITOR'\n  static readonly CHANGE_EDITOR_VALUE = 'CHANGE_EDITOR_VALUE'\n  static readonly FOCUS = 'FOCUS'\n  static readonly BLUR = 'BLUR'\n  static readonly UNDO = 'UNDO'\n  static readonly REDO = 'REDO'\n  static readonly CHANGE_BOX_MODEL = 'CHANGE_BOX_MODEL'\n\n  private editor: Editor | null = null\n\n  recv = (message: Message): void => {\n    if (!this.editor) return\n\n    switch (message.type) {\n      case RichTextControl.CHANGE_BUILDER_EDIT_MODE: {\n        switch (message.payload.editMode) {\n          case BuilderEditMode.BUILD:\n          case BuilderEditMode.INTERACT:\n            this.editor.deselectAndBlur()\n        }\n        break\n      }\n\n      case RichTextControl.FOCUS: {\n        this.editor.focusAndSelectAll()\n        break\n      }\n    }\n  }\n\n  subscribe(_listener: () => void): () => void {\n    // No mutable state, nothing to subscribe to\n    return () => {}\n  }\n\n  isCompositeProp(): boolean {\n    return false\n  }\n\n  children(): ControlInstance[] {\n    return []\n  }\n\n  child(_key: string): ControlInstance | undefined {\n    return undefined\n  }\n\n  resolvesToRenderableNode(): boolean {\n    return true\n  }\n\n  setSlateEditor(editor: Editor) {\n    this.editor = editor\n\n    this.sendMessage({\n      type: RichTextControl.INITIALIZE_EDITOR,\n      value: richTextDAOToDTO(editor.children, editor.selection),\n    })\n\n    const _onChange = editor.onChange\n    this.editor.onChange = options => {\n      _onChange(options)\n\n      // if onChange is local then it will include an operation(s)\n      // that is the only case in which we want to push updates\n      // this prevents infinite loops that can occur when collaborating\n      if (options?.operation != null) {\n        this.sendMessage({\n          type: RichTextControl.CHANGE_EDITOR_VALUE,\n          value: richTextDAOToDTO(editor.children, editor.selection),\n        })\n      }\n    }\n  }\n\n  focus() {\n    this.sendMessage({ type: RichTextControl.FOCUS })\n  }\n\n  blur() {\n    this.sendMessage({ type: RichTextControl.BLUR })\n  }\n\n  undo() {\n    this.sendMessage({ type: RichTextControl.UNDO })\n  }\n\n  redo() {\n    this.sendMessage({ type: RichTextControl.REDO })\n  }\n\n  changeBoxModel(boxModel: BoxDisplayModel | null): void {\n    this.sendMessage({\n      type: RichTextControl.CHANGE_BOX_MODEL,\n      payload: { boxModel },\n    })\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,+BAAgC;AAEhC,sBAKO;AAgDA,MAAM,wBAAwB,gCAAyB;AAAA,EAC5D,OAAgB,2BAA2B;AAAA,EAC3C,OAAgB,oBAAoB;AAAA,EACpC,OAAgB,sBAAsB;AAAA,EACtC,OAAgB,QAAQ;AAAA,EACxB,OAAgB,OAAO;AAAA,EACvB,OAAgB,OAAO;AAAA,EACvB,OAAgB,OAAO;AAAA,EACvB,OAAgB,mBAAmB;AAAA,EAE3B,SAAwB;AAAA,EAEhC,OAAO,CAAC,YAA2B;AACjC,QAAI,CAAC,KAAK;AAAQ;AAElB,YAAQ,QAAQ,MAAM;AAAA,MACpB,KAAK,gBAAgB,0BAA0B;AAC7C,gBAAQ,QAAQ,QAAQ,UAAU;AAAA,UAChC,KAAK,yCAAgB;AAAA,UACrB,KAAK,yCAAgB;AACnB,iBAAK,OAAO,gBAAgB;AAAA,QAChC;AACA;AAAA,MACF;AAAA,MAEA,KAAK,gBAAgB,OAAO;AAC1B,aAAK,OAAO,kBAAkB;AAC9B;AAAA,MACF;AAAA,IACF;AAAA,EACF;AAAA,EAEA,UAAU,WAAmC;AAE3C,WAAO,MAAM;AAAA,IAAC;AAAA,EAChB;AAAA,EAEA,kBAA2B;AACzB,WAAO;AAAA,EACT;AAAA,EAEA,WAA8B;AAC5B,WAAO,CAAC;AAAA,EACV;AAAA,EAEA,MAAM,MAA2C;AAC/C,WAAO;AAAA,EACT;AAAA,EAEA,2BAAoC;AAClC,WAAO;AAAA,EACT;AAAA,EAEA,eAAe,QAAgB;AAC7B,SAAK,SAAS;AAEd,SAAK,YAAY;AAAA,MACf,MAAM,gBAAgB;AAAA,MACtB,WAAO,kCAAiB,OAAO,UAAU,OAAO,SAAS;AAAA,IAC3D,CAAC;AAED,UAAM,YAAY,OAAO;AACzB,SAAK,OAAO,WAAW,aAAW;AAChC,gBAAU,OAAO;AAKjB,UAAI,SAAS,aAAa,MAAM;AAC9B,aAAK,YAAY;AAAA,UACf,MAAM,gBAAgB;AAAA,UACtB,WAAO,kCAAiB,OAAO,UAAU,OAAO,SAAS;AAAA,QAC3D,CAAC;AAAA,MACH;AAAA,IACF;AAAA,EACF;AAAA,EAEA,QAAQ;AACN,SAAK,YAAY,EAAE,MAAM,gBAAgB,MAAM,CAAC;AAAA,EAClD;AAAA,EAEA,OAAO;AACL,SAAK,YAAY,EAAE,MAAM,gBAAgB,KAAK,CAAC;AAAA,EACjD;AAAA,EAEA,OAAO;AACL,SAAK,YAAY,EAAE,MAAM,gBAAgB,KAAK,CAAC;AAAA,EACjD;AAAA,EAEA,OAAO;AACL,SAAK,YAAY,EAAE,MAAM,gBAAgB,KAAK,CAAC;AAAA,EACjD;AAAA,EAEA,eAAe,UAAwC;AACrD,SAAK,YAAY;AAAA,MACf,MAAM,gBAAgB;AAAA,MACtB,SAAS,EAAE,SAAS;AAAA,IACtB,CAAC;AAAA,EACH;AACF;","names":[]}

package/dist/cjs/next/components/tests/controls/page-control-prop-rendering.js

@@ -33,7 +33,6 @@ __export(page_control_prop_rendering_exports, {
 module.exports = __toCommonJS(page_control_prop_rendering_exports);
 var import_jsx_runtime = require("react/jsx-runtime");
 var import_react = require("react");
-var import_server = require("react-dom/server");
 var import_jsdom = require("jsdom");
 var import_react2 = require("@testing-library/react");
 var import_jest_dom = require("@testing-library/jest-dom");
@@ -42,33 +41,19 @@ var import_read_only_actions = require("../../../../state/actions/internal/read-
 var import_MakeswiftComponent = require("../../../../runtimes/react/components/MakeswiftComponent");
 var import_page = require("../../page");
 var import_is_server = require("../../../../utils/is-server");
+var import_render_to_string = require("../../../../runtimes/react/testing/render-to-string");
 var Testing = __toESM(require("../../../testing"));
 const ROOT_ID = "00000000-0000-0000-0000-000000000000";
 const ELEMENT_ID = "11111111-1111-1111-1111-111111111111";
 const renderProp = (prop) => prop === void 0 ? "undefined" : (0, import_react.isValidElement)(prop) ? prop : JSON.stringify(prop);
 const propSnapshot = (prop) => prop?.childElementCount ? prop.childNodes : parseStringifiedProp(prop?.textContent ?? "");
 const parseStringifiedProp = (prop) => prop === "undefined" ? void 0 : JSON.parse(prop);
-async function streamToString(stream) {
-  const reader = stream.getReader();
-  const decoder = new TextDecoder();
-  let result = "";
-  while (true) {
-    const { done, value } = await reader.read();
-    if (done)
-      break;
-    result += decoder.decode(value, { stream: true });
-  }
-  return result;
-}
-async function renderToString(element) {
-  return await streamToString(await (0, import_server.renderToReadableStream)(element));
-}
 async function serverSideRender(children) {
   const serverInsertedCallbacks = [];
   const elementTree = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_navigation.ServerInsertedHTMLContext.Provider, { value: (handler) => serverInsertedCallbacks.push(handler), children });
-  const elementsHTML = await renderToString(elementTree);
+  const elementsHTML = await (0, import_render_to_string.renderToString)(elementTree);
   const serverInsertedNodes = serverInsertedCallbacks.map((callback, index) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react.Fragment, { children: callback() }, "__next_server_inserted__" + index));
-  const headHTML = await renderToString(serverInsertedNodes);
+  const headHTML = await (0, import_render_to_string.renderToString)(serverInsertedNodes);
   const dom = new import_jsdom.JSDOM(
     `<!DOCTYPE html><head>${headHTML}</head><body><div id="root">${elementsHTML}</div></body></div>`,
     {

package/dist/cjs/next/components/tests/controls/page-control-prop-rendering.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../src/next/components/tests/controls/page-control-prop-rendering.tsx"],"sourcesContent":["import { type ReactNode, Fragment, forwardRef, useRef, isValidElement, act } from 'react'\nimport { renderToReadableStream } from 'react-dom/server'\nimport { JSDOM } from 'jsdom'\nimport { render, screen } from '@testing-library/react'\nimport '@testing-library/jest-dom'\nimport { ServerInsertedHTMLContext } from 'next/navigation'\n\nimport { type Data, type ValueType, type DataType, ControlDefinition } from '@makeswift/controls'\n\nimport { type CacheData } from '../../../../api/api-resources-client'\nimport { ElementData } from '../../../../state/read-only-state'\nimport { setIsInBuilder } from '../../../../state/actions/internal/read-only-actions'\nimport { ReactRuntime } from '../../../../runtimes/react/react-runtime'\nimport { MakeswiftComponent } from '../../../../runtimes/react/components/MakeswiftComponent'\nimport { Page } from '../../page'\nimport { isServer } from '../../../../utils/is-server'\nimport * as Testing from '../../../testing'\n\nconst ROOT_ID = '00000000-0000-0000-0000-000000000000'\nconst ELEMENT_ID = '11111111-1111-1111-1111-111111111111'\n\nconst renderProp = (prop: any) =>\n  prop === undefined ? 'undefined' : isValidElement(prop) ? prop : JSON.stringify(prop)\n\nconst propSnapshot = (prop: HTMLElement | null) =>\n  prop?.childElementCount ? prop.childNodes : parseStringifiedProp(prop?.textContent ?? '')\n\nconst parseStringifiedProp = (prop: string) => (prop === 'undefined' ? undefined : JSON.parse(prop))\n\nasync function streamToString(stream: ReadableStream) {\n  const reader = stream.getReader()\n  const decoder = new TextDecoder()\n\n  let result = ''\n\n  while (true) {\n    const { done, value } = await reader.read()\n    if (done) break\n    result += decoder.decode(value, { stream: true })\n  }\n\n  return result\n}\n\nasync function renderToString(element: ReactNode) {\n  return await streamToString(await renderToReadableStream(element))\n}\n\nasync function serverSideRender(children: ReactNode) {\n  // wrap the children in a context provider to capture server-inserted HTML, see\n  // https://github.com/vercel/next.js/blob/canary/packages/next/src/server/app-render/server-inserted-html.tsx\n  const serverInsertedCallbacks: (() => React.ReactNode)[] = []\n\n  const elementTree = (\n    <ServerInsertedHTMLContext.Provider value={handler => serverInsertedCallbacks.push(handler)}>\n      {children}\n    </ServerInsertedHTMLContext.Provider>\n  )\n\n  const elementsHTML = await renderToString(elementTree)\n\n  const serverInsertedNodes = serverInsertedCallbacks.map((callback, index) => (\n    <Fragment key={'__next_server_inserted__' + index}>{callback()}</Fragment>\n  ))\n\n  const headHTML = await renderToString(serverInsertedNodes)\n\n  const dom = new JSDOM(\n    `<!DOCTYPE html><head>${headHTML}</head><body><div id=\"root\">${elementsHTML}</div></body></div>`,\n    {\n      runScripts: 'dangerously',\n    },\n  )\n\n  return dom.window.document\n}\n\n/**\n * In read-write mode, the runtime opens a `MessageChannel` to the builder\n * parent frame; jsdom doesn't implement `MessageChannel`, so stub them to keep\n * the read-write setup from throwing.\n */\nfunction stubBuilderMessageChannel(): () => void {\n  const postMessageSpy = jest.spyOn(window, 'postMessage').mockImplementation(() => {})\n\n  const originalMessageChannel = window.MessageChannel\n  const stubPort = () => ({ onmessage: null, postMessage: () => {}, close: () => {} })\n  window.MessageChannel = class {\n    port1 = stubPort()\n    port2 = stubPort()\n  } as unknown as typeof MessageChannel\n\n  return () => {\n    postMessageSpy.mockRestore()\n    window.MessageChannel = originalMessageChannel\n  }\n}\n\nexport async function testPageControlPropRendering<D extends ControlDefinition>(\n  controlDefinition: D,\n  {\n    toData,\n    value,\n    locale,\n    cacheData,\n    expectedRenders,\n    registerComponents,\n    action,\n    rootElements = [],\n    isInBuilder = false,\n    isReadOnly = true,\n  }: {\n    toData?: (value: ValueType<D>) => DataType<D>\n    value: ValueType<D> | undefined\n    locale?: string | null\n    cacheData?: Partial<CacheData>\n    expectedRenders?: number\n    registerComponents?: (runtime: ReactRuntime) => void\n    action?: (element: HTMLElement) => Promise<void>\n    rootElements?: ElementData[]\n    isInBuilder?: boolean\n    isReadOnly?: boolean\n  },\n) {\n  // Arrange\n  const controlData: DataType<D> | Data =\n    value !== undefined ? (toData ? toData(value) : controlDefinition.toData(value)) : undefined\n\n  const testComponentMeta = {\n    type: 'TestComponent',\n    label: 'Test Component',\n  }\n\n  const testId = 'test-id'\n  const renderCountTestId = 'render-count-test-id'\n  const elementData: ElementData = {\n    key: ELEMENT_ID,\n    type: testComponentMeta.type,\n    props: {\n      propKey: controlData,\n    },\n  }\n\n  const runtime = Testing.createReactRuntime()\n  runtime.protoStore.dispatch(setIsInBuilder(isInBuilder))\n  registerComponents?.(runtime)\n\n  // Act\n  runtime.registerComponent(\n    forwardRef<HTMLDivElement, { propKey?: any }>(({ propKey }, ref) => {\n      const renderCount = useRef(0)\n      ++renderCount.current\n\n      return (\n        <div ref={ref}>\n          <div data-testid={renderCountTestId}>{renderCount.current}</div>\n          <div data-testid={testId}>{renderProp(propKey)}</div>\n        </div>\n      )\n    }),\n    {\n      ...testComponentMeta,\n      props: {\n        propKey: controlDefinition as any,\n      },\n    },\n  )\n\n  const testElementTree = (component: ReactNode) => {\n    // The runtime enters the read-write state when a non-null site version is\n    // passed\n    const siteVersion = isReadOnly ? null : { token: 'test-token', version: 'draft' }\n    return (\n      <Testing.ReactProvider runtime={runtime} siteVersion={siteVersion}>\n        {component}\n      </Testing.ReactProvider>\n    )\n  }\n\n  if (!isServer()) {\n    const restoreMessageChannel = isReadOnly ? null : stubBuilderMessageChannel()\n\n    const rootElementData: ElementData = Testing.createRootComponent(\n      [elementData, ...rootElements],\n      ROOT_ID,\n    )\n\n    const snapshot = Testing.createMakeswiftPageSnapshot(rootElementData, { locale, cacheData })\n\n    // Assert\n    await act(async () => render(testElementTree(<Page snapshot={snapshot} />)))\n\n    if (action) {\n      await act(async () => {\n        await action(screen.getByTestId(testId))\n      })\n    }\n\n    expect(snapshot).toMatchSnapshot('snapshot')\n    expect(propSnapshot(screen.getByTestId(testId))).toMatchSnapshot('resolvedValue')\n\n    if (expectedRenders != null) {\n      expect(Number(screen.getByTestId(renderCountTestId).textContent)).toBe(expectedRenders)\n    }\n\n    restoreMessageChannel?.()\n  } else {\n    // test server-side rendering using a component snapshot\n    console.assert(action == null)\n    console.assert(rootElements.length === 0)\n\n    const snapshot = Testing.createMakeswiftComponentSnapshot(elementData, { locale, cacheData })\n    const elementTree = testElementTree(\n      <MakeswiftComponent snapshot={snapshot} {...testComponentMeta} />,\n    )\n\n    const document = await serverSideRender(elementTree)\n    const getByTestId = (id: string): HTMLElement | null =>\n      document.querySelector(`[data-testid=\"${id}\"]`)\n\n    expect(propSnapshot(getByTestId(testId))).toMatchSnapshot('resolvedValue')\n    expect([...document.querySelectorAll('style')].map(n => n.textContent)).toMatchSnapshot(\n      'component styles',\n    )\n    expect(Number(getByTestId(renderCountTestId)?.textContent)).toBe(1)\n  }\n}\n"],"mappings":"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","names":["import_react"]}
+{"version":3,"sources":["../../../../../../src/next/components/tests/controls/page-control-prop-rendering.tsx"],"sourcesContent":["import { type ReactNode, Fragment, forwardRef, useRef, isValidElement, act } from 'react'\nimport { JSDOM } from 'jsdom'\nimport { render, screen } from '@testing-library/react'\nimport '@testing-library/jest-dom'\nimport { ServerInsertedHTMLContext } from 'next/navigation'\n\nimport { type Data, type ValueType, type DataType, ControlDefinition } from '@makeswift/controls'\n\nimport { type CacheData } from '../../../../api/api-resources-client'\nimport { ElementData } from '../../../../state/read-only-state'\nimport { setIsInBuilder } from '../../../../state/actions/internal/read-only-actions'\nimport { ReactRuntime } from '../../../../runtimes/react/react-runtime'\nimport { MakeswiftComponent } from '../../../../runtimes/react/components/MakeswiftComponent'\nimport { Page } from '../../page'\nimport { isServer } from '../../../../utils/is-server'\n\nimport { renderToString } from '../../../../runtimes/react/testing/render-to-string'\nimport * as Testing from '../../../testing'\n\nconst ROOT_ID = '00000000-0000-0000-0000-000000000000'\nconst ELEMENT_ID = '11111111-1111-1111-1111-111111111111'\n\nconst renderProp = (prop: any) =>\n  prop === undefined ? 'undefined' : isValidElement(prop) ? prop : JSON.stringify(prop)\n\nconst propSnapshot = (prop: HTMLElement | null) =>\n  prop?.childElementCount ? prop.childNodes : parseStringifiedProp(prop?.textContent ?? '')\n\nconst parseStringifiedProp = (prop: string) => (prop === 'undefined' ? undefined : JSON.parse(prop))\n\nasync function serverSideRender(children: ReactNode) {\n  // wrap the children in a context provider to capture server-inserted HTML, see\n  // https://github.com/vercel/next.js/blob/canary/packages/next/src/server/app-render/server-inserted-html.tsx\n  const serverInsertedCallbacks: (() => React.ReactNode)[] = []\n\n  const elementTree = (\n    <ServerInsertedHTMLContext.Provider value={handler => serverInsertedCallbacks.push(handler)}>\n      {children}\n    </ServerInsertedHTMLContext.Provider>\n  )\n\n  const elementsHTML = await renderToString(elementTree)\n\n  const serverInsertedNodes = serverInsertedCallbacks.map((callback, index) => (\n    <Fragment key={'__next_server_inserted__' + index}>{callback()}</Fragment>\n  ))\n\n  const headHTML = await renderToString(serverInsertedNodes)\n\n  const dom = new JSDOM(\n    `<!DOCTYPE html><head>${headHTML}</head><body><div id=\"root\">${elementsHTML}</div></body></div>`,\n    {\n      runScripts: 'dangerously',\n    },\n  )\n\n  return dom.window.document\n}\n\n/**\n * In read-write mode, the runtime opens a `MessageChannel` to the builder\n * parent frame; jsdom doesn't implement `MessageChannel`, so stub them to keep\n * the read-write setup from throwing.\n */\nfunction stubBuilderMessageChannel(): () => void {\n  const postMessageSpy = jest.spyOn(window, 'postMessage').mockImplementation(() => {})\n\n  const originalMessageChannel = window.MessageChannel\n  const stubPort = () => ({ onmessage: null, postMessage: () => {}, close: () => {} })\n  window.MessageChannel = class {\n    port1 = stubPort()\n    port2 = stubPort()\n  } as unknown as typeof MessageChannel\n\n  return () => {\n    postMessageSpy.mockRestore()\n    window.MessageChannel = originalMessageChannel\n  }\n}\n\nexport async function testPageControlPropRendering<D extends ControlDefinition>(\n  controlDefinition: D,\n  {\n    toData,\n    value,\n    locale,\n    cacheData,\n    expectedRenders,\n    registerComponents,\n    action,\n    rootElements = [],\n    isInBuilder = false,\n    isReadOnly = true,\n  }: {\n    toData?: (value: ValueType<D>) => DataType<D>\n    value: ValueType<D> | undefined\n    locale?: string | null\n    cacheData?: Partial<CacheData>\n    expectedRenders?: number\n    registerComponents?: (runtime: ReactRuntime) => void\n    action?: (element: HTMLElement) => Promise<void>\n    rootElements?: ElementData[]\n    isInBuilder?: boolean\n    isReadOnly?: boolean\n  },\n) {\n  // Arrange\n  const controlData: DataType<D> | Data =\n    value !== undefined ? (toData ? toData(value) : controlDefinition.toData(value)) : undefined\n\n  const testComponentMeta = {\n    type: 'TestComponent',\n    label: 'Test Component',\n  }\n\n  const testId = 'test-id'\n  const renderCountTestId = 'render-count-test-id'\n  const elementData: ElementData = {\n    key: ELEMENT_ID,\n    type: testComponentMeta.type,\n    props: {\n      propKey: controlData,\n    },\n  }\n\n  const runtime = Testing.createReactRuntime()\n  runtime.protoStore.dispatch(setIsInBuilder(isInBuilder))\n  registerComponents?.(runtime)\n\n  // Act\n  runtime.registerComponent(\n    forwardRef<HTMLDivElement, { propKey?: any }>(({ propKey }, ref) => {\n      const renderCount = useRef(0)\n      ++renderCount.current\n\n      return (\n        <div ref={ref}>\n          <div data-testid={renderCountTestId}>{renderCount.current}</div>\n          <div data-testid={testId}>{renderProp(propKey)}</div>\n        </div>\n      )\n    }),\n    {\n      ...testComponentMeta,\n      props: {\n        propKey: controlDefinition as any,\n      },\n    },\n  )\n\n  const testElementTree = (component: ReactNode) => {\n    // The runtime enters the read-write state when a non-null site version is\n    // passed\n    const siteVersion = isReadOnly ? null : { token: 'test-token', version: 'draft' }\n    return (\n      <Testing.ReactProvider runtime={runtime} siteVersion={siteVersion}>\n        {component}\n      </Testing.ReactProvider>\n    )\n  }\n\n  if (!isServer()) {\n    const restoreMessageChannel = isReadOnly ? null : stubBuilderMessageChannel()\n\n    const rootElementData: ElementData = Testing.createRootComponent(\n      [elementData, ...rootElements],\n      ROOT_ID,\n    )\n\n    const snapshot = Testing.createMakeswiftPageSnapshot(rootElementData, { locale, cacheData })\n\n    // Assert\n    await act(async () => render(testElementTree(<Page snapshot={snapshot} />)))\n\n    if (action) {\n      await act(async () => {\n        await action(screen.getByTestId(testId))\n      })\n    }\n\n    expect(snapshot).toMatchSnapshot('snapshot')\n    expect(propSnapshot(screen.getByTestId(testId))).toMatchSnapshot('resolvedValue')\n\n    if (expectedRenders != null) {\n      expect(Number(screen.getByTestId(renderCountTestId).textContent)).toBe(expectedRenders)\n    }\n\n    restoreMessageChannel?.()\n  } else {\n    // test server-side rendering using a component snapshot\n    console.assert(action == null)\n    console.assert(rootElements.length === 0)\n\n    const snapshot = Testing.createMakeswiftComponentSnapshot(elementData, { locale, cacheData })\n    const elementTree = testElementTree(\n      <MakeswiftComponent snapshot={snapshot} {...testComponentMeta} />,\n    )\n\n    const document = await serverSideRender(elementTree)\n    const getByTestId = (id: string): HTMLElement | null =>\n      document.querySelector(`[data-testid=\"${id}\"]`)\n\n    expect(propSnapshot(getByTestId(testId))).toMatchSnapshot('resolvedValue')\n    expect([...document.querySelectorAll('style')].map(n => n.textContent)).toMatchSnapshot(\n      'component styles',\n    )\n    expect(Number(getByTestId(renderCountTestId)?.textContent)).toBe(1)\n  }\n}\n"],"mappings":"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","names":["import_react"]}

package/dist/cjs/runtimes/react/react-runtime-core.js

@@ -47,10 +47,12 @@ class ReactRuntimeCore extends import_runtime_core.RuntimeCore {
     server = false,
     props
   }) {
+    const isServerComponent = server !== false;
+    const injectedProps = typeof server === "object" ? server.unstable_injectedProps : {};
     validateComponentType(
       // make sure we don't access `component?.name` and trigger loading of the server
       // component unless we're running in the RSC environment
-      server && !this.isRSCEnv() ? { type, componentName: label || "Unknown server component" } : {
+      isServerComponent && !this.isRSCEnv() ? { type, componentName: label || "Unknown server component" } : {
         type,
         componentName: component?.name || label || "Unknown component"
       }
@@ -58,7 +60,16 @@ class ReactRuntimeCore extends import_runtime_core.RuntimeCore {
     const unregisterComponent = this.protoStore.dispatch(
       (0, import_read_only_actions.registerComponentEffect)(
         type,
-        { label, icon, hidden, description, builtinSuspense, unstable_migration, server },
+        {
+          label,
+          icon,
+          hidden,
+          description,
+          builtinSuspense,
+          unstable_migration,
+          server: isServerComponent,
+          injectedProps
+        },
         props ?? {}
       )
     );
@@ -67,7 +78,7 @@ class ReactRuntimeCore extends import_runtime_core.RuntimeCore {
         "builtinSuspense is ignored in React >= 19.2; components are always wrapped in <Activity>."
       );
     }
-    if (server && !this.isRSCEnv()) {
+    if (isServerComponent && !this.isRSCEnv()) {
       return () => {
         unregisterComponent();
       };

package/dist/cjs/runtimes/react/react-runtime-core.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/runtimes/react/react-runtime-core.ts"],"sourcesContent":["import { ControlDefinition as UnifiedControlDefinition } from '@makeswift/controls'\n\nimport { type LegacyDescriptor, type DescriptorValueType } from '../../prop-controllers/descriptors'\n\nimport { supportsActivity } from './components/activity-with-fallback'\n\nimport {\n  registerComponentEffect,\n  registerReactComponentEffect,\n} from '../../state/actions/internal/read-only-actions'\n\nimport { ComponentIcon } from '../../state/modules/components-meta'\nimport type { ComponentType } from '../../state/read-only-state'\n\nimport { RuntimeCore } from './runtime-core'\n\nfunction validateComponentType({\n  type,\n  componentName,\n}: {\n  type: string\n  componentName: string\n}): void {\n  if (typeof type !== 'string' || type === '') {\n    throw new Error(\n      `${componentName}: A non-empty string \\`type\\` is required for component registration, got ${type}`,\n    )\n  }\n}\n\nexport class ReactRuntimeCore extends RuntimeCore {\n  registerComponent<\n    ControlDef extends UnifiedControlDefinition,\n    P extends Record<string, LegacyDescriptor | ControlDef>,\n    C extends ComponentType<{ [K in keyof P]: DescriptorValueType<P[K]> }>,\n  >(\n    component: C,\n    {\n      type,\n      label,\n      icon = ComponentIcon.Cube,\n      hidden = false,\n      description,\n      builtinSuspense,\n      unstable_migration,\n      server = false,\n      props,\n    }: {\n      type: string\n      label: string\n      icon?: ComponentIcon\n      hidden?: boolean\n      description?: string\n      /**\n       * In React <= 19.1, controls the default `<Suspense>` boundary.\n       * Ignored in React >= 19.2; components are always wrapped in `<Activity>`.\n       * Defaults to `true`.\n       */\n      builtinSuspense?: boolean\n      /**\n       * Marks this registration as superseded by `replacementType`. When\n       * `replacementType` differs from `type`, the builder offers a way to\n       * update existing instances.\n       */\n      unstable_migration?: { replacementType: string }\n      server?: boolean\n      props?: P\n    },\n  ): () => void {\n    validateComponentType(\n      // make sure we don't access `component?.name` and trigger loading of the server\n      // component unless we're running in the RSC environment\n      server && !this.isRSCEnv()\n        ? { type, componentName: label || 'Unknown server component' }\n        : {\n            type,\n            componentName: component?.name || label || 'Unknown component',\n          },\n    )\n\n    const unregisterComponent = this.protoStore.dispatch(\n      registerComponentEffect(\n        type,\n        { label, icon, hidden, description, builtinSuspense, unstable_migration, server },\n        props ?? {},\n      ),\n    )\n\n    if (supportsActivity() && builtinSuspense !== undefined) {\n      console.warn(\n        'builtinSuspense is ignored in React >= 19.2; components are always wrapped in <Activity>.',\n      )\n    }\n\n    if (server && !this.isRSCEnv()) {\n      // we can't load server components code outside of the RSC environment, but we also\n      // don't need to: if everything is set up correctly, React has already rendered and\n      // streamed the corresponding React elements to the client for us -- see\n      // `ServerElementsCache` and `ElementDataServer`\n      return () => {\n        unregisterComponent()\n      }\n    }\n\n    const unregisterReactComponent = this.protoStore.dispatch(\n      registerReactComponentEffect(type, component as unknown as ComponentType),\n    )\n\n    return () => {\n      unregisterComponent()\n      unregisterReactComponent()\n    }\n  }\n\n  protected isRSCEnv() {\n    return false\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAIA,oCAAiC;AAEjC,+BAGO;AAEP,6BAA8B;AAG9B,0BAA4B;AAE5B,SAAS,sBAAsB;AAAA,EAC7B;AAAA,EACA;AACF,GAGS;AACP,MAAI,OAAO,SAAS,YAAY,SAAS,IAAI;AAC3C,UAAM,IAAI;AAAA,MACR,GAAG,aAAa,6EAA6E,IAAI;AAAA,IACnG;AAAA,EACF;AACF;AAEO,MAAM,yBAAyB,gCAAY;AAAA,EAChD,kBAKE,WACA;AAAA,IACE;AAAA,IACA;AAAA,IACA,OAAO,qCAAc;AAAA,IACrB,SAAS;AAAA,IACT;AAAA,IACA;AAAA,IACA;AAAA,IACA,SAAS;AAAA,IACT;AAAA,EACF,GAqBY;AACZ;AAAA;AAAA;AAAA,MAGE,UAAU,CAAC,KAAK,SAAS,IACrB,EAAE,MAAM,eAAe,SAAS,2BAA2B,IAC3D;AAAA,QACE;AAAA,QACA,eAAe,WAAW,QAAQ,SAAS;AAAA,MAC7C;AAAA,IACN;AAEA,UAAM,sBAAsB,KAAK,WAAW;AAAA,UAC1C;AAAA,QACE;AAAA,QACA,EAAE,OAAO,MAAM,QAAQ,aAAa,iBAAiB,oBAAoB,OAAO;AAAA,QAChF,SAAS,CAAC;AAAA,MACZ;AAAA,IACF;AAEA,YAAI,gDAAiB,KAAK,oBAAoB,QAAW;AACvD,cAAQ;AAAA,QACN;AAAA,MACF;AAAA,IACF;AAEA,QAAI,UAAU,CAAC,KAAK,SAAS,GAAG;AAK9B,aAAO,MAAM;AACX,4BAAoB;AAAA,MACtB;AAAA,IACF;AAEA,UAAM,2BAA2B,KAAK,WAAW;AAAA,UAC/C,uDAA6B,MAAM,SAAqC;AAAA,IAC1E;AAEA,WAAO,MAAM;AACX,0BAAoB;AACpB,+BAAyB;AAAA,IAC3B;AAAA,EACF;AAAA,EAEU,WAAW;AACnB,WAAO;AAAA,EACT;AACF;","names":[]}
+{"version":3,"sources":["../../../../src/runtimes/react/react-runtime-core.ts"],"sourcesContent":["import { type Component, type PropsWithoutRef, type ReactNode, type RefAttributes } from 'react'\n\nimport { ControlDefinition as UnifiedControlDefinition } from '@makeswift/controls'\n\nimport { type LegacyDescriptor, type DescriptorValueType } from '../../prop-controllers/descriptors'\n\nimport { supportsActivity } from './components/activity-with-fallback'\n\nimport {\n  registerComponentEffect,\n  registerReactComponentEffect,\n} from '../../state/actions/internal/read-only-actions'\n\nimport { ComponentIcon } from '../../state/modules/components-meta'\nimport type { ComponentType } from '../../state/read-only-state'\n\nimport { type InjectableProps } from './server/injectable-props'\n\nimport { RuntimeCore } from './runtime-core'\n\nfunction validateComponentType({\n  type,\n  componentName,\n}: {\n  type: string\n  componentName: string\n}): void {\n  if (typeof type !== 'string' || type === '') {\n    throw new Error(\n      `${componentName}: A non-empty string \\`type\\` is required for component registration, got ${type}`,\n    )\n  }\n}\n\ntype InjectedPropsConfig = Record<string, keyof InjectableProps>\n\ntype ServerComponentConfig<I extends InjectedPropsConfig> =\n  | boolean\n  | {\n      unstable_injectedProps: I\n    }\n\ntype InjectedProps<I extends InjectedPropsConfig> = {\n  [K in keyof I]: InjectableProps[I[K]]\n}\n\ntype ResolvedProps<P extends Record<string, LegacyDescriptor | UnifiedControlDefinition>> = {\n  [K in keyof P]: DescriptorValueType<P[K]>\n}\n\ntype RegisteredComponentType<\n  P extends Record<string, LegacyDescriptor | UnifiedControlDefinition>,\n  I extends InjectedPropsConfig,\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  T = any,\n> =\n  | {\n      new (\n        props: PropsWithoutRef<ResolvedProps<P>> & InjectedProps<I> & RefAttributes<T>,\n        // eslint-disable-next-line @typescript-eslint/no-explicit-any\n        context?: any,\n      ): Component<ResolvedProps<P> & InjectedProps<I>>\n    }\n  | ((\n      props: PropsWithoutRef<ResolvedProps<P>> & InjectedProps<I> & RefAttributes<T>,\n      // eslint-disable-next-line @typescript-eslint/no-explicit-any\n      context?: any,\n    ) => ReactNode)\n\nexport class ReactRuntimeCore extends RuntimeCore {\n  registerComponent<\n    ControlDef extends UnifiedControlDefinition,\n    P extends Record<string, LegacyDescriptor | ControlDef>,\n    // eslint-disable-next-line @typescript-eslint/no-empty-object-type\n    const I extends InjectedPropsConfig = {},\n    C extends RegisteredComponentType<P, I> = RegisteredComponentType<P, I>,\n  >(\n    component: C,\n    {\n      type,\n      label,\n      icon = ComponentIcon.Cube,\n      hidden = false,\n      description,\n      builtinSuspense,\n      unstable_migration,\n      server = false,\n      props,\n    }: {\n      type: string\n      label: string\n      icon?: ComponentIcon\n      hidden?: boolean\n      description?: string\n      /**\n       * In React <= 19.1, controls the default `<Suspense>` boundary.\n       * Ignored in React >= 19.2; components are always wrapped in `<Activity>`.\n       * Defaults to `true`.\n       */\n      builtinSuspense?: boolean\n      /**\n       * Marks this registration as superseded by `replacementType`. When\n       * `replacementType` differs from `type`, the builder offers a way to\n       * update existing instances.\n       */\n      unstable_migration?: { replacementType: string }\n      server?: ServerComponentConfig<I>\n      props?: P\n    },\n  ): () => void {\n    const isServerComponent = server !== false\n    const injectedProps = typeof server === 'object' ? server.unstable_injectedProps : {}\n\n    validateComponentType(\n      // make sure we don't access `component?.name` and trigger loading of the server\n      // component unless we're running in the RSC environment\n      isServerComponent && !this.isRSCEnv()\n        ? { type, componentName: label || 'Unknown server component' }\n        : {\n            type,\n            componentName: component?.name || label || 'Unknown component',\n          },\n    )\n\n    const unregisterComponent = this.protoStore.dispatch(\n      registerComponentEffect(\n        type,\n        {\n          label,\n          icon,\n          hidden,\n          description,\n          builtinSuspense,\n          unstable_migration,\n          server: isServerComponent,\n          injectedProps,\n        },\n        props ?? {},\n      ),\n    )\n\n    if (supportsActivity() && builtinSuspense !== undefined) {\n      console.warn(\n        'builtinSuspense is ignored in React >= 19.2; components are always wrapped in <Activity>.',\n      )\n    }\n\n    if (isServerComponent && !this.isRSCEnv()) {\n      // we can't load server components code outside of the RSC environment, but we also\n      // don't need to: if everything is set up correctly, React has already rendered and\n      // streamed the corresponding React elements to the client for us -- see\n      // `ServerElementsCache` and `ElementDataServer`\n      return () => {\n        unregisterComponent()\n      }\n    }\n\n    const unregisterReactComponent = this.protoStore.dispatch(\n      registerReactComponentEffect(type, component as unknown as ComponentType),\n    )\n\n    return () => {\n      unregisterComponent()\n      unregisterReactComponent()\n    }\n  }\n\n  protected isRSCEnv() {\n    return false\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,oCAAiC;AAEjC,+BAGO;AAEP,6BAA8B;AAK9B,0BAA4B;AAE5B,SAAS,sBAAsB;AAAA,EAC7B;AAAA,EACA;AACF,GAGS;AACP,MAAI,OAAO,SAAS,YAAY,SAAS,IAAI;AAC3C,UAAM,IAAI;AAAA,MACR,GAAG,aAAa,6EAA6E,IAAI;AAAA,IACnG;AAAA,EACF;AACF;AAqCO,MAAM,yBAAyB,gCAAY;AAAA,EAChD,kBAOE,WACA;AAAA,IACE;AAAA,IACA;AAAA,IACA,OAAO,qCAAc;AAAA,IACrB,SAAS;AAAA,IACT;AAAA,IACA;AAAA,IACA;AAAA,IACA,SAAS;AAAA,IACT;AAAA,EACF,GAqBY;AACZ,UAAM,oBAAoB,WAAW;AACrC,UAAM,gBAAgB,OAAO,WAAW,WAAW,OAAO,yBAAyB,CAAC;AAEpF;AAAA;AAAA;AAAA,MAGE,qBAAqB,CAAC,KAAK,SAAS,IAChC,EAAE,MAAM,eAAe,SAAS,2BAA2B,IAC3D;AAAA,QACE;AAAA,QACA,eAAe,WAAW,QAAQ,SAAS;AAAA,MAC7C;AAAA,IACN;AAEA,UAAM,sBAAsB,KAAK,WAAW;AAAA,UAC1C;AAAA,QACE;AAAA,QACA;AAAA,UACE;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA,UACA,QAAQ;AAAA,UACR;AAAA,QACF;AAAA,QACA,SAAS,CAAC;AAAA,MACZ;AAAA,IACF;AAEA,YAAI,gDAAiB,KAAK,oBAAoB,QAAW;AACvD,cAAQ;AAAA,QACN;AAAA,MACF;AAAA,IACF;AAEA,QAAI,qBAAqB,CAAC,KAAK,SAAS,GAAG;AAKzC,aAAO,MAAM;AACX,4BAAoB;AAAA,MACtB;AAAA,IACF;AAEA,UAAM,2BAA2B,KAAK,WAAW;AAAA,UAC/C,uDAA6B,MAAM,SAAqC;AAAA,IAC1E;AAEA,WAAO,MAAM;AACX,0BAAoB;AACpB,+BAAyB;AAAA,IAC3B;AAAA,EACF;AAAA,EAEU,WAAW;AACnB,WAAO;AAAA,EACT;AACF;","names":[]}

package/dist/cjs/runtimes/react/server/components/element-data.js

@@ -32,7 +32,8 @@ var import_resolve_props = require("../resolve-props");
 async function ServerElementData({
   documentKey,
   context,
-  elementData
+  elementData,
+  injectedProps
 }) {
   const state = (0, import_render_context.getStore)(context).getState();
   const Component = (0, import_read_only_state.getReactComponent)(state, elementData.type);
@@ -59,7 +60,10 @@ async function ServerElementData({
     (0, import_read_only_state.getBreakpoints)(state),
     elementData.key
   );
-  const props = await (0, import_resolve_props.resolveProps)(context, elementData, documentKey, definitions, stylesheet);
+  const props = {
+    ...await (0, import_resolve_props.resolveProps)(context, elementData, documentKey, definitions, stylesheet),
+    ...injectedProps
+  };
   return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [
     /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Component, { ...props }, elementData.key),
     /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_server_css.InjectServerCSS, { collector: cssCollector, elementKey: elementData.key })

package/dist/cjs/runtimes/react/server/components/element-data.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../src/runtimes/react/server/components/element-data.tsx"],"sourcesContent":["import { type ReactNode } from 'react'\n\nimport { partitionRecord } from '../../../../utils/partition'\n\nimport {\n  type State,\n  type ElementData,\n  getReactComponent,\n  getBreakpoints,\n  getComponentPropControllerDescriptors,\n} from '../../../../state/read-only-state'\n\nimport { FallbackComponent } from '../../../../components/shared/FallbackComponent'\nimport { isLegacyDescriptor } from '../../../../prop-controllers/descriptors'\n\nimport {\n  ServerCSSCollector,\n  createCollectingServerStylesheet,\n  InjectServerCSS,\n} from '../css/server-css'\nimport { type ServerRenderContext, getStore } from '../render-context'\nimport { resolveProps } from '../resolve-props'\n\nexport async function ServerElementData({\n  documentKey,\n  context,\n  elementData,\n}: {\n  documentKey: string\n  context: ServerRenderContext\n  elementData: ElementData\n}): Promise<ReactNode> {\n  const state = getStore(context).getState()\n\n  const Component = getReactComponent(state, elementData.type)\n  if (Component == null) {\n    return (\n      <FallbackComponent\n        text=\"Component not found\"\n        details={`Unknown component '${elementData.type}'`}\n      />\n    )\n  }\n\n  const [legacyDescriptors, definitions] = getControlDefs(state, elementData)\n  const legacyKeys = Object.keys(legacyDescriptors)\n  if (legacyKeys.length > 0) {\n    console.warn(`Unexpected legacy control data in server element '${elementData.key}`, {\n      elementData,\n      legacyKeys,\n    })\n  }\n\n  const cssCollector = new ServerCSSCollector()\n  const stylesheet = createCollectingServerStylesheet(\n    cssCollector,\n    getBreakpoints(state),\n    elementData.key,\n  )\n\n  const props = await resolveProps(context, elementData, documentKey, definitions, stylesheet)\n\n  return (\n    <>\n      {/* Make the component the first child so that `findDOMNode` resolves to its first\n        rendered DOM node (if any) rather than the component's `<style>` element */}\n      <Component key={elementData.key} {...props} />\n      <InjectServerCSS collector={cssCollector} elementKey={elementData.key} />\n    </>\n  )\n}\n\nconst getControlDefs = (state: State, elementData: ElementData) => {\n  const descriptors = getComponentPropControllerDescriptors(state, elementData.type) ?? {}\n  return partitionRecord(descriptors, isLegacyDescriptor)\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAqCM;AAnCN,uBAAgC;AAEhC,6BAMO;AAEP,+BAAkC;AAClC,yBAAmC;AAEnC,wBAIO;AACP,4BAAmD;AACnD,2BAA6B;AAE7B,eAAsB,kBAAkB;AAAA,EACtC;AAAA,EACA;AAAA,EACA;AACF,GAIuB;AACrB,QAAM,YAAQ,gCAAS,OAAO,EAAE,SAAS;AAEzC,QAAM,gBAAY,0CAAkB,OAAO,YAAY,IAAI;AAC3D,MAAI,aAAa,MAAM;AACrB,WACE;AAAA,MAAC;AAAA;AAAA,QACC,MAAK;AAAA,QACL,SAAS,sBAAsB,YAAY,IAAI;AAAA;AAAA,IACjD;AAAA,EAEJ;AAEA,QAAM,CAAC,mBAAmB,WAAW,IAAI,eAAe,OAAO,WAAW;AAC1E,QAAM,aAAa,OAAO,KAAK,iBAAiB;AAChD,MAAI,WAAW,SAAS,GAAG;AACzB,YAAQ,KAAK,qDAAqD,YAAY,GAAG,IAAI;AAAA,MACnF;AAAA,MACA;AAAA,IACF,CAAC;AAAA,EACH;AAEA,QAAM,eAAe,IAAI,qCAAmB;AAC5C,QAAM,iBAAa;AAAA,IACjB;AAAA,QACA,uCAAe,KAAK;AAAA,IACpB,YAAY;AAAA,EACd;AAEA,QAAM,QAAQ,UAAM,mCAAa,SAAS,aAAa,aAAa,aAAa,UAAU;AAE3F,SACE,4EAGE;AAAA,gDAAC,aAAiC,GAAG,SAArB,YAAY,GAAgB;AAAA,IAC5C,4CAAC,qCAAgB,WAAW,cAAc,YAAY,YAAY,KAAK;AAAA,KACzE;AAEJ;AAEA,MAAM,iBAAiB,CAAC,OAAc,gBAA6B;AACjE,QAAM,kBAAc,8DAAsC,OAAO,YAAY,IAAI,KAAK,CAAC;AACvF,aAAO,kCAAgB,aAAa,qCAAkB;AACxD;","names":[]}
+{"version":3,"sources":["../../../../../../src/runtimes/react/server/components/element-data.tsx"],"sourcesContent":["import { type ReactNode } from 'react'\n\nimport { partitionRecord } from '../../../../utils/partition'\n\nimport {\n  type State,\n  type ElementData,\n  getReactComponent,\n  getBreakpoints,\n  getComponentPropControllerDescriptors,\n} from '../../../../state/read-only-state'\n\nimport { FallbackComponent } from '../../../../components/shared/FallbackComponent'\nimport { isLegacyDescriptor } from '../../../../prop-controllers/descriptors'\n\nimport {\n  ServerCSSCollector,\n  createCollectingServerStylesheet,\n  InjectServerCSS,\n} from '../css/server-css'\nimport { type ServerRenderContext, getStore } from '../render-context'\nimport { resolveProps } from '../resolve-props'\n\nexport async function ServerElementData({\n  documentKey,\n  context,\n  elementData,\n  injectedProps,\n}: {\n  documentKey: string\n  context: ServerRenderContext\n  elementData: ElementData\n  injectedProps: Record<string, unknown>\n}): Promise<ReactNode> {\n  const state = getStore(context).getState()\n\n  const Component = getReactComponent(state, elementData.type)\n  if (Component == null) {\n    return (\n      <FallbackComponent\n        text=\"Component not found\"\n        details={`Unknown component '${elementData.type}'`}\n      />\n    )\n  }\n\n  const [legacyDescriptors, definitions] = getControlDefs(state, elementData)\n  const legacyKeys = Object.keys(legacyDescriptors)\n  if (legacyKeys.length > 0) {\n    console.warn(`Unexpected legacy control data in server element '${elementData.key}`, {\n      elementData,\n      legacyKeys,\n    })\n  }\n\n  const cssCollector = new ServerCSSCollector()\n  const stylesheet = createCollectingServerStylesheet(\n    cssCollector,\n    getBreakpoints(state),\n    elementData.key,\n  )\n\n  const props = {\n    ...(await resolveProps(context, elementData, documentKey, definitions, stylesheet)),\n    ...injectedProps,\n  }\n\n  return (\n    <>\n      {/* Make the component the first child so that `findDOMNode` resolves to its first\n        rendered DOM node (if any) rather than the component's `<style>` element */}\n      <Component key={elementData.key} {...props} />\n      <InjectServerCSS collector={cssCollector} elementKey={elementData.key} />\n    </>\n  )\n}\n\nconst getControlDefs = (state: State, elementData: ElementData) => {\n  const descriptors = getComponentPropControllerDescriptors(state, elementData.type) ?? {}\n  return partitionRecord(descriptors, isLegacyDescriptor)\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAuCM;AArCN,uBAAgC;AAEhC,6BAMO;AAEP,+BAAkC;AAClC,yBAAmC;AAEnC,wBAIO;AACP,4BAAmD;AACnD,2BAA6B;AAE7B,eAAsB,kBAAkB;AAAA,EACtC;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,GAKuB;AACrB,QAAM,YAAQ,gCAAS,OAAO,EAAE,SAAS;AAEzC,QAAM,gBAAY,0CAAkB,OAAO,YAAY,IAAI;AAC3D,MAAI,aAAa,MAAM;AACrB,WACE;AAAA,MAAC;AAAA;AAAA,QACC,MAAK;AAAA,QACL,SAAS,sBAAsB,YAAY,IAAI;AAAA;AAAA,IACjD;AAAA,EAEJ;AAEA,QAAM,CAAC,mBAAmB,WAAW,IAAI,eAAe,OAAO,WAAW;AAC1E,QAAM,aAAa,OAAO,KAAK,iBAAiB;AAChD,MAAI,WAAW,SAAS,GAAG;AACzB,YAAQ,KAAK,qDAAqD,YAAY,GAAG,IAAI;AAAA,MACnF;AAAA,MACA;AAAA,IACF,CAAC;AAAA,EACH;AAEA,QAAM,eAAe,IAAI,qCAAmB;AAC5C,QAAM,iBAAa;AAAA,IACjB;AAAA,QACA,uCAAe,KAAK;AAAA,IACpB,YAAY;AAAA,EACd;AAEA,QAAM,QAAQ;AAAA,IACZ,GAAI,UAAM,mCAAa,SAAS,aAAa,aAAa,aAAa,UAAU;AAAA,IACjF,GAAG;AAAA,EACL;AAEA,SACE,4EAGE;AAAA,gDAAC,aAAiC,GAAG,SAArB,YAAY,GAAgB;AAAA,IAC5C,4CAAC,qCAAgB,WAAW,cAAc,YAAY,YAAY,KAAK;AAAA,KACzE;AAEJ;AAEA,MAAM,iBAAiB,CAAC,OAAc,gBAA6B;AACjE,QAAM,kBAAc,8DAAsC,OAAO,YAAY,IAAI,KAAK,CAAC;AACvF,aAAO,kCAAgB,aAAa,qCAAkB;AACxD;","names":[]}

package/dist/cjs/runtimes/react/server/components/element.js

@@ -22,6 +22,7 @@ __export(element_exports, {
 });
 module.exports = __toCommonJS(element_exports);
 var import_jsx_runtime = require("react/jsx-runtime");
+var import_controls = require("@makeswift/controls");
 var import_read_only_state = require("../../../../state/read-only-state");
 var import_FallbackComponent = require("../../../../components/shared/FallbackComponent");
 var import_Element = require("../../components/Element");
@@ -46,11 +47,28 @@ function ServerElement({
       }
     );
   }
+  const elementKey = element.key;
   const isRSC = elementMeta.server ?? false;
   if (!isRSC) {
-    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_Element.Element, { element }, element.key);
+    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_Element.Element, { element }, elementKey);
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_element_data.ServerElementData, { documentKey, context, elementData: element });
+  const injectableProps = {
+    elementKey,
+    documentKey
+  };
+  const injectedProps = (0, import_controls.mapValues)(
+    elementMeta.injectedProps ?? {},
+    (propName) => injectableProps[propName]
+  );
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+    import_element_data.ServerElementData,
+    {
+      documentKey,
+      context,
+      elementData: element,
+      injectedProps
+    }
+  );
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/cjs/runtimes/react/server/components/element.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../src/runtimes/react/server/components/element.tsx"],"sourcesContent":["import { ReactNode } from 'react'\n\nimport {\n  isElementReference,\n  getComponentsMeta,\n  type Element as ElementDataOrRef,\n} from '../../../../state/read-only-state'\n\nimport { FallbackComponent } from '../../../../components/shared/FallbackComponent'\n\nimport { Element as ClientElement } from '../../components/Element'\n\nimport { type ServerRenderContext, getStore } from '../render-context'\n\nimport { ServerElementData } from './element-data'\n\nexport function ServerElement({\n  context,\n  element,\n  documentKey,\n}: {\n  context: ServerRenderContext\n  element: ElementDataOrRef\n  documentKey: string\n}): ReactNode {\n  // check for element references first to avoid looking them up as regular components\n  if (isElementReference(element)) {\n    return <FallbackComponent text=\"Element reference is not supported on server yet\" />\n  }\n\n  const state = getStore(context).getState()\n  const elementMeta = getComponentsMeta(state).get(element.type)\n  if (elementMeta == null) {\n    return (\n      <FallbackComponent\n        text=\"Component not found\"\n        details={`Missing component metadata for '${element.type}'`}\n      />\n    )\n  }\n\n  const isRSC = elementMeta.server ?? false\n  if (!isRSC) {\n    return <ClientElement key={element.key} element={element} />\n  }\n\n  return <ServerElementData documentKey={documentKey} context={context} elementData={element} />\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AA2BW;AAzBX,6BAIO;AAEP,+BAAkC;AAElC,qBAAyC;AAEzC,4BAAmD;AAEnD,0BAAkC;AAE3B,SAAS,cAAc;AAAA,EAC5B;AAAA,EACA;AAAA,EACA;AACF,GAIc;AAEZ,UAAI,2CAAmB,OAAO,GAAG;AAC/B,WAAO,4CAAC,8CAAkB,MAAK,oDAAmD;AAAA,EACpF;AAEA,QAAM,YAAQ,gCAAS,OAAO,EAAE,SAAS;AACzC,QAAM,kBAAc,0CAAkB,KAAK,EAAE,IAAI,QAAQ,IAAI;AAC7D,MAAI,eAAe,MAAM;AACvB,WACE;AAAA,MAAC;AAAA;AAAA,QACC,MAAK;AAAA,QACL,SAAS,mCAAmC,QAAQ,IAAI;AAAA;AAAA,IAC1D;AAAA,EAEJ;AAEA,QAAM,QAAQ,YAAY,UAAU;AACpC,MAAI,CAAC,OAAO;AACV,WAAO,4CAAC,eAAAA,SAAA,EAAgC,WAAb,QAAQ,GAAuB;AAAA,EAC5D;AAEA,SAAO,4CAAC,yCAAkB,aAA0B,SAAkB,aAAa,SAAS;AAC9F;","names":["ClientElement"]}
+{"version":3,"sources":["../../../../../../src/runtimes/react/server/components/element.tsx"],"sourcesContent":["import { ReactNode } from 'react'\n\nimport { mapValues } from '@makeswift/controls'\n\nimport {\n  isElementReference,\n  getComponentsMeta,\n  type Element as ElementDataOrRef,\n} from '../../../../state/read-only-state'\n\nimport { FallbackComponent } from '../../../../components/shared/FallbackComponent'\n\nimport { Element as ClientElement } from '../../components/Element'\n\nimport { type ServerRenderContext, getStore } from '../render-context'\nimport { type InjectableProps } from '../injectable-props'\n\nimport { ServerElementData } from './element-data'\n\nexport function ServerElement({\n  context,\n  element,\n  documentKey,\n}: {\n  context: ServerRenderContext\n  element: ElementDataOrRef\n  documentKey: string\n}): ReactNode {\n  // check for element references first to avoid looking them up as regular components\n  if (isElementReference(element)) {\n    return <FallbackComponent text=\"Element reference is not supported on server yet\" />\n  }\n\n  const state = getStore(context).getState()\n  const elementMeta = getComponentsMeta(state).get(element.type)\n  if (elementMeta == null) {\n    return (\n      <FallbackComponent\n        text=\"Component not found\"\n        details={`Missing component metadata for '${element.type}'`}\n      />\n    )\n  }\n\n  const elementKey = element.key\n  const isRSC = elementMeta.server ?? false\n  if (!isRSC) {\n    return <ClientElement key={elementKey} element={element} />\n  }\n\n  const injectableProps: InjectableProps = {\n    elementKey,\n    documentKey,\n  }\n\n  const injectedProps = mapValues(\n    elementMeta.injectedProps ?? {},\n    propName => injectableProps[propName],\n  )\n\n  return (\n    <ServerElementData\n      documentKey={documentKey}\n      context={context}\n      elementData={element}\n      injectedProps={injectedProps}\n    />\n  )\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AA8BW;AA5BX,sBAA0B;AAE1B,6BAIO;AAEP,+BAAkC;AAElC,qBAAyC;AAEzC,4BAAmD;AAGnD,0BAAkC;AAE3B,SAAS,cAAc;AAAA,EAC5B;AAAA,EACA;AAAA,EACA;AACF,GAIc;AAEZ,UAAI,2CAAmB,OAAO,GAAG;AAC/B,WAAO,4CAAC,8CAAkB,MAAK,oDAAmD;AAAA,EACpF;AAEA,QAAM,YAAQ,gCAAS,OAAO,EAAE,SAAS;AACzC,QAAM,kBAAc,0CAAkB,KAAK,EAAE,IAAI,QAAQ,IAAI;AAC7D,MAAI,eAAe,MAAM;AACvB,WACE;AAAA,MAAC;AAAA;AAAA,QACC,MAAK;AAAA,QACL,SAAS,mCAAmC,QAAQ,IAAI;AAAA;AAAA,IAC1D;AAAA,EAEJ;AAEA,QAAM,aAAa,QAAQ;AAC3B,QAAM,QAAQ,YAAY,UAAU;AACpC,MAAI,CAAC,OAAO;AACV,WAAO,4CAAC,eAAAA,SAAA,EAA+B,WAAZ,UAA8B;AAAA,EAC3D;AAEA,QAAM,kBAAmC;AAAA,IACvC;AAAA,IACA;AAAA,EACF;AAEA,QAAM,oBAAgB;AAAA,IACpB,YAAY,iBAAiB,CAAC;AAAA,IAC9B,cAAY,gBAAgB,QAAQ;AAAA,EACtC;AAEA,SACE;AAAA,IAAC;AAAA;AAAA,MACC;AAAA,MACA;AAAA,MACA,aAAa;AAAA,MACb;AAAA;AAAA,EACF;AAEJ;","names":["ClientElement"]}

package/dist/cjs/runtimes/react/server/injectable-props.js

@@ -0,0 +1,17 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var injectable_props_exports = {};
+module.exports = __toCommonJS(injectable_props_exports);
+//# sourceMappingURL=injectable-props.js.map

package/dist/cjs/runtimes/react/server/injectable-props.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../src/runtimes/react/server/injectable-props.ts"],"sourcesContent":["export type InjectableProps = {\n  documentKey: string\n  elementKey: string\n}\n"],"mappings":";;;;;;;;;;;;;;AAAA;AAAA;","names":[]}

package/dist/cjs/runtimes/react/server/render-context.js

@@ -35,12 +35,7 @@ const getRenderContext = () => {
     throw Error("Makeswift render context was not set.");
   return context;
 };
-const getStore = ({ runtime, siteVersion, locale }) => {
-  if (runtime.requestKey == null) {
-    throw Error("Expected a runtime instance that is bound to a specific request key");
-  }
-  return runtime.getOrCreateStore({ siteVersion, locale });
-};
+const getStore = ({ store }) => store;
 const RenderContext = ({
   context,
   children

package/dist/cjs/runtimes/react/server/render-context.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../src/runtimes/react/server/render-context.tsx"],"sourcesContent":["import { cache, type PropsWithChildren } from 'react'\n\nimport { ReactRuntime } from '../../react/react-runtime'\nimport { type Store } from '../../../state/store'\n\nimport { type SiteVersion } from '../../../api/site-version'\nimport { MakeswiftClient } from '../../../client'\n\n/**\n * Request-scoped dependencies used to render Makeswift server elements.\n *\n * Framework integrations create a context for each request and install it with\n * `RenderContext` or `setRenderContext` so nested renderers can access it without\n * threading it through every component. The runtime must be request-bound;\n * together with `siteVersion` and `locale`, it selects the store and API resource\n * cache used during rendering.\n */\nexport type ServerRenderContext = {\n  request: Request\n  runtime: ReactRuntime\n  client: MakeswiftClient\n  siteVersion: SiteVersion | null\n  locale: string | undefined\n}\n\nconst requestContext = cache((): { current?: ServerRenderContext } => ({}))\n\nexport const setRenderContext = (context: ServerRenderContext) => {\n  requestContext().current = context\n}\n\nexport const getRenderContext = (): ServerRenderContext => {\n  const context = requestContext().current\n  if (!context) throw Error('Makeswift render context was not set.')\n  return context\n}\n\nexport const getStore = ({ runtime, siteVersion, locale }: ServerRenderContext): Store => {\n  if (runtime.requestKey == null) {\n    throw Error('Expected a runtime instance that is bound to a specific request key')\n  }\n\n  return runtime.getOrCreateStore({ siteVersion, locale })\n}\n\nexport const RenderContext = ({\n  context,\n  children,\n}: PropsWithChildren<{ context: ServerRenderContext }>) => {\n  setRenderContext(context)\n  return children\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAA8C;AAyB9C,MAAM,qBAAiB,oBAAM,OAA0C,CAAC,EAAE;AAEnE,MAAM,mBAAmB,CAAC,YAAiC;AAChE,iBAAe,EAAE,UAAU;AAC7B;AAEO,MAAM,mBAAmB,MAA2B;AACzD,QAAM,UAAU,eAAe,EAAE;AACjC,MAAI,CAAC;AAAS,UAAM,MAAM,uCAAuC;AACjE,SAAO;AACT;AAEO,MAAM,WAAW,CAAC,EAAE,SAAS,aAAa,OAAO,MAAkC;AACxF,MAAI,QAAQ,cAAc,MAAM;AAC9B,UAAM,MAAM,qEAAqE;AAAA,EACnF;AAEA,SAAO,QAAQ,iBAAiB,EAAE,aAAa,OAAO,CAAC;AACzD;AAEO,MAAM,gBAAgB,CAAC;AAAA,EAC5B;AAAA,EACA;AACF,MAA2D;AACzD,mBAAiB,OAAO;AACxB,SAAO;AACT;","names":[]}
+{"version":3,"sources":["../../../../../src/runtimes/react/server/render-context.tsx"],"sourcesContent":["import { cache, type PropsWithChildren } from 'react'\n\nimport { ReactRuntime } from '../../react/react-runtime'\nimport { type Store } from '../../../state/store'\n\nimport { type SiteVersion } from '../../../api/site-version'\nimport { MakeswiftClient } from '../../../client'\n\n/**\n * Request-scoped dependencies used to render Makeswift server elements.\n *\n * Framework integrations create a context for each request and install it with\n * `RenderContext` or `setRenderContext` so nested renderers can access it without\n * threading it through every component. The runtime must be request-bound;\n * together with `siteVersion` and `locale`, it selects the store and API resource\n * cache used during rendering.\n */\nexport type ServerRenderContext = {\n  request: Request\n  runtime: ReactRuntime\n  client: MakeswiftClient\n  siteVersion: SiteVersion | null\n  locale: string | undefined\n  store: Store\n}\n\nconst requestContext = cache((): { current?: ServerRenderContext } => ({}))\n\nexport const setRenderContext = (context: ServerRenderContext) => {\n  requestContext().current = context\n}\n\nexport const getRenderContext = (): ServerRenderContext => {\n  const context = requestContext().current\n  if (!context) throw Error('Makeswift render context was not set.')\n  return context\n}\n\nexport const getStore = ({ store }: ServerRenderContext): Store => store\n\nexport const RenderContext = ({\n  context,\n  children,\n}: PropsWithChildren<{ context: ServerRenderContext }>) => {\n  setRenderContext(context)\n  return children\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAA8C;AA0B9C,MAAM,qBAAiB,oBAAM,OAA0C,CAAC,EAAE;AAEnE,MAAM,mBAAmB,CAAC,YAAiC;AAChE,iBAAe,EAAE,UAAU;AAC7B;AAEO,MAAM,mBAAmB,MAA2B;AACzD,QAAM,UAAU,eAAe,EAAE;AACjC,MAAI,CAAC;AAAS,UAAM,MAAM,uCAAuC;AACjE,SAAO;AACT;AAEO,MAAM,WAAW,CAAC,EAAE,MAAM,MAAkC;AAE5D,MAAM,gBAAgB,CAAC;AAAA,EAC5B;AAAA,EACA;AACF,MAA2D;AACzD,mBAAiB,OAAO;AACxB,SAAO;AACT;","names":[]}

package/dist/cjs/runtimes/react/testing/react-runtime.js

@@ -25,10 +25,7 @@ var import_fixtures = require("../../../testing/fixtures");
 var import_react_runtime = require("../react-runtime");
 class TestReactRuntime extends import_react_runtime.ReactRuntime {
   env;
-  constructor({
-    env,
-    ...args
-  }) {
+  constructor({ env, ...args }) {
     super(args);
     this.env = env ?? "client";
   }
@@ -38,6 +35,7 @@ class TestReactRuntime extends import_react_runtime.ReactRuntime {
 }
 function createReactRuntime({
   breakpoints,
+  requestKey,
   env
 } = {}) {
   return new TestReactRuntime({
@@ -45,6 +43,7 @@ function createReactRuntime({
     // through the patched version instead of an eagerly captured reference to the original
     fetch: (...args) => globalThis.fetch(...args),
     breakpoints,
+    requestKey,
     env,
     ...import_fixtures.TestOrigins
   });

package/dist/cjs/runtimes/react/testing/react-runtime.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../src/runtimes/react/testing/react-runtime.tsx"],"sourcesContent":["import { type BreakpointsInput } from '../../../state/modules/breakpoints'\nimport { TestOrigins } from '../../../testing/fixtures'\nimport { ReactRuntime } from '../react-runtime'\n\ntype RuntimeEnv = 'client' | 'ssr' | 'rsc'\n\nclass TestReactRuntime extends ReactRuntime {\n  readonly env: RuntimeEnv\n\n  constructor({\n    env,\n    ...args\n  }: ConstructorParameters<typeof ReactRuntime>[0] & { env?: RuntimeEnv }) {\n    super(args)\n    this.env = env ?? 'client'\n  }\n\n  protected isRSCEnv() {\n    return this.env === 'rsc'\n  }\n}\n\nexport function createReactRuntime({\n  breakpoints,\n  env,\n}: { breakpoints?: BreakpointsInput; env?: RuntimeEnv } = {}) {\n  return new TestReactRuntime({\n    // Mock Service Worker patches global `fetch` for interception; make sure our test calls go\n    // through the patched version instead of an eagerly captured reference to the original\n    fetch: (...args) => globalThis.fetch(...args),\n    breakpoints,\n    env,\n    ...TestOrigins,\n  })\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,sBAA4B;AAC5B,2BAA6B;AAI7B,MAAM,yBAAyB,kCAAa;AAAA,EACjC;AAAA,EAET,YAAY;AAAA,IACV;AAAA,IACA,GAAG;AAAA,EACL,GAAyE;AACvE,UAAM,IAAI;AACV,SAAK,MAAM,OAAO;AAAA,EACpB;AAAA,EAEU,WAAW;AACnB,WAAO,KAAK,QAAQ;AAAA,EACtB;AACF;AAEO,SAAS,mBAAmB;AAAA,EACjC;AAAA,EACA;AACF,IAA0D,CAAC,GAAG;AAC5D,SAAO,IAAI,iBAAiB;AAAA;AAAA;AAAA,IAG1B,OAAO,IAAI,SAAS,WAAW,MAAM,GAAG,IAAI;AAAA,IAC5C;AAAA,IACA;AAAA,IACA,GAAG;AAAA,EACL,CAAC;AACH;","names":[]}
+{"version":3,"sources":["../../../../../src/runtimes/react/testing/react-runtime.tsx"],"sourcesContent":["import { TestOrigins } from '../../../testing/fixtures'\nimport { ReactRuntime } from '../react-runtime'\n\ntype RuntimeEnv = 'client' | 'ssr' | 'rsc'\ntype RuntimeArgs = ConstructorParameters<typeof ReactRuntime>[0]\n\nclass TestReactRuntime extends ReactRuntime {\n  readonly env: RuntimeEnv\n\n  constructor({ env, ...args }: RuntimeArgs & { env?: RuntimeEnv }) {\n    super(args)\n    this.env = env ?? 'client'\n  }\n\n  protected isRSCEnv() {\n    return this.env === 'rsc'\n  }\n}\n\nexport function createReactRuntime({\n  breakpoints,\n  requestKey,\n  env,\n}: {\n  breakpoints?: RuntimeArgs['breakpoints']\n  requestKey?: RuntimeArgs['requestKey']\n  env?: RuntimeEnv\n} = {}) {\n  return new TestReactRuntime({\n    // Mock Service Worker patches global `fetch` for interception; make sure our test calls go\n    // through the patched version instead of an eagerly captured reference to the original\n    fetch: (...args) => globalThis.fetch(...args),\n    breakpoints,\n    requestKey,\n    env,\n    ...TestOrigins,\n  })\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,sBAA4B;AAC5B,2BAA6B;AAK7B,MAAM,yBAAyB,kCAAa;AAAA,EACjC;AAAA,EAET,YAAY,EAAE,KAAK,GAAG,KAAK,GAAuC;AAChE,UAAM,IAAI;AACV,SAAK,MAAM,OAAO;AAAA,EACpB;AAAA,EAEU,WAAW;AACnB,WAAO,KAAK,QAAQ;AAAA,EACtB;AACF;AAEO,SAAS,mBAAmB;AAAA,EACjC;AAAA,EACA;AAAA,EACA;AACF,IAII,CAAC,GAAG;AACN,SAAO,IAAI,iBAAiB;AAAA;AAAA;AAAA,IAG1B,OAAO,IAAI,SAAS,WAAW,MAAM,GAAG,IAAI;AAAA,IAC5C;AAAA,IACA;AAAA,IACA;AAAA,IACA,GAAG;AAAA,EACL,CAAC;AACH;","names":[]}

package/dist/cjs/runtimes/react/testing/render-to-string.js

@@ -0,0 +1,44 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var render_to_string_exports = {};
+__export(render_to_string_exports, {
+  renderToString: () => renderToString
+});
+module.exports = __toCommonJS(render_to_string_exports);
+var import_server = require("react-dom/server");
+async function streamToString(stream) {
+  const reader = stream.getReader();
+  const decoder = new TextDecoder();
+  let result = "";
+  while (true) {
+    const { done, value } = await reader.read();
+    if (done)
+      break;
+    result += decoder.decode(value, { stream: true });
+  }
+  return result;
+}
+async function renderToString(element) {
+  return await streamToString(await (0, import_server.renderToReadableStream)(element));
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  renderToString
+});
+//# sourceMappingURL=render-to-string.js.map

package/dist/cjs/runtimes/react/testing/render-to-string.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../src/runtimes/react/testing/render-to-string.ts"],"sourcesContent":["import { type ReactNode } from 'react'\nimport { renderToReadableStream } from 'react-dom/server'\n\nasync function streamToString(stream: ReadableStream) {\n  const reader = stream.getReader()\n  const decoder = new TextDecoder()\n\n  let result = ''\n\n  while (true) {\n    const { done, value } = await reader.read()\n    if (done) break\n    result += decoder.decode(value, { stream: true })\n  }\n\n  return result\n}\n\nexport async function renderToString(element: ReactNode) {\n  return await streamToString(await renderToReadableStream(element))\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,oBAAuC;AAEvC,eAAe,eAAe,QAAwB;AACpD,QAAM,SAAS,OAAO,UAAU;AAChC,QAAM,UAAU,IAAI,YAAY;AAEhC,MAAI,SAAS;AAEb,SAAO,MAAM;AACX,UAAM,EAAE,MAAM,MAAM,IAAI,MAAM,OAAO,KAAK;AAC1C,QAAI;AAAM;AACV,cAAU,QAAQ,OAAO,OAAO,EAAE,QAAQ,KAAK,CAAC;AAAA,EAClD;AAEA,SAAO;AACT;AAEA,eAAsB,eAAe,SAAoB;AACvD,SAAO,MAAM,eAAe,UAAM,sCAAuB,OAAO,CAAC;AACnE;","names":[]}

package/dist/cjs/state/modules/components-meta.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/state/modules/components-meta.ts"],"sourcesContent":["import { type Action, type UnknownAction, isKnownAction } from '../actions'\nimport { ReadOnlyActionTypes } from '../actions/internal/read-only-action-types'\n\nexport const ComponentIcon = {\n  Accordion: 'accordion',\n  Audio: 'audio',\n  Billing: 'billing',\n  Bolt: 'bolt',\n  Button: 'button',\n  Card: 'card',\n  Cards: 'cards',\n  Carousel: 'carousel',\n  Chats: 'chats',\n  Code: 'code',\n  Countdown: 'countdown',\n  Cube: 'cube',\n  Database: 'database',\n  Divider: 'divider',\n  Form: 'form',\n  Gallery: 'gallery',\n  Grid: 'grid',\n  Help: 'help',\n  Image: 'image',\n  Layout: 'layout',\n  Lock: 'lock',\n  Marker: 'marker',\n  Navigation: 'navigation',\n  Palette: 'palette',\n  SocialLinks: 'social-links',\n  Star: 'star',\n  Table: 'table',\n  Tabs: 'tabs',\n  Text: 'text',\n  Users: 'users',\n  Video: 'video',\n} as const\n\nexport type ComponentIcon = (typeof ComponentIcon)[keyof typeof ComponentIcon]\n\nexport type ComponentMeta = {\n  label: string\n  icon: ComponentIcon\n  hidden: boolean\n  description?: string\n  builtinSuspense?: boolean\n  unstable_migration?: {\n    replacementType: string\n  }\n  server?: boolean\n}\n\nexport type State = Map<string, ComponentMeta>\n\nexport function getInitialState({\n  componentsMeta = new Map(),\n}: { componentsMeta?: Map<string, ComponentMeta> } = {}): State {\n  return componentsMeta\n}\n\nexport function getComponentsMeta(state: State): Map<string, ComponentMeta> {\n  return state\n}\n\nexport function getComponentMeta(state: State, type: string): ComponentMeta | null {\n  return getComponentsMeta(state).get(type) ?? null\n}\n\nexport function reducer(state: State = getInitialState(), action: Action | UnknownAction): State {\n  if (!isKnownAction(action)) return state\n\n  switch (action.type) {\n    case ReadOnlyActionTypes.REGISTER_COMPONENT:\n      return new Map(state).set(action.payload.type, action.payload.meta)\n\n    case ReadOnlyActionTypes.UNREGISTER_COMPONENT: {\n      const nextState = new Map(state)\n\n      const deleted = nextState.delete(action.payload.type)\n\n      return deleted ? nextState : state\n    }\n\n    default:\n      return state\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,qBAA+D;AAC/D,oCAAoC;AAE7B,MAAM,gBAAgB;AAAA,EAC3B,WAAW;AAAA,EACX,OAAO;AAAA,EACP,SAAS;AAAA,EACT,MAAM;AAAA,EACN,QAAQ;AAAA,EACR,MAAM;AAAA,EACN,OAAO;AAAA,EACP,UAAU;AAAA,EACV,OAAO;AAAA,EACP,MAAM;AAAA,EACN,WAAW;AAAA,EACX,MAAM;AAAA,EACN,UAAU;AAAA,EACV,SAAS;AAAA,EACT,MAAM;AAAA,EACN,SAAS;AAAA,EACT,MAAM;AAAA,EACN,MAAM;AAAA,EACN,OAAO;AAAA,EACP,QAAQ;AAAA,EACR,MAAM;AAAA,EACN,QAAQ;AAAA,EACR,YAAY;AAAA,EACZ,SAAS;AAAA,EACT,aAAa;AAAA,EACb,MAAM;AAAA,EACN,OAAO;AAAA,EACP,MAAM;AAAA,EACN,MAAM;AAAA,EACN,OAAO;AAAA,EACP,OAAO;AACT;AAkBO,SAAS,gBAAgB;AAAA,EAC9B,iBAAiB,oBAAI,IAAI;AAC3B,IAAqD,CAAC,GAAU;AAC9D,SAAO;AACT;AAEO,SAAS,kBAAkB,OAA0C;AAC1E,SAAO;AACT;AAEO,SAAS,iBAAiB,OAAc,MAAoC;AACjF,SAAO,kBAAkB,KAAK,EAAE,IAAI,IAAI,KAAK;AAC/C;AAEO,SAAS,QAAQ,QAAe,gBAAgB,GAAG,QAAuC;AAC/F,MAAI,KAAC,8BAAc,MAAM;AAAG,WAAO;AAEnC,UAAQ,OAAO,MAAM;AAAA,IACnB,KAAK,kDAAoB;AACvB,aAAO,IAAI,IAAI,KAAK,EAAE,IAAI,OAAO,QAAQ,MAAM,OAAO,QAAQ,IAAI;AAAA,IAEpE,KAAK,kDAAoB,sBAAsB;AAC7C,YAAM,YAAY,IAAI,IAAI,KAAK;AAE/B,YAAM,UAAU,UAAU,OAAO,OAAO,QAAQ,IAAI;AAEpD,aAAO,UAAU,YAAY;AAAA,IAC/B;AAAA,IAEA;AACE,aAAO;AAAA,EACX;AACF;","names":[]}
+{"version":3,"sources":["../../../../src/state/modules/components-meta.ts"],"sourcesContent":["import { InjectableProps } from '../../runtimes/react/server/injectable-props'\nimport { type Action, type UnknownAction, isKnownAction } from '../actions'\nimport { ReadOnlyActionTypes } from '../actions/internal/read-only-action-types'\n\nexport const ComponentIcon = {\n  Accordion: 'accordion',\n  Audio: 'audio',\n  Billing: 'billing',\n  Bolt: 'bolt',\n  Button: 'button',\n  Card: 'card',\n  Cards: 'cards',\n  Carousel: 'carousel',\n  Chats: 'chats',\n  Code: 'code',\n  Countdown: 'countdown',\n  Cube: 'cube',\n  Database: 'database',\n  Divider: 'divider',\n  Form: 'form',\n  Gallery: 'gallery',\n  Grid: 'grid',\n  Help: 'help',\n  Image: 'image',\n  Layout: 'layout',\n  Lock: 'lock',\n  Marker: 'marker',\n  Navigation: 'navigation',\n  Palette: 'palette',\n  SocialLinks: 'social-links',\n  Star: 'star',\n  Table: 'table',\n  Tabs: 'tabs',\n  Text: 'text',\n  Users: 'users',\n  Video: 'video',\n} as const\n\nexport type ComponentIcon = (typeof ComponentIcon)[keyof typeof ComponentIcon]\n\nexport type ComponentMeta = {\n  label: string\n  icon: ComponentIcon\n  hidden: boolean\n  description?: string\n  builtinSuspense?: boolean\n  unstable_migration?: {\n    replacementType: string\n  }\n  server?: boolean\n  injectedProps?: Record<string, keyof InjectableProps>\n}\n\nexport type State = Map<string, ComponentMeta>\n\nexport function getInitialState({\n  componentsMeta = new Map(),\n}: { componentsMeta?: Map<string, ComponentMeta> } = {}): State {\n  return componentsMeta\n}\n\nexport function getComponentsMeta(state: State): Map<string, ComponentMeta> {\n  return state\n}\n\nexport function getComponentMeta(state: State, type: string): ComponentMeta | null {\n  return getComponentsMeta(state).get(type) ?? null\n}\n\nexport function reducer(state: State = getInitialState(), action: Action | UnknownAction): State {\n  if (!isKnownAction(action)) return state\n\n  switch (action.type) {\n    case ReadOnlyActionTypes.REGISTER_COMPONENT:\n      return new Map(state).set(action.payload.type, action.payload.meta)\n\n    case ReadOnlyActionTypes.UNREGISTER_COMPONENT: {\n      const nextState = new Map(state)\n\n      const deleted = nextState.delete(action.payload.type)\n\n      return deleted ? nextState : state\n    }\n\n    default:\n      return state\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,qBAA+D;AAC/D,oCAAoC;AAE7B,MAAM,gBAAgB;AAAA,EAC3B,WAAW;AAAA,EACX,OAAO;AAAA,EACP,SAAS;AAAA,EACT,MAAM;AAAA,EACN,QAAQ;AAAA,EACR,MAAM;AAAA,EACN,OAAO;AAAA,EACP,UAAU;AAAA,EACV,OAAO;AAAA,EACP,MAAM;AAAA,EACN,WAAW;AAAA,EACX,MAAM;AAAA,EACN,UAAU;AAAA,EACV,SAAS;AAAA,EACT,MAAM;AAAA,EACN,SAAS;AAAA,EACT,MAAM;AAAA,EACN,MAAM;AAAA,EACN,OAAO;AAAA,EACP,QAAQ;AAAA,EACR,MAAM;AAAA,EACN,QAAQ;AAAA,EACR,YAAY;AAAA,EACZ,SAAS;AAAA,EACT,aAAa;AAAA,EACb,MAAM;AAAA,EACN,OAAO;AAAA,EACP,MAAM;AAAA,EACN,MAAM;AAAA,EACN,OAAO;AAAA,EACP,OAAO;AACT;AAmBO,SAAS,gBAAgB;AAAA,EAC9B,iBAAiB,oBAAI,IAAI;AAC3B,IAAqD,CAAC,GAAU;AAC9D,SAAO;AACT;AAEO,SAAS,kBAAkB,OAA0C;AAC1E,SAAO;AACT;AAEO,SAAS,iBAAiB,OAAc,MAAoC;AACjF,SAAO,kBAAkB,KAAK,EAAE,IAAI,IAAI,KAAK;AAC/C;AAEO,SAAS,QAAQ,QAAe,gBAAgB,GAAG,QAAuC;AAC/F,MAAI,KAAC,8BAAc,MAAM;AAAG,WAAO;AAEnC,UAAQ,OAAO,MAAM;AAAA,IACnB,KAAK,kDAAoB;AACvB,aAAO,IAAI,IAAI,KAAK,EAAE,IAAI,OAAO,QAAQ,MAAM,OAAO,QAAQ,IAAI;AAAA,IAEpE,KAAK,kDAAoB,sBAAsB;AAC7C,YAAM,YAAY,IAAI,IAAI,KAAK;AAE/B,YAAM,UAAU,UAAU,OAAO,OAAO,QAAQ,IAAI;AAEpD,aAAO,UAAU,YAAY;AAAA,IAC/B;AAAA,IAEA;AACE,aAAO;AAAA,EACX;AACF;","names":[]}

package/dist/esm/api/graphql-api-client.js

@@ -4,7 +4,7 @@ class MakeswiftGraphQLApiClient {
   graphqlClient;
   constructor({ endpoint }) {
     this.graphqlClient = new GraphQLClient(endpoint, {
-      "makeswift-runtime-version": "0.28.10-canary.5"
+      "makeswift-runtime-version": "0.28.10-canary.7"
     });
   }
   async getUnversionedResources({

package/dist/esm/api/rest-api-client.js

@@ -150,7 +150,7 @@ class MakeswiftRestAPIClient {
     const requestHeaders = new Headers({
       "x-api-key": this.apiKey,
       "makeswift-site-api-key": this.apiKey,
-      "makeswift-runtime-version": "0.28.10-canary.5"
+      "makeswift-runtime-version": "0.28.10-canary.7"
     });
     if (siteVersion?.token) {
       requestUrl.searchParams.set("version", siteVersion.version);

package/dist/esm/api-handler/handlers/manifest.js

@@ -8,7 +8,7 @@ async function manifestHandler(req, { apiKey, manifest }) {
     return ApiResponse.json({ message: "Unauthorized" }, { status: 401 });
   }
   return ApiResponse.json({
-    version: "0.28.10-canary.5",
+    version: "0.28.10-canary.7",
     interactionMode: true,
     clientSideNavigation: false,
     elementFromPoint: false,

package/dist/esm/controls/rich-text/control.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/controls/rich-text/control.ts"],"sourcesContent":["import { Editor } from 'slate'\n\nimport { BuilderEditMode } from '../../state/modules/builder-edit-mode'\n\nimport {\n  ControlInstance,\n  richTextDAOToDTO,\n  type BoxDisplayModel,\n  type RichTextValue,\n} from '@makeswift/controls'\n\ntype ChangeBuilderEditModeMessage = {\n  type: typeof RichTextControl.CHANGE_BUILDER_EDIT_MODE\n  payload: { editMode: BuilderEditMode }\n}\n\ntype InitializeEditorMessage = {\n  type: typeof RichTextControl.INITIALIZE_EDITOR\n  value: RichTextValue\n}\n\ntype ChangeEditorValueMessage = {\n  type: typeof RichTextControl.CHANGE_EDITOR_VALUE\n  value: RichTextValue\n}\n\ntype FocusMessage = {\n  type: typeof RichTextControl.FOCUS\n}\n\ntype BlurMessage = {\n  type: typeof RichTextControl.BLUR\n}\n\ntype UndoMessage = {\n  type: typeof RichTextControl.UNDO\n}\n\ntype RedoMessage = {\n  type: typeof RichTextControl.REDO\n}\n\ntype BoxModelChangeMessage = {\n  type: typeof RichTextControl.CHANGE_BOX_MODEL\n  payload: { boxModel: BoxDisplayModel | null }\n}\n\ntype Message =\n  | ChangeBuilderEditModeMessage\n  | InitializeEditorMessage\n  | ChangeEditorValueMessage\n  | FocusMessage\n  | BlurMessage\n  | UndoMessage\n  | RedoMessage\n  | BoxModelChangeMessage\n\nexport class RichTextControl extends ControlInstance<Message> {\n  static readonly CHANGE_BUILDER_EDIT_MODE = 'CHANGE_BUILDER_EDIT_MODE'\n  static readonly INITIALIZE_EDITOR = 'INITIALIZE_EDITOR'\n  static readonly CHANGE_EDITOR_VALUE = 'CHANGE_EDITOR_VALUE'\n  static readonly FOCUS = 'FOCUS'\n  static readonly BLUR = 'BLUR'\n  static readonly UNDO = 'UNDO'\n  static readonly REDO = 'REDO'\n  static readonly CHANGE_BOX_MODEL = 'CHANGE_BOX_MODEL'\n\n  private editor: Editor | null = null\n\n  recv = (message: Message): void => {\n    if (!this.editor) return\n\n    switch (message.type) {\n      case RichTextControl.CHANGE_BUILDER_EDIT_MODE: {\n        switch (message.payload.editMode) {\n          case BuilderEditMode.BUILD:\n          case BuilderEditMode.INTERACT:\n            this.editor.deselectAndBlur()\n        }\n        break\n      }\n\n      case RichTextControl.FOCUS: {\n        this.editor.focusAndSelectAll()\n        break\n      }\n    }\n  }\n\n  subscribe(_listener: () => void): () => void {\n    // No mutable state, nothing to subscribe to\n    return () => {}\n  }\n\n  isCompositeProp(): boolean {\n    return false\n  }\n\n  children(): ControlInstance[] {\n    return []\n  }\n\n  child(_key: string): ControlInstance | undefined {\n    return undefined\n  }\n\n  resolvesToRenderableNode(): boolean {\n    return true\n  }\n\n  setSlateEditor(editor: Editor) {\n    this.editor = editor\n\n    this.sendMessage({\n      type: RichTextControl.INITIALIZE_EDITOR,\n      value: richTextDAOToDTO(editor.children, editor.selection),\n    })\n\n    const _onChange = editor.onChange\n    this.editor.onChange = options => {\n      _onChange(options)\n\n      // if onChange is local then it will include an operation(s)\n      // that is the only case in which we want to push updates\n      // this prevent infinite loops that can occur when collaborating\n      if (options?.operation != null) {\n        this.sendMessage({\n          type: RichTextControl.CHANGE_EDITOR_VALUE,\n          value: richTextDAOToDTO(editor.children, editor.selection),\n        })\n      }\n    }\n  }\n\n  focus() {\n    this.sendMessage({ type: RichTextControl.FOCUS })\n  }\n\n  blur() {\n    this.sendMessage({ type: RichTextControl.BLUR })\n  }\n\n  undo() {\n    this.sendMessage({ type: RichTextControl.UNDO })\n  }\n\n  redo() {\n    this.sendMessage({ type: RichTextControl.REDO })\n  }\n\n  changeBoxModel(boxModel: BoxDisplayModel | null): void {\n    this.sendMessage({\n      type: RichTextControl.CHANGE_BOX_MODEL,\n      payload: { boxModel },\n    })\n  }\n}\n"],"mappings":"AAEA,SAAS,uBAAuB;AAEhC;AAAA,EACE;AAAA,EACA;AAAA,OAGK;AAgDA,MAAM,wBAAwB,gBAAyB;AAAA,EAC5D,OAAgB,2BAA2B;AAAA,EAC3C,OAAgB,oBAAoB;AAAA,EACpC,OAAgB,sBAAsB;AAAA,EACtC,OAAgB,QAAQ;AAAA,EACxB,OAAgB,OAAO;AAAA,EACvB,OAAgB,OAAO;AAAA,EACvB,OAAgB,OAAO;AAAA,EACvB,OAAgB,mBAAmB;AAAA,EAE3B,SAAwB;AAAA,EAEhC,OAAO,CAAC,YAA2B;AACjC,QAAI,CAAC,KAAK;AAAQ;AAElB,YAAQ,QAAQ,MAAM;AAAA,MACpB,KAAK,gBAAgB,0BAA0B;AAC7C,gBAAQ,QAAQ,QAAQ,UAAU;AAAA,UAChC,KAAK,gBAAgB;AAAA,UACrB,KAAK,gBAAgB;AACnB,iBAAK,OAAO,gBAAgB;AAAA,QAChC;AACA;AAAA,MACF;AAAA,MAEA,KAAK,gBAAgB,OAAO;AAC1B,aAAK,OAAO,kBAAkB;AAC9B;AAAA,MACF;AAAA,IACF;AAAA,EACF;AAAA,EAEA,UAAU,WAAmC;AAE3C,WAAO,MAAM;AAAA,IAAC;AAAA,EAChB;AAAA,EAEA,kBAA2B;AACzB,WAAO;AAAA,EACT;AAAA,EAEA,WAA8B;AAC5B,WAAO,CAAC;AAAA,EACV;AAAA,EAEA,MAAM,MAA2C;AAC/C,WAAO;AAAA,EACT;AAAA,EAEA,2BAAoC;AAClC,WAAO;AAAA,EACT;AAAA,EAEA,eAAe,QAAgB;AAC7B,SAAK,SAAS;AAEd,SAAK,YAAY;AAAA,MACf,MAAM,gBAAgB;AAAA,MACtB,OAAO,iBAAiB,OAAO,UAAU,OAAO,SAAS;AAAA,IAC3D,CAAC;AAED,UAAM,YAAY,OAAO;AACzB,SAAK,OAAO,WAAW,aAAW;AAChC,gBAAU,OAAO;AAKjB,UAAI,SAAS,aAAa,MAAM;AAC9B,aAAK,YAAY;AAAA,UACf,MAAM,gBAAgB;AAAA,UACtB,OAAO,iBAAiB,OAAO,UAAU,OAAO,SAAS;AAAA,QAC3D,CAAC;AAAA,MACH;AAAA,IACF;AAAA,EACF;AAAA,EAEA,QAAQ;AACN,SAAK,YAAY,EAAE,MAAM,gBAAgB,MAAM,CAAC;AAAA,EAClD;AAAA,EAEA,OAAO;AACL,SAAK,YAAY,EAAE,MAAM,gBAAgB,KAAK,CAAC;AAAA,EACjD;AAAA,EAEA,OAAO;AACL,SAAK,YAAY,EAAE,MAAM,gBAAgB,KAAK,CAAC;AAAA,EACjD;AAAA,EAEA,OAAO;AACL,SAAK,YAAY,EAAE,MAAM,gBAAgB,KAAK,CAAC;AAAA,EACjD;AAAA,EAEA,eAAe,UAAwC;AACrD,SAAK,YAAY;AAAA,MACf,MAAM,gBAAgB;AAAA,MACtB,SAAS,EAAE,SAAS;AAAA,IACtB,CAAC;AAAA,EACH;AACF;","names":[]}
+{"version":3,"sources":["../../../../src/controls/rich-text/control.ts"],"sourcesContent":["import { Editor } from 'slate'\n\nimport { BuilderEditMode } from '../../state/modules/builder-edit-mode'\n\nimport {\n  ControlInstance,\n  richTextDAOToDTO,\n  type BoxDisplayModel,\n  type RichTextValue,\n} from '@makeswift/controls'\n\ntype ChangeBuilderEditModeMessage = {\n  type: typeof RichTextControl.CHANGE_BUILDER_EDIT_MODE\n  payload: { editMode: BuilderEditMode }\n}\n\ntype InitializeEditorMessage = {\n  type: typeof RichTextControl.INITIALIZE_EDITOR\n  value: RichTextValue\n}\n\ntype ChangeEditorValueMessage = {\n  type: typeof RichTextControl.CHANGE_EDITOR_VALUE\n  value: RichTextValue\n}\n\ntype FocusMessage = {\n  type: typeof RichTextControl.FOCUS\n}\n\ntype BlurMessage = {\n  type: typeof RichTextControl.BLUR\n}\n\ntype UndoMessage = {\n  type: typeof RichTextControl.UNDO\n}\n\ntype RedoMessage = {\n  type: typeof RichTextControl.REDO\n}\n\ntype BoxModelChangeMessage = {\n  type: typeof RichTextControl.CHANGE_BOX_MODEL\n  payload: { boxModel: BoxDisplayModel | null }\n}\n\ntype Message =\n  | ChangeBuilderEditModeMessage\n  | InitializeEditorMessage\n  | ChangeEditorValueMessage\n  | FocusMessage\n  | BlurMessage\n  | UndoMessage\n  | RedoMessage\n  | BoxModelChangeMessage\n\nexport class RichTextControl extends ControlInstance<Message> {\n  static readonly CHANGE_BUILDER_EDIT_MODE = 'CHANGE_BUILDER_EDIT_MODE'\n  static readonly INITIALIZE_EDITOR = 'INITIALIZE_EDITOR'\n  static readonly CHANGE_EDITOR_VALUE = 'CHANGE_EDITOR_VALUE'\n  static readonly FOCUS = 'FOCUS'\n  static readonly BLUR = 'BLUR'\n  static readonly UNDO = 'UNDO'\n  static readonly REDO = 'REDO'\n  static readonly CHANGE_BOX_MODEL = 'CHANGE_BOX_MODEL'\n\n  private editor: Editor | null = null\n\n  recv = (message: Message): void => {\n    if (!this.editor) return\n\n    switch (message.type) {\n      case RichTextControl.CHANGE_BUILDER_EDIT_MODE: {\n        switch (message.payload.editMode) {\n          case BuilderEditMode.BUILD:\n          case BuilderEditMode.INTERACT:\n            this.editor.deselectAndBlur()\n        }\n        break\n      }\n\n      case RichTextControl.FOCUS: {\n        this.editor.focusAndSelectAll()\n        break\n      }\n    }\n  }\n\n  subscribe(_listener: () => void): () => void {\n    // No mutable state, nothing to subscribe to\n    return () => {}\n  }\n\n  isCompositeProp(): boolean {\n    return false\n  }\n\n  children(): ControlInstance[] {\n    return []\n  }\n\n  child(_key: string): ControlInstance | undefined {\n    return undefined\n  }\n\n  resolvesToRenderableNode(): boolean {\n    return true\n  }\n\n  setSlateEditor(editor: Editor) {\n    this.editor = editor\n\n    this.sendMessage({\n      type: RichTextControl.INITIALIZE_EDITOR,\n      value: richTextDAOToDTO(editor.children, editor.selection),\n    })\n\n    const _onChange = editor.onChange\n    this.editor.onChange = options => {\n      _onChange(options)\n\n      // if onChange is local then it will include an operation(s)\n      // that is the only case in which we want to push updates\n      // this prevents infinite loops that can occur when collaborating\n      if (options?.operation != null) {\n        this.sendMessage({\n          type: RichTextControl.CHANGE_EDITOR_VALUE,\n          value: richTextDAOToDTO(editor.children, editor.selection),\n        })\n      }\n    }\n  }\n\n  focus() {\n    this.sendMessage({ type: RichTextControl.FOCUS })\n  }\n\n  blur() {\n    this.sendMessage({ type: RichTextControl.BLUR })\n  }\n\n  undo() {\n    this.sendMessage({ type: RichTextControl.UNDO })\n  }\n\n  redo() {\n    this.sendMessage({ type: RichTextControl.REDO })\n  }\n\n  changeBoxModel(boxModel: BoxDisplayModel | null): void {\n    this.sendMessage({\n      type: RichTextControl.CHANGE_BOX_MODEL,\n      payload: { boxModel },\n    })\n  }\n}\n"],"mappings":"AAEA,SAAS,uBAAuB;AAEhC;AAAA,EACE;AAAA,EACA;AAAA,OAGK;AAgDA,MAAM,wBAAwB,gBAAyB;AAAA,EAC5D,OAAgB,2BAA2B;AAAA,EAC3C,OAAgB,oBAAoB;AAAA,EACpC,OAAgB,sBAAsB;AAAA,EACtC,OAAgB,QAAQ;AAAA,EACxB,OAAgB,OAAO;AAAA,EACvB,OAAgB,OAAO;AAAA,EACvB,OAAgB,OAAO;AAAA,EACvB,OAAgB,mBAAmB;AAAA,EAE3B,SAAwB;AAAA,EAEhC,OAAO,CAAC,YAA2B;AACjC,QAAI,CAAC,KAAK;AAAQ;AAElB,YAAQ,QAAQ,MAAM;AAAA,MACpB,KAAK,gBAAgB,0BAA0B;AAC7C,gBAAQ,QAAQ,QAAQ,UAAU;AAAA,UAChC,KAAK,gBAAgB;AAAA,UACrB,KAAK,gBAAgB;AACnB,iBAAK,OAAO,gBAAgB;AAAA,QAChC;AACA;AAAA,MACF;AAAA,MAEA,KAAK,gBAAgB,OAAO;AAC1B,aAAK,OAAO,kBAAkB;AAC9B;AAAA,MACF;AAAA,IACF;AAAA,EACF;AAAA,EAEA,UAAU,WAAmC;AAE3C,WAAO,MAAM;AAAA,IAAC;AAAA,EAChB;AAAA,EAEA,kBAA2B;AACzB,WAAO;AAAA,EACT;AAAA,EAEA,WAA8B;AAC5B,WAAO,CAAC;AAAA,EACV;AAAA,EAEA,MAAM,MAA2C;AAC/C,WAAO;AAAA,EACT;AAAA,EAEA,2BAAoC;AAClC,WAAO;AAAA,EACT;AAAA,EAEA,eAAe,QAAgB;AAC7B,SAAK,SAAS;AAEd,SAAK,YAAY;AAAA,MACf,MAAM,gBAAgB;AAAA,MACtB,OAAO,iBAAiB,OAAO,UAAU,OAAO,SAAS;AAAA,IAC3D,CAAC;AAED,UAAM,YAAY,OAAO;AACzB,SAAK,OAAO,WAAW,aAAW;AAChC,gBAAU,OAAO;AAKjB,UAAI,SAAS,aAAa,MAAM;AAC9B,aAAK,YAAY;AAAA,UACf,MAAM,gBAAgB;AAAA,UACtB,OAAO,iBAAiB,OAAO,UAAU,OAAO,SAAS;AAAA,QAC3D,CAAC;AAAA,MACH;AAAA,IACF;AAAA,EACF;AAAA,EAEA,QAAQ;AACN,SAAK,YAAY,EAAE,MAAM,gBAAgB,MAAM,CAAC;AAAA,EAClD;AAAA,EAEA,OAAO;AACL,SAAK,YAAY,EAAE,MAAM,gBAAgB,KAAK,CAAC;AAAA,EACjD;AAAA,EAEA,OAAO;AACL,SAAK,YAAY,EAAE,MAAM,gBAAgB,KAAK,CAAC;AAAA,EACjD;AAAA,EAEA,OAAO;AACL,SAAK,YAAY,EAAE,MAAM,gBAAgB,KAAK,CAAC;AAAA,EACjD;AAAA,EAEA,eAAe,UAAwC;AACrD,SAAK,YAAY;AAAA,MACf,MAAM,gBAAgB;AAAA,MACtB,SAAS,EAAE,SAAS;AAAA,IACtB,CAAC;AAAA,EACH;AACF;","names":[]}

package/dist/esm/next/components/tests/controls/page-control-prop-rendering.js

@@ -1,6 +1,5 @@
 import { jsx, jsxs } from "react/jsx-runtime";
 import { Fragment, forwardRef, useRef, isValidElement, act } from "react";
-import { renderToReadableStream } from "react-dom/server";
 import { JSDOM } from "jsdom";
 import { render, screen } from "@testing-library/react";
 import "@testing-library/jest-dom";
@@ -9,27 +8,13 @@ import { setIsInBuilder } from "../../../../state/actions/internal/read-only-act
 import { MakeswiftComponent } from "../../../../runtimes/react/components/MakeswiftComponent";
 import { Page } from "../../page";
 import { isServer } from "../../../../utils/is-server";
+import { renderToString } from "../../../../runtimes/react/testing/render-to-string";
 import * as Testing from "../../../testing";
 const ROOT_ID = "00000000-0000-0000-0000-000000000000";
 const ELEMENT_ID = "11111111-1111-1111-1111-111111111111";
 const renderProp = (prop) => prop === void 0 ? "undefined" : isValidElement(prop) ? prop : JSON.stringify(prop);
 const propSnapshot = (prop) => prop?.childElementCount ? prop.childNodes : parseStringifiedProp(prop?.textContent ?? "");
 const parseStringifiedProp = (prop) => prop === "undefined" ? void 0 : JSON.parse(prop);
-async function streamToString(stream) {
-  const reader = stream.getReader();
-  const decoder = new TextDecoder();
-  let result = "";
-  while (true) {
-    const { done, value } = await reader.read();
-    if (done)
-      break;
-    result += decoder.decode(value, { stream: true });
-  }
-  return result;
-}
-async function renderToString(element) {
-  return await streamToString(await renderToReadableStream(element));
-}
 async function serverSideRender(children) {
   const serverInsertedCallbacks = [];
   const elementTree = /* @__PURE__ */ jsx(ServerInsertedHTMLContext.Provider, { value: (handler) => serverInsertedCallbacks.push(handler), children });