@makeswift/runtime 0.24.0-canary.1 → 0.24.0

package/dist/cjs/runtimes/react/hooks/use-resolvable-record.js

@@ -0,0 +1,68 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var use_resolvable_record_exports = {};
+__export(use_resolvable_record_exports, {
+  useResolvableRecord: () => useResolvableRecord
+});
+module.exports = __toCommonJS(use_resolvable_record_exports);
+var import_react = require("react");
+function useResolvableRecord(resolvables) {
+  const snapshot = (0, import_react.useRef)({ resolvedValues: {}, dirtyProps: /* @__PURE__ */ new Set() });
+  return (0, import_react.useMemo)(() => {
+    return {
+      name: "resolvable-record",
+      subscribe: (onUpdate) => {
+        const unsubscribes = Object.values(resolvables).map((s) => s.subscribe(onUpdate));
+        return () => {
+          unsubscribes.forEach((u) => u());
+        };
+      },
+      readStable: () => {
+        const nextSnapshot = Object.entries(resolvables).reduce(
+          ({ dirtyProps, resolvedValues }, [propName, subscription]) => {
+            const lastPropValue = snapshot.current.resolvedValues[propName];
+            const propValue = subscription.readStable();
+            const isDirty = propValue !== lastPropValue;
+            return {
+              dirtyProps: isDirty ? dirtyProps.add(propName) : dirtyProps,
+              resolvedValues: { ...resolvedValues, [propName]: propValue }
+            };
+          },
+          { resolvedValues: {}, dirtyProps: /* @__PURE__ */ new Set() }
+        );
+        if (nextSnapshot.dirtyProps.size > 0) {
+          snapshot.current = nextSnapshot;
+        }
+        return snapshot.current.resolvedValues;
+      },
+      triggerResolve: async () => {
+        return await Promise.all(
+          Object.entries(resolvables).map(
+            ([propName, sub]) => sub.triggerResolve(snapshot.current.resolvedValues[propName])
+          )
+        );
+      }
+    };
+  }, [resolvables]);
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  useResolvableRecord
+});
+//# sourceMappingURL=use-resolvable-record.js.map

package/dist/cjs/runtimes/react/hooks/use-resolvable-record.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../src/runtimes/react/hooks/use-resolvable-record.tsx"],"sourcesContent":["import { type Resolvable } from '@makeswift/controls'\nimport { useMemo, useRef } from 'react'\n\ntype Snapshot = {\n  resolvedValues: Record<string, unknown>\n  dirtyProps: Set<string>\n}\n\nexport function useResolvableRecord(\n  resolvables: Record<string, Resolvable<unknown>>,\n): Resolvable<Record<string, unknown>> {\n  const snapshot = useRef<Snapshot>({ resolvedValues: {}, dirtyProps: new Set() })\n\n  return useMemo<Resolvable<Record<string, unknown>>>(() => {\n    return {\n      name: 'resolvable-record',\n      subscribe: (onUpdate: () => void): (() => void) => {\n        const unsubscribes = Object.values(resolvables).map(s => s.subscribe(onUpdate))\n        return () => {\n          unsubscribes.forEach(u => u())\n        }\n      },\n\n      readStable: () => {\n        const nextSnapshot = Object.entries(resolvables).reduce<Snapshot>(\n          ({ dirtyProps, resolvedValues }, [propName, subscription]) => {\n            const lastPropValue = snapshot.current.resolvedValues[propName]\n            const propValue = subscription.readStable()\n            const isDirty = propValue !== lastPropValue\n\n            return {\n              dirtyProps: isDirty ? dirtyProps.add(propName) : dirtyProps,\n              resolvedValues: { ...resolvedValues, [propName]: propValue },\n            }\n          },\n          { resolvedValues: {}, dirtyProps: new Set() },\n        )\n\n        if (nextSnapshot.dirtyProps.size > 0) {\n          snapshot.current = nextSnapshot\n        }\n\n        return snapshot.current.resolvedValues\n      },\n\n      triggerResolve: async () => {\n        // While we _could_ only trigger resolution on the dirty props, this is\n        // not an airtight solution. Some controls will resolve to nullish\n        // values even when the underlying data changes, so they won't be dirty\n        // (ex: an Image control where the data changes from `undefined` to a\n        // file that has not yet been fetched). Even if you add a nullish check\n        // on the resolved value, some controls can resolve to non-nullish value\n        // when the resolution does not occur (ex: swatches can resolve to\n        // black). The true solution is to trigger resolve on underlying data\n        // change, and moving these dirtiness optimizations for resolution\n        // triggering at the control level.\n        return await Promise.all(\n          Object.entries(resolvables).map(([propName, sub]) =>\n            sub.triggerResolve(snapshot.current.resolvedValues[propName]),\n          ),\n        )\n      },\n    }\n  }, [resolvables])\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,mBAAgC;AAOzB,SAAS,oBACd,aACqC;AACrC,QAAM,eAAW,qBAAiB,EAAE,gBAAgB,CAAC,GAAG,YAAY,oBAAI,IAAI,EAAE,CAAC;AAE/E,aAAO,sBAA6C,MAAM;AACxD,WAAO;AAAA,MACL,MAAM;AAAA,MACN,WAAW,CAAC,aAAuC;AACjD,cAAM,eAAe,OAAO,OAAO,WAAW,EAAE,IAAI,OAAK,EAAE,UAAU,QAAQ,CAAC;AAC9E,eAAO,MAAM;AACX,uBAAa,QAAQ,OAAK,EAAE,CAAC;AAAA,QAC/B;AAAA,MACF;AAAA,MAEA,YAAY,MAAM;AAChB,cAAM,eAAe,OAAO,QAAQ,WAAW,EAAE;AAAA,UAC/C,CAAC,EAAE,YAAY,eAAe,GAAG,CAAC,UAAU,YAAY,MAAM;AAC5D,kBAAM,gBAAgB,SAAS,QAAQ,eAAe,QAAQ;AAC9D,kBAAM,YAAY,aAAa,WAAW;AAC1C,kBAAM,UAAU,cAAc;AAE9B,mBAAO;AAAA,cACL,YAAY,UAAU,WAAW,IAAI,QAAQ,IAAI;AAAA,cACjD,gBAAgB,EAAE,GAAG,gBAAgB,CAAC,QAAQ,GAAG,UAAU;AAAA,YAC7D;AAAA,UACF;AAAA,UACA,EAAE,gBAAgB,CAAC,GAAG,YAAY,oBAAI,IAAI,EAAE;AAAA,QAC9C;AAEA,YAAI,aAAa,WAAW,OAAO,GAAG;AACpC,mBAAS,UAAU;AAAA,QACrB;AAEA,eAAO,SAAS,QAAQ;AAAA,MAC1B;AAAA,MAEA,gBAAgB,YAAY;AAW1B,eAAO,MAAM,QAAQ;AAAA,UACnB,OAAO,QAAQ,WAAW,EAAE;AAAA,YAAI,CAAC,CAAC,UAAU,GAAG,MAC7C,IAAI,eAAe,SAAS,QAAQ,eAAe,QAAQ,CAAC;AAAA,UAC9D;AAAA,QACF;AAAA,MACF;AAAA,IACF;AAAA,EACF,GAAG,CAAC,WAAW,CAAC;AAClB;","names":[]}

package/dist/cjs/runtimes/react/hooks/use-resolved-props.js

@@ -38,7 +38,7 @@ var import_use_resource_resolver = require("./use-resource-resolver");
 var import_use_document_context = require("./use-document-context");
 var import_use_selector = require("./use-selector");
 var import_use_stylesheet_factory = require("./use-stylesheet-factory");
-var import_resolvable_record = require("../resolvable-record");
+var import_use_resolvable_record = require("./use-resolvable-record");
 var import_prop_error_handling_proxy = require("../utils/prop-error-handling-proxy");
 function useControlInstances(elementKey) {
   const documentKey = (0, import_use_document_context.useDocumentKey)();
@@ -83,10 +83,10 @@ function useResolvedProps(propDefs, elementData, elementKey) {
     }),
     [propDefs, resolveProp]
   );
-  const props = (0, import_react.useMemo)(() => (0, import_resolvable_record.resolvableRecord)(resolvables), [resolvables]);
+  const props = (0, import_use_resolvable_record.useResolvableRecord)(resolvables);
   (0, import_react.useEffect)(() => {
     props.triggerResolve();
-  }, []);
+  }, [props]);
   const resolvedProps = (0, import_react.useSyncExternalStore)(props.subscribe, props.readStable, props.readStable);
   stylesheetFactory.useDefinedStyles();
   return resolvedProps;

package/dist/cjs/runtimes/react/hooks/use-resolved-props.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../src/runtimes/react/hooks/use-resolved-props.ts"],"sourcesContent":["import { useMemo, useEffect, useRef, useSyncExternalStore, useCallback } from 'react'\nimport {\n  ControlDefinition,\n  ControlInstance,\n  mapValues,\n  type Data,\n  type Resolvable,\n} from '@makeswift/controls'\n\nimport * as ReactPage from '../../../state/react-page'\nimport { useResourceResolver } from './use-resource-resolver'\nimport { useDocumentKey } from './use-document-context'\nimport { useSelector } from './use-selector'\n\nimport { useStylesheetFactory } from './use-stylesheet-factory'\n\nimport { resolvableRecord } from '../resolvable-record'\nimport { propErrorHandlingProxy } from '../utils/prop-error-handling-proxy'\n\nfunction useControlInstances(elementKey: string): Record<string, ControlInstance> | null {\n  const documentKey = useDocumentKey()\n\n  return useSelector(state => {\n    if (documentKey == null) return null\n\n    return ReactPage.getPropControllers(state, documentKey, elementKey)\n  })\n}\n\ntype CacheItem = {\n  data: Data\n  control: ControlInstance | undefined\n  resolvedValue: Resolvable<unknown>\n}\n\nexport function useResolvedProps(\n  propDefs: Record<string, ControlDefinition>,\n  elementData: Record<string, Data>,\n  elementKey: string,\n): Record<string, unknown> {\n  const stylesheetFactory = useStylesheetFactory()\n  const resourceResolver = useResourceResolver()\n  const controls = useControlInstances(elementKey)\n\n  const cache = useRef<Record<string, CacheItem>>({}).current\n  const resolveProp = useCallback(\n    (def: ControlDefinition, propName: string) => {\n      const data = elementData[propName]\n      const control = controls?.[propName]\n\n      if (\n        cache[propName] != null &&\n        data === cache[propName].data &&\n        control === cache[propName].control\n      ) {\n        return cache[propName].resolvedValue\n      }\n\n      const resolvedValue = def.resolveValue(\n        data,\n        resourceResolver,\n        stylesheetFactory.get(propName),\n        control,\n      )\n\n      cache[propName] = { data, control, resolvedValue }\n      return resolvedValue\n    },\n    [controls, elementData, resourceResolver, stylesheetFactory],\n  )\n\n  const resolvables = useMemo(\n    () =>\n      mapValues(propDefs, (def, propName) => {\n        const defaultValue = (def.config as any)?.defaultValue\n        return propErrorHandlingProxy(resolveProp(def, propName), defaultValue, error => {\n          console.warn(\n            `Error reading value for prop \"${propName}\", falling back to \\`${defaultValue}\\`.`,\n            { control: def, error },\n          )\n        })\n      }),\n    [propDefs, resolveProp],\n  )\n\n  const props = useMemo(() => resolvableRecord(resolvables), [resolvables])\n\n  // no need to call `triggerResolve` on the server, all the resources should already be in\n  // the host API client's cache (populated from the snapshot's cache)\n  useEffect(() => {\n    props.triggerResolve()\n  }, [])\n\n  // the order is important here, the styles are defined in the process of the props resolution,\n  // calling `useDefinedStyles` before the props are resolved would effectively be a noop\n  const resolvedProps = useSyncExternalStore(props.subscribe, props.readStable, props.readStable)\n\n  stylesheetFactory.useDefinedStyles()\n\n  return resolvedProps\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAA8E;AAC9E,sBAMO;AAEP,gBAA2B;AAC3B,mCAAoC;AACpC,kCAA+B;AAC/B,0BAA4B;AAE5B,oCAAqC;AAErC,+BAAiC;AACjC,uCAAuC;AAEvC,SAAS,oBAAoB,YAA4D;AACvF,QAAM,kBAAc,4CAAe;AAEnC,aAAO,iCAAY,WAAS;AAC1B,QAAI,eAAe;AAAM,aAAO;AAEhC,WAAO,UAAU,mBAAmB,OAAO,aAAa,UAAU;AAAA,EACpE,CAAC;AACH;AAQO,SAAS,iBACd,UACA,aACA,YACyB;AACzB,QAAM,wBAAoB,oDAAqB;AAC/C,QAAM,uBAAmB,kDAAoB;AAC7C,QAAM,WAAW,oBAAoB,UAAU;AAE/C,QAAM,YAAQ,qBAAkC,CAAC,CAAC,EAAE;AACpD,QAAM,kBAAc;AAAA,IAClB,CAAC,KAAwB,aAAqB;AAC5C,YAAM,OAAO,YAAY,QAAQ;AACjC,YAAM,UAAU,WAAW,QAAQ;AAEnC,UACE,MAAM,QAAQ,KAAK,QACnB,SAAS,MAAM,QAAQ,EAAE,QACzB,YAAY,MAAM,QAAQ,EAAE,SAC5B;AACA,eAAO,MAAM,QAAQ,EAAE;AAAA,MACzB;AAEA,YAAM,gBAAgB,IAAI;AAAA,QACxB;AAAA,QACA;AAAA,QACA,kBAAkB,IAAI,QAAQ;AAAA,QAC9B;AAAA,MACF;AAEA,YAAM,QAAQ,IAAI,EAAE,MAAM,SAAS,cAAc;AACjD,aAAO;AAAA,IACT;AAAA,IACA,CAAC,UAAU,aAAa,kBAAkB,iBAAiB;AAAA,EAC7D;AAEA,QAAM,kBAAc;AAAA,IAClB,UACE,2BAAU,UAAU,CAAC,KAAK,aAAa;AACrC,YAAM,eAAgB,IAAI,QAAgB;AAC1C,iBAAO,yDAAuB,YAAY,KAAK,QAAQ,GAAG,cAAc,WAAS;AAC/E,gBAAQ;AAAA,UACN,iCAAiC,QAAQ,wBAAwB,YAAY;AAAA,UAC7E,EAAE,SAAS,KAAK,MAAM;AAAA,QACxB;AAAA,MACF,CAAC;AAAA,IACH,CAAC;AAAA,IACH,CAAC,UAAU,WAAW;AAAA,EACxB;AAEA,QAAM,YAAQ,sBAAQ,UAAM,2CAAiB,WAAW,GAAG,CAAC,WAAW,CAAC;AAIxE,8BAAU,MAAM;AACd,UAAM,eAAe;AAAA,EACvB,GAAG,CAAC,CAAC;AAIL,QAAM,oBAAgB,mCAAqB,MAAM,WAAW,MAAM,YAAY,MAAM,UAAU;AAE9F,oBAAkB,iBAAiB;AAEnC,SAAO;AACT;","names":[]}
+{"version":3,"sources":["../../../../../src/runtimes/react/hooks/use-resolved-props.ts"],"sourcesContent":["import { useMemo, useEffect, useRef, useSyncExternalStore, useCallback } from 'react'\nimport {\n  ControlDefinition,\n  ControlInstance,\n  mapValues,\n  type Data,\n  type Resolvable,\n} from '@makeswift/controls'\n\nimport * as ReactPage from '../../../state/react-page'\nimport { useResourceResolver } from './use-resource-resolver'\nimport { useDocumentKey } from './use-document-context'\nimport { useSelector } from './use-selector'\n\nimport { useStylesheetFactory } from './use-stylesheet-factory'\n\nimport { useResolvableRecord } from './use-resolvable-record'\nimport { propErrorHandlingProxy } from '../utils/prop-error-handling-proxy'\n\nfunction useControlInstances(elementKey: string): Record<string, ControlInstance> | null {\n  const documentKey = useDocumentKey()\n\n  return useSelector(state => {\n    if (documentKey == null) return null\n\n    return ReactPage.getPropControllers(state, documentKey, elementKey)\n  })\n}\n\ntype CacheItem = {\n  data: Data\n  control: ControlInstance | undefined\n  resolvedValue: Resolvable<unknown>\n}\n\nexport function useResolvedProps(\n  propDefs: Record<string, ControlDefinition>,\n  elementData: Record<string, Data>,\n  elementKey: string,\n): Record<string, unknown> {\n  const stylesheetFactory = useStylesheetFactory()\n  const resourceResolver = useResourceResolver()\n  const controls = useControlInstances(elementKey)\n\n  const cache = useRef<Record<string, CacheItem>>({}).current\n  const resolveProp = useCallback(\n    (def: ControlDefinition, propName: string) => {\n      const data = elementData[propName]\n      const control = controls?.[propName]\n\n      if (\n        cache[propName] != null &&\n        data === cache[propName].data &&\n        control === cache[propName].control\n      ) {\n        return cache[propName].resolvedValue\n      }\n\n      const resolvedValue = def.resolveValue(\n        data,\n        resourceResolver,\n        stylesheetFactory.get(propName),\n        control,\n      )\n\n      cache[propName] = { data, control, resolvedValue }\n      return resolvedValue\n    },\n    [controls, elementData, resourceResolver, stylesheetFactory],\n  )\n\n  const resolvables = useMemo<Record<string, Resolvable<unknown>>>(\n    () =>\n      mapValues(propDefs, (def, propName) => {\n        const defaultValue = (def.config as any)?.defaultValue\n        return propErrorHandlingProxy(resolveProp(def, propName), defaultValue, error => {\n          console.warn(\n            `Error reading value for prop \"${propName}\", falling back to \\`${defaultValue}\\`.`,\n            { control: def, error },\n          )\n        })\n      }),\n    [propDefs, resolveProp],\n  )\n\n  const props = useResolvableRecord(resolvables)\n\n  // no need to call `triggerResolve` on the server, all the resources should already be in\n  // the host API client's cache (populated from the snapshot's cache)\n  useEffect(() => {\n    props.triggerResolve()\n  }, [props])\n\n  // the order is important here, the styles are defined in the process of the props resolution,\n  // calling `useDefinedStyles` before the props are resolved would effectively be a noop\n  const resolvedProps = useSyncExternalStore(props.subscribe, props.readStable, props.readStable)\n\n  stylesheetFactory.useDefinedStyles()\n\n  return resolvedProps\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAA8E;AAC9E,sBAMO;AAEP,gBAA2B;AAC3B,mCAAoC;AACpC,kCAA+B;AAC/B,0BAA4B;AAE5B,oCAAqC;AAErC,mCAAoC;AACpC,uCAAuC;AAEvC,SAAS,oBAAoB,YAA4D;AACvF,QAAM,kBAAc,4CAAe;AAEnC,aAAO,iCAAY,WAAS;AAC1B,QAAI,eAAe;AAAM,aAAO;AAEhC,WAAO,UAAU,mBAAmB,OAAO,aAAa,UAAU;AAAA,EACpE,CAAC;AACH;AAQO,SAAS,iBACd,UACA,aACA,YACyB;AACzB,QAAM,wBAAoB,oDAAqB;AAC/C,QAAM,uBAAmB,kDAAoB;AAC7C,QAAM,WAAW,oBAAoB,UAAU;AAE/C,QAAM,YAAQ,qBAAkC,CAAC,CAAC,EAAE;AACpD,QAAM,kBAAc;AAAA,IAClB,CAAC,KAAwB,aAAqB;AAC5C,YAAM,OAAO,YAAY,QAAQ;AACjC,YAAM,UAAU,WAAW,QAAQ;AAEnC,UACE,MAAM,QAAQ,KAAK,QACnB,SAAS,MAAM,QAAQ,EAAE,QACzB,YAAY,MAAM,QAAQ,EAAE,SAC5B;AACA,eAAO,MAAM,QAAQ,EAAE;AAAA,MACzB;AAEA,YAAM,gBAAgB,IAAI;AAAA,QACxB;AAAA,QACA;AAAA,QACA,kBAAkB,IAAI,QAAQ;AAAA,QAC9B;AAAA,MACF;AAEA,YAAM,QAAQ,IAAI,EAAE,MAAM,SAAS,cAAc;AACjD,aAAO;AAAA,IACT;AAAA,IACA,CAAC,UAAU,aAAa,kBAAkB,iBAAiB;AAAA,EAC7D;AAEA,QAAM,kBAAc;AAAA,IAClB,UACE,2BAAU,UAAU,CAAC,KAAK,aAAa;AACrC,YAAM,eAAgB,IAAI,QAAgB;AAC1C,iBAAO,yDAAuB,YAAY,KAAK,QAAQ,GAAG,cAAc,WAAS;AAC/E,gBAAQ;AAAA,UACN,iCAAiC,QAAQ,wBAAwB,YAAY;AAAA,UAC7E,EAAE,SAAS,KAAK,MAAM;AAAA,QACxB;AAAA,MACF,CAAC;AAAA,IACH,CAAC;AAAA,IACH,CAAC,UAAU,WAAW;AAAA,EACxB;AAEA,QAAM,YAAQ,kDAAoB,WAAW;AAI7C,8BAAU,MAAM;AACd,UAAM,eAAe;AAAA,EACvB,GAAG,CAAC,KAAK,CAAC;AAIV,QAAM,oBAAgB,mCAAqB,MAAM,WAAW,MAAM,YAAY,MAAM,UAAU;AAE9F,oBAAkB,iBAAiB;AAEnC,SAAO;AACT;","names":[]}

package/dist/cjs/runtimes/react/hooks/use-resolved-value.js

@@ -33,7 +33,7 @@ function useResolvedValue(data, resolver, defaultValue) {
   }, [data, resourceResolver, defaultValue]);
   (0, import_react.useEffect)(() => {
     resolvable.triggerResolve();
-  }, []);
+  }, [resolvable]);
   return (0, import_react.useSyncExternalStore)(resolvable.subscribe, resolvable.readStable, resolvable.readStable);
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/cjs/runtimes/react/hooks/use-resolved-value.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../src/runtimes/react/hooks/use-resolved-value.ts"],"sourcesContent":["import { useMemo, useEffect, useSyncExternalStore } from 'react'\nimport { Resolvable, ResourceResolver } from '@makeswift/controls'\n\nimport { useResourceResolver } from './use-resource-resolver'\nimport { propErrorHandlingProxy } from '../utils/prop-error-handling-proxy'\n\nexport function useResolvedValue<D, T>(\n  data: D,\n  resolver: (data: D, resourceResolver: ResourceResolver) => Resolvable<T>,\n  defaultValue?: T,\n): T | undefined {\n  const resourceResolver = useResourceResolver()\n  const resolvable = useMemo(() => {\n    return propErrorHandlingProxy(resolver(data, resourceResolver), defaultValue, error => {\n      console.warn(`Error resolving data, falling back to \\`${defaultValue}\\`.`, { error, data })\n    })\n  }, [data, resourceResolver, defaultValue])\n\n  useEffect(() => {\n    resolvable.triggerResolve()\n  }, [])\n\n  return useSyncExternalStore(resolvable.subscribe, resolvable.readStable, resolvable.readStable)\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAyD;AAGzD,mCAAoC;AACpC,uCAAuC;AAEhC,SAAS,iBACd,MACA,UACA,cACe;AACf,QAAM,uBAAmB,kDAAoB;AAC7C,QAAM,iBAAa,sBAAQ,MAAM;AAC/B,eAAO,yDAAuB,SAAS,MAAM,gBAAgB,GAAG,cAAc,WAAS;AACrF,cAAQ,KAAK,2CAA2C,YAAY,OAAO,EAAE,OAAO,KAAK,CAAC;AAAA,IAC5F,CAAC;AAAA,EACH,GAAG,CAAC,MAAM,kBAAkB,YAAY,CAAC;AAEzC,8BAAU,MAAM;AACd,eAAW,eAAe;AAAA,EAC5B,GAAG,CAAC,CAAC;AAEL,aAAO,mCAAqB,WAAW,WAAW,WAAW,YAAY,WAAW,UAAU;AAChG;","names":[]}
+{"version":3,"sources":["../../../../../src/runtimes/react/hooks/use-resolved-value.ts"],"sourcesContent":["import { useMemo, useEffect, useSyncExternalStore } from 'react'\nimport { Resolvable, ResourceResolver } from '@makeswift/controls'\n\nimport { useResourceResolver } from './use-resource-resolver'\nimport { propErrorHandlingProxy } from '../utils/prop-error-handling-proxy'\n\nexport function useResolvedValue<D, T>(\n  data: D,\n  resolver: (data: D, resourceResolver: ResourceResolver) => Resolvable<T>,\n  defaultValue?: T,\n): T | undefined {\n  const resourceResolver = useResourceResolver()\n  const resolvable = useMemo(() => {\n    return propErrorHandlingProxy(resolver(data, resourceResolver), defaultValue, error => {\n      console.warn(`Error resolving data, falling back to \\`${defaultValue}\\`.`, { error, data })\n    })\n  }, [data, resourceResolver, defaultValue])\n\n  useEffect(() => {\n    resolvable.triggerResolve()\n  }, [resolvable])\n\n  return useSyncExternalStore(resolvable.subscribe, resolvable.readStable, resolvable.readStable)\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAyD;AAGzD,mCAAoC;AACpC,uCAAuC;AAEhC,SAAS,iBACd,MACA,UACA,cACe;AACf,QAAM,uBAAmB,kDAAoB;AAC7C,QAAM,iBAAa,sBAAQ,MAAM;AAC/B,eAAO,yDAAuB,SAAS,MAAM,gBAAgB,GAAG,cAAc,WAAS;AACrF,cAAQ,KAAK,2CAA2C,YAAY,OAAO,EAAE,OAAO,KAAK,CAAC;AAAA,IAC5F,CAAC;AAAA,EACH,GAAG,CAAC,MAAM,kBAAkB,YAAY,CAAC;AAEzC,8BAAU,MAAM;AACd,eAAW,eAAe;AAAA,EAC5B,GAAG,CAAC,UAAU,CAAC;AAEf,aAAO,mCAAqB,WAAW,WAAW,WAAW,YAAY,WAAW,UAAU;AAChG;","names":[]}

package/dist/cjs/runtimes/react/hooks/use-resource-resolver.js

@@ -39,7 +39,8 @@ var import_use_document_context = require("./use-document-context");
 function useResourceResolver() {
   const store = (0, import_use_store.useStore)();
   const client = (0, import_host_api_client.useMakeswiftHostApiClient)();
-  const { key: documentKey, locale } = (0, import_use_document_context.useDocumentContext)();
+  const documentKey = (0, import_use_document_context.useDocumentKey)();
+  const locale = (0, import_use_document_context.useDocumentLocale)();
   return (0, import_react.useMemo)(() => {
     return {
       resolveSwatch: (swatchId) => client.resolveSwatch(swatchId),

package/dist/cjs/runtimes/react/hooks/use-resource-resolver.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../src/runtimes/react/hooks/use-resource-resolver.ts"],"sourcesContent":["import { useMemo } from 'react'\nimport { type ResourceResolver } from '@makeswift/controls'\n\nimport * as ReactPage from '../../../state/react-page'\nimport { useMakeswiftHostApiClient } from '../host-api-client'\nimport { useStore } from './use-store'\nimport { useDocumentContext } from './use-document-context'\n\nexport function useResourceResolver(): ResourceResolver {\n  const store = useStore()\n  const client = useMakeswiftHostApiClient()\n  const { key: documentKey, locale } = useDocumentContext()\n\n  return useMemo<ResourceResolver>(() => {\n    return {\n      resolveSwatch: swatchId => client.resolveSwatch(swatchId),\n      resolveFile: fileId => client.resolveFile(fileId),\n      resolveTypography: typographyId => client.resolveTypography(typographyId),\n      resolvePagePathnameSlice: pageId => client.resolvePagePathnameSlice({ pageId, locale }),\n      resolveElementId: elementKey => {\n        const read = () =>\n          documentKey == null\n            ? null\n            : ReactPage.getElementId(store.getState(), documentKey, elementKey)\n\n        let lastValue: string | null = null\n        return {\n          name: `element-id:${documentKey}:${elementKey}`,\n          readStable: () => (lastValue = read()),\n          subscribe: (onUpdate: () => void) =>\n            store.subscribe(() => {\n              if (read() !== lastValue) onUpdate()\n            }),\n        }\n      },\n    }\n  }, [client, store, documentKey, locale])\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAwB;AAGxB,gBAA2B;AAC3B,6BAA0C;AAC1C,uBAAyB;AACzB,kCAAmC;AAE5B,SAAS,sBAAwC;AACtD,QAAM,YAAQ,2BAAS;AACvB,QAAM,aAAS,kDAA0B;AACzC,QAAM,EAAE,KAAK,aAAa,OAAO,QAAI,gDAAmB;AAExD,aAAO,sBAA0B,MAAM;AACrC,WAAO;AAAA,MACL,eAAe,cAAY,OAAO,cAAc,QAAQ;AAAA,MACxD,aAAa,YAAU,OAAO,YAAY,MAAM;AAAA,MAChD,mBAAmB,kBAAgB,OAAO,kBAAkB,YAAY;AAAA,MACxE,0BAA0B,YAAU,OAAO,yBAAyB,EAAE,QAAQ,OAAO,CAAC;AAAA,MACtF,kBAAkB,gBAAc;AAC9B,cAAM,OAAO,MACX,eAAe,OACX,OACA,UAAU,aAAa,MAAM,SAAS,GAAG,aAAa,UAAU;AAEtE,YAAI,YAA2B;AAC/B,eAAO;AAAA,UACL,MAAM,cAAc,WAAW,IAAI,UAAU;AAAA,UAC7C,YAAY,MAAO,YAAY,KAAK;AAAA,UACpC,WAAW,CAAC,aACV,MAAM,UAAU,MAAM;AACpB,gBAAI,KAAK,MAAM;AAAW,uBAAS;AAAA,UACrC,CAAC;AAAA,QACL;AAAA,MACF;AAAA,IACF;AAAA,EACF,GAAG,CAAC,QAAQ,OAAO,aAAa,MAAM,CAAC;AACzC;","names":[]}
+{"version":3,"sources":["../../../../../src/runtimes/react/hooks/use-resource-resolver.ts"],"sourcesContent":["import { useMemo } from 'react'\nimport { type ResourceResolver } from '@makeswift/controls'\n\nimport * as ReactPage from '../../../state/react-page'\nimport { useMakeswiftHostApiClient } from '../host-api-client'\nimport { useStore } from './use-store'\nimport { useDocumentKey, useDocumentLocale } from './use-document-context'\n\nexport function useResourceResolver(): ResourceResolver {\n  const store = useStore()\n  const client = useMakeswiftHostApiClient()\n\n  const documentKey = useDocumentKey()\n  const locale = useDocumentLocale()\n\n  return useMemo<ResourceResolver>(() => {\n    return {\n      resolveSwatch: swatchId => client.resolveSwatch(swatchId),\n      resolveFile: fileId => client.resolveFile(fileId),\n      resolveTypography: typographyId => client.resolveTypography(typographyId),\n      resolvePagePathnameSlice: pageId => client.resolvePagePathnameSlice({ pageId, locale }),\n      resolveElementId: elementKey => {\n        const read = () =>\n          documentKey == null\n            ? null\n            : ReactPage.getElementId(store.getState(), documentKey, elementKey)\n\n        let lastValue: string | null = null\n        return {\n          name: `element-id:${documentKey}:${elementKey}`,\n          readStable: () => (lastValue = read()),\n          subscribe: (onUpdate: () => void) =>\n            store.subscribe(() => {\n              if (read() !== lastValue) onUpdate()\n            }),\n        }\n      },\n    }\n  }, [client, store, documentKey, locale])\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAwB;AAGxB,gBAA2B;AAC3B,6BAA0C;AAC1C,uBAAyB;AACzB,kCAAkD;AAE3C,SAAS,sBAAwC;AACtD,QAAM,YAAQ,2BAAS;AACvB,QAAM,aAAS,kDAA0B;AAEzC,QAAM,kBAAc,4CAAe;AACnC,QAAM,aAAS,+CAAkB;AAEjC,aAAO,sBAA0B,MAAM;AACrC,WAAO;AAAA,MACL,eAAe,cAAY,OAAO,cAAc,QAAQ;AAAA,MACxD,aAAa,YAAU,OAAO,YAAY,MAAM;AAAA,MAChD,mBAAmB,kBAAgB,OAAO,kBAAkB,YAAY;AAAA,MACxE,0BAA0B,YAAU,OAAO,yBAAyB,EAAE,QAAQ,OAAO,CAAC;AAAA,MACtF,kBAAkB,gBAAc;AAC9B,cAAM,OAAO,MACX,eAAe,OACX,OACA,UAAU,aAAa,MAAM,SAAS,GAAG,aAAa,UAAU;AAEtE,YAAI,YAA2B;AAC/B,eAAO;AAAA,UACL,MAAM,cAAc,WAAW,IAAI,UAAU;AAAA,UAC7C,YAAY,MAAO,YAAY,KAAK;AAAA,UACpC,WAAW,CAAC,aACV,MAAM,UAAU,MAAM;AACpB,gBAAI,KAAK,MAAM;AAAW,uBAAS;AAAA,UACrC,CAAC;AAAA,QACL;AAAA,MACF;AAAA,IACF;AAAA,EACF,GAAG,CAAC,QAAQ,OAAO,aAAa,MAAM,CAAC;AACzC;","names":[]}

package/dist/cjs/runtimes/react/hooks/use-stylesheet-factory.js

@@ -25,7 +25,6 @@ var import_react = require("react");
 var import_serialize = require("@emotion/serialize");
 var import_controls = require("@makeswift/controls");
 var import_root_style_registry = require("../../../next/root-style-registry");
-var import_breakpoints = require("../../../state/modules/breakpoints");
 var import_style = require("../controls/style");
 var import_typography = require("../controls/typography");
 var import_use_breakpoints = require("./use-breakpoints");
@@ -88,7 +87,7 @@ function styleV2Css(breakpoints, style) {
     ...breakpoints.reduce(
       (styles, breakpoint) => ({
         ...styles,
-        [(0, import_breakpoints.getBreakpointMediaQuery)(breakpoint)]: style.getStyle(breakpoint)
+        [(0, import_controls.getBreakpointMediaQuery)(breakpoint)]: style.getStyle(breakpoint)
       }),
       {}
     )

package/dist/cjs/runtimes/react/hooks/use-stylesheet-factory.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../src/runtimes/react/hooks/use-stylesheet-factory.ts"],"sourcesContent":["import { useMemo, useEffect, useRef } from 'react'\nimport { type CSSObject, serializeStyles } from '@emotion/serialize'\nimport { type EmotionCache } from '@emotion/cache'\nimport { type SerializedStyles } from '@emotion/utils'\n\nimport {\n  type Breakpoints,\n  type BoxModel,\n  type Stylesheet,\n  type ResolvedStyle,\n  type ResolvedStyleV2,\n  type ResolvedTypographyStyle,\n  isNotNil,\n  getBaseBreakpoint,\n} from '@makeswift/controls'\n\nimport { useCache } from '../../../next/root-style-registry'\nimport { getBreakpointMediaQuery } from '../../../state/modules/breakpoints'\n\nimport { styleV1Css } from '../controls/style'\nimport { typographyCss } from '../controls/typography'\n\nimport { useBreakpoints } from './use-breakpoints'\nimport { useCssId } from './use-css-id'\nimport { useStyles, serializedStyleClassName } from '../use-style'\nimport { pollBoxModel } from '../poll-box-model'\n\nexport type StylesheetFactory = {\n  get(propName: string): Stylesheet\n  useDefinedStyles(): void\n}\n\nexport function useStylesheetFactory(): StylesheetFactory {\n  const breakpoints = useBreakpoints()\n  const cache = useCache()\n  const componentUid = useCssId()\n\n  const computedStyles = useRef<Record<string, SerializedStyles>>({}).current\n  const boxModelCallbacks = useRef<Record<string, (boxModel: BoxModel | null) => void>>({}).current\n\n  return useMemo(() => {\n    const getStylesheet = (styleSheetId: string): Stylesheet => ({\n      breakpoints(): Breakpoints {\n        return breakpoints\n      },\n\n      defineStyle(\n        style: ResolvedStyle,\n        onBoxModelChange?: (boxModel: BoxModel | null) => void,\n      ): string {\n        const serialized = serializeStyle(breakpoints, style, cache)\n        const uid = `u-${componentUid}-${styleSheetId}`\n        computedStyles[uid] = serialized\n\n        const className = serializedStyleClassName(cache, serialized)\n        if (!onBoxModelChange) return className\n\n        boxModelCallbacks[uid] = onBoxModelChange\n        return `${className} ${uid}`\n      },\n\n      child(id: string): Stylesheet {\n        return getStylesheet(`${styleSheetId}-${id}`)\n      },\n    })\n\n    return {\n      get(propName: string): Stylesheet {\n        return getStylesheet(propName)\n      },\n\n      useDefinedStyles() {\n        useStyles(cache, Object.values(computedStyles))\n\n        useEffect(() => {\n          const unsubscribes = Object.entries(boxModelCallbacks)\n            .map(([uid, callback]) =>\n              callback != null\n                ? pollBoxModel({\n                    element: document.querySelector(`.${uid}`),\n                    onBoxModelChange: callback,\n                  })\n                : undefined,\n            )\n            .filter(isNotNil)\n\n          return () => unsubscribes.forEach(fn => fn())\n        }, [Object.keys(boxModelCallbacks).join(' ')])\n      },\n    }\n  }, [breakpoints, cache, componentUid])\n}\n\nfunction isTypographyStyle(style: ResolvedStyle): style is ResolvedTypographyStyle {\n  return Array.isArray(style)\n}\n\nfunction isStyleV2(style: ResolvedStyle): style is ResolvedStyleV2 {\n  return typeof style === 'object' && 'getStyle' in style && typeof style.getStyle === 'function'\n}\n\nfunction styleV2Css(breakpoints: Breakpoints, style: ResolvedStyleV2<CSSObject>): CSSObject {\n  return {\n    ...style.getStyle(getBaseBreakpoint(breakpoints)),\n    ...breakpoints.reduce(\n      (styles, breakpoint) => ({\n        ...styles,\n        [getBreakpointMediaQuery(breakpoint)]: style.getStyle(breakpoint),\n      }),\n      {},\n    ),\n  }\n}\n\nfunction resolvedStyleToCss(breakpoints: Breakpoints, style: ResolvedStyle) {\n  if (isTypographyStyle(style)) {\n    return typographyCss(breakpoints, style)\n  }\n\n  if (isStyleV2(style)) {\n    return styleV2Css(breakpoints, style as ResolvedStyleV2<CSSObject>)\n  }\n\n  const { properties, styleData } = style\n  return styleV1Css(breakpoints, styleData, properties)\n}\n\nfunction serializeStyle(\n  breakpoints: Breakpoints,\n  style: ResolvedStyle,\n  cache: EmotionCache,\n): SerializedStyles {\n  const css = resolvedStyleToCss(breakpoints, style)\n  return serializeStyles([css], cache.registered)\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAA2C;AAC3C,uBAAgD;AAIhD,sBASO;AAEP,iCAAyB;AACzB,yBAAwC;AAExC,mBAA2B;AAC3B,wBAA8B;AAE9B,6BAA+B;AAC/B,wBAAyB;AACzB,uBAAoD;AACpD,4BAA6B;AAOtB,SAAS,uBAA0C;AACxD,QAAM,kBAAc,uCAAe;AACnC,QAAM,YAAQ,qCAAS;AACvB,QAAM,mBAAe,4BAAS;AAE9B,QAAM,qBAAiB,qBAAyC,CAAC,CAAC,EAAE;AACpE,QAAM,wBAAoB,qBAA4D,CAAC,CAAC,EAAE;AAE1F,aAAO,sBAAQ,MAAM;AACnB,UAAM,gBAAgB,CAAC,kBAAsC;AAAA,MAC3D,cAA2B;AACzB,eAAO;AAAA,MACT;AAAA,MAEA,YACE,OACA,kBACQ;AACR,cAAM,aAAa,eAAe,aAAa,OAAO,KAAK;AAC3D,cAAM,MAAM,KAAK,YAAY,IAAI,YAAY;AAC7C,uBAAe,GAAG,IAAI;AAEtB,cAAM,gBAAY,2CAAyB,OAAO,UAAU;AAC5D,YAAI,CAAC;AAAkB,iBAAO;AAE9B,0BAAkB,GAAG,IAAI;AACzB,eAAO,GAAG,SAAS,IAAI,GAAG;AAAA,MAC5B;AAAA,MAEA,MAAM,IAAwB;AAC5B,eAAO,cAAc,GAAG,YAAY,IAAI,EAAE,EAAE;AAAA,MAC9C;AAAA,IACF;AAEA,WAAO;AAAA,MACL,IAAI,UAA8B;AAChC,eAAO,cAAc,QAAQ;AAAA,MAC/B;AAAA,MAEA,mBAAmB;AACjB,wCAAU,OAAO,OAAO,OAAO,cAAc,CAAC;AAE9C,oCAAU,MAAM;AACd,gBAAM,eAAe,OAAO,QAAQ,iBAAiB,EAClD;AAAA,YAAI,CAAC,CAAC,KAAK,QAAQ,MAClB,YAAY,WACR,oCAAa;AAAA,cACX,SAAS,SAAS,cAAc,IAAI,GAAG,EAAE;AAAA,cACzC,kBAAkB;AAAA,YACpB,CAAC,IACD;AAAA,UACN,EACC,OAAO,wBAAQ;AAElB,iBAAO,MAAM,aAAa,QAAQ,QAAM,GAAG,CAAC;AAAA,QAC9C,GAAG,CAAC,OAAO,KAAK,iBAAiB,EAAE,KAAK,GAAG,CAAC,CAAC;AAAA,MAC/C;AAAA,IACF;AAAA,EACF,GAAG,CAAC,aAAa,OAAO,YAAY,CAAC;AACvC;AAEA,SAAS,kBAAkB,OAAwD;AACjF,SAAO,MAAM,QAAQ,KAAK;AAC5B;AAEA,SAAS,UAAU,OAAgD;AACjE,SAAO,OAAO,UAAU,YAAY,cAAc,SAAS,OAAO,MAAM,aAAa;AACvF;AAEA,SAAS,WAAW,aAA0B,OAA8C;AAC1F,SAAO;AAAA,IACL,GAAG,MAAM,aAAS,mCAAkB,WAAW,CAAC;AAAA,IAChD,GAAG,YAAY;AAAA,MACb,CAAC,QAAQ,gBAAgB;AAAA,QACvB,GAAG;AAAA,QACH,KAAC,4CAAwB,UAAU,CAAC,GAAG,MAAM,SAAS,UAAU;AAAA,MAClE;AAAA,MACA,CAAC;AAAA,IACH;AAAA,EACF;AACF;AAEA,SAAS,mBAAmB,aAA0B,OAAsB;AAC1E,MAAI,kBAAkB,KAAK,GAAG;AAC5B,eAAO,iCAAc,aAAa,KAAK;AAAA,EACzC;AAEA,MAAI,UAAU,KAAK,GAAG;AACpB,WAAO,WAAW,aAAa,KAAmC;AAAA,EACpE;AAEA,QAAM,EAAE,YAAY,UAAU,IAAI;AAClC,aAAO,yBAAW,aAAa,WAAW,UAAU;AACtD;AAEA,SAAS,eACP,aACA,OACA,OACkB;AAClB,QAAM,MAAM,mBAAmB,aAAa,KAAK;AACjD,aAAO,kCAAgB,CAAC,GAAG,GAAG,MAAM,UAAU;AAChD;","names":[]}
+{"version":3,"sources":["../../../../../src/runtimes/react/hooks/use-stylesheet-factory.ts"],"sourcesContent":["import { useMemo, useEffect, useRef } from 'react'\nimport { type CSSObject, serializeStyles } from '@emotion/serialize'\nimport { type EmotionCache } from '@emotion/cache'\nimport { type SerializedStyles } from '@emotion/utils'\n\nimport {\n  type Breakpoints,\n  type BoxModel,\n  type Stylesheet,\n  type ResolvedStyle,\n  type ResolvedStyleV2,\n  type ResolvedTypographyStyle,\n  isNotNil,\n  getBaseBreakpoint,\n  getBreakpointMediaQuery,\n} from '@makeswift/controls'\n\nimport { useCache } from '../../../next/root-style-registry'\n\nimport { styleV1Css } from '../controls/style'\nimport { typographyCss } from '../controls/typography'\n\nimport { useBreakpoints } from './use-breakpoints'\nimport { useCssId } from './use-css-id'\nimport { useStyles, serializedStyleClassName } from '../use-style'\nimport { pollBoxModel } from '../poll-box-model'\n\nexport type StylesheetFactory = {\n  get(propName: string): Stylesheet\n  useDefinedStyles(): void\n}\n\nexport function useStylesheetFactory(): StylesheetFactory {\n  const breakpoints = useBreakpoints()\n  const cache = useCache()\n  const componentUid = useCssId()\n\n  const computedStyles = useRef<Record<string, SerializedStyles>>({}).current\n  const boxModelCallbacks = useRef<Record<string, (boxModel: BoxModel | null) => void>>({}).current\n\n  return useMemo(() => {\n    const getStylesheet = (styleSheetId: string): Stylesheet => ({\n      breakpoints(): Breakpoints {\n        return breakpoints\n      },\n\n      defineStyle(\n        style: ResolvedStyle,\n        onBoxModelChange?: (boxModel: BoxModel | null) => void,\n      ): string {\n        const serialized = serializeStyle(breakpoints, style, cache)\n        const uid = `u-${componentUid}-${styleSheetId}`\n        computedStyles[uid] = serialized\n\n        const className = serializedStyleClassName(cache, serialized)\n        if (!onBoxModelChange) return className\n\n        boxModelCallbacks[uid] = onBoxModelChange\n        return `${className} ${uid}`\n      },\n\n      child(id: string): Stylesheet {\n        return getStylesheet(`${styleSheetId}-${id}`)\n      },\n    })\n\n    return {\n      get(propName: string): Stylesheet {\n        return getStylesheet(propName)\n      },\n\n      useDefinedStyles() {\n        useStyles(cache, Object.values(computedStyles))\n\n        useEffect(() => {\n          const unsubscribes = Object.entries(boxModelCallbacks)\n            .map(([uid, callback]) =>\n              callback != null\n                ? pollBoxModel({\n                    element: document.querySelector(`.${uid}`),\n                    onBoxModelChange: callback,\n                  })\n                : undefined,\n            )\n            .filter(isNotNil)\n\n          return () => unsubscribes.forEach(fn => fn())\n        }, [Object.keys(boxModelCallbacks).join(' ')])\n      },\n    }\n  }, [breakpoints, cache, componentUid])\n}\n\nfunction isTypographyStyle(style: ResolvedStyle): style is ResolvedTypographyStyle {\n  return Array.isArray(style)\n}\n\nfunction isStyleV2(style: ResolvedStyle): style is ResolvedStyleV2 {\n  return typeof style === 'object' && 'getStyle' in style && typeof style.getStyle === 'function'\n}\n\nfunction styleV2Css(breakpoints: Breakpoints, style: ResolvedStyleV2<CSSObject>): CSSObject {\n  return {\n    ...style.getStyle(getBaseBreakpoint(breakpoints)),\n    ...breakpoints.reduce(\n      (styles, breakpoint) => ({\n        ...styles,\n        [getBreakpointMediaQuery(breakpoint)]: style.getStyle(breakpoint),\n      }),\n      {},\n    ),\n  }\n}\n\nfunction resolvedStyleToCss(breakpoints: Breakpoints, style: ResolvedStyle) {\n  if (isTypographyStyle(style)) {\n    return typographyCss(breakpoints, style)\n  }\n\n  if (isStyleV2(style)) {\n    return styleV2Css(breakpoints, style as ResolvedStyleV2<CSSObject>)\n  }\n\n  const { properties, styleData } = style\n  return styleV1Css(breakpoints, styleData, properties)\n}\n\nfunction serializeStyle(\n  breakpoints: Breakpoints,\n  style: ResolvedStyle,\n  cache: EmotionCache,\n): SerializedStyles {\n  const css = resolvedStyleToCss(breakpoints, style)\n  return serializeStyles([css], cache.registered)\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAA2C;AAC3C,uBAAgD;AAIhD,sBAUO;AAEP,iCAAyB;AAEzB,mBAA2B;AAC3B,wBAA8B;AAE9B,6BAA+B;AAC/B,wBAAyB;AACzB,uBAAoD;AACpD,4BAA6B;AAOtB,SAAS,uBAA0C;AACxD,QAAM,kBAAc,uCAAe;AACnC,QAAM,YAAQ,qCAAS;AACvB,QAAM,mBAAe,4BAAS;AAE9B,QAAM,qBAAiB,qBAAyC,CAAC,CAAC,EAAE;AACpE,QAAM,wBAAoB,qBAA4D,CAAC,CAAC,EAAE;AAE1F,aAAO,sBAAQ,MAAM;AACnB,UAAM,gBAAgB,CAAC,kBAAsC;AAAA,MAC3D,cAA2B;AACzB,eAAO;AAAA,MACT;AAAA,MAEA,YACE,OACA,kBACQ;AACR,cAAM,aAAa,eAAe,aAAa,OAAO,KAAK;AAC3D,cAAM,MAAM,KAAK,YAAY,IAAI,YAAY;AAC7C,uBAAe,GAAG,IAAI;AAEtB,cAAM,gBAAY,2CAAyB,OAAO,UAAU;AAC5D,YAAI,CAAC;AAAkB,iBAAO;AAE9B,0BAAkB,GAAG,IAAI;AACzB,eAAO,GAAG,SAAS,IAAI,GAAG;AAAA,MAC5B;AAAA,MAEA,MAAM,IAAwB;AAC5B,eAAO,cAAc,GAAG,YAAY,IAAI,EAAE,EAAE;AAAA,MAC9C;AAAA,IACF;AAEA,WAAO;AAAA,MACL,IAAI,UAA8B;AAChC,eAAO,cAAc,QAAQ;AAAA,MAC/B;AAAA,MAEA,mBAAmB;AACjB,wCAAU,OAAO,OAAO,OAAO,cAAc,CAAC;AAE9C,oCAAU,MAAM;AACd,gBAAM,eAAe,OAAO,QAAQ,iBAAiB,EAClD;AAAA,YAAI,CAAC,CAAC,KAAK,QAAQ,MAClB,YAAY,WACR,oCAAa;AAAA,cACX,SAAS,SAAS,cAAc,IAAI,GAAG,EAAE;AAAA,cACzC,kBAAkB;AAAA,YACpB,CAAC,IACD;AAAA,UACN,EACC,OAAO,wBAAQ;AAElB,iBAAO,MAAM,aAAa,QAAQ,QAAM,GAAG,CAAC;AAAA,QAC9C,GAAG,CAAC,OAAO,KAAK,iBAAiB,EAAE,KAAK,GAAG,CAAC,CAAC;AAAA,MAC/C;AAAA,IACF;AAAA,EACF,GAAG,CAAC,aAAa,OAAO,YAAY,CAAC;AACvC;AAEA,SAAS,kBAAkB,OAAwD;AACjF,SAAO,MAAM,QAAQ,KAAK;AAC5B;AAEA,SAAS,UAAU,OAAgD;AACjE,SAAO,OAAO,UAAU,YAAY,cAAc,SAAS,OAAO,MAAM,aAAa;AACvF;AAEA,SAAS,WAAW,aAA0B,OAA8C;AAC1F,SAAO;AAAA,IACL,GAAG,MAAM,aAAS,mCAAkB,WAAW,CAAC;AAAA,IAChD,GAAG,YAAY;AAAA,MACb,CAAC,QAAQ,gBAAgB;AAAA,QACvB,GAAG;AAAA,QACH,KAAC,yCAAwB,UAAU,CAAC,GAAG,MAAM,SAAS,UAAU;AAAA,MAClE;AAAA,MACA,CAAC;AAAA,IACH;AAAA,EACF;AACF;AAEA,SAAS,mBAAmB,aAA0B,OAAsB;AAC1E,MAAI,kBAAkB,KAAK,GAAG;AAC5B,eAAO,iCAAc,aAAa,KAAK;AAAA,EACzC;AAEA,MAAI,UAAU,KAAK,GAAG;AACpB,WAAO,WAAW,aAAa,KAAmC;AAAA,EACpE;AAEA,QAAM,EAAE,YAAY,UAAU,IAAI;AAClC,aAAO,yBAAW,aAAa,WAAW,UAAU;AACtD;AAEA,SAAS,eACP,aACA,OACA,OACkB;AAClB,QAAM,MAAM,mBAAmB,aAAa,KAAK;AACjD,aAAO,kCAAgB,CAAC,GAAG,GAAG,MAAM,UAAU;AAChD;","names":[]}

package/dist/cjs/runtimes/react/host-api-client.js

@@ -26,8 +26,12 @@ module.exports = __toCommonJS(host_api_client_exports);
 var import_jsx_runtime = require("react/jsx-runtime");
 var import_react = require("react");
 var import_react2 = require("../../api/react");
+var import_site_version = require("../../api/site-version");
 const Context = (0, import_react.createContext)(
-  new import_react2.MakeswiftHostApiClient({ uri: "https://api.makeswift.com/graphql" })
+  new import_react2.MakeswiftHostApiClient({
+    uri: "https://api.makeswift.com/graphql",
+    siteVersion: import_site_version.MakeswiftSiteVersion.Live
+  })
 );
 function useMakeswiftHostApiClient() {
   return (0, import_react.useContext)(Context);

package/dist/cjs/runtimes/react/host-api-client.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/runtimes/react/host-api-client.tsx"],"sourcesContent":["'use client'\n\nimport { ReactNode, createContext, useContext } from 'react'\nimport { MakeswiftHostApiClient } from '../../api/react'\n\nconst Context = createContext(\n  new MakeswiftHostApiClient({ uri: 'https://api.makeswift.com/graphql' }),\n)\n\nexport function useMakeswiftHostApiClient(): MakeswiftHostApiClient {\n  return useContext(Context)\n}\n\nexport function MakeswiftHostApiClientProvider({\n  client,\n  children,\n}: {\n  client: MakeswiftHostApiClient\n  children: ReactNode\n}) {\n  return <Context.Provider value={client}>{children}</Context.Provider>\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAoBS;AAlBT,mBAAqD;AACrD,IAAAA,gBAAuC;AAEvC,MAAM,cAAU;AAAA,EACd,IAAI,qCAAuB,EAAE,KAAK,oCAAoC,CAAC;AACzE;AAEO,SAAS,4BAAoD;AAClE,aAAO,yBAAW,OAAO;AAC3B;AAEO,SAAS,+BAA+B;AAAA,EAC7C;AAAA,EACA;AACF,GAGG;AACD,SAAO,4CAAC,QAAQ,UAAR,EAAiB,OAAO,QAAS,UAAS;AACpD;","names":["import_react"]}
+{"version":3,"sources":["../../../../src/runtimes/react/host-api-client.tsx"],"sourcesContent":["'use client'\n\nimport { ReactNode, createContext, useContext } from 'react'\nimport { MakeswiftHostApiClient } from '../../api/react'\nimport { MakeswiftSiteVersion } from '../../api/site-version'\n\nconst Context = createContext(\n  new MakeswiftHostApiClient({\n    uri: 'https://api.makeswift.com/graphql',\n    siteVersion: MakeswiftSiteVersion.Live,\n  }),\n)\n\nexport function useMakeswiftHostApiClient(): MakeswiftHostApiClient {\n  return useContext(Context)\n}\n\nexport function MakeswiftHostApiClientProvider({\n  client,\n  children,\n}: {\n  client: MakeswiftHostApiClient\n  children: ReactNode\n}) {\n  return <Context.Provider value={client}>{children}</Context.Provider>\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAwBS;AAtBT,mBAAqD;AACrD,IAAAA,gBAAuC;AACvC,0BAAqC;AAErC,MAAM,cAAU;AAAA,EACd,IAAI,qCAAuB;AAAA,IACzB,KAAK;AAAA,IACL,aAAa,yCAAqB;AAAA,EACpC,CAAC;AACH;AAEO,SAAS,4BAAoD;AAClE,aAAO,yBAAW,OAAO;AAC3B;AAEO,SAAS,+BAA+B;AAAA,EAC7C;AAAA,EACA;AACF,GAGG;AACD,SAAO,4CAAC,QAAQ,UAAR,EAAiB,OAAO,QAAS,UAAS;AACpD;","names":["import_react"]}

package/dist/cjs/slate/BlockPlugin/setBlockKeyForDevice.js

@@ -24,7 +24,6 @@ module.exports = __toCommonJS(setBlockKeyForDevice_exports);
 var import_slate = require("slate");
 var import_controls = require("@makeswift/controls");
 var import_selectors = require("../selectors");
-var import_breakpoints = require("../../state/modules/breakpoints");
 function setBlockKeyForDevice(editor, breakpoints, deviceId, key, value, options) {
   const at = options?.at ?? editor.selection;
   if (!at)
@@ -33,7 +32,7 @@ function setBlockKeyForDevice(editor, breakpoints, deviceId, key, value, options
   for (const [node, path] of rootElements) {
     if (import_controls.Slate.isBlock(node)) {
       const deviceValues = node[key] ?? [];
-      const currentDeviceValue = (0, import_breakpoints.findBreakpointOverride)(breakpoints, deviceValues, deviceId, (v) => v);
+      const currentDeviceValue = (0, import_controls.findBreakpointOverride)(breakpoints, deviceValues, deviceId, (v) => v);
       const nextDeviceValue = {
         ...currentDeviceValue,
         deviceId,

package/dist/cjs/slate/BlockPlugin/setBlockKeyForDevice.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/slate/BlockPlugin/setBlockKeyForDevice.ts"],"sourcesContent":["import { Editor, Transforms, Location } from 'slate'\nimport { Slate } from '@makeswift/controls'\n\nimport { getBlocksInSelection } from '../selectors'\nimport { EditableBlockKey, EditableBlockValue } from './types'\nimport { Breakpoints, BreakpointId, findBreakpointOverride } from '../../state/modules/breakpoints'\n\ntype SetBlockKeyForDeviceOptions = {\n  at?: Location\n}\n\nexport function setBlockKeyForDevice(\n  editor: Editor,\n  breakpoints: Breakpoints,\n  deviceId: BreakpointId,\n  key: EditableBlockKey,\n  value: EditableBlockValue[number]['value'],\n  options?: SetBlockKeyForDeviceOptions,\n) {\n  const at = options?.at ?? editor.selection\n  if (!at) return\n\n  const rootElements = getBlocksInSelection(editor)\n\n  for (const [node, path] of rootElements) {\n    if (Slate.isBlock(node)) {\n      const deviceValues = node[key] ?? []\n      const currentDeviceValue = findBreakpointOverride(breakpoints, deviceValues, deviceId, v => v)\n      const nextDeviceValue = {\n        ...currentDeviceValue,\n        deviceId,\n        value,\n      }\n      Transforms.setNodes(\n        editor,\n        {\n          [key]: [...deviceValues.filter(v => v.deviceId !== deviceId), nextDeviceValue],\n        },\n        { at: path },\n      )\n    }\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAA6C;AAC7C,sBAAsB;AAEtB,uBAAqC;AAErC,yBAAkE;AAM3D,SAAS,qBACd,QACA,aACA,UACA,KACA,OACA,SACA;AACA,QAAM,KAAK,SAAS,MAAM,OAAO;AACjC,MAAI,CAAC;AAAI;AAET,QAAM,mBAAe,uCAAqB,MAAM;AAEhD,aAAW,CAAC,MAAM,IAAI,KAAK,cAAc;AACvC,QAAI,sBAAM,QAAQ,IAAI,GAAG;AACvB,YAAM,eAAe,KAAK,GAAG,KAAK,CAAC;AACnC,YAAM,yBAAqB,2CAAuB,aAAa,cAAc,UAAU,OAAK,CAAC;AAC7F,YAAM,kBAAkB;AAAA,QACtB,GAAG;AAAA,QACH;AAAA,QACA;AAAA,MACF;AACA,8BAAW;AAAA,QACT;AAAA,QACA;AAAA,UACE,CAAC,GAAG,GAAG,CAAC,GAAG,aAAa,OAAO,OAAK,EAAE,aAAa,QAAQ,GAAG,eAAe;AAAA,QAC/E;AAAA,QACA,EAAE,IAAI,KAAK;AAAA,MACb;AAAA,IACF;AAAA,EACF;AACF;","names":[]}
+{"version":3,"sources":["../../../../src/slate/BlockPlugin/setBlockKeyForDevice.ts"],"sourcesContent":["import { Editor, Transforms, Location } from 'slate'\nimport {\n  type Breakpoints,\n  type BreakpointId,\n  findBreakpointOverride,\n  Slate,\n} from '@makeswift/controls'\n\nimport { getBlocksInSelection } from '../selectors'\nimport { EditableBlockKey, EditableBlockValue } from './types'\n\ntype SetBlockKeyForDeviceOptions = {\n  at?: Location\n}\n\nexport function setBlockKeyForDevice(\n  editor: Editor,\n  breakpoints: Breakpoints,\n  deviceId: BreakpointId,\n  key: EditableBlockKey,\n  value: EditableBlockValue[number]['value'],\n  options?: SetBlockKeyForDeviceOptions,\n) {\n  const at = options?.at ?? editor.selection\n  if (!at) return\n\n  const rootElements = getBlocksInSelection(editor)\n\n  for (const [node, path] of rootElements) {\n    if (Slate.isBlock(node)) {\n      const deviceValues = node[key] ?? []\n      const currentDeviceValue = findBreakpointOverride(breakpoints, deviceValues, deviceId, v => v)\n      const nextDeviceValue = {\n        ...currentDeviceValue,\n        deviceId,\n        value,\n      }\n      Transforms.setNodes(\n        editor,\n        {\n          [key]: [...deviceValues.filter(v => v.deviceId !== deviceId), nextDeviceValue],\n        },\n        { at: path },\n      )\n    }\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAA6C;AAC7C,sBAKO;AAEP,uBAAqC;AAO9B,SAAS,qBACd,QACA,aACA,UACA,KACA,OACA,SACA;AACA,QAAM,KAAK,SAAS,MAAM,OAAO;AACjC,MAAI,CAAC;AAAI;AAET,QAAM,mBAAe,uCAAqB,MAAM;AAEhD,aAAW,CAAC,MAAM,IAAI,KAAK,cAAc;AACvC,QAAI,sBAAM,QAAQ,IAAI,GAAG;AACvB,YAAM,eAAe,KAAK,GAAG,KAAK,CAAC;AACnC,YAAM,yBAAqB,wCAAuB,aAAa,cAAc,UAAU,OAAK,CAAC;AAC7F,YAAM,kBAAkB;AAAA,QACtB,GAAG;AAAA,QACH;AAAA,QACA;AAAA,MACF;AACA,8BAAW;AAAA,QACT;AAAA,QACA;AAAA,UACE,CAAC,GAAG,GAAG,CAAC,GAAG,aAAa,OAAO,OAAK,EAAE,aAAa,QAAQ,GAAG,eAAe;AAAA,QAC/E;AAAA,QACA,EAAE,IAAI,KAAK;AAAA,MACb;AAAA,IACF;AAAA,EACF;AACF;","names":[]}

package/dist/cjs/slate/TypographyPlugin/setActiveTypographyStyle.js

@@ -22,7 +22,7 @@ __export(setActiveTypographyStyle_exports, {
 });
 module.exports = __toCommonJS(setActiveTypographyStyle_exports);
 var import_slate = require("slate");
-var import_breakpoints = require("../../state/modules/breakpoints");
+var import_controls = require("@makeswift/controls");
 function setActiveTypographyStyle(editor, breakpoints, deviceId, prop, value, options) {
   import_slate.Editor.withoutNormalizing(editor, () => {
     const at = options?.at ?? editor.selection;
@@ -52,7 +52,7 @@ function setActiveTypographyStyle(editor, breakpoints, deviceId, prop, value, op
       for (const [node, path] of textNodes) {
         if (import_slate.Text.isText(node)) {
           const deviceOverrides = node?.typography?.style ?? [];
-          const deviceStyle = (0, import_breakpoints.findBreakpointOverride)(
+          const deviceStyle = (0, import_controls.findBreakpointOverride)(
             breakpoints,
             deviceOverrides,
             deviceId,

package/dist/cjs/slate/TypographyPlugin/setActiveTypographyStyle.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/slate/TypographyPlugin/setActiveTypographyStyle.ts"],"sourcesContent":["import { Editor, Transforms, Text, Range } from 'slate'\nimport { RichTextTypography } from '@makeswift/controls'\n\nimport { Breakpoints, findBreakpointOverride, BreakpointId } from '../../state/modules/breakpoints'\n\ntype SetActiveTypographyStyleOptions = {\n  at?: Range\n}\n\nexport function setActiveTypographyStyle(\n  editor: Editor,\n  breakpoints: Breakpoints,\n  deviceId: string,\n  prop: string,\n  value?: unknown,\n  options?: SetActiveTypographyStyleOptions,\n) {\n  Editor.withoutNormalizing(editor, () => {\n    const at = options?.at ?? editor.selection\n    if (!at) return\n    const atRef = Editor.rangeRef(editor, at)\n\n    if (atRef.current) {\n      Transforms.setNodes(\n        editor,\n        {\n          slice: true,\n        },\n        {\n          at: atRef.current,\n          match: node => Text.isText(node),\n          split: Range.isExpanded(atRef.current),\n        },\n      )\n    }\n\n    if (atRef.current) {\n      const textNodes = Array.from(\n        Editor.nodes(editor, {\n          at: atRef.current,\n          match: node => Text.isText(node) && node.slice === true,\n        }),\n      )\n\n      for (const [node, path] of textNodes) {\n        if (Text.isText(node)) {\n          const deviceOverrides = node?.typography?.style ?? []\n          const deviceStyle = findBreakpointOverride(\n            breakpoints,\n            deviceOverrides,\n            deviceId as BreakpointId,\n            v => v,\n          ) || {\n            value: {},\n          }\n          const nextDeviceStyle = {\n            deviceId,\n            value: { ...deviceStyle.value, [prop]: value },\n          }\n\n          const nextTypography: RichTextTypography = {\n            ...node.typography,\n            style: [...deviceOverrides.filter(v => v.deviceId !== deviceId), nextDeviceStyle],\n          }\n\n          Transforms.setNodes(\n            editor,\n            {\n              typography: nextTypography,\n            },\n            { at: path },\n          )\n        }\n      }\n    }\n\n    atRef.unref()\n  })\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAgD;AAGhD,yBAAkE;AAM3D,SAAS,yBACd,QACA,aACA,UACA,MACA,OACA,SACA;AACA,sBAAO,mBAAmB,QAAQ,MAAM;AACtC,UAAM,KAAK,SAAS,MAAM,OAAO;AACjC,QAAI,CAAC;AAAI;AACT,UAAM,QAAQ,oBAAO,SAAS,QAAQ,EAAE;AAExC,QAAI,MAAM,SAAS;AACjB,8BAAW;AAAA,QACT;AAAA,QACA;AAAA,UACE,OAAO;AAAA,QACT;AAAA,QACA;AAAA,UACE,IAAI,MAAM;AAAA,UACV,OAAO,UAAQ,kBAAK,OAAO,IAAI;AAAA,UAC/B,OAAO,mBAAM,WAAW,MAAM,OAAO;AAAA,QACvC;AAAA,MACF;AAAA,IACF;AAEA,QAAI,MAAM,SAAS;AACjB,YAAM,YAAY,MAAM;AAAA,QACtB,oBAAO,MAAM,QAAQ;AAAA,UACnB,IAAI,MAAM;AAAA,UACV,OAAO,UAAQ,kBAAK,OAAO,IAAI,KAAK,KAAK,UAAU;AAAA,QACrD,CAAC;AAAA,MACH;AAEA,iBAAW,CAAC,MAAM,IAAI,KAAK,WAAW;AACpC,YAAI,kBAAK,OAAO,IAAI,GAAG;AACrB,gBAAM,kBAAkB,MAAM,YAAY,SAAS,CAAC;AACpD,gBAAM,kBAAc;AAAA,YAClB;AAAA,YACA;AAAA,YACA;AAAA,YACA,OAAK;AAAA,UACP,KAAK;AAAA,YACH,OAAO,CAAC;AAAA,UACV;AACA,gBAAM,kBAAkB;AAAA,YACtB;AAAA,YACA,OAAO,EAAE,GAAG,YAAY,OAAO,CAAC,IAAI,GAAG,MAAM;AAAA,UAC/C;AAEA,gBAAM,iBAAqC;AAAA,YACzC,GAAG,KAAK;AAAA,YACR,OAAO,CAAC,GAAG,gBAAgB,OAAO,OAAK,EAAE,aAAa,QAAQ,GAAG,eAAe;AAAA,UAClF;AAEA,kCAAW;AAAA,YACT;AAAA,YACA;AAAA,cACE,YAAY;AAAA,YACd;AAAA,YACA,EAAE,IAAI,KAAK;AAAA,UACb;AAAA,QACF;AAAA,MACF;AAAA,IACF;AAEA,UAAM,MAAM;AAAA,EACd,CAAC;AACH;","names":[]}
+{"version":3,"sources":["../../../../src/slate/TypographyPlugin/setActiveTypographyStyle.ts"],"sourcesContent":["import { Editor, Transforms, Text, Range } from 'slate'\nimport {\n  type Breakpoints,\n  type BreakpointId,\n  findBreakpointOverride,\n  RichTextTypography,\n} from '@makeswift/controls'\n\ntype SetActiveTypographyStyleOptions = {\n  at?: Range\n}\n\nexport function setActiveTypographyStyle(\n  editor: Editor,\n  breakpoints: Breakpoints,\n  deviceId: string,\n  prop: string,\n  value?: unknown,\n  options?: SetActiveTypographyStyleOptions,\n) {\n  Editor.withoutNormalizing(editor, () => {\n    const at = options?.at ?? editor.selection\n    if (!at) return\n    const atRef = Editor.rangeRef(editor, at)\n\n    if (atRef.current) {\n      Transforms.setNodes(\n        editor,\n        {\n          slice: true,\n        },\n        {\n          at: atRef.current,\n          match: node => Text.isText(node),\n          split: Range.isExpanded(atRef.current),\n        },\n      )\n    }\n\n    if (atRef.current) {\n      const textNodes = Array.from(\n        Editor.nodes(editor, {\n          at: atRef.current,\n          match: node => Text.isText(node) && node.slice === true,\n        }),\n      )\n\n      for (const [node, path] of textNodes) {\n        if (Text.isText(node)) {\n          const deviceOverrides = node?.typography?.style ?? []\n          const deviceStyle = findBreakpointOverride(\n            breakpoints,\n            deviceOverrides,\n            deviceId as BreakpointId,\n            v => v,\n          ) || {\n            value: {},\n          }\n          const nextDeviceStyle = {\n            deviceId,\n            value: { ...deviceStyle.value, [prop]: value },\n          }\n\n          const nextTypography: RichTextTypography = {\n            ...node.typography,\n            style: [...deviceOverrides.filter(v => v.deviceId !== deviceId), nextDeviceStyle],\n          }\n\n          Transforms.setNodes(\n            editor,\n            {\n              typography: nextTypography,\n            },\n            { at: path },\n          )\n        }\n      }\n    }\n\n    atRef.unref()\n  })\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAgD;AAChD,sBAKO;AAMA,SAAS,yBACd,QACA,aACA,UACA,MACA,OACA,SACA;AACA,sBAAO,mBAAmB,QAAQ,MAAM;AACtC,UAAM,KAAK,SAAS,MAAM,OAAO;AACjC,QAAI,CAAC;AAAI;AACT,UAAM,QAAQ,oBAAO,SAAS,QAAQ,EAAE;AAExC,QAAI,MAAM,SAAS;AACjB,8BAAW;AAAA,QACT;AAAA,QACA;AAAA,UACE,OAAO;AAAA,QACT;AAAA,QACA;AAAA,UACE,IAAI,MAAM;AAAA,UACV,OAAO,UAAQ,kBAAK,OAAO,IAAI;AAAA,UAC/B,OAAO,mBAAM,WAAW,MAAM,OAAO;AAAA,QACvC;AAAA,MACF;AAAA,IACF;AAEA,QAAI,MAAM,SAAS;AACjB,YAAM,YAAY,MAAM;AAAA,QACtB,oBAAO,MAAM,QAAQ;AAAA,UACnB,IAAI,MAAM;AAAA,UACV,OAAO,UAAQ,kBAAK,OAAO,IAAI,KAAK,KAAK,UAAU;AAAA,QACrD,CAAC;AAAA,MACH;AAEA,iBAAW,CAAC,MAAM,IAAI,KAAK,WAAW;AACpC,YAAI,kBAAK,OAAO,IAAI,GAAG;AACrB,gBAAM,kBAAkB,MAAM,YAAY,SAAS,CAAC;AACpD,gBAAM,kBAAc;AAAA,YAClB;AAAA,YACA;AAAA,YACA;AAAA,YACA,OAAK;AAAA,UACP,KAAK;AAAA,YACH,OAAO,CAAC;AAAA,UACV;AACA,gBAAM,kBAAkB;AAAA,YACtB;AAAA,YACA,OAAO,EAAE,GAAG,YAAY,OAAO,CAAC,IAAI,GAAG,MAAM;AAAA,UAC/C;AAEA,gBAAM,iBAAqC;AAAA,YACzC,GAAG,KAAK;AAAA,YACR,OAAO,CAAC,GAAG,gBAAgB,OAAO,OAAK,EAAE,aAAa,QAAQ,GAAG,eAAe;AAAA,UAClF;AAEA,kCAAW;AAAA,YACT;AAAA,YACA;AAAA,cACE,YAAY;AAAA,YACd;AAAA,YACA,EAAE,IAAI,KAAK;AAAA,UACb;AAAA,QACF;AAAA,MACF;AAAA,IACF;AAEA,UAAM,MAAM;AAAA,EACd,CAAC;AACH;","names":[]}

package/dist/cjs/slate/selectors.js

@@ -43,7 +43,6 @@ var import_controls = require("@makeswift/controls");
 var import_unhangRange = __toESM(require("./utils/unhangRange"));
 var import_shallowEqual = __toESM(require("../utils/shallowEqual"));
 var import_isNonNullable = require("../utils/isNonNullable");
-var import_breakpoints = require("../state/modules/breakpoints");
 var import_deepEqual = __toESM(require("../utils/deepEqual"));
 var import_keys = __toESM(require("../utils/keys"));
 function getSelection(editor) {
@@ -88,7 +87,7 @@ function getActiveBlockDeviceOverrideValue(editor, key, breakpoints, deviceId) {
   const active = [];
   const blocks = getBlocksInSelection(editor);
   blocks.forEach(([block]) => {
-    const deviceOverride = (0, import_breakpoints.findBreakpointOverride)(breakpoints, block[key], deviceId) || null;
+    const deviceOverride = (0, import_controls.findBreakpointOverride)(breakpoints, block[key], deviceId) || null;
     active.push(deviceOverride?.value ?? null);
   });
   return active.length === 0 ? null : active.reduce((a, b) => (0, import_shallowEqual.default)(a, b) ? b : null);
@@ -117,7 +116,7 @@ const fuseTypographyMarks = (values, breakpoints) => {
     id: values.map((v) => v && v.id).reduce((a, b) => a === b ? a : void 0) ?? void 0,
     style: devices.map(
       (deviceId) => values.map(
-        (v) => v && (0, import_breakpoints.findBreakpointOverride)(breakpoints, v.style, deviceId) || {
+        (v) => v && (0, import_controls.findBreakpointOverride)(breakpoints, v.style, deviceId) || {
           deviceId,
           value: {}
         }

package/dist/cjs/slate/selectors.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/slate/selectors.ts"],"sourcesContent":["import { Editor, NodeEntry, Range, Text } from 'slate'\nimport { Slate } from '@makeswift/controls'\n\nimport { EditableBlockKey } from './BlockPlugin/types'\n\nimport unhangRange from './utils/unhangRange'\nimport shallowEqual from '../utils/shallowEqual'\nimport { isNonNullable } from '../utils/isNonNullable'\n\nimport { Breakpoints, BreakpointId, findBreakpointOverride } from '../state/modules/breakpoints'\nimport deepEqual from '../utils/deepEqual'\nimport keys from '../utils/keys'\n\nexport function getSelection(editor: Editor): Range {\n  if (editor.selection) return unhangRange(editor, editor.selection)\n  return {\n    anchor: Editor.start(editor, []),\n    focus: Editor.end(editor, []),\n  }\n}\n\nexport function getBlocksInSelection(editor: Editor): NodeEntry<Slate.RootBlock>[] {\n  return Array.from(\n    Editor.nodes(editor, {\n      at: getSelection(editor),\n      match: node => Slate.isRootBlock(node),\n    }),\n  ).filter((entry): entry is NodeEntry<Slate.RootBlock> => Slate.isRootBlock(entry[0]))\n}\n\nexport function getInlinesInSelection(editor: Editor): NodeEntry<Slate.Inline>[] {\n  return Array.from(\n    Editor.nodes(editor, {\n      at: getSelection(editor),\n      match: node => Slate.isInline(node),\n    }),\n  ).filter((entry): entry is NodeEntry<Slate.Inline> => Slate.isInline(entry[0]))\n}\n\nexport function getActiveBlockType(editor: Editor): Slate.RootBlockType | null {\n  const rootBlocks = getBlocksInSelection(editor).map(([node]) => node.type)\n\n  return rootBlocks.reduce<Slate.RootBlockType | null>(\n    (a, b) => (a === b ? b : null),\n    rootBlocks.at(0) ?? null,\n  )\n}\n\nexport function getActiveBlockValue(editor: Editor, key: EditableBlockKey) {\n  const blocks = getBlocksInSelection(editor)\n\n  const active = blocks.map(\n    ([block]) => block[key] ?? null,\n  ) as (Slate.ResponsiveBlockTextAlignment | null)[]\n\n  return active.length === 0 ? null : active.reduce((a, b) => (shallowEqual(a, b) ? b : null))\n}\n\nexport function getActiveBlockDeviceOverrideValue(\n  editor: Editor,\n  key: EditableBlockKey,\n  breakpoints: Breakpoints,\n  deviceId: BreakpointId,\n) {\n  const active: (Slate.BlockTextAlignment | null)[] = []\n  const blocks = getBlocksInSelection(editor)\n\n  blocks.forEach(([block]) => {\n    const deviceOverride =\n      findBreakpointOverride<Slate.BlockTextAlignment>(breakpoints, block[key], deviceId) || null\n    active.push(deviceOverride?.value ?? null)\n  })\n\n  return active.length === 0 ? null : active.reduce((a, b) => (shallowEqual(a, b) ? b : null))\n}\n\n// Typography\n\nconst concat = (a: unknown[], b: unknown[]) => a.concat(b)\n\n// TODO: This is more cruft from trying to remove null from the typography type. This optimization is not worth it.\n/**\n * This is a c/p of the intersection of the utils from the root utils folder.\n * The only change is defaulting to undefined instead of to null.\n */\nexport default function intersection<A extends Record<string, unknown>, B extends A>(\n  a: A,\n  b: B,\n  isEqual: (a: unknown, b: unknown) => boolean = deepEqual,\n): { [K in keyof A]: A[K] | undefined } {\n  const allKeys = [...new Set([...keys(a), ...keys(b)])] as (keyof A)[]\n\n  return allKeys.reduce(\n    (acc, k) => {\n      if (isEqual(a[k], b[k])) acc[k] = a[k]\n      else acc[k] = undefined\n\n      return acc\n    },\n    {} as { [K in keyof A]: A[K] | undefined },\n  )\n}\n\nconst fuseTypographyMarks = (\n  values: Array<Slate.Typography | null | undefined>,\n  breakpoints: Breakpoints,\n): Slate.Typography => {\n  const devices = [\n    ...new Set(\n      values\n        .filter(isNonNullable)\n        .map(({ style }) => style.map(({ deviceId }) => deviceId))\n        .reduce(concat, []),\n    ),\n  ] as BreakpointId[]\n\n  return {\n    id: values.map(v => v && v.id).reduce((a, b) => (a === b ? a : undefined)) ?? undefined,\n    style: devices.map(deviceId =>\n      values\n        .map(\n          v =>\n            (v && findBreakpointOverride(breakpoints, v.style, deviceId)) || {\n              deviceId,\n              value: {},\n            },\n        )\n        .reduce((acc, { value }) => {\n          const a = intersection(acc.value, value)\n          return {\n            deviceId,\n            value: a,\n          }\n        }),\n    ),\n  }\n}\n\nexport function getActiveTypographyMark(\n  editor: Editor,\n  breakpoints: Breakpoints,\n): Slate.Typography {\n  const active: Slate.Typography[] = []\n\n  const textNodes = Editor.nodes(editor, {\n    at: getSelection(editor),\n    match: node => Text.isText(node),\n  })\n\n  for (const [node] of textNodes) {\n    if (Text.isText(node) && 'typography' in node && node.typography != undefined) {\n      active.push(node.typography)\n    }\n  }\n  return active.length === 0 ? { style: [] } : fuseTypographyMarks(active, breakpoints)\n}\n"],"mappings":"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","names":["unhangRange","shallowEqual","deepEqual","keys"]}
+{"version":3,"sources":["../../../src/slate/selectors.ts"],"sourcesContent":["import { Editor, NodeEntry, Range, Text } from 'slate'\nimport {\n  type Breakpoints,\n  type BreakpointId,\n  findBreakpointOverride,\n  Slate,\n} from '@makeswift/controls'\n\nimport { EditableBlockKey } from './BlockPlugin/types'\n\nimport unhangRange from './utils/unhangRange'\nimport shallowEqual from '../utils/shallowEqual'\nimport { isNonNullable } from '../utils/isNonNullable'\n\nimport deepEqual from '../utils/deepEqual'\nimport keys from '../utils/keys'\n\nexport function getSelection(editor: Editor): Range {\n  if (editor.selection) return unhangRange(editor, editor.selection)\n  return {\n    anchor: Editor.start(editor, []),\n    focus: Editor.end(editor, []),\n  }\n}\n\nexport function getBlocksInSelection(editor: Editor): NodeEntry<Slate.RootBlock>[] {\n  return Array.from(\n    Editor.nodes(editor, {\n      at: getSelection(editor),\n      match: node => Slate.isRootBlock(node),\n    }),\n  ).filter((entry): entry is NodeEntry<Slate.RootBlock> => Slate.isRootBlock(entry[0]))\n}\n\nexport function getInlinesInSelection(editor: Editor): NodeEntry<Slate.Inline>[] {\n  return Array.from(\n    Editor.nodes(editor, {\n      at: getSelection(editor),\n      match: node => Slate.isInline(node),\n    }),\n  ).filter((entry): entry is NodeEntry<Slate.Inline> => Slate.isInline(entry[0]))\n}\n\nexport function getActiveBlockType(editor: Editor): Slate.RootBlockType | null {\n  const rootBlocks = getBlocksInSelection(editor).map(([node]) => node.type)\n\n  return rootBlocks.reduce<Slate.RootBlockType | null>(\n    (a, b) => (a === b ? b : null),\n    rootBlocks.at(0) ?? null,\n  )\n}\n\nexport function getActiveBlockValue(editor: Editor, key: EditableBlockKey) {\n  const blocks = getBlocksInSelection(editor)\n\n  const active = blocks.map(\n    ([block]) => block[key] ?? null,\n  ) as (Slate.ResponsiveBlockTextAlignment | null)[]\n\n  return active.length === 0 ? null : active.reduce((a, b) => (shallowEqual(a, b) ? b : null))\n}\n\nexport function getActiveBlockDeviceOverrideValue(\n  editor: Editor,\n  key: EditableBlockKey,\n  breakpoints: Breakpoints,\n  deviceId: BreakpointId,\n) {\n  const active: (Slate.BlockTextAlignment | null)[] = []\n  const blocks = getBlocksInSelection(editor)\n\n  blocks.forEach(([block]) => {\n    const deviceOverride =\n      findBreakpointOverride<Slate.BlockTextAlignment>(breakpoints, block[key], deviceId) || null\n    active.push(deviceOverride?.value ?? null)\n  })\n\n  return active.length === 0 ? null : active.reduce((a, b) => (shallowEqual(a, b) ? b : null))\n}\n\n// Typography\n\nconst concat = (a: unknown[], b: unknown[]) => a.concat(b)\n\n// TODO: This is more cruft from trying to remove null from the typography type. This optimization is not worth it.\n/**\n * This is a c/p of the intersection of the utils from the root utils folder.\n * The only change is defaulting to undefined instead of to null.\n */\nexport default function intersection<A extends Record<string, unknown>, B extends A>(\n  a: A,\n  b: B,\n  isEqual: (a: unknown, b: unknown) => boolean = deepEqual,\n): { [K in keyof A]: A[K] | undefined } {\n  const allKeys = [...new Set([...keys(a), ...keys(b)])] as (keyof A)[]\n\n  return allKeys.reduce(\n    (acc, k) => {\n      if (isEqual(a[k], b[k])) acc[k] = a[k]\n      else acc[k] = undefined\n\n      return acc\n    },\n    {} as { [K in keyof A]: A[K] | undefined },\n  )\n}\n\nconst fuseTypographyMarks = (\n  values: Array<Slate.Typography | null | undefined>,\n  breakpoints: Breakpoints,\n): Slate.Typography => {\n  const devices = [\n    ...new Set(\n      values\n        .filter(isNonNullable)\n        .map(({ style }) => style.map(({ deviceId }) => deviceId))\n        .reduce(concat, []),\n    ),\n  ] as BreakpointId[]\n\n  return {\n    id: values.map(v => v && v.id).reduce((a, b) => (a === b ? a : undefined)) ?? undefined,\n    style: devices.map(deviceId =>\n      values\n        .map(\n          v =>\n            (v && findBreakpointOverride(breakpoints, v.style, deviceId)) || {\n              deviceId,\n              value: {},\n            },\n        )\n        .reduce((acc, { value }) => {\n          const a = intersection(acc.value, value)\n          return {\n            deviceId,\n            value: a,\n          }\n        }),\n    ),\n  }\n}\n\nexport function getActiveTypographyMark(\n  editor: Editor,\n  breakpoints: Breakpoints,\n): Slate.Typography {\n  const active: Slate.Typography[] = []\n\n  const textNodes = Editor.nodes(editor, {\n    at: getSelection(editor),\n    match: node => Text.isText(node),\n  })\n\n  for (const [node] of textNodes) {\n    if (Text.isText(node) && 'typography' in node && node.typography != undefined) {\n      active.push(node.typography)\n    }\n  }\n  return active.length === 0 ? { style: [] } : fuseTypographyMarks(active, breakpoints)\n}\n"],"mappings":"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","names":["unhangRange","shallowEqual","deepEqual","keys"]}

package/dist/cjs/state/makeswift-api-client.js

@@ -42,7 +42,8 @@ var APIResources = __toESM(require("./modules/api-resources"));
 var LocalizedResourcesMap = __toESM(require("./modules/localized-resources-map"));
 var import_actions = require("./actions");
 var import_api = require("../api");
-var import_site_published = require("../next/api-handler/handlers/webhook/site-published");
+var import_cache = require("../next/cache");
+var import_site_version = require("../api/site-version");
 const reducer = (0, import_redux.combineReducers)({
   apiResources: APIResources.reducer,
   localizedResourcesMap: LocalizedResourcesMap.reducer
@@ -80,10 +81,13 @@ function getAPIResource(state, resourceType, resourceId, locale) {
       return APIResources.getAPIResource(state.apiResources, resourceType, resourceId, locale);
   }
 }
-async function fetchJson(url) {
+async function fetchJson(url, siteVersion) {
   const response = await fetch(url, {
-    headers: { "Content-Type": "application/json" },
-    next: { tags: [import_site_published.MAKESWIFT_CACHE_TAG] }
+    headers: {
+      "Content-Type": "application/json",
+      [import_site_version.API_HANDLER_SITE_VERSION_HEADER]: siteVersion
+    },
+    next: { tags: [import_cache.MAKESWIFT_CACHE_TAG] }
   });
   if (response.status === 404)
     return null;
@@ -96,7 +100,7 @@ async function fetchJson(url) {
   }
   return response.json();
 }
-function fetchAPIResource(resourceType, resourceId, locale) {
+function fetchAPIResource(resourceType, resourceId, siteVersion, locale) {
   return async (dispatch, getState) => {
     const state = getState();
     if (getHasAPIResource(state, resourceType, resourceId, locale)) {
@@ -105,16 +109,22 @@ function fetchAPIResource(resourceType, resourceId, locale) {
     let resource;
     switch (resourceType) {
       case import_api.APIResourceType.Swatch:
-        resource = await fetchJson(`/api/makeswift/swatches/${resourceId}`);
+        resource = await fetchJson(`/api/makeswift/swatches/${resourceId}`, siteVersion);
         break;
       case import_api.APIResourceType.File:
-        resource = await fetchJson(`/api/makeswift/files/${resourceId}`);
+        resource = await fetchJson(`/api/makeswift/files/${resourceId}`, siteVersion);
         break;
       case import_api.APIResourceType.Typography:
-        resource = await fetchJson(`/api/makeswift/typographies/${resourceId}`);
+        resource = await fetchJson(
+          `/api/makeswift/typographies/${resourceId}`,
+          siteVersion
+        );
         break;
       case import_api.APIResourceType.GlobalElement:
-        resource = await fetchJson(`/api/makeswift/global-elements/${resourceId}`);
+        resource = await fetchJson(
+          `/api/makeswift/global-elements/${resourceId}`,
+          siteVersion
+        );
         break;
       case import_api.APIResourceType.LocalizedGlobalElement: {
         if (locale == null)
@@ -123,7 +133,8 @@ function fetchAPIResource(resourceType, resourceId, locale) {
           return null;
         }
         resource = await fetchJson(
-          `/api/makeswift/localized-global-elements/${resourceId}/${locale}`
+          `/api/makeswift/localized-global-elements/${resourceId}/${locale}`,
+          siteVersion
         );
         dispatch(
           (0, import_actions.setLocalizedResourceId)({
@@ -138,11 +149,11 @@ function fetchAPIResource(resourceType, resourceId, locale) {
         const url = new URL(`/api/makeswift/page-pathname-slices/${resourceId}`, "http://n");
         if (locale != null)
           url.searchParams.set("locale", locale);
-        resource = await fetchJson(url.pathname + url.search);
+        resource = await fetchJson(url.pathname + url.search, siteVersion);
         break;
       }
       case import_api.APIResourceType.Table:
-        resource = await fetchJson(`/api/makeswift/tables/${resourceId}`);
+        resource = await fetchJson(`/api/makeswift/tables/${resourceId}`, siteVersion);
         break;
       default:
         resource = null;

package/dist/cjs/state/makeswift-api-client.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/state/makeswift-api-client.ts"],"sourcesContent":["import {\n  applyMiddleware,\n  createStore,\n  combineReducers,\n  type Dispatch as ReduxDispatch,\n  type Store as ReduxStore,\n  type Middleware,\n} from 'redux'\nimport thunk, { type ThunkAction, type ThunkDispatch } from 'redux-thunk'\n\nimport { composeWithDevToolsDevelopmentOnly } from '@redux-devtools/extension'\n\nimport { serializeState } from '../utils/serializeState'\n\nimport * as APIResources from './modules/api-resources'\nimport * as LocalizedResourcesMap from './modules/localized-resources-map'\nimport { type Action, ActionTypes, apiResourceFulfilled, setLocalizedResourceId } from './actions'\nimport {\n  APIResourceType,\n  type APIResource,\n  type Swatch,\n  type File,\n  type Typography,\n  type GlobalElement,\n  type PagePathnameSlice,\n  type Table,\n  type LocalizedGlobalElement,\n  type APIResourceLocale,\n} from '../api'\nimport { MAKESWIFT_CACHE_TAG } from '../next/api-handler/handlers/webhook/site-published'\n\nconst reducer = combineReducers({\n  apiResources: APIResources.reducer,\n  localizedResourcesMap: LocalizedResourcesMap.reducer,\n})\n\nexport type State = ReturnType<typeof reducer>\n\nexport type SerializedState = {\n  apiResources: APIResources.SerializedState\n  localizedResourcesMap: LocalizedResourcesMap.SerializedState\n}\n\nfunction getLocalizedResourceId(\n  state: State,\n  locale: string,\n  resourceId: string,\n): string | undefined | null {\n  return LocalizedResourcesMap.getLocalizedResourceId(\n    state.localizedResourcesMap,\n    locale,\n    resourceId,\n  )\n}\n\nexport function getHasAPIResource<T extends APIResourceType>(\n  state: State,\n  resourceType: APIResourceType,\n  resourceId: string,\n  locale?: APIResourceLocale<T>,\n): boolean {\n  switch (resourceType) {\n    case APIResourceType.LocalizedGlobalElement:\n      if (locale == null) {\n        console.error(`Attempt to access ${resourceType} ${resourceId} without a locale`)\n        return false\n      }\n\n      const localizedId = getLocalizedResourceId(state, locale, resourceId)\n      return (\n        localizedId != null &&\n        APIResources.getHasAPIResource(state.apiResources, resourceType, localizedId, locale)\n      )\n\n    default:\n      return APIResources.getHasAPIResource(state.apiResources, resourceType, resourceId, locale)\n  }\n}\n\nexport function getAPIResource<T extends APIResourceType>(\n  state: State,\n  resourceType: T,\n  resourceId: string,\n  locale?: APIResourceLocale<T>,\n): Extract<APIResource, { __typename: T }> | null {\n  switch (resourceType) {\n    case APIResourceType.LocalizedGlobalElement:\n      if (locale == null) {\n        console.error(`Attempt to access ${resourceType} ${resourceId} without a locale`)\n        return null\n      }\n\n      const localizedId = getLocalizedResourceId(state, locale, resourceId)\n      return localizedId != null\n        ? APIResources.getAPIResource(state.apiResources, resourceType, localizedId, locale)\n        : null\n\n    default:\n      return APIResources.getAPIResource(state.apiResources, resourceType, resourceId, locale)\n  }\n}\n\ntype Thunk<ReturnType> = ThunkAction<ReturnType, State, unknown, Action>\n\nasync function fetchJson<T>(url: string): Promise<T | null> {\n  const response = await fetch(url, {\n    headers: { 'Content-Type': 'application/json' },\n    next: { tags: [MAKESWIFT_CACHE_TAG] },\n  })\n\n  if (response.status === 404) return null\n\n  if (!response.ok) throw new Error(response.statusText)\n\n  if (response.headers.get('content-type')?.includes('application/json') !== true) {\n    throw new Error(\n      `Expected JSON response from \"${url}\" but got \"${response.headers.get('content-type')}\"`,\n    )\n  }\n\n  return response.json()\n}\n\nexport function fetchAPIResource<T extends APIResourceType>(\n  resourceType: T,\n  resourceId: string,\n  locale?: APIResourceLocale<T>,\n): Thunk<Promise<Extract<APIResource, { __typename: T }> | null>> {\n  return async (dispatch, getState) => {\n    const state = getState()\n\n    if (getHasAPIResource(state, resourceType, resourceId, locale)) {\n      return getAPIResource(state, resourceType, resourceId, locale)\n    }\n\n    let resource: APIResource | null\n\n    switch (resourceType) {\n      case APIResourceType.Swatch:\n        resource = await fetchJson<Swatch>(`/api/makeswift/swatches/${resourceId}`)\n        break\n\n      case APIResourceType.File:\n        resource = await fetchJson<File>(`/api/makeswift/files/${resourceId}`)\n        break\n\n      case APIResourceType.Typography:\n        resource = await fetchJson<Typography>(`/api/makeswift/typographies/${resourceId}`)\n        break\n\n      case APIResourceType.GlobalElement:\n        resource = await fetchJson<GlobalElement>(`/api/makeswift/global-elements/${resourceId}`)\n        break\n\n      case APIResourceType.LocalizedGlobalElement: {\n        if (locale == null) throw new Error('Locale is required to fetch LocalizedGlobalElement')\n\n        // If `getLocalizedResourceId` returns null, it means we have tried to fetch the resource,\n        // but the resource is not available. If we haven't fetched it yet, it'll return undefined.\n        if (getLocalizedResourceId(state, locale, resourceId) === null) {\n          return null\n        }\n\n        resource = await fetchJson<LocalizedGlobalElement>(\n          `/api/makeswift/localized-global-elements/${resourceId}/${locale}`,\n        )\n\n        dispatch(\n          setLocalizedResourceId({\n            locale,\n            resourceId,\n            localizedResourceId: resource?.id ?? null,\n          }),\n        )\n\n        break\n      }\n\n      case APIResourceType.PagePathnameSlice: {\n        const url = new URL(`/api/makeswift/page-pathname-slices/${resourceId}`, 'http://n')\n\n        if (locale != null) url.searchParams.set('locale', locale)\n\n        resource = await fetchJson<PagePathnameSlice>(url.pathname + url.search)\n        break\n      }\n\n      case APIResourceType.Table:\n        resource = await fetchJson<Table>(`/api/makeswift/tables/${resourceId}`)\n        break\n\n      default:\n        resource = null\n    }\n\n    dispatch(apiResourceFulfilled(resourceType, resourceId, resource, locale))\n\n    return resource as Extract<APIResource, { __typename: T }> | null\n  }\n}\n\nexport type Dispatch = ThunkDispatch<State, unknown, Action>\n\nexport type Store = ReduxStore<State, Action> & { dispatch: Dispatch }\n\n// FIXME: this middleware can be removed once we've upgraded the builder\n// to always provide the locale when dispatching resource actions\nfunction defaultLocaleMiddleware(\n  defaultLocale: string | undefined,\n): Middleware<Dispatch, State, Dispatch> {\n  return () => (next: ReduxDispatch<Action>) => {\n    return (action: Action): Action => {\n      switch (action.type) {\n        case ActionTypes.CHANGE_API_RESOURCE:\n        case ActionTypes.EVICT_API_RESOURCE:\n        case ActionTypes.SET_LOCALIZED_RESOURCE_ID: {\n          const { locale } = action.payload\n          return next({\n            ...action,\n            payload: { ...action.payload, locale: locale ?? defaultLocale },\n          } as Action)\n        }\n      }\n\n      return next(action)\n    }\n  }\n}\n\nexport function configureStore({\n  defaultLocale,\n  serializedState,\n}: {\n  defaultLocale: string | undefined\n  serializedState?: SerializedState\n}): Store {\n  const composeEnhancers = composeWithDevToolsDevelopmentOnly({\n    name: `API client store (${new Date().toISOString()})`,\n    serialize: true,\n    stateSanitizer: (state: any) => serializeState(state),\n    actionsDenylist: [\n      ActionTypes.BUILDER_POINTER_MOVE,\n      ActionTypes.HANDLE_POINTER_MOVE,\n      ActionTypes.ELEMENT_FROM_POINT_CHANGE,\n    ],\n  })\n\n  return createStore(\n    reducer,\n    {\n      apiResources: APIResources.getInitialState(serializedState?.apiResources),\n      localizedResourcesMap: LocalizedResourcesMap.getInitialState(\n        serializedState?.localizedResourcesMap,\n      ),\n    },\n    composeEnhancers(applyMiddleware(thunk, defaultLocaleMiddleware(defaultLocale))),\n  )\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAOO;AACP,yBAA4D;AAE5D,uBAAmD;AAEnD,4BAA+B;AAE/B,mBAA8B;AAC9B,4BAAuC;AACvC,qBAAuF;AACvF,iBAWO;AACP,4BAAoC;AAEpC,MAAM,cAAU,8BAAgB;AAAA,EAC9B,cAAc,aAAa;AAAA,EAC3B,uBAAuB,sBAAsB;AAC/C,CAAC;AASD,SAAS,uBACP,OACA,QACA,YAC2B;AAC3B,SAAO,sBAAsB;AAAA,IAC3B,MAAM;AAAA,IACN;AAAA,IACA;AAAA,EACF;AACF;AAEO,SAAS,kBACd,OACA,cACA,YACA,QACS;AACT,UAAQ,cAAc;AAAA,IACpB,KAAK,2BAAgB;AACnB,UAAI,UAAU,MAAM;AAClB,gBAAQ,MAAM,qBAAqB,YAAY,IAAI,UAAU,mBAAmB;AAChF,eAAO;AAAA,MACT;AAEA,YAAM,cAAc,uBAAuB,OAAO,QAAQ,UAAU;AACpE,aACE,eAAe,QACf,aAAa,kBAAkB,MAAM,cAAc,cAAc,aAAa,MAAM;AAAA,IAGxF;AACE,aAAO,aAAa,kBAAkB,MAAM,cAAc,cAAc,YAAY,MAAM;AAAA,EAC9F;AACF;AAEO,SAAS,eACd,OACA,cACA,YACA,QACgD;AAChD,UAAQ,cAAc;AAAA,IACpB,KAAK,2BAAgB;AACnB,UAAI,UAAU,MAAM;AAClB,gBAAQ,MAAM,qBAAqB,YAAY,IAAI,UAAU,mBAAmB;AAChF,eAAO;AAAA,MACT;AAEA,YAAM,cAAc,uBAAuB,OAAO,QAAQ,UAAU;AACpE,aAAO,eAAe,OAClB,aAAa,eAAe,MAAM,cAAc,cAAc,aAAa,MAAM,IACjF;AAAA,IAEN;AACE,aAAO,aAAa,eAAe,MAAM,cAAc,cAAc,YAAY,MAAM;AAAA,EAC3F;AACF;AAIA,eAAe,UAAa,KAAgC;AAC1D,QAAM,WAAW,MAAM,MAAM,KAAK;AAAA,IAChC,SAAS,EAAE,gBAAgB,mBAAmB;AAAA,IAC9C,MAAM,EAAE,MAAM,CAAC,yCAAmB,EAAE;AAAA,EACtC,CAAC;AAED,MAAI,SAAS,WAAW;AAAK,WAAO;AAEpC,MAAI,CAAC,SAAS;AAAI,UAAM,IAAI,MAAM,SAAS,UAAU;AAErD,MAAI,SAAS,QAAQ,IAAI,cAAc,GAAG,SAAS,kBAAkB,MAAM,MAAM;AAC/E,UAAM,IAAI;AAAA,MACR,gCAAgC,GAAG,cAAc,SAAS,QAAQ,IAAI,cAAc,CAAC;AAAA,IACvF;AAAA,EACF;AAEA,SAAO,SAAS,KAAK;AACvB;AAEO,SAAS,iBACd,cACA,YACA,QACgE;AAChE,SAAO,OAAO,UAAU,aAAa;AACnC,UAAM,QAAQ,SAAS;AAEvB,QAAI,kBAAkB,OAAO,cAAc,YAAY,MAAM,GAAG;AAC9D,aAAO,eAAe,OAAO,cAAc,YAAY,MAAM;AAAA,IAC/D;AAEA,QAAI;AAEJ,YAAQ,cAAc;AAAA,MACpB,KAAK,2BAAgB;AACnB,mBAAW,MAAM,UAAkB,2BAA2B,UAAU,EAAE;AAC1E;AAAA,MAEF,KAAK,2BAAgB;AACnB,mBAAW,MAAM,UAAgB,wBAAwB,UAAU,EAAE;AACrE;AAAA,MAEF,KAAK,2BAAgB;AACnB,mBAAW,MAAM,UAAsB,+BAA+B,UAAU,EAAE;AAClF;AAAA,MAEF,KAAK,2BAAgB;AACnB,mBAAW,MAAM,UAAyB,kCAAkC,UAAU,EAAE;AACxF;AAAA,MAEF,KAAK,2BAAgB,wBAAwB;AAC3C,YAAI,UAAU;AAAM,gBAAM,IAAI,MAAM,oDAAoD;AAIxF,YAAI,uBAAuB,OAAO,QAAQ,UAAU,MAAM,MAAM;AAC9D,iBAAO;AAAA,QACT;AAEA,mBAAW,MAAM;AAAA,UACf,4CAA4C,UAAU,IAAI,MAAM;AAAA,QAClE;AAEA;AAAA,cACE,uCAAuB;AAAA,YACrB;AAAA,YACA;AAAA,YACA,qBAAqB,UAAU,MAAM;AAAA,UACvC,CAAC;AAAA,QACH;AAEA;AAAA,MACF;AAAA,MAEA,KAAK,2BAAgB,mBAAmB;AACtC,cAAM,MAAM,IAAI,IAAI,uCAAuC,UAAU,IAAI,UAAU;AAEnF,YAAI,UAAU;AAAM,cAAI,aAAa,IAAI,UAAU,MAAM;AAEzD,mBAAW,MAAM,UAA6B,IAAI,WAAW,IAAI,MAAM;AACvE;AAAA,MACF;AAAA,MAEA,KAAK,2BAAgB;AACnB,mBAAW,MAAM,UAAiB,yBAAyB,UAAU,EAAE;AACvE;AAAA,MAEF;AACE,mBAAW;AAAA,IACf;AAEA,iBAAS,qCAAqB,cAAc,YAAY,UAAU,MAAM,CAAC;AAEzE,WAAO;AAAA,EACT;AACF;AAQA,SAAS,wBACP,eACuC;AACvC,SAAO,MAAM,CAAC,SAAgC;AAC5C,WAAO,CAAC,WAA2B;AACjC,cAAQ,OAAO,MAAM;AAAA,QACnB,KAAK,2BAAY;AAAA,QACjB,KAAK,2BAAY;AAAA,QACjB,KAAK,2BAAY,2BAA2B;AAC1C,gBAAM,EAAE,OAAO,IAAI,OAAO;AAC1B,iBAAO,KAAK;AAAA,YACV,GAAG;AAAA,YACH,SAAS,EAAE,GAAG,OAAO,SAAS,QAAQ,UAAU,cAAc;AAAA,UAChE,CAAW;AAAA,QACb;AAAA,MACF;AAEA,aAAO,KAAK,MAAM;AAAA,IACpB;AAAA,EACF;AACF;AAEO,SAAS,eAAe;AAAA,EAC7B;AAAA,EACA;AACF,GAGU;AACR,QAAM,uBAAmB,qDAAmC;AAAA,IAC1D,MAAM,sBAAqB,oBAAI,KAAK,GAAE,YAAY,CAAC;AAAA,IACnD,WAAW;AAAA,IACX,gBAAgB,CAAC,cAAe,sCAAe,KAAK;AAAA,IACpD,iBAAiB;AAAA,MACf,2BAAY;AAAA,MACZ,2BAAY;AAAA,MACZ,2BAAY;AAAA,IACd;AAAA,EACF,CAAC;AAED,aAAO;AAAA,IACL;AAAA,IACA;AAAA,MACE,cAAc,aAAa,gBAAgB,iBAAiB,YAAY;AAAA,MACxE,uBAAuB,sBAAsB;AAAA,QAC3C,iBAAiB;AAAA,MACnB;AAAA,IACF;AAAA,IACA,qBAAiB,8BAAgB,mBAAAA,SAAO,wBAAwB,aAAa,CAAC,CAAC;AAAA,EACjF;AACF;","names":["thunk"]}
+{"version":3,"sources":["../../../src/state/makeswift-api-client.ts"],"sourcesContent":["import {\n  applyMiddleware,\n  createStore,\n  combineReducers,\n  type Dispatch as ReduxDispatch,\n  type Store as ReduxStore,\n  type Middleware,\n} from 'redux'\nimport thunk, { type ThunkAction, type ThunkDispatch } from 'redux-thunk'\n\nimport { composeWithDevToolsDevelopmentOnly } from '@redux-devtools/extension'\n\nimport { serializeState } from '../utils/serializeState'\n\nimport * as APIResources from './modules/api-resources'\nimport * as LocalizedResourcesMap from './modules/localized-resources-map'\nimport { type Action, ActionTypes, apiResourceFulfilled, setLocalizedResourceId } from './actions'\nimport {\n  APIResourceType,\n  type APIResource,\n  type Swatch,\n  type File,\n  type Typography,\n  type GlobalElement,\n  type PagePathnameSlice,\n  type Table,\n  type LocalizedGlobalElement,\n  type APIResourceLocale,\n} from '../api'\nimport { MAKESWIFT_CACHE_TAG } from '../next/cache'\nimport { API_HANDLER_SITE_VERSION_HEADER, MakeswiftSiteVersion } from '../api/site-version'\n\nconst reducer = combineReducers({\n  apiResources: APIResources.reducer,\n  localizedResourcesMap: LocalizedResourcesMap.reducer,\n})\n\nexport type State = ReturnType<typeof reducer>\n\nexport type SerializedState = {\n  apiResources: APIResources.SerializedState\n  localizedResourcesMap: LocalizedResourcesMap.SerializedState\n}\n\nfunction getLocalizedResourceId(\n  state: State,\n  locale: string,\n  resourceId: string,\n): string | undefined | null {\n  return LocalizedResourcesMap.getLocalizedResourceId(\n    state.localizedResourcesMap,\n    locale,\n    resourceId,\n  )\n}\n\nexport function getHasAPIResource<T extends APIResourceType>(\n  state: State,\n  resourceType: APIResourceType,\n  resourceId: string,\n  locale?: APIResourceLocale<T>,\n): boolean {\n  switch (resourceType) {\n    case APIResourceType.LocalizedGlobalElement:\n      if (locale == null) {\n        console.error(`Attempt to access ${resourceType} ${resourceId} without a locale`)\n        return false\n      }\n\n      const localizedId = getLocalizedResourceId(state, locale, resourceId)\n      return (\n        localizedId != null &&\n        APIResources.getHasAPIResource(state.apiResources, resourceType, localizedId, locale)\n      )\n\n    default:\n      return APIResources.getHasAPIResource(state.apiResources, resourceType, resourceId, locale)\n  }\n}\n\nexport function getAPIResource<T extends APIResourceType>(\n  state: State,\n  resourceType: T,\n  resourceId: string,\n  locale?: APIResourceLocale<T>,\n): Extract<APIResource, { __typename: T }> | null {\n  switch (resourceType) {\n    case APIResourceType.LocalizedGlobalElement:\n      if (locale == null) {\n        console.error(`Attempt to access ${resourceType} ${resourceId} without a locale`)\n        return null\n      }\n\n      const localizedId = getLocalizedResourceId(state, locale, resourceId)\n      return localizedId != null\n        ? APIResources.getAPIResource(state.apiResources, resourceType, localizedId, locale)\n        : null\n\n    default:\n      return APIResources.getAPIResource(state.apiResources, resourceType, resourceId, locale)\n  }\n}\n\ntype Thunk<ReturnType> = ThunkAction<ReturnType, State, unknown, Action>\n\nasync function fetchJson<T>(url: string, siteVersion: MakeswiftSiteVersion): Promise<T | null> {\n  const response = await fetch(url, {\n    headers: {\n      'Content-Type': 'application/json',\n      [API_HANDLER_SITE_VERSION_HEADER]: siteVersion,\n    },\n    next: { tags: [MAKESWIFT_CACHE_TAG] },\n  })\n\n  if (response.status === 404) return null\n\n  if (!response.ok) throw new Error(response.statusText)\n\n  if (response.headers.get('content-type')?.includes('application/json') !== true) {\n    throw new Error(\n      `Expected JSON response from \"${url}\" but got \"${response.headers.get('content-type')}\"`,\n    )\n  }\n\n  return response.json()\n}\n\nexport function fetchAPIResource<T extends APIResourceType>(\n  resourceType: T,\n  resourceId: string,\n  siteVersion: MakeswiftSiteVersion,\n  locale?: APIResourceLocale<T>,\n): Thunk<Promise<Extract<APIResource, { __typename: T }> | null>> {\n  return async (dispatch, getState) => {\n    const state = getState()\n\n    if (getHasAPIResource(state, resourceType, resourceId, locale)) {\n      return getAPIResource(state, resourceType, resourceId, locale)\n    }\n\n    let resource: APIResource | null\n\n    switch (resourceType) {\n      case APIResourceType.Swatch:\n        resource = await fetchJson<Swatch>(`/api/makeswift/swatches/${resourceId}`, siteVersion)\n        break\n\n      case APIResourceType.File:\n        resource = await fetchJson<File>(`/api/makeswift/files/${resourceId}`, siteVersion)\n        break\n\n      case APIResourceType.Typography:\n        resource = await fetchJson<Typography>(\n          `/api/makeswift/typographies/${resourceId}`,\n          siteVersion,\n        )\n        break\n\n      case APIResourceType.GlobalElement:\n        resource = await fetchJson<GlobalElement>(\n          `/api/makeswift/global-elements/${resourceId}`,\n          siteVersion,\n        )\n        break\n\n      case APIResourceType.LocalizedGlobalElement: {\n        if (locale == null) throw new Error('Locale is required to fetch LocalizedGlobalElement')\n\n        // If `getLocalizedResourceId` returns null, it means we have tried to fetch the resource,\n        // but the resource is not available. If we haven't fetched it yet, it'll return undefined.\n        if (getLocalizedResourceId(state, locale, resourceId) === null) {\n          return null\n        }\n\n        resource = await fetchJson<LocalizedGlobalElement>(\n          `/api/makeswift/localized-global-elements/${resourceId}/${locale}`,\n          siteVersion,\n        )\n\n        dispatch(\n          setLocalizedResourceId({\n            locale,\n            resourceId,\n            localizedResourceId: resource?.id ?? null,\n          }),\n        )\n\n        break\n      }\n\n      case APIResourceType.PagePathnameSlice: {\n        const url = new URL(`/api/makeswift/page-pathname-slices/${resourceId}`, 'http://n')\n\n        if (locale != null) url.searchParams.set('locale', locale)\n\n        resource = await fetchJson<PagePathnameSlice>(url.pathname + url.search, siteVersion)\n        break\n      }\n\n      case APIResourceType.Table:\n        resource = await fetchJson<Table>(`/api/makeswift/tables/${resourceId}`, siteVersion)\n        break\n\n      default:\n        resource = null\n    }\n\n    dispatch(apiResourceFulfilled(resourceType, resourceId, resource, locale))\n\n    return resource as Extract<APIResource, { __typename: T }> | null\n  }\n}\n\nexport type Dispatch = ThunkDispatch<State, unknown, Action>\n\nexport type Store = ReduxStore<State, Action> & { dispatch: Dispatch }\n\n// FIXME: this middleware can be removed once we've upgraded the builder\n// to always provide the locale when dispatching resource actions\nfunction defaultLocaleMiddleware(\n  defaultLocale: string | undefined,\n): Middleware<Dispatch, State, Dispatch> {\n  return () => (next: ReduxDispatch<Action>) => {\n    return (action: Action): Action => {\n      switch (action.type) {\n        case ActionTypes.CHANGE_API_RESOURCE:\n        case ActionTypes.EVICT_API_RESOURCE:\n        case ActionTypes.SET_LOCALIZED_RESOURCE_ID: {\n          const { locale } = action.payload\n          return next({\n            ...action,\n            payload: { ...action.payload, locale: locale ?? defaultLocale },\n          } as Action)\n        }\n      }\n\n      return next(action)\n    }\n  }\n}\n\nexport function configureStore({\n  defaultLocale,\n  serializedState,\n}: {\n  defaultLocale: string | undefined\n  serializedState?: SerializedState\n}): Store {\n  const composeEnhancers = composeWithDevToolsDevelopmentOnly({\n    name: `API client store (${new Date().toISOString()})`,\n    serialize: true,\n    stateSanitizer: (state: any) => serializeState(state),\n    actionsDenylist: [\n      ActionTypes.BUILDER_POINTER_MOVE,\n      ActionTypes.HANDLE_POINTER_MOVE,\n      ActionTypes.ELEMENT_FROM_POINT_CHANGE,\n    ],\n  })\n\n  return createStore(\n    reducer,\n    {\n      apiResources: APIResources.getInitialState(serializedState?.apiResources),\n      localizedResourcesMap: LocalizedResourcesMap.getInitialState(\n        serializedState?.localizedResourcesMap,\n      ),\n    },\n    composeEnhancers(applyMiddleware(thunk, defaultLocaleMiddleware(defaultLocale))),\n  )\n}\n"],"mappings":"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","names":["thunk"]}

package/dist/cjs/state/modules/breakpoints.js

@@ -20,18 +20,12 @@ var breakpoints_exports = {};
 __export(breakpoints_exports, {
   DEFAULT_BREAKPOINTS: () => DEFAULT_BREAKPOINTS,
   DefaultBreakpointID: () => DefaultBreakpointID,
-  findBreakpointOverride: () => import_controls2.findBreakpointOverride,
-  findNextFallback: () => findNextFallback,
-  getBaseBreakpoint: () => import_controls2.getBaseBreakpoint,
-  getBreakpoint: () => getBreakpoint,
-  getBreakpointMediaQuery: () => getBreakpointMediaQuery,
+  getBreakpoint: () => import_controls2.getBreakpoint,
   getInitialState: () => getInitialState,
-  getViewportStyle: () => getViewportStyle,
   parseBreakpointsInput: () => parseBreakpointsInput,
   reducer: () => reducer
 });
 module.exports = __toCommonJS(breakpoints_exports);
-var import_controls = require("@makeswift/controls");
 var import_actions = require("../actions");
 var import_controls2 = require("@makeswift/controls");
 const DefaultBreakpointID = {
@@ -127,49 +121,12 @@ function validateBreakpointsInput(input) {
     }
   });
 }
-const getBreakpoint = (state, breakpointId) => {
-  const breakpoint = state.find(({ id }) => id === breakpointId);
-  if (breakpoint == null)
-    throw new Error(`Unrecognized breakpoint ID: "${breakpointId}".`);
-  return breakpoint;
-};
-const getBreakpointMediaQuery = (breakpoint) => {
-  const parts = ["@media only screen"];
-  if (breakpoint.minWidth != null) {
-    parts.push(`(min-width: ${breakpoint.minWidth}px)`);
-  }
-  if (breakpoint.maxWidth != null) {
-    parts.push(`(max-width: ${breakpoint.maxWidth}px)`);
-  }
-  return parts.join(" and ");
-};
-const getViewportStyle = (state, deviceId) => {
-  const device = getBreakpoint(state, deviceId);
-  return device && {
-    width: device.viewportWidth != null ? device.viewportWidth : "100%",
-    minWidth: device.minWidth
-  };
-};
-function findNextFallback(breakpoints, value, deviceId, activeDeviceId, fallbackStrategy) {
-  const deviceOverride = (0, import_controls.findBreakpointOverride)(
-    breakpoints,
-    value.filter((v) => v.deviceId !== activeDeviceId),
-    deviceId,
-    fallbackStrategy
-  );
-  return (deviceOverride && getBreakpoint(breakpoints, deviceOverride.deviceId)) ?? null;
-}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   DEFAULT_BREAKPOINTS,
   DefaultBreakpointID,
-  findBreakpointOverride,
-  findNextFallback,
-  getBaseBreakpoint,
   getBreakpoint,
-  getBreakpointMediaQuery,
   getInitialState,
-  getViewportStyle,
   parseBreakpointsInput,
   reducer
 });