@makeswift/runtime 0.28.7-canary.9 → 0.28.8-canary.0

package/dist/esm/api/api-resources-client.js

@@ -1,4 +1,5 @@
 import * as ApiClientState from "../state/api-client/state";
+import { fetchAPIResource } from "../state/api-client/fetch-api-resource";
 import {
   APIResourceType
 } from "./types";
@@ -17,6 +18,10 @@ class ApiResourcesClient {
     this.store = store;
     this.subscribe = this.store.subscribe;
   }
+  async fetchSwatch(swatchId) {
+    const fetch = (id, version) => this.fetchSwatchImpl(id, version);
+    return await this.store.dispatch(fetchAPIResource(APIResourceType.Swatch, swatchId, fetch));
+  }
   readSwatch(swatchId) {
     return ApiClientState.getAPIResource(this.store.getState(), APIResourceType.Swatch, swatchId);
   }
@@ -27,6 +32,10 @@ class ApiResourcesClient {
       fetch: (id) => this.fetchSwatch(id)
     });
   }
+  async fetchFile(fileId) {
+    const fetch = (id, version) => this.fetchFileImpl(id, version);
+    return await this.store.dispatch(fetchAPIResource(APIResourceType.File, fileId, fetch));
+  }
   readFile(fileId) {
     return ApiClientState.getAPIResource(this.store.getState(), APIResourceType.File, fileId);
   }
@@ -37,6 +46,12 @@ class ApiResourcesClient {
       fetch: (id) => this.fetchFile(id)
     });
   }
+  async fetchTypography(typographyId) {
+    const fetch = (id, version) => this.fetchTypographyImpl(id, version);
+    return await this.store.dispatch(
+      fetchAPIResource(APIResourceType.Typography, typographyId, fetch)
+    );
+  }
   readTypography(typographyId) {
     return ApiClientState.getAPIResource(
       this.store.getState(),
@@ -51,6 +66,12 @@ class ApiResourcesClient {
       fetch: (id) => this.fetchTypography(id)
     });
   }
