@makeswift/runtime 0.9.10 → 0.9.12

package/dist/controls.cjs.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
-var typography = require("./typography.cjs.js");
+var textInput = require("./text-input.cjs.js");
 var reactPage = require("./react-page.cjs.js");
 var combobox = require("./combobox.cjs.js");
 require("redux");
@@ -13,21 +13,19 @@ require("@emotion/css");
 require("@emotion/serialize");
 require("@emotion/utils");
 require("slate");
-exports.Checkbox = typography.Checkbox;
-exports.CheckboxControlType = typography.CheckboxControlType;
-exports.IconRadioGroupControlType = typography.IconRadioGroupControlType;
-exports.Number = typography.Number;
-exports.NumberControlType = typography.NumberControlType;
-exports.Select = typography.Select;
-exports.SelectControlType = typography.SelectControlType;
-exports.TextArea = typography.TextArea;
-exports.TextAreaControlType = typography.TextAreaControlType;
-exports.TextInput = typography.TextInput;
-exports.TextInputControlType = typography.TextInputControlType;
-exports.TypographyControlType = typography.TypographyControlType;
-exports.unstable_IconRadioGroup = typography.unstable_IconRadioGroup;
-exports.unstable_IconRadioGroupIcon = typography.unstable_IconRadioGroupIcon;
-exports.unstable_Typography = typography.unstable_Typography;
+exports.Checkbox = textInput.Checkbox;
+exports.CheckboxControlType = textInput.CheckboxControlType;
+exports.IconRadioGroupControlType = textInput.IconRadioGroupControlType;
+exports.Number = textInput.Number;
+exports.NumberControlType = textInput.NumberControlType;
+exports.Select = textInput.Select;
+exports.SelectControlType = textInput.SelectControlType;
+exports.TextArea = textInput.TextArea;
+exports.TextAreaControlType = textInput.TextAreaControlType;
+exports.TextInput = textInput.TextInput;
+exports.TextInputControlType = textInput.TextInputControlType;
+exports.unstable_IconRadioGroup = textInput.unstable_IconRadioGroup;
+exports.unstable_IconRadioGroupIcon = textInput.unstable_IconRadioGroupIcon;
 exports.Color = reactPage.Color;
 exports.ColorControlType = reactPage.ColorControlType;
 exports.Image = reactPage.Image$1;
@@ -64,6 +62,7 @@ exports.StyleControlType = reactPage.StyleControlType;
 exports.StyleV2Control = reactPage.StyleV2Control;
 exports.StyleV2ControlMessageType = reactPage.StyleV2ControlMessageType;
 exports.StyleV2ControlType = reactPage.StyleV2ControlType;
+exports.TypographyControlType = reactPage.TypographyControlType;
 exports.copy = reactPage.copy;
 exports.copyColorData = reactPage.copyColorData;
 exports.copyImageData = reactPage.copyImageData;
@@ -73,8 +72,18 @@ exports.copyShapeData = reactPage.copyShapeData;
 exports.copySlotData = reactPage.copySlotData;
 exports.copyStyleData = reactPage.copyStyleData;
 exports.createRichTextV2Plugin = reactPage.createRichTextV2Plugin;
-exports.introspectListData = reactPage.introspectListData;
-exports.introspectShapeData = reactPage.introspectShapeData;
+exports.getListElementChildren = reactPage.getListElementChildren;
+exports.getListFileIds = reactPage.getListFileIds;
+exports.getListPageIds = reactPage.getListPageIds;
+exports.getListSwatchIds = reactPage.getListSwatchIds;
+exports.getListTypographyIds = reactPage.getListTypographyIds;
+exports.getShapeElementChildren = reactPage.getShapeElementChildren;
+exports.getShapeFileIds = reactPage.getShapeFileIds;
+exports.getShapePageIds = reactPage.getShapePageIds;
+exports.getShapeSwatchIds = reactPage.getShapeSwatchIds;
+exports.getShapeTypographyIds = reactPage.getShapeTypographyIds;
+exports.getTypographySwatchIds = reactPage.getTypographySwatchIds;
+exports.getTypographyTypographyIds = reactPage.getTypographyTypographyIds;
 exports.isRichTextV1Data = reactPage.isRichTextV1Data;
 exports.merge = reactPage.merge;
 exports.mergeSlotData = reactPage.mergeSlotData;
