@makeswift/runtime 0.28.7 → 0.28.8-canary.1

package/dist/cjs/runtimes/react/hooks/use-control-defs.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../src/runtimes/react/hooks/use-control-defs.ts"],"sourcesContent":["import { useRef } from 'react'\n\nimport { ControlDefinition } from '@makeswift/controls'\n\nimport { partitionRecord } from '../../../utils/partition'\n\nimport { getComponentPropControllerDescriptors } from '../../../state/read-only-state'\nimport { type LegacyDescriptor, isLegacyDescriptor } from '../../../prop-controllers/descriptors'\n\nimport { useStore } from './use-store'\n\nexport function useControlDefs({\n  elementType,\n}: {\n  elementType: string\n}): readonly [Record<string, LegacyDescriptor>, Record<string, ControlDefinition>] {\n  const store = useStore()\n  const all = getComponentPropControllerDescriptors(store.getState(), elementType) ?? {}\n  return useRef(partitionRecord(all, isLegacyDescriptor)).current\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAAuB;AAIvB,uBAAgC;AAEhC,6BAAsD;AACtD,yBAA0D;AAE1D,uBAAyB;AAElB,SAAS,eAAe;AAAA,EAC7B;AACF,GAEmF;AACjF,QAAM,YAAQ,2BAAS;AACvB,QAAM,UAAM,8DAAsC,MAAM,SAAS,GAAG,WAAW,KAAK,CAAC;AACrF,aAAO,yBAAO,kCAAgB,KAAK,qCAAkB,CAAC,EAAE;AAC1D;","names":[]}

package/dist/cjs/runtimes/react/runtime-core.js

@@ -22,6 +22,7 @@ __export(runtime_core_exports, {
 });
 module.exports = __toCommonJS(runtime_core_exports);
 var import_host_api_resources_client = require("../../api/host-api-resources-client");
+var import_makeswift_api_resources_client = require("../../api/makeswift-api-resources-client");
 var import_breakpoints = require("../../state/modules/breakpoints");
 var import_copy_element_tree = require("../../state/ops/copy-element-tree");
 var import_read_only_state = require("../../state/read-only-state");
@@ -41,6 +42,7 @@ class RuntimeCore {
     // requested site version, which should be the only site version for which the store is requested
     ttlCheck: import_ref_counted_map.RefCountedMap.TTLCheck.ON_RETAIN | import_ref_counted_map.RefCountedMap.TTLCheck.ON_RELEASE
   });
+  apiKey;
   protoStore;
   appOrigin;
   apiOrigin;
@@ -49,12 +51,14 @@ class RuntimeCore {
   constructor({
     appOrigin = "https://app.makeswift.com",
     apiOrigin = "https://api.makeswift.com",
+    apiKey,
     breakpoints,
     requestKey,
     fetch
   }) {
     this.appOrigin = validateOrigin(appOrigin, "appOrigin");
     this.apiOrigin = validateOrigin(apiOrigin, "apiOrigin");
+    this.apiKey = apiKey;
     this.requestKey = requestKey;
     this.fetch = fetch;
     this.protoStore = (0, import_store.configureProtoStore)({
@@ -107,6 +111,15 @@ class RuntimeCore {
     return new URL("graphql", this.apiOrigin).href;
   }
   createApiResourcesClient(preloadedState) {
+    if ((0, import_is_server.isServer)() && this.apiKey) {
+      return new import_makeswift_api_resources_client.MakeswiftApiResourcesClient({
+        fetch: this.fetch,
+        apiKey: this.apiKey,
+        apiOrigin: this.apiOrigin,
+        graphqlApiEndpoint: this.graphqlApiEndpoint,
+        preloadedState
+      });
+    }
     return new import_host_api_resources_client.HostApiResourcesClient({
       fetch: this.fetch,
       preloadedState

package/dist/cjs/runtimes/react/runtime-core.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/runtimes/react/runtime-core.ts"],"sourcesContent":["import { type SerializableReplacementContext } from '@makeswift/controls'\n\nimport { HostApiResourcesClient } from '../../api/host-api-resources-client'\nimport { type HttpFetch } from '../../api/types'\nimport { type SiteVersion } from '../../api/site-version'\n\nimport {\n  Breakpoints,\n  BreakpointsInput,\n  parseBreakpointsInput,\n} from '../../state/modules/breakpoints'\n\nimport { copyElementTree } from '../../state/ops/copy-element-tree'\n\nimport { getBreakpoints, type Element, type ElementData } from '../../state/read-only-state'\nimport {\n  configureProtoStore,\n  configureReadWriteStore,\n  type ProtoStore,\n  type Store,\n} from '../../state/store'\n\nimport { RefCountedMap } from '../../utils/ref-counted-map'\nimport { isServer } from '../../utils/is-server'\n\nexport type StoreKey = {\n  siteVersion: SiteVersion | null\n  locale: string | undefined\n}\n\nconst VERSION_TAG_LIVE = 'ref:live'\n\nexport class RuntimeCore {\n  // The unowned entry TTL affects performance, not correctness. The TTL controls how long an unretained store stays\n  // in the map. If an entry expires and is removed from the map before React commits, the store remains retained\n  // via `<StoreContext.Provider>`. The only impact is that future lookups will create a new store instance instead of\n  // reusing the existing one, reducing cache efficiency.\n  private readonly activeStores = new RefCountedMap<string | null, Store>({\n    unownedEntryTtlMs: 1000,\n    // Checking on retain/release is sufficient on the client, and we don't need to check on get on the server\n    // as the only scenario in which we add the store to the map is when the runtime is already bound to the\n    // requested site version, which should be the only site version for which the store is requested\n    ttlCheck: RefCountedMap.TTLCheck.ON_RETAIN | RefCountedMap.TTLCheck.ON_RELEASE,\n  })\n\n  readonly protoStore: ProtoStore\n  readonly appOrigin: string\n  readonly apiOrigin: string\n  readonly requestKey: StoreKey | undefined\n  readonly fetch: HttpFetch\n\n  constructor({\n    appOrigin = 'https://app.makeswift.com',\n    apiOrigin = 'https://api.makeswift.com',\n    breakpoints,\n    requestKey,\n    fetch,\n  }: {\n    appOrigin?: string\n    apiOrigin?: string\n    breakpoints?: BreakpointsInput\n    requestKey?: StoreKey\n    fetch: HttpFetch\n  }) {\n    this.appOrigin = validateOrigin(appOrigin, 'appOrigin')\n    this.apiOrigin = validateOrigin(apiOrigin, 'apiOrigin')\n    this.requestKey = requestKey\n    this.fetch = fetch\n\n    this.protoStore = configureProtoStore({\n      name: 'Runtime proto-store',\n      breakpoints: breakpoints ? parseBreakpointsInput(breakpoints) : undefined,\n    })\n  }\n\n  getOrCreateStore({ siteVersion, locale }: StoreKey): Store {\n    const key = storeCacheKey({ siteVersion, locale })\n\n    const createStore = () => {\n      // API resources client includes an in-memory cache of the site's resources and thus also has to be versioned\n      const apiResourcesClient = this.createApiResourcesClient({ siteVersion, locale })\n\n      // TODO: we need to decouple editability from the site version; specifically, previewing\n      // a draft version of the site should not lead to switching to the read-write state\n      const isReadOnly = siteVersion == null\n\n      return configureReadWriteStore({\n        name: `Runtime read-write store (site version: ${key})`,\n        appOrigin: this.appOrigin,\n        apiResourcesClient,\n        preloadedState: { ...this.protoStore.getState(), siteVersion, isReadOnly, locale },\n      })\n    }\n\n    // On the server, stores are ephemeral by default so SSR does not retain them in a long-lived runtime.\n    // The exception is a runtime that is already bound to the requested site version & locale, where we\n    // can safely reuse the store across multiple root regions and benefit from the host API client's\n    // in-memory cache.\n    //\n    // On the client, stores are reference-counted by site version so multiple root regions can share a store\n    // instance, which preserves the pre-v0.17 per-site-version store behavior without requiring a separate\n    // runtime per root.\n    const usePersistentStore = this.shouldUsePersistentStore(key)\n    return usePersistentStore ? this.activeStores.getOrCreate(key, createStore) : createStore()\n  }\n\n  retainStore({ siteVersion, locale }: StoreKey, store: Store): void {\n    const key = storeCacheKey({ siteVersion, locale })\n\n    if (!this.shouldUsePersistentStore(key)) {\n      console.error('RuntimeCore: attempt to retain an ephemeral store', { key })\n      return\n    }\n\n    if (this.activeStores.retain(key, store)) {\n      store.startBreakpointWatch()\n    }\n  }\n\n  releaseStore({ siteVersion, locale }: StoreKey, store: Store): void {\n    const key = storeCacheKey({ siteVersion, locale })\n\n    if (!this.shouldUsePersistentStore(key)) {\n      console.error('RuntimeCore: attempt to release an ephemeral store', { key })\n      return\n    }\n\n    if (this.activeStores.release(key, store)) {\n      store.stopBreakpointWatch()\n    }\n  }\n\n  copyElementTree(\n    elementTree: ElementData,\n    replacementContext: SerializableReplacementContext,\n  ): Element {\n    return copyElementTree(this.protoStore.getState(), elementTree, replacementContext)\n  }\n\n  getBreakpoints(): Breakpoints {\n    return getBreakpoints(this.protoStore.getState())\n  }\n\n  get graphqlApiEndpoint(): string {\n    return new URL('graphql', this.apiOrigin).href\n  }\n\n  private createApiResourcesClient(preloadedState: {\n    siteVersion: SiteVersion | null\n    locale: string | undefined\n  }) {\n    return new HostApiResourcesClient({\n      fetch: this.fetch,\n      preloadedState,\n    })\n  }\n\n  private shouldUsePersistentStore(key: string): boolean {\n    // don't persist stores on the server unless the runtime instance is bound to a request\n    // and the requested store matches the request's site version and locale\n    return !isServer() || (this.requestKey !== undefined && storeCacheKey(this.requestKey) === key)\n  }\n}\n\nconst storeCacheKey = ({ siteVersion, locale }: StoreKey): string =>\n  `${siteVersionTag(siteVersion)}/${locale ?? 'default'}`\n\nconst siteVersionTag = (siteVersion: SiteVersion | null): string =>\n  siteVersion?.version ?? VERSION_TAG_LIVE\n\nfunction validateOrigin(url: string, name: string): string {\n  try {\n    return new URL(url).origin\n  } catch {\n    throw new Error(`The Makeswift runtime received an invalid \\`${name}\\` parameter: \"${url}\".`)\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,uCAAuC;AAIvC,yBAIO;AAEP,+BAAgC;AAEhC,6BAA+D;AAC/D,mBAKO;AAEP,6BAA8B;AAC9B,uBAAyB;AAOzB,MAAM,mBAAmB;AAElB,MAAM,YAAY;AAAA;AAAA;AAAA;AAAA;AAAA,EAKN,eAAe,IAAI,qCAAoC;AAAA,IACtE,mBAAmB;AAAA;AAAA;AAAA;AAAA,IAInB,UAAU,qCAAc,SAAS,YAAY,qCAAc,SAAS;AAAA,EACtE,CAAC;AAAA,EAEQ;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EAET,YAAY;AAAA,IACV,YAAY;AAAA,IACZ,YAAY;AAAA,IACZ;AAAA,IACA;AAAA,IACA;AAAA,EACF,GAMG;AACD,SAAK,YAAY,eAAe,WAAW,WAAW;AACtD,SAAK,YAAY,eAAe,WAAW,WAAW;AACtD,SAAK,aAAa;AAClB,SAAK,QAAQ;AAEb,SAAK,iBAAa,kCAAoB;AAAA,MACpC,MAAM;AAAA,MACN,aAAa,kBAAc,0CAAsB,WAAW,IAAI;AAAA,IAClE,CAAC;AAAA,EACH;AAAA,EAEA,iBAAiB,EAAE,aAAa,OAAO,GAAoB;AACzD,UAAM,MAAM,cAAc,EAAE,aAAa,OAAO,CAAC;AAEjD,UAAM,cAAc,MAAM;AAExB,YAAM,qBAAqB,KAAK,yBAAyB,EAAE,aAAa,OAAO,CAAC;AAIhF,YAAM,aAAa,eAAe;AAElC,iBAAO,sCAAwB;AAAA,QAC7B,MAAM,2CAA2C,GAAG;AAAA,QACpD,WAAW,KAAK;AAAA,QAChB;AAAA,QACA,gBAAgB,EAAE,GAAG,KAAK,WAAW,SAAS,GAAG,aAAa,YAAY,OAAO;AAAA,MACnF,CAAC;AAAA,IACH;AAUA,UAAM,qBAAqB,KAAK,yBAAyB,GAAG;AAC5D,WAAO,qBAAqB,KAAK,aAAa,YAAY,KAAK,WAAW,IAAI,YAAY;AAAA,EAC5F;AAAA,EAEA,YAAY,EAAE,aAAa,OAAO,GAAa,OAAoB;AACjE,UAAM,MAAM,cAAc,EAAE,aAAa,OAAO,CAAC;AAEjD,QAAI,CAAC,KAAK,yBAAyB,GAAG,GAAG;AACvC,cAAQ,MAAM,qDAAqD,EAAE,IAAI,CAAC;AAC1E;AAAA,IACF;AAEA,QAAI,KAAK,aAAa,OAAO,KAAK,KAAK,GAAG;AACxC,YAAM,qBAAqB;AAAA,IAC7B;AAAA,EACF;AAAA,EAEA,aAAa,EAAE,aAAa,OAAO,GAAa,OAAoB;AAClE,UAAM,MAAM,cAAc,EAAE,aAAa,OAAO,CAAC;AAEjD,QAAI,CAAC,KAAK,yBAAyB,GAAG,GAAG;AACvC,cAAQ,MAAM,sDAAsD,EAAE,IAAI,CAAC;AAC3E;AAAA,IACF;AAEA,QAAI,KAAK,aAAa,QAAQ,KAAK,KAAK,GAAG;AACzC,YAAM,oBAAoB;AAAA,IAC5B;AAAA,EACF;AAAA,EAEA,gBACE,aACA,oBACS;AACT,eAAO,0CAAgB,KAAK,WAAW,SAAS,GAAG,aAAa,kBAAkB;AAAA,EACpF;AAAA,EAEA,iBAA8B;AAC5B,eAAO,uCAAe,KAAK,WAAW,SAAS,CAAC;AAAA,EAClD;AAAA,EAEA,IAAI,qBAA6B;AAC/B,WAAO,IAAI,IAAI,WAAW,KAAK,SAAS,EAAE;AAAA,EAC5C;AAAA,EAEQ,yBAAyB,gBAG9B;AACD,WAAO,IAAI,wDAAuB;AAAA,MAChC,OAAO,KAAK;AAAA,MACZ;AAAA,IACF,CAAC;AAAA,EACH;AAAA,EAEQ,yBAAyB,KAAsB;AAGrD,WAAO,KAAC,2BAAS,KAAM,KAAK,eAAe,UAAa,cAAc,KAAK,UAAU,MAAM;AAAA,EAC7F;AACF;AAEA,MAAM,gBAAgB,CAAC,EAAE,aAAa,OAAO,MAC3C,GAAG,eAAe,WAAW,CAAC,IAAI,UAAU,SAAS;AAEvD,MAAM,iBAAiB,CAAC,gBACtB,aAAa,WAAW;AAE1B,SAAS,eAAe,KAAa,MAAsB;AACzD,MAAI;AACF,WAAO,IAAI,IAAI,GAAG,EAAE;AAAA,EACtB,QAAQ;AACN,UAAM,IAAI,MAAM,+CAA+C,IAAI,kBAAkB,GAAG,IAAI;AAAA,EAC9F;AACF;","names":[]}
+{"version":3,"sources":["../../../../src/runtimes/react/runtime-core.ts"],"sourcesContent":["import { type SerializableReplacementContext } from '@makeswift/controls'\n\nimport { ApiResourcesClient } from '../../api/api-resources-client'\nimport { HostApiResourcesClient } from '../../api/host-api-resources-client'\nimport { MakeswiftApiResourcesClient } from '../../api/makeswift-api-resources-client'\nimport { type HttpFetch } from '../../api/types'\nimport { type SiteVersion } from '../../api/site-version'\n\nimport {\n  type Breakpoints,\n  type BreakpointsInput,\n  parseBreakpointsInput,\n} from '../../state/modules/breakpoints'\n\nimport { copyElementTree } from '../../state/ops/copy-element-tree'\n\nimport { getBreakpoints, type Element, type ElementData } from '../../state/read-only-state'\nimport {\n  configureProtoStore,\n  configureReadWriteStore,\n  type ProtoStore,\n  type Store,\n} from '../../state/store'\n\nimport { RefCountedMap } from '../../utils/ref-counted-map'\nimport { isServer } from '../../utils/is-server'\n\nexport type StoreKey = {\n  siteVersion: SiteVersion | null\n  locale: string | undefined\n}\n\nconst VERSION_TAG_LIVE = 'ref:live'\n\nexport class RuntimeCore {\n  // The unowned entry TTL affects performance, not correctness. The TTL controls how long an unretained store stays\n  // in the map. If an entry expires and is removed from the map before React commits, the store remains retained\n  // via `<StoreContext.Provider>`. The only impact is that future lookups will create a new store instance instead of\n  // reusing the existing one, reducing cache efficiency.\n  private readonly activeStores = new RefCountedMap<string | null, Store>({\n    unownedEntryTtlMs: 1000,\n    // Checking on retain/release is sufficient on the client, and we don't need to check on get on the server\n    // as the only scenario in which we add the store to the map is when the runtime is already bound to the\n    // requested site version, which should be the only site version for which the store is requested\n    ttlCheck: RefCountedMap.TTLCheck.ON_RETAIN | RefCountedMap.TTLCheck.ON_RELEASE,\n  })\n\n  private readonly apiKey: string | undefined\n\n  readonly protoStore: ProtoStore\n  readonly appOrigin: string\n  readonly apiOrigin: string\n  readonly requestKey: StoreKey | undefined\n  readonly fetch: HttpFetch\n\n  constructor({\n    appOrigin = 'https://app.makeswift.com',\n    apiOrigin = 'https://api.makeswift.com',\n    apiKey,\n    breakpoints,\n    requestKey,\n    fetch,\n  }: {\n    appOrigin?: string\n    apiOrigin?: string\n    apiKey?: string\n    breakpoints?: BreakpointsInput\n    requestKey?: StoreKey\n    fetch: HttpFetch\n  }) {\n    this.appOrigin = validateOrigin(appOrigin, 'appOrigin')\n    this.apiOrigin = validateOrigin(apiOrigin, 'apiOrigin')\n    this.apiKey = apiKey\n    this.requestKey = requestKey\n    this.fetch = fetch\n\n    this.protoStore = configureProtoStore({\n      name: 'Runtime proto-store',\n      breakpoints: breakpoints ? parseBreakpointsInput(breakpoints) : undefined,\n    })\n  }\n\n  getOrCreateStore({ siteVersion, locale }: StoreKey): Store {\n    const key = storeCacheKey({ siteVersion, locale })\n\n    const createStore = () => {\n      // API resources client includes an in-memory cache of the site's resources and thus also has to be versioned\n      const apiResourcesClient = this.createApiResourcesClient({ siteVersion, locale })\n\n      // TODO: we need to decouple editability from the site version; specifically, previewing\n      // a draft version of the site should not lead to switching to the read-write state\n      const isReadOnly = siteVersion == null\n\n      return configureReadWriteStore({\n        name: `Runtime read-write store (site version: ${key})`,\n        appOrigin: this.appOrigin,\n        apiResourcesClient,\n        preloadedState: { ...this.protoStore.getState(), siteVersion, isReadOnly, locale },\n      })\n    }\n\n    // On the server, stores are ephemeral by default so SSR does not retain them in a long-lived runtime.\n    // The exception is a runtime that is already bound to the requested site version & locale, where we\n    // can safely reuse the store across multiple root regions and benefit from the host API client's\n    // in-memory cache.\n    //\n    // On the client, stores are reference-counted by site version so multiple root regions can share a store\n    // instance, which preserves the pre-v0.17 per-site-version store behavior without requiring a separate\n    // runtime per root.\n    const usePersistentStore = this.shouldUsePersistentStore(key)\n    return usePersistentStore ? this.activeStores.getOrCreate(key, createStore) : createStore()\n  }\n\n  retainStore({ siteVersion, locale }: StoreKey, store: Store): void {\n    const key = storeCacheKey({ siteVersion, locale })\n\n    if (!this.shouldUsePersistentStore(key)) {\n      console.error('RuntimeCore: attempt to retain an ephemeral store', { key })\n      return\n    }\n\n    if (this.activeStores.retain(key, store)) {\n      store.startBreakpointWatch()\n    }\n  }\n\n  releaseStore({ siteVersion, locale }: StoreKey, store: Store): void {\n    const key = storeCacheKey({ siteVersion, locale })\n\n    if (!this.shouldUsePersistentStore(key)) {\n      console.error('RuntimeCore: attempt to release an ephemeral store', { key })\n      return\n    }\n\n    if (this.activeStores.release(key, store)) {\n      store.stopBreakpointWatch()\n    }\n  }\n\n  copyElementTree(\n    elementTree: ElementData,\n    replacementContext: SerializableReplacementContext,\n  ): Element {\n    return copyElementTree(this.protoStore.getState(), elementTree, replacementContext)\n  }\n\n  getBreakpoints(): Breakpoints {\n    return getBreakpoints(this.protoStore.getState())\n  }\n\n  get graphqlApiEndpoint(): string {\n    return new URL('graphql', this.apiOrigin).href\n  }\n\n  private createApiResourcesClient(preloadedState: {\n    siteVersion: SiteVersion | null\n    locale: string | undefined\n  }): ApiResourcesClient {\n    if (isServer() && this.apiKey) {\n      return new MakeswiftApiResourcesClient({\n        fetch: this.fetch,\n        apiKey: this.apiKey,\n        apiOrigin: this.apiOrigin,\n        graphqlApiEndpoint: this.graphqlApiEndpoint,\n        preloadedState,\n      })\n    }\n\n    return new HostApiResourcesClient({\n      fetch: this.fetch,\n      preloadedState,\n    })\n  }\n\n  private shouldUsePersistentStore(key: string): boolean {\n    // don't persist stores on the server unless the runtime instance is bound to a request\n    // and the requested store matches the request's site version and locale\n    return !isServer() || (this.requestKey !== undefined && storeCacheKey(this.requestKey) === key)\n  }\n}\n\nconst storeCacheKey = ({ siteVersion, locale }: StoreKey): string =>\n  `${siteVersionTag(siteVersion)}/${locale ?? 'default'}`\n\nconst siteVersionTag = (siteVersion: SiteVersion | null): string =>\n  siteVersion?.version ?? VERSION_TAG_LIVE\n\nfunction validateOrigin(url: string, name: string): string {\n  try {\n    return new URL(url).origin\n  } catch {\n    throw new Error(`The Makeswift runtime received an invalid \\`${name}\\` parameter: \"${url}\".`)\n  }\n}\n"],"mappings":"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","names":[]}

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

@@ -31,31 +31,12 @@ __export(fetch_api_resource_exports, {
   fetchAPIResource: () => fetchAPIResource
 });
 module.exports = __toCommonJS(fetch_api_resource_exports);
-var import_site_version = require("../../api/site-version");
 var SiteVersionState = __toESM(require("../modules/site-version"));
 var import_read_only_actions = require("../actions/internal/read-only-actions");
 var import_host_api = require("../host-api");
 var import_types = require("../../api/types");
 var import_state = require("./state");
-function fetchAPIResource(resourceType, resourceId, fetch, locale) {
-  const fetchVersioned = async (url, version) => {
-    const response = await fetch(url, {
-      headers: {
-        "Content-Type": "application/json",
-        ...version != null ? { [import_site_version.ApiHandlerHeaders.SiteVersion]: (0, import_site_version.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);
@@ -65,22 +46,12 @@ function fetchAPIResource(resourceType, resourceId, fetch, locale) {
     let resource;
     switch (resourceType) {
       case import_types.APIResourceType.Swatch:
-        resource = await fetchVersioned(`/api/makeswift/swatches/${resourceId}`, version);
-        break;
       case import_types.APIResourceType.File:
-        resource = await fetchVersioned(`/api/makeswift/files/${resourceId}`, version);
-        break;
       case import_types.APIResourceType.Typography:
-        resource = await fetchVersioned(
-          `/api/makeswift/typographies/${resourceId}`,
-          version
-        );
-        break;
       case import_types.APIResourceType.GlobalElement:
-        resource = await fetchVersioned(
-          `/api/makeswift/global-elements/${resourceId}`,
-          version
-        );
+      case import_types.APIResourceType.PagePathnameSlice:
+      case import_types.APIResourceType.Table:
+        resource = await fetchResource(resourceId, version, locale);
         break;
       case import_types.APIResourceType.LocalizedGlobalElement: {
         if (locale == null)
@@ -88,10 +59,7 @@ function fetchAPIResource(resourceType, resourceId, fetch, locale) {
         if ((0, import_state.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(
           (0, import_host_api.setLocalizedResourceId)({
             locale,
@@ -101,16 +69,6 @@ function fetchAPIResource(resourceType, resourceId, fetch, locale) {
         );
         break;
       }
-      case import_types.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 import_types.APIResourceType.Table:
-        resource = await fetchVersioned(`/api/makeswift/tables/${resourceId}`, version);
-        break;
       default:
         resource = null;
     }

package/dist/cjs/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":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,0BAA0E;AAE1E,uBAAkC;AAGlC,+BAAqC;AACrC,sBAAuC;AAEvC,mBAYO;AAEP,mBAAsF;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,sCAAkB,WAAW,OAAG,0CAAqB,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,YAAI,gCAAkB,OAAO,cAAc,YAAY,MAAM,GAAG;AAC9D,iBAAO,6BAAe,OAAO,cAAc,YAAY,MAAM;AAAA,IAC/D;AAEA,QAAI;AAEJ,YAAQ,cAAc;AAAA,MACpB,KAAK,6BAAgB;AACnB,mBAAW,MAAM,eAAuB,2BAA2B,UAAU,IAAI,OAAO;AACxF;AAAA,MAEF,KAAK,6BAAgB;AACnB,mBAAW,MAAM,eAAqB,wBAAwB,UAAU,IAAI,OAAO;AACnF;AAAA,MAEF,KAAK,6BAAgB;AACnB,mBAAW,MAAM;AAAA,UACf,+BAA+B,UAAU;AAAA,UACzC;AAAA,QACF;AACA;AAAA,MAEF,KAAK,6BAAgB;AACnB,mBAAW,MAAM;AAAA,UACf,kCAAkC,UAAU;AAAA,UAC5C;AAAA,QACF;AACA;AAAA,MAEF,KAAK,6BAAgB,wBAAwB;AAC3C,YAAI,UAAU;AAAM,gBAAM,IAAI,MAAM,oDAAoD;AAIxF,gBAAI,qCAAuB,OAAO,QAAQ,UAAU,MAAM,MAAM;AAC9D,iBAAO;AAAA,QACT;AAEA,mBAAW,MAAM;AAAA,UACf,4CAA4C,UAAU,IAAI,MAAM;AAAA,UAChE;AAAA,QACF;AAEA;AAAA,cACE,wCAAuB;AAAA,YACrB;AAAA,YACA;AAAA,YACA,qBAAqB,UAAU,MAAM;AAAA,UACvC,CAAC;AAAA,QACH;AAEA;AAAA,MACF;AAAA,MAEA,KAAK,6BAAgB,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,6BAAgB;AACnB,mBAAW,MAAM,eAAsB,yBAAyB,UAAU,IAAI,OAAO;AACrF;AAAA,MAEF;AACE,mBAAW;AAAA,IACf;AAEA,iBAAS,+CAAqB,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":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAIA,uBAAkC;AAGlC,+BAAqC;AACrC,sBAAuC;AAEvC,mBAKO;AAEP,mBAAsF;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,YAAI,gCAAkB,OAAO,cAAc,YAAY,MAAM,GAAG;AAC9D,iBAAO,6BAAe,OAAO,cAAc,YAAY,MAAM;AAAA,IAC/D;AAEA,QAAI;AAEJ,YAAQ,cAAc;AAAA,MACpB,KAAK,6BAAgB;AAAA,MACrB,KAAK,6BAAgB;AAAA,MACrB,KAAK,6BAAgB;AAAA,MACrB,KAAK,6BAAgB;AAAA,MACrB,KAAK,6BAAgB;AAAA,MACrB,KAAK,6BAAgB;AACnB,mBAAW,MAAM,cAAc,YAAY,SAAS,MAAM;AAC1D;AAAA,MAEF,KAAK,6BAAgB,wBAAwB;AAC3C,YAAI,UAAU;AAAM,gBAAM,IAAI,MAAM,oDAAoD;AAIxF,gBAAI,qCAAuB,OAAO,QAAQ,UAAU,MAAM,MAAM;AAC9D,iBAAO;AAAA,QACT;AAEA,mBAAW,MAAM,cAAc,YAAY,SAAS,MAAM;AAE1D;AAAA,cACE,wCAAuB;AAAA,YACrB;AAAA,YACA;AAAA,YACA,qBAAqB,UAAU,MAAM;AAAA,UACvC,CAAC;AAAA,QACH;AAEA;AAAA,MACF;AAAA,MAEA;AACE,mBAAW;AAAA,IACf;AAEA,iBAAS,+CAAqB,cAAc,YAAY,UAAU,MAAM,CAAC;AAEzE,WAAO;AAAA,EACT;AACF;","names":[]}

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"
+      "makeswift-runtime-version": "0.28.8-canary.1"
     });
   }
   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,50 @@
+import { configureClientStore } from "../state/api-client/client-store";
+import { ApiResourcesClient } from "./api-resources-client";
+class MakeswiftApiResourcesClient extends ApiResourcesClient {
+  restApiClient;
+  graphQlClient;
+  constructor({
+    fetch,
+    apiKey,
+    apiOrigin,
+    graphqlApiEndpoint,
+    preloadedState
+  }) {
+    super({
+      store: configureClientStore({ preloadedState })
+    });
+    this.restApiClient = (async () => {
+      const { MakeswiftRestAPIClient } = await import("./rest-api-client");
+      return new MakeswiftRestAPIClient({ fetch, apiKey, apiOrigin });
+    })();
+    this.graphQlClient = (async () => {
+      const { MakeswiftGraphQLApiClient } = await import("./graphql-api-client");
+      return new MakeswiftGraphQLApiClient({ endpoint: graphqlApiEndpoint });
+    })();
+  }
+  async fetchSwatchImpl(id, version) {
+    return (await this.restApiClient).getSwatch(id, version);
+  }
+  async fetchFileImpl(id, _version) {
+    return (await this.graphQlClient).getFile(id);
+  }
+  async fetchTypographyImpl(id, version) {
+    return (await this.restApiClient).getTypography(id, version);
+  }
+  async fetchGlobalElementImpl(id, version) {
+    return (await this.restApiClient).getGlobalElement(id, version);
+  }
+  async fetchLocalizedGlobalElementImpl(id, version, locale) {
+    return (await this.restApiClient).getLocalizedGlobalElement(id, locale, version);
+  }
+  async fetchPagePathnameSliceImpl(id, version, locale) {
+    return (await this.restApiClient).getPagePathnameSlice(id, version, { locale });
+  }
+  async fetchTableImpl(id, _version) {
+    return (await 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 { type SiteVersion } from './site-version'\n\n// see the comment in `MakeswiftApiResourcesClient` constructor below\nimport { type MakeswiftGraphQLApiClient } from './graphql-api-client'\nimport { type MakeswiftRestAPIClient } from './rest-api-client'\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: Promise<MakeswiftRestAPIClient>\n  private graphQlClient: Promise<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    // `MakeswiftApiResourcesClient` is used by the runtime and therefore will be imported\n    // on the client; lazy import server-side REST/GraphQL clients to avoid unnecessarily\n    // pulling their code into a client bundle.\n    //\n    // (we can't easily lazy-load `MakeswiftApiResourcesClient` itself, at it will make its\n    // construction async, but because it shares most of its implementation with\n    // `HostApiResourcesClient`, the overhead of this module on its own is negligible)\n    this.restApiClient = (async () => {\n      const { MakeswiftRestAPIClient } = await import('./rest-api-client')\n      return new MakeswiftRestAPIClient({ fetch, apiKey, apiOrigin })\n    })()\n\n    this.graphQlClient = (async () => {\n      const { MakeswiftGraphQLApiClient } = await import('./graphql-api-client')\n      return new MakeswiftGraphQLApiClient({ endpoint: graphqlApiEndpoint })\n    })()\n  }\n\n  protected async fetchSwatchImpl(id: string, version: SiteVersion | null): Promise<Swatch | null> {\n    return (await 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 (await this.graphQlClient).getFile(id)\n  }\n\n  protected async fetchTypographyImpl(\n    id: string,\n    version: SiteVersion | null,\n  ): Promise<Typography | null> {\n    return (await this.restApiClient).getTypography(id, version)\n  }\n\n  protected async fetchGlobalElementImpl(\n    id: string,\n    version: SiteVersion | null,\n  ): Promise<GlobalElement | null> {\n    return (await 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 (await 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 (await 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 (await this.graphQlClient).getTable(id)\n  }\n}\n"],"mappings":"AACA,SAAS,4BAA4B;AAarC,SAAS,0BAA0B;AAc5B,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;AASD,SAAK,iBAAiB,YAAY;AAChC,YAAM,EAAE,uBAAuB,IAAI,MAAM,OAAO,mBAAmB;AACnE,aAAO,IAAI,uBAAuB,EAAE,OAAO,QAAQ,UAAU,CAAC;AAAA,IAChE,GAAG;AAEH,SAAK,iBAAiB,YAAY;AAChC,YAAM,EAAE,0BAA0B,IAAI,MAAM,OAAO,sBAAsB;AACzE,aAAO,IAAI,0BAA0B,EAAE,UAAU,mBAAmB,CAAC;AAAA,IACvE,GAAG;AAAA,EACL;AAAA,EAEA,MAAgB,gBAAgB,IAAY,SAAqD;AAC/F,YAAQ,MAAM,KAAK,eAAe,UAAU,IAAI,OAAO;AAAA,EACzD;AAAA,EAEA,MAAgB,cAAc,IAAY,UAAoD;AAE5F,YAAQ,MAAM,KAAK,eAAe,QAAQ,EAAE;AAAA,EAC9C;AAAA,EAEA,MAAgB,oBACd,IACA,SAC4B;AAC5B,YAAQ,MAAM,KAAK,eAAe,cAAc,IAAI,OAAO;AAAA,EAC7D;AAAA,EAEA,MAAgB,uBACd,IACA,SAC+B;AAC/B,YAAQ,MAAM,KAAK,eAAe,iBAAiB,IAAI,OAAO;AAAA,EAChE;AAAA,EAEA,MAAgB,gCACd,IACA,SACA,QACwC;AACxC,YAAQ,MAAM,KAAK,eAAe,0BAA0B,IAAI,QAAQ,OAAO;AAAA,EACjF;AAAA,EAEA,MAAgB,2BACd,IACA,SACA,QACmC;AACnC,YAAQ,MAAM,KAAK,eAAe,qBAAqB,IAAI,SAAS,EAAE,OAAO,CAAC;AAAA,EAChF;AAAA,EAEA,MAAgB,eAAe,IAAY,UAAqD;AAE9F,YAAQ,MAAM,KAAK,eAAe,SAAS,EAAE;AAAA,EAC/C;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"
+      "makeswift-runtime-version": "0.28.8-canary.1"
     });
     if (siteVersion?.token) {
       requestUrl.searchParams.set("version", siteVersion.version);