+  async fetchGlobalElement(globalElementId) {
+    const fetch = (id, version) => this.fetchGlobalElementImpl(id, version);
+    return await this.store.dispatch(
+      fetchAPIResource(APIResourceType.GlobalElement, globalElementId, fetch)
+    );
+  }
   readGlobalElement(globalElementId) {
     return ApiClientState.getAPIResource(
       this.store.getState(),
@@ -58,6 +79,19 @@ class ApiResourcesClient {
       globalElementId
     );
   }
+  async fetchLocalizedGlobalElement({
+    globalElementId,
+    locale
+  }) {
+    const fetch = (id, version, locale2) => {
+      if (locale2 == null)
+        throw new Error("Locale is required to fetch LocalizedGlobalElement");
+      return this.fetchLocalizedGlobalElementImpl(id, version, locale2);
+    };
+    return await this.store.dispatch(
+      fetchAPIResource(APIResourceType.LocalizedGlobalElement, globalElementId, fetch, locale)
+    );
+  }
   readLocalizedGlobalElement({
     globalElementId,
     locale
@@ -69,6 +103,15 @@ class ApiResourcesClient {
       locale
     );
   }
+  async fetchPagePathnameSlice({
+    pageId,
+    locale
+  }) {
+    const fetch = (id, version, locale2) => this.fetchPagePathnameSliceImpl(id, version, locale2);
+    return await this.store.dispatch(
+      fetchAPIResource(APIResourceType.PagePathnameSlice, pageId, fetch, locale)
+    );
+  }
   readPagePathnameSlice({
     pageId,
     locale
@@ -107,6 +150,10 @@ class ApiResourcesClient {
       fetch: async () => id != null ? fetch(id) : null
     };
   }
+  async fetchTable(tableId) {
+    const fetch = (id, version) => this.fetchTableImpl(id, version);
+    return await this.store.dispatch(fetchAPIResource(APIResourceType.Table, tableId, fetch));
+  }
   readTable(tableId) {
     return ApiClientState.getAPIResource(this.store.getState(), APIResourceType.Table, tableId);
   }

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/api/api-resources-client.ts"],"sourcesContent":["import { type FetchableValue } from '@makeswift/controls'\n\nimport { type Store as ApiClientStore } from '../state/api-client/store'\nimport * as ApiClientState from '../state/api-client/state'\n\nimport {\n  type File,\n  type GlobalElement,\n  type LocalizedGlobalElement,\n  type Page,\n  type PagePathnameSlice,\n  type Site,\n  type Snippet,\n  type Swatch,\n  type Table,\n  type Typography,\n  APIResourceType,\n} from './types'\n\nexport type CacheData = ApiClientState.SerializedState\n\nexport const CacheData = {\n  empty(): CacheData {\n    return {\n      apiResources: {},\n      localizedResourcesMap: {},\n    }\n  },\n}\n\nexport abstract class ApiResourcesClient {\n  readonly store: ApiClientStore\n  readonly subscribe: ApiClientStore['subscribe']\n\n  constructor({ store }: { store: ApiClientStore }) {\n    this.store = store\n    this.subscribe = this.store.subscribe\n  }\n\n  abstract fetchSwatch(swatchId: string): Promise<Swatch | null>\n\n  readSwatch(swatchId: string): Swatch | null {\n    return ApiClientState.getAPIResource(this.store.getState(), APIResourceType.Swatch, swatchId)\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  abstract fetchFile(fileId: string): Promise<File | null>\n\n  readFile(fileId: string): File | null {\n    return ApiClientState.getAPIResource(this.store.getState(), APIResourceType.File, fileId)\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  abstract fetchTypography(typographyId: string): Promise<Typography | null>\n\n  readTypography(typographyId: string): Typography | null {\n    return ApiClientState.getAPIResource(\n      this.store.getState(),\n      APIResourceType.Typography,\n      typographyId,\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  abstract fetchGlobalElement(globalElementId: string): Promise<GlobalElement | null>\n\n  readGlobalElement(globalElementId: string): GlobalElement | null {\n    return ApiClientState.getAPIResource(\n      this.store.getState(),\n      APIResourceType.GlobalElement,\n      globalElementId,\n    )\n  }\n\n  abstract fetchLocalizedGlobalElement({\n    globalElementId,\n    locale,\n  }: {\n    globalElementId: string\n    locale: string\n  }): Promise<LocalizedGlobalElement | null>\n\n  readLocalizedGlobalElement({\n    globalElementId,\n    locale,\n  }: {\n    globalElementId: string\n    locale: string\n  }): LocalizedGlobalElement | null {\n    return ApiClientState.getAPIResource(\n      this.store.getState(),\n      APIResourceType.LocalizedGlobalElement,\n      globalElementId,\n      locale,\n    )\n  }\n\n  readPagePathnameSlice({\n    pageId,\n    locale,\n  }: {\n    pageId: string\n    locale: string | null\n  }): PagePathnameSlice | null {\n    return ApiClientState.getAPIResource(\n      this.store.getState(),\n      APIResourceType.PagePathnameSlice,\n      pageId,\n      locale,\n    )\n  }\n\n  abstract fetchPagePathnameSlice({\n    pageId,\n    locale,\n  }: {\n    pageId: string\n    locale: string | null\n  }): Promise<PagePathnameSlice | null>\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  abstract fetchTable(tableId: string): Promise<Table | null>\n\n  readTable(tableId: string): Table | null {\n    return ApiClientState.getAPIResource(this.store.getState(), APIResourceType.Table, tableId)\n  }\n\n  readSite(siteId: string): Site | null {\n    return ApiClientState.getAPIResource(this.store.getState(), APIResourceType.Site, siteId)\n  }\n\n  readPage(pageId: string): Page | null {\n    return ApiClientState.getAPIResource(this.store.getState(), APIResourceType.Page, pageId)\n  }\n\n  readSnippet(snippetId: string): Snippet | null {\n    return ApiClientState.getAPIResource(this.store.getState(), APIResourceType.Snippet, snippetId)\n  }\n}\n"],"mappings":"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","names":[]}
+{"version":3,"sources":["../../../src/api/api-resources-client.ts"],"sourcesContent":["import { type FetchableValue } from '@makeswift/controls'\n\nimport { type Store as ApiClientStore } from '../state/api-client/store'\nimport * as ApiClientState from '../state/api-client/state'\nimport { fetchAPIResource } from '../state/api-client/fetch-api-resource'\n\nimport {\n  type File,\n  type GlobalElement,\n  type LocalizedGlobalElement,\n  type Page,\n  type PagePathnameSlice,\n  type Site,\n  type Snippet,\n  type Swatch,\n  type Table,\n  type Typography,\n  APIResourceType,\n} from './types'\n\nimport { type SiteVersion } from './site-version'\n\nexport type CacheData = ApiClientState.SerializedState\n\nexport const CacheData = {\n  empty(): CacheData {\n    return {\n      apiResources: {},\n      localizedResourcesMap: {},\n    }\n  },\n}\n\nexport abstract class ApiResourcesClient {\n  readonly store: ApiClientStore\n  readonly subscribe: ApiClientStore['subscribe']\n\n  constructor({ store }: { store: ApiClientStore }) {\n    this.store = store\n    this.subscribe = this.store.subscribe\n  }\n\n  async fetchSwatch(swatchId: string): Promise<Swatch | null> {\n    const fetch = (id: string, version: SiteVersion | null) => this.fetchSwatchImpl(id, version)\n\n    return await this.store.dispatch(fetchAPIResource(APIResourceType.Swatch, swatchId, fetch))\n  }\n\n  readSwatch(swatchId: string): Swatch | null {\n    return ApiClientState.getAPIResource(this.store.getState(), APIResourceType.Swatch, swatchId)\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  async fetchFile(fileId: string): Promise<File | null> {\n    const fetch = (id: string, version: SiteVersion | null) => this.fetchFileImpl(id, version)\n\n    return await this.store.dispatch(fetchAPIResource(APIResourceType.File, fileId, fetch))\n  }\n\n  readFile(fileId: string): File | null {\n    return ApiClientState.getAPIResource(this.store.getState(), APIResourceType.File, fileId)\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  async fetchTypography(typographyId: string): Promise<Typography | null> {\n    const fetch = (id: string, version: SiteVersion | null) => this.fetchTypographyImpl(id, version)\n\n    return await this.store.dispatch(\n      fetchAPIResource(APIResourceType.Typography, typographyId, fetch),\n    )\n  }\n\n  readTypography(typographyId: string): Typography | null {\n    return ApiClientState.getAPIResource(\n      this.store.getState(),\n      APIResourceType.Typography,\n      typographyId,\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  async fetchGlobalElement(globalElementId: string): Promise<GlobalElement | null> {\n    const fetch = (id: string, version: SiteVersion | null) =>\n      this.fetchGlobalElementImpl(id, version)\n\n    return await this.store.dispatch(\n      fetchAPIResource(APIResourceType.GlobalElement, globalElementId, fetch),\n    )\n  }\n\n  readGlobalElement(globalElementId: string): GlobalElement | null {\n    return ApiClientState.getAPIResource(\n      this.store.getState(),\n      APIResourceType.GlobalElement,\n      globalElementId,\n    )\n  }\n\n  async fetchLocalizedGlobalElement({\n    globalElementId,\n    locale,\n  }: {\n    globalElementId: string\n    locale: string\n  }): Promise<LocalizedGlobalElement | null> {\n    const fetch = (id: string, version: SiteVersion | null, locale: string | null | undefined) => {\n      if (locale == null) throw new Error('Locale is required to fetch LocalizedGlobalElement')\n      return this.fetchLocalizedGlobalElementImpl(id, version, locale)\n    }\n\n    return await this.store.dispatch(\n      fetchAPIResource(APIResourceType.LocalizedGlobalElement, globalElementId, fetch, locale),\n    )\n  }\n\n  readLocalizedGlobalElement({\n    globalElementId,\n    locale,\n  }: {\n    globalElementId: string\n    locale: string\n  }): LocalizedGlobalElement | null {\n    return ApiClientState.getAPIResource(\n      this.store.getState(),\n      APIResourceType.LocalizedGlobalElement,\n      globalElementId,\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    const fetch = (id: string, version: SiteVersion | null, locale: string | null | undefined) =>\n      this.fetchPagePathnameSliceImpl(id, version, locale)\n\n    return await this.store.dispatch(\n      fetchAPIResource(APIResourceType.PagePathnameSlice, pageId, fetch, locale),\n    )\n  }\n\n  readPagePathnameSlice({\n    pageId,\n    locale,\n  }: {\n    pageId: string\n    locale: string | null\n  }): PagePathnameSlice | null {\n    return ApiClientState.getAPIResource(\n      this.store.getState(),\n      APIResourceType.PagePathnameSlice,\n      pageId,\n      locale,\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  async fetchTable(tableId: string): Promise<Table | null> {\n    const fetch = (id: string, version: SiteVersion | null) => this.fetchTableImpl(id, version)\n\n    return await this.store.dispatch(fetchAPIResource(APIResourceType.Table, tableId, fetch))\n  }\n\n  readTable(tableId: string): Table | null {\n    return ApiClientState.getAPIResource(this.store.getState(), APIResourceType.Table, tableId)\n  }\n\n  readSite(siteId: string): Site | null {\n    return ApiClientState.getAPIResource(this.store.getState(), APIResourceType.Site, siteId)\n  }\n\n  readPage(pageId: string): Page | null {\n    return ApiClientState.getAPIResource(this.store.getState(), APIResourceType.Page, pageId)\n  }\n\n  readSnippet(snippetId: string): Snippet | null {\n    return ApiClientState.getAPIResource(this.store.getState(), APIResourceType.Snippet, snippetId)\n  }\n\n  protected abstract fetchSwatchImpl(\n    id: string,\n    version: SiteVersion | null,\n  ): Promise<Swatch | null>\n\n  protected abstract fetchFileImpl(id: string, version: SiteVersion | null): Promise<File | null>\n  protected abstract fetchTypographyImpl(\n    id: string,\n    version: SiteVersion | null,\n  ): Promise<Typography | null>\n\n  protected abstract fetchGlobalElementImpl(\n    id: string,\n    version: SiteVersion | null,\n  ): Promise<GlobalElement | null>\n\n  protected abstract fetchLocalizedGlobalElementImpl(\n    id: string,\n    version: SiteVersion | null,\n    locale: string,\n  ): Promise<LocalizedGlobalElement | null>\n\n  protected abstract fetchPagePathnameSliceImpl(\n    id: string,\n    version: SiteVersion | null,\n    locale: string | null | undefined,\n  ): Promise<PagePathnameSlice | null>\n\n  protected abstract fetchTableImpl(id: string, version: SiteVersion | null): Promise<Table | null>\n}\n"],"mappings":"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","names":["locale"]}

package/dist/esm/api/graphql-api-client.js

@@ -9,7 +9,7 @@ class MakeswiftGraphQLApiClient {
   graphqlClient;
   constructor({ endpoint }) {
     this.graphqlClient = new GraphQLClient(endpoint, {
-      "makeswift-runtime-version": "0.28.7-canary.9"
+      "makeswift-runtime-version": "0.28.8-canary.0"
     });
   }
   async createTableRecord(tableId, columns) {

package/dist/esm/api/host-api-resources-client.js

@@ -1,10 +1,6 @@
-import { fetchAPIResource } from "../state/api-client/fetch-api-resource";
 import { configureClientStore } from "../state/api-client/client-store";
-import {
-  APIResourceType
-} from "./types";
+import { ApiHandlerHeaders, serializeSiteVersion } from "./site-version";
 import { ApiResourcesClient } from "./api-resources-client";
-import { CacheData } from "./api-resources-client";
 class HostApiResourcesClient extends ApiResourcesClient {
   fetch;
   constructor({
@@ -16,44 +12,53 @@ class HostApiResourcesClient extends ApiResourcesClient {
     });
     this.fetch = fetch;
   }
-  async fetchSwatch(swatchId) {
-    return await this.store.dispatch(fetchAPIResource(APIResourceType.Swatch, swatchId, this.fetch));
+  async fetchSwatchImpl(id, version) {
+    return await this.fetchVersioned(`/api/makeswift/swatches/${id}`, version);
   }
-  async fetchFile(fileId) {
-    return await this.store.dispatch(fetchAPIResource(APIResourceType.File, fileId, this.fetch));
+  async fetchFileImpl(id, version) {
+    return await this.fetchVersioned(`/api/makeswift/files/${id}`, version);
   }
-  async fetchTypography(typographyId) {
-    return await this.store.dispatch(
-      fetchAPIResource(APIResourceType.Typography, typographyId, this.fetch)
-    );
+  async fetchTypographyImpl(id, version) {
+    return await this.fetchVersioned(`/api/makeswift/typographies/${id}`, version);
   }
-  async fetchGlobalElement(globalElementId) {
-    return await this.store.dispatch(
-      fetchAPIResource(APIResourceType.GlobalElement, globalElementId, this.fetch)
-    );
+  async fetchGlobalElementImpl(id, version) {
+    return await this.fetchVersioned(`/api/makeswift/global-elements/${id}`, version);
   }
-  async fetchLocalizedGlobalElement({
-    globalElementId,
-    locale
-  }) {
-    return await this.store.dispatch(
-      fetchAPIResource(APIResourceType.LocalizedGlobalElement, globalElementId, this.fetch, locale)
+  async fetchLocalizedGlobalElementImpl(id, version, locale) {
+    return await this.fetchVersioned(
+      `/api/makeswift/localized-global-elements/${id}/${locale}`,
+      version
     );
   }
-  async fetchPagePathnameSlice({
-    pageId,
-    locale
-  }) {
-    return await this.store.dispatch(
-      fetchAPIResource(APIResourceType.PagePathnameSlice, pageId, this.fetch, locale)
-    );
+  async fetchPagePathnameSliceImpl(id, version, locale) {
+    const url = new URL(`/api/makeswift/page-pathname-slices/${id}`, "http://n");
+    if (locale != null)
+      url.searchParams.set("locale", locale);
+    return await this.fetchVersioned(url.pathname + url.search, version);
+  }
+  async fetchTableImpl(id, version) {
+    return await this.fetchVersioned(`/api/makeswift/tables/${id}`, version);
   }
-  async fetchTable(tableId) {
-    return await this.store.dispatch(fetchAPIResource(APIResourceType.Table, tableId, this.fetch));
+  async fetchVersioned(url, version) {
+    const response = await this.fetch(url, {
+      headers: {
+        "Content-Type": "application/json",
+        ...version != null ? { [ApiHandlerHeaders.SiteVersion]: serializeSiteVersion(version) } : {}
+      }
+    });
+    if (response.status === 404)
+      return null;
+    if (!response.ok)
+      throw new Error(response.statusText);
+    if (response.headers.get("content-type")?.includes("application/json") !== true) {
+      throw new Error(
+        `Expected JSON response from "${url}" but got "${response.headers.get("content-type")}"`
+      );
+    }
+    return response.json();
   }
 }
 export {
-  CacheData,
   HostApiResourcesClient
 };
 //# sourceMappingURL=host-api-resources-client.js.map

package/dist/esm/api/host-api-resources-client.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/api/host-api-resources-client.ts"],"sourcesContent":["import { type State as ApiClientState } from '../state/api-client/state'\nimport { fetchAPIResource } from '../state/api-client/fetch-api-resource'\nimport { configureClientStore } from '../state/api-client/client-store'\n\nimport {\n  type File,\n  type GlobalElement,\n  type LocalizedGlobalElement,\n  type PagePathnameSlice,\n  type Swatch,\n  type Table,\n  type Typography,\n  type HttpFetch,\n  APIResourceType,\n} from './types'\n\nimport { ApiResourcesClient } from './api-resources-client'\n\nexport { CacheData } from './api-resources-client'\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 HostApiResourcesClient extends ApiResourcesClient {\n  readonly fetch: HttpFetch\n\n  constructor({\n    fetch,\n    preloadedState,\n  }: {\n    fetch: HttpFetch\n    preloadedState: Partial<ApiClientState>\n  }) {\n    super({\n      store: configureClientStore({ preloadedState }),\n    })\n\n    this.fetch = fetch\n  }\n\n  async fetchSwatch(swatchId: string): Promise<Swatch | null> {\n    return await this.store.dispatch(fetchAPIResource(APIResourceType.Swatch, swatchId, this.fetch))\n  }\n\n  async fetchFile(fileId: string): Promise<File | null> {\n    return await this.store.dispatch(fetchAPIResource(APIResourceType.File, fileId, this.fetch))\n  }\n\n  async fetchTypography(typographyId: string): Promise<Typography | null> {\n    return await this.store.dispatch(\n      fetchAPIResource(APIResourceType.Typography, typographyId, this.fetch),\n    )\n  }\n\n  async fetchGlobalElement(globalElementId: string): Promise<GlobalElement | null> {\n    return await this.store.dispatch(\n      fetchAPIResource(APIResourceType.GlobalElement, globalElementId, this.fetch),\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.store.dispatch(\n      fetchAPIResource(APIResourceType.LocalizedGlobalElement, globalElementId, this.fetch, 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.store.dispatch(\n      fetchAPIResource(APIResourceType.PagePathnameSlice, pageId, this.fetch, locale),\n    )\n  }\n\n  async fetchTable(tableId: string): Promise<Table | null> {\n    return await this.store.dispatch(fetchAPIResource(APIResourceType.Table, tableId, this.fetch))\n  }\n}\n"],"mappings":"AACA,SAAS,wBAAwB;AACjC,SAAS,4BAA4B;AAErC;AAAA,EASE;AAAA,OACK;AAEP,SAAS,0BAA0B;AAEnC,SAAS,iBAAiB;AAqBnB,MAAM,+BAA+B,mBAAmB;AAAA,EACpD;AAAA,EAET,YAAY;AAAA,IACV;AAAA,IACA;AAAA,EACF,GAGG;AACD,UAAM;AAAA,MACJ,OAAO,qBAAqB,EAAE,eAAe,CAAC;AAAA,IAChD,CAAC;AAED,SAAK,QAAQ;AAAA,EACf;AAAA,EAEA,MAAM,YAAY,UAA0C;AAC1D,WAAO,MAAM,KAAK,MAAM,SAAS,iBAAiB,gBAAgB,QAAQ,UAAU,KAAK,KAAK,CAAC;AAAA,EACjG;AAAA,EAEA,MAAM,UAAU,QAAsC;AACpD,WAAO,MAAM,KAAK,MAAM,SAAS,iBAAiB,gBAAgB,MAAM,QAAQ,KAAK,KAAK,CAAC;AAAA,EAC7F;AAAA,EAEA,MAAM,gBAAgB,cAAkD;AACtE,WAAO,MAAM,KAAK,MAAM;AAAA,MACtB,iBAAiB,gBAAgB,YAAY,cAAc,KAAK,KAAK;AAAA,IACvE;AAAA,EACF;AAAA,EAEA,MAAM,mBAAmB,iBAAwD;AAC/E,WAAO,MAAM,KAAK,MAAM;AAAA,MACtB,iBAAiB,gBAAgB,eAAe,iBAAiB,KAAK,KAAK;AAAA,IAC7E;AAAA,EACF;AAAA,EAEA,MAAM,4BAA4B;AAAA,IAChC;AAAA,IACA;AAAA,EACF,GAG2C;AACzC,WAAO,MAAM,KAAK,MAAM;AAAA,MACtB,iBAAiB,gBAAgB,wBAAwB,iBAAiB,KAAK,OAAO,MAAM;AAAA,IAC9F;AAAA,EACF;AAAA,EAEA,MAAM,uBAAuB;AAAA,IAC3B;AAAA,IACA;AAAA,EACF,GAGsC;AACpC,WAAO,MAAM,KAAK,MAAM;AAAA,MACtB,iBAAiB,gBAAgB,mBAAmB,QAAQ,KAAK,OAAO,MAAM;AAAA,IAChF;AAAA,EACF;AAAA,EAEA,MAAM,WAAW,SAAwC;AACvD,WAAO,MAAM,KAAK,MAAM,SAAS,iBAAiB,gBAAgB,OAAO,SAAS,KAAK,KAAK,CAAC;AAAA,EAC/F;AACF;","names":[]}
+{"version":3,"sources":["../../../src/api/host-api-resources-client.ts"],"sourcesContent":["import { type State as ApiClientState } from '../state/api-client/state'\n\nimport { configureClientStore } from '../state/api-client/client-store'\n\nimport {\n  type File,\n  type GlobalElement,\n  type LocalizedGlobalElement,\n  type PagePathnameSlice,\n  type Swatch,\n  type Table,\n  type Typography,\n  type HttpFetch,\n} from './types'\n\nimport { type SiteVersion, ApiHandlerHeaders, serializeSiteVersion } from './site-version'\nimport { ApiResourcesClient } from './api-resources-client'\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 HostApiResourcesClient extends ApiResourcesClient {\n  readonly fetch: HttpFetch\n\n  constructor({\n    fetch,\n    preloadedState,\n  }: {\n    fetch: HttpFetch\n    preloadedState: Partial<ApiClientState>\n  }) {\n    super({\n      store: configureClientStore({ preloadedState }),\n    })\n\n    this.fetch = fetch\n  }\n\n  protected async fetchSwatchImpl(id: string, version: SiteVersion | null): Promise<Swatch | null> {\n    return await this.fetchVersioned<Swatch>(`/api/makeswift/swatches/${id}`, version)\n  }\n\n  protected async fetchFileImpl(id: string, version: SiteVersion | null): Promise<File | null> {\n    return await this.fetchVersioned<File>(`/api/makeswift/files/${id}`, version)\n  }\n\n  protected async fetchTypographyImpl(\n    id: string,\n    version: SiteVersion | null,\n  ): Promise<Typography | null> {\n    return await this.fetchVersioned<Typography>(`/api/makeswift/typographies/${id}`, version)\n  }\n\n  protected async fetchGlobalElementImpl(\n    id: string,\n    version: SiteVersion | null,\n  ): Promise<GlobalElement | null> {\n    return await this.fetchVersioned<GlobalElement>(`/api/makeswift/global-elements/${id}`, version)\n  }\n\n  protected async fetchLocalizedGlobalElementImpl(\n    id: string,\n    version: SiteVersion | null,\n    locale: string,\n  ): Promise<LocalizedGlobalElement | null> {\n    return await this.fetchVersioned<LocalizedGlobalElement>(\n      `/api/makeswift/localized-global-elements/${id}/${locale}`,\n      version,\n    )\n  }\n\n  protected async fetchPagePathnameSliceImpl(\n    id: string,\n    version: SiteVersion | null,\n    locale: string | null | undefined,\n  ): Promise<PagePathnameSlice | null> {\n    const url = new URL(`/api/makeswift/page-pathname-slices/${id}`, 'http://n')\n\n    if (locale != null) url.searchParams.set('locale', locale)\n\n    return await this.fetchVersioned<PagePathnameSlice>(url.pathname + url.search, version)\n  }\n\n  protected async fetchTableImpl(id: string, version: SiteVersion | null): Promise<Table | null> {\n    return await this.fetchVersioned<Table>(`/api/makeswift/tables/${id}`, version)\n  }\n\n  private async fetchVersioned<T>(url: string, version: SiteVersion | null): Promise<T | null> {\n    const response = await this.fetch(url, {\n      headers: {\n        'Content-Type': 'application/json',\n        ...(version != null\n          ? { [ApiHandlerHeaders.SiteVersion]: serializeSiteVersion(version) }\n          : {}),\n      },\n    })\n\n    if (response.status === 404) return null\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}\n"],"mappings":"AAEA,SAAS,4BAA4B;AAarC,SAA2B,mBAAmB,4BAA4B;AAC1E,SAAS,0BAA0B;AAqB5B,MAAM,+BAA+B,mBAAmB;AAAA,EACpD;AAAA,EAET,YAAY;AAAA,IACV;AAAA,IACA;AAAA,EACF,GAGG;AACD,UAAM;AAAA,MACJ,OAAO,qBAAqB,EAAE,eAAe,CAAC;AAAA,IAChD,CAAC;AAED,SAAK,QAAQ;AAAA,EACf;AAAA,EAEA,MAAgB,gBAAgB,IAAY,SAAqD;AAC/F,WAAO,MAAM,KAAK,eAAuB,2BAA2B,EAAE,IAAI,OAAO;AAAA,EACnF;AAAA,EAEA,MAAgB,cAAc,IAAY,SAAmD;AAC3F,WAAO,MAAM,KAAK,eAAqB,wBAAwB,EAAE,IAAI,OAAO;AAAA,EAC9E;AAAA,EAEA,MAAgB,oBACd,IACA,SAC4B;AAC5B,WAAO,MAAM,KAAK,eAA2B,+BAA+B,EAAE,IAAI,OAAO;AAAA,EAC3F;AAAA,EAEA,MAAgB,uBACd,IACA,SAC+B;AAC/B,WAAO,MAAM,KAAK,eAA8B,kCAAkC,EAAE,IAAI,OAAO;AAAA,EACjG;AAAA,EAEA,MAAgB,gCACd,IACA,SACA,QACwC;AACxC,WAAO,MAAM,KAAK;AAAA,MAChB,4CAA4C,EAAE,IAAI,MAAM;AAAA,MACxD;AAAA,IACF;AAAA,EACF;AAAA,EAEA,MAAgB,2BACd,IACA,SACA,QACmC;AACnC,UAAM,MAAM,IAAI,IAAI,uCAAuC,EAAE,IAAI,UAAU;AAE3E,QAAI,UAAU;AAAM,UAAI,aAAa,IAAI,UAAU,MAAM;AAEzD,WAAO,MAAM,KAAK,eAAkC,IAAI,WAAW,IAAI,QAAQ,OAAO;AAAA,EACxF;AAAA,EAEA,MAAgB,eAAe,IAAY,SAAoD;AAC7F,WAAO,MAAM,KAAK,eAAsB,yBAAyB,EAAE,IAAI,OAAO;AAAA,EAChF;AAAA,EAEA,MAAc,eAAkB,KAAa,SAAgD;AAC3F,UAAM,WAAW,MAAM,KAAK,MAAM,KAAK;AAAA,MACrC,SAAS;AAAA,QACP,gBAAgB;AAAA,QAChB,GAAI,WAAW,OACX,EAAE,CAAC,kBAAkB,WAAW,GAAG,qBAAqB,OAAO,EAAE,IACjE,CAAC;AAAA,MACP;AAAA,IACF,CAAC;AAED,QAAI,SAAS,WAAW;AAAK,aAAO;AACpC,QAAI,CAAC,SAAS;AAAI,YAAM,IAAI,MAAM,SAAS,UAAU;AAErD,QAAI,SAAS,QAAQ,IAAI,cAAc,GAAG,SAAS,kBAAkB,MAAM,MAAM;AAC/E,YAAM,IAAI;AAAA,QACR,gCAAgC,GAAG,cAAc,SAAS,QAAQ,IAAI,cAAc,CAAC;AAAA,MACvF;AAAA,IACF;AAEA,WAAO,SAAS,KAAK;AAAA,EACvB;AACF;","names":[]}

package/dist/esm/api/makeswift-api-resources-client.js

@@ -0,0 +1,46 @@
+import { configureClientStore } from "../state/api-client/client-store";
+import { ApiResourcesClient } from "./api-resources-client";
+import { MakeswiftGraphQLApiClient } from "./graphql-api-client";
+import { MakeswiftRestAPIClient } from "./rest-api-client";
+class MakeswiftApiResourcesClient extends ApiResourcesClient {
+  restApiClient;
+  graphQlClient;
+  constructor({
+    fetch,
+    apiKey,
+    apiOrigin,
+    graphqlApiEndpoint,
+    preloadedState
+  }) {
+    super({
+      store: configureClientStore({ preloadedState })
+    });
+    this.restApiClient = new MakeswiftRestAPIClient({ fetch, apiKey, apiOrigin });
+    this.graphQlClient = new MakeswiftGraphQLApiClient({ endpoint: graphqlApiEndpoint });
+  }
+  async fetchSwatchImpl(id, version) {
+    return this.restApiClient.getSwatch(id, version);
+  }
+  async fetchFileImpl(id, _version) {
+    return this.graphQlClient.getFile(id);
+  }
+  async fetchTypographyImpl(id, version) {
+    return this.restApiClient.getTypography(id, version);
+  }
+  async fetchGlobalElementImpl(id, version) {
+    return this.restApiClient.getGlobalElement(id, version);
+  }
+  async fetchLocalizedGlobalElementImpl(id, version, locale) {
+    return this.restApiClient.getLocalizedGlobalElement(id, locale, version);
+  }
+  async fetchPagePathnameSliceImpl(id, version, locale) {
+    return this.restApiClient.getPagePathnameSlice(id, version, { locale });
+  }
+  async fetchTableImpl(id, _version) {
+    return this.graphQlClient.getTable(id);
+  }
+}
+export {
+  MakeswiftApiResourcesClient
+};
+//# sourceMappingURL=makeswift-api-resources-client.js.map

package/dist/esm/api/makeswift-api-resources-client.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/api/makeswift-api-resources-client.ts"],"sourcesContent":["import { type State as ApiClientState } from '../state/api-client/state'\nimport { configureClientStore } from '../state/api-client/client-store'\n\nimport {\n  type File,\n  type GlobalElement,\n  type LocalizedGlobalElement,\n  type PagePathnameSlice,\n  type Swatch,\n  type Table,\n  type Typography,\n  type HttpFetch,\n} from './types'\n\nimport { ApiResourcesClient } from './api-resources-client'\nimport { MakeswiftGraphQLApiClient } from './graphql-api-client'\nimport { MakeswiftRestAPIClient } from './rest-api-client'\nimport { type SiteVersion } from './site-version'\n\n/**\n * Server-side implementation that makes direct authenticated requests to the Makeswift API.\n * Requires an API key.\n *\n * For client-side usage, see `HostApiResourcesClient`, which goes through the host via\n * `/api/makeswift/...` endpoints.\n */\nexport class MakeswiftApiResourcesClient extends ApiResourcesClient {\n  private restApiClient: MakeswiftRestAPIClient\n  private graphQlClient: MakeswiftGraphQLApiClient\n\n  constructor({\n    fetch,\n    apiKey,\n    apiOrigin,\n    graphqlApiEndpoint,\n    preloadedState,\n  }: {\n    fetch: HttpFetch\n    apiKey: string\n    apiOrigin: string\n    graphqlApiEndpoint: string\n    preloadedState: Partial<ApiClientState>\n  }) {\n    super({\n      store: configureClientStore({ preloadedState }),\n    })\n\n    this.restApiClient = new MakeswiftRestAPIClient({ fetch, apiKey, apiOrigin })\n    this.graphQlClient = new MakeswiftGraphQLApiClient({ endpoint: graphqlApiEndpoint })\n  }\n\n  protected async fetchSwatchImpl(id: string, version: SiteVersion | null): Promise<Swatch | null> {\n    return this.restApiClient.getSwatch(id, version)\n  }\n\n  protected async fetchFileImpl(id: string, _version: SiteVersion | null): Promise<File | null> {\n    // files are unversioned\n    return this.graphQlClient.getFile(id)\n  }\n\n  protected async fetchTypographyImpl(\n    id: string,\n    version: SiteVersion | null,\n  ): Promise<Typography | null> {\n    return this.restApiClient.getTypography(id, version)\n  }\n\n  protected async fetchGlobalElementImpl(\n    id: string,\n    version: SiteVersion | null,\n  ): Promise<GlobalElement | null> {\n    return this.restApiClient.getGlobalElement(id, version)\n  }\n\n  protected async fetchLocalizedGlobalElementImpl(\n    id: string,\n    version: SiteVersion | null,\n    locale: string,\n  ): Promise<LocalizedGlobalElement | null> {\n    return this.restApiClient.getLocalizedGlobalElement(id, locale, version)\n  }\n\n  protected async fetchPagePathnameSliceImpl(\n    id: string,\n    version: SiteVersion | null,\n    locale: string | null | undefined,\n  ): Promise<PagePathnameSlice | null> {\n    return this.restApiClient.getPagePathnameSlice(id, version, { locale })\n  }\n\n  protected async fetchTableImpl(id: string, _version: SiteVersion | null): Promise<Table | null> {\n    // tables are unversioned\n    return this.graphQlClient.getTable(id)\n  }\n}\n"],"mappings":"AACA,SAAS,4BAA4B;AAarC,SAAS,0BAA0B;AACnC,SAAS,iCAAiC;AAC1C,SAAS,8BAA8B;AAUhC,MAAM,oCAAoC,mBAAmB;AAAA,EAC1D;AAAA,EACA;AAAA,EAER,YAAY;AAAA,IACV;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF,GAMG;AACD,UAAM;AAAA,MACJ,OAAO,qBAAqB,EAAE,eAAe,CAAC;AAAA,IAChD,CAAC;AAED,SAAK,gBAAgB,IAAI,uBAAuB,EAAE,OAAO,QAAQ,UAAU,CAAC;AAC5E,SAAK,gBAAgB,IAAI,0BAA0B,EAAE,UAAU,mBAAmB,CAAC;AAAA,EACrF;AAAA,EAEA,MAAgB,gBAAgB,IAAY,SAAqD;AAC/F,WAAO,KAAK,cAAc,UAAU,IAAI,OAAO;AAAA,EACjD;AAAA,EAEA,MAAgB,cAAc,IAAY,UAAoD;AAE5F,WAAO,KAAK,cAAc,QAAQ,EAAE;AAAA,EACtC;AAAA,EAEA,MAAgB,oBACd,IACA,SAC4B;AAC5B,WAAO,KAAK,cAAc,cAAc,IAAI,OAAO;AAAA,EACrD;AAAA,EAEA,MAAgB,uBACd,IACA,SAC+B;AAC/B,WAAO,KAAK,cAAc,iBAAiB,IAAI,OAAO;AAAA,EACxD;AAAA,EAEA,MAAgB,gCACd,IACA,SACA,QACwC;AACxC,WAAO,KAAK,cAAc,0BAA0B,IAAI,QAAQ,OAAO;AAAA,EACzE;AAAA,EAEA,MAAgB,2BACd,IACA,SACA,QACmC;AACnC,WAAO,KAAK,cAAc,qBAAqB,IAAI,SAAS,EAAE,OAAO,CAAC;AAAA,EACxE;AAAA,EAEA,MAAgB,eAAe,IAAY,UAAqD;AAE9F,WAAO,KAAK,cAAc,SAAS,EAAE;AAAA,EACvC;AACF;","names":[]}

package/dist/esm/api/rest-api-client.js

@@ -113,7 +113,7 @@ class MakeswiftRestAPIClient {
     const requestHeaders = new Headers({
       "x-api-key": this.apiKey,
       "makeswift-site-api-key": this.apiKey,
-      "makeswift-runtime-version": "0.28.7-canary.9"
+      "makeswift-runtime-version": "0.28.8-canary.0"
     });
     if (siteVersion?.token) {
       requestUrl.searchParams.set("version", siteVersion.version);

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/api/rest-api-client.ts"],"sourcesContent":["import {\n  type GlobalElement,\n  type LocalizedGlobalElement,\n  type PagePathnameSlice,\n  type Swatch,\n  type Typography,\n  type HttpFetch,\n} from './types'\n\nimport { type SiteVersion } from './site-version'\nimport * as Schema from './schema'\n\nexport class MakeswiftRestAPIClient {\n  private _fetch: HttpFetch\n\n  readonly apiKey: string\n  readonly apiOrigin: string\n\n  constructor({\n    fetch,\n    apiKey,\n    apiOrigin,\n  }: {\n    fetch: HttpFetch\n    apiKey: string\n    apiOrigin: string\n  }) {\n    this._fetch = fetch\n    this.apiKey = apiKey\n    this.apiOrigin = apiOrigin\n  }\n\n  async getSwatch(swatchId: string, siteVersion: SiteVersion | null): Promise<Swatch | null> {\n    const response = await this.fetch(`v3/swatches/${swatchId}`, siteVersion)\n\n    if (!response.ok) {\n      const failedBody = await failedResponseBody(response)\n      if (response.status !== 404) {\n        console.error(`Failed to get swatch '${swatchId}'`, {\n          response: failedBody,\n          siteVersion,\n        })\n      }\n\n      return null\n    }\n\n    const swatch = await response.json()\n\n    return swatch\n  }\n\n  async getTypography(\n    typographyId: string,\n    siteVersion: SiteVersion | null,\n  ): Promise<Typography | null> {\n    const response = await this.fetch(`v3/typographies/${typographyId}`, siteVersion)\n\n    if (!response.ok) {\n      const failedBody = await failedResponseBody(response)\n      if (response.status !== 404) {\n        console.error(`Failed to get typography '${typographyId}'`, {\n          response: failedBody,\n          siteVersion,\n        })\n      }\n\n      return null\n    }\n\n    const typography = await response.json()\n\n    return typography\n  }\n\n  async getGlobalElement(\n    globalElementId: string,\n    siteVersion: SiteVersion | null,\n  ): Promise<GlobalElement | null> {\n    const response = await this.fetch(`v3/global-elements/${globalElementId}`, siteVersion)\n\n    if (!response.ok) {\n      const failedBody = await failedResponseBody(response)\n      if (response.status !== 404) {\n        console.error(`Failed to get global element '${globalElementId}'`, {\n          response: failedBody,\n          siteVersion,\n        })\n      }\n\n      return null\n    }\n\n    const globalElement = await response.json()\n\n    return globalElement\n  }\n\n  async getLocalizedGlobalElement(\n    globalElementId: string,\n    locale: string,\n    siteVersion: SiteVersion | null,\n  ): Promise<LocalizedGlobalElement | null> {\n    const response = await this.fetch(\n      `v3/localized-global-elements/${globalElementId}?locale=${locale}`,\n      siteVersion,\n    )\n\n    if (!response.ok) {\n      const failedBody = await failedResponseBody(response)\n      if (response.status !== 404) {\n        console.error(`Failed to get localized global element '${globalElementId}'`, {\n          response: failedBody,\n          siteVersion,\n          locale,\n        })\n      }\n\n      return null\n    }\n\n    const localizedGlobalElement = await response.json()\n\n    return localizedGlobalElement\n  }\n\n  async getPagePathnameSlices(\n    pageIds: string[],\n    siteVersion: SiteVersion | null,\n    { locale }: { locale?: string | null },\n  ): Promise<(PagePathnameSlice | null)[]> {\n    if (pageIds.length === 0) return []\n\n    const url = new URL(`v3/page-pathname-slices/bulk`, this.apiOrigin)\n\n    pageIds.forEach(id => url.searchParams.append('ids', id))\n    if (locale != null) url.searchParams.set('locale', locale)\n\n    const response = await this.fetch(url.pathname + url.search, siteVersion)\n\n    if (!response.ok) {\n      console.error(`Failed to get page pathname slice(s) for ${pageIds.join(', ')}`, {\n        response: await failedResponseBody(response),\n        siteVersion,\n        locale,\n      })\n\n      return []\n    }\n\n    const json = await response.json()\n\n    const pagePathnameSlices = Schema.pagePathnameSlices.parse(json)\n\n    // We're mapping the basePageId to be the id, because we're still using the GraphQL\n    // fragment as our APIResource. The id on the APIResource needs to match the pageId\n    // so that we can find the corresponding page pathname slice when we call getPagePathnameSlice(pageId).\n    // TODO: Update this once we move away from the GraphQL fragments.\n    return pagePathnameSlices.map(pagePathnameSlice => {\n      if (pagePathnameSlice == null) return null\n\n      return {\n        ...pagePathnameSlice,\n        id: pagePathnameSlice.basePageId,\n        localizedPathname: pagePathnameSlice.localizedPathname ?? null,\n      }\n    })\n  }\n\n  async getPagePathnameSlice(\n    pageId: string,\n    siteVersion: SiteVersion | null,\n    { locale }: { locale?: string } = {},\n  ): Promise<PagePathnameSlice | null> {\n    const pagePathnameSlices = await this.getPagePathnameSlices([pageId], siteVersion, { locale })\n\n    return pagePathnameSlices.at(0) ?? null\n  }\n\n  protected async fetch(\n    path: string,\n    siteVersion: SiteVersion | null,\n    init?: RequestInit,\n  ): Promise<Response> {\n    const requestUrl = new URL(path, this.apiOrigin)\n\n    const requestHeaders = new Headers({\n      'x-api-key': this.apiKey,\n      'makeswift-site-api-key': this.apiKey,\n      'makeswift-runtime-version': PACKAGE_VERSION,\n    })\n\n    if (siteVersion?.token) {\n      requestUrl.searchParams.set('version', siteVersion.version)\n      requestHeaders.set('makeswift-preview-token', siteVersion.token)\n    }\n\n    if (init?.headers) {\n      new Headers(init.headers).forEach((value, key) => {\n        requestHeaders.set(key, value)\n      })\n    }\n\n    const response = await this._fetch(requestUrl.toString(), {\n      ...init,\n      headers: requestHeaders,\n      ...(siteVersion != null ? { cache: 'no-store' } : {}),\n    })\n\n    return response\n  }\n}\n\n// This function attempts to consume the response body of a failed response, and\n// returns either the parsed JSON or raw text. This is useful for logging more\n// detailed error information when an API request fails.\n//\n// Cloudflare Worker Note: The Cloudflare Worker runtime has automatic deadlock\n// prevention (in the form of auto-cancelling responses) that triggers when too\n// many response bodies are unconsumed. This applies for error responses as\n// well. As such, in this client we use this function to consume the response\n// body whenever the request fails, even if we don't end up logging the body\n// itself, to avoid hitting the deadlock prevention.\nexport async function failedResponseBody(response: Response): Promise<unknown> {\n  try {\n    const text = await response.text()\n    try {\n      return JSON.parse(text)\n    } catch {\n      return text\n    }\n  } catch (e) {\n    return `Failed to extract response body: ${e}`\n  }\n}\n"],"mappings":"AAUA,YAAY,YAAY;AAEjB,MAAM,uBAAuB;AAAA,EAC1B;AAAA,EAEC;AAAA,EACA;AAAA,EAET,YAAY;AAAA,IACV;AAAA,IACA;AAAA,IACA;AAAA,EACF,GAIG;AACD,SAAK,SAAS;AACd,SAAK,SAAS;AACd,SAAK,YAAY;AAAA,EACnB;AAAA,EAEA,MAAM,UAAU,UAAkB,aAAyD;AACzF,UAAM,WAAW,MAAM,KAAK,MAAM,eAAe,QAAQ,IAAI,WAAW;AAExE,QAAI,CAAC,SAAS,IAAI;AAChB,YAAM,aAAa,MAAM,mBAAmB,QAAQ;AACpD,UAAI,SAAS,WAAW,KAAK;AAC3B,gBAAQ,MAAM,yBAAyB,QAAQ,KAAK;AAAA,UAClD,UAAU;AAAA,UACV;AAAA,QACF,CAAC;AAAA,MACH;AAEA,aAAO;AAAA,IACT;AAEA,UAAM,SAAS,MAAM,SAAS,KAAK;AAEnC,WAAO;AAAA,EACT;AAAA,EAEA,MAAM,cACJ,cACA,aAC4B;AAC5B,UAAM,WAAW,MAAM,KAAK,MAAM,mBAAmB,YAAY,IAAI,WAAW;AAEhF,QAAI,CAAC,SAAS,IAAI;AAChB,YAAM,aAAa,MAAM,mBAAmB,QAAQ;AACpD,UAAI,SAAS,WAAW,KAAK;AAC3B,gBAAQ,MAAM,6BAA6B,YAAY,KAAK;AAAA,UAC1D,UAAU;AAAA,UACV;AAAA,QACF,CAAC;AAAA,MACH;AAEA,aAAO;AAAA,IACT;AAEA,UAAM,aAAa,MAAM,SAAS,KAAK;AAEvC,WAAO;AAAA,EACT;AAAA,EAEA,MAAM,iBACJ,iBACA,aAC+B;AAC/B,UAAM,WAAW,MAAM,KAAK,MAAM,sBAAsB,eAAe,IAAI,WAAW;AAEtF,QAAI,CAAC,SAAS,IAAI;AAChB,YAAM,aAAa,MAAM,mBAAmB,QAAQ;AACpD,UAAI,SAAS,WAAW,KAAK;AAC3B,gBAAQ,MAAM,iCAAiC,eAAe,KAAK;AAAA,UACjE,UAAU;AAAA,UACV;AAAA,QACF,CAAC;AAAA,MACH;AAEA,aAAO;AAAA,IACT;AAEA,UAAM,gBAAgB,MAAM,SAAS,KAAK;AAE1C,WAAO;AAAA,EACT;AAAA,EAEA,MAAM,0BACJ,iBACA,QACA,aACwC;AACxC,UAAM,WAAW,MAAM,KAAK;AAAA,MAC1B,gCAAgC,eAAe,WAAW,MAAM;AAAA,MAChE;AAAA,IACF;AAEA,QAAI,CAAC,SAAS,IAAI;AAChB,YAAM,aAAa,MAAM,mBAAmB,QAAQ;AACpD,UAAI,SAAS,WAAW,KAAK;AAC3B,gBAAQ,MAAM,2CAA2C,eAAe,KAAK;AAAA,UAC3E,UAAU;AAAA,UACV;AAAA,UACA;AAAA,QACF,CAAC;AAAA,MACH;AAEA,aAAO;AAAA,IACT;AAEA,UAAM,yBAAyB,MAAM,SAAS,KAAK;AAEnD,WAAO;AAAA,EACT;AAAA,EAEA,MAAM,sBACJ,SACA,aACA,EAAE,OAAO,GAC8B;AACvC,QAAI,QAAQ,WAAW;AAAG,aAAO,CAAC;AAElC,UAAM,MAAM,IAAI,IAAI,gCAAgC,KAAK,SAAS;AAElE,YAAQ,QAAQ,QAAM,IAAI,aAAa,OAAO,OAAO,EAAE,CAAC;AACxD,QAAI,UAAU;AAAM,UAAI,aAAa,IAAI,UAAU,MAAM;AAEzD,UAAM,WAAW,MAAM,KAAK,MAAM,IAAI,WAAW,IAAI,QAAQ,WAAW;AAExE,QAAI,CAAC,SAAS,IAAI;AAChB,cAAQ,MAAM,4CAA4C,QAAQ,KAAK,IAAI,CAAC,IAAI;AAAA,QAC9E,UAAU,MAAM,mBAAmB,QAAQ;AAAA,QAC3C;AAAA,QACA;AAAA,MACF,CAAC;AAED,aAAO,CAAC;AAAA,IACV;AAEA,UAAM,OAAO,MAAM,SAAS,KAAK;AAEjC,UAAM,qBAAqB,OAAO,mBAAmB,MAAM,IAAI;AAM/D,WAAO,mBAAmB,IAAI,uBAAqB;AACjD,UAAI,qBAAqB;AAAM,eAAO;AAEtC,aAAO;AAAA,QACL,GAAG;AAAA,QACH,IAAI,kBAAkB;AAAA,QACtB,mBAAmB,kBAAkB,qBAAqB;AAAA,MAC5D;AAAA,IACF,CAAC;AAAA,EACH;AAAA,EAEA,MAAM,qBACJ,QACA,aACA,EAAE,OAAO,IAAyB,CAAC,GACA;AACnC,UAAM,qBAAqB,MAAM,KAAK,sBAAsB,CAAC,MAAM,GAAG,aAAa,EAAE,OAAO,CAAC;AAE7F,WAAO,mBAAmB,GAAG,CAAC,KAAK;AAAA,EACrC;AAAA,EAEA,MAAgB,MACd,MACA,aACA,MACmB;AACnB,UAAM,aAAa,IAAI,IAAI,MAAM,KAAK,SAAS;AAE/C,UAAM,iBAAiB,IAAI,QAAQ;AAAA,MACjC,aAAa,KAAK;AAAA,MAClB,0BAA0B,KAAK;AAAA,MAC/B,6BAA6B;AAAA,IAC/B,CAAC;AAED,QAAI,aAAa,OAAO;AACtB,iBAAW,aAAa,IAAI,WAAW,YAAY,OAAO;AAC1D,qBAAe,IAAI,2BAA2B,YAAY,KAAK;AAAA,IACjE;AAEA,QAAI,MAAM,SAAS;AACjB,UAAI,QAAQ,KAAK,OAAO,EAAE,QAAQ,CAAC,OAAO,QAAQ;AAChD,uBAAe,IAAI,KAAK,KAAK;AAAA,MAC/B,CAAC;AAAA,IACH;AAEA,UAAM,WAAW,MAAM,KAAK,OAAO,WAAW,SAAS,GAAG;AAAA,MACxD,GAAG;AAAA,MACH,SAAS;AAAA,MACT,GAAI,eAAe,OAAO,EAAE,OAAO,WAAW,IAAI,CAAC;AAAA,IACrD,CAAC;AAED,WAAO;AAAA,EACT;AACF;AAYA,eAAsB,mBAAmB,UAAsC;AAC7E,MAAI;AACF,UAAM,OAAO,MAAM,SAAS,KAAK;AACjC,QAAI;AACF,aAAO,KAAK,MAAM,IAAI;AAAA,IACxB,QAAQ;AACN,aAAO;AAAA,IACT;AAAA,EACF,SAAS,GAAG;AACV,WAAO,oCAAoC,CAAC;AAAA,EAC9C;AACF;","names":[]}
+{"version":3,"sources":["../../../src/api/rest-api-client.ts"],"sourcesContent":["import {\n  type GlobalElement,\n  type LocalizedGlobalElement,\n  type PagePathnameSlice,\n  type Swatch,\n  type Typography,\n  type HttpFetch,\n} from './types'\n\nimport { type SiteVersion } from './site-version'\nimport * as Schema from './schema'\n\nexport class MakeswiftRestAPIClient {\n  private _fetch: HttpFetch\n\n  readonly apiKey: string\n  readonly apiOrigin: string\n\n  constructor({\n    fetch,\n    apiKey,\n    apiOrigin,\n  }: {\n    fetch: HttpFetch\n    apiKey: string\n    apiOrigin: string\n  }) {\n    this._fetch = fetch\n    this.apiKey = apiKey\n    this.apiOrigin = apiOrigin\n  }\n\n  async getSwatch(swatchId: string, siteVersion: SiteVersion | null): Promise<Swatch | null> {\n    const response = await this.fetch(`v3/swatches/${swatchId}`, siteVersion)\n\n    if (!response.ok) {\n      const failedBody = await failedResponseBody(response)\n      if (response.status !== 404) {\n        console.error(`Failed to get swatch '${swatchId}'`, {\n          response: failedBody,\n          siteVersion,\n        })\n      }\n\n      return null\n    }\n\n    const swatch = await response.json()\n\n    return swatch\n  }\n\n  async getTypography(\n    typographyId: string,\n    siteVersion: SiteVersion | null,\n  ): Promise<Typography | null> {\n    const response = await this.fetch(`v3/typographies/${typographyId}`, siteVersion)\n\n    if (!response.ok) {\n      const failedBody = await failedResponseBody(response)\n      if (response.status !== 404) {\n        console.error(`Failed to get typography '${typographyId}'`, {\n          response: failedBody,\n          siteVersion,\n        })\n      }\n\n      return null\n    }\n\n    const typography = await response.json()\n\n    return typography\n  }\n\n  async getGlobalElement(\n    globalElementId: string,\n    siteVersion: SiteVersion | null,\n  ): Promise<GlobalElement | null> {\n    const response = await this.fetch(`v3/global-elements/${globalElementId}`, siteVersion)\n\n    if (!response.ok) {\n      const failedBody = await failedResponseBody(response)\n      if (response.status !== 404) {\n        console.error(`Failed to get global element '${globalElementId}'`, {\n          response: failedBody,\n          siteVersion,\n        })\n      }\n\n      return null\n    }\n\n    const globalElement = await response.json()\n\n    return globalElement\n  }\n\n  async getLocalizedGlobalElement(\n    globalElementId: string,\n    locale: string,\n    siteVersion: SiteVersion | null,\n  ): Promise<LocalizedGlobalElement | null> {\n    const response = await this.fetch(\n      `v3/localized-global-elements/${globalElementId}?locale=${locale}`,\n      siteVersion,\n    )\n\n    if (!response.ok) {\n      const failedBody = await failedResponseBody(response)\n      if (response.status !== 404) {\n        console.error(`Failed to get localized global element '${globalElementId}'`, {\n          response: failedBody,\n          siteVersion,\n          locale,\n        })\n      }\n\n      return null\n    }\n\n    const localizedGlobalElement = await response.json()\n\n    return localizedGlobalElement\n  }\n\n  async getPagePathnameSlices(\n    pageIds: string[],\n    siteVersion: SiteVersion | null,\n    { locale }: { locale?: string | null },\n  ): Promise<(PagePathnameSlice | null)[]> {\n    if (pageIds.length === 0) return []\n\n    const url = new URL(`v3/page-pathname-slices/bulk`, this.apiOrigin)\n\n    pageIds.forEach(id => url.searchParams.append('ids', id))\n    if (locale != null) url.searchParams.set('locale', locale)\n\n    const response = await this.fetch(url.pathname + url.search, siteVersion)\n\n    if (!response.ok) {\n      console.error(`Failed to get page pathname slice(s) for ${pageIds.join(', ')}`, {\n        response: await failedResponseBody(response),\n        siteVersion,\n        locale,\n      })\n\n      return []\n    }\n\n    const json = await response.json()\n\n    const pagePathnameSlices = Schema.pagePathnameSlices.parse(json)\n\n    // We're mapping the basePageId to be the id, because we're still using the GraphQL\n    // fragment as our APIResource. The id on the APIResource needs to match the pageId\n    // so that we can find the corresponding page pathname slice when we call getPagePathnameSlice(pageId).\n    // TODO: Update this once we move away from the GraphQL fragments.\n    return pagePathnameSlices.map(pagePathnameSlice => {\n      if (pagePathnameSlice == null) return null\n\n      return {\n        ...pagePathnameSlice,\n        id: pagePathnameSlice.basePageId,\n        localizedPathname: pagePathnameSlice.localizedPathname ?? null,\n      }\n    })\n  }\n\n  async getPagePathnameSlice(\n    pageId: string,\n    siteVersion: SiteVersion | null,\n    { locale }: { locale?: string | null } = {},\n  ): Promise<PagePathnameSlice | null> {\n    const pagePathnameSlices = await this.getPagePathnameSlices([pageId], siteVersion, { locale })\n\n    return pagePathnameSlices.at(0) ?? null\n  }\n\n  protected async fetch(\n    path: string,\n    siteVersion: SiteVersion | null,\n    init?: RequestInit,\n  ): Promise<Response> {\n    const requestUrl = new URL(path, this.apiOrigin)\n\n    const requestHeaders = new Headers({\n      'x-api-key': this.apiKey,\n      'makeswift-site-api-key': this.apiKey,\n      'makeswift-runtime-version': PACKAGE_VERSION,\n    })\n\n    if (siteVersion?.token) {\n      requestUrl.searchParams.set('version', siteVersion.version)\n      requestHeaders.set('makeswift-preview-token', siteVersion.token)\n    }\n\n    if (init?.headers) {\n      new Headers(init.headers).forEach((value, key) => {\n        requestHeaders.set(key, value)\n      })\n    }\n\n    const response = await this._fetch(requestUrl.toString(), {\n      ...init,\n      headers: requestHeaders,\n      ...(siteVersion != null ? { cache: 'no-store' } : {}),\n    })\n\n    return response\n  }\n}\n\n// This function attempts to consume the response body of a failed response, and\n// returns either the parsed JSON or raw text. This is useful for logging more\n// detailed error information when an API request fails.\n//\n// Cloudflare Worker Note: The Cloudflare Worker runtime has automatic deadlock\n// prevention (in the form of auto-cancelling responses) that triggers when too\n// many response bodies are unconsumed. This applies for error responses as\n// well. As such, in this client we use this function to consume the response\n// body whenever the request fails, even if we don't end up logging the body\n// itself, to avoid hitting the deadlock prevention.\nexport async function failedResponseBody(response: Response): Promise<unknown> {\n  try {\n    const text = await response.text()\n    try {\n      return JSON.parse(text)\n    } catch {\n      return text\n    }\n  } catch (e) {\n    return `Failed to extract response body: ${e}`\n  }\n}\n"],"mappings":"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","names":[]}

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/api/types.ts"],"sourcesContent":["import {\n  SwatchFragment as Swatch,\n  FileFragment as File,\n  TypographyFragment as Typography,\n  PagePathnameSliceFragment,\n  GlobalElementFragment as GlobalElement,\n  LocalizedGlobalElementFragment as LocalizedGlobalElement,\n  TableFragment as Table,\n  SnippetFragment as Snippet,\n  PageFragment as Page,\n  SiteFragment as Site,\n} from './graphql/generated/types'\n\ntype PagePathnameSlice = PagePathnameSliceFragment & {\n  basePageId?: string\n  localizedPathname?: string | null\n}\n\nexport type {\n  Swatch,\n  File,\n  Typography,\n  PagePathnameSlice,\n  GlobalElement,\n  LocalizedGlobalElement,\n  Table,\n  Snippet,\n  Page,\n  Site,\n}\n\nexport type LocalizableAPIResource = PagePathnameSlice | LocalizedGlobalElement\n\nexport const LocalizableAPIResourceType: {\n  [R in LocalizableAPIResource as R['__typename']]: R['__typename']\n} = {\n  PagePathnameSlice: 'PagePathnameSlice',\n  LocalizedGlobalElement: 'LocalizedGlobalElement',\n}\n\nexport type LocalizableAPIResourceType =\n  (typeof LocalizableAPIResourceType)[keyof typeof LocalizableAPIResourceType]\n\nexport type APIResource =\n  | LocalizableAPIResource\n  | Swatch\n  | File\n  | Typography\n  | GlobalElement\n  | Table\n  | Snippet\n  | Page\n  | Site\n\nexport const APIResourceType: { [R in APIResource as R['__typename']]: R['__typename'] } = {\n  ...LocalizableAPIResourceType,\n  Swatch: 'Swatch',\n  File: 'File',\n  Typography: 'Typography',\n  GlobalElement: 'GlobalElement',\n  Table: 'Table',\n  Snippet: 'Snippet',\n  Page: 'Page',\n  Site: 'Site',\n}\n\nexport type APIResourceType = (typeof APIResourceType)[keyof typeof APIResourceType]\n\nexport type APIResourceLocale<R extends APIResource | APIResourceType> = R extends\n  | LocalizableAPIResource\n  | LocalizableAPIResourceType\n  ? string | null\n  : never\n\nexport type HttpFetch = (url: string | URL, init?: RequestInit) => Promise<Response>\n"],"mappings":"AAiCO,MAAM,6BAET;AAAA,EACF,mBAAmB;AAAA,EACnB,wBAAwB;AAC1B;AAgBO,MAAM,kBAA8E;AAAA,EACzF,GAAG;AAAA,EACH,QAAQ;AAAA,EACR,MAAM;AAAA,EACN,YAAY;AAAA,EACZ,eAAe;AAAA,EACf,OAAO;AAAA,EACP,SAAS;AAAA,EACT,MAAM;AAAA,EACN,MAAM;AACR;","names":[]}
+{"version":3,"sources":["../../../src/api/types.ts"],"sourcesContent":["import {\n  SwatchFragment as Swatch,\n  FileFragment as File,\n  TypographyFragment as Typography,\n  PagePathnameSliceFragment,\n  GlobalElementFragment as GlobalElement,\n  LocalizedGlobalElementFragment as LocalizedGlobalElement,\n  TableFragment as Table,\n  SnippetFragment as Snippet,\n  PageFragment as Page,\n  SiteFragment as Site,\n} from './graphql/generated/types'\n\ntype PagePathnameSlice = PagePathnameSliceFragment & {\n  basePageId?: string\n  localizedPathname?: string | null\n}\n\nexport type {\n  Swatch,\n  File,\n  Typography,\n  PagePathnameSlice,\n  GlobalElement,\n  LocalizedGlobalElement,\n  Table,\n  Snippet,\n  Page,\n  Site,\n}\n\nexport type LocalizableAPIResource = PagePathnameSlice | LocalizedGlobalElement\n\nexport const LocalizableAPIResourceType: {\n  [R in LocalizableAPIResource as R['__typename']]: R['__typename']\n} = {\n  PagePathnameSlice: 'PagePathnameSlice',\n  LocalizedGlobalElement: 'LocalizedGlobalElement',\n}\n\nexport type LocalizableAPIResourceType =\n  (typeof LocalizableAPIResourceType)[keyof typeof LocalizableAPIResourceType]\n\nexport type APIResource =\n  | LocalizableAPIResource\n  | Swatch\n  | File\n  | Typography\n  | GlobalElement\n  | Table\n  | Snippet\n  | Page\n  | Site\n\nexport const APIResourceType: { [R in APIResource as R['__typename']]: R['__typename'] } = {\n  ...LocalizableAPIResourceType,\n  Swatch: 'Swatch',\n  File: 'File',\n  Typography: 'Typography',\n  GlobalElement: 'GlobalElement',\n  Table: 'Table',\n  Snippet: 'Snippet',\n  Page: 'Page',\n  Site: 'Site',\n}\n\nexport type APIResourceType = (typeof APIResourceType)[keyof typeof APIResourceType]\n\nexport type APIResourceByType<T extends APIResourceType> = Extract<APIResource, { __typename: T }>\n\nexport type APIResourceLocale<R extends APIResource | APIResourceType> = R extends\n  | LocalizableAPIResource\n  | LocalizableAPIResourceType\n  ? string | null\n  : never\n\nexport type HttpFetch = (url: string | URL, init?: RequestInit) => Promise<Response>\n"],"mappings":"AAiCO,MAAM,6BAET;AAAA,EACF,mBAAmB;AAAA,EACnB,wBAAwB;AAC1B;AAgBO,MAAM,kBAA8E;AAAA,EACzF,GAAG;AAAA,EACH,QAAQ;AAAA,EACR,MAAM;AAAA,EACN,YAAY;AAAA,EACZ,eAAe;AAAA,EACf,OAAO;AAAA,EACP,SAAS;AAAA,EACT,MAAM;AAAA,EACN,MAAM;AACR;","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.7-canary.9",
+    version: "0.28.8-canary.0",
     interactionMode: true,
     clientSideNavigation: false,
     elementFromPoint: false,

package/dist/esm/client/index.js

@@ -669,7 +669,7 @@ Received "${apiKey}" instead.`
       headers: {
         "x-api-key": this.apiKey,
         "makeswift-site-api-key": this.apiKey,
-        "makeswift-runtime-version": "0.28.7-canary.9",
+        "makeswift-runtime-version": "0.28.8-canary.0",
         "content-type": "application/json"
       },
       body: JSON.stringify({ token }),

package/dist/esm/state/api-client/fetch-api-resource.js

@@ -1,4 +1,3 @@
-import { ApiHandlerHeaders, serializeSiteVersion } from "../../api/site-version";
 import * as SiteVersionState from "../modules/site-version";
 import { apiResourceFulfilled } from "../actions/internal/read-only-actions";
 import { setLocalizedResourceId } from "../host-api";
@@ -6,25 +5,7 @@ import {
   APIResourceType
 } from "../../api/types";
 import { getHasAPIResource, getAPIResource, getLocalizedResourceId } from "./state";
-function fetchAPIResource(resourceType, resourceId, fetch, locale) {
-  const fetchVersioned = async (url, version) => {
-    const response = await fetch(url, {
-      headers: {
-        "Content-Type": "application/json",
-        ...version != null ? { [ApiHandlerHeaders.SiteVersion]: serializeSiteVersion(version) } : {}
-      }
-    });
-    if (response.status === 404)
-      return null;
-    if (!response.ok)
-      throw new Error(response.statusText);
-    if (response.headers.get("content-type")?.includes("application/json") !== true) {
-      throw new Error(
-        `Expected JSON response from "${url}" but got "${response.headers.get("content-type")}"`
-      );
-    }
-    return response.json();
-  };
+function fetchAPIResource(resourceType, resourceId, fetchResource, locale) {
   return async (dispatch, getState) => {
     const state = getState();
     const version = SiteVersionState.getSiteVersion(state.siteVersion);
@@ -34,22 +15,12 @@ function fetchAPIResource(resourceType, resourceId, fetch, locale) {
     let resource;
     switch (resourceType) {
       case APIResourceType.Swatch:
-        resource = await fetchVersioned(`/api/makeswift/swatches/${resourceId}`, version);
-        break;
       case APIResourceType.File:
-        resource = await fetchVersioned(`/api/makeswift/files/${resourceId}`, version);
-        break;
       case APIResourceType.Typography:
-        resource = await fetchVersioned(
-          `/api/makeswift/typographies/${resourceId}`,
-          version
-        );
-        break;
       case APIResourceType.GlobalElement:
-        resource = await fetchVersioned(
-          `/api/makeswift/global-elements/${resourceId}`,
-          version
-        );
+      case APIResourceType.PagePathnameSlice:
+      case APIResourceType.Table:
+        resource = await fetchResource(resourceId, version, locale);
         break;
       case APIResourceType.LocalizedGlobalElement: {
         if (locale == null)
@@ -57,10 +28,7 @@ function fetchAPIResource(resourceType, resourceId, fetch, locale) {
         if (getLocalizedResourceId(state, locale, resourceId) === null) {
           return null;
         }
-        resource = await fetchVersioned(
-          `/api/makeswift/localized-global-elements/${resourceId}/${locale}`,
-          version
-        );
+        resource = await fetchResource(resourceId, version, locale);
         dispatch(
           setLocalizedResourceId({
             locale,
@@ -70,16 +38,6 @@ function fetchAPIResource(resourceType, resourceId, fetch, locale) {
         );
         break;
       }
-      case APIResourceType.PagePathnameSlice: {
-        const url = new URL(`/api/makeswift/page-pathname-slices/${resourceId}`, "http://n");
-        if (locale != null)
-          url.searchParams.set("locale", locale);
-        resource = await fetchVersioned(url.pathname + url.search, version);
-        break;
-      }
-      case APIResourceType.Table:
-        resource = await fetchVersioned(`/api/makeswift/tables/${resourceId}`, version);
-        break;
       default:
         resource = null;
     }

package/dist/esm/state/api-client/fetch-api-resource.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/state/api-client/fetch-api-resource.ts"],"sourcesContent":["import { type ThunkAction } from '@reduxjs/toolkit'\n\nimport { type SiteVersion, ApiHandlerHeaders, serializeSiteVersion } from '../../api/site-version'\n\nimport * as SiteVersionState from '../modules/site-version'\n\nimport { type Action } from '../actions'\nimport { apiResourceFulfilled } from '../actions/internal/read-only-actions'\nimport { setLocalizedResourceId } from '../host-api'\n\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  type HttpFetch,\n} from '../../api/types'\n\nimport { type State, getHasAPIResource, getAPIResource, getLocalizedResourceId } from './state'\n\ntype Thunk<ReturnType> = ThunkAction<ReturnType, State, unknown, Action>\n\nexport function fetchAPIResource<T extends APIResourceType>(\n  resourceType: T,\n  resourceId: string,\n  fetch: HttpFetch,\n  locale?: APIResourceLocale<T>,\n): Thunk<Promise<Extract<APIResource, { __typename: T }> | null>> {\n  const fetchVersioned = async <T>(url: string, version: SiteVersion | null): Promise<T | null> => {\n    const response = await fetch(url, {\n      headers: {\n        'Content-Type': 'application/json',\n        ...(version != null\n          ? { [ApiHandlerHeaders.SiteVersion]: serializeSiteVersion(version) }\n          : {}),\n      },\n    })\n\n    if (response.status === 404) return null\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\n  return async (dispatch, getState) => {\n    const state = getState()\n    const version = SiteVersionState.getSiteVersion(state.siteVersion)\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 fetchVersioned<Swatch>(`/api/makeswift/swatches/${resourceId}`, version)\n        break\n\n      case APIResourceType.File:\n        resource = await fetchVersioned<File>(`/api/makeswift/files/${resourceId}`, version)\n        break\n\n      case APIResourceType.Typography:\n        resource = await fetchVersioned<Typography>(\n          `/api/makeswift/typographies/${resourceId}`,\n          version,\n        )\n        break\n\n      case APIResourceType.GlobalElement:\n        resource = await fetchVersioned<GlobalElement>(\n          `/api/makeswift/global-elements/${resourceId}`,\n          version,\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 fetchVersioned<LocalizedGlobalElement>(\n          `/api/makeswift/localized-global-elements/${resourceId}/${locale}`,\n          version,\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 fetchVersioned<PagePathnameSlice>(url.pathname + url.search, version)\n        break\n      }\n\n      case APIResourceType.Table:\n        resource = await fetchVersioned<Table>(`/api/makeswift/tables/${resourceId}`, version)\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"],"mappings":"AAEA,SAA2B,mBAAmB,4BAA4B;AAE1E,YAAY,sBAAsB;AAGlC,SAAS,4BAA4B;AACrC,SAAS,8BAA8B;AAEvC;AAAA,EACE;AAAA,OAWK;AAEP,SAAqB,mBAAmB,gBAAgB,8BAA8B;AAI/E,SAAS,iBACd,cACA,YACA,OACA,QACgE;AAChE,QAAM,iBAAiB,OAAU,KAAa,YAAmD;AAC/F,UAAM,WAAW,MAAM,MAAM,KAAK;AAAA,MAChC,SAAS;AAAA,QACP,gBAAgB;AAAA,QAChB,GAAI,WAAW,OACX,EAAE,CAAC,kBAAkB,WAAW,GAAG,qBAAqB,OAAO,EAAE,IACjE,CAAC;AAAA,MACP;AAAA,IACF,CAAC;AAED,QAAI,SAAS,WAAW;AAAK,aAAO;AACpC,QAAI,CAAC,SAAS;AAAI,YAAM,IAAI,MAAM,SAAS,UAAU;AAErD,QAAI,SAAS,QAAQ,IAAI,cAAc,GAAG,SAAS,kBAAkB,MAAM,MAAM;AAC/E,YAAM,IAAI;AAAA,QACR,gCAAgC,GAAG,cAAc,SAAS,QAAQ,IAAI,cAAc,CAAC;AAAA,MACvF;AAAA,IACF;AAEA,WAAO,SAAS,KAAK;AAAA,EACvB;AAEA,SAAO,OAAO,UAAU,aAAa;AACnC,UAAM,QAAQ,SAAS;AACvB,UAAM,UAAU,iBAAiB,eAAe,MAAM,WAAW;AAEjE,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,gBAAgB;AACnB,mBAAW,MAAM,eAAuB,2BAA2B,UAAU,IAAI,OAAO;AACxF;AAAA,MAEF,KAAK,gBAAgB;AACnB,mBAAW,MAAM,eAAqB,wBAAwB,UAAU,IAAI,OAAO;AACnF;AAAA,MAEF,KAAK,gBAAgB;AACnB,mBAAW,MAAM;AAAA,UACf,+BAA+B,UAAU;AAAA,UACzC;AAAA,QACF;AACA;AAAA,MAEF,KAAK,gBAAgB;AACnB,mBAAW,MAAM;AAAA,UACf,kCAAkC,UAAU;AAAA,UAC5C;AAAA,QACF;AACA;AAAA,MAEF,KAAK,gBAAgB,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,UAChE;AAAA,QACF;AAEA;AAAA,UACE,uBAAuB;AAAA,YACrB;AAAA,YACA;AAAA,YACA,qBAAqB,UAAU,MAAM;AAAA,UACvC,CAAC;AAAA,QACH;AAEA;AAAA,MACF;AAAA,MAEA,KAAK,gBAAgB,mBAAmB;AACtC,cAAM,MAAM,IAAI,IAAI,uCAAuC,UAAU,IAAI,UAAU;AAEnF,YAAI,UAAU;AAAM,cAAI,aAAa,IAAI,UAAU,MAAM;AAEzD,mBAAW,MAAM,eAAkC,IAAI,WAAW,IAAI,QAAQ,OAAO;AACrF;AAAA,MACF;AAAA,MAEA,KAAK,gBAAgB;AACnB,mBAAW,MAAM,eAAsB,yBAAyB,UAAU,IAAI,OAAO;AACrF;AAAA,MAEF;AACE,mBAAW;AAAA,IACf;AAEA,aAAS,qBAAqB,cAAc,YAAY,UAAU,MAAM,CAAC;AAEzE,WAAO;AAAA,EACT;AACF;","names":[]}
+{"version":3,"sources":["../../../../src/state/api-client/fetch-api-resource.ts"],"sourcesContent":["import { type ThunkAction } from '@reduxjs/toolkit'\n\nimport { type SiteVersion } from '../../api/site-version'\n\nimport * as SiteVersionState from '../modules/site-version'\n\nimport { type Action } from '../actions'\nimport { apiResourceFulfilled } from '../actions/internal/read-only-actions'\nimport { setLocalizedResourceId } from '../host-api'\n\nimport {\n  APIResourceType,\n  type APIResource,\n  type APIResourceByType,\n  type APIResourceLocale,\n} from '../../api/types'\n\nimport { type State, getHasAPIResource, getAPIResource, getLocalizedResourceId } from './state'\n\ntype Thunk<ReturnType> = ThunkAction<ReturnType, State, unknown, Action>\n\nexport function fetchAPIResource<T extends APIResourceType>(\n  resourceType: T,\n  resourceId: string,\n  fetchResource: (\n    resourceId: string,\n    version: SiteVersion | null,\n    locale?: APIResourceLocale<T>,\n  ) => Promise<APIResourceByType<T> | null>,\n  locale?: APIResourceLocale<T>,\n): Thunk<Promise<APIResourceByType<T> | null>> {\n  return async (dispatch, getState) => {\n    const state = getState()\n    const version = SiteVersionState.getSiteVersion(state.siteVersion)\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      case APIResourceType.File:\n      case APIResourceType.Typography:\n      case APIResourceType.GlobalElement:\n      case APIResourceType.PagePathnameSlice:\n      case APIResourceType.Table:\n        resource = await fetchResource(resourceId, version, locale)\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 fetchResource(resourceId, version, locale)\n\n        dispatch(\n          setLocalizedResourceId({\n            locale,\n            resourceId,\n            localizedResourceId: resource?.id ?? null,\n          }),\n        )\n\n        break\n      }\n\n      default:\n        resource = null\n    }\n\n    dispatch(apiResourceFulfilled(resourceType, resourceId, resource, locale))\n\n    return resource as APIResourceByType<T> | null\n  }\n}\n"],"mappings":"AAIA,YAAY,sBAAsB;AAGlC,SAAS,4BAA4B;AACrC,SAAS,8BAA8B;AAEvC;AAAA,EACE;AAAA,OAIK;AAEP,SAAqB,mBAAmB,gBAAgB,8BAA8B;AAI/E,SAAS,iBACd,cACA,YACA,eAKA,QAC6C;AAC7C,SAAO,OAAO,UAAU,aAAa;AACnC,UAAM,QAAQ,SAAS;AACvB,UAAM,UAAU,iBAAiB,eAAe,MAAM,WAAW;AAEjE,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,gBAAgB;AAAA,MACrB,KAAK,gBAAgB;AAAA,MACrB,KAAK,gBAAgB;AAAA,MACrB,KAAK,gBAAgB;AAAA,MACrB,KAAK,gBAAgB;AAAA,MACrB,KAAK,gBAAgB;AACnB,mBAAW,MAAM,cAAc,YAAY,SAAS,MAAM;AAC1D;AAAA,MAEF,KAAK,gBAAgB,wBAAwB;AAC3C,YAAI,UAAU;AAAM,gBAAM,IAAI,MAAM,oDAAoD;AAIxF,YAAI,uBAAuB,OAAO,QAAQ,UAAU,MAAM,MAAM;AAC9D,iBAAO;AAAA,QACT;AAEA,mBAAW,MAAM,cAAc,YAAY,SAAS,MAAM;AAE1D;AAAA,UACE,uBAAuB;AAAA,YACrB;AAAA,YACA;AAAA,YACA,qBAAqB,UAAU,MAAM;AAAA,UACvC,CAAC;AAAA,QACH;AAEA;AAAA,MACF;AAAA,MAEA;AACE,mBAAW;AAAA,IACf;AAEA,aAAS,qBAAqB,cAAc,YAAY,UAAU,MAAM,CAAC;AAEzE,WAAO;AAAA,EACT;AACF;","names":[]}

package/dist/types/api/api-resources-client.d.ts

@@ -2,6 +2,7 @@ import { type FetchableValue } from '@makeswift/controls';
 import { type Store as ApiClientStore } from '../state/api-client/store';
 import * as ApiClientState from '../state/api-client/state';
 import { type File, type GlobalElement, type LocalizedGlobalElement, type Page, type PagePathnameSlice, type Site, type Snippet, type Swatch, type Table, type Typography, APIResourceType } from './types';
+import { type SiteVersion } from './site-version';
 export type CacheData = ApiClientState.SerializedState;
 export declare const CacheData: {
     empty(): CacheData;
@@ -12,18 +13,18 @@ export declare abstract class ApiResourcesClient {
     constructor({ store }: {
         store: ApiClientStore;
     });
-    abstract fetchSwatch(swatchId: string): Promise<Swatch | null>;
+    fetchSwatch(swatchId: string): Promise<Swatch | null>;
     readSwatch(swatchId: string): Swatch | null;
     resolveSwatch(swatchId: string | undefined): FetchableValue<Swatch | null>;
-    abstract fetchFile(fileId: string): Promise<File | null>;
+    fetchFile(fileId: string): Promise<File | null>;
     readFile(fileId: string): File | null;
     resolveFile(fileId: string | undefined): FetchableValue<File | null>;
-    abstract fetchTypography(typographyId: string): Promise<Typography | null>;
+    fetchTypography(typographyId: string): Promise<Typography | null>;
     readTypography(typographyId: string): Typography | null;
     resolveTypography(typographyId: string | undefined): FetchableValue<Typography | null>;
-    abstract fetchGlobalElement(globalElementId: string): Promise<GlobalElement | null>;
+    fetchGlobalElement(globalElementId: string): Promise<GlobalElement | null>;
     readGlobalElement(globalElementId: string): GlobalElement | null;
-    abstract fetchLocalizedGlobalElement({ globalElementId, locale, }: {
+    fetchLocalizedGlobalElement({ globalElementId, locale, }: {
         globalElementId: string;
         locale: string;
     }): Promise<LocalizedGlobalElement | null>;
@@ -31,14 +32,14 @@ export declare abstract class ApiResourcesClient {
         globalElementId: string;
         locale: string;
     }): LocalizedGlobalElement | null;
-    readPagePathnameSlice({ pageId, locale, }: {
+    fetchPagePathnameSlice({ pageId, locale, }: {
         pageId: string;
         locale: string | null;
-    }): PagePathnameSlice | null;
-    abstract fetchPagePathnameSlice({ pageId, locale, }: {
+    }): Promise<PagePathnameSlice | null>;
+    readPagePathnameSlice({ pageId, locale, }: {
         pageId: string;
         locale: string | null;
-    }): Promise<PagePathnameSlice | null>;
+    }): PagePathnameSlice | null;
     resolvePagePathnameSlice({ pageId, locale, }: {
         pageId: string | undefined;
         locale: string | null;
@@ -48,10 +49,17 @@ export declare abstract class ApiResourcesClient {
         read: (id: string) => R | null;
         fetch: (id: string) => Promise<R | null>;
     }): FetchableValue<R | null>;
-    abstract fetchTable(tableId: string): Promise<Table | null>;
+    fetchTable(tableId: string): Promise<Table | null>;
     readTable(tableId: string): Table | null;
     readSite(siteId: string): Site | null;
     readPage(pageId: string): Page | null;
     readSnippet(snippetId: string): Snippet | null;
+    protected abstract fetchSwatchImpl(id: string, version: SiteVersion | null): Promise<Swatch | null>;
+    protected abstract fetchFileImpl(id: string, version: SiteVersion | null): Promise<File | null>;
+    protected abstract fetchTypographyImpl(id: string, version: SiteVersion | null): Promise<Typography | null>;
+    protected abstract fetchGlobalElementImpl(id: string, version: SiteVersion | null): Promise<GlobalElement | null>;
+    protected abstract fetchLocalizedGlobalElementImpl(id: string, version: SiteVersion | null, locale: string): Promise<LocalizedGlobalElement | null>;
+    protected abstract fetchPagePathnameSliceImpl(id: string, version: SiteVersion | null, locale: string | null | undefined): Promise<PagePathnameSlice | null>;
+    protected abstract fetchTableImpl(id: string, version: SiteVersion | null): Promise<Table | null>;
 }
 //# sourceMappingURL=api-resources-client.d.ts.map