@@ -86,6 +95,7 @@ exports.richTextV2DescendentsToData = reactPage.richTextV2DescendentsToData;
 exports.toSelectionDTO = reactPage.toSelectionDTO;
 exports.unstable_RichTextV2 = reactPage.unstable_RichTextV2;
 exports.unstable_StyleV2 = reactPage.unstable_StyleV2;
+exports.unstable_Typography = reactPage.unstable_Typography;
 exports.unstable_useStyleV2ClassName = reactPage.unstable_useStyleV2ClassName;
 exports.Combobox = combobox.Combobox;
 exports.ComboboxControlType = combobox.ComboboxControlType;

package/dist/controls.cjs.js.map

@@ -1 +1 @@
-{"version":3,"file":"controls.cjs.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"controls.cjs.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/dist/controls.es.js

@@ -1,5 +1,5 @@
-export { c as Checkbox, C as CheckboxControlType, I as IconRadioGroupControlType, e as Number, N as NumberControlType, f as Select, S as SelectControlType, g as TextArea, a as TextAreaControlType, h as TextInput, b as TextInputControlType, T as TypographyControlType, d as unstable_IconRadioGroup, u as unstable_IconRadioGroupIcon, i as unstable_Typography } from "./typography.es.js";
-export { ay as Color, ac as ColorControlType, aC as Image, ab as ImageControlType, a0 as ImageControlValueFormat, aE as Link, aa as LinkControlType, aG as List, aI as ListControl, aH as ListControlMessageType, a8 as ListControlType, b1 as ObjectType, b2 as RichText, b4 as RichTextControl, b3 as RichTextControlMessageType, a5 as RichTextControlType, bd as RichTextV2Control, bc as RichTextV2ControlMessageType, a4 as RichTextV2ControlType, b9 as RichTextV2Mode, aL as Shape, aN as ShapeControl, aM as ShapeControlMessageType, a9 as ShapeControlType, aQ as Slot, aS as SlotControl, aR as SlotControlMessageType, a6 as SlotControlType, aV as Style, aX as StyleControl, aW as StyleControlMessageType, $ as StyleControlProperty, a3 as StyleControlType, b0 as StyleV2Control, a$ as StyleV2ControlMessageType, a7 as StyleV2ControlType, aA as copy, az as copyColorData, aD as copyImageData, aF as copyLinkData, aJ as copyListData, aO as copyShapeData, aT as copySlotData, aY as copyStyleData, ba as createRichTextV2Plugin, aK as introspectListData, aP as introspectShapeData, a2 as isRichTextV1Data, aB as merge, aU as mergeSlotData, b8 as richTextDAOToDTO, b6 as richTextDTOtoDAO, b5 as richTextDTOtoSelection, be as richTextV2DataToDescendents, bf as richTextV2DescendentsToData, b7 as toSelectionDTO, bb as unstable_RichTextV2, a_ as unstable_StyleV2, aZ as unstable_useStyleV2ClassName } from "./react-page.es.js";
+export { b as Checkbox, C as CheckboxControlType, I as IconRadioGroupControlType, d as Number, N as NumberControlType, e as Select, S as SelectControlType, f as TextArea, T as TextAreaControlType, g as TextInput, a as TextInputControlType, c as unstable_IconRadioGroup, u as unstable_IconRadioGroupIcon } from "./text-input.es.js";
+export { az as Color, ad as ColorControlType, aD as Image, ac as ImageControlType, $ as ImageControlValueFormat, aF as Link, ab as LinkControlType, aH as List, aJ as ListControl, aI as ListControlMessageType, a9 as ListControlType, ba as ObjectType, bb as RichText, bd as RichTextControl, bc as RichTextControlMessageType, a6 as RichTextControlType, bm as RichTextV2Control, bl as RichTextV2ControlMessageType, a5 as RichTextV2ControlType, bi as RichTextV2Mode, aQ as Shape, aS as ShapeControl, aR as ShapeControlMessageType, aa as ShapeControlType, aZ as Slot, a$ as SlotControl, a_ as SlotControlMessageType, a7 as SlotControlType, b2 as Style, b4 as StyleControl, b3 as StyleControlMessageType, _ as StyleControlProperty, a4 as StyleControlType, b9 as StyleV2Control, b8 as StyleV2ControlMessageType, a8 as StyleV2ControlType, a3 as TypographyControlType, aB as copy, aA as copyColorData, aE as copyImageData, aG as copyLinkData, aK as copyListData, aT as copyShapeData, b0 as copySlotData, b5 as copyStyleData, bj as createRichTextV2Plugin, aL as getListElementChildren, aN as getListFileIds, aP as getListPageIds, aM as getListSwatchIds, aO as getListTypographyIds, aU as getShapeElementChildren, aY as getShapeFileIds, aX as getShapePageIds, aV as getShapeSwatchIds, aW as getShapeTypographyIds, bq as getTypographySwatchIds, br as getTypographyTypographyIds, a1 as isRichTextV1Data, aC as merge, b1 as mergeSlotData, bh as richTextDAOToDTO, bf as richTextDTOtoDAO, be as richTextDTOtoSelection, bn as richTextV2DataToDescendents, bo as richTextV2DescendentsToData, bg as toSelectionDTO, bk as unstable_RichTextV2, b7 as unstable_StyleV2, bp as unstable_Typography, b6 as unstable_useStyleV2ClassName } from "./react-page.es.js";
 export { a as Combobox, C as ComboboxControlType } from "./combobox.es.js";
 import "redux";
 import "redux-thunk";

package/dist/index.cjs.js

@@ -41,7 +41,7 @@ var dynamic = require("next/dynamic");
 var reactPage = require("./react-page.cjs.js");
 var actions = require("./actions.cjs.js");
 var jsxRuntime = require("react/jsx-runtime");
-var typography = require("./typography.cjs.js");
+var textInput = require("./text-input.cjs.js");
 var combobox = require("./combobox.cjs.js");
 require("slate");
 var shim = require("use-sync-external-store/shim");
@@ -950,7 +950,8 @@ Received "${apiKey}" instead.`);
     return response;
   }
   async getPages() {
-    const response = await this.fetch(`/v2/pages`, {
+    const isUsingVersioning = this.siteVersion != null;
+    const response = await this.fetch(`/${isUsingVersioning ? "v3" : "v2"}/pages`, {
       headers: {
         "Makeswift-Site-Version": MakeswiftSiteVersion.Live
       }
@@ -968,7 +969,8 @@ Received "${apiKey}" instead.`);
   }
   async getSwatches(ids, preview) {
     var _a;
-    const url = new URL(`v1/swatches/bulk`, this.apiOrigin);
+    const isUsingVersioning = this.siteVersion != null;
+    const url = new URL(`${isUsingVersioning ? "v2" : "v1"}/swatches/bulk`, this.apiOrigin);
     ids.forEach((id) => {
       url.searchParams.append("ids", id);
     });
@@ -1051,8 +1053,8 @@ Received "${apiKey}" instead.`);
       getResourcesFromElementDescriptors(elementDescriptors, element2.props);
     }
     const typographies = await this.getTypographies([...typographyIds]);
-    typographies.forEach((typography2) => {
-      typography2 == null ? void 0 : typography2.style.forEach((style) => {
+    typographies.forEach((typography) => {
+      typography == null ? void 0 : typography.style.forEach((style) => {
         var _a;
         const swatchId = (_a = style.value.color) == null ? void 0 : _a.swatchId;
         if (swatchId != null)
@@ -1087,7 +1089,7 @@ Received "${apiKey}" instead.`);
         var _a;
         return {
           id,
-          value: (_a = typographies.find((typography2) => (typography2 == null ? void 0 : typography2.id) === id)) != null ? _a : null
+          value: (_a = typographies.find((typography) => (typography == null ? void 0 : typography.id) === id)) != null ? _a : null
         };
       }),
       [types.APIResourceType.Table]: [...tableIds].map((id) => {
@@ -1120,11 +1122,12 @@ Received "${apiKey}" instead.`);
     unstable_locale
   } = {}) {
     var _a;
+    const isUsingVersioning = this.siteVersion != null;
     const siteVersion = (_a = this.siteVersion) != null ? _a : previewOverride ? MakeswiftSiteVersion.Working : MakeswiftSiteVersion.Live;
     const searchParams = new URLSearchParams();
     if (unstable_locale)
       searchParams.set("locale", unstable_locale);
-    const response = await this.fetch(`/v2/pages/${encodeURIComponent(pathname)}/document?${searchParams.toString()}`, {
+    const response = await this.fetch(`/${isUsingVersioning ? "v3" : "v2"}/pages/${encodeURIComponent(pathname)}/document?${searchParams.toString()}`, {
       headers: { "Makeswift-Site-Version": siteVersion }
     });
     if (!response.ok) {
@@ -1147,7 +1150,8 @@ Received "${apiKey}" instead.`);
     };
   }
   async getSwatch(swatchId) {
-    const response = await this.fetch(`v1/swatches/${swatchId}`);
+    const isUsingVersioning = this.siteVersion != null;
+    const response = await this.fetch(`${isUsingVersioning ? "v2" : "v1"}/swatches/${swatchId}`);
     if (!response.ok) {
       if (response.status !== 404)
         console.error("Failed to get swatch", await response.json());
@@ -1236,7 +1240,7 @@ async function fonts(_req, res, { getFonts } = {}) {
   const fonts2 = (_a = await (getFonts == null ? void 0 : getFonts())) != null ? _a : [];
   return res.json(fonts2);
 }
-const version = "0.9.10";
+const version = "0.9.12";
 async function handler(req, res, { apiKey, unstable_siteVersions }) {
   if (req.query.secret !== apiKey) {
     return res.status(401).json({ message: "Unauthorized" });
@@ -2593,6 +2597,9 @@ const FallbackComponent = React.forwardRef(function FallbackComponent2({
     })]
   });
 });
+function isNonNullable(value) {
+  return value != null;
+}
 function useSwatch(swatchId) {
   const client = useMakeswiftClient();
   const readSwatch = () => swatchId == null ? null : client.readSwatch(swatchId);
@@ -2648,12 +2655,12 @@ function useFiles(fileIds) {
 function useTypography(typographyId) {
   const client = useMakeswiftClient();
   const readTypography = () => typographyId == null ? null : client.readTypography(typographyId);
-  const typography2 = shim.useSyncExternalStore(client.subscribe, readTypography, readTypography);
+  const typography = shim.useSyncExternalStore(client.subscribe, readTypography, readTypography);
   React.useEffect(() => {
     if (typographyId != null)
       client.fetchTypography(typographyId).catch(console.error);
   }, [client, typographyId]);
-  return typography2;
+  return typography;
 }
 function useGlobalElement(globalElementId) {
   const client = useMakeswiftClient();
@@ -2701,7 +2708,7 @@ function mapSideColor(swatches, _e) {
   return __spreadProps(__spreadValues({}, restOfSide), {
     color: color && {
       alpha: color.alpha,
-      swatch: swatches.filter(reactPage.isNonNullable).find((s) => s && s.id === color.swatchId)
+      swatch: swatches.filter(isNonNullable).find((s) => s && s.id === color.swatchId)
     }
   });
 }
@@ -2747,7 +2754,7 @@ function useBoxShadow(value) {
         return __spreadProps(__spreadValues({}, restOfShadow), {
           payload: {
             color: color != null ? {
-              swatch: swatches.filter(reactPage.isNonNullable).find((s) => s && s.id === color.swatchId),
+              swatch: swatches.filter(isNonNullable).find((s) => s && s.id === color.swatchId),
               alpha: color.alpha
             } : null,
             inset: inset != null ? inset : ShadowDefaultValue.inset,
@@ -2771,7 +2778,7 @@ function useResponsiveColor(color) {
     const { swatchId, alpha } = v;
     const swatch = swatches.find((s) => s && s.id === swatchId);
     return swatch == null ? null : __spreadProps(__spreadValues({}, rest), { value: { swatch, alpha } });
-  }).filter(reactPage.isNonNullable);
+  }).filter(isNonNullable);
 }
 const getIndexes = (spans, index) => {
   const flattened = spans.reduce((a, s) => a.concat(s), []);
@@ -3267,7 +3274,7 @@ function useRichTextV2(data, definition, control) {
     control
   }) : /* @__PURE__ */ jsxRuntime.jsx(ReadOnlyText, {
     text: data,
-    control
+    definition
   });
 }
 function useSelectControlValue(data, definition) {
@@ -3493,15 +3500,12 @@ function useTextAreaValue(data, definition) {
 function useTextInputValue(data, definition) {
   return data != null ? data : definition.config.defaultValue;
 }
-function isNonNullable(value) {
-  return value != null;
-}
-function typographyFragementToTypographyControlData(typography2) {
-  if (typography2 == null)
+function typographyFragementToTypographyControlData(typography) {
+  if (typography == null)
     return void 0;
   return {
-    id: typography2.id,
-    style: typography2.style.map(({ deviceId, value }) => {
+    id: typography.id,
+    style: typography.style.map(({ deviceId, value }) => {
       var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
       return {
         deviceId,
@@ -3527,7 +3531,7 @@ function getTypographyStyleSwatchIds(style) {
   return (_a = style == null ? void 0 : style.map((override) => override.value).flatMap((typographyStyle) => {
     var _a2;
     return (_a2 = typographyStyle.color) == null ? void 0 : _a2.swatchId;
-  }).filter(isNonNullable)) != null ? _a : [];
+  }).filter(reactPage.isNonNullable)) != null ? _a : [];
 }
 const withColor = (swatches) => (deviceRawTypographyValue) => {
   var _b, _c;
@@ -3555,15 +3559,15 @@ const withColor = (swatches) => (deviceRawTypographyValue) => {
 const getDeviceId = ({ deviceId }) => deviceId;
 function useEnhancedTypography(value) {
   var _a, _b, _c;
-  const typography2 = typographyFragementToTypographyControlData(useTypography((_a = value == null ? void 0 : value.id) != null ? _a : null));
-  const source = (_b = typography2 == null ? void 0 : typography2.style) != null ? _b : [];
+  const typography = typographyFragementToTypographyControlData(useTypography((_a = value == null ? void 0 : value.id) != null ? _a : null));
+  const source = (_b = typography == null ? void 0 : typography.style) != null ? _b : [];
   const override = (_c = value == null ? void 0 : value.style) != null ? _c : [];
   const breakpoints = useBreakpoints();
   const swatchIds = [
     ...getTypographyStyleSwatchIds(value == null ? void 0 : value.style),
-    ...getTypographyStyleSwatchIds(typography2 == null ? void 0 : typography2.style)
+    ...getTypographyStyleSwatchIds(typography == null ? void 0 : typography.style)
   ];
-  const swatches = useSwatches(swatchIds).filter(isNonNullable);
+  const swatches = useSwatches(swatchIds).filter(reactPage.isNonNullable);
   const enhancedSource = source.map(withColor(swatches));
   const enhancedOverride = override.map(withColor(swatches));
   const devices = [
@@ -3590,7 +3594,7 @@ function useEnhancedTypography(value) {
       };
     }
     return null;
-  }).filter(isNonNullable);
+  }).filter(reactPage.isNonNullable);
 }
 function useTypographyClassName(value) {
   return reactPage.useStyle(useResponsiveStyle([value], ([value2]) => {
@@ -3632,31 +3636,31 @@ function ControlValue({
   control
 }) {
   switch (definition.type) {
-    case typography.CheckboxControlType:
+    case textInput.CheckboxControlType:
       return /* @__PURE__ */ jsxRuntime.jsx(RenderHook, {
         hook: useCheckboxControlValue,
         parameters: [data, definition],
         children: (value) => children(value)
       }, definition.type);
-    case typography.NumberControlType:
+    case textInput.NumberControlType:
       return /* @__PURE__ */ jsxRuntime.jsx(RenderHook, {
         hook: useNumber,
         parameters: [data, definition],
         children: (value) => children(value)
       }, definition.type);
-    case typography.TextInputControlType:
+    case textInput.TextInputControlType:
       return /* @__PURE__ */ jsxRuntime.jsx(RenderHook, {
         hook: useTextInputValue,
         parameters: [data, definition],
         children: (value) => children(value)
       }, definition.type);
-    case typography.TextAreaControlType:
+    case textInput.TextAreaControlType:
       return /* @__PURE__ */ jsxRuntime.jsx(RenderHook, {
         hook: useTextAreaValue,
         parameters: [data, definition],
         children: (value) => children(value)
       }, definition.type);
-    case typography.SelectControlType:
+    case textInput.SelectControlType:
       return /* @__PURE__ */ jsxRuntime.jsx(RenderHook, {
         hook: useSelectControlValue,
         parameters: [data, definition],
@@ -3668,7 +3672,7 @@ function ControlValue({
         parameters: [data, definition],
         children: (value) => children(value)
       }, definition.type);
-    case typography.IconRadioGroupControlType:
+    case textInput.IconRadioGroupControlType:
       return /* @__PURE__ */ jsxRuntime.jsx(RenderHook, {
         hook: useIconRadioGroupValue,
         parameters: [data, definition],
@@ -3737,7 +3741,7 @@ function ControlValue({
         parameters: [data, definition, control],
         children: (value) => children(value)
       }, definition.type);
-    case typography.TypographyControlType:
+    case reactPage.TypographyControlType:
       return /* @__PURE__ */ jsxRuntime.jsx(RenderHook, {
         hook: useTypographyValue,
         parameters: [data],
@@ -3784,20 +3788,20 @@ function PropsValue({
   return Object.entries(propControllerDescriptorsRef.current).reduceRight((renderFn, [propName, descriptor]) => (propsValue) => {
     var _a2, _b, _c, _d;
     switch (descriptor.type) {
-      case typography.CheckboxControlType:
-      case typography.NumberControlType:
-      case typography.TextInputControlType:
-      case typography.TextAreaControlType:
-      case typography.SelectControlType:
+      case textInput.CheckboxControlType:
+      case textInput.NumberControlType:
+      case textInput.TextInputControlType:
+      case textInput.TextAreaControlType:
+      case textInput.SelectControlType:
       case reactPage.ColorControlType:
-      case typography.IconRadioGroupControlType:
+      case textInput.IconRadioGroupControlType:
       case reactPage.ImageControlType:
       case combobox.ComboboxControlType:
       case reactPage.ShapeControlType:
       case reactPage.ListControlType:
       case reactPage.LinkControlType:
       case reactPage.StyleV2ControlType:
-      case typography.TypographyControlType:
+      case reactPage.TypographyControlType:
         return /* @__PURE__ */ jsxRuntime.jsx(ControlValue, {
           definition: descriptor,
           data: props[propName],
@@ -4328,6 +4332,7 @@ exports.forwardNextDynamicRef = forwardNextDynamicRef;
 exports.getServerSideProps = getServerSideProps;
 exports.getStaticPaths = getStaticPaths;
 exports.getStaticProps = getStaticProps;
+exports.isNonNullable = isNonNullable;
 exports.pollBoxModel = pollBoxModel;
 exports.shallowEqual = shallowEqual;
 exports.useBorder = useBorder;