@makeswift/runtime 0.12.3 → 0.13.0

package/dist/LiveProvider.es.js

@@ -1,6 +1,6 @@
 import { useMemo } from "react";
 import { a as ReactRuntime, K as StoreContext, M as MakeswiftProvider } from "./index.es.js";
-import { av as configureStore } from "./react-page.es.js";
+import { az as configureStore } from "./react-page.es.js";
 import { jsx } from "react/jsx-runtime";
 import "use-sync-external-store/shim/with-selector";
 import "next/dynamic";

package/dist/PreviewProvider.es.js

@@ -23,7 +23,7 @@ import { J as ElementImperativeHandle, a as ReactRuntime, K as StoreContext, M a
 import { createStore, applyMiddleware, combineReducers } from "redux";
 import thunk from "redux-thunk";
 import Router from "next/router";
-import { ca as getInitialState$3, cb as reducer$4, cc as getDocument$1, c as createDocument, cd as getComponentsMeta$1, ce as getComponentPropControllerDescriptors$1, ax as getBreakpoints, f as deepEqual, aE as getBuilderEditMode, cf as BuilderEditMode, cg as getDocumentKeysSortedByDepth, ch as getPropController, ci as getPropControllersHandle, cj as getElement, ck as getElementPropControllerDescriptors, cl as createPropController, j as isElementReference, a4 as isPropControllersHandle, cm as reducer$5, cn as reducer$7, co as reducer$8, cp as reducer$9, cq as reducer$a, cr as reducer$b, cs as reducer$c, ct as getInitialState$4 } from "./react-page.es.js";
+import { ce as getInitialState$3, cf as reducer$4, cg as getDocument$1, c as createDocument, ch as getComponentsMeta$1, ci as getComponentPropControllerDescriptors$1, aB as getBreakpoints, f as deepEqual, aI as getBuilderEditMode, cj as BuilderEditMode, ck as getDocumentKeysSortedByDepth, cl as getPropController, cm as getPropControllersHandle, cn as getElement, co as getElementPropControllerDescriptors, cp as createPropController, j as isElementReference, a4 as isPropControllersHandle, cq as reducer$5, cr as reducer$7, cs as reducer$8, ct as reducer$9, cu as reducer$a, cv as reducer$b, cw as reducer$c, cx as getInitialState$4 } from "./react-page.es.js";
 import { removeIn, setIn } from "immutable";
 import { A as ActionTypes, v as unregisterMeasurable, w as registerMeasurable, x as registerBuilderComponent, j as setBreakpoints, k as setLocale, y as changePathnameStart, z as changePathnameComplete, B as changeElementBoxModels, C as changeDocumentElementSize, D as handleWheel, E as handlePointerMove, F as elementFromPointChange, G as setIsInBuilder, H as unregisterBuilderComponent, I as unregisterPropControllers, J as registerPropControllers, K as registerPropControllersHandle, r as registerDocument, L as registerComponentHandle, M as messageBuilderPropController, N as registerDocumentEffect } from "./actions.es.js";
 import { i as isMeasurable, a as getMeasurables$1, b as getBoxModels$1, m as measure, d as getBoxModel$1, r as reducer$6 } from "./box-models.es.js";

package/dist/ReadOnlyText.es.js

@@ -2,7 +2,7 @@ import { cx } from "@emotion/css";
 import { forwardRef } from "react";
 import { L as useEnhancedTypography, N as useTypographyClassName, n as useResponsiveStyle } from "./index.es.js";
 import "ts-pattern";
-import { bD as richTextDTOtoDAO, _ as useStyle, c1 as BlockType, c2 as InlineType } from "./react-page.es.js";
+import { bH as richTextDTOtoDAO, _ as useStyle, c5 as BlockType, c6 as InlineType } from "./react-page.es.js";
 import "./actions.es.js";
 import "slate";
 import "uuid";

package/dist/ReadOnlyTextV2.es.js

@@ -15,7 +15,7 @@ var __objRest = (source, exclude) => {
 };
 import { forwardRef } from "react";
 import "ts-pattern";
-import { bG as RichTextV2Mode, bZ as InlineModePlugin, bX as BlockPlugin, bS as TypographyPlugin, b$ as TextAlignPlugin, c5 as InlinePlugin, _ as useStyle } from "./react-page.es.js";
+import { bK as RichTextV2Mode, c1 as InlineModePlugin, b$ as BlockPlugin, bW as TypographyPlugin, c3 as TextAlignPlugin, c9 as InlinePlugin, _ as useStyle } from "./react-page.es.js";
 import "./actions.es.js";
 import "slate";
 import "uuid";

package/dist/control-serialization.es.js

@@ -32,7 +32,7 @@ var __objRest = (source, exclude) => {
 const import_meta = {};
 import "ts-pattern";
 import { C as ComboboxControlType } from "./combobox.es.js";
-import { ad as ListControlType, ae as ShapeControlType, ac as StyleV2ControlType, a9 as RichTextV2ControlType, ao as Types } from "./react-page.es.js";
+import { ah as ListControlType, ai as ShapeControlType, ag as StyleV2ControlType, ad as RichTextV2ControlType, as as Types } from "./react-page.es.js";
 import "./actions.es.js";
 import "uuid";
 import "slate";

package/dist/controls.cjs.js

@@ -22,14 +22,17 @@ require("@emotion/css");
 require("@emotion/serialize");
 require("@emotion/utils");
 exports.Checkbox = number.Checkbox;
+exports.CheckboxControlDataTypeKey = number.CheckboxControlDataTypeKey;
+exports.CheckboxControlDataTypeValueV1 = number.CheckboxControlDataTypeValueV1;
 exports.CheckboxControlType = number.CheckboxControlType;
 exports.Number = number.Number;
+exports.NumberControlDataTypeKey = number.NumberControlDataTypeKey;
+exports.NumberControlDataTypeValueV1 = number.NumberControlDataTypeValueV1;
 exports.NumberControlType = number.NumberControlType;
 exports.Color = reactPage.Color;
 exports.ColorControlDataTypeKey = reactPage.ColorControlDataTypeKey;
 exports.ColorControlDataTypeValueV1 = reactPage.ColorControlDataTypeValueV1;
 exports.ColorControlType = reactPage.ColorControlType;
-exports.ControlDataTypeKey = reactPage.ControlDataTypeKey;
 exports.IconRadioGroupControlType = reactPage.IconRadioGroupControlType;
 exports.Image = reactPage.Image$1;
 exports.ImageControlType = reactPage.ImageControlType;
@@ -68,8 +71,12 @@ exports.StyleV2Control = reactPage.StyleV2Control;
 exports.StyleV2ControlMessageType = reactPage.StyleV2ControlMessageType;
 exports.StyleV2ControlType = reactPage.StyleV2ControlType;
 exports.TextArea = reactPage.TextArea$1;
+exports.TextAreaControlDataTypeKey = reactPage.TextAreaControlDataTypeKey;
+exports.TextAreaControlDataTypeValueV1 = reactPage.TextAreaControlDataTypeValueV1;
 exports.TextAreaControlType = reactPage.TextAreaControlType;
 exports.TextInput = reactPage.TextInput$1;
+exports.TextInputControlDataTypeKey = reactPage.TextInputControlDataTypeKey;
+exports.TextInputControlDataTypeValueV1 = reactPage.TextInputControlDataTypeValueV1;
 exports.TextInputControlType = reactPage.TextInputControlType;
 exports.TypographyControlType = reactPage.TypographyControlType;
 exports.copy = reactPage.copy$3;

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 { a as Checkbox, C as CheckboxControlType, b as Number, N as NumberControlType } from "./number.es.js";
-export { aL as Color, aJ as ColorControlDataTypeKey, aK as ColorControlDataTypeValueV1, ai as ColorControlType, aI as ControlDataTypeKey, ah as IconRadioGroupControlType, aT as Image, ag as ImageControlType, a3 as ImageControlValueFormat, aV as Link, af as LinkControlType, aX as List, aZ as ListControl, aY as ListControlMessageType, ad as ListControlType, bz as ObjectType, Y as RichText, bB as RichTextControl, bA as RichTextControlMessageType, aa as RichTextControlType, bI as RichTextV2Control, bH as RichTextV2ControlMessageType, a9 as RichTextV2ControlType, bG as RichTextV2Mode, b6 as Select, aj as SelectControlType, b7 as Shape, b9 as ShapeControl, b8 as ShapeControlMessageType, ae as ShapeControlType, bi as Slot, bk as SlotControl, bj as SlotControlMessageType, ab as SlotControlType, bo as Style, bq as StyleControl, bp as StyleControlMessageType, a2 as StyleControlProperty, a8 as StyleControlType, bv as StyleV2Control, bu as StyleV2ControlMessageType, ac as StyleV2ControlType, bw as TextArea, ak as TextAreaControlType, bx as TextInput, al as TextInputControlType, a7 as TypographyControlType, aN as copy, aM as copyColorData, aU as copyImageData, aW as copyLinkData, a_ as copyListData, by as copyRichTextData, ba as copyShapeData, bl as copySlotData, br as copyStyleData, bL as createRichTextV2Plugin, a$ as getListElementChildren, b1 as getListFileIds, b3 as getListPageIds, b0 as getListSwatchIds, b4 as getListTranslatableData, b2 as getListTypographyIds, bb as getShapeElementChildren, bf as getShapeFileIds, be as getShapePageIds, bc as getShapeSwatchIds, bg as getShapeTranslatableData, bd as getShapeTypographyIds, aP as getTranslatableData, bN as getTypographySwatchIds, bO as getTypographyTypographyIds, a5 as isRichTextV1Data, aO as merge, b5 as mergeListTranslatedData, bh as mergeShapeTranslatedData, bn as mergeSlotControlTranslatedData, bm as mergeSlotData, aQ as mergeTranslatedData, bF as richTextDAOToDTO, bD as richTextDTOtoDAO, bC as richTextDTOtoSelection, bJ as richTextV2DataToDescendents, bK as richTextV2DescendentsToData, bE as toSelectionDTO, aS as unstable_IconRadioGroup, aR as unstable_IconRadioGroupIcon, bt as unstable_StyleV2, bM as unstable_Typography, bs as unstable_useStyleV2ClassName } from "./react-page.es.js";
+export { e as Checkbox, C as CheckboxControlDataTypeKey, a as CheckboxControlDataTypeValueV1, d as CheckboxControlType, f as Number, N as NumberControlDataTypeKey, b as NumberControlDataTypeValueV1, c as NumberControlType } from "./number.es.js";
+export { aP as Color, aN as ColorControlDataTypeKey, aO as ColorControlDataTypeValueV1, am as ColorControlType, al as IconRadioGroupControlType, aX as Image, ak as ImageControlType, a3 as ImageControlValueFormat, aZ as Link, aj as LinkControlType, a$ as List, b1 as ListControl, b0 as ListControlMessageType, ah as ListControlType, bD as ObjectType, Y as RichText, bF as RichTextControl, bE as RichTextControlMessageType, ae as RichTextControlType, bM as RichTextV2Control, bL as RichTextV2ControlMessageType, ad as RichTextV2ControlType, bK as RichTextV2Mode, ba as Select, an as SelectControlType, bb as Shape, bd as ShapeControl, bc as ShapeControlMessageType, ai as ShapeControlType, bm as Slot, bo as SlotControl, bn as SlotControlMessageType, af as SlotControlType, bs as Style, bu as StyleControl, bt as StyleControlMessageType, a2 as StyleControlProperty, ac as StyleControlType, bz as StyleV2Control, by as StyleV2ControlMessageType, ag as StyleV2ControlType, bA as TextArea, a6 as TextAreaControlDataTypeKey, a7 as TextAreaControlDataTypeValueV1, ao as TextAreaControlType, bB as TextInput, a8 as TextInputControlDataTypeKey, a9 as TextInputControlDataTypeValueV1, ap as TextInputControlType, ab as TypographyControlType, aR as copy, aQ as copyColorData, aY as copyImageData, a_ as copyLinkData, b2 as copyListData, bC as copyRichTextData, be as copyShapeData, bp as copySlotData, bv as copyStyleData, bP as createRichTextV2Plugin, b3 as getListElementChildren, b5 as getListFileIds, b7 as getListPageIds, b4 as getListSwatchIds, b8 as getListTranslatableData, b6 as getListTypographyIds, bf as getShapeElementChildren, bj as getShapeFileIds, bi as getShapePageIds, bg as getShapeSwatchIds, bk as getShapeTranslatableData, bh as getShapeTypographyIds, aT as getTranslatableData, bR as getTypographySwatchIds, bS as getTypographyTypographyIds, a5 as isRichTextV1Data, aS as merge, b9 as mergeListTranslatedData, bl as mergeShapeTranslatedData, br as mergeSlotControlTranslatedData, bq as mergeSlotData, aU as mergeTranslatedData, bJ as richTextDAOToDTO, bH as richTextDTOtoDAO, bG as richTextDTOtoSelection, bN as richTextV2DataToDescendents, bO as richTextV2DescendentsToData, bI as toSelectionDTO, aW as unstable_IconRadioGroup, aV as unstable_IconRadioGroupIcon, bx as unstable_StyleV2, bQ as unstable_Typography, bw 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

@@ -810,16 +810,11 @@ const getPageAPISchema = zod.z.object({
   }))
 });
 class Makeswift {
-  constructor(apiKey, {
-    apiOrigin = "https://api.makeswift.com",
-    runtime = ReactRuntime,
-    siteVersion
-  } = {}) {
+  constructor(apiKey, { apiOrigin = "https://api.makeswift.com", runtime = ReactRuntime } = {}) {
     __publicField(this, "apiKey");
     __publicField(this, "apiOrigin");
     __publicField(this, "graphqlClient");
     __publicField(this, "runtime");
-    __publicField(this, "siteVersion");
     if (typeof apiKey !== "string") {
       throw new Error(`The Makeswift client must be passed a valid Makeswift site API key: \`new Makeswift('<makeswift_site_api_key>')\`
 Received "${apiKey}" instead.`);
@@ -832,29 +827,25 @@ Received "${apiKey}" instead.`);
     }
     this.graphqlClient = new GraphQLClient(new URL("graphql", apiOrigin).href);
     this.runtime = runtime;
-    this.siteVersion = siteVersion != null ? siteVersion : null;
   }
   static getSiteVersion(previewData) {
     var _a;
     return (_a = getMakeswiftSiteVersion(previewData)) != null ? _a : MakeswiftSiteVersion.Live;
   }
-  async fetch(path, init) {
-    var _a;
+  async fetch(path, siteVersion = MakeswiftSiteVersion.Live, init) {
     const response = await fetch(new URL(path, this.apiOrigin).toString(), __spreadProps(__spreadValues({}, init), {
       headers: __spreadValues({
         ["X-API-Key"]: this.apiKey,
         "Makeswift-Site-API-Key": this.apiKey,
-        "Makeswift-Site-Version": (_a = this.siteVersion) != null ? _a : MakeswiftSiteVersion.Live
+        "Makeswift-Site-Version": siteVersion
       }, init == null ? void 0 : init.headers)
     }));
     return response;
   }
-  async getPages() {
-    const response = await this.fetch(`/${this.siteVersion == null ? "v2" : "v3"}/pages`, {
-      headers: {
-        "Makeswift-Site-Version": MakeswiftSiteVersion.Live
-      }
-    });
+  async getPages({
+    siteVersion = MakeswiftSiteVersion.Live
+  } = {}) {
+    const response = await this.fetch(`v3/pages`, siteVersion);
     if (!response.ok) {
       console.error("Failed to get pages", await response.json());
       throw new Error(`Failed to get pages with error: "${response.statusText}"`);
@@ -863,17 +854,13 @@ Received "${apiKey}" instead.`);
     return json;
   }
   async getPage(pathname, {
-    preview: previewOverride = false,
+    siteVersion = MakeswiftSiteVersion.Live,
     locale: localeInput
   } = {}) {
-    var _a;
-    const siteVersion = (_a = this.siteVersion) != null ? _a : previewOverride ? MakeswiftSiteVersion.Working : MakeswiftSiteVersion.Live;
-    const url = new URL(`${this.siteVersion == null ? "v1" : "v2"}/pages/${encodeURIComponent(pathname)}`, this.apiOrigin);
+    const url = new URL(`v2/pages/${encodeURIComponent(pathname)}`, this.apiOrigin);
     if (localeInput)
       url.searchParams.set("locale", localeInput);
-    const response = await this.fetch(url.pathname + url.search, {
-      headers: { "Makeswift-Site-Version": siteVersion }
-    });
+    const response = await this.fetch(url.pathname + url.search, siteVersion);
     if (!response.ok) {
       if (response.status === 404)
         return null;
@@ -883,19 +870,14 @@ Received "${apiKey}" instead.`);
     const json = await response.json();
     return getPageAPISchema.parse(json);
   }
-  async getTypographies(typographyIds, preview) {
-    var _a;
+  async getTypographies(typographyIds, siteVersion) {
     if (typographyIds.length === 0)
       return [];
-    const url = new URL(`${this.siteVersion == null ? "v1" : "v2"}/typographies/bulk`, this.apiOrigin);
+    const url = new URL(`v2/typographies/bulk`, this.apiOrigin);
     typographyIds.forEach((id) => {
       url.searchParams.append("ids", id);
     });
-    const response = await this.fetch(url.pathname + url.search, {
-      headers: {
-        "Makeswift-Site-Version": (_a = this.siteVersion) != null ? _a : preview ? MakeswiftSiteVersion.Working : MakeswiftSiteVersion.Live
-      }
-    });
+    const response = await this.fetch(url.pathname + url.search, siteVersion);
     if (!response.ok) {
       console.error("Failed to get typographies", await response.json());
       return [];
@@ -903,36 +885,31 @@ Received "${apiKey}" instead.`);
     const body = await response.json();
     return body;
   }
-  async getSwatches(ids, preview) {
-    var _a;
+  async getSwatches(ids, siteVersion) {
     if (ids.length === 0)
       return [];
-    const url = new URL(`${this.siteVersion == null ? "v1" : "v2"}/swatches/bulk`, this.apiOrigin);
+    const url = new URL(`v2/swatches/bulk`, this.apiOrigin);
     ids.forEach((id) => {
       url.searchParams.append("ids", id);
     });
-    const response = await this.fetch(url.pathname + url.search, {
-      headers: {
-        "Makeswift-Site-Version": (_a = this.siteVersion) != null ? _a : preview ? MakeswiftSiteVersion.Working : MakeswiftSiteVersion.Live
-      }
-    });
+    const response = await this.fetch(url.pathname + url.search, siteVersion);
     if (!response.ok) {
       console.error("Failed to get swatches", await response.json());
       return [];
     }
     return await response.json();
   }
-  async getIntrospectedResources(_a, preview) {
+  async getIntrospectedResources(_a, siteVersion) {
     var _b = _a, {
       swatchIds
     } = _b, introspectedResourceIds = __objRest(_b, [
       "swatchIds"
     ]);
     const result = await this.graphqlClient.request(IntrospectedResourcesQuery, introspectedResourceIds);
-    const swatches = await this.getSwatches(swatchIds, preview);
+    const swatches = await this.getSwatches(swatchIds, siteVersion);
     return __spreadProps(__spreadValues({}, result), { swatches });
   }
-  async introspect(element, preview, locale) {
+  async introspect(element, siteVersion, locale) {
     var _a;
     const runtime = this.runtime;
     const descriptors = reactPage.getPropControllerDescriptors(runtime.store.getState());
@@ -968,10 +945,10 @@ Received "${apiKey}" instead.`);
       let element2;
       if (reactPage.isElementReference(current)) {
         const globalElementId = current.value;
-        const globalElement = await this.getGlobalElement(globalElementId);
+        const globalElement = await this.getGlobalElement(globalElementId, siteVersion);
         let elementData = globalElement == null ? void 0 : globalElement.data;
         if (locale) {
-          const localizedGlobalElement = await this.getLocalizedGlobalElement(globalElementId, locale);
+          const localizedGlobalElement = await this.getLocalizedGlobalElement(globalElementId, locale, siteVersion);
           localizedResourcesMap.set(globalElementId, (_a = localizedGlobalElement == null ? void 0 : localizedGlobalElement.id) != null ? _a : null);
           if (localizedGlobalElement) {
             elementData = localizedGlobalElement.data;
@@ -990,7 +967,7 @@ Received "${apiKey}" instead.`);
         continue;
       getResourcesFromElementDescriptors(elementDescriptors, element2.props);
     }
-    const typographies = await this.getTypographies([...typographyIds], preview);
+    const typographies = await this.getTypographies([...typographyIds], siteVersion);
     typographies.forEach((typography) => {
       typography == null ? void 0 : typography.style.forEach((style) => {
         var _a2;
@@ -999,12 +976,12 @@ Received "${apiKey}" instead.`);
           swatchIds.add(swatchId);
       });
     });
-    const pagePathnames = await this.getPagePathnameSlices([...pageIds], { preview, locale });
+    const pagePathnames = await this.getPagePathnameSlices([...pageIds], siteVersion, { locale });
     const { swatches, files, tables } = await this.getIntrospectedResources({
       swatchIds: [...swatchIds],
       fileIds: [...fileIds],
       tableIds: [...tableIds]
-    }, preview);
+    }, siteVersion);
     const cacheData = {
       [types.APIResourceType.Swatch]: [...swatchIds].map((id) => {
         var _a2;
@@ -1052,19 +1029,13 @@ Received "${apiKey}" instead.`);
     };
     return { cacheData, localizedResourcesMap: Object.fromEntries(localizedResourcesMap.entries()) };
   }
-  async getPageSnapshot(pathname, {
-    preview: previewOverride = false,
-    locale: localeInput
-  } = {}) {
-    var _a, _b;
-    const siteVersion = (_a = this.siteVersion) != null ? _a : previewOverride ? MakeswiftSiteVersion.Working : MakeswiftSiteVersion.Live;
+  async getPageSnapshot(pathname, { siteVersion, locale: localeInput }) {
+    var _a;
     const searchParams = new URLSearchParams();
     if (localeInput) {
       searchParams.set("locale", localeInput);
     }
-    const response = await this.fetch(`/${this.siteVersion == null ? "v2" : "v3"}/pages/${encodeURIComponent(pathname)}/document?${searchParams.toString()}`, {
-      headers: { "Makeswift-Site-Version": siteVersion }
-    });
+    const response = await this.fetch(`v3/pages/${encodeURIComponent(pathname)}/document?${searchParams.toString()}`, siteVersion);
     if (!response.ok) {
       if (response.status === 404)
         return null;
@@ -1074,7 +1045,7 @@ Received "${apiKey}" instead.`);
     const document2 = await response.json();
     const baseLocalizedPage = document2.localizedPages.find(({ parentId }) => parentId == null);
     const locale = document2.locale;
-    const { cacheData, localizedResourcesMap } = await this.introspect((_b = baseLocalizedPage == null ? void 0 : baseLocalizedPage.data) != null ? _b : document2.data, previewOverride, locale != null ? locale : void 0);
+    const { cacheData, localizedResourcesMap } = await this.introspect((_a = baseLocalizedPage == null ? void 0 : baseLocalizedPage.data) != null ? _a : document2.data, siteVersion, locale != null ? locale : void 0);
     const apiOrigin = this.apiOrigin.href;
     const preview = siteVersion === MakeswiftSiteVersion.Working;
     return {
@@ -1086,8 +1057,8 @@ Received "${apiKey}" instead.`);
       locale
     };
   }
-  async getSwatch(swatchId) {
-    const response = await this.fetch(`${this.siteVersion == null ? "v1" : "v2"}/swatches/${swatchId}`);
+  async getSwatch(swatchId, siteVersion) {
+    const response = await this.fetch(`v2/swatches/${swatchId}`, siteVersion);
     if (!response.ok) {
       if (response.status !== 404)
         console.error("Failed to get swatch", await response.json());
@@ -1100,8 +1071,8 @@ Received "${apiKey}" instead.`);
     const result = await this.graphqlClient.request(FileQuery, { fileId });
     return result.file;
   }
-  async getTypography(typographyId) {
-    const response = await this.fetch(`${this.siteVersion == null ? "v1" : "v2"}/typographies/${typographyId}`);
+  async getTypography(typographyId, siteVersion) {
+    const response = await this.fetch(`v2/typographies/${typographyId}`, siteVersion);
     if (!response.ok) {
       if (response.status !== 404)
         console.error("Failed to get typography", await response.json());
@@ -1110,8 +1081,8 @@ Received "${apiKey}" instead.`);
     const typography = await response.json();
     return typography;
   }
-  async getGlobalElement(globalElementId) {
-    const response = await this.fetch(`${this.siteVersion == null ? "v1" : "v2"}/global-elements/${globalElementId}`);
+  async getGlobalElement(globalElementId, siteVersion) {
+    const response = await this.fetch(`v2/global-elements/${globalElementId}`, siteVersion);
     if (!response.ok) {
       if (response.status !== 404)
         console.error("Failed to get global element", await response.json());
@@ -1120,8 +1091,8 @@ Received "${apiKey}" instead.`);
     const globalElement = await response.json();
     return globalElement;
   }
-  async getLocalizedGlobalElement(globalElementId, locale) {
-    const response = await this.fetch(`${this.siteVersion == null ? "v1" : "v2"}/localized-global-elements/${globalElementId}?locale=${locale}`);
+  async getLocalizedGlobalElement(globalElementId, locale, siteVersion) {
+    const response = await this.fetch(`v2/localized-global-elements/${globalElementId}?locale=${locale}`, siteVersion);
     if (!response.ok) {
       if (response.status !== 404)
         console.error("Failed to get localized global element", await response.json());
@@ -1130,19 +1101,14 @@ Received "${apiKey}" instead.`);
     const localizedGlobalElement = await response.json();
     return localizedGlobalElement;
   }
-  async getPagePathnameSlices(pageIds, { preview: previewOverride = false, locale } = {}) {
-    var _a;
+  async getPagePathnameSlices(pageIds, siteVersion, { locale }) {
     if (pageIds.length === 0)
       return [];
-    const url = new URL(`${this.siteVersion == null ? "v1" : "v2"}/page-pathname-slices/bulk`, this.apiOrigin);
+    const url = new URL(`v2/page-pathname-slices/bulk`, this.apiOrigin);
     pageIds.forEach((id) => url.searchParams.append("ids", id));
     if (locale != null)
       url.searchParams.set("locale", locale);
-    const response = await this.fetch(url.pathname + url.search, {
-      headers: {
-        "Makeswift-Site-Version": (_a = this.siteVersion) != null ? _a : previewOverride ? MakeswiftSiteVersion.Working : MakeswiftSiteVersion.Live
-      }
-    });
+    const response = await this.fetch(url.pathname + url.search, siteVersion);
     if (!response.ok) {
       console.error("Failed to get page pathname slices", await response.json());
       return [];
@@ -1159,9 +1125,9 @@ Received "${apiKey}" instead.`);
       };
     });
   }
-  async getPagePathnameSlice(pageId, { preview = false, locale } = {}) {
+  async getPagePathnameSlice(pageId, siteVersion, { locale } = {}) {
     var _a;
-    const pagePathnameSlices = await this.getPagePathnameSlices([pageId], { preview, locale });
+    const pagePathnameSlices = await this.getPagePathnameSlices([pageId], siteVersion, { locale });
     return (_a = pagePathnameSlices.at(0)) != null ? _a : null;
   }
   async getTable(tableId) {
@@ -1251,8 +1217,8 @@ async function fonts(_req, res, { getFonts } = {}) {
   const fonts2 = (_a = await (getFonts == null ? void 0 : getFonts())) != null ? _a : [];
   return res.json(fonts2);
 }
-const version = "0.12.3";
-async function handler(req, res, { apiKey, siteVersions }) {
+const version = "0.13.0";
+async function handler(req, res, { apiKey }) {
   if (req.query.secret !== apiKey) {
     return res.status(401).json({ message: "Unauthorized" });
   }
@@ -1263,8 +1229,8 @@ async function handler(req, res, { apiKey, siteVersions }) {
     clientSideNavigation: true,
     elementFromPoint: false,
     customBreakpoints: true,
-    siteVersions,
-    unstable_siteVersions: siteVersions,
+    siteVersions: true,
+    unstable_siteVersions: true,
     localizedPageSSR: true
   });
 }
@@ -1381,7 +1347,6 @@ function MakeswiftApiHandler(apiKey, {
   appOrigin = "https://app.makeswift.com",
   apiOrigin = "https://api.makeswift.com",
   getFonts,
-  siteVersions = false,
   runtime = ReactRuntime
 } = {}) {
   const cors = Cors__default["default"]({ origin: appOrigin });
@@ -1404,16 +1369,13 @@ Received "${apiKey}" instead.`);
 Received "${makeswift}" for the \`makeswift\` param instead.
 Read more about dynamic catch-all routes here: https://nextjs.org/docs/routing/dynamic-routes#catch-all-routes`);
     }
-    const client = new Makeswift(apiKey, {
-      apiOrigin,
-      siteVersion: siteVersions ? Makeswift.getSiteVersion(req.previewData) : void 0,
-      runtime
-    });
+    const client = new Makeswift(apiKey, { apiOrigin, runtime });
+    const siteVersion = Makeswift.getSiteVersion(req.previewData);
     const action = "/" + makeswift.join("/");
     const matches = (pattern) => pathToRegexp.match(pattern, { decode: decodeURIComponent })(action);
     let m;
     if (matches("/manifest"))
-      return handler(req, res, { apiKey, siteVersions });
+      return handler(req, res, { apiKey });
     if (matches("/revalidate"))
       return revalidate(req, res, { apiKey });
     if (matches("/proxy-preview-mode"))
@@ -1428,23 +1390,23 @@ Read more about dynamic catch-all routes here: https://nextjs.org/docs/routing/d
       return mergeTranslatedData(req, res, client);
     const handleResource = (resource) => resource === null ? res.status(404).json({ message: "Not Found" }) : res.json(resource);
     if (m = matches("/swatches/:id")) {
-      return client.getSwatch(m.params.id).then(handleResource);
+      return client.getSwatch(m.params.id, siteVersion).then(handleResource);
     }
     if (m = matches("/files/:id")) {
       return client.getFile(m.params.id).then(handleResource);
     }
     if (m = matches("/typographies/:id")) {
-      return client.getTypography(m.params.id).then(handleResource);
+      return client.getTypography(m.params.id, siteVersion).then(handleResource);
     }
     if (m = matches("/global-elements/:id")) {
-      return client.getGlobalElement(m.params.id).then(handleResource);
+      return client.getGlobalElement(m.params.id, siteVersion).then(handleResource);
     }
     if (m = matches("/localized-global-elements/:globalElementId/:locale")) {
-      return client.getLocalizedGlobalElement(m.params.globalElementId, m.params.locale).then((resource) => resource === null ? res.json({ message: "Not Found" }) : res.json(resource));
+      return client.getLocalizedGlobalElement(m.params.globalElementId, m.params.locale, siteVersion).then((resource) => resource === null ? res.json({ message: "Not Found" }) : res.json(resource));
     }
     if (m = matches("/page-pathname-slices/:id")) {
       const locale = typeof req.query.locale === "string" ? req.query.locale : void 0;
-      return client.getPagePathnameSlice(m.params.id, { locale }).then(handleResource);
+      return client.getPagePathnameSlice(m.params.id, siteVersion, { locale }).then(handleResource);
     }
     if (m = matches("/tables/:id")) {
       return client.getTable(m.params.id).then(handleResource);
@@ -1524,14 +1486,14 @@ async function getStaticPaths() {
 }
 const REVALIDATE_SECONDS = 1;
 async function getStaticProps(ctx) {
-  var _a, _b, _c;
+  var _a, _b;
   deprecationWarning("getStaticProps");
   const makeswift = new Makeswift(getApiKey(), {
     apiOrigin: getApiOrigin()
   });
   const path = "/" + ((_b = (_a = ctx.params) == null ? void 0 : _a.path) != null ? _b : []).join("/");
   const snapshot = await makeswift.getPageSnapshot(path, {
-    preview: ((_c = ctx.previewData) == null ? void 0 : _c.makeswift) === true
+    siteVersion: Makeswift.getSiteVersion(ctx.previewData)
   });
   if (snapshot == null)
     return {
@@ -1553,7 +1515,7 @@ async function getServerSideProps(ctx) {
   });
   const path = "/" + ((_b = (_a = ctx.params) == null ? void 0 : _a.path) != null ? _b : []).join("/");
   const snapshot = await makeswift.getPageSnapshot(path, {
-    preview: true
+    siteVersion: MakeswiftSiteVersion.Working
   });
   if (snapshot == null)
     return {
@@ -3122,7 +3084,9 @@ function RenderHook({
   return children(useHook(...parameters));
 }
 function useCheckboxControlValue(data, definition) {
-  return data != null ? data : definition.config.defaultValue;
+  var _a;
+  const value = (_a = tsPattern.match(data).with({ [number.CheckboxControlDataTypeKey]: number.CheckboxControlDataTypeValueV1 }, (val) => val.value).otherwise((val) => val)) != null ? _a : definition.config.defaultValue;
+  return value;
 }
 function useColorValue(data, definition) {
   var _a, _b;
@@ -3255,8 +3219,10 @@ function ListControlValue({
     children: (value) => renderFn([value, ...listControlValue])
   }), children)([]);
 }
-function useNumber(numberControlData, controlDefinition) {
-  return numberControlData != null ? numberControlData : controlDefinition.config.defaultValue;
+function useNumber(data, definition) {
+  var _a;
+  const value = (_a = tsPattern.match(data).with({ [number.NumberControlDataTypeKey]: number.NumberControlDataTypeValueV1 }, (val) => val.value).otherwise((val) => val)) != null ? _a : definition.config.defaultValue;
+  return value;
 }
 const EditableText$1 = forwardNextDynamicRef((patch) => dynamic__default["default"](() => patch(Promise.resolve().then(function() {
   return require("./index.cjs8.js");
@@ -3524,10 +3490,14 @@ function StyleV2ControlValue({
   })([]);
 }
 function useTextAreaValue(data, definition) {
-  return data != null ? data : definition.config.defaultValue;
+  var _a;
+  const value = (_a = tsPattern.match(data).with({ [reactPage.TextAreaControlDataTypeKey]: reactPage.TextAreaControlDataTypeValueV1 }, (val) => val.value).otherwise((val) => val)) != null ? _a : definition.config.defaultValue;
+  return value;
 }
 function useTextInputValue(data, definition) {
-  return data != null ? data : definition.config.defaultValue;
+  var _a;
+  const value = (_a = tsPattern.match(data).with({ [reactPage.TextInputControlDataTypeKey]: reactPage.TextInputControlDataTypeValueV1 }, (val) => val.value).otherwise((val) => val)) != null ? _a : definition.config.defaultValue;
+  return value;
 }
 function typographyFragementToTypographyControlData(typography) {
   if (typography == null)