@makeswift/runtime 0.28.3-canary.3 → 0.28.3-canary.5

package/dist/cjs/state/store.js

@@ -29,7 +29,8 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var store_exports = {};
 __export(store_exports, {
   conditionalReadWriteMiddleware: () => conditionalReadWriteMiddleware,
-  configureStore: () => configureStore
+  configureProtoStore: () => configureProtoStore,
+  configureReadWriteStore: () => configureReadWriteStore
 });
 module.exports = __toCommonJS(store_exports);
 var import_toolkit = require("@reduxjs/toolkit");
@@ -38,8 +39,45 @@ var import_actions = require("./builder-api/actions");
 var import_host_api = require("./host-api");
 var Breakpoints = __toESM(require("./modules/breakpoints"));
 var import_read_only_element_tree = require("./middleware/read-only-element-tree");
-var ReadOnlyState = __toESM(require("./read-only-state"));
 var import_makeswift_api_client_sync = require("./middleware/makeswift-api-client-sync");
+var ReadOnlyState = __toESM(require("./read-only-state"));
+const configureStore = ({
+  name,
+  preloadedState,
+  enhancers,
+  middleware
+}) => {
+  const store = (0, import_toolkit.configureStore)({
+    reducer: (0, import_toolkit.combineReducers)(ReadOnlyState.reducers),
+    preloadedState,
+    middleware: (getDefaultMiddleware) => getDefaultMiddleware(import_toolkit2.middlewareOptions).concat([
+      (0, import_read_only_element_tree.readOnlyElementTreeMiddleware)(),
+      ...middleware ? middleware() : []
+    ]),
+    enhancers: (getDefaultEnhancers) => getDefaultEnhancers().concat(enhancers()),
+    devTools: (0, import_toolkit2.devToolsConfig)({
+      name: `${name} (${(/* @__PURE__ */ new Date()).toISOString()})`,
+      actionsDenylist: [
+        import_host_api.HostActionTypes.BUILDER_POINTER_MOVE,
+        import_actions.BuilderActionTypes.HANDLE_POINTER_MOVE,
+        import_actions.BuilderActionTypes.ELEMENT_FROM_POINT_CHANGE
+      ]
+    })
+  });
+  return store;
+};
+function configureProtoStore({
+  name,
+  breakpoints
+}) {
+  return configureStore({
+    name,
+    preloadedState: {
+      breakpoints: Breakpoints.getInitialState(breakpoints)
+    },
+    enhancers: () => new import_toolkit.Tuple()
+  });
+}
 function conditionalReadWriteMiddleware(middlewareRef) {
   let readWriteActionBuffer = [];
   let middlewares = null;
@@ -76,18 +114,17 @@ function conditionalReadWriteMiddleware(middlewareRef) {
     };
   });
 }
-function withReadWriteState(loadReadWriteState) {
+function withMixin(mixin) {
   return (next) => (reducer, preloadedState) => ({
     ...next(reducer, preloadedState),
-    loadReadWriteState
+    ...mixin
   });
 }
-function configureStore({
+function configureReadWriteStore({
   name,
   appOrigin,
   hostApiClient,
-  preloadedState,
-  breakpoints
+  preloadedState
 }) {
   const readWriteMiddlewareRef = {
     current: null
@@ -126,59 +163,49 @@ function configureStore({
       readWriteSetupPromise = null;
     }
   };
-  const store = (0, import_toolkit.configureStore)({
-    reducer: (0, import_toolkit.combineReducers)(ReadOnlyState.reducers),
-    preloadedState: {
-      ...preloadedState,
-      breakpoints: Breakpoints.getInitialState(breakpoints ?? preloadedState?.breakpoints)
-    },
-    middleware: (getDefaultMiddleware) => getDefaultMiddleware(import_toolkit2.middlewareOptions).concat([
-      (0, import_read_only_element_tree.readOnlyElementTreeMiddleware)(),
+  const store = configureStore({
+    name,
+    preloadedState,
+    middleware: () => [
       (0, import_makeswift_api_client_sync.makeswiftApiClientSyncMiddleware)(hostApiClient),
       conditionalReadWriteMiddleware(readWriteMiddlewareRef)
-    ]),
-    enhancers: (getDefaultEnhancers) => getDefaultEnhancers().concat(
-      withReadWriteState(async ({ isReadOnly }) => {
-        if (isReadOnly) {
-          if (refCount > 0) {
-            console.error("Read-write state mismatch", {
-              isReadOnly,
-              refCount
-            });
+    ],
+    enhancers: () => new import_toolkit.Tuple(
+      withMixin({
+        hostApiClient,
+        loadReadWriteStateIfNeeded: async () => {
+          const { isReadOnly } = store.getState();
+          if (isReadOnly) {
+            if (refCount > 0) {
+              console.error("Read-write state mismatch", { isReadOnly, refCount });
+            }
+            return () => {
+            };
           }
+          await loadReadWriteState();
+          refCount += 1;
+          let didCleanup = false;
           return () => {
+            if (didCleanup) {
+              return;
+            }
+            didCleanup = true;
+            refCount -= 1;
+            if (refCount === 0 && readWriteCleanup != null) {
+              readWriteCleanup();
+              readWriteCleanup = null;
+            }
           };
         }
-        await loadReadWriteState();
-        refCount += 1;
-        let didCleanup = false;
-        return () => {
-          if (didCleanup) {
-            return;
-          }
-          didCleanup = true;
-          refCount -= 1;
-          if (refCount === 0 && readWriteCleanup != null) {
-            readWriteCleanup();
-            readWriteCleanup = null;
-          }
-        };
       })
-    ),
-    devTools: (0, import_toolkit2.devToolsConfig)({
-      name: `${name} (${(/* @__PURE__ */ new Date()).toISOString()})`,
-      actionsDenylist: [
-        import_host_api.HostActionTypes.BUILDER_POINTER_MOVE,
-        import_actions.BuilderActionTypes.HANDLE_POINTER_MOVE,
-        import_actions.BuilderActionTypes.ELEMENT_FROM_POINT_CHANGE
-      ]
-    })
+    )
   });
   return store;
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   conditionalReadWriteMiddleware,
-  configureStore
+  configureProtoStore,
+  configureReadWriteStore
 });
 //# sourceMappingURL=store.js.map

package/dist/cjs/state/store.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/state/store.ts"],"sourcesContent":["import {\n  type Middleware,\n  type StoreEnhancer,\n  type MiddlewareAPI,\n  configureStore as configureReduxStore,\n  combineReducers,\n  compose,\n} from '@reduxjs/toolkit'\n\nimport { MakeswiftHostApiClient } from '../api/client'\n\nimport { actionMiddleware, middlewareOptions, devToolsConfig } from './toolkit'\nimport { BuilderActionTypes } from './builder-api/actions'\nimport { HostActionTypes } from './host-api'\n\nimport * as Breakpoints from './modules/breakpoints'\n\nimport { readOnlyElementTreeMiddleware } from './middleware/read-only-element-tree'\n\nimport { type Action } from './actions'\nimport { type State as ReadWriteState } from './read-write-state'\nimport * as ReadOnlyState from './read-only-state'\n\nimport {\n  type State,\n  type Dispatch,\n  type ReadOnlyReducer,\n  type ReadWriteDispatch,\n} from './unified-state'\nimport { makeswiftApiClientSyncMiddleware } from './middleware/makeswift-api-client-sync'\n\ntype ReadWriteMiddleware = ReturnType<\n  typeof import('./middleware/read-write').createReadWriteMiddleware\n>\n\ntype ReadWriteMiddlewareRef = {\n  current: ReadWriteMiddleware | null\n}\n\nexport function conditionalReadWriteMiddleware(\n  middlewareRef: ReadWriteMiddlewareRef,\n): Middleware<Dispatch, State, Dispatch> {\n  let readWriteActionBuffer: Action[] = []\n  let middlewares: ReadWriteMiddleware | null = null\n  let enhancedDispatch: Dispatch | null = null\n\n  return actionMiddleware(({ dispatch, getState }) => next => {\n    return (action: Action) => {\n      const state = getState()\n\n      if (middlewareRef.current == null) {\n        if (!state.isReadOnly) {\n          // because switching to the read-write state is an asynchronous operation,\n          // we need to buffer all actions dispatched after the isReadOnly state is\n          // set to false but before the read-write middleware is installed\n          readWriteActionBuffer.push(action)\n        }\n\n        return next(action)\n      }\n\n      if (state.isReadOnly) {\n        console.error('Read-write state mismatch', {\n          isReadOnly: state.isReadOnly,\n          middlewareRef: middlewareRef.current,\n          siteVersion: state.siteVersion,\n        })\n      }\n\n      // build and cache the enhanced dispatch chain when read-write middleware is installed\n      if (enhancedDispatch == null || middlewares !== middlewareRef.current) {\n        middlewares = middlewareRef.current\n\n        const middlewareApi = { dispatch, getState } as MiddlewareAPI<\n          ReadWriteDispatch,\n          ReadWriteState\n        >\n\n        enhancedDispatch = compose<Dispatch>(...middlewares.map(mw => mw(middlewareApi)))(next)\n      }\n\n      // dispatch buffered actions, if any\n      if (readWriteActionBuffer.length > 0) {\n        const readWriteActions = [...readWriteActionBuffer]\n        readWriteActionBuffer = []\n\n        // Note that we're rerunning the actions through the entire middleware chain,\n        // including the read-only middleware and the reducers, some of which have\n        // already processed these actions once. This is safe to do because actions that\n        // are run as part of page initialization are idempotent.\n        for (const bufferedAction of readWriteActions) {\n          enhancedDispatch(bufferedAction)\n        }\n      }\n\n      return enhancedDispatch(action)\n    }\n  })\n}\n\ninterface ReadWriteStateMixin {\n  loadReadWriteState: ({ isReadOnly }: { isReadOnly: boolean }) => Promise<() => void>\n}\n\nfunction withReadWriteState(\n  loadReadWriteState: ReadWriteStateMixin['loadReadWriteState'],\n): StoreEnhancer<ReadWriteStateMixin> {\n  return next => (reducer, preloadedState?) => ({\n    ...next(reducer, preloadedState),\n    loadReadWriteState,\n  })\n}\n\nexport function configureStore({\n  name,\n  appOrigin,\n  hostApiClient,\n  preloadedState,\n  breakpoints,\n}: {\n  name: string\n  appOrigin: string\n  hostApiClient: MakeswiftHostApiClient\n  preloadedState: Partial<State> | null\n  breakpoints?: Breakpoints.State\n}) {\n  const readWriteMiddlewareRef: ReadWriteMiddlewareRef = {\n    current: null,\n  }\n\n  let refCount = 0\n  let readWriteCleanup: (() => void) | null = null\n  let readWriteSetupPromise: Promise<void> | null = null\n\n  const loadReadWriteState = async (): Promise<void> => {\n    if (readWriteCleanup != null) {\n      return\n    }\n\n    if (readWriteSetupPromise != null) {\n      await readWriteSetupPromise\n      return\n    }\n\n    readWriteSetupPromise = (async () => {\n      // import all the modules needed for read-write mode before proceeding with\n      // the setup to avoid race conditions when `setup` is called concurrently\n      // in two different page regions\n      const { BuilderAPIProxy } = await import('./builder-api/proxy')\n      const { createRootReducer, setupBuilderProxy } = await import('./read-write-state')\n      const { createReadWriteMiddleware } = await import('./middleware/read-write')\n\n      // IMPORTANT: only synchronous code after this point\n\n      // with all modules imported, check if another concurrent setup already\n      // initialized the read-write middleware\n      if (readWriteMiddlewareRef.current != null) {\n        return\n      }\n\n      store.replaceReducer(createRootReducer() as ReadOnlyReducer)\n\n      const builderProxy = new BuilderAPIProxy({ appOrigin })\n      readWriteMiddlewareRef.current = createReadWriteMiddleware({ builderProxy })\n\n      const dispatch = store.dispatch as ReadWriteDispatch\n      const builderProxyCleanup = dispatch(setupBuilderProxy(builderProxy))\n\n      readWriteCleanup = () => {\n        readWriteMiddlewareRef.current = null\n        builderProxyCleanup()\n      }\n    })()\n\n    try {\n      await readWriteSetupPromise\n    } finally {\n      readWriteSetupPromise = null\n    }\n  }\n\n  const store = configureReduxStore({\n    reducer: combineReducers(ReadOnlyState.reducers),\n\n    preloadedState: {\n      ...preloadedState,\n      breakpoints: Breakpoints.getInitialState(breakpoints ?? preloadedState?.breakpoints),\n    },\n\n    middleware: getDefaultMiddleware =>\n      getDefaultMiddleware(middlewareOptions).concat([\n        readOnlyElementTreeMiddleware(),\n        makeswiftApiClientSyncMiddleware(hostApiClient),\n        conditionalReadWriteMiddleware(readWriteMiddlewareRef),\n      ]),\n\n    enhancers: getDefaultEnhancers =>\n      getDefaultEnhancers().concat(\n        withReadWriteState(async ({ isReadOnly }) => {\n          if (isReadOnly) {\n            if (refCount > 0) {\n              console.error('Read-write state mismatch', {\n                isReadOnly,\n                refCount,\n              })\n            }\n\n            return () => {}\n          }\n\n          await loadReadWriteState()\n          refCount += 1\n\n          let didCleanup = false\n          return () => {\n            if (didCleanup) {\n              return\n            }\n\n            didCleanup = true\n            refCount -= 1\n            if (refCount === 0 && readWriteCleanup != null) {\n              readWriteCleanup()\n              readWriteCleanup = null\n            }\n          }\n        }),\n      ),\n\n    devTools: devToolsConfig({\n      name: `${name} (${new Date().toISOString()})`,\n      actionsDenylist: [\n        HostActionTypes.BUILDER_POINTER_MOVE,\n        BuilderActionTypes.HANDLE_POINTER_MOVE,\n        BuilderActionTypes.ELEMENT_FROM_POINT_CHANGE,\n      ],\n    }),\n  })\n\n  return store\n}\n\nexport type Store = ReturnType<typeof configureStore>\n"],"mappings":"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","names":["import_toolkit","configureReduxStore"]}
+{"version":3,"sources":["../../../src/state/store.ts"],"sourcesContent":["import {\n  type Middleware,\n  type StoreEnhancer,\n  type MiddlewareAPI,\n  Tuple,\n  configureStore as configureReduxStore,\n  combineReducers,\n  compose,\n} from '@reduxjs/toolkit'\n\nimport { MakeswiftHostApiClient } from '../api/client'\n\nimport { actionMiddleware, middlewareOptions, devToolsConfig } from './toolkit'\nimport { BuilderActionTypes } from './builder-api/actions'\nimport { HostActionTypes } from './host-api'\n\nimport * as Breakpoints from './modules/breakpoints'\n\nimport { readOnlyElementTreeMiddleware } from './middleware/read-only-element-tree'\nimport { makeswiftApiClientSyncMiddleware } from './middleware/makeswift-api-client-sync'\n\nimport { type Action } from './actions'\n\nimport { type State as ReadWriteState } from './read-write-state'\nimport * as ReadOnlyState from './read-only-state'\nimport {\n  type State,\n  type Dispatch,\n  type ReadOnlyReducer,\n  type ReadWriteDispatch,\n} from './unified-state'\n\nexport { type State } from './unified-state'\n\nconst configureStore = <Items extends readonly StoreEnhancer[] = []>({\n  name,\n  preloadedState,\n  enhancers,\n  middleware,\n}: {\n  name: string\n  preloadedState: Partial<State>\n  enhancers: () => Tuple<Items>\n  middleware?: () => Middleware[]\n}) => {\n  const store = configureReduxStore({\n    reducer: combineReducers(ReadOnlyState.reducers),\n    preloadedState,\n\n    middleware: getDefaultMiddleware =>\n      getDefaultMiddleware(middlewareOptions).concat([\n        readOnlyElementTreeMiddleware(),\n        ...(middleware ? middleware() : []),\n      ]),\n\n    enhancers: getDefaultEnhancers => getDefaultEnhancers().concat(enhancers()),\n\n    devTools: devToolsConfig({\n      name: `${name} (${new Date().toISOString()})`,\n      actionsDenylist: [\n        HostActionTypes.BUILDER_POINTER_MOVE,\n        BuilderActionTypes.HANDLE_POINTER_MOVE,\n        BuilderActionTypes.ELEMENT_FROM_POINT_CHANGE,\n      ],\n    }),\n  })\n\n  return store\n}\n\nexport function configureProtoStore({\n  name,\n  breakpoints,\n}: {\n  name: string\n  breakpoints: Breakpoints.State | undefined\n}) {\n  return configureStore({\n    name,\n    preloadedState: {\n      breakpoints: Breakpoints.getInitialState(breakpoints),\n    },\n    enhancers: () => new Tuple(),\n  })\n}\n\nexport type ProtoStore = ReturnType<typeof configureProtoStore>\n\ntype ReadWriteMiddleware = ReturnType<\n  typeof import('./middleware/read-write').createReadWriteMiddleware\n>\n\ntype ReadWriteMiddlewareRef = {\n  current: ReadWriteMiddleware | null\n}\n\nexport function conditionalReadWriteMiddleware(\n  middlewareRef: ReadWriteMiddlewareRef,\n): Middleware<Dispatch, State, Dispatch> {\n  let readWriteActionBuffer: Action[] = []\n  let middlewares: ReadWriteMiddleware | null = null\n  let enhancedDispatch: Dispatch | null = null\n\n  return actionMiddleware(({ dispatch, getState }) => next => {\n    return (action: Action) => {\n      const state = getState()\n\n      if (middlewareRef.current == null) {\n        if (!state.isReadOnly) {\n          // because switching to the read-write state is an asynchronous operation,\n          // we need to buffer all actions dispatched after the isReadOnly state is\n          // set to false but before the read-write middleware is installed\n          readWriteActionBuffer.push(action)\n        }\n\n        return next(action)\n      }\n\n      if (state.isReadOnly) {\n        console.error('Read-write state mismatch', {\n          isReadOnly: state.isReadOnly,\n          middlewareRef: middlewareRef.current,\n          siteVersion: state.siteVersion,\n        })\n      }\n\n      // build and cache the enhanced dispatch chain when read-write middleware is installed\n      if (enhancedDispatch == null || middlewares !== middlewareRef.current) {\n        middlewares = middlewareRef.current\n\n        const middlewareApi = { dispatch, getState } as MiddlewareAPI<\n          ReadWriteDispatch,\n          ReadWriteState\n        >\n\n        enhancedDispatch = compose<Dispatch>(...middlewares.map(mw => mw(middlewareApi)))(next)\n      }\n\n      // dispatch buffered actions, if any\n      if (readWriteActionBuffer.length > 0) {\n        const readWriteActions = [...readWriteActionBuffer]\n        readWriteActionBuffer = []\n\n        // Note that we're rerunning the actions through the entire middleware chain,\n        // including the read-only middleware and the reducers, some of which have\n        // already processed these actions once. This is safe to do because actions that\n        // are run as part of page initialization are idempotent.\n        for (const bufferedAction of readWriteActions) {\n          enhancedDispatch(bufferedAction)\n        }\n      }\n\n      return enhancedDispatch(action)\n    }\n  })\n}\n\nexport interface ReadWriteStateMixin {\n  readonly hostApiClient: MakeswiftHostApiClient\n\n  loadReadWriteStateIfNeeded(): Promise<() => void>\n}\n\nfunction withMixin<M extends {}>(mixin: M): StoreEnhancer<M> {\n  return next => (reducer, preloadedState?) => ({\n    ...next(reducer, preloadedState),\n    ...mixin,\n  })\n}\n\nexport function configureReadWriteStore({\n  name,\n  appOrigin,\n  hostApiClient,\n  preloadedState,\n}: {\n  name: string\n  appOrigin: string\n  hostApiClient: MakeswiftHostApiClient\n  preloadedState: Partial<State>\n}) {\n  const readWriteMiddlewareRef: ReadWriteMiddlewareRef = {\n    current: null,\n  }\n\n  let refCount = 0\n  let readWriteCleanup: (() => void) | null = null\n  let readWriteSetupPromise: Promise<void> | null = null\n\n  const loadReadWriteState = async (): Promise<void> => {\n    if (readWriteCleanup != null) {\n      return\n    }\n\n    if (readWriteSetupPromise != null) {\n      await readWriteSetupPromise\n      return\n    }\n\n    readWriteSetupPromise = (async () => {\n      // import all the modules needed for read-write mode before proceeding with\n      // the setup to avoid race conditions when `setup` is called concurrently\n      // in two different page regions\n      const { BuilderAPIProxy } = await import('./builder-api/proxy')\n      const { createRootReducer, setupBuilderProxy } = await import('./read-write-state')\n      const { createReadWriteMiddleware } = await import('./middleware/read-write')\n\n      // IMPORTANT: only synchronous code after this point\n\n      // with all modules imported, check if another concurrent setup already\n      // initialized the read-write middleware\n      if (readWriteMiddlewareRef.current != null) {\n        return\n      }\n\n      store.replaceReducer(createRootReducer() as ReadOnlyReducer)\n\n      const builderProxy = new BuilderAPIProxy({ appOrigin })\n      readWriteMiddlewareRef.current = createReadWriteMiddleware({ builderProxy })\n\n      const dispatch = store.dispatch as ReadWriteDispatch\n      const builderProxyCleanup = dispatch(setupBuilderProxy(builderProxy))\n\n      readWriteCleanup = () => {\n        readWriteMiddlewareRef.current = null\n        builderProxyCleanup()\n      }\n    })()\n\n    try {\n      await readWriteSetupPromise\n    } finally {\n      readWriteSetupPromise = null\n    }\n  }\n\n  const store = configureStore({\n    name,\n    preloadedState,\n\n    middleware: () => [\n      makeswiftApiClientSyncMiddleware(hostApiClient),\n      conditionalReadWriteMiddleware(readWriteMiddlewareRef),\n    ],\n\n    enhancers: () =>\n      new Tuple(\n        withMixin<ReadWriteStateMixin>({\n          hostApiClient,\n          loadReadWriteStateIfNeeded: async () => {\n            const { isReadOnly } = store.getState()\n\n            if (isReadOnly) {\n              if (refCount > 0) {\n                console.error('Read-write state mismatch', { isReadOnly, refCount })\n              }\n\n              return () => {}\n            }\n\n            await loadReadWriteState()\n            refCount += 1\n\n            let didCleanup = false\n            return () => {\n              if (didCleanup) {\n                return\n              }\n\n              didCleanup = true\n              refCount -= 1\n              if (refCount === 0 && readWriteCleanup != null) {\n                readWriteCleanup()\n                readWriteCleanup = null\n              }\n            }\n          },\n        }),\n      ),\n  })\n\n  return store\n}\n\nexport type Store = ReturnType<typeof configureReadWriteStore>\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,qBAQO;AAIP,IAAAA,kBAAoE;AACpE,qBAAmC;AACnC,sBAAgC;AAEhC,kBAA6B;AAE7B,oCAA8C;AAC9C,uCAAiD;AAKjD,oBAA+B;AAU/B,MAAM,iBAAiB,CAA8C;AAAA,EACnE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,MAKM;AACJ,QAAM,YAAQ,eAAAC,gBAAoB;AAAA,IAChC,aAAS,gCAAgB,cAAc,QAAQ;AAAA,IAC/C;AAAA,IAEA,YAAY,0BACV,qBAAqB,iCAAiB,EAAE,OAAO;AAAA,UAC7C,6DAA8B;AAAA,MAC9B,GAAI,aAAa,WAAW,IAAI,CAAC;AAAA,IACnC,CAAC;AAAA,IAEH,WAAW,yBAAuB,oBAAoB,EAAE,OAAO,UAAU,CAAC;AAAA,IAE1E,cAAU,gCAAe;AAAA,MACvB,MAAM,GAAG,IAAI,MAAK,oBAAI,KAAK,GAAE,YAAY,CAAC;AAAA,MAC1C,iBAAiB;AAAA,QACf,gCAAgB;AAAA,QAChB,kCAAmB;AAAA,QACnB,kCAAmB;AAAA,MACrB;AAAA,IACF,CAAC;AAAA,EACH,CAAC;AAED,SAAO;AACT;AAEO,SAAS,oBAAoB;AAAA,EAClC;AAAA,EACA;AACF,GAGG;AACD,SAAO,eAAe;AAAA,IACpB;AAAA,IACA,gBAAgB;AAAA,MACd,aAAa,YAAY,gBAAgB,WAAW;AAAA,IACtD;AAAA,IACA,WAAW,MAAM,IAAI,qBAAM;AAAA,EAC7B,CAAC;AACH;AAYO,SAAS,+BACd,eACuC;AACvC,MAAI,wBAAkC,CAAC;AACvC,MAAI,cAA0C;AAC9C,MAAI,mBAAoC;AAExC,aAAO,kCAAiB,CAAC,EAAE,UAAU,SAAS,MAAM,UAAQ;AAC1D,WAAO,CAAC,WAAmB;AACzB,YAAM,QAAQ,SAAS;AAEvB,UAAI,cAAc,WAAW,MAAM;AACjC,YAAI,CAAC,MAAM,YAAY;AAIrB,gCAAsB,KAAK,MAAM;AAAA,QACnC;AAEA,eAAO,KAAK,MAAM;AAAA,MACpB;AAEA,UAAI,MAAM,YAAY;AACpB,gBAAQ,MAAM,6BAA6B;AAAA,UACzC,YAAY,MAAM;AAAA,UAClB,eAAe,cAAc;AAAA,UAC7B,aAAa,MAAM;AAAA,QACrB,CAAC;AAAA,MACH;AAGA,UAAI,oBAAoB,QAAQ,gBAAgB,cAAc,SAAS;AACrE,sBAAc,cAAc;AAE5B,cAAM,gBAAgB,EAAE,UAAU,SAAS;AAK3C,+BAAmB,wBAAkB,GAAG,YAAY,IAAI,QAAM,GAAG,aAAa,CAAC,CAAC,EAAE,IAAI;AAAA,MACxF;AAGA,UAAI,sBAAsB,SAAS,GAAG;AACpC,cAAM,mBAAmB,CAAC,GAAG,qBAAqB;AAClD,gCAAwB,CAAC;AAMzB,mBAAW,kBAAkB,kBAAkB;AAC7C,2BAAiB,cAAc;AAAA,QACjC;AAAA,MACF;AAEA,aAAO,iBAAiB,MAAM;AAAA,IAChC;AAAA,EACF,CAAC;AACH;AAQA,SAAS,UAAwB,OAA4B;AAC3D,SAAO,UAAQ,CAAC,SAAS,oBAAqB;AAAA,IAC5C,GAAG,KAAK,SAAS,cAAc;AAAA,IAC/B,GAAG;AAAA,EACL;AACF;AAEO,SAAS,wBAAwB;AAAA,EACtC;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,GAKG;AACD,QAAM,yBAAiD;AAAA,IACrD,SAAS;AAAA,EACX;AAEA,MAAI,WAAW;AACf,MAAI,mBAAwC;AAC5C,MAAI,wBAA8C;AAElD,QAAM,qBAAqB,YAA2B;AACpD,QAAI,oBAAoB,MAAM;AAC5B;AAAA,IACF;AAEA,QAAI,yBAAyB,MAAM;AACjC,YAAM;AACN;AAAA,IACF;AAEA,6BAAyB,YAAY;AAInC,YAAM,EAAE,gBAAgB,IAAI,MAAM,6CAAO,qBAAqB;AAC9D,YAAM,EAAE,mBAAmB,kBAAkB,IAAI,MAAM,6CAAO,oBAAoB;AAClF,YAAM,EAAE,0BAA0B,IAAI,MAAM,6CAAO,yBAAyB;AAM5E,UAAI,uBAAuB,WAAW,MAAM;AAC1C;AAAA,MACF;AAEA,YAAM,eAAe,kBAAkB,CAAoB;AAE3D,YAAM,eAAe,IAAI,gBAAgB,EAAE,UAAU,CAAC;AACtD,6BAAuB,UAAU,0BAA0B,EAAE,aAAa,CAAC;AAE3E,YAAM,WAAW,MAAM;AACvB,YAAM,sBAAsB,SAAS,kBAAkB,YAAY,CAAC;AAEpE,yBAAmB,MAAM;AACvB,+BAAuB,UAAU;AACjC,4BAAoB;AAAA,MACtB;AAAA,IACF,GAAG;AAEH,QAAI;AACF,YAAM;AAAA,IACR,UAAE;AACA,8BAAwB;AAAA,IAC1B;AAAA,EACF;AAEA,QAAM,QAAQ,eAAe;AAAA,IAC3B;AAAA,IACA;AAAA,IAEA,YAAY,MAAM;AAAA,UAChB,mEAAiC,aAAa;AAAA,MAC9C,+BAA+B,sBAAsB;AAAA,IACvD;AAAA,IAEA,WAAW,MACT,IAAI;AAAA,MACF,UAA+B;AAAA,QAC7B;AAAA,QACA,4BAA4B,YAAY;AACtC,gBAAM,EAAE,WAAW,IAAI,MAAM,SAAS;AAEtC,cAAI,YAAY;AACd,gBAAI,WAAW,GAAG;AAChB,sBAAQ,MAAM,6BAA6B,EAAE,YAAY,SAAS,CAAC;AAAA,YACrE;AAEA,mBAAO,MAAM;AAAA,YAAC;AAAA,UAChB;AAEA,gBAAM,mBAAmB;AACzB,sBAAY;AAEZ,cAAI,aAAa;AACjB,iBAAO,MAAM;AACX,gBAAI,YAAY;AACd;AAAA,YACF;AAEA,yBAAa;AACb,wBAAY;AACZ,gBAAI,aAAa,KAAK,oBAAoB,MAAM;AAC9C,+BAAiB;AACjB,iCAAmB;AAAA,YACrB;AAAA,UACF;AAAA,QACF;AAAA,MACF,CAAC;AAAA,IACH;AAAA,EACJ,CAAC;AAED,SAAO;AACT;","names":["import_toolkit","configureReduxStore"]}

package/dist/cjs/unstable-framework-support/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/unstable-framework-support/index.ts"],"sourcesContent":["export {\n  type SiteVersion,\n  serializeSiteVersion,\n  deserializeSiteVersion,\n  secondsUntilSiteVersionExpiration,\n} from '../api/site-version'\n\nexport {\n  type ApiHandlerUserConfig,\n  createApiHandler,\n  type SitePublishedWebhookPayloadData,\n} from '../api-handler'\nexport { SET_COOKIE_HEADER, cookieSettingOptions } from '../api-handler/cookies'\nexport { REDIRECT_SEARCH_PARAM, redirectLiveHandler } from '../api-handler/handlers/redirect-live'\nexport { toApiRequest, pipeResponseTo } from '../api-handler/node-request-response'\nexport { MAKESWIFT_SITE_VERSION_COOKIE, SearchParams } from '../api-handler/preview'\n\nexport { MakeswiftClient } from '../client'\n\nexport { type BreakpointsInput as Breakpoints } from '../state/modules/breakpoints'\n\nexport {\n  FrameworkContext,\n  DefaultHead,\n  DefaultHeadSnippet,\n  DefaultImage,\n} from '../runtimes/react/components/framework-context'\n\nexport { MakeswiftComponent } from '../runtimes/react/components/MakeswiftComponent'\nexport { Page } from '../runtimes/react/components/page'\nexport { RuntimeProvider } from '../runtimes/react/components/RuntimeProvider'\nexport { Slot } from '../runtimes/react/components/Slot'\n\nexport { GoogleFontLink } from '../runtimes/react/components/GoogleFontLink'\nexport { MakeswiftFonts } from '../runtimes/react/components/MakeswiftFonts'\n\nexport {\n  createRootStyleCache,\n  RootStyleRegistry,\n  styleTagHtml,\n  StyleTagSSR,\n  type RootStyleProps,\n} from '../runtimes/react/root-style-registry'\n\nexport { ReactRuntime } from '../runtimes/react/react-runtime'\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,0BAKO;AAEP,yBAIO;AACP,qBAAwD;AACxD,2BAA2D;AAC3D,mCAA6C;AAC7C,qBAA4D;AAE5D,oBAAgC;AAIhC,+BAKO;AAEP,gCAAmC;AACnC,kBAAqB;AACrB,6BAAgC;AAChC,kBAAqB;AAErB,4BAA+B;AAC/B,4BAA+B;AAE/B,iCAMO;AAEP,2BAA6B;","names":[]}
+{"version":3,"sources":["../../../src/unstable-framework-support/index.ts"],"sourcesContent":["export {\n  type SiteVersion,\n  serializeSiteVersion,\n  deserializeSiteVersion,\n  secondsUntilSiteVersionExpiration,\n} from '../api/site-version'\n\nexport {\n  type ApiHandlerUserConfig,\n  createApiHandler,\n  type SitePublishedWebhookPayloadData,\n} from '../api-handler'\nexport { SET_COOKIE_HEADER, cookieSettingOptions } from '../api-handler/cookies'\nexport { REDIRECT_SEARCH_PARAM, redirectLiveHandler } from '../api-handler/handlers/redirect-live'\nexport { toApiRequest, pipeResponseTo } from '../api-handler/node-request-response'\nexport { MAKESWIFT_SITE_VERSION_COOKIE, SearchParams } from '../api-handler/preview'\n\nexport { MakeswiftClient } from '../client'\n\nexport { type BreakpointsInput as Breakpoints } from '../state/modules/breakpoints'\n\nexport {\n  FrameworkContext,\n  DefaultHead,\n  DefaultHeadSnippet,\n  DefaultImage,\n} from '../runtimes/react/components/framework-context'\n\nexport { MakeswiftComponent } from '../runtimes/react/components/MakeswiftComponent'\nexport { Page } from '../runtimes/react/components/page'\nexport { RuntimeProvider } from '../runtimes/react/components/RuntimeProvider'\nexport { Slot } from '../runtimes/react/components/Slot'\n\nexport { GoogleFontLink } from '../runtimes/react/components/GoogleFontLink'\nexport { MakeswiftFonts } from '../runtimes/react/components/MakeswiftFonts'\n\nexport {\n  createRootStyleCache,\n  RootStyleRegistry,\n  styleTagHtml,\n  StyleTagSSR,\n  type RootStyleProps,\n} from '../runtimes/react/root-style-registry'\n\nexport { ReactRuntime, type StoreKey } from '../runtimes/react/react-runtime'\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,0BAKO;AAEP,yBAIO;AACP,qBAAwD;AACxD,2BAA2D;AAC3D,mCAA6C;AAC7C,qBAA4D;AAE5D,oBAAgC;AAIhC,+BAKO;AAEP,gCAAmC;AACnC,kBAAqB;AACrB,6BAAgC;AAChC,kBAAqB;AAErB,4BAA+B;AAC/B,4BAA+B;AAE/B,iCAMO;AAEP,2BAA4C;","names":[]}

package/dist/cjs/utils/ref-counted-map.js

@@ -0,0 +1,111 @@
+"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 ref_counted_map_exports = {};
+__export(ref_counted_map_exports, {
+  RefCountedMap: () => RefCountedMap
+});
+module.exports = __toCommonJS(ref_counted_map_exports);
+const TTLCheck = {
+  ON_GET: 1 << 0,
+  ON_RETAIN: 1 << 1,
+  ON_RELEASE: 1 << 2
+};
+class RefCountedMap {
+  map = /* @__PURE__ */ new Map();
+  unownedEntryTtlMs;
+  ttlCheck;
+  static TTLCheck = TTLCheck;
+  constructor({
+    unownedEntryTtlMs,
+    ttlCheck = TTLCheck.ON_GET | TTLCheck.ON_RETAIN | TTLCheck.ON_RELEASE
+  }) {
+    this.unownedEntryTtlMs = unownedEntryTtlMs;
+    this.ttlCheck = ttlCheck;
+  }
+  get size() {
+    return this.map.size;
+  }
+  get(key) {
+    return this.map.get(key)?.value;
+  }
+  getOrCreate(key, init) {
+    try {
+      const existing = this.map.get(key);
+      if (existing) {
+        if (isUnowned(existing))
+          existing.accessedAt = Date.now();
+        return existing.value;
+      }
+      const value = init();
+      this.map.set(key, { value, count: void 0, accessedAt: Date.now() });
+      return value;
+    } finally {
+      if (this.ttlCheck & TTLCheck.ON_GET)
+        this.removeExpired();
+    }
+  }
+  retain(key, value) {
+    try {
+      const existing = this.map.get(key);
+      if (existing != null) {
+        if (existing.value !== value)
+          return;
+        existing.count = (existing.count ?? 0) + 1;
+      } else {
+        this.map.set(key, { value, count: 1 });
+      }
+    } finally {
+      if (this.ttlCheck & TTLCheck.ON_RETAIN)
+        this.removeExpired();
+    }
+  }
+  release(key, value) {
+    try {
+      const existing = this.map.get(key);
+      if (existing == null)
+        return;
+      if (isUnowned(existing))
+        return;
+      if (existing.value !== value)
+        return;
+      if (existing.count > 1) {
+        existing.count -= 1;
+      } else {
+        this.map.delete(key);
+      }
+    } finally {
+      if (this.ttlCheck & TTLCheck.ON_RELEASE)
+        this.removeExpired();
+    }
+  }
+  removeExpired() {
+    const now = Date.now();
+    const isExpired = (entry) => isUnowned(entry) && now - entry.accessedAt > this.unownedEntryTtlMs;
+    this.map.forEach((entry, key) => {
+      if (isExpired(entry))
+        this.map.delete(key);
+    });
+  }
+}
+const isUnowned = (entry) => entry.count === void 0;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  RefCountedMap
+});
+//# sourceMappingURL=ref-counted-map.js.map

package/dist/cjs/utils/ref-counted-map.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/utils/ref-counted-map.ts"],"sourcesContent":["type RefCountedMapEntry<V> = {\n  value: V\n  count: number\n}\n\ntype UnownedMapEntry<V> = {\n  value: V\n  count: undefined\n  accessedAt: number\n}\n\ntype MapEntry<V> = RefCountedMapEntry<V> | UnownedMapEntry<V>\n\nconst TTLCheck = {\n  ON_GET: 1 << 0,\n  ON_RETAIN: 1 << 1,\n  ON_RELEASE: 1 << 2,\n} as const\n\n/**\n * Ref-counted map with explicit retention semantics. Entries are unowned by default and may be evicted after their\n * TTL unless explicitly retained. This provides TTL-based caching for unowned entries, while allowing consumers to\n * opt into stronger lifetime control via explicit retention.\n */\nexport class RefCountedMap<K, V> {\n  private readonly map = new Map<K, MapEntry<V>>()\n  private readonly unownedEntryTtlMs: number\n  private readonly ttlCheck: number\n\n  static readonly TTLCheck = TTLCheck\n\n  constructor({\n    unownedEntryTtlMs,\n    ttlCheck = TTLCheck.ON_GET | TTLCheck.ON_RETAIN | TTLCheck.ON_RELEASE,\n  }: {\n    unownedEntryTtlMs: number\n    ttlCheck?: number\n  }) {\n    this.unownedEntryTtlMs = unownedEntryTtlMs\n    this.ttlCheck = ttlCheck\n  }\n\n  get size(): number {\n    return this.map.size\n  }\n\n  get(key: K): V | undefined {\n    return this.map.get(key)?.value\n  }\n\n  getOrCreate(key: K, init: () => V): V {\n    try {\n      const existing = this.map.get(key)\n\n      if (existing) {\n        if (isUnowned(existing)) existing.accessedAt = Date.now()\n        return existing.value\n      }\n\n      const value = init()\n      this.map.set(key, { value, count: undefined, accessedAt: Date.now() })\n      return value\n    } finally {\n      if (this.ttlCheck & TTLCheck.ON_GET) this.removeExpired()\n    }\n  }\n\n  retain(key: K, value: V): void {\n    try {\n      const existing = this.map.get(key)\n\n      // `retain` might be called on a unowned entry that has already been evicted from the map due to TTL expiration\n      // *and* possibly replaced by a new unowned entry with the same key; handle this gracefully\n      if (existing != null) {\n        if (existing.value !== value) return\n        existing.count = (existing.count ?? 0) + 1\n      } else {\n        this.map.set(key, { value, count: 1 })\n      }\n    } finally {\n      if (this.ttlCheck & TTLCheck.ON_RETAIN) this.removeExpired()\n    }\n  }\n\n  release(key: K, value: V): void {\n    try {\n      const existing = this.map.get(key)\n\n      // `release` might be called on an entry that remained unowned due being superseded by a new entry with the same\n      // key after TTL expiration of the original entry; handle this gracefully\n      if (existing == null) return\n      if (isUnowned(existing)) return\n      if (existing.value !== value) return\n\n      if (existing.count > 1) {\n        existing.count -= 1\n      } else {\n        this.map.delete(key)\n      }\n    } finally {\n      if (this.ttlCheck & TTLCheck.ON_RELEASE) this.removeExpired()\n    }\n  }\n\n  private removeExpired(): void {\n    const now = Date.now()\n    const isExpired = (entry: MapEntry<V>): boolean =>\n      isUnowned(entry) && now - entry.accessedAt > this.unownedEntryTtlMs\n\n    this.map.forEach((entry, key) => {\n      if (isExpired(entry)) this.map.delete(key)\n    })\n  }\n}\n\nconst isUnowned = <V>(entry: MapEntry<V>): entry is UnownedMapEntry<V> => entry.count === undefined\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAaA,MAAM,WAAW;AAAA,EACf,QAAQ,KAAK;AAAA,EACb,WAAW,KAAK;AAAA,EAChB,YAAY,KAAK;AACnB;AAOO,MAAM,cAAoB;AAAA,EACd,MAAM,oBAAI,IAAoB;AAAA,EAC9B;AAAA,EACA;AAAA,EAEjB,OAAgB,WAAW;AAAA,EAE3B,YAAY;AAAA,IACV;AAAA,IACA,WAAW,SAAS,SAAS,SAAS,YAAY,SAAS;AAAA,EAC7D,GAGG;AACD,SAAK,oBAAoB;AACzB,SAAK,WAAW;AAAA,EAClB;AAAA,EAEA,IAAI,OAAe;AACjB,WAAO,KAAK,IAAI;AAAA,EAClB;AAAA,EAEA,IAAI,KAAuB;AACzB,WAAO,KAAK,IAAI,IAAI,GAAG,GAAG;AAAA,EAC5B;AAAA,EAEA,YAAY,KAAQ,MAAkB;AACpC,QAAI;AACF,YAAM,WAAW,KAAK,IAAI,IAAI,GAAG;AAEjC,UAAI,UAAU;AACZ,YAAI,UAAU,QAAQ;AAAG,mBAAS,aAAa,KAAK,IAAI;AACxD,eAAO,SAAS;AAAA,MAClB;AAEA,YAAM,QAAQ,KAAK;AACnB,WAAK,IAAI,IAAI,KAAK,EAAE,OAAO,OAAO,QAAW,YAAY,KAAK,IAAI,EAAE,CAAC;AACrE,aAAO;AAAA,IACT,UAAE;AACA,UAAI,KAAK,WAAW,SAAS;AAAQ,aAAK,cAAc;AAAA,IAC1D;AAAA,EACF;AAAA,EAEA,OAAO,KAAQ,OAAgB;AAC7B,QAAI;AACF,YAAM,WAAW,KAAK,IAAI,IAAI,GAAG;AAIjC,UAAI,YAAY,MAAM;AACpB,YAAI,SAAS,UAAU;AAAO;AAC9B,iBAAS,SAAS,SAAS,SAAS,KAAK;AAAA,MAC3C,OAAO;AACL,aAAK,IAAI,IAAI,KAAK,EAAE,OAAO,OAAO,EAAE,CAAC;AAAA,MACvC;AAAA,IACF,UAAE;AACA,UAAI,KAAK,WAAW,SAAS;AAAW,aAAK,cAAc;AAAA,IAC7D;AAAA,EACF;AAAA,EAEA,QAAQ,KAAQ,OAAgB;AAC9B,QAAI;AACF,YAAM,WAAW,KAAK,IAAI,IAAI,GAAG;AAIjC,UAAI,YAAY;AAAM;AACtB,UAAI,UAAU,QAAQ;AAAG;AACzB,UAAI,SAAS,UAAU;AAAO;AAE9B,UAAI,SAAS,QAAQ,GAAG;AACtB,iBAAS,SAAS;AAAA,MACpB,OAAO;AACL,aAAK,IAAI,OAAO,GAAG;AAAA,MACrB;AAAA,IACF,UAAE;AACA,UAAI,KAAK,WAAW,SAAS;AAAY,aAAK,cAAc;AAAA,IAC9D;AAAA,EACF;AAAA,EAEQ,gBAAsB;AAC5B,UAAM,MAAM,KAAK,IAAI;AACrB,UAAM,YAAY,CAAC,UACjB,UAAU,KAAK,KAAK,MAAM,MAAM,aAAa,KAAK;AAEpD,SAAK,IAAI,QAAQ,CAAC,OAAO,QAAQ;AAC/B,UAAI,UAAU,KAAK;AAAG,aAAK,IAAI,OAAO,GAAG;AAAA,IAC3C,CAAC;AAAA,EACH;AACF;AAEA,MAAM,YAAY,CAAI,UAAoD,MAAM,UAAU;","names":[]}

package/dist/esm/api/client.js

@@ -20,12 +20,10 @@ class MakeswiftHostApiClient {
   constructor({
     uri,
     fetch,
-    cacheData
+    preloadedState
   }) {
     this.graphqlClient = new GraphQLClient(uri);
-    this.makeswiftApiClient = MakeswiftApiClient.configureStore({
-      serializedState: cacheData
-    });
+    this.makeswiftApiClient = MakeswiftApiClient.configureStore({ preloadedState });
     this.fetch = fetch;
     this.subscribe = this.makeswiftApiClient.subscribe;
   }

package/dist/esm/api/client.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/api/client.ts"],"sourcesContent":["import { type FetchableValue } from '@makeswift/controls'\n\nimport * as MakeswiftApiClient from '../state/makeswift-api-client'\n\nimport {\n  APIResourceType,\n  File,\n  GlobalElement,\n  LocalizedGlobalElement,\n  Page,\n  PagePathnameSlice,\n  Site,\n  Snippet,\n  Swatch,\n  Table,\n  Typography,\n} from './types'\nimport { GraphQLClient } from './graphql/client'\nimport { CreateTableRecordMutation } from './graphql/documents'\nimport {\n  CreateTableRecordMutationResult,\n  CreateTableRecordMutationVariables,\n} from './graphql/generated/types'\n\nexport type CacheData = MakeswiftApiClient.SerializedState\n\nexport const CacheData = {\n  empty(): CacheData {\n    return {\n      apiResources: {},\n      localizedResourcesMap: {},\n    }\n  },\n}\n\n/**\n * NOTE(miguel): This \"client\" is used to fetch Makeswift API resources needed for the host. For\n * example, swatches, files, typographies, etc. Ideally it's internal to the runtime and is only\n * used by controls to transform API references to API resources.\n *\n * Moreover, its use should be reserved for the builder only, since for live pages all Makeswift\n * API resources should be embedded in the \"page snapshot\". In the builder, this client serves the\n * purpose of sending requests for API resources and keeping a cache so that changes that happen in\n * the builder, like modifying a swatch, can be sent via `postMessage` to the host and the cache can\n * immediately update the value and re-render.\n *\n * Furthermore, the API resources requested shouldn't be requested directly from the Makeswift API\n * as that would require those resources to not be authenticated since the requests come from the\n * browser when running the host. Instead, the requests should go to the host directly, at the\n * Makeswift API endpoint (i.g., `/api/makeswift/[...makeswift]` dynamic route) where the host's\n * API key can be used, securely, in the server. For this reason, this client should really be a\n * client of the host's API, not Makeswift's, intended to build and continuously maintain a realtime\n * snapshot for use in the builder, not the lives pages.\n */\nexport class MakeswiftHostApiClient {\n  graphqlClient: GraphQLClient\n  makeswiftApiClient: MakeswiftApiClient.Store\n  subscribe: MakeswiftApiClient.Store['subscribe']\n  fetch: MakeswiftApiClient.HttpFetch\n\n  constructor({\n    uri,\n    fetch,\n    cacheData,\n  }: {\n    uri: string\n    fetch: MakeswiftApiClient.HttpFetch\n    cacheData?: CacheData\n  }) {\n    this.graphqlClient = new GraphQLClient(uri)\n    this.makeswiftApiClient = MakeswiftApiClient.configureStore({\n      serializedState: cacheData,\n    })\n    this.fetch = fetch\n    this.subscribe = this.makeswiftApiClient.subscribe\n  }\n\n  readSwatch(swatchId: string): Swatch | null {\n    return MakeswiftApiClient.getAPIResource(\n      this.makeswiftApiClient.getState(),\n      APIResourceType.Swatch,\n      swatchId,\n    )\n  }\n\n  async fetchSwatch(swatchId: string): Promise<Swatch | null> {\n    return await this.makeswiftApiClient.dispatch(\n      MakeswiftApiClient.fetchAPIResource(APIResourceType.Swatch, swatchId, this.fetch),\n    )\n  }\n\n  resolveSwatch(swatchId: string | undefined): FetchableValue<Swatch | null> {\n    return this.resolveResource(APIResourceType.Swatch, {\n      id: swatchId,\n      read: id => this.readSwatch(id),\n      fetch: id => this.fetchSwatch(id),\n    })\n  }\n\n  readFile(fileId: string): File | null {\n    return MakeswiftApiClient.getAPIResource(\n      this.makeswiftApiClient.getState(),\n      APIResourceType.File,\n      fileId,\n    )\n  }\n\n  async fetchFile(fileId: string): Promise<File | null> {\n    return await this.makeswiftApiClient.dispatch(\n      MakeswiftApiClient.fetchAPIResource(APIResourceType.File, fileId, this.fetch),\n    )\n  }\n\n  resolveFile(fileId: string | undefined): FetchableValue<File | null> {\n    return this.resolveResource(APIResourceType.File, {\n      id: fileId,\n      read: id => this.readFile(id),\n      fetch: id => this.fetchFile(id),\n    })\n  }\n\n  readTypography(typographyId: string): Typography | null {\n    return MakeswiftApiClient.getAPIResource(\n      this.makeswiftApiClient.getState(),\n      APIResourceType.Typography,\n      typographyId,\n    )\n  }\n\n  async fetchTypography(typographyId: string): Promise<Typography | null> {\n    return await this.makeswiftApiClient.dispatch(\n      MakeswiftApiClient.fetchAPIResource(APIResourceType.Typography, typographyId, this.fetch),\n    )\n  }\n\n  resolveTypography(typographyId: string | undefined): FetchableValue<Typography | null> {\n    return this.resolveResource(APIResourceType.Typography, {\n      id: typographyId,\n      read: id => this.readTypography(id),\n      fetch: id => this.fetchTypography(id),\n    })\n  }\n\n  readGlobalElement(globalElementId: string): GlobalElement | null {\n    return MakeswiftApiClient.getAPIResource(\n      this.makeswiftApiClient.getState(),\n      APIResourceType.GlobalElement,\n      globalElementId,\n    )\n  }\n\n  async fetchGlobalElement(globalElementId: string): Promise<GlobalElement | null> {\n    return await this.makeswiftApiClient.dispatch(\n      MakeswiftApiClient.fetchAPIResource(\n        APIResourceType.GlobalElement,\n        globalElementId,\n        this.fetch,\n      ),\n    )\n  }\n\n  readLocalizedGlobalElement({\n    globalElementId,\n    locale,\n  }: {\n    globalElementId: string\n    locale: string\n  }): LocalizedGlobalElement | null {\n    return MakeswiftApiClient.getAPIResource(\n      this.makeswiftApiClient.getState(),\n      APIResourceType.LocalizedGlobalElement,\n      globalElementId,\n      locale,\n    )\n  }\n\n  async fetchLocalizedGlobalElement({\n    globalElementId,\n    locale,\n  }: {\n    globalElementId: string\n    locale: string\n  }): Promise<LocalizedGlobalElement | null> {\n    return await this.makeswiftApiClient.dispatch(\n      MakeswiftApiClient.fetchAPIResource(\n        APIResourceType.LocalizedGlobalElement,\n        globalElementId,\n        this.fetch,\n        locale,\n      ),\n    )\n  }\n\n  readPagePathnameSlice({\n    pageId,\n    locale,\n  }: {\n    pageId: string\n    locale: string | null\n  }): PagePathnameSlice | null {\n    return MakeswiftApiClient.getAPIResource(\n      this.makeswiftApiClient.getState(),\n      APIResourceType.PagePathnameSlice,\n      pageId,\n      locale,\n    )\n  }\n\n  async fetchPagePathnameSlice({\n    pageId,\n    locale,\n  }: {\n    pageId: string\n    locale: string | null\n  }): Promise<PagePathnameSlice | null> {\n    return await this.makeswiftApiClient.dispatch(\n      MakeswiftApiClient.fetchAPIResource(\n        APIResourceType.PagePathnameSlice,\n        pageId,\n        this.fetch,\n        locale,\n      ),\n    )\n  }\n\n  resolvePagePathnameSlice({\n    pageId,\n    locale,\n  }: {\n    pageId: string | undefined\n    locale: string | null\n  }): FetchableValue<PagePathnameSlice | null> {\n    return this.resolveResource(APIResourceType.PagePathnameSlice, {\n      id: pageId,\n      read: id => this.readPagePathnameSlice({ pageId: id, locale }),\n      fetch: id => this.fetchPagePathnameSlice({ pageId: id, locale }),\n    })\n  }\n\n  resolveResource<R>(\n    type: APIResourceType,\n    {\n      id,\n      read,\n      fetch,\n    }: {\n      id: string | undefined\n      read: (id: string) => R | null\n      fetch: (id: string) => Promise<R | null>\n    },\n  ): FetchableValue<R | null> {\n    const _read = () => (id != null ? read(id) : null)\n    let lastValue: R | null = null\n    return {\n      name: `${type}:${id}`,\n      readStable: () => (lastValue = _read()),\n      subscribe: (onUpdate: () => void) =>\n        this.subscribe(() => {\n          if (_read() !== lastValue) onUpdate()\n        }),\n      fetch: async () => (id != null ? fetch(id) : null),\n    }\n  }\n\n  readTable(tableId: string): Table | null {\n    return MakeswiftApiClient.getAPIResource(\n      this.makeswiftApiClient.getState(),\n      APIResourceType.Table,\n      tableId,\n    )\n  }\n\n  async fetchTable(tableId: string): Promise<Table | null> {\n    return await this.makeswiftApiClient.dispatch(\n      MakeswiftApiClient.fetchAPIResource(APIResourceType.Table, tableId, this.fetch),\n    )\n  }\n\n  async createTableRecord(tableId: string, columns: any): Promise<void> {\n    await this.graphqlClient.request<\n      CreateTableRecordMutationResult,\n      CreateTableRecordMutationVariables\n    >(CreateTableRecordMutation, { input: { data: { tableId, columns } } })\n  }\n\n  readSite(siteId: string): Site | null {\n    return MakeswiftApiClient.getAPIResource(\n      this.makeswiftApiClient.getState(),\n      APIResourceType.Site,\n      siteId,\n    )\n  }\n\n  readPage(pageId: string): Page | null {\n    return MakeswiftApiClient.getAPIResource(\n      this.makeswiftApiClient.getState(),\n      APIResourceType.Page,\n      pageId,\n    )\n  }\n\n  readSnippet(snippetId: string): Snippet | null {\n    return MakeswiftApiClient.getAPIResource(\n      this.makeswiftApiClient.getState(),\n      APIResourceType.Snippet,\n      snippetId,\n    )\n  }\n}\n"],"mappings":"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","names":[]}
+{"version":3,"sources":["../../../src/api/client.ts"],"sourcesContent":["import { type FetchableValue } from '@makeswift/controls'\n\nimport * as MakeswiftApiClient from '../state/makeswift-api-client'\n\nimport {\n  APIResourceType,\n  File,\n  GlobalElement,\n  LocalizedGlobalElement,\n  Page,\n  PagePathnameSlice,\n  Site,\n  Snippet,\n  Swatch,\n  Table,\n  Typography,\n} from './types'\nimport { GraphQLClient } from './graphql/client'\nimport { CreateTableRecordMutation } from './graphql/documents'\nimport {\n  CreateTableRecordMutationResult,\n  CreateTableRecordMutationVariables,\n} from './graphql/generated/types'\n\nexport type CacheData = MakeswiftApiClient.SerializedState\n\nexport const CacheData = {\n  empty(): CacheData {\n    return {\n      apiResources: {},\n      localizedResourcesMap: {},\n    }\n  },\n}\n\n/**\n * NOTE(miguel): This \"client\" is used to fetch Makeswift API resources needed for the host. For\n * example, swatches, files, typographies, etc. Ideally it's internal to the runtime and is only\n * used by controls to transform API references to API resources.\n *\n * Moreover, its use should be reserved for the builder only, since for live pages all Makeswift\n * API resources should be embedded in the \"page snapshot\". In the builder, this client serves the\n * purpose of sending requests for API resources and keeping a cache so that changes that happen in\n * the builder, like modifying a swatch, can be sent via `postMessage` to the host and the cache can\n * immediately update the value and re-render.\n *\n * Furthermore, the API resources requested shouldn't be requested directly from the Makeswift API\n * as that would require those resources to not be authenticated since the requests come from the\n * browser when running the host. Instead, the requests should go to the host directly, at the\n * Makeswift API endpoint (i.g., `/api/makeswift/[...makeswift]` dynamic route) where the host's\n * API key can be used, securely, in the server. For this reason, this client should really be a\n * client of the host's API, not Makeswift's, intended to build and continuously maintain a realtime\n * snapshot for use in the builder, not the lives pages.\n */\nexport class MakeswiftHostApiClient {\n  graphqlClient: GraphQLClient\n  makeswiftApiClient: MakeswiftApiClient.Store\n  subscribe: MakeswiftApiClient.Store['subscribe']\n  fetch: MakeswiftApiClient.HttpFetch\n\n  constructor({\n    uri,\n    fetch,\n    preloadedState,\n  }: {\n    uri: string\n    fetch: MakeswiftApiClient.HttpFetch\n    preloadedState: Partial<MakeswiftApiClient.State>\n  }) {\n    this.graphqlClient = new GraphQLClient(uri)\n    this.makeswiftApiClient = MakeswiftApiClient.configureStore({ preloadedState })\n    this.fetch = fetch\n    this.subscribe = this.makeswiftApiClient.subscribe\n  }\n\n  readSwatch(swatchId: string): Swatch | null {\n    return MakeswiftApiClient.getAPIResource(\n      this.makeswiftApiClient.getState(),\n      APIResourceType.Swatch,\n      swatchId,\n    )\n  }\n\n  async fetchSwatch(swatchId: string): Promise<Swatch | null> {\n    return await this.makeswiftApiClient.dispatch(\n      MakeswiftApiClient.fetchAPIResource(APIResourceType.Swatch, swatchId, this.fetch),\n    )\n  }\n\n  resolveSwatch(swatchId: string | undefined): FetchableValue<Swatch | null> {\n    return this.resolveResource(APIResourceType.Swatch, {\n      id: swatchId,\n      read: id => this.readSwatch(id),\n      fetch: id => this.fetchSwatch(id),\n    })\n  }\n\n  readFile(fileId: string): File | null {\n    return MakeswiftApiClient.getAPIResource(\n      this.makeswiftApiClient.getState(),\n      APIResourceType.File,\n      fileId,\n    )\n  }\n\n  async fetchFile(fileId: string): Promise<File | null> {\n    return await this.makeswiftApiClient.dispatch(\n      MakeswiftApiClient.fetchAPIResource(APIResourceType.File, fileId, this.fetch),\n    )\n  }\n\n  resolveFile(fileId: string | undefined): FetchableValue<File | null> {\n    return this.resolveResource(APIResourceType.File, {\n      id: fileId,\n      read: id => this.readFile(id),\n      fetch: id => this.fetchFile(id),\n    })\n  }\n\n  readTypography(typographyId: string): Typography | null {\n    return MakeswiftApiClient.getAPIResource(\n      this.makeswiftApiClient.getState(),\n      APIResourceType.Typography,\n      typographyId,\n    )\n  }\n\n  async fetchTypography(typographyId: string): Promise<Typography | null> {\n    return await this.makeswiftApiClient.dispatch(\n      MakeswiftApiClient.fetchAPIResource(APIResourceType.Typography, typographyId, this.fetch),\n    )\n  }\n\n  resolveTypography(typographyId: string | undefined): FetchableValue<Typography | null> {\n    return this.resolveResource(APIResourceType.Typography, {\n      id: typographyId,\n      read: id => this.readTypography(id),\n      fetch: id => this.fetchTypography(id),\n    })\n  }\n\n  readGlobalElement(globalElementId: string): GlobalElement | null {\n    return MakeswiftApiClient.getAPIResource(\n      this.makeswiftApiClient.getState(),\n      APIResourceType.GlobalElement,\n      globalElementId,\n    )\n  }\n\n  async fetchGlobalElement(globalElementId: string): Promise<GlobalElement | null> {\n    return await this.makeswiftApiClient.dispatch(\n      MakeswiftApiClient.fetchAPIResource(\n        APIResourceType.GlobalElement,\n        globalElementId,\n        this.fetch,\n      ),\n    )\n  }\n\n  readLocalizedGlobalElement({\n    globalElementId,\n    locale,\n  }: {\n    globalElementId: string\n    locale: string\n  }): LocalizedGlobalElement | null {\n    return MakeswiftApiClient.getAPIResource(\n      this.makeswiftApiClient.getState(),\n      APIResourceType.LocalizedGlobalElement,\n      globalElementId,\n      locale,\n    )\n  }\n\n  async fetchLocalizedGlobalElement({\n    globalElementId,\n    locale,\n  }: {\n    globalElementId: string\n    locale: string\n  }): Promise<LocalizedGlobalElement | null> {\n    return await this.makeswiftApiClient.dispatch(\n      MakeswiftApiClient.fetchAPIResource(\n        APIResourceType.LocalizedGlobalElement,\n        globalElementId,\n        this.fetch,\n        locale,\n      ),\n    )\n  }\n\n  readPagePathnameSlice({\n    pageId,\n    locale,\n  }: {\n    pageId: string\n    locale: string | null\n  }): PagePathnameSlice | null {\n    return MakeswiftApiClient.getAPIResource(\n      this.makeswiftApiClient.getState(),\n      APIResourceType.PagePathnameSlice,\n      pageId,\n      locale,\n    )\n  }\n\n  async fetchPagePathnameSlice({\n    pageId,\n    locale,\n  }: {\n    pageId: string\n    locale: string | null\n  }): Promise<PagePathnameSlice | null> {\n    return await this.makeswiftApiClient.dispatch(\n      MakeswiftApiClient.fetchAPIResource(\n        APIResourceType.PagePathnameSlice,\n        pageId,\n        this.fetch,\n        locale,\n      ),\n    )\n  }\n\n  resolvePagePathnameSlice({\n    pageId,\n    locale,\n  }: {\n    pageId: string | undefined\n    locale: string | null\n  }): FetchableValue<PagePathnameSlice | null> {\n    return this.resolveResource(APIResourceType.PagePathnameSlice, {\n      id: pageId,\n      read: id => this.readPagePathnameSlice({ pageId: id, locale }),\n      fetch: id => this.fetchPagePathnameSlice({ pageId: id, locale }),\n    })\n  }\n\n  resolveResource<R>(\n    type: APIResourceType,\n    {\n      id,\n      read,\n      fetch,\n    }: {\n      id: string | undefined\n      read: (id: string) => R | null\n      fetch: (id: string) => Promise<R | null>\n    },\n  ): FetchableValue<R | null> {\n    const _read = () => (id != null ? read(id) : null)\n    let lastValue: R | null = null\n    return {\n      name: `${type}:${id}`,\n      readStable: () => (lastValue = _read()),\n      subscribe: (onUpdate: () => void) =>\n        this.subscribe(() => {\n          if (_read() !== lastValue) onUpdate()\n        }),\n      fetch: async () => (id != null ? fetch(id) : null),\n    }\n  }\n\n  readTable(tableId: string): Table | null {\n    return MakeswiftApiClient.getAPIResource(\n      this.makeswiftApiClient.getState(),\n      APIResourceType.Table,\n      tableId,\n    )\n  }\n\n  async fetchTable(tableId: string): Promise<Table | null> {\n    return await this.makeswiftApiClient.dispatch(\n      MakeswiftApiClient.fetchAPIResource(APIResourceType.Table, tableId, this.fetch),\n    )\n  }\n\n  async createTableRecord(tableId: string, columns: any): Promise<void> {\n    await this.graphqlClient.request<\n      CreateTableRecordMutationResult,\n      CreateTableRecordMutationVariables\n    >(CreateTableRecordMutation, { input: { data: { tableId, columns } } })\n  }\n\n  readSite(siteId: string): Site | null {\n    return MakeswiftApiClient.getAPIResource(\n      this.makeswiftApiClient.getState(),\n      APIResourceType.Site,\n      siteId,\n    )\n  }\n\n  readPage(pageId: string): Page | null {\n    return MakeswiftApiClient.getAPIResource(\n      this.makeswiftApiClient.getState(),\n      APIResourceType.Page,\n      pageId,\n    )\n  }\n\n  readSnippet(snippetId: string): Snippet | null {\n    return MakeswiftApiClient.getAPIResource(\n      this.makeswiftApiClient.getState(),\n      APIResourceType.Snippet,\n      snippetId,\n    )\n  }\n}\n"],"mappings":"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","names":[]}

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

@@ -8,7 +8,7 @@ async function manifestHandler(req, { apiKey, manifest }) {
     return ApiResponse.json({ message: "Unauthorized" }, { status: 401 });
   }
   return ApiResponse.json({
-    version: "0.28.3-canary.3",
+    version: "0.28.3-canary.5",
     interactionMode: true,
     clientSideNavigation: false,
     elementFromPoint: false,

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/builder/core/index.ts"],"sourcesContent":["export {\n  type BoxModel,\n  type Breakpoint,\n  type BreakpointId,\n  type Breakpoints,\n  type ConfigType,\n  type Data,\n  type DataType,\n  type Device,\n  type DeviceOverride,\n  type FallbackStrategy,\n  type ValueType,\n  type ResolvedValueType,\n  type ResponsiveValue,\n  type ControlMessage,\n  type ReplacementContext,\n  type SendMessageType,\n  type Element,\n  ControlDefinition,\n  ControlInstance,\n  DefaultControlInstance,\n  ShapeV2Control,\n  getBaseBreakpoint,\n  getBreakpoint,\n  findBreakpointOverride,\n  findNextFallback,\n  mergeOrCoalesceFallbacks,\n  mergeResponsiveValues,\n  shallowMergeFallbacks,\n  getViewportStyle,\n  replaceResourceIfNeeded,\n  shouldRemoveResource,\n  ContextResource,\n} from '@makeswift/controls'\n"],"mappings":"AAAA;AAAA,EAkBE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;","names":[]}
+{"version":3,"sources":["../../../../src/builder/core/index.ts"],"sourcesContent":["export {\n  type BoxModel,\n  type BoxDisplayModel,\n  type Breakpoint,\n  type BreakpointId,\n  type Breakpoints,\n  type ConfigType,\n  type Data,\n  type DataType,\n  type Device,\n  type DeviceOverride,\n  type FallbackStrategy,\n  type ValueType,\n  type ResolvedValueType,\n  type ResponsiveValue,\n  type ControlMessage,\n  type ReplacementContext,\n  type SendMessageType,\n  type Element,\n  ControlDefinition,\n  ControlInstance,\n  DefaultControlInstance,\n  ShapeV2Control,\n  getBaseBreakpoint,\n  getBreakpoint,\n  findBreakpointOverride,\n  findNextFallback,\n  mergeOrCoalesceFallbacks,\n  mergeResponsiveValues,\n  shallowMergeFallbacks,\n  getViewportStyle,\n  replaceResourceIfNeeded,\n  shouldRemoveResource,\n  ContextResource,\n} from '@makeswift/controls'\n"],"mappings":"AAAA;AAAA,EAmBE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;","names":[]}

package/dist/esm/client/index.js

@@ -176,10 +176,12 @@ const getPageAPISchema = z.object({
   )
 });
 const getFontsAPISchema = z.object({
-  googleFonts: z.array(z.object({
-    family: z.string(),
-    variants: z.array(z.string())
-  })),
+  googleFonts: z.array(
+    z.object({
+      family: z.string(),
+      variants: z.array(z.string())
+    })
+  ),
   siteId: z.string()
 });
 class MakeswiftClient {
@@ -195,7 +197,7 @@ Received "${apiKey}" instead.`
     }
     this.apiKey = apiKey;
     this.graphqlClient = new GraphQLClient(new URL("graphql", runtime.apiOrigin).href, {
-      "makeswift-runtime-version": "0.28.3-canary.3"
+      "makeswift-runtime-version": "0.28.3-canary.5"
     });
     this.runtime = runtime;
   }
@@ -207,7 +209,7 @@ Received "${apiKey}" instead.`
     const requestHeaders = new Headers({
       "x-api-key": this.apiKey,
       "makeswift-site-api-key": this.apiKey,
-      "makeswift-runtime-version": "0.28.3-canary.3"
+      "makeswift-runtime-version": "0.28.3-canary.5"
     });
     if (siteVersion?.token) {
       requestUrl.searchParams.set("version", siteVersion.version);
@@ -313,8 +315,7 @@ Received "${apiKey}" instead.`
     return { ...result, swatches };
   }
   async introspect(element, siteVersion, locale) {
-    const runtime = this.runtime;
-    const descriptors = getPropControllerDescriptors(runtime.store.getState());
+    const descriptors = this.getElementDescriptors();
     const swatchIds = /* @__PURE__ */ new Set();
     const fileIds = /* @__PURE__ */ new Set();
     const typographyIds = /* @__PURE__ */ new Set();
@@ -647,17 +648,10 @@ Received "${apiKey}" instead.`
     return result.table;
   }
   getTranslatableData(elementTree) {
-    return getTranslatableContent(
-      getPropControllerDescriptors(this.runtime.store.getState()),
-      elementTree
-    );
+    return getTranslatableContent(this.getElementDescriptors(), elementTree);
   }
   mergeTranslatedData(elementTree, translatedData) {
-    return mergeTranslatedContent(
-      getPropControllerDescriptors(this.runtime.store.getState()),
-      elementTree,
-      translatedData
-    );
+    return mergeTranslatedContent(this.getElementDescriptors(), elementTree, translatedData);
   }
   async readPreviewToken(token) {
     const response = await fetch(new URL("v1/preview-tokens/reads", this.apiOrigin).toString(), {
@@ -665,7 +659,7 @@ Received "${apiKey}" instead.`
       headers: {
         "x-api-key": this.apiKey,
         "makeswift-site-api-key": this.apiKey,
-        "makeswift-runtime-version": "0.28.3-canary.3",
+        "makeswift-runtime-version": "0.28.3-canary.5",
         "content-type": "application/json"
       },
       body: JSON.stringify({ token }),
@@ -713,6 +707,9 @@ Received "${apiKey}" instead.`
     }
     return parsed.data;
   }
+  getElementDescriptors() {
+    return getPropControllerDescriptors(this.runtime.protoStore.getState());
+  }
 }
 export {
   MakeswiftClient,