@makeswift/runtime 0.28.10-canary.9 → 0.29.0-canary.20

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

@@ -27,7 +27,7 @@ class MakeswiftGraphQLApiClient {
   graphqlClient;
   constructor({ endpoint }) {
     this.graphqlClient = new import_client.GraphQLClient(endpoint, {
-      "makeswift-runtime-version": "0.28.10-canary.9"
+      "makeswift-runtime-version": "0.29.0-canary.20"
     });
   }
   async getUnversionedResources({

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

@@ -35,6 +35,7 @@ __export(rest_api_client_exports, {
 module.exports = __toCommonJS(rest_api_client_exports);
 var import_ky = __toESM(require("./ky"));
 var Schema = __toESM(require("./schema"));
+const MAX_GLOBAL_ELEMENTS_PER_REQUEST = 100;
 const RetryBackoffConfig = {
   MaxAttempts: 3,
   MaxDelayMs: 5e3
@@ -52,7 +53,7 @@ class MakeswiftRestAPIClient {
       fetch,
       timeout: false,
       retry: {
-        statusCodes: [429],
+        statusCodes: [408, 429, 500, 502, 503, 504],
         limit: RetryBackoffConfig.MaxAttempts,
         backoffLimit: RetryBackoffConfig.MaxDelayMs,
         delay: (attemptCount) => 2 ** (attemptCount - 1) * 1e3,
@@ -128,6 +129,30 @@ class MakeswiftRestAPIClient {
     const globalElement = await response.json();
     return globalElement;
   }
+  async getGlobalElements(globalElementIds, siteVersion, { locale } = {}) {
+    const getGlobalElementsBatch = async (ids) => {
+      const url = new URL(`content/v1/global-elements/bulk`, this.apiOrigin);
+      ids.forEach((id) => url.searchParams.append("ids", id));
+      if (locale != null)
+        url.searchParams.set("locale", locale);
+      const response = await this.fetch(url.pathname + url.search, siteVersion);
+      if (!response.ok) {
+        const failedBody = await failedResponseBody(response);
+        throw new RestApiClientError(
+          `Failed to get global elements for [${ids.join(", ")}]`,
+          response,
+          { body: failedBody, siteVersion, locale }
+        );
+      }
+      return await response.json();
+    };
+    const batches = [];
+    for (let i = 0; i < globalElementIds.length; i += MAX_GLOBAL_ELEMENTS_PER_REQUEST) {
+      batches.push(globalElementIds.slice(i, i + MAX_GLOBAL_ELEMENTS_PER_REQUEST));
+    }
+    const results = await Promise.all(batches.map(getGlobalElementsBatch));
+    return results.flat();
+  }
   async getLocalizedGlobalElement(globalElementId, locale, siteVersion) {
     const response = await this.fetch(
       `v3/localized-global-elements/${globalElementId}?locale=${locale}`,
@@ -198,7 +223,7 @@ class MakeswiftRestAPIClient {
     const requestHeaders = new Headers({
       "x-api-key": this.apiKey,
       "makeswift-site-api-key": this.apiKey,
-      "makeswift-runtime-version": "0.28.10-canary.9"
+      "makeswift-runtime-version": "0.29.0-canary.20"
     });
     if (siteVersion?.token) {
       requestUrl.searchParams.set("version", siteVersion.version);

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/api/rest-api-client.ts"],"sourcesContent":["import ky, { HTTPError, isHTTPError, type KyInstance } from './ky'\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 } 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 getFile(fileId: string): Promise<File | null> {\n    const response = await this.fetch(`v1/files/${fileId}`, null)\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 file '${fileId}'`, response, {\n        body: failedBody,\n      })\n    }\n\n    const file = await response.json()\n\n    return file\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 getTable(tableId: string): Promise<Table | null> {\n    const response = await this.fetch(`v1/tables/${tableId}`, null)\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 table '${tableId}'`, response, {\n        body: failedBody,\n      })\n    }\n\n    const table = await response.json()\n\n    return table\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":["ky"]}
+{"version":3,"sources":["../../../src/api/rest-api-client.ts"],"sourcesContent":["import ky, { HTTPError, isHTTPError, type KyInstance } from './ky'\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 } from './site-version'\nimport * as Schema from './schema'\n\nexport type GlobalElementWithLocalized = {\n  base: GlobalElement | null\n  localized: LocalizedGlobalElement | null\n}\n\nconst MAX_GLOBAL_ELEMENTS_PER_REQUEST = 100\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: [408, 429, 500, 502, 503, 504],\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 getFile(fileId: string): Promise<File | null> {\n    const response = await this.fetch(`v1/files/${fileId}`, null)\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 file '${fileId}'`, response, {\n        body: failedBody,\n      })\n    }\n\n    const file = await response.json()\n\n    return file\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 getGlobalElements(\n    globalElementIds: string[],\n    siteVersion: SiteVersion | null,\n    { locale }: { locale?: string | null } = {},\n  ): Promise<GlobalElementWithLocalized[]> {\n    const getGlobalElementsBatch = async (ids: string[]): Promise<GlobalElementWithLocalized[]> => {\n      const url = new URL(`content/v1/global-elements/bulk`, this.apiOrigin)\n\n      ids.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\n        throw new RestApiClientError(\n          `Failed to get global elements for [${ids.join(', ')}]`,\n          response,\n          { body: failedBody, siteVersion, locale },\n        )\n      }\n\n      return await response.json()\n    }\n\n    const batches: string[][] = []\n\n    for (let i = 0; i < globalElementIds.length; i += MAX_GLOBAL_ELEMENTS_PER_REQUEST) {\n      batches.push(globalElementIds.slice(i, i + MAX_GLOBAL_ELEMENTS_PER_REQUEST))\n    }\n\n    const results = await Promise.all(batches.map(getGlobalElementsBatch))\n\n    return results.flat()\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 getTable(tableId: string): Promise<Table | null> {\n    const response = await this.fetch(`v1/tables/${tableId}`, null)\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 table '${tableId}'`, response, {\n        body: failedBody,\n      })\n    }\n\n    const table = await response.json()\n\n    return table\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":["ky"]}

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

@@ -28,7 +28,7 @@ async function manifestHandler(req, { apiKey, manifest }) {
     return import_request_response.ApiResponse.json({ message: "Unauthorized" }, { status: 401 });
   }
   return import_request_response.ApiResponse.json({
-    version: "0.28.10-canary.9",
+    version: "0.29.0-canary.20",
     interactionMode: true,
     clientSideNavigation: false,
     elementFromPoint: false,

package/dist/cjs/client/index.js

@@ -187,128 +187,14 @@ Received "${apiKey}" instead.`
     const swatches = await this.getSwatches(swatchIds, siteVersion);
     return { ...unversionedResources, swatches };
   }
-  // TODO: Consolidate this method with the introspectMany method once the
-  // unstable_getComponentSnapshots method is stable and tested in production.
   async introspect(element, siteVersion, locale) {
-    const descriptors = this.getElementDescriptors();
-    const swatchIds = /* @__PURE__ */ new Set();
-    const fileIds = /* @__PURE__ */ new Set();
-    const typographyIds = /* @__PURE__ */ new Set();
-    const tableIds = /* @__PURE__ */ new Set();
-    const pageIds = /* @__PURE__ */ new Set();
-    const globalElements = /* @__PURE__ */ new Map();
-    const localizedGlobalElements = /* @__PURE__ */ new Map();
-    const localizedResourcesMap = /* @__PURE__ */ new Map();
-    const remaining = [element];
-    const seen = /* @__PURE__ */ new Set();
-    let current;
-    while (current = remaining.pop()) {
-      let getResourcesFromElementDescriptors2 = function(elementDescriptors2, props) {
-        Object.entries(elementDescriptors2).forEach(([propName, descriptor]) => {
-          (0, import_introspection.getSwatchIds)(descriptor, props[propName]).forEach((swatchId) => {
-            swatchIds.add(swatchId);
-          });
-          (0, import_introspection.getFileIds)(descriptor, props[propName]).forEach((fileId) => fileIds.add(fileId));
-          (0, import_introspection.getTypographyIds)(descriptor, props[propName]).forEach(
-            (typographyId) => typographyIds.add(typographyId)
-          );
-          (0, import_introspection.getTableIds)(descriptor, props[propName]).forEach((tableId) => tableIds.add(tableId));
-          (0, import_introspection.getPageIds)(descriptor, props[propName]).forEach((pageId) => pageIds.add(pageId));
-          (0, import_introspection.getElementChildren)(descriptor, props[propName]).forEach((child) => {
-            if (!seen.has(child.key)) {
-              seen.add(child.key);
-              remaining.push(child);
-            }
-          });
-        });
-      };
-      var getResourcesFromElementDescriptors = getResourcesFromElementDescriptors2;
-      let element2;
-      if ((0, import_read_only_state.isElementReference)(current)) {
-        const globalElementId = current.value;
-        const globalElement = await this.getGlobalElement(globalElementId, siteVersion);
-        let elementData = globalElement?.data;
-        if (locale) {
-          const localizedGlobalElement = await this.getLocalizedGlobalElement(
-            globalElementId,
-            locale,
-            siteVersion
-          );
-          if (localizedGlobalElement) {
-            elementData = localizedGlobalElement.data;
-            localizedResourcesMap.set(globalElementId, localizedGlobalElement.id);
-            localizedGlobalElements.set(localizedGlobalElement.id, localizedGlobalElement);
-          } else {
-            localizedResourcesMap.set(globalElementId, null);
-          }
-        }
-        globalElements.set(globalElementId, globalElement);
-        if (elementData == null)
-          continue;
-        element2 = elementData;
-      } else {
-        element2 = current;
-      }
-      const elementDescriptors = descriptors.get(element2.type);
-      if (elementDescriptors == null)
-        continue;
-      getResourcesFromElementDescriptors2(elementDescriptors, element2.props);
-    }
-    const typographies = await this.getTypographies([...typographyIds], siteVersion);
-    typographies.forEach((typography) => {
-      typography?.style.forEach((style) => {
-        const swatchId = style.value.color?.swatchId;
-        if (swatchId != null)
-          swatchIds.add(swatchId);
-      });
-    });
-    const pagePathnames = await this.getPagePathnameSlices([...pageIds], siteVersion, { locale });
-    const { swatches, files, tables } = await this.getIntrospectedResources(
-      {
-        swatchIds: [...swatchIds],
-        fileIds: [...fileIds],
-        tableIds: [...tableIds]
-      },
-      siteVersion
+    const treeId = "root";
+    const cacheDataMap = await this.introspectMany(
+      [{ id: treeId, data: element }],
+      siteVersion,
+      locale
     );
-    const apiResources = {
-      [import_types2.APIResourceType.Swatch]: [...swatchIds].map((id) => ({
-        id,
-        value: swatches.find((swatch) => swatch?.id === id) ?? null
-      })),
-      [import_types2.APIResourceType.File]: [...fileIds].map((id) => ({
-        id,
-        value: files.find((file) => file?.id === id) ?? null
-      })),
-      [import_types2.APIResourceType.Typography]: [...typographyIds].map((id) => ({
-        id,
-        value: typographies.find((typography) => typography?.id === id) ?? null
-      })),
-      [import_types2.APIResourceType.Table]: [...tableIds].map((id) => ({
-        id,
-        value: tables.find((table) => table?.id === id) ?? null
-      })),
-      [import_types2.APIResourceType.PagePathnameSlice]: [...pageIds].map((id) => ({
-        id,
-        value: pagePathnames.find((pagePathnameSlice) => pagePathnameSlice?.id === id) ?? null,
-        locale
-      })),
-      [import_types2.APIResourceType.GlobalElement]: [...globalElements.entries()].map(([id, value]) => ({
-        id,
-        value
-      })),
-      [import_types2.APIResourceType.LocalizedGlobalElement]: [...localizedGlobalElements.entries()].map(
-        ([id, value]) => ({
-          id,
-          value,
-          locale
-        })
-      )
-    };
-    return {
-      apiResources,
-      localizedResourcesMap: locale != null ? { [locale]: Object.fromEntries(localizedResourcesMap.entries()) } : {}
-    };
+    return cacheDataMap.get(treeId);
   }
   async introspectMany(trees, siteVersion, locale) {
     if (trees.length === 0)
@@ -316,106 +202,116 @@ Received "${apiKey}" instead.`
     const descriptors = this.getElementDescriptors();
     const globalElementCache = /* @__PURE__ */ new Map();
     const localizedGlobalElementCache = /* @__PURE__ */ new Map();
-    const treeCaches = new Map(
+    function createTreeCache() {
+      return {
+        swatchIds: /* @__PURE__ */ new Set(),
+        fileIds: /* @__PURE__ */ new Set(),
+        typographyIds: /* @__PURE__ */ new Set(),
+        tableIds: /* @__PURE__ */ new Set(),
+        pageIds: /* @__PURE__ */ new Set(),
+        globalElements: /* @__PURE__ */ new Map(),
+        localizedGlobalElements: /* @__PURE__ */ new Map(),
+        localizedResourcesMap: /* @__PURE__ */ new Map()
+      };
+    }
+    const traversals = new Map(
       trees.map((tree) => [
         tree.id,
         {
-          data: tree.data,
-          swatchIds: /* @__PURE__ */ new Set(),
-          fileIds: /* @__PURE__ */ new Set(),
-          typographyIds: /* @__PURE__ */ new Set(),
-          tableIds: /* @__PURE__ */ new Set(),
-          pageIds: /* @__PURE__ */ new Set(),
-          globalElements: /* @__PURE__ */ new Map(),
-          localizedGlobalElements: /* @__PURE__ */ new Map(),
-          localizedResourcesMap: /* @__PURE__ */ new Map()
+          cache: createTreeCache(),
+          remaining: [tree.data],
+          seen: /* @__PURE__ */ new Set()
         }
       ])
     );
-    for (const currentTreeCache of treeCaches.values()) {
-      const remaining = [currentTreeCache.data];
-      const seen = /* @__PURE__ */ new Set();
-      let current;
-      while (current = remaining.pop()) {
-        let getResourcesFromElementDescriptors2 = function(elementDescriptors2, props) {
-          Object.entries(elementDescriptors2).forEach(([propName, descriptor]) => {
-            (0, import_introspection.getSwatchIds)(descriptor, props[propName]).forEach((swatchId) => {
-              currentTreeCache.swatchIds.add(swatchId);
-            });
-            (0, import_introspection.getFileIds)(descriptor, props[propName]).forEach((fileId) => {
-              currentTreeCache.fileIds.add(fileId);
-            });
-            (0, import_introspection.getTypographyIds)(descriptor, props[propName]).forEach((typographyId) => {
-              currentTreeCache.typographyIds.add(typographyId);
-            });
-            (0, import_introspection.getTableIds)(descriptor, props[propName]).forEach((tableId) => {
-              currentTreeCache.tableIds.add(tableId);
+    while (true) {
+      const pendingGlobalElementIds = /* @__PURE__ */ new Set();
+      const deferred = [];
+      for (const [treeId, traversal] of traversals) {
+        const { remaining, seen, cache: currentTreeCache } = traversal;
+        let current;
+        while (current = remaining.pop()) {
+          let getResourcesFromElementDescriptors2 = function(elementDescriptors2, props) {
+            Object.entries(elementDescriptors2).forEach(([propName, descriptor]) => {
+              (0, import_introspection.getSwatchIds)(descriptor, props[propName]).forEach((swatchId) => {
+                currentTreeCache.swatchIds.add(swatchId);
+              });
+              (0, import_introspection.getFileIds)(descriptor, props[propName]).forEach((fileId) => {
+                currentTreeCache.fileIds.add(fileId);
+              });
+              (0, import_introspection.getTypographyIds)(descriptor, props[propName]).forEach((typographyId) => {
+                currentTreeCache.typographyIds.add(typographyId);
+              });
+              (0, import_introspection.getTableIds)(descriptor, props[propName]).forEach((tableId) => {
+                currentTreeCache.tableIds.add(tableId);
+              });
+              (0, import_introspection.getPageIds)(descriptor, props[propName]).forEach((pageId) => {
+                currentTreeCache.pageIds.add(pageId);
+              });
+              (0, import_introspection.getElementChildren)(descriptor, props[propName]).forEach((child) => {
+                if (!seen.has(child.key)) {
+                  seen.add(child.key);
+                  remaining.push(child);
+                }
+              });
             });
-            (0, import_introspection.getPageIds)(descriptor, props[propName]).forEach((pageId) => {
-              currentTreeCache.pageIds.add(pageId);
-            });
-            (0, import_introspection.getElementChildren)(descriptor, props[propName]).forEach((child) => {
-              if (!seen.has(child.key)) {
-                seen.add(child.key);
-                remaining.push(child);
-              }
-            });
-          });
-        };
-        var getResourcesFromElementDescriptors = getResourcesFromElementDescriptors2;
-        let element;
-        if ((0, import_read_only_state.isElementReference)(current)) {
-          const globalElementId = current.value;
-          let globalElement;
-          if (globalElementCache.has(globalElementId)) {
-            globalElement = globalElementCache.get(globalElementId);
-          } else {
-            globalElement = await this.getGlobalElement(globalElementId, siteVersion);
-            globalElementCache.set(globalElementId, globalElement);
-          }
-          let elementData = globalElement?.data;
-          if (locale) {
-            let localizedGlobalElement;
-            if (localizedGlobalElementCache.has(globalElementId)) {
-              localizedGlobalElement = localizedGlobalElementCache.get(globalElementId);
-            } else {
-              localizedGlobalElement = await this.getLocalizedGlobalElement(
-                globalElementId,
-                locale,
-                siteVersion
-              );
-              localizedGlobalElementCache.set(globalElementId, localizedGlobalElement);
+          };
+          var getResourcesFromElementDescriptors = getResourcesFromElementDescriptors2;
+          let element;
+          if ((0, import_read_only_state.isElementReference)(current)) {
+            const globalElementId = current.value;
+            if (!globalElementCache.has(globalElementId)) {
+              pendingGlobalElementIds.add(globalElementId);
+              deferred.push({ treeId, element: current });
+              continue;
             }
-            if (localizedGlobalElement) {
-              elementData = localizedGlobalElement.data;
-              currentTreeCache.localizedResourcesMap.set(globalElementId, localizedGlobalElement.id);
-              currentTreeCache.localizedGlobalElements.set(
-                localizedGlobalElement.id,
-                localizedGlobalElement
-              );
-            } else {
-              currentTreeCache.localizedResourcesMap.set(globalElementId, null);
+            const globalElement = globalElementCache.get(globalElementId) ?? null;
+            let elementData = globalElement?.data;
+            if (locale) {
+              const localizedGlobalElement = localizedGlobalElementCache.get(globalElementId) ?? null;
+              if (localizedGlobalElement) {
+                elementData = localizedGlobalElement.data;
+                currentTreeCache.localizedResourcesMap.set(
+                  globalElementId,
+                  localizedGlobalElement.id
+                );
+                currentTreeCache.localizedGlobalElements.set(
+                  localizedGlobalElement.id,
+                  localizedGlobalElement
+                );
+              } else {
+                currentTreeCache.localizedResourcesMap.set(globalElementId, null);
+              }
             }
+            currentTreeCache.globalElements.set(globalElementId, globalElement);
+            if (elementData == null)
+              continue;
+            element = elementData;
+          } else {
+            element = current;
           }
-          currentTreeCache.globalElements.set(globalElementId, globalElement);
-          if (elementData == null)
+          const elementDescriptors = descriptors.get(element.type);
+          if (elementDescriptors == null)
             continue;
-          element = elementData;
-        } else {
-          element = current;
+          getResourcesFromElementDescriptors2(elementDescriptors, element.props);
         }
-        const elementDescriptors = descriptors.get(element.type);
-        if (elementDescriptors == null)
-          continue;
-        getResourcesFromElementDescriptors2(elementDescriptors, element.props);
       }
+      if (pendingGlobalElementIds.size === 0)
+        break;
+      const ids = [...pendingGlobalElementIds];
+      const results = await this.getGlobalElements(ids, siteVersion, { locale });
+      ids.forEach((id, index) => {
+        globalElementCache.set(id, results[index]?.base ?? null);
+        localizedGlobalElementCache.set(id, results[index]?.localized ?? null);
+      });
+      deferred.forEach(({ treeId, element }) => traversals.get(treeId).remaining.push(element));
     }
     const allSwatchIds = /* @__PURE__ */ new Set();
     const allFileIds = /* @__PURE__ */ new Set();
     const allTypographyIds = /* @__PURE__ */ new Set();
     const allTableIds = /* @__PURE__ */ new Set();
     const allPageIds = /* @__PURE__ */ new Set();
-    for (const currentTreeCache of treeCaches.values()) {
+    for (const { cache: currentTreeCache } of traversals.values()) {
       currentTreeCache.swatchIds.forEach((id) => allSwatchIds.add(id));
       currentTreeCache.fileIds.forEach((id) => allFileIds.add(id));
       currentTreeCache.typographyIds.forEach((id) => allTypographyIds.add(id));
@@ -435,7 +331,7 @@ Received "${apiKey}" instead.`
         }
       });
       if (secondarySwatchIds.length > 0) {
-        for (const currentTreeCache of treeCaches.values()) {
+        for (const { cache: currentTreeCache } of traversals.values()) {
           if (currentTreeCache.typographyIds.has(typography.id)) {
             secondarySwatchIds.forEach((id) => currentTreeCache.swatchIds.add(id));
           }
@@ -454,7 +350,7 @@ Received "${apiKey}" instead.`
       )
     ]);
     const result = /* @__PURE__ */ new Map();
-    for (const [treeId, currentTreeCache] of treeCaches) {
+    for (const [treeId, { cache: currentTreeCache }] of traversals) {
       const apiResources = {
         [import_types2.APIResourceType.Swatch]: [...currentTreeCache.swatchIds].map((id) => ({
           id,