@makeswift/runtime 0.28.8-canary.8 → 0.28.8

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

@@ -1,4 +1,9 @@
+import ky, { HTTPError, isHTTPError } from "ky";
 import * as Schema from "./schema";
+const RetryBackoffConfig = {
+  MaxAttempts: 3,
+  MaxDelayMs: 5e3
+};
 class MakeswiftRestAPIClient {
   _fetch;
   apiKey;
@@ -8,7 +13,28 @@ class MakeswiftRestAPIClient {
     apiKey,
     apiOrigin
   }) {
-    this._fetch = fetch;
+    this._fetch = ky.create({
+      fetch,
+      timeout: false,
+      retry: {
+        statusCodes: [429],
+        limit: RetryBackoffConfig.MaxAttempts,
+        backoffLimit: RetryBackoffConfig.MaxDelayMs,
+        delay: (attemptCount) => 2 ** (attemptCount - 1) * 1e3,
+        jitter: true
+      },
+      hooks: {
+        beforeRetry: [
+          async ({ request, error, retryCount }) => {
+            console.warn(
+              `Request to ${request.url} failed with ${error}. Retrying (${retryCount}/${RetryBackoffConfig.MaxAttempts})`
+            );
+            if (isHTTPError(error))
+              await failedResponseBody(error.response);
+          }
+        ]
+      }
+    });
     this.apiKey = apiKey;
     this.apiOrigin = apiOrigin;
   }
@@ -16,13 +42,12 @@ class MakeswiftRestAPIClient {
     const response = await this.fetch(`v3/swatches/${swatchId}`, siteVersion);
     if (!response.ok) {
       const failedBody = await failedResponseBody(response);
-      if (response.status !== 404) {
-        console.error(`Failed to get swatch '${swatchId}'`, {
-          response: failedBody,
-          siteVersion
-        });
-      }
-      return null;
+      if (response.status === 404)
+        return null;
+      throw new RestApiClientError(`Failed to get swatch '${swatchId}'`, response, {
+        body: failedBody,
+        siteVersion
+      });
     }
     const swatch = await response.json();
     return swatch;
@@ -31,13 +56,12 @@ class MakeswiftRestAPIClient {
     const response = await this.fetch(`v3/typographies/${typographyId}`, siteVersion);
     if (!response.ok) {
       const failedBody = await failedResponseBody(response);
-      if (response.status !== 404) {
-        console.error(`Failed to get typography '${typographyId}'`, {
-          response: failedBody,
-          siteVersion
-        });
-      }
-      return null;
+      if (response.status === 404)
+        return null;
+      throw new RestApiClientError(`Failed to get typography '${typographyId}'`, response, {
+        body: failedBody,
+        siteVersion
+      });
     }
     const typography = await response.json();
     return typography;
@@ -46,13 +70,12 @@ class MakeswiftRestAPIClient {
     const response = await this.fetch(`v3/global-elements/${globalElementId}`, siteVersion);
     if (!response.ok) {
       const failedBody = await failedResponseBody(response);
-      if (response.status !== 404) {
-        console.error(`Failed to get global element '${globalElementId}'`, {
-          response: failedBody,
-          siteVersion
-        });
-      }
-      return null;
+      if (response.status === 404)
+        return null;
+      throw new RestApiClientError(`Failed to get global element '${globalElementId}'`, response, {
+        body: failedBody,
+        siteVersion
+      });
     }
     const globalElement = await response.json();
     return globalElement;
@@ -64,14 +87,13 @@ class MakeswiftRestAPIClient {
     );
     if (!response.ok) {
       const failedBody = await failedResponseBody(response);
-      if (response.status !== 404) {
-        console.error(`Failed to get localized global element '${globalElementId}'`, {
-          response: failedBody,
-          siteVersion,
-          locale
-        });
-      }
-      return null;
+      if (response.status === 404)
+        return null;
+      throw new RestApiClientError(
+        `Failed to get localized global element '${globalElementId}'`,
+        response,
+        { body: failedBody, siteVersion, locale }
+      );
     }
     const localizedGlobalElement = await response.json();
     return localizedGlobalElement;
@@ -85,12 +107,14 @@ class MakeswiftRestAPIClient {
       url.searchParams.set("locale", locale);
     const response = await this.fetch(url.pathname + url.search, siteVersion);
     if (!response.ok) {
-      console.error(`Failed to get page pathname slice(s) for ${pageIds.join(", ")}`, {
-        response: await failedResponseBody(response),
-        siteVersion,
-        locale
-      });
-      return [];
+      const failedBody = await failedResponseBody(response);
+      if (response.status === 404)
+        return [];
+      throw new RestApiClientError(
+        `Failed to get page pathname slice(s) for ${pageIds.join(", ")}`,
+        response,
+        { body: failedBody, siteVersion, locale }
+      );
     }
     const json = await response.json();
     const pagePathnameSlices = Schema.pagePathnameSlices.parse(json);
@@ -113,7 +137,7 @@ class MakeswiftRestAPIClient {
     const requestHeaders = new Headers({
       "x-api-key": this.apiKey,
       "makeswift-site-api-key": this.apiKey,
-      "makeswift-runtime-version": "0.28.8-canary.8"
+      "makeswift-runtime-version": "0.28.8"
     });
     if (siteVersion?.token) {
       requestUrl.searchParams.set("version", siteVersion.version);
@@ -124,12 +148,17 @@ class MakeswiftRestAPIClient {
         requestHeaders.set(key, value);
       });
     }
-    const response = await this._fetch(requestUrl.toString(), {
-      ...init,
-      headers: requestHeaders,
-      ...siteVersion != null ? { cache: "no-store" } : {}
-    });
-    return response;
+    try {
+      return await this._fetch(requestUrl.toString(), {
+        ...init,
+        headers: requestHeaders,
+        ...siteVersion != null ? { cache: "no-store" } : {}
+      });
+    } catch (error) {
+      if (error instanceof HTTPError)
+        return error.response;
+      throw error;
+    }
   }
 }
 async function failedResponseBody(response) {
@@ -144,8 +173,20 @@ async function failedResponseBody(response) {
     return `Failed to extract response body: ${e}`;
   }
 }
+function responseError(response) {
+  return `${response.status} ${response.statusText}`;
+}
+class RestApiClientError extends Error {
+  status;
+  constructor(message, response, cause) {
+    super(`${message}: ${responseError(response)}`, { cause });
+    this.name = "RestApiClientError";
+    this.status = response.status;
+  }
+}
 export {
   MakeswiftRestAPIClient,
+  RestApiClientError,
   failedResponseBody
 };
 //# sourceMappingURL=rest-api-client.js.map

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 | 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":"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,IAAgC,CAAC,GACP;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 ky, { HTTPError, isHTTPError, type KyInstance } from 'ky'\n\nimport {\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\nconst RetryBackoffConfig = {\n  MaxAttempts: 3,\n  MaxDelayMs: 5_000,\n}\n\nexport class MakeswiftRestAPIClient {\n  private _fetch: KyInstance\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 = ky.create({\n      fetch,\n      timeout: false,\n      retry: {\n        statusCodes: [429],\n        limit: RetryBackoffConfig.MaxAttempts,\n        backoffLimit: RetryBackoffConfig.MaxDelayMs,\n        delay: attemptCount => 2 ** (attemptCount - 1) * 1000,\n        jitter: true,\n      },\n      hooks: {\n        beforeRetry: [\n          async ({ request, error, retryCount }) => {\n            console.warn(\n              `Request to ${request.url} failed with ${error}. Retrying (${retryCount}/${RetryBackoffConfig.MaxAttempts})`,\n            )\n            // Drain the response body before retrying so we don't leak unconsumed\n            // response bodies (see the comment on `failedResponseBody` below).\n            if (isHTTPError(error)) await failedResponseBody(error.response)\n          },\n        ],\n      },\n    })\n\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) return null\n\n      throw new RestApiClientError(`Failed to get swatch '${swatchId}'`, response, {\n        body: failedBody,\n        siteVersion,\n      })\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) return null\n\n      throw new RestApiClientError(`Failed to get typography '${typographyId}'`, response, {\n        body: failedBody,\n        siteVersion,\n      })\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) return null\n\n      throw new RestApiClientError(`Failed to get global element '${globalElementId}'`, response, {\n        body: failedBody,\n        siteVersion,\n      })\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) return null\n\n      throw new RestApiClientError(\n        `Failed to get localized global element '${globalElementId}'`,\n        response,\n        { body: failedBody, siteVersion, locale },\n      )\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      const failedBody = await failedResponseBody(response)\n      if (response.status === 404) return []\n\n      throw new RestApiClientError(\n        `Failed to get page pathname slice(s) for ${pageIds.join(', ')}`,\n        response,\n        { body: failedBody, siteVersion, locale },\n      )\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    try {\n      return await this._fetch(requestUrl.toString(), {\n        ...init,\n        headers: requestHeaders,\n        ...(siteVersion != null ? { cache: 'no-store' } : {}),\n      })\n    } catch (error) {\n      if (error instanceof HTTPError) return error.response\n      throw error\n    }\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\nfunction responseError(response: Response): string {\n  return `${response.status} ${response.statusText}`\n}\n\nexport class RestApiClientError extends Error {\n  readonly status: number\n\n  constructor(message: string, response: Response, cause: Record<string, unknown>) {\n    super(`${message}: ${responseError(response)}`, { cause })\n\n    this.name = 'RestApiClientError'\n    this.status = response.status\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 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":[]}
+{"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 = (input: string | URL | Request, 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.8-canary.8",
+    version: "0.28.8",
     interactionMode: true,
     clientSideNavigation: false,
     elementFromPoint: false,

package/dist/esm/builder/host-to-builder-actions.js

@@ -1,8 +1,6 @@
 import { isAction } from "@reduxjs/toolkit";
-import {
-  ReadOnlyActionTypes
-} from "../state/actions/internal/read-only-actions";
-import { BuilderActionTypes } from "../state/builder-api/actions";
+import { ReadOnlyActionTypes } from "../state/actions/internal/read-only-action-types";
+import { BuilderActionTypes } from "../state/builder-api/action-types";
 const HostToBuilderActionTypes = {
   ...BuilderActionTypes,
   REGISTER_COMPONENT: ReadOnlyActionTypes.REGISTER_COMPONENT,

package/dist/esm/builder/host-to-builder-actions.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/builder/host-to-builder-actions.ts"],"sourcesContent":["import { isAction } from '@reduxjs/toolkit'\n\n// in the past, we reused the same action type for registering components both internally\n// and in the builder; they have been since split into two separate action types,\n// REGISTER_COMPONENT and REGISTER_BUILDER_COMPONENT, but we still have to expose what\n// are now internal actions to the builder for backward compatibility with the older runtimes\nimport {\n  type RegisterComponentAction,\n  type UnregisterComponentAction,\n  ReadOnlyActionTypes,\n} from '../state/actions/internal/read-only-actions'\n\nimport { type BuilderAction, BuilderActionTypes } from '../state/builder-api/actions'\n\nexport const HostToBuilderActionTypes = {\n  ...BuilderActionTypes,\n  REGISTER_COMPONENT: ReadOnlyActionTypes.REGISTER_COMPONENT,\n  UNREGISTER_COMPONENT: ReadOnlyActionTypes.UNREGISTER_COMPONENT,\n} as const\n\nexport type HostToBuilderAction =\n  | BuilderAction\n  | RegisterComponentAction\n  | UnregisterComponentAction\n\nexport function isHostToBuilderAction(action: unknown): action is HostToBuilderAction {\n  return isAction(action) && Object.hasOwn(HostToBuilderActionTypes, action.type)\n}\n"],"mappings":"AAAA,SAAS,gBAAgB;AAMzB;AAAA,EAGE;AAAA,OACK;AAEP,SAA6B,0BAA0B;AAEhD,MAAM,2BAA2B;AAAA,EACtC,GAAG;AAAA,EACH,oBAAoB,oBAAoB;AAAA,EACxC,sBAAsB,oBAAoB;AAC5C;AAOO,SAAS,sBAAsB,QAAgD;AACpF,SAAO,SAAS,MAAM,KAAK,OAAO,OAAO,0BAA0B,OAAO,IAAI;AAChF;","names":[]}
+{"version":3,"sources":["../../../src/builder/host-to-builder-actions.ts"],"sourcesContent":["import { isAction } from '@reduxjs/toolkit'\n\n// in the past, we reused the same action type for registering components both internally\n// and in the builder; they have been since split into two separate action types,\n// REGISTER_COMPONENT and REGISTER_BUILDER_COMPONENT, but we still have to expose what\n// are now internal actions to the builder for backward compatibility with the older runtimes\nimport { ReadOnlyActionTypes } from '../state/actions/internal/read-only-action-types'\nimport {\n  type RegisterComponentAction,\n  type UnregisterComponentAction,\n} from '../state/actions/internal/read-only-actions'\n\nimport { BuilderActionTypes } from '../state/builder-api/action-types'\nimport { type BuilderAction } from '../state/builder-api/actions'\n\nexport const HostToBuilderActionTypes = {\n  ...BuilderActionTypes,\n  REGISTER_COMPONENT: ReadOnlyActionTypes.REGISTER_COMPONENT,\n  UNREGISTER_COMPONENT: ReadOnlyActionTypes.UNREGISTER_COMPONENT,\n} as const\n\nexport type HostToBuilderAction =\n  | BuilderAction\n  | RegisterComponentAction\n  | UnregisterComponentAction\n\nexport function isHostToBuilderAction(action: unknown): action is HostToBuilderAction {\n  return isAction(action) && Object.hasOwn(HostToBuilderActionTypes, action.type)\n}\n"],"mappings":"AAAA,SAAS,gBAAgB;AAMzB,SAAS,2BAA2B;AAMpC,SAAS,0BAA0B;AAG5B,MAAM,2BAA2B;AAAA,EACtC,GAAG;AAAA,EACH,oBAAoB,oBAAoB;AAAA,EACxC,sBAAsB,oBAAoB;AAC5C;AAOO,SAAS,sBAAsB,QAAgD;AACpF,SAAO,SAAS,MAAM,KAAK,OAAO,OAAO,0BAA0B,OAAO,IAAI;AAChF;","names":[]}

package/dist/esm/client/index.js

@@ -3,7 +3,11 @@ import {
 } from "../api/types";
 import { CacheData } from "../api/api-resources-client";
 import { MakeswiftGraphQLApiClient } from "../api/graphql-api-client";
-import { MakeswiftRestAPIClient, failedResponseBody } from "../api/rest-api-client";
+import {
+  MakeswiftRestAPIClient,
+  failedResponseBody,
+  RestApiClientError
+} from "../api/rest-api-client";
 import {
   getElementChildren,
   getSwatchIds,
@@ -58,12 +62,12 @@ Received "${apiKey}" instead.`
     const queryParams = getPagesQueryParams(params);
     const response = await this.fetch(`v5/pages?${queryParams.toString()}`, siteVersion);
     if (!response.ok) {
-      console.error("Failed to get pages", {
-        response: await failedResponseBody(response),
+      const body = await failedResponseBody(response);
+      throw new RestApiClientError("Failed to get pages", response, {
+        body,
         siteVersion,
         params
       });
-      throw new Error(`Failed to get pages: ${responseError(response)}`);
     }
     const result = await response.json();
     const parsedResponse = Schema.getPagesResult.safeParse(result);
@@ -84,12 +88,11 @@ Received "${apiKey}" instead.`
       const failedBody = await failedResponseBody(response);
       if (response.status === 404)
         return null;
-      console.error(`Failed to get page snapshot for '${pathname}'`, {
-        response: failedBody,
+      throw new RestApiClientError(`Failed to get page snapshot for '${pathname}'`, response, {
+        body: failedBody,
         siteVersion,
         locale
       });
-      throw new Error(`Failed to get page snapshot for '${pathname}': ${responseError(response)}`);
     }
     const json = await response.json();
     return Schema.getPageResult.parse(json);
@@ -103,11 +106,14 @@ Received "${apiKey}" instead.`
     });
     const response = await this.fetch(url.pathname + url.search, siteVersion);
     if (!response.ok) {
-      console.error(`Failed to get typographies for [${typographyIds.join(", ")}]`, {
-        response: await failedResponseBody(response),
-        siteVersion
-      });
-      return [];
+      const failedBody = await failedResponseBody(response);
+      if (response.status === 404)
+        return [];
+      throw new RestApiClientError(
+        `Failed to get typographies for [${typographyIds.join(", ")}]`,
+        response,
+        { body: failedBody, siteVersion }
+      );
     }
     const body = await response.json();
     return body;
@@ -121,11 +127,13 @@ Received "${apiKey}" instead.`
     });
     const response = await this.fetch(url.pathname + url.search, siteVersion);
     if (!response.ok) {
-      console.error(`Failed to get swatches for ${ids.join(", ")}`, {
-        response: await failedResponseBody(response),
+      const failedBody = await failedResponseBody(response);
+      if (response.status === 404)
+        return [];
+      throw new RestApiClientError(`Failed to get swatches for ${ids.join(", ")}`, response, {
+        body: failedBody,
         siteVersion
       });
-      return [];
     }
     return await response.json();
   }
@@ -144,12 +152,11 @@ Received "${apiKey}" instead.`
       const failedBody = await failedResponseBody(response);
       if (response.status === 404)
         return ids.map(() => null);
-      console.error(`Failed to get element trees for [${ids.join(", ")}]`, {
-        response: failedBody,
-        siteVersion,
-        locale
-      });
-      throw new Error(`Failed to get element trees: ${responseError(response)}`);
+      throw new RestApiClientError(
+        `Failed to get element trees for [${ids.join(", ")}]`,
+        response,
+        { body: failedBody, siteVersion, locale }
+      );
     }
     const responseBody = await response.json();
     return responseBody.map(
@@ -497,12 +504,11 @@ Received "${apiKey}" instead.`
       const failedBody = await failedResponseBody(response);
       if (response.status === 404)
         return null;
-      console.error(`Failed to get page snapshot for '${pathname}'`, {
-        response: failedBody,
+      throw new RestApiClientError(`Failed to get page snapshot for '${pathname}'`, response, {
+        body: failedBody,
         siteVersion,
         locale
       });
-      throw new Error(`Failed to get page snapshot for '${pathname}': ${responseError(response)}`);
     }
     const document = await response.json();
     const baseLocalizedPage = document.localizedPages.find(({ parentId }) => parentId == null);
@@ -536,12 +542,11 @@ Received "${apiKey}" instead.`
         if (response.status === 404) {
           return null;
         }
-        console.error(`Failed to get component snapshot for '${id}':`, {
-          response: failedBody,
+        throw new RestApiClientError(`Failed to get component snapshot for '${id}'`, response, {
+          body: failedBody,
           siteVersion,
           locale
         });
-        throw new Error(`Failed to get component snapshot for '${id}': ${responseError(response)}`);
       }
       const responseBody = await response.json();
       const parsed = Schema.componentDocumentResponse.parse(responseBody);
@@ -664,14 +669,9 @@ Received "${apiKey}" instead.`
     return mergeTranslatedContent(this.getElementDescriptors(), elementTree, translatedData);
   }
   async readPreviewToken(token) {
-    const response = await fetch(new URL("v1/preview-tokens/reads", this.apiOrigin).toString(), {
+    const response = await this.fetch("v1/preview-tokens/reads", null, {
       method: "POST",
-      headers: {
-        "x-api-key": this.apiKey,
-        "makeswift-site-api-key": this.apiKey,
-        "makeswift-runtime-version": "0.28.8-canary.8",
-        "content-type": "application/json"
-      },
+      headers: { "content-type": "application/json" },
       body: JSON.stringify({ token }),
       cache: "no-store"
     });
@@ -681,12 +681,13 @@ Received "${apiKey}" instead.`
         console.error(`Preview token is invalid or expired`, {
           response: failedBody
         });
-      } else if (response.status !== 404) {
-        console.error(`Failed to verify preview token`, {
-          response: failedBody
-        });
+        return null;
       }
-      return null;
+      if (response.status === 404)
+        return null;
+      throw new RestApiClientError(`Failed to verify preview token`, response, {
+        body: failedBody
+      });
     }
     const json = await response.json();
     const parsed = Schema.previewTokenPayload.safeParse(json);
@@ -700,11 +701,13 @@ Received "${apiKey}" instead.`
   async unstable_getFonts(siteVersion = null) {
     const response = await this.fetch("v1_unstable/fonts", siteVersion);
     if (!response.ok) {
-      console.error("Failed to fetch fonts", {
-        response: await failedResponseBody(response),
+      const failedBody = await failedResponseBody(response);
+      if (response.status === 404)
+        return null;
+      throw new RestApiClientError("Failed to fetch fonts", response, {
+        body: failedBody,
         siteVersion
       });
-      return null;
     }
     const json = await response.json();
     const parsed = Schema.fonts.safeParse(json);
@@ -747,9 +750,6 @@ function getPagesQueryParams({
     params.set("locale", locale);
   return params;
 }
-function responseError(response) {
-  return `${response.status} ${response.statusText}`;
-}
 export {
   MakeswiftClient,
   SnippetLocation,