@makeswift/runtime 0.19.4 → 0.20.0-canary.0

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-canary.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

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/prop-controllers/descriptors.ts"],"sourcesContent":["import {\n  CheckboxControlDefinition,\n  IconRadioGroupControlDefinition,\n  NumberControlDefinition,\n  TextInputControlDefinition,\n  TextAreaControlDefinition,\n} from '@makeswift/controls'\nimport { ResponsiveColor } from '../runtimes/react/controls'\nimport { StyleControlFormattedValue } from '../runtimes/react/controls/style'\nimport type { Data } from '../state/react-page'\nimport { NumberControlValue } from '../runtimes/react/controls/number'\nimport { StyleControlType } from '../controls/style'\nimport {\n  ColorControlDefinition,\n  ComboboxControlDefinition,\n  ImageControlDefinition,\n  LinkControlDefinition,\n  ListControlDefinition,\n  SelectControlDefinition,\n  ShapeControlDefinition,\n  SlotControlDefinition,\n  StyleControlDefinition,\n  RichTextV2ControlDefinition,\n  StyleV2ControlDefinition,\n  TypographyControlDefinition,\n} from '../controls'\nimport { TextInputControlValue } from '../runtimes/react/controls/text-input'\nimport { TextAreaControlValue } from '../runtimes/react/controls/text-area'\nimport { ColorControlValue } from '../runtimes/react/controls/color'\nimport { SelectControlValue } from '../runtimes/react/controls/select'\nimport { CheckboxControlValue } from '../runtimes/react/controls/checkbox'\nimport { ResolveImageControlValue } from '../runtimes/react/controls/image'\nimport { ShapeControlValue } from '../runtimes/react/controls/shape'\nimport { ListControlValue } from '../runtimes/react/controls/list'\nimport { ComboboxControlValue } from '../runtimes/react/controls/combobox'\nimport { LinkControlValue } from '../runtimes/react/controls/link'\nimport { SlotControlValue } from '../runtimes/react/controls/slot'\nimport { RichTextControlDefinition } from '../controls/rich-text'\nimport { RichTextControlValue } from '../runtimes/react/controls/rich-text/rich-text'\nimport { RichTextV2ControlValue } from '../runtimes/react/controls/rich-text-v2'\nimport { StyleV2ControlFormattedValue } from '../runtimes/react/controls/style-v2'\nimport { IconRadioGroupControlValue } from '../runtimes/react/controls/icon-radio-group'\nimport { TypographyControlValue } from '../runtimes/react/controls/typography'\nimport {\n  BorderDescriptor,\n  CheckboxDescriptor,\n  LinkDescriptor,\n  ResolveLinkPropControllerValue,\n  Types as PropControllerTypes,\n  ShadowsDescriptor,\n  ResolveShadowsPropControllerValue,\n  ResponsiveLengthDescriptor,\n  ResolveResponsiveLengthPropControllerValue,\n  NumberDescriptor,\n  ResolveNumberPropControllerValue,\n  ResponsiveColorDescriptor,\n  ResolveCheckboxPropControllerValue,\n  BorderRadiusDescriptor,\n  ResolveBorderPropControllerValue,\n  ResolveBorderRadiusPropControllerValue,\n  DateDescriptor,\n  ResolveDatePropControllerValue,\n  FontDescriptor,\n  ResolveFontPropControllerValue,\n  VideoDescriptor,\n  ResolveVideoPropControllerValue,\n  TableDescriptor,\n  ResolveTablePropControllerValue,\n  MarginDescriptor,\n  ResolveMarginPropControllerValue,\n  PaddingDescriptor,\n  ResolvePaddingPropControllerValue,\n  WidthDescriptor,\n  ResolveWidthPropControllerValue,\n  TextStyleDescriptor,\n  ResolveTextStylePropControllerValue,\n  NavigationLinksDescriptor,\n  ResolveNavigationLinksPropControllerValue,\n  TextAreaDescriptor,\n  ResolveTextAreaPropControllerValue,\n  GapX,\n  ResponsiveNumber,\n  ResponsiveSelect,\n  ResolveGapYPropControllerValue,\n  GapYDescriptor,\n  ElementIDDescriptor,\n  ResolveElementIDPropControllerValue,\n  TableFormFieldsDescriptor,\n  ResolveTableFormFieldsPropControllerValue,\n  GridDescriptor,\n  ResolveGridPropControllerValue,\n  ImageDescriptor,\n  ResolveImagePropControllerValue,\n  ImagesDescriptor,\n  ResolveImagesPropControllerValue,\n  BackgroundsDescriptor,\n  ResolveBackgroundsPropControllerValue,\n  ResponsiveOpacity,\n  ResponsiveIconRadioGroup,\n  ResolveSocialLinksPropControllerValue,\n  SocialLinksDescriptor,\n  TextInputDescriptor,\n  ResolveTextInputPropControllerValue,\n  type Descriptor as PropDescriptor,\n  type Value as PropValue,\n} from '@makeswift/prop-controllers'\nimport { DeletedPropControllerDescriptor } from './deleted'\n\nexport type { Data }\n\nexport type Gap = { value: number; unit: 'px' }\n\nexport const Types = {\n  Style: StyleControlType,\n} as const\n\nexport type Descriptor<T extends Data = Data> =\n  | DeletedPropControllerDescriptor<T>\n  | BackgroundsDescriptor<T>\n  | BorderDescriptor<T>\n  | BorderRadiusDescriptor<T>\n  | CheckboxDescriptor<T>\n  | DateDescriptor<T>\n  | ElementIDDescriptor<T>\n  | FontDescriptor<T>\n  | PropDescriptor<typeof GapX>\n  | GapYDescriptor<T>\n  | GridDescriptor<T>\n  | ImageDescriptor<T>\n  | ImagesDescriptor<T>\n  | LinkDescriptor<T>\n  | MarginDescriptor<T>\n  | NavigationLinksDescriptor<T>\n  | NumberDescriptor<T>\n  | PaddingDescriptor<T>\n  | ResponsiveColorDescriptor<T>\n  | ResponsiveLengthDescriptor<T>\n  | PropDescriptor<typeof ResponsiveIconRadioGroup>\n  | PropDescriptor<typeof ResponsiveNumber>\n  | PropDescriptor<typeof ResponsiveOpacity>\n  | PropDescriptor<typeof ResponsiveSelect>\n  | ShadowsDescriptor<T>\n  | SocialLinksDescriptor<T>\n  | TableDescriptor<T>\n  | TableFormFieldsDescriptor<T>\n  | TextAreaDescriptor<T>\n  | TextInputDescriptor<T>\n  | TextStyleDescriptor<T>\n  | VideoDescriptor<T>\n  | WidthDescriptor<T>\n  | StyleControlDefinition\n  | StyleV2ControlDefinition\n  | NumberControlDefinition\n  | CheckboxControlDefinition\n  | TextInputControlDefinition\n  | TextAreaControlDefinition\n  | SelectControlDefinition\n  | ColorControlDefinition\n  | IconRadioGroupControlDefinition\n  | ImageControlDefinition\n  | ComboboxControlDefinition\n  | ShapeControlDefinition\n  | ListControlDefinition\n  | LinkControlDefinition\n  | SlotControlDefinition\n  | RichTextControlDefinition\n  | RichTextV2ControlDefinition\n  | TypographyControlDefinition\n\nexport type PanelDescriptorType =\n  | typeof PropControllerTypes.Backgrounds\n  | typeof PropControllerTypes.ResponsiveIconRadioGroup\n  | typeof PropControllerTypes.Margin\n  | typeof PropControllerTypes.Padding\n  | typeof PropControllerTypes.Shadows\n  | typeof PropControllerTypes.Border\n  | typeof PropControllerTypes.GapY\n  | typeof PropControllerTypes.GapX\n  | typeof PropControllerTypes.BorderRadius\n  | typeof PropControllerTypes.Checkbox\n  | typeof PropControllerTypes.TextInput\n  | typeof PropControllerTypes.Link\n  | typeof PropControllerTypes.ResponsiveSelect\n  | typeof PropControllerTypes.ResponsiveColor\n  | typeof PropControllerTypes.TextStyle\n  | typeof PropControllerTypes.Images\n  | typeof PropControllerTypes.ResponsiveNumber\n  | typeof PropControllerTypes.Number\n  | typeof PropControllerTypes.Date\n  | typeof PropControllerTypes.Font\n  | typeof PropControllerTypes.TextArea\n  | typeof PropControllerTypes.Table\n  | typeof PropControllerTypes.Image\n  | typeof PropControllerTypes.ResponsiveOpacity\n  | typeof PropControllerTypes.SocialLinks\n  | typeof PropControllerTypes.Video\n  | typeof PropControllerTypes.NavigationLinks\n\nexport type PanelDescriptor<T extends Data = Data> = Extract<\n  Descriptor<T>,\n  { type: PanelDescriptorType }\n>\n\nexport type DescriptorValueType<T extends Descriptor> = T extends NumberControlDefinition\n  ? NumberControlValue<T>\n  : T extends CheckboxControlDefinition\n  ? CheckboxControlValue<T>\n  : T extends TextInputControlDefinition\n  ? TextInputControlValue<T>\n  : T extends TextAreaControlDefinition\n  ? TextAreaControlValue<T>\n  : T extends SelectControlDefinition\n  ? SelectControlValue<T>\n  : T extends ColorControlDefinition\n  ? ColorControlValue<T>\n  : T extends StyleControlDefinition\n  ? StyleControlFormattedValue\n  : T extends StyleV2ControlDefinition\n  ? StyleV2ControlFormattedValue\n  : T extends IconRadioGroupControlDefinition\n  ? IconRadioGroupControlValue<T>\n  : T extends ImageControlDefinition\n  ? ResolveImageControlValue<T>\n  : T extends ComboboxControlDefinition\n  ? ComboboxControlValue<T>\n  : T extends ShapeControlDefinition\n  ? ShapeControlValue<T>\n  : T extends ListControlDefinition\n  ? ListControlValue<T>\n  : T extends LinkControlDefinition\n  ? LinkControlValue<T>\n  : T extends SlotControlDefinition\n  ? SlotControlValue\n  : T extends RichTextControlDefinition\n  ? RichTextControlValue\n  : T extends RichTextV2ControlDefinition\n  ? RichTextV2ControlValue\n  : T extends StyleV2ControlDefinition\n  ? StyleV2ControlFormattedValue\n  : T extends TypographyControlDefinition\n  ? TypographyControlValue\n  : T['type'] extends typeof PropControllerTypes.ResponsiveColor\n  ? // TODO(miguel): We're not importing a resolver type from `@makeswift/prop-controllers` because\n    // the resolved type is tightly coupled with the runtime (i.e., it's the result of an API call).\n    // This means that we probably want to rethink how types are resolved and where that lives.\n    ResponsiveColor | null | undefined\n  : T['type'] extends typeof PropControllerTypes.Backgrounds\n  ? ResolveBackgroundsPropControllerValue<\n      Extract<T, { type: typeof PropControllerTypes.Backgrounds }>\n    >\n  : T['type'] extends typeof PropControllerTypes.Checkbox\n  ? ResolveCheckboxPropControllerValue<Extract<T, { type: typeof PropControllerTypes.Checkbox }>>\n  : T['type'] extends typeof PropControllerTypes.Date\n  ? ResolveDatePropControllerValue<Extract<T, { type: typeof PropControllerTypes.Date }>>\n  : T['type'] extends typeof PropControllerTypes.ElementID\n  ? ResolveElementIDPropControllerValue<Extract<T, { type: typeof PropControllerTypes.ElementID }>>\n  : T['type'] extends typeof PropControllerTypes.Font\n  ? ResolveFontPropControllerValue<Extract<T, { type: typeof PropControllerTypes.Font }>>\n  : T['type'] extends typeof PropControllerTypes.GapX\n  ? PropValue<T> | undefined\n  : T['type'] extends typeof PropControllerTypes.GapY\n  ? ResolveGapYPropControllerValue<Extract<T, { type: typeof PropControllerTypes.GapY }>>\n  : T['type'] extends typeof PropControllerTypes.Grid\n  ? ResolveGridPropControllerValue<Extract<T, { type: typeof PropControllerTypes.Grid }>>\n  : T['type'] extends typeof PropControllerTypes.Image\n  ? ResolveImagePropControllerValue<Extract<T, { type: typeof PropControllerTypes.Image }>>\n  : T['type'] extends typeof PropControllerTypes.Images\n  ? ResolveImagesPropControllerValue<Extract<T, { type: typeof PropControllerTypes.Images }>>\n  : T['type'] extends typeof PropControllerTypes.ResponsiveIconRadioGroup\n  ? PropValue<T> | undefined\n  : T['type'] extends typeof PropControllerTypes.ResponsiveNumber\n  ? PropValue<T> | undefined\n  : T['type'] extends typeof PropControllerTypes.ResponsiveOpacity\n  ? PropValue<T> | undefined\n  : T['type'] extends typeof PropControllerTypes.ResponsiveSelect\n  ? PropValue<T> | undefined\n  : T['type'] extends typeof PropControllerTypes.Link\n  ? ResolveLinkPropControllerValue<Extract<T, { type: typeof PropControllerTypes.Link }>>\n  : T['type'] extends typeof PropControllerTypes.Width\n  ? ResolveWidthPropControllerValue<Extract<T, { type: typeof PropControllerTypes.Width }>>\n  : T['type'] extends typeof PropControllerTypes.Padding\n  ? ResolvePaddingPropControllerValue<Extract<T, { type: typeof PropControllerTypes.Padding }>>\n  : T['type'] extends typeof PropControllerTypes.Margin\n  ? ResolveMarginPropControllerValue<Extract<T, { type: typeof PropControllerTypes.Margin }>>\n  : T['type'] extends typeof PropControllerTypes.NavigationLinks\n  ? ResolveNavigationLinksPropControllerValue<\n      Extract<T, { type: typeof PropControllerTypes.NavigationLinks }>\n    >\n  : T['type'] extends typeof PropControllerTypes.BorderRadius\n  ? ResolveBorderRadiusPropControllerValue<\n      Extract<T, { type: typeof PropControllerTypes.BorderRadius }>\n    >\n  : T['type'] extends typeof PropControllerTypes.Shadows\n  ? ResolveShadowsPropControllerValue<Extract<T, { type: typeof PropControllerTypes.Shadows }>>\n  : T['type'] extends typeof PropControllerTypes.SocialLinks\n  ? ResolveSocialLinksPropControllerValue<\n      Extract<T, { type: typeof PropControllerTypes.SocialLinks }>\n    >\n  : T['type'] extends typeof PropControllerTypes.ResponsiveLength\n  ? ResolveResponsiveLengthPropControllerValue<\n      Extract<T, { type: typeof PropControllerTypes.ResponsiveLength }>\n    >\n  : T['type'] extends typeof PropControllerTypes.Border\n  ? ResolveBorderPropControllerValue<Extract<T, { type: typeof PropControllerTypes.Border }>>\n  : T['type'] extends typeof PropControllerTypes.Number\n  ? ResolveNumberPropControllerValue<Extract<T, { type: typeof PropControllerTypes.Number }>>\n  : T['type'] extends typeof PropControllerTypes.Table\n  ? ResolveTablePropControllerValue<Extract<T, { type: typeof PropControllerTypes.Table }>>\n  : T['type'] extends typeof PropControllerTypes.TableFormFields\n  ? ResolveTableFormFieldsPropControllerValue<\n      Extract<T, { type: typeof PropControllerTypes.TableFormFields }>\n    >\n  : T['type'] extends typeof PropControllerTypes.TextStyle\n  ? ResolveTextStylePropControllerValue<Extract<T, { type: typeof PropControllerTypes.TextStyle }>>\n  : T['type'] extends typeof PropControllerTypes.TextArea\n  ? ResolveTextAreaPropControllerValue<Extract<T, { type: typeof PropControllerTypes.TextArea }>>\n  : T['type'] extends typeof PropControllerTypes.TextInput\n  ? ResolveTextInputPropControllerValue<Extract<T, { type: typeof PropControllerTypes.TextInput }>>\n  : T['type'] extends typeof PropControllerTypes.Video\n  ? ResolveVideoPropControllerValue<Extract<T, { type: typeof PropControllerTypes.Video }>>\n  : T extends Descriptor<infer U>\n  ? U | undefined\n  : never\n\nexport type PanelDescriptorValueType<T extends PanelDescriptor> = T extends PanelDescriptor<infer U>\n  ? U\n  : never\n"],"mappings":"AAWA,SAAS,wBAAwB;AAqG1B,MAAM,QAAQ;AAAA,EACnB,OAAO;AACT;","names":[]}
+{"version":3,"sources":["../../../src/prop-controllers/descriptors.ts"],"sourcesContent":["import {\n  type ResolvedValueType,\n  ControlDefinition as UnifiedControlDefinition,\n} from '@makeswift/controls'\n\nimport { type ResponsiveColor } from '../components/utils/types'\nimport type { Data } from '../state/react-page'\nimport {\n  BorderDescriptor,\n  CheckboxDescriptor,\n  LinkDescriptor,\n  ResolveLinkPropControllerValue,\n  Types as PropControllerTypes,\n  ShadowsDescriptor,\n  ResolveShadowsPropControllerValue,\n  ResponsiveLengthDescriptor,\n  ResolveResponsiveLengthPropControllerValue,\n  NumberDescriptor,\n  ResolveNumberPropControllerValue,\n  ResponsiveColorDescriptor,\n  ResolveCheckboxPropControllerValue,\n  BorderRadiusDescriptor,\n  ResolveBorderPropControllerValue,\n  ResolveBorderRadiusPropControllerValue,\n  DateDescriptor,\n  ResolveDatePropControllerValue,\n  FontDescriptor,\n  ResolveFontPropControllerValue,\n  VideoDescriptor,\n  ResolveVideoPropControllerValue,\n  TableDescriptor,\n  ResolveTablePropControllerValue,\n  MarginDescriptor,\n  ResolveMarginPropControllerValue,\n  PaddingDescriptor,\n  ResolvePaddingPropControllerValue,\n  WidthDescriptor,\n  ResolveWidthPropControllerValue,\n  TextStyleDescriptor,\n  ResolveTextStylePropControllerValue,\n  NavigationLinksDescriptor,\n  ResolveNavigationLinksPropControllerValue,\n  TextAreaDescriptor,\n  ResolveTextAreaPropControllerValue,\n  GapX,\n  ResponsiveNumber,\n  ResponsiveSelect,\n  ResolveGapYPropControllerValue,\n  GapYDescriptor,\n  ElementIDDescriptor,\n  ResolveElementIDPropControllerValue,\n  TableFormFieldsDescriptor,\n  ResolveTableFormFieldsPropControllerValue,\n  GridDescriptor,\n  ResolveGridPropControllerValue,\n  ImageDescriptor,\n  ResolveImagePropControllerValue,\n  ImagesDescriptor,\n  ResolveImagesPropControllerValue,\n  BackgroundsDescriptor,\n  ResolveBackgroundsPropControllerValue,\n  ResponsiveOpacity,\n  ResponsiveIconRadioGroup,\n  ResolveSocialLinksPropControllerValue,\n  SocialLinksDescriptor,\n  TextInputDescriptor,\n  ResolveTextInputPropControllerValue,\n  type Descriptor as PropDescriptor,\n  type Value as PropValue,\n} from '@makeswift/prop-controllers'\n\nimport { DeletedPropControllerDescriptor } from './deleted'\n\nexport type { Data }\n\nexport type Gap = { value: number; unit: 'px' }\n\ntype PropControllerDescriptor<T extends Data = Data> =\n  | DeletedPropControllerDescriptor<T>\n  | BackgroundsDescriptor<T>\n  | BorderDescriptor<T>\n  | BorderRadiusDescriptor<T>\n  | CheckboxDescriptor<T>\n  | DateDescriptor<T>\n  | ElementIDDescriptor<T>\n  | FontDescriptor<T>\n  | PropDescriptor<typeof GapX>\n  | GapYDescriptor<T>\n  | GridDescriptor<T>\n  | ImageDescriptor<T>\n  | ImagesDescriptor<T>\n  | LinkDescriptor<T>\n  | MarginDescriptor<T>\n  | NavigationLinksDescriptor<T>\n  | NumberDescriptor<T>\n  | PaddingDescriptor<T>\n  | ResponsiveColorDescriptor<T>\n  | ResponsiveLengthDescriptor<T>\n  | PropDescriptor<typeof ResponsiveIconRadioGroup>\n  | PropDescriptor<typeof ResponsiveNumber>\n  | PropDescriptor<typeof ResponsiveOpacity>\n  | PropDescriptor<typeof ResponsiveSelect>\n  | ShadowsDescriptor<T>\n  | SocialLinksDescriptor<T>\n  | TableDescriptor<T>\n  | TableFormFieldsDescriptor<T>\n  | TextAreaDescriptor<T>\n  | TextInputDescriptor<T>\n  | TextStyleDescriptor<T>\n  | VideoDescriptor<T>\n  | WidthDescriptor<T>\n\nexport type LegacyDescriptor<T extends Data = Data> = PropControllerDescriptor<T>\n\nexport type Descriptor<T extends Data = Data> = LegacyDescriptor<T> | UnifiedControlDefinition\n\nexport function isLegacyDescriptor<T extends Data>(\n  control: Descriptor<T>,\n): control is LegacyDescriptor<T> {\n  return !(control instanceof UnifiedControlDefinition)\n}\n\nexport type PanelDescriptorType =\n  | typeof PropControllerTypes.Backgrounds\n  | typeof PropControllerTypes.ResponsiveIconRadioGroup\n  | typeof PropControllerTypes.Margin\n  | typeof PropControllerTypes.Padding\n  | typeof PropControllerTypes.Shadows\n  | typeof PropControllerTypes.Border\n  | typeof PropControllerTypes.GapY\n  | typeof PropControllerTypes.GapX\n  | typeof PropControllerTypes.BorderRadius\n  | typeof PropControllerTypes.Checkbox\n  | typeof PropControllerTypes.TextInput\n  | typeof PropControllerTypes.Link\n  | typeof PropControllerTypes.ResponsiveSelect\n  | typeof PropControllerTypes.ResponsiveColor\n  | typeof PropControllerTypes.TextStyle\n  | typeof PropControllerTypes.Images\n  | typeof PropControllerTypes.ResponsiveNumber\n  | typeof PropControllerTypes.Number\n  | typeof PropControllerTypes.Date\n  | typeof PropControllerTypes.Font\n  | typeof PropControllerTypes.TextArea\n  | typeof PropControllerTypes.Table\n  | typeof PropControllerTypes.Image\n  | typeof PropControllerTypes.ResponsiveOpacity\n  | typeof PropControllerTypes.SocialLinks\n  | typeof PropControllerTypes.Video\n  | typeof PropControllerTypes.NavigationLinks\n\nexport type PanelDescriptor<T extends Data = Data> = Extract<\n  Descriptor<T>,\n  { type: PanelDescriptorType }\n>\n\n// see https://github.com/prettier/prettier/issues/7940#issuecomment-2074455883\n// prettier-ignore\nexport type PropControllerDescriptorValueType<T extends PropControllerDescriptor> = T['type'] extends typeof PropControllerTypes.ResponsiveColor\n  ? // TODO(miguel): We're not importing a resolver type from `@makeswift/prop-controllers` because\n    // the resolved type is tightly coupled with the runtime (i.e., it's the result of an API call).\n    // This means that we probably want to rethink how types are resolved and where that lives.\n    ResponsiveColor | null | undefined\n  : T['type'] extends typeof PropControllerTypes.Backgrounds\n  ? ResolveBackgroundsPropControllerValue<\n      Extract<T, { type: typeof PropControllerTypes.Backgrounds }>\n    >\n  : T['type'] extends typeof PropControllerTypes.Checkbox\n  ? ResolveCheckboxPropControllerValue<Extract<T, { type: typeof PropControllerTypes.Checkbox }>>\n  : T['type'] extends typeof PropControllerTypes.Date\n  ? ResolveDatePropControllerValue<Extract<T, { type: typeof PropControllerTypes.Date }>>\n  : T['type'] extends typeof PropControllerTypes.ElementID\n  ? ResolveElementIDPropControllerValue<Extract<T, { type: typeof PropControllerTypes.ElementID }>>\n  : T['type'] extends typeof PropControllerTypes.Font\n  ? ResolveFontPropControllerValue<Extract<T, { type: typeof PropControllerTypes.Font }>>\n  : T['type'] extends typeof PropControllerTypes.GapX\n  ? PropValue<T> | undefined\n  : T['type'] extends typeof PropControllerTypes.GapY\n  ? ResolveGapYPropControllerValue<Extract<T, { type: typeof PropControllerTypes.GapY }>>\n  : T['type'] extends typeof PropControllerTypes.Grid\n  ? ResolveGridPropControllerValue<Extract<T, { type: typeof PropControllerTypes.Grid }>>\n  : T['type'] extends typeof PropControllerTypes.Image\n  ? ResolveImagePropControllerValue<Extract<T, { type: typeof PropControllerTypes.Image }>>\n  : T['type'] extends typeof PropControllerTypes.Images\n  ? ResolveImagesPropControllerValue<Extract<T, { type: typeof PropControllerTypes.Images }>>\n  : T['type'] extends typeof PropControllerTypes.ResponsiveIconRadioGroup\n  ? PropValue<T> | undefined\n  : T['type'] extends typeof PropControllerTypes.ResponsiveNumber\n  ? PropValue<T> | undefined\n  : T['type'] extends typeof PropControllerTypes.ResponsiveOpacity\n  ? PropValue<T> | undefined\n  : T['type'] extends typeof PropControllerTypes.ResponsiveSelect\n  ? PropValue<T> | undefined\n  : T['type'] extends typeof PropControllerTypes.Link\n  ? ResolveLinkPropControllerValue<Extract<T, { type: typeof PropControllerTypes.Link }>>\n  : T['type'] extends typeof PropControllerTypes.Width\n  ? ResolveWidthPropControllerValue<Extract<T, { type: typeof PropControllerTypes.Width }>>\n  : T['type'] extends typeof PropControllerTypes.Padding\n  ? ResolvePaddingPropControllerValue<Extract<T, { type: typeof PropControllerTypes.Padding }>>\n  : T['type'] extends typeof PropControllerTypes.Margin\n  ? ResolveMarginPropControllerValue<Extract<T, { type: typeof PropControllerTypes.Margin }>>\n  : T['type'] extends typeof PropControllerTypes.NavigationLinks\n  ? ResolveNavigationLinksPropControllerValue<\n      Extract<T, { type: typeof PropControllerTypes.NavigationLinks }>\n    >\n  : T['type'] extends typeof PropControllerTypes.BorderRadius\n  ? ResolveBorderRadiusPropControllerValue<\n      Extract<T, { type: typeof PropControllerTypes.BorderRadius }>\n    >\n  : T['type'] extends typeof PropControllerTypes.Shadows\n  ? ResolveShadowsPropControllerValue<Extract<T, { type: typeof PropControllerTypes.Shadows }>>\n  : T['type'] extends typeof PropControllerTypes.SocialLinks\n  ? ResolveSocialLinksPropControllerValue<\n      Extract<T, { type: typeof PropControllerTypes.SocialLinks }>\n    >\n  : T['type'] extends typeof PropControllerTypes.ResponsiveLength\n  ? ResolveResponsiveLengthPropControllerValue<\n      Extract<T, { type: typeof PropControllerTypes.ResponsiveLength }>\n    >\n  : T['type'] extends typeof PropControllerTypes.Border\n  ? ResolveBorderPropControllerValue<Extract<T, { type: typeof PropControllerTypes.Border }>>\n  : T['type'] extends typeof PropControllerTypes.Number\n  ? ResolveNumberPropControllerValue<Extract<T, { type: typeof PropControllerTypes.Number }>>\n  : T['type'] extends typeof PropControllerTypes.Table\n  ? ResolveTablePropControllerValue<Extract<T, { type: typeof PropControllerTypes.Table }>>\n  : T['type'] extends typeof PropControllerTypes.TableFormFields\n  ? ResolveTableFormFieldsPropControllerValue<\n      Extract<T, { type: typeof PropControllerTypes.TableFormFields }>\n    >\n  : T['type'] extends typeof PropControllerTypes.TextStyle\n  ? ResolveTextStylePropControllerValue<Extract<T, { type: typeof PropControllerTypes.TextStyle }>>\n  : T['type'] extends typeof PropControllerTypes.TextArea\n  ? ResolveTextAreaPropControllerValue<Extract<T, { type: typeof PropControllerTypes.TextArea }>>\n  : T['type'] extends typeof PropControllerTypes.TextInput\n  ? ResolveTextInputPropControllerValue<Extract<T, { type: typeof PropControllerTypes.TextInput }>>\n  : T['type'] extends typeof PropControllerTypes.Video\n  ? ResolveVideoPropControllerValue<Extract<T, { type: typeof PropControllerTypes.Video }>>\n  : T extends Descriptor<infer U>\n  ? U | undefined\n  : never\n\nexport type DescriptorValueType<T extends Descriptor> = T extends PropControllerDescriptor\n  ? PropControllerDescriptorValueType<T>\n  : T extends UnifiedControlDefinition\n    ? ResolvedValueType<T>\n    : T extends Descriptor<infer U>\n      ? U | undefined\n      : never\n\nexport type PanelDescriptorValueType<T extends PanelDescriptor> =\n  T extends PanelDescriptor<infer U> ? U : never\n"],"mappings":"AAAA;AAAA,EAEE,qBAAqB;AAAA,OAChB;AAiHA,SAAS,mBACd,SACgC;AAChC,SAAO,EAAE,mBAAmB;AAC9B;","names":[]}

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

@@ -1,12 +1,11 @@
 import * as Props from "./descriptors";
-import { RichTextPropControllerMessageType, TableFormFieldsMessageType } from "./instances";
+import { TableFormFieldsMessageType } from "./instances";
 import * as Introspection from "./introspection";
 import { DELETED_PROP_CONTROLLER_TYPES } from "./deleted";
 export {
   DELETED_PROP_CONTROLLER_TYPES,
   Introspection,
   Props,
-  RichTextPropControllerMessageType,
   TableFormFieldsMessageType
 };
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/prop-controllers/index.ts"],"sourcesContent":["export type {\n  Data,\n  Descriptor as PropControllerDescriptor,\n  DescriptorValueType as PropControllerDescriptorValueType,\n  PanelDescriptor,\n  PanelDescriptorType,\n  PanelDescriptorValueType,\n} from './descriptors'\nexport type {\n  ResponsiveValueType,\n  Device,\n  DeviceOverride,\n  ResponsiveValue,\n} from '@makeswift/prop-controllers'\nexport * as Props from './descriptors'\nexport type {\n  PropControllerMessage,\n  RichTextPropControllerMessage,\n  TableFormFieldsMessage,\n} from './instances'\nexport { RichTextPropControllerMessageType, TableFormFieldsMessageType } from './instances'\nexport * as Introspection from './introspection'\nexport { DELETED_PROP_CONTROLLER_TYPES } from './deleted'\n"],"mappings":"AAcA,YAAY,WAAW;AAMvB,SAAS,mCAAmC,kCAAkC;AAC9E,YAAY,mBAAmB;AAC/B,SAAS,qCAAqC;","names":[]}
+{"version":3,"sources":["../../../src/prop-controllers/index.ts"],"sourcesContent":["export type { Device, DeviceOverride, ResponsiveValue } from '@makeswift/controls'\n\nexport type {\n  Data,\n  Descriptor as PropControllerDescriptor,\n  DescriptorValueType as PropControllerDescriptorValueType,\n  PanelDescriptor,\n  PanelDescriptorType,\n  PanelDescriptorValueType,\n} from './descriptors'\n\nexport * as Props from './descriptors'\nexport type { PropControllerMessage, TableFormFieldsMessage } from './instances'\nexport { TableFormFieldsMessageType } from './instances'\nexport * as Introspection from './introspection'\nexport { DELETED_PROP_CONTROLLER_TYPES } from './deleted'\n"],"mappings":"AAWA,YAAY,WAAW;AAEvB,SAAS,kCAAkC;AAC3C,YAAY,mBAAmB;AAC/B,SAAS,qCAAqC;","names":[]}

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

@@ -1,130 +1,38 @@
-import { BuilderEditMode } from "../state/modules/builder-edit-mode";
+import { isLegacyDescriptor } from "./descriptors";
+import { Types as PropControllerTypes } from "@makeswift/prop-controllers";
 import {
-  ListControl,
-  ListControlType,
-  RichTextControl,
-  RichTextControlType,
-  ShapeControl,
-  ShapeControlType,
-  richTextDAOToDTO,
-  SlotControl,
-  SlotControlType,
-  StyleControl,
-  StyleControlType,
-  RichTextV2ControlType,
-  RichTextV2Control,
-  StyleV2Control,
-  StyleV2ControlType
-} from "../controls";
-import { PropController } from "./base";
-import {
-  Types as PropControllerTypes
-} from "@makeswift/prop-controllers";
-const RichTextPropControllerMessageType = {
-  CHANGE_BUILDER_EDIT_MODE: "CHANGE_BUILDER_EDIT_MODE",
-  INITIALIZE_EDITOR: "INITIALIZE_EDITOR",
-  CHANGE_EDITOR_VALUE: "CHANGE_EDITOR_VALUE",
-  FOCUS: "FOCUS",
-  BLUR: "BLUR",
-  UNDO: "UNDO",
-  REDO: "REDO",
-  CHANGE_BOX_MODEL: "CHANGE_BOX_MODEL"
-};
-class DefaultPropController extends PropController {
-  recv = (_message) => {
-  };
-}
-class RichTextPropController extends PropController {
-  editor = null;
-  recv = (message) => {
-    if (!this.editor)
-      return;
-    switch (message.type) {
-      case RichTextPropControllerMessageType.CHANGE_BUILDER_EDIT_MODE: {
-        switch (message.editMode) {
-          case BuilderEditMode.BUILD:
-          case BuilderEditMode.INTERACT:
-            this.editor.deselectAndBlur();
-        }
-        break;
-      }
-      case RichTextPropControllerMessageType.FOCUS: {
-        this.editor.focusAndSelectAll();
-        break;
-      }
-    }
-  };
-  setSlateEditor(editor) {
-    this.editor = editor;
-    this.send({
-      type: RichTextPropControllerMessageType.INITIALIZE_EDITOR,
-      value: richTextDAOToDTO(editor.children, editor.selection)
-    });
-    const _onChange = editor.onChange;
-    this.editor.onChange = (options) => {
-      _onChange(options);
-      if (options?.operation != null) {
-        this.send({
-          type: RichTextPropControllerMessageType.CHANGE_EDITOR_VALUE,
-          value: richTextDAOToDTO(editor.children, editor.selection)
-        });
-      }
-    };
-  }
-  focus() {
-    this.send({ type: RichTextPropControllerMessageType.FOCUS });
-  }
-  blur() {
-    this.send({ type: RichTextPropControllerMessageType.BLUR });
-  }
-  undo() {
-    this.send({ type: RichTextPropControllerMessageType.UNDO });
-  }
-  redo() {
-    this.send({ type: RichTextPropControllerMessageType.REDO });
-  }
-  changeBoxModel(boxModel) {
-    this.send({ type: RichTextPropControllerMessageType.CHANGE_BOX_MODEL, payload: { boxModel } });
-  }
-}
+  ControlInstance,
+  DefaultControlInstance
+} from "@makeswift/controls";
 const TableFormFieldsMessageType = {
   TABLE_FORM_LAYOUT_CHANGE: "TABLE_FORM_LAYOUT_CHANGE",
   TABLE_FORM_FIELD_LAYOUT_CHANGE: "TABLE_FORM_FIELD_LAYOUT_CHANGE"
 };
-class TableFormFieldsPropController extends PropController {
+class TableFormFieldsPropController extends ControlInstance {
   recv = () => {
   };
+  child(_key) {
+    return void 0;
+  }
   tableFormLayoutChange(payload) {
-    this.send({ type: TableFormFieldsMessageType.TABLE_FORM_LAYOUT_CHANGE, payload });
+    this.sendMessage({ type: TableFormFieldsMessageType.TABLE_FORM_LAYOUT_CHANGE, payload });
   }
   tableFormFieldLayoutChange(payload) {
-    this.send({ type: TableFormFieldsMessageType.TABLE_FORM_FIELD_LAYOUT_CHANGE, payload });
+    this.sendMessage({ type: TableFormFieldsMessageType.TABLE_FORM_FIELD_LAYOUT_CHANGE, payload });
   }
 }
 function createPropController(descriptor, send) {
+  if (!isLegacyDescriptor(descriptor)) {
+    return descriptor.createInstance(send);
+  }
   switch (descriptor.type) {
     case PropControllerTypes.TableFormFields:
       return new TableFormFieldsPropController(send);
-    case SlotControlType:
-      return new SlotControl(send);
-    case RichTextControlType:
-      return new RichTextControl(send);
-    case RichTextV2ControlType:
-      return new RichTextV2Control(send, descriptor);
-    case ListControlType:
-      return new ListControl(send, descriptor);
-    case ShapeControlType:
-      return new ShapeControl(send, descriptor);
-    case StyleControlType:
-      return new StyleControl(send);
-    case StyleV2ControlType:
-      return new StyleV2Control(send, descriptor);
     default:
-      return new DefaultPropController(send);
+      return new DefaultControlInstance(send);
   }
 }
 export {
-  RichTextPropControllerMessageType,
   TableFormFieldsMessageType,
   TableFormFieldsPropController,
   createPropController