@makeswift/runtime 0.19.4 → 0.20.0

package/dist/esm/controls/rich-text-v2/translation.js

@@ -1,15 +1,15 @@
 import escapeHtml from "escape-html";
-import { BlockType, InlineType } from "../../slate/types";
 import { Editor, Node, Text, Transforms, createEditor } from "slate";
 import { jsx } from "slate-hyperscript";
 import { parseFragment } from "parse5";
-import { RichTextV2Mode } from "./rich-text-v2";
-import { InlineModePlugin } from "../../slate/InlineModePlugin";
-import { BlockPlugin } from "../../slate/BlockPlugin";
-import { TypographyPlugin } from "../../slate/TypographyPlugin";
-import { TextAlignPlugin } from "../../slate/TextAlignPlugin";
-import { InlinePlugin } from "../../slate/InlinePlugin";
-import { ElementUtils } from "../../slate/utils/element";
+import { Slate } from "@makeswift/controls";
+import { BlockType, InlineType } from "../../slate/types";
+function createEditorWithPlugins(plugins) {
+  return plugins.reduceRight(
+    (editor, plugin) => plugin?.withPlugin?.(editor) ?? editor,
+    createEditor()
+  );
+}
 function pathToString(path) {
   return path.join(":");
 }
@@ -20,20 +20,16 @@ function getDescendantTranslatableData(descendant, path) {
   if (Text.isText(descendant)) {
     return {};
   }
-  switch (descendant.type) {
-    case BlockType.UnorderedList:
-    case BlockType.OrderedList:
-    case BlockType.ListItem:
-      return descendant.children.reduce(
-        (acc, d, j) => ({ ...acc, ...getDescendantTranslatableData(d, [...path, j]) }),
-        {}
-      );
-    default:
-      const text = getInlineOrTextTranslatableData(descendant);
-      if (text == null)
-        return {};
-      return { [pathToString(path)]: text };
+  if (Slate.isList(descendant) || Slate.isListItem(descendant)) {
+    return descendant.children.reduce(
+      (acc, d, j) => ({ ...acc, ...getDescendantTranslatableData(d, [...path, j]) }),
+      {}
+    );
   }
+  const text = getInlineOrTextTranslatableData(descendant);
+  if (text == null)
+    return {};
+  return { [pathToString(path)]: text };
 }
 function getInlineOrTextTranslatableData(descendant, path = []) {
   if (Text.isText(descendant)) {
@@ -60,13 +56,9 @@ function getInlineOrTextTranslatableData(descendant, path = []) {
       return children;
   }
 }
-function getRichTextV2TranslatableData(definition, data) {
-  const plugins = definition?.config?.mode === RichTextV2Mode.Inline ? [InlineModePlugin()] : [BlockPlugin(), TypographyPlugin(), TextAlignPlugin(), InlinePlugin()];
-  const editor = plugins.reduceRight(
-    (editor2, plugin) => plugin?.withPlugin?.(editor2) ?? editor2,
-    createEditor()
-  );
-  editor.children = data.descendants;
+function getTranslatableData(nodes, plugins) {
+  const editor = createEditorWithPlugins(plugins);
+  editor.children = nodes;
   editor.typographyNormalizationDirection = "up";
   Editor.normalize(editor, { force: true });
   return editor.children.reduce(
@@ -84,9 +76,11 @@ function deserializeTranslationHtmlString(el, translationKey) {
       children.push(jsx("text", {}, ""));
     }
     return children;
-  } else if (el.nodeName === "#text" && "value" in el) {
+  }
+  if (el.nodeName === "#text" && "value" in el) {
     return [jsx("text", { translationKey: translationKey ?? void 0 }, el.value)];
-  } else if ("namespaceURI" in el) {
+  }
+  if ("namespaceURI" in el) {
     const translationKey2 = el.attrs.find((a) => a.name === "key")?.value ?? void 0;
     const children = Array.from(el.childNodes).map((element) => deserializeTranslationHtmlString(element, translationKey2)).flat();
     if (children.length === 0) {
@@ -107,17 +101,10 @@ function deserializeTranslationHtmlString(el, translationKey) {
   }
   return [];
 }
-function mergeRichTextV2TranslatedData(definition, data, translatedData) {
-  const plugins = definition?.config?.mode === RichTextV2Mode.Inline ? [InlineModePlugin()] : [BlockPlugin(), TypographyPlugin(), TextAlignPlugin(), InlinePlugin()];
-  const sourceEditor = plugins.reduceRight(
-    (editor, plugin) => plugin?.withPlugin?.(editor) ?? editor,
-    createEditor()
-  );
-  const targetEditor = plugins.reduceRight(
-    (editor, plugin) => plugin?.withPlugin?.(editor) ?? editor,
-    createEditor()
-  );
-  sourceEditor.children = data.descendants;
+function mergeTranslatedNodes(nodes, translatedData, plugins) {
+  const sourceEditor = createEditorWithPlugins(plugins);
+  const targetEditor = createEditorWithPlugins(plugins);
+  sourceEditor.children = nodes;
   sourceEditor.typographyNormalizationDirection = "up";
   Editor.normalize(sourceEditor, { force: true });
   Object.entries(translatedData).reverse().forEach(([blockStringPath, htmlString]) => {
@@ -130,7 +117,7 @@ function mergeRichTextV2TranslatedData(definition, data, translatedData) {
     targetEditor.typographyNormalizationDirection = "neutral";
     Editor.normalize(targetEditor, { force: true });
     for (const [descendant, absolutePathToTargetNode] of Node.descendants(targetEditor)) {
-      if (!Text.isText(descendant) && !ElementUtils.isInline(descendant) || descendant.translationKey == null || descendant.translationKey === "") {
+      if (!Text.isText(descendant) && !Slate.isInline(descendant) || descendant.translationKey == null || descendant.translationKey === "") {
         continue;
       }
       const relativePathToSourceNode = stringToPath(descendant.translationKey);
@@ -140,7 +127,7 @@ function mergeRichTextV2TranslatedData(definition, data, translatedData) {
         const { translationKey, text, ...rest } = sourceNode;
         Transforms.setNodes(targetEditor, rest, { at: absolutePathToTargetNode });
         Transforms.unsetNodes(targetEditor, "translationKey", { at: absolutePathToTargetNode });
-      } else if (ElementUtils.isInline(sourceNode) && ElementUtils.isInline(descendant)) {
+      } else if (Slate.isInline(sourceNode) && Slate.isInline(descendant)) {
         const { translationKey, children, ...rest } = sourceNode;
         Transforms.setNodes(targetEditor, rest, { at: absolutePathToTargetNode });
         Transforms.unsetNodes(targetEditor, "translationKey", { at: absolutePathToTargetNode });
@@ -156,10 +143,10 @@ function mergeRichTextV2TranslatedData(definition, data, translatedData) {
   });
   sourceEditor.typographyNormalizationDirection = "down";
   Editor.normalize(sourceEditor, { force: true });
-  return { ...data, descendants: sourceEditor.children };
+  return sourceEditor.children;
 }
 export {
-  getRichTextV2TranslatableData,
-  mergeRichTextV2TranslatedData
+  getTranslatableData,
+  mergeTranslatedNodes
 };
 //# sourceMappingURL=translation.js.map

package/dist/esm/controls/rich-text-v2/translation.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/controls/rich-text-v2/translation.ts"],"sourcesContent":["import escapeHtml from 'escape-html'\nimport { BlockType, InlineType } from '../../slate/types'\nimport { Descendant, Editor, Element, Node, Text, Transforms, createEditor } from 'slate'\nimport { jsx } from 'slate-hyperscript'\nimport { parseFragment } from 'parse5'\nimport { ChildNode, DocumentFragment } from 'parse5/dist/tree-adapters/default'\n\nimport { RichTextV2ControlData, RichTextV2ControlDefinition, RichTextV2Mode } from './rich-text-v2'\nimport { RichTextV2Plugin } from './plugin'\nimport { InlineModePlugin } from '../../slate/InlineModePlugin'\nimport { BlockPlugin } from '../../slate/BlockPlugin'\nimport { TypographyPlugin } from '../../slate/TypographyPlugin'\nimport { TextAlignPlugin } from '../../slate/TextAlignPlugin'\nimport { InlinePlugin } from '../../slate/InlinePlugin'\nimport { MakeswiftEditor } from '../../slate/types'\nimport { ElementUtils } from '../../slate/utils/element'\nimport { TranslationDto } from '../../state/react-page'\n\nfunction pathToString(path: number[]): string {\n  return path.join(':')\n}\n\nfunction stringToPath(s: string): number[] {\n  return s.split(':').map(a => parseInt(a))\n}\n\nfunction getDescendantTranslatableData(descendant: Descendant, path: number[]): TranslationDto {\n  if (Text.isText(descendant)) {\n    return {}\n  }\n\n  switch (descendant.type) {\n    case BlockType.UnorderedList:\n    case BlockType.OrderedList:\n    case BlockType.ListItem:\n      return descendant.children.reduce(\n        (acc, d, j) => ({ ...acc, ...getDescendantTranslatableData(d, [...path, j]) }),\n        {},\n      )\n\n    default:\n      const text = getInlineOrTextTranslatableData(descendant)\n\n      if (text == null) return {}\n\n      return { [pathToString(path)]: text }\n  }\n}\n\nfunction getInlineOrTextTranslatableData(\n  descendant: Descendant,\n  path: number[] = [],\n): string | null {\n  if (Text.isText(descendant)) {\n    let string = escapeHtml(descendant.text)\n\n    if (string === '') return null\n\n    if (descendant.typography === undefined) return string\n\n    return `<span key=\"${pathToString(path)}\">${string}</span>`\n  }\n\n  const children = descendant.children\n    .map((child: Descendant, i: number) => getInlineOrTextTranslatableData(child, [...path, i]))\n    .join('')\n\n  if (children === '') return null\n\n  switch (descendant.type) {\n    case InlineType.Link:\n      return `<a key=\"${pathToString(path)}\">${children}</a>`\n    case InlineType.SuperScript:\n      return `<sup key=\"${pathToString(path)}\">${children}</sup>`\n    case InlineType.SubScript:\n      return `<sub key=\"${pathToString(path)}\">${children}</sub>`\n    case InlineType.Code:\n      return `<code key=\"${pathToString(path)}\">${children}</code>`\n    default:\n      return children\n  }\n}\n\nexport function getRichTextV2TranslatableData(\n  definition: RichTextV2ControlDefinition,\n  data: RichTextV2ControlData,\n): Record<string, string> {\n  const plugins: RichTextV2Plugin[] =\n    definition?.config?.mode === RichTextV2Mode.Inline\n      ? [InlineModePlugin()]\n      : [BlockPlugin(), TypographyPlugin(), TextAlignPlugin(), InlinePlugin()]\n\n  const editor: MakeswiftEditor = plugins.reduceRight(\n    (editor, plugin) => plugin?.withPlugin?.(editor) ?? editor,\n    createEditor(),\n  )\n\n  editor.children = data.descendants\n  editor.typographyNormalizationDirection = 'up'\n  Editor.normalize(editor, { force: true })\n\n  return editor.children.reduce(\n    (acc, descendant: Descendant, i) => ({\n      ...acc,\n      ...getDescendantTranslatableData(descendant, [i]),\n    }),\n    {},\n  )\n}\n\nfunction deserializeTranslationHtmlString(\n  el: ChildNode | DocumentFragment,\n  translationKey?: string,\n): Descendant[] {\n  if (el.nodeName === '#document-fragment') {\n    const children = Array.from(el.childNodes)\n      .map(element => deserializeTranslationHtmlString(element))\n      .flat()\n\n    if (children.length === 0) {\n      children.push(jsx('text', {}, ''))\n    }\n\n    return children\n  } else if (el.nodeName === '#text' && 'value' in el) {\n    return [jsx('text', { translationKey: translationKey ?? undefined }, el.value)]\n  } else if ('namespaceURI' in el) {\n    const translationKey = el.attrs.find(a => a.name === 'key')?.value ?? undefined\n    const children = Array.from(el.childNodes)\n      .map(element => deserializeTranslationHtmlString(element, translationKey))\n      .flat()\n\n    if (children.length === 0) {\n      children.push(jsx('text', {}, ''))\n    }\n\n    switch (el.nodeName) {\n      case 'code':\n        return [jsx('element', { type: InlineType.Code, translationKey }, children)]\n      case 'sub':\n        return [jsx('element', { type: InlineType.SubScript, translationKey }, children)]\n      case 'sup':\n        return [jsx('element', { type: InlineType.SuperScript, translationKey }, children)]\n      case 'a':\n        return [jsx('element', { type: InlineType.Link, translationKey }, children)]\n      default:\n        return children\n    }\n  }\n  return []\n}\n\nexport type RichTextV2ControlTranslationDto = Record<string, string>\n\nexport function mergeRichTextV2TranslatedData(\n  definition: RichTextV2ControlDefinition,\n  data: RichTextV2ControlData,\n  translatedData: RichTextV2ControlTranslationDto,\n): RichTextV2ControlData {\n  const plugins: RichTextV2Plugin[] =\n    definition?.config?.mode === RichTextV2Mode.Inline\n      ? [InlineModePlugin()]\n      : [BlockPlugin(), TypographyPlugin(), TextAlignPlugin(), InlinePlugin()]\n\n  const sourceEditor: MakeswiftEditor = plugins.reduceRight(\n    (editor, plugin) => plugin?.withPlugin?.(editor) ?? editor,\n    createEditor(),\n  )\n\n  const targetEditor: MakeswiftEditor = plugins.reduceRight(\n    (editor, plugin) => plugin?.withPlugin?.(editor) ?? editor,\n    createEditor(),\n  )\n\n  sourceEditor.children = data.descendants\n  sourceEditor.typographyNormalizationDirection = 'up'\n  Editor.normalize(sourceEditor, { force: true })\n\n  Object.entries(translatedData)\n    .reverse()\n    .forEach(([blockStringPath, htmlString]) => {\n      const blockPath = stringToPath(blockStringPath)\n      if (blockPath.length === 0) return\n\n      const html = parseFragment(htmlString)\n      const inlineDescendants = deserializeTranslationHtmlString(html)\n\n      targetEditor.children = [{ type: BlockType.Default, children: inlineDescendants }]\n\n      targetEditor.typographyNormalizationDirection = 'neutral'\n      Editor.normalize(targetEditor, { force: true })\n\n      for (const [descendant, absolutePathToTargetNode] of Node.descendants(targetEditor)) {\n        if (\n          (!Text.isText(descendant) && !ElementUtils.isInline(descendant)) ||\n          descendant.translationKey == null ||\n          descendant.translationKey === ''\n        ) {\n          continue\n        }\n\n        const relativePathToSourceNode = stringToPath(descendant.translationKey)\n\n        const absolutePathToSourceNode = [...blockPath, ...relativePathToSourceNode]\n\n        const [sourceNode] = Editor.node(sourceEditor, absolutePathToSourceNode)\n\n        if (Text.isText(sourceNode) && Text.isText(descendant)) {\n          const { translationKey, text, ...rest } = sourceNode\n          Transforms.setNodes(targetEditor, rest, { at: absolutePathToTargetNode })\n          Transforms.unsetNodes(targetEditor, 'translationKey', { at: absolutePathToTargetNode })\n        } else if (ElementUtils.isInline(sourceNode) && ElementUtils.isInline(descendant)) {\n          const { translationKey, children, ...rest } = sourceNode\n          Transforms.setNodes(targetEditor, rest, { at: absolutePathToTargetNode })\n          Transforms.unsetNodes(targetEditor, 'translationKey', { at: absolutePathToTargetNode })\n        }\n      }\n      const translatedChildren = (targetEditor.children.at(0) as Element)?.children\n\n      Editor.withoutNormalizing(sourceEditor, () => {\n        Array.from(Node.children(sourceEditor, blockPath))\n          .reverse()\n          .forEach(([_, path]) => {\n            Transforms.removeNodes(sourceEditor, { at: path })\n          })\n\n        Transforms.insertNodes(sourceEditor, translatedChildren, { at: [...blockPath, 0] })\n      })\n    })\n\n  sourceEditor.typographyNormalizationDirection = 'down'\n  Editor.normalize(sourceEditor, { force: true })\n\n  return { ...data, descendants: sourceEditor.children }\n}\n"],"mappings":"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","names":["editor","translationKey"]}
+{"version":3,"sources":["../../../../src/controls/rich-text-v2/translation.ts"],"sourcesContent":["import escapeHtml from 'escape-html'\nimport { Descendant, Editor, Element, Node, Text, Transforms, createEditor } from 'slate'\nimport { jsx } from 'slate-hyperscript'\nimport { parseFragment } from 'parse5'\nimport { ChildNode, DocumentFragment } from 'parse5/dist/tree-adapters/default'\n\nimport { type TranslationDto, Slate } from '@makeswift/controls'\n\nimport { RichTextV2Plugin } from './plugin'\nimport { type MakeswiftEditor, BlockType, InlineType } from '../../slate/types'\n\nfunction createEditorWithPlugins(plugins: RichTextV2Plugin[]): MakeswiftEditor {\n  return plugins.reduceRight(\n    (editor, plugin) => plugin?.withPlugin?.(editor) ?? editor,\n    createEditor(),\n  )\n}\n\nfunction pathToString(path: number[]): string {\n  return path.join(':')\n}\n\nfunction stringToPath(s: string): number[] {\n  return s.split(':').map(a => parseInt(a))\n}\n\nfunction getDescendantTranslatableData(descendant: Descendant, path: number[]): TranslationDto {\n  if (Text.isText(descendant)) {\n    return {}\n  }\n\n  if (Slate.isList(descendant) || Slate.isListItem(descendant)) {\n    return descendant.children.reduce(\n      (acc, d, j) => ({ ...acc, ...getDescendantTranslatableData(d, [...path, j]) }),\n      {},\n    )\n  }\n\n  const text = getInlineOrTextTranslatableData(descendant)\n  if (text == null) return {}\n\n  return { [pathToString(path)]: text }\n}\n\nfunction getInlineOrTextTranslatableData(\n  descendant: Descendant,\n  path: number[] = [],\n): string | null {\n  if (Text.isText(descendant)) {\n    let string = escapeHtml(descendant.text)\n\n    if (string === '') return null\n\n    if (descendant.typography === undefined) return string\n\n    return `<span key=\"${pathToString(path)}\">${string}</span>`\n  }\n\n  const children = descendant.children\n    .map((child: Descendant, i: number) => getInlineOrTextTranslatableData(child, [...path, i]))\n    .join('')\n\n  if (children === '') return null\n\n  switch (descendant.type) {\n    case InlineType.Link:\n      return `<a key=\"${pathToString(path)}\">${children}</a>`\n\n    case InlineType.SuperScript:\n      return `<sup key=\"${pathToString(path)}\">${children}</sup>`\n\n    case InlineType.SubScript:\n      return `<sub key=\"${pathToString(path)}\">${children}</sub>`\n\n    case InlineType.Code:\n      return `<code key=\"${pathToString(path)}\">${children}</code>`\n\n    default:\n      return children\n  }\n}\n\nexport type RichTextTranslationDto = Record<string, string>\n\nexport function getTranslatableData(\n  nodes: Slate.Descendant[],\n  plugins: RichTextV2Plugin[],\n): RichTextTranslationDto {\n  const editor = createEditorWithPlugins(plugins)\n\n  editor.children = nodes\n  editor.typographyNormalizationDirection = 'up'\n  Editor.normalize(editor, { force: true })\n\n  return editor.children.reduce(\n    (acc, descendant: Descendant, i) => ({\n      ...acc,\n      ...getDescendantTranslatableData(descendant, [i]),\n    }),\n    {},\n  )\n}\n\nfunction deserializeTranslationHtmlString(\n  el: ChildNode | DocumentFragment,\n  translationKey?: string,\n): Descendant[] {\n  if (el.nodeName === '#document-fragment') {\n    const children = Array.from(el.childNodes)\n      .map(element => deserializeTranslationHtmlString(element))\n      .flat()\n\n    if (children.length === 0) {\n      children.push(jsx('text', {}, ''))\n    }\n\n    return children\n  }\n\n  if (el.nodeName === '#text' && 'value' in el) {\n    return [jsx('text', { translationKey: translationKey ?? undefined }, el.value)]\n  }\n\n  if ('namespaceURI' in el) {\n    const translationKey = el.attrs.find(a => a.name === 'key')?.value ?? undefined\n    const children = Array.from(el.childNodes)\n      .map(element => deserializeTranslationHtmlString(element, translationKey))\n      .flat()\n\n    if (children.length === 0) {\n      children.push(jsx('text', {}, ''))\n    }\n\n    switch (el.nodeName) {\n      case 'code':\n        return [jsx('element', { type: InlineType.Code, translationKey }, children)]\n\n      case 'sub':\n        return [jsx('element', { type: InlineType.SubScript, translationKey }, children)]\n\n      case 'sup':\n        return [jsx('element', { type: InlineType.SuperScript, translationKey }, children)]\n\n      case 'a':\n        return [jsx('element', { type: InlineType.Link, translationKey }, children)]\n\n      default:\n        return children\n    }\n  }\n\n  return []\n}\n\nexport function mergeTranslatedNodes(\n  nodes: Slate.Descendant[],\n  translatedData: RichTextTranslationDto,\n  plugins: RichTextV2Plugin[],\n): Slate.Descendant[] {\n  const sourceEditor = createEditorWithPlugins(plugins)\n  const targetEditor = createEditorWithPlugins(plugins)\n\n  sourceEditor.children = nodes\n  sourceEditor.typographyNormalizationDirection = 'up'\n  Editor.normalize(sourceEditor, { force: true })\n\n  Object.entries(translatedData)\n    .reverse()\n    .forEach(([blockStringPath, htmlString]) => {\n      const blockPath = stringToPath(blockStringPath)\n      if (blockPath.length === 0) return\n\n      const html = parseFragment(htmlString)\n      const inlineDescendants = deserializeTranslationHtmlString(html)\n\n      targetEditor.children = [{ type: BlockType.Default, children: inlineDescendants }]\n\n      targetEditor.typographyNormalizationDirection = 'neutral'\n      Editor.normalize(targetEditor, { force: true })\n\n      for (const [descendant, absolutePathToTargetNode] of Node.descendants(targetEditor)) {\n        if (\n          (!Text.isText(descendant) && !Slate.isInline(descendant)) ||\n          descendant.translationKey == null ||\n          descendant.translationKey === ''\n        ) {\n          continue\n        }\n\n        const relativePathToSourceNode = stringToPath(descendant.translationKey)\n\n        const absolutePathToSourceNode = [...blockPath, ...relativePathToSourceNode]\n\n        const [sourceNode] = Editor.node(sourceEditor, absolutePathToSourceNode)\n\n        if (Text.isText(sourceNode) && Text.isText(descendant)) {\n          const { translationKey, text, ...rest } = sourceNode\n          Transforms.setNodes(targetEditor, rest, { at: absolutePathToTargetNode })\n          Transforms.unsetNodes(targetEditor, 'translationKey', { at: absolutePathToTargetNode })\n        } else if (Slate.isInline(sourceNode) && Slate.isInline(descendant)) {\n          const { translationKey, children, ...rest } = sourceNode\n          Transforms.setNodes(targetEditor, rest, { at: absolutePathToTargetNode })\n          Transforms.unsetNodes(targetEditor, 'translationKey', { at: absolutePathToTargetNode })\n        }\n      }\n      const translatedChildren = (targetEditor.children.at(0) as Element)?.children\n\n      Editor.withoutNormalizing(sourceEditor, () => {\n        Array.from(Node.children(sourceEditor, blockPath))\n          .reverse()\n          .forEach(([_, path]) => {\n            Transforms.removeNodes(sourceEditor, { at: path })\n          })\n\n        Transforms.insertNodes(sourceEditor, translatedChildren, { at: [...blockPath, 0] })\n      })\n    })\n\n  sourceEditor.typographyNormalizationDirection = 'down'\n  Editor.normalize(sourceEditor, { force: true })\n\n  return sourceEditor.children\n}\n"],"mappings":"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","names":["translationKey"]}

package/dist/esm/controls/slot.js

@@ -1,64 +1,23 @@
-import { PropController } from "../prop-controllers/base";
 import {
-  isElementReference
-} from "../state/react-page";
-const SlotControlType = "makeswift::controls::slot";
-function Slot() {
-  return { type: SlotControlType };
+  SlotDefinition as BaseSlotDefinition,
+  SlotControl
+} from "@makeswift/controls";
+class BaseDefinition extends BaseSlotDefinition {
 }
-const SlotControlMessageType = {
-  CONTAINER_BOX_MODEL_CHANGE: "makeswift::controls::slot::message::container-box-model-change",
-  ITEM_BOX_MODEL_CHANGE: "makeswift::controls::slot::message::item-box-model-change"
-};
-class SlotControl extends PropController {
-  recv = () => {
-  };
-  changeContainerBoxModel(boxModel) {
-    this.send({ type: SlotControlMessageType.CONTAINER_BOX_MODEL_CHANGE, payload: { boxModel } });
-  }
-  changeItemBoxModel(index, boxModel) {
-    this.send({ type: SlotControlMessageType.ITEM_BOX_MODEL_CHANGE, payload: { index, boxModel } });
+class SlotDefinition extends BaseDefinition {
+  static deserialize(data) {
+    if (data.type !== SlotDefinition.type) {
+      throw new Error(`Slot: expected type ${SlotDefinition.type}, got ${data.type}`);
+    }
+    return Slot();
   }
 }
-function copySlotData(value, context) {
-  if (value == null)
-    return value;
-  return {
-    ...value,
-    elements: value.elements.map((element) => context.copyElement(element))
-  };
-}
-function mergeSlotData(base = { columns: [], elements: [] }, override = { columns: [], elements: [] }, context) {
-  const mergedColumns = base.columns;
-  const mergedElements = base.elements.flatMap((baseElement) => {
-    const overrideElement = override.elements.find(
-      (e) => baseElement.type === e.type && baseElement.key === e.key
-    );
-    if (overrideElement == null)
-      return [baseElement];
-    if (overrideElement.deleted)
-      return [];
-    if (isElementReference(overrideElement))
-      return [overrideElement];
-    if (isElementReference(baseElement))
-      return [baseElement];
-    return context.mergeElement(baseElement, overrideElement);
-  });
-  return { columns: mergedColumns, elements: mergedElements };
-}
-function mergeSlotControlTranslatedData(data, context) {
-  return {
-    ...data,
-    elements: data.elements.map((element) => context.mergeTranslatedData(element))
-  };
+function Slot() {
+  return new SlotDefinition();
 }
 export {
   Slot,
   SlotControl,
-  SlotControlMessageType,
-  SlotControlType,
-  copySlotData,
-  mergeSlotControlTranslatedData,
-  mergeSlotData
+  SlotDefinition
 };
 //# sourceMappingURL=slot.js.map

package/dist/esm/controls/slot.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/controls/slot.ts"],"sourcesContent":["import { ResponsiveValue } from '@makeswift/controls'\nimport { PropController } from '../prop-controllers/base'\nimport { BoxModel } from '../state/modules/box-models'\nimport {\n  CopyContext,\n  Element,\n  isElementReference,\n  MergeContext,\n  MergeTranslatableDataContext,\n} from '../state/react-page'\n\ntype SlotControlColumnData = { count: number; spans: number[][] }\n\nexport type SlotControlData = {\n  elements: (Element & { deleted?: boolean })[]\n  columns: ResponsiveValue<SlotControlColumnData>\n}\n\nexport const SlotControlType = 'makeswift::controls::slot'\n\nexport type SlotControlDefinition = {\n  type: typeof SlotControlType\n}\n\nexport function Slot(): SlotControlDefinition {\n  return { type: SlotControlType }\n}\n\nexport const SlotControlMessageType = {\n  CONTAINER_BOX_MODEL_CHANGE: 'makeswift::controls::slot::message::container-box-model-change',\n  ITEM_BOX_MODEL_CHANGE: 'makeswift::controls::slot::message::item-box-model-change',\n} as const\n\ntype SlotControlContainerBoxModelChangeMessage = {\n  type: typeof SlotControlMessageType.CONTAINER_BOX_MODEL_CHANGE\n  payload: { boxModel: BoxModel | null }\n}\n\ntype SlotControlItemBoxModelChangeMessage = {\n  type: typeof SlotControlMessageType.ITEM_BOX_MODEL_CHANGE\n  payload: { index: number; boxModel: BoxModel | null }\n}\n\nexport type SlotControlMessage =\n  | SlotControlContainerBoxModelChangeMessage\n  | SlotControlItemBoxModelChangeMessage\n\nexport class SlotControl extends PropController<SlotControlMessage> {\n  recv = () => {}\n\n  changeContainerBoxModel(boxModel: BoxModel | null): void {\n    this.send({ type: SlotControlMessageType.CONTAINER_BOX_MODEL_CHANGE, payload: { boxModel } })\n  }\n\n  changeItemBoxModel(index: number, boxModel: BoxModel | null): void {\n    this.send({ type: SlotControlMessageType.ITEM_BOX_MODEL_CHANGE, payload: { index, boxModel } })\n  }\n}\n\nexport function copySlotData(\n  value: SlotControlData | undefined,\n  context: CopyContext,\n): SlotControlData | undefined {\n  if (value == null) return value\n\n  return {\n    ...value,\n    elements: value.elements.map(element => context.copyElement(element)),\n  }\n}\n\n/**\n * @todo\n * - Inserting elements\n * - Moving elements\n * - Merging column data\n */\nexport function mergeSlotData(\n  base: SlotControlData | undefined = { columns: [], elements: [] },\n  override: SlotControlData | undefined = { columns: [], elements: [] },\n  context: MergeContext,\n): SlotControlData {\n  const mergedColumns = base.columns\n  const mergedElements = base.elements.flatMap(baseElement => {\n    const overrideElement = override.elements.find(\n      e => baseElement.type === e.type && baseElement.key === e.key,\n    )\n\n    if (overrideElement == null) return [baseElement]\n\n    if (overrideElement.deleted) return []\n\n    if (isElementReference(overrideElement)) return [overrideElement]\n\n    if (isElementReference(baseElement)) return [baseElement]\n\n    return context.mergeElement(baseElement, overrideElement)\n  })\n\n  return { columns: mergedColumns, elements: mergedElements }\n}\n\nexport function mergeSlotControlTranslatedData(\n  data: SlotControlData,\n  context: MergeTranslatableDataContext,\n) {\n  return {\n    ...data,\n    elements: data.elements.map(element => context.mergeTranslatedData(element)),\n  }\n}\n"],"mappings":"AACA,SAAS,sBAAsB;AAE/B;AAAA,EAGE;AAAA,OAGK;AASA,MAAM,kBAAkB;AAMxB,SAAS,OAA8B;AAC5C,SAAO,EAAE,MAAM,gBAAgB;AACjC;AAEO,MAAM,yBAAyB;AAAA,EACpC,4BAA4B;AAAA,EAC5B,uBAAuB;AACzB;AAgBO,MAAM,oBAAoB,eAAmC;AAAA,EAClE,OAAO,MAAM;AAAA,EAAC;AAAA,EAEd,wBAAwB,UAAiC;AACvD,SAAK,KAAK,EAAE,MAAM,uBAAuB,4BAA4B,SAAS,EAAE,SAAS,EAAE,CAAC;AAAA,EAC9F;AAAA,EAEA,mBAAmB,OAAe,UAAiC;AACjE,SAAK,KAAK,EAAE,MAAM,uBAAuB,uBAAuB,SAAS,EAAE,OAAO,SAAS,EAAE,CAAC;AAAA,EAChG;AACF;AAEO,SAAS,aACd,OACA,SAC6B;AAC7B,MAAI,SAAS;AAAM,WAAO;AAE1B,SAAO;AAAA,IACL,GAAG;AAAA,IACH,UAAU,MAAM,SAAS,IAAI,aAAW,QAAQ,YAAY,OAAO,CAAC;AAAA,EACtE;AACF;AAQO,SAAS,cACd,OAAoC,EAAE,SAAS,CAAC,GAAG,UAAU,CAAC,EAAE,GAChE,WAAwC,EAAE,SAAS,CAAC,GAAG,UAAU,CAAC,EAAE,GACpE,SACiB;AACjB,QAAM,gBAAgB,KAAK;AAC3B,QAAM,iBAAiB,KAAK,SAAS,QAAQ,iBAAe;AAC1D,UAAM,kBAAkB,SAAS,SAAS;AAAA,MACxC,OAAK,YAAY,SAAS,EAAE,QAAQ,YAAY,QAAQ,EAAE;AAAA,IAC5D;AAEA,QAAI,mBAAmB;AAAM,aAAO,CAAC,WAAW;AAEhD,QAAI,gBAAgB;AAAS,aAAO,CAAC;AAErC,QAAI,mBAAmB,eAAe;AAAG,aAAO,CAAC,eAAe;AAEhE,QAAI,mBAAmB,WAAW;AAAG,aAAO,CAAC,WAAW;AAExD,WAAO,QAAQ,aAAa,aAAa,eAAe;AAAA,EAC1D,CAAC;AAED,SAAO,EAAE,SAAS,eAAe,UAAU,eAAe;AAC5D;AAEO,SAAS,+BACd,MACA,SACA;AACA,SAAO;AAAA,IACL,GAAG;AAAA,IACH,UAAU,KAAK,SAAS,IAAI,aAAW,QAAQ,oBAAoB,OAAO,CAAC;AAAA,EAC7E;AACF;","names":[]}
+{"version":3,"sources":["../../../src/controls/slot.ts"],"sourcesContent":["import { ReactNode } from 'react'\nimport {\n  SlotDefinition as BaseSlotDefinition,\n  SlotControl,\n  type DeserializedRecord,\n} from '@makeswift/controls'\n\nabstract class BaseDefinition extends BaseSlotDefinition<ReactNode> {}\n\nexport class SlotDefinition extends BaseDefinition {\n  static deserialize(data: DeserializedRecord): SlotDefinition {\n    if (data.type !== SlotDefinition.type) {\n      throw new Error(`Slot: expected type ${SlotDefinition.type}, got ${data.type}`)\n    }\n\n    return Slot()\n  }\n}\n\nexport function Slot(): SlotDefinition {\n  return new SlotDefinition()\n}\n\nexport { SlotControl }\n"],"mappings":"AACA;AAAA,EACE,kBAAkB;AAAA,EAClB;AAAA,OAEK;AAEP,MAAe,uBAAuB,mBAA8B;AAAC;AAE9D,MAAM,uBAAuB,eAAe;AAAA,EACjD,OAAO,YAAY,MAA0C;AAC3D,QAAI,KAAK,SAAS,eAAe,MAAM;AACrC,YAAM,IAAI,MAAM,uBAAuB,eAAe,IAAI,SAAS,KAAK,IAAI,EAAE;AAAA,IAChF;AAEA,WAAO,KAAK;AAAA,EACd;AACF;AAEO,SAAS,OAAuB;AACrC,SAAO,IAAI,eAAe;AAC5B;","names":[]}

package/dist/esm/controls/style-v2/index.js

@@ -0,0 +1,2 @@
+export * from "./style-v2";
+//# sourceMappingURL=index.js.map

package/dist/esm/controls/style-v2/index.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../src/controls/style-v2/index.ts"],"sourcesContent":["export * from './style-v2'\n"],"mappings":"AAAA,cAAc;","names":[]}

package/dist/esm/controls/style-v2/style-v2.js

@@ -0,0 +1,28 @@
+import {
+  SerializationSchema,
+  StyleV2Definition as BaseStyleV2Definition,
+  StyleV2Control
+} from "@makeswift/controls";
+class StyleV2Definition extends BaseStyleV2Definition {
+  static deserialize(data, deserializeCallback) {
+    if (data.type !== StyleV2Definition.type) {
+      throw new Error(`StyleV2: expected type ${StyleV2Definition.type}, got ${data.type}`);
+    }
+    const {
+      config: { type, ...config }
+    } = StyleV2Definition.schema({
+      typeDef: SerializationSchema.deserializedRecord
+    }).definition.parse(data);
+    const typeDef = deserializeCallback(type);
+    return unstable_StyleV2({ type: typeDef, ...config });
+  }
+}
+function unstable_StyleV2(config) {
+  return new StyleV2Definition(config);
+}
+export {
+  StyleV2Control,
+  StyleV2Definition,
+  unstable_StyleV2
+};
+//# sourceMappingURL=style-v2.js.map

package/dist/esm/controls/style-v2/style-v2.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../src/controls/style-v2/style-v2.ts"],"sourcesContent":["import {\n  ControlDefinition,\n  SerializationSchema,\n  StyleV2Definition as BaseStyleV2Definition,\n  StyleV2PropDefinition,\n  StyleV2Control,\n  type StyleV2Config,\n  type DeserializedRecord,\n} from '@makeswift/controls'\n\nimport { CSSObject } from '@emotion/serialize'\n\ntype PropDefinition = StyleV2PropDefinition\ntype Config<Prop extends PropDefinition> = StyleV2Config<Prop, CSSObject>\n\nexport class StyleV2Definition<\n  Prop extends PropDefinition = PropDefinition,\n> extends BaseStyleV2Definition<Prop, CSSObject> {\n  static deserialize(\n    data: DeserializedRecord,\n    deserializeCallback: (r: DeserializedRecord) => ControlDefinition,\n  ): StyleV2Definition {\n    if (data.type !== StyleV2Definition.type) {\n      throw new Error(`StyleV2: expected type ${StyleV2Definition.type}, got ${data.type}`)\n    }\n\n    const {\n      config: { type, ...config },\n    } = StyleV2Definition.schema({\n      typeDef: SerializationSchema.deserializedRecord,\n    }).definition.parse(data)\n\n    const typeDef = deserializeCallback(type)\n\n    return unstable_StyleV2({ type: typeDef, ...config })\n  }\n}\n\nexport function unstable_StyleV2<Prop extends PropDefinition>(\n  config: Config<Prop>,\n): StyleV2Definition<Prop> {\n  return new StyleV2Definition(config)\n}\n\nexport { StyleV2Control }\n"],"mappings":"AAAA;AAAA,EAEE;AAAA,EACA,qBAAqB;AAAA,EAErB;AAAA,OAGK;AAOA,MAAM,0BAEH,sBAAuC;AAAA,EAC/C,OAAO,YACL,MACA,qBACmB;AACnB,QAAI,KAAK,SAAS,kBAAkB,MAAM;AACxC,YAAM,IAAI,MAAM,0BAA0B,kBAAkB,IAAI,SAAS,KAAK,IAAI,EAAE;AAAA,IACtF;AAEA,UAAM;AAAA,MACJ,QAAQ,EAAE,MAAM,GAAG,OAAO;AAAA,IAC5B,IAAI,kBAAkB,OAAO;AAAA,MAC3B,SAAS,oBAAoB;AAAA,IAC/B,CAAC,EAAE,WAAW,MAAM,IAAI;AAExB,UAAM,UAAU,oBAAoB,IAAI;AAExC,WAAO,iBAAiB,EAAE,MAAM,SAAS,GAAG,OAAO,CAAC;AAAA,EACtD;AACF;AAEO,SAAS,iBACd,QACyB;AACzB,SAAO,IAAI,kBAAkB,MAAM;AACrC;","names":[]}

package/dist/esm/core/index.js

@@ -0,0 +1,11 @@
+import {
+  ControlDefinition,
+  ControlInstance,
+  DefaultControlInstance
+} from "@makeswift/controls";
+export {
+  ControlDefinition,
+  ControlInstance,
+  DefaultControlInstance
+};
+//# sourceMappingURL=index.js.map

package/dist/esm/core/index.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/core/index.ts"],"sourcesContent":["export {\n  type Data,\n  type DataType,\n  type ValueType,\n  type ResolvedValueType,\n  type ControlMessage,\n  type ReplacementContext,\n  type SendMessageType,\n  ControlDefinition,\n  ControlInstance,\n  DefaultControlInstance,\n} from '@makeswift/controls'\n"],"mappings":"AAAA;AAAA,EAQE;AAAA,EACA;AAAA,EACA;AAAA,OACK;","names":[]}

package/dist/esm/jest-setup.js

@@ -5,6 +5,9 @@ beforeAll(() => server.listen());
 afterEach(() => server.resetHandlers());
 afterAll(() => server.close());
 expect.extend(matchers);
+jest.mock("uuid", () => ({
+  v4: jest.fn(() => "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx")
+}));
 if (typeof window !== "undefined") {
   Object.defineProperty(window, "matchMedia", {
     writable: true,

package/dist/esm/jest-setup.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/jest-setup.ts"],"sourcesContent":["import '@testing-library/jest-dom'\nimport { matchers } from '@emotion/jest'\nimport { server } from './mocks/server'\n\nbeforeAll(() => server.listen())\nafterEach(() => server.resetHandlers())\nafterAll(() => server.close())\n\nexpect.extend(matchers)\n\nif (typeof window !== 'undefined') {\n  Object.defineProperty(window, 'matchMedia', {\n    writable: true,\n    value: jest.fn().mockImplementation(query => ({\n      matches: false,\n      media: query,\n      onchange: null,\n      addListener: jest.fn(), // deprecated\n      removeListener: jest.fn(), // deprecated\n      addEventListener: jest.fn(),\n      removeEventListener: jest.fn(),\n      dispatchEvent: jest.fn(),\n    })),\n  })\n\n  Object.defineProperty(window, 'IntersectionObserver', {\n    writable: true,\n    value: jest.fn().mockImplementation(() => ({\n      observe: jest.fn(),\n      unobserve: jest.fn(),\n      disconnect: jest.fn(),\n    })),\n  })\n}\n"],"mappings":"AAAA,OAAO;AACP,SAAS,gBAAgB;AACzB,SAAS,cAAc;AAEvB,UAAU,MAAM,OAAO,OAAO,CAAC;AAC/B,UAAU,MAAM,OAAO,cAAc,CAAC;AACtC,SAAS,MAAM,OAAO,MAAM,CAAC;AAE7B,OAAO,OAAO,QAAQ;AAEtB,IAAI,OAAO,WAAW,aAAa;AACjC,SAAO,eAAe,QAAQ,cAAc;AAAA,IAC1C,UAAU;AAAA,IACV,OAAO,KAAK,GAAG,EAAE,mBAAmB,YAAU;AAAA,MAC5C,SAAS;AAAA,MACT,OAAO;AAAA,MACP,UAAU;AAAA,MACV,aAAa,KAAK,GAAG;AAAA;AAAA,MACrB,gBAAgB,KAAK,GAAG;AAAA;AAAA,MACxB,kBAAkB,KAAK,GAAG;AAAA,MAC1B,qBAAqB,KAAK,GAAG;AAAA,MAC7B,eAAe,KAAK,GAAG;AAAA,IACzB,EAAE;AAAA,EACJ,CAAC;AAED,SAAO,eAAe,QAAQ,wBAAwB;AAAA,IACpD,UAAU;AAAA,IACV,OAAO,KAAK,GAAG,EAAE,mBAAmB,OAAO;AAAA,MACzC,SAAS,KAAK,GAAG;AAAA,MACjB,WAAW,KAAK,GAAG;AAAA,MACnB,YAAY,KAAK,GAAG;AAAA,IACtB,EAAE;AAAA,EACJ,CAAC;AACH;","names":[]}
+{"version":3,"sources":["../../src/jest-setup.ts"],"sourcesContent":["import '@testing-library/jest-dom'\nimport { matchers } from '@emotion/jest'\nimport { server } from './mocks/server'\n\nbeforeAll(() => server.listen())\nafterEach(() => server.resetHandlers())\nafterAll(() => server.close())\n\nexpect.extend(matchers)\n\njest.mock('uuid', () => ({\n  v4: jest.fn(() => 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx'),\n}))\n\nif (typeof window !== 'undefined') {\n  Object.defineProperty(window, 'matchMedia', {\n    writable: true,\n    value: jest.fn().mockImplementation(query => ({\n      matches: false,\n      media: query,\n      onchange: null,\n      addListener: jest.fn(), // deprecated\n      removeListener: jest.fn(), // deprecated\n      addEventListener: jest.fn(),\n      removeEventListener: jest.fn(),\n      dispatchEvent: jest.fn(),\n    })),\n  })\n\n  Object.defineProperty(window, 'IntersectionObserver', {\n    writable: true,\n    value: jest.fn().mockImplementation(() => ({\n      observe: jest.fn(),\n      unobserve: jest.fn(),\n      disconnect: jest.fn(),\n    })),\n  })\n}\n"],"mappings":"AAAA,OAAO;AACP,SAAS,gBAAgB;AACzB,SAAS,cAAc;AAEvB,UAAU,MAAM,OAAO,OAAO,CAAC;AAC/B,UAAU,MAAM,OAAO,cAAc,CAAC;AACtC,SAAS,MAAM,OAAO,MAAM,CAAC;AAE7B,OAAO,OAAO,QAAQ;AAEtB,KAAK,KAAK,QAAQ,OAAO;AAAA,EACvB,IAAI,KAAK,GAAG,MAAM,sCAAsC;AAC1D,EAAE;AAEF,IAAI,OAAO,WAAW,aAAa;AACjC,SAAO,eAAe,QAAQ,cAAc;AAAA,IAC1C,UAAU;AAAA,IACV,OAAO,KAAK,GAAG,EAAE,mBAAmB,YAAU;AAAA,MAC5C,SAAS;AAAA,MACT,OAAO;AAAA,MACP,UAAU;AAAA,MACV,aAAa,KAAK,GAAG;AAAA;AAAA,MACrB,gBAAgB,KAAK,GAAG;AAAA;AAAA,MACxB,kBAAkB,KAAK,GAAG;AAAA,MAC1B,qBAAqB,KAAK,GAAG;AAAA,MAC7B,eAAe,KAAK,GAAG;AAAA,IACzB,EAAE;AAAA,EACJ,CAAC;AAED,SAAO,eAAe,QAAQ,wBAAwB;AAAA,IACpD,UAAU;AAAA,IACV,OAAO,KAAK,GAAG,EAAE,mBAAmB,OAAO;AAAA,MACzC,SAAS,KAAK,GAAG;AAAA,MACjB,WAAW,KAAK,GAAG;AAAA,MACnB,YAAY,KAAK,GAAG;AAAA,IACtB,EAAE;AAAA,EACJ,CAAC;AACH;","names":[]}

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

@@ -13,7 +13,7 @@ async function handler(...args) {
   const supportsPreviewMode = match(args).with(routeHandlerPattern, () => false).with(apiRoutePattern, () => true).exhaustive();
   const supportsDraftMode = match(args).with(routeHandlerPattern, () => true).with(apiRoutePattern, () => false).exhaustive();
   const body = {
-    version: "0.19.4",
+    version: "0.20.0",
     previewMode: supportsPreviewMode,
     draftMode: supportsDraftMode,
     interactionMode: true,

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

@@ -1,5 +1,5 @@
 import { jsx, jsxs } from "react/jsx-runtime";
-import { forwardRef, useRef } from "react";
+import { forwardRef, useRef, isValidElement } from "react";
 import { act } from "react-dom/test-utils";
 import { render, screen } from "@testing-library/react";
 import "@testing-library/jest-dom";
@@ -12,13 +12,19 @@ import {
 } from "../../../../utils/tests/element-data-test-test";
 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 testPageControlPropRendering(controlDefinition, {
   toData,
   value,
   cacheData,
-  expectedRenders
+  expectedRenders,
+  registerComponents,
+  action,
+  rootElements = []
 }) {
-  const controlData = toData(value);
+  const controlData = value !== void 0 ? toData ? toData(value) : controlDefinition.toData(value) : void 0;
   const TestComponentType = "TestComponent";
   const testId = "test-id";
   const renderCountTestId = "render-count-test-id";
@@ -30,19 +36,21 @@ async function testPageControlPropRendering(controlDefinition, {
         props: {
           propKey: controlData
         }
-      }
+      },
+      ...rootElements
     ],
     ROOT_ID
   );
   const snapshot = createMakeswiftPageSnapshot(elementData, {}, cacheData);
   const runtime = new ReactRuntime();
+  registerComponents?.(runtime);
   runtime.registerComponent(
     forwardRef(({ propKey }, ref) => {
       const renderCount = useRef(0);
       ++renderCount.current;
       return /* @__PURE__ */ jsxs("div", { ref, children: [
         /* @__PURE__ */ jsx("div", { "data-testid": renderCountTestId, children: renderCount.current }),
-        /* @__PURE__ */ jsx("div", { "data-testid": testId, children: JSON.stringify(propKey) })
+        /* @__PURE__ */ jsx("div", { "data-testid": testId, children: renderProp(propKey) })
       ] });
     }),
     {
@@ -58,8 +66,13 @@ async function testPageControlPropRendering(controlDefinition, {
       /* @__PURE__ */ jsx(ReactRuntimeProvider, { runtime, children: /* @__PURE__ */ jsx(Page, { snapshot }) })
     )
   );
+  if (action) {
+    await act(async () => {
+      await action(screen.getByTestId(testId));
+    });
+  }
   expect(snapshot).toMatchSnapshot("snapshot");
-  expect(JSON.parse(screen.getByTestId(testId).textContent ?? "")).toMatchSnapshot("resolvedValue");
+  expect(propSnapshot(screen.getByTestId(testId))).toMatchSnapshot("resolvedValue");
   if (expectedRenders != null) {
     expect(Number(screen.getByTestId(renderCountTestId).textContent)).toBe(expectedRenders);
   }

package/dist/esm/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":["/** @jest-environment jsdom */\n\nimport { forwardRef, useRef } from 'react'\nimport { act } from 'react-dom/test-utils'\nimport { render, screen } from '@testing-library/react'\nimport '@testing-library/jest-dom'\n\nimport { Data } from '@makeswift/controls'\n\nimport { ElementData } from '../../../../state/react-page'\nimport { Page } from '../../page'\nimport { ReactRuntimeProvider } from '../../../context/react-runtime'\nimport { ReactRuntime } from '../../../../react'\n\nimport {\n  createMakeswiftPageSnapshot,\n  createRootComponent,\n} from '../../../../utils/tests/element-data-test-test'\n\nimport { type MakeswiftPageSnapshot } from '../../../../next'\nimport { ControlDefinition, ControlDefinitionData } from '../../../../controls'\n\nconst ROOT_ID = '00000000-0000-0000-0000-000000000000'\nconst ELEMENT_ID = '11111111-1111-1111-1111-111111111111'\n\nexport async function testPageControlPropRendering<T extends ControlDefinition>(\n  controlDefinition: T,\n  {\n    toData,\n    value,\n    cacheData,\n    expectedRenders,\n  }: {\n    toData: (value: Data) => ControlDefinitionData<T>\n    value: Data\n    cacheData?: MakeswiftPageSnapshot['cacheData']\n    expectedRenders?: number\n  },\n) {\n  // Arrange\n  const controlData = toData(value)\n  const TestComponentType = 'TestComponent'\n  const testId = 'test-id'\n  const renderCountTestId = 'render-count-test-id'\n  const elementData: ElementData = createRootComponent(\n    [\n      {\n        key: ELEMENT_ID,\n        type: TestComponentType,\n        props: {\n          propKey: controlData,\n        },\n      },\n    ],\n    ROOT_ID,\n  )\n  const snapshot = createMakeswiftPageSnapshot(elementData, {}, cacheData)\n  const runtime = new ReactRuntime()\n\n  // Act\n  runtime.registerComponent(\n    forwardRef<HTMLDivElement, { propKey?: any }>(({ propKey }, ref) => {\n      const renderCount = useRef(0)\n      ++renderCount.current\n      return (\n        <div ref={ref}>\n          <div data-testid={renderCountTestId}>{renderCount.current}</div>\n          <div data-testid={testId}>{JSON.stringify(propKey)}</div>\n        </div>\n      )\n    }),\n    {\n      type: TestComponentType,\n      label: 'TestComponent',\n      props: {\n        propKey: controlDefinition,\n      },\n    },\n  )\n\n  // Assert\n  await act(async () =>\n    render(\n      <ReactRuntimeProvider runtime={runtime}>\n        <Page snapshot={snapshot} />\n      </ReactRuntimeProvider>,\n    ),\n  )\n\n  expect(snapshot).toMatchSnapshot('snapshot')\n  expect(JSON.parse(screen.getByTestId(testId).textContent ?? '')).toMatchSnapshot('resolvedValue')\n\n  if (expectedRenders != null) {\n    expect(Number(screen.getByTestId(renderCountTestId).textContent)).toBe(expectedRenders)\n  }\n}\n"],"mappings":"AAiEQ,SACE,KADF;AA/DR,SAAS,YAAY,cAAc;AACnC,SAAS,WAAW;AACpB,SAAS,QAAQ,cAAc;AAC/B,OAAO;AAKP,SAAS,YAAY;AACrB,SAAS,4BAA4B;AACrC,SAAS,oBAAoB;AAE7B;AAAA,EACE;AAAA,EACA;AAAA,OACK;AAKP,MAAM,UAAU;AAChB,MAAM,aAAa;AAEnB,eAAsB,6BACpB,mBACA;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,GAMA;AAEA,QAAM,cAAc,OAAO,KAAK;AAChC,QAAM,oBAAoB;AAC1B,QAAM,SAAS;AACf,QAAM,oBAAoB;AAC1B,QAAM,cAA2B;AAAA,IAC/B;AAAA,MACE;AAAA,QACE,KAAK;AAAA,QACL,MAAM;AAAA,QACN,OAAO;AAAA,UACL,SAAS;AAAA,QACX;AAAA,MACF;AAAA,IACF;AAAA,IACA;AAAA,EACF;AACA,QAAM,WAAW,4BAA4B,aAAa,CAAC,GAAG,SAAS;AACvE,QAAM,UAAU,IAAI,aAAa;AAGjC,UAAQ;AAAA,IACN,WAA8C,CAAC,EAAE,QAAQ,GAAG,QAAQ;AAClE,YAAM,cAAc,OAAO,CAAC;AAC5B,QAAE,YAAY;AACd,aACE,qBAAC,SAAI,KACH;AAAA,4BAAC,SAAI,eAAa,mBAAoB,sBAAY,SAAQ;AAAA,QAC1D,oBAAC,SAAI,eAAa,QAAS,eAAK,UAAU,OAAO,GAAE;AAAA,SACrD;AAAA,IAEJ,CAAC;AAAA,IACD;AAAA,MACE,MAAM;AAAA,MACN,OAAO;AAAA,MACP,OAAO;AAAA,QACL,SAAS;AAAA,MACX;AAAA,IACF;AAAA,EACF;AAGA,QAAM;AAAA,IAAI,YACR;AAAA,MACE,oBAAC,wBAAqB,SACpB,8BAAC,QAAK,UAAoB,GAC5B;AAAA,IACF;AAAA,EACF;AAEA,SAAO,QAAQ,EAAE,gBAAgB,UAAU;AAC3C,SAAO,KAAK,MAAM,OAAO,YAAY,MAAM,EAAE,eAAe,EAAE,CAAC,EAAE,gBAAgB,eAAe;AAEhG,MAAI,mBAAmB,MAAM;AAC3B,WAAO,OAAO,OAAO,YAAY,iBAAiB,EAAE,WAAW,CAAC,EAAE,KAAK,eAAe;AAAA,EACxF;AACF;","names":[]}
+{"version":3,"sources":["../../../../../../src/next/components/tests/controls/page-control-prop-rendering.tsx"],"sourcesContent":["/** @jest-environment jsdom */\n\nimport { forwardRef, useRef, isValidElement } from 'react'\nimport { act } from 'react-dom/test-utils'\nimport { render, screen } from '@testing-library/react'\nimport '@testing-library/jest-dom'\n\nimport { type Data, type ValueType, type DataType, ControlDefinition } from '@makeswift/controls'\n\nimport { ElementData } from '../../../../state/react-page'\nimport { Page } from '../../page'\nimport { ReactRuntimeProvider } from '../../../context/react-runtime'\nimport { ReactRuntime } from '../../../../react'\n\nimport {\n  createMakeswiftPageSnapshot,\n  createRootComponent,\n} from '../../../../utils/tests/element-data-test-test'\n\nimport { type MakeswiftPageSnapshot } from '../../../../next'\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) =>\n  prop.childElementCount ? prop.childNodes : parseStringifiedProp(prop.textContent ?? '')\n\nconst parseStringifiedProp = (prop: string) => (prop === 'undefined' ? undefined : JSON.parse(prop))\n\nexport async function testPageControlPropRendering<D extends ControlDefinition>(\n  controlDefinition: D,\n  {\n    toData,\n    value,\n    cacheData,\n    expectedRenders,\n    registerComponents,\n    action,\n    rootElements = [],\n  }: {\n    toData?: (value: ValueType<D>) => DataType<D>\n    value: ValueType<D> | undefined\n    cacheData?: MakeswiftPageSnapshot['cacheData']\n    expectedRenders?: number\n    registerComponents?: (runtime: ReactRuntime) => void\n    action?: (element: HTMLElement) => Promise<void>\n    rootElements?: ElementData[]\n  },\n) {\n  // Arrange\n  const controlData: DataType<D> | Data =\n    value !== undefined ? (toData ? toData(value) : controlDefinition.toData(value)) : undefined\n\n  const TestComponentType = 'TestComponent'\n  const testId = 'test-id'\n  const renderCountTestId = 'render-count-test-id'\n  const elementData: ElementData = createRootComponent(\n    [\n      {\n        key: ELEMENT_ID,\n        type: TestComponentType,\n        props: {\n          propKey: controlData,\n        },\n      },\n      ...rootElements,\n    ],\n    ROOT_ID,\n  )\n  const snapshot = createMakeswiftPageSnapshot(elementData, {}, cacheData)\n  const runtime = new ReactRuntime()\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      type: TestComponentType,\n      label: 'TestComponent',\n      props: {\n        propKey: controlDefinition as any,\n      },\n    },\n  )\n\n  // Assert\n  await act(async () =>\n    render(\n      <ReactRuntimeProvider runtime={runtime}>\n        <Page snapshot={snapshot} />\n      </ReactRuntimeProvider>,\n    ),\n  )\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"],"mappings":"AAmFQ,SACE,KADF;AAjFR,SAAS,YAAY,QAAQ,sBAAsB;AACnD,SAAS,WAAW;AACpB,SAAS,QAAQ,cAAc;AAC/B,OAAO;AAKP,SAAS,YAAY;AACrB,SAAS,4BAA4B;AACrC,SAAS,oBAAoB;AAE7B;AAAA,EACE;AAAA,EACA;AAAA,OACK;AAIP,MAAM,UAAU;AAChB,MAAM,aAAa;AAEnB,MAAM,aAAa,CAAC,SAClB,SAAS,SAAY,cAAc,eAAe,IAAI,IAAI,OAAO,KAAK,UAAU,IAAI;AAEtF,MAAM,eAAe,CAAC,SACpB,KAAK,oBAAoB,KAAK,aAAa,qBAAqB,KAAK,eAAe,EAAE;AAExF,MAAM,uBAAuB,CAAC,SAAkB,SAAS,cAAc,SAAY,KAAK,MAAM,IAAI;AAElG,eAAsB,6BACpB,mBACA;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA,eAAe,CAAC;AAClB,GASA;AAEA,QAAM,cACJ,UAAU,SAAa,SAAS,OAAO,KAAK,IAAI,kBAAkB,OAAO,KAAK,IAAK;AAErF,QAAM,oBAAoB;AAC1B,QAAM,SAAS;AACf,QAAM,oBAAoB;AAC1B,QAAM,cAA2B;AAAA,IAC/B;AAAA,MACE;AAAA,QACE,KAAK;AAAA,QACL,MAAM;AAAA,QACN,OAAO;AAAA,UACL,SAAS;AAAA,QACX;AAAA,MACF;AAAA,MACA,GAAG;AAAA,IACL;AAAA,IACA;AAAA,EACF;AACA,QAAM,WAAW,4BAA4B,aAAa,CAAC,GAAG,SAAS;AACvE,QAAM,UAAU,IAAI,aAAa;AACjC,uBAAqB,OAAO;AAG5B,UAAQ;AAAA,IACN,WAA8C,CAAC,EAAE,QAAQ,GAAG,QAAQ;AAClE,YAAM,cAAc,OAAO,CAAC;AAC5B,QAAE,YAAY;AAEd,aACE,qBAAC,SAAI,KACH;AAAA,4BAAC,SAAI,eAAa,mBAAoB,sBAAY,SAAQ;AAAA,QAC1D,oBAAC,SAAI,eAAa,QAAS,qBAAW,OAAO,GAAE;AAAA,SACjD;AAAA,IAEJ,CAAC;AAAA,IACD;AAAA,MACE,MAAM;AAAA,MACN,OAAO;AAAA,MACP,OAAO;AAAA,QACL,SAAS;AAAA,MACX;AAAA,IACF;AAAA,EACF;AAGA,QAAM;AAAA,IAAI,YACR;AAAA,MACE,oBAAC,wBAAqB,SACpB,8BAAC,QAAK,UAAoB,GAC5B;AAAA,IACF;AAAA,EACF;AAEA,MAAI,QAAQ;AACV,UAAM,IAAI,YAAY;AACpB,YAAM,OAAO,OAAO,YAAY,MAAM,CAAC;AAAA,IACzC,CAAC;AAAA,EACH;AAEA,SAAO,QAAQ,EAAE,gBAAgB,UAAU;AAC3C,SAAO,aAAa,OAAO,YAAY,MAAM,CAAC,CAAC,EAAE,gBAAgB,eAAe;AAEhF,MAAI,mBAAmB,MAAM;AAC3B,WAAO,OAAO,OAAO,YAAY,iBAAiB,EAAE,WAAW,CAAC,EAAE,KAAK,eAAe;AAAA,EACxF;AACF;","names":[]}

package/dist/esm/prop-controllers/copy.js

@@ -6,15 +6,17 @@ import {
   copyGridPropControllerData,
   copyImagePropControllerData,
   copyImagesPropControllerData,
-  copyBackgroundsPropControllerData
-} from "@makeswift/prop-controllers";
-import { Types as PropControllerTypes } from "@makeswift/prop-controllers";
-import {
+  copyBackgroundsPropControllerData,
   copyResponsiveColorPropControllerData,
   copyTablePropControllerData,
-  copyNavigationLinksPropControllerData
+  copyNavigationLinksPropControllerData,
+  Types as PropControllerTypes
 } from "@makeswift/prop-controllers";
+import { isLegacyDescriptor } from "./descriptors";
 function copy(descriptor, value, context) {
+  if (!isLegacyDescriptor(descriptor)) {
+    return descriptor.copyData(value, context);
+  }
   switch (descriptor.type) {
     case PropControllerTypes.Backgrounds:
       return copyBackgroundsPropControllerData(descriptor, value, context);

package/dist/esm/prop-controllers/copy.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/prop-controllers/copy.ts"],"sourcesContent":["import { Descriptor } from './descriptors'\nimport {\n  copyLinkPropControllerData,\n  copyShadowsPropControllerData,\n  copyBorderPropControllerData,\n  copyElementIDPropControllerData,\n  copyGridPropControllerData,\n  copyImagePropControllerData,\n  copyImagesPropControllerData,\n  copyBackgroundsPropControllerData,\n} from '@makeswift/prop-controllers'\nimport { CopyContext } from '../state/react-page'\nimport { Types as PropControllerTypes } from '@makeswift/prop-controllers'\nimport {\n  copyResponsiveColorPropControllerData,\n  copyTablePropControllerData,\n  copyNavigationLinksPropControllerData,\n} from '@makeswift/prop-controllers'\n\n// @note: note typing value, because would then have to type narrow `Data` per case\nexport function copy(descriptor: Descriptor, value: any, context: CopyContext) {\n  switch (descriptor.type) {\n    case PropControllerTypes.Backgrounds:\n      return copyBackgroundsPropControllerData(descriptor, value, context)\n    case PropControllerTypes.Grid:\n      return copyGridPropControllerData(value, context)\n    case PropControllerTypes.NavigationLinks:\n      return copyNavigationLinksPropControllerData(value, context)\n    case PropControllerTypes.Link:\n      return copyLinkPropControllerData(value, context)\n    case PropControllerTypes.Shadows:\n      return copyShadowsPropControllerData(value, context)\n    case PropControllerTypes.Image:\n      return copyImagePropControllerData(value, context)\n    case PropControllerTypes.Images:\n      return copyImagesPropControllerData(value, context)\n    case PropControllerTypes.ResponsiveColor:\n      return copyResponsiveColorPropControllerData(value, context)\n    case PropControllerTypes.TableFormFields:\n      return copyTablePropControllerData(value, context)\n    case PropControllerTypes.Table:\n      return copyTablePropControllerData(value, context)\n    case PropControllerTypes.Border:\n      return copyBorderPropControllerData(value, context)\n    case PropControllerTypes.ElementID:\n      return copyElementIDPropControllerData(value, context)\n    default:\n      return value\n  }\n}\n\nexport function copyElementReference(value: string, context: CopyContext) {\n  return context.replacementContext.globalElementIds.get(value) || value\n}\n"],"mappings":"AACA;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AAEP,SAAS,SAAS,2BAA2B;AAC7C;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,OACK;AAGA,SAAS,KAAK,YAAwB,OAAY,SAAsB;AAC7E,UAAQ,WAAW,MAAM;AAAA,IACvB,KAAK,oBAAoB;AACvB,aAAO,kCAAkC,YAAY,OAAO,OAAO;AAAA,IACrE,KAAK,oBAAoB;AACvB,aAAO,2BAA2B,OAAO,OAAO;AAAA,IAClD,KAAK,oBAAoB;AACvB,aAAO,sCAAsC,OAAO,OAAO;AAAA,IAC7D,KAAK,oBAAoB;AACvB,aAAO,2BAA2B,OAAO,OAAO;AAAA,IAClD,KAAK,oBAAoB;AACvB,aAAO,8BAA8B,OAAO,OAAO;AAAA,IACrD,KAAK,oBAAoB;AACvB,aAAO,4BAA4B,OAAO,OAAO;AAAA,IACnD,KAAK,oBAAoB;AACvB,aAAO,6BAA6B,OAAO,OAAO;AAAA,IACpD,KAAK,oBAAoB;AACvB,aAAO,sCAAsC,OAAO,OAAO;AAAA,IAC7D,KAAK,oBAAoB;AACvB,aAAO,4BAA4B,OAAO,OAAO;AAAA,IACnD,KAAK,oBAAoB;AACvB,aAAO,4BAA4B,OAAO,OAAO;AAAA,IACnD,KAAK,oBAAoB;AACvB,aAAO,6BAA6B,OAAO,OAAO;AAAA,IACpD,KAAK,oBAAoB;AACvB,aAAO,gCAAgC,OAAO,OAAO;AAAA,IACvD;AACE,aAAO;AAAA,EACX;AACF;AAEO,SAAS,qBAAqB,OAAe,SAAsB;AACxE,SAAO,QAAQ,mBAAmB,iBAAiB,IAAI,KAAK,KAAK;AACnE;","names":[]}
+{"version":3,"sources":["../../../src/prop-controllers/copy.ts"],"sourcesContent":["import { type CopyContext } from '@makeswift/controls'\n\nimport {\n  copyLinkPropControllerData,\n  copyShadowsPropControllerData,\n  copyBorderPropControllerData,\n  copyElementIDPropControllerData,\n  copyGridPropControllerData,\n  copyImagePropControllerData,\n  copyImagesPropControllerData,\n  copyBackgroundsPropControllerData,\n  copyResponsiveColorPropControllerData,\n  copyTablePropControllerData,\n  copyNavigationLinksPropControllerData,\n  Types as PropControllerTypes,\n} from '@makeswift/prop-controllers'\n\nimport { isLegacyDescriptor, type Descriptor } from './descriptors'\n\n// @note: note typing value, because would then have to type narrow `Data` per case\nexport function copy(descriptor: Descriptor, value: any, context: CopyContext) {\n  if (!isLegacyDescriptor(descriptor)) {\n    return descriptor.copyData(value, context)\n  }\n\n  switch (descriptor.type) {\n    case PropControllerTypes.Backgrounds:\n      return copyBackgroundsPropControllerData(descriptor, value, context)\n\n    case PropControllerTypes.Grid:\n      return copyGridPropControllerData(value, context)\n\n    case PropControllerTypes.NavigationLinks:\n      return copyNavigationLinksPropControllerData(value, context)\n\n    case PropControllerTypes.Link:\n      return copyLinkPropControllerData(value, context)\n\n    case PropControllerTypes.Shadows:\n      return copyShadowsPropControllerData(value, context)\n\n    case PropControllerTypes.Image:\n      return copyImagePropControllerData(value, context)\n\n    case PropControllerTypes.Images:\n      return copyImagesPropControllerData(value, context)\n\n    case PropControllerTypes.ResponsiveColor:\n      return copyResponsiveColorPropControllerData(value, context)\n\n    case PropControllerTypes.TableFormFields:\n      return copyTablePropControllerData(value, context)\n\n    case PropControllerTypes.Table:\n      return copyTablePropControllerData(value, context)\n\n    case PropControllerTypes.Border:\n      return copyBorderPropControllerData(value, context)\n\n    case PropControllerTypes.ElementID:\n      return copyElementIDPropControllerData(value, context)\n\n    // FIXME: DELETED_PROP_CONTROLLER_TYPES.RichText ??\n\n    default:\n      return value\n  }\n}\n\nexport function copyElementReference(value: string, context: CopyContext) {\n  return context.replacementContext.globalElementIds.get(value) || value\n}\n"],"mappings":"AAEA;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA,SAAS;AAAA,OACJ;AAEP,SAAS,0BAA2C;AAG7C,SAAS,KAAK,YAAwB,OAAY,SAAsB;AAC7E,MAAI,CAAC,mBAAmB,UAAU,GAAG;AACnC,WAAO,WAAW,SAAS,OAAO,OAAO;AAAA,EAC3C;AAEA,UAAQ,WAAW,MAAM;AAAA,IACvB,KAAK,oBAAoB;AACvB,aAAO,kCAAkC,YAAY,OAAO,OAAO;AAAA,IAErE,KAAK,oBAAoB;AACvB,aAAO,2BAA2B,OAAO,OAAO;AAAA,IAElD,KAAK,oBAAoB;AACvB,aAAO,sCAAsC,OAAO,OAAO;AAAA,IAE7D,KAAK,oBAAoB;AACvB,aAAO,2BAA2B,OAAO,OAAO;AAAA,IAElD,KAAK,oBAAoB;AACvB,aAAO,8BAA8B,OAAO,OAAO;AAAA,IAErD,KAAK,oBAAoB;AACvB,aAAO,4BAA4B,OAAO,OAAO;AAAA,IAEnD,KAAK,oBAAoB;AACvB,aAAO,6BAA6B,OAAO,OAAO;AAAA,IAEpD,KAAK,oBAAoB;AACvB,aAAO,sCAAsC,OAAO,OAAO;AAAA,IAE7D,KAAK,oBAAoB;AACvB,aAAO,4BAA4B,OAAO,OAAO;AAAA,IAEnD,KAAK,oBAAoB;AACvB,aAAO,4BAA4B,OAAO,OAAO;AAAA,IAEnD,KAAK,oBAAoB;AACvB,aAAO,6BAA6B,OAAO,OAAO;AAAA,IAEpD,KAAK,oBAAoB;AACvB,aAAO,gCAAgC,OAAO,OAAO;AAAA,IAIvD;AACE,aAAO;AAAA,EACX;AACF;AAEO,SAAS,qBAAqB,OAAe,SAAsB;AACxE,SAAO,QAAQ,mBAAmB,iBAAiB,IAAI,KAAK,KAAK;AACnE;","names":[]}

package/dist/esm/prop-controllers/deleted.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/prop-controllers/deleted.ts"],"sourcesContent":["import { RichTextValue } from '../controls'\nimport { Data, DescriptorValueType, PanelDescriptor } from './descriptors'\n\nexport const DELETED_PROP_CONTROLLER_TYPES = {\n  List: 'List',\n  RichText: 'RichText',\n  Shape: 'Shape',\n  Typeahead: 'Typeahead',\n} as const\n\nexport type DeletedPropControllerDescriptor<T extends Data = Data> =\n  | ListDescriptor<T extends ListValue ? T : ListValue>\n  | RichTextDescriptor<T>\n  | ShapeDescriptor<T extends ShapeValue ? T : ShapeValue, any>\n  | TypeaheadDescriptor<T extends TypeaheadValue ? T : TypeaheadValue>\n\ntype ListValueItem<T extends Data> = { id: string; value?: T }\n\nexport type ListValue<T extends Data = Data> = ListValueItem<T>[]\n\nexport type ListOptions<T extends Data> = {\n  type: PanelDescriptor<T>\n  label?: string\n  getItemLabel?: ((value: T | undefined) => string) | ((value: T | undefined) => Promise<string>)\n  preset?: ListValue<T>\n  defaultValue?: ListValue<T>\n}\n\nexport type ListDescriptor<T extends ListValue = ListValue> = {\n  type: typeof DELETED_PROP_CONTROLLER_TYPES.List\n  options: ListOptions<T extends ListValue<infer U> ? U : never>\n}\n\nexport type RichTextOptions = { preset?: RichTextValue }\n\nexport type RichTextDescriptor<_T extends Data = RichTextValue> = {\n  type: typeof DELETED_PROP_CONTROLLER_TYPES.RichText\n  options: RichTextOptions\n}\n\nexport type ShapeValue<T extends Data = Data> = Record<string, T>\n\ntype ShapeOptions<T extends Record<string, PanelDescriptor>> = {\n  type: T\n  preset?: { [K in keyof T]?: DescriptorValueType<T[K]> }\n}\n\nexport type ShapeDescriptor<\n  _T extends Record<string, Data>,\n  U extends Record<string, PanelDescriptor>,\n> = {\n  type: typeof DELETED_PROP_CONTROLLER_TYPES.Shape\n  options: ShapeOptions<U>\n}\n\nexport type TypeaheadValue<T extends Data = Data> = {\n  id: string\n  label: string\n  value: T\n}\n\nexport type TypeaheadOptions<T extends Data> = {\n  getItems: (query: string) => Promise<TypeaheadValue<T>[]>\n  label?: string\n  preset?: TypeaheadValue<T>\n  defaultValue?: TypeaheadValue<T>\n}\n\nexport type TypeaheadDescriptor<T extends TypeaheadValue = TypeaheadValue> = {\n  type: typeof DELETED_PROP_CONTROLLER_TYPES.Typeahead\n  options: TypeaheadOptions<T extends TypeaheadValue<infer U> ? U : never>\n}\n"],"mappings":"AAGO,MAAM,gCAAgC;AAAA,EAC3C,MAAM;AAAA,EACN,UAAU;AAAA,EACV,OAAO;AAAA,EACP,WAAW;AACb;","names":[]}
+{"version":3,"sources":["../../../src/prop-controllers/deleted.ts"],"sourcesContent":["import { type RichTextValue } from '@makeswift/controls'\nimport { Data, DescriptorValueType, PanelDescriptor } from './descriptors'\n\nexport const DELETED_PROP_CONTROLLER_TYPES = {\n  List: 'List',\n  RichText: 'RichText',\n  Shape: 'Shape',\n  Typeahead: 'Typeahead',\n} as const\n\nexport type DeletedPropControllerDescriptor<T extends Data = Data> =\n  | ListDescriptor<T extends ListValue ? T : ListValue>\n  | RichTextDescriptor<T>\n  | ShapeDescriptor<T extends ShapeValue ? T : ShapeValue, any>\n  | TypeaheadDescriptor<T extends TypeaheadValue ? T : TypeaheadValue>\n\ntype ListValueItem<T extends Data> = { id: string; value?: T }\n\nexport type ListValue<T extends Data = Data> = ListValueItem<T>[]\n\nexport type ListOptions<T extends Data> = {\n  type: PanelDescriptor<T>\n  label?: string\n  getItemLabel?: ((value: T | undefined) => string) | ((value: T | undefined) => Promise<string>)\n  preset?: ListValue<T>\n  defaultValue?: ListValue<T>\n}\n\nexport type ListDescriptor<T extends ListValue = ListValue> = {\n  type: typeof DELETED_PROP_CONTROLLER_TYPES.List\n  options: ListOptions<T extends ListValue<infer U> ? U : never>\n}\n\nexport type RichTextOptions = { preset?: RichTextValue }\n\nexport type RichTextDescriptor<_T extends Data = RichTextValue> = {\n  type: typeof DELETED_PROP_CONTROLLER_TYPES.RichText\n  options: RichTextOptions\n}\n\nexport type ShapeValue<T extends Data = Data> = Record<string, T>\n\ntype ShapeOptions<T extends Record<string, PanelDescriptor>> = {\n  type: T\n  preset?: { [K in keyof T]?: DescriptorValueType<T[K]> }\n}\n\nexport type ShapeDescriptor<\n  _T extends Record<string, Data>,\n  U extends Record<string, PanelDescriptor>,\n> = {\n  type: typeof DELETED_PROP_CONTROLLER_TYPES.Shape\n  options: ShapeOptions<U>\n}\n\nexport type TypeaheadValue<T extends Data = Data> = {\n  id: string\n  label: string\n  value: T\n}\n\nexport type TypeaheadOptions<T extends Data> = {\n  getItems: (query: string) => Promise<TypeaheadValue<T>[]>\n  label?: string\n  preset?: TypeaheadValue<T>\n  defaultValue?: TypeaheadValue<T>\n}\n\nexport type TypeaheadDescriptor<T extends TypeaheadValue = TypeaheadValue> = {\n  type: typeof DELETED_PROP_CONTROLLER_TYPES.Typeahead\n  options: TypeaheadOptions<T extends TypeaheadValue<infer U> ? U : never>\n}\n"],"mappings":"AAGO,MAAM,gCAAgC;AAAA,EAC3C,MAAM;AAAA,EACN,UAAU;AAAA,EACV,OAAO;AAAA,EACP,WAAW;AACb;","names":[]}

package/dist/esm/prop-controllers/descriptors.js

@@ -1,8 +1,10 @@
-import { StyleControlType } from "../controls/style";
-const Types = {
-  Style: StyleControlType
-};
+import {
+  ControlDefinition as UnifiedControlDefinition
+} from "@makeswift/controls";
+function isLegacyDescriptor(control) {
+  return !(control instanceof UnifiedControlDefinition);
+}
 export {
-  Types
+  isLegacyDescriptor
 };
 //# sourceMappingURL=descriptors.js.map