@makeswift/runtime 0.29.0-canary.19 → 0.29.0-canary.21

package/dist/esm/client/index.js

@@ -171,128 +171,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]) => {
-          getSwatchIds(descriptor, props[propName]).forEach((swatchId) => {
-            swatchIds.add(swatchId);
-          });
-          getFileIds(descriptor, props[propName]).forEach((fileId) => fileIds.add(fileId));
-          getTypographyIds(descriptor, props[propName]).forEach(
-            (typographyId) => typographyIds.add(typographyId)
-          );
-          getTableIds(descriptor, props[propName]).forEach((tableId) => tableIds.add(tableId));
-          getPageIds(descriptor, props[propName]).forEach((pageId) => pageIds.add(pageId));
-          getElementChildren(descriptor, props[propName]).forEach((child) => {
-            if (!seen.has(child.key)) {
-              seen.add(child.key);
-              remaining.push(child);
-            }
-          });
-        });
-      };
-      var getResourcesFromElementDescriptors = getResourcesFromElementDescriptors2;
-      let element2;
-      if (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 = {
-      [APIResourceType.Swatch]: [...swatchIds].map((id) => ({
-        id,
-        value: swatches.find((swatch) => swatch?.id === id) ?? null
-      })),
-      [APIResourceType.File]: [...fileIds].map((id) => ({
-        id,
-        value: files.find((file) => file?.id === id) ?? null
-      })),
-      [APIResourceType.Typography]: [...typographyIds].map((id) => ({
-        id,
-        value: typographies.find((typography) => typography?.id === id) ?? null
-      })),
-      [APIResourceType.Table]: [...tableIds].map((id) => ({
-        id,
-        value: tables.find((table) => table?.id === id) ?? null
-      })),
-      [APIResourceType.PagePathnameSlice]: [...pageIds].map((id) => ({
-        id,
-        value: pagePathnames.find((pagePathnameSlice) => pagePathnameSlice?.id === id) ?? null,
-        locale
-      })),
-      [APIResourceType.GlobalElement]: [...globalElements.entries()].map(([id, value]) => ({
-        id,
-        value
-      })),
-      [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)
@@ -300,106 +186,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]) => {
-            getSwatchIds(descriptor, props[propName]).forEach((swatchId) => {
-              currentTreeCache.swatchIds.add(swatchId);
-            });
-            getFileIds(descriptor, props[propName]).forEach((fileId) => {
-              currentTreeCache.fileIds.add(fileId);
+    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]) => {
+              getSwatchIds(descriptor, props[propName]).forEach((swatchId) => {
+                currentTreeCache.swatchIds.add(swatchId);
+              });
+              getFileIds(descriptor, props[propName]).forEach((fileId) => {
+                currentTreeCache.fileIds.add(fileId);
+              });
+              getTypographyIds(descriptor, props[propName]).forEach((typographyId) => {
+                currentTreeCache.typographyIds.add(typographyId);
+              });
+              getTableIds(descriptor, props[propName]).forEach((tableId) => {
+                currentTreeCache.tableIds.add(tableId);
+              });
+              getPageIds(descriptor, props[propName]).forEach((pageId) => {
+                currentTreeCache.pageIds.add(pageId);
+              });
+              getElementChildren(descriptor, props[propName]).forEach((child) => {
+                if (!seen.has(child.key)) {
+                  seen.add(child.key);
+                  remaining.push(child);
+                }
+              });
             });
-            getTypographyIds(descriptor, props[propName]).forEach((typographyId) => {
-              currentTreeCache.typographyIds.add(typographyId);
-            });
-            getTableIds(descriptor, props[propName]).forEach((tableId) => {
-              currentTreeCache.tableIds.add(tableId);
-            });
-            getPageIds(descriptor, props[propName]).forEach((pageId) => {
-              currentTreeCache.pageIds.add(pageId);
-            });
-            getElementChildren(descriptor, props[propName]).forEach((child) => {
-              if (!seen.has(child.key)) {
-                seen.add(child.key);
-                remaining.push(child);
-              }
-            });
-          });
-        };
-        var getResourcesFromElementDescriptors = getResourcesFromElementDescriptors2;
-        let element;
-        if (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 (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));
@@ -419,7 +315,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));
           }
@@ -438,7 +334,7 @@ Received "${apiKey}" instead.`
       )
     ]);
     const result = /* @__PURE__ */ new Map();
-    for (const [treeId, currentTreeCache] of treeCaches) {
+    for (const [treeId, { cache: currentTreeCache }] of traversals) {
       const apiResources = {
         [APIResourceType.Swatch]: [...currentTreeCache.swatchIds].map((id) => ({
           id,
@@ -529,71 +425,33 @@ Received "${apiKey}" instead.`
   async getComponentSnapshot(id, {
     siteVersion: siteVersionPromise,
     locale,
-    allowLocaleFallback = true,
-    unstable_enforceSuccess = false
+    allowLocaleFallback = true
   }) {
     const siteVersion = await siteVersionPromise;
     const key = deterministicUUID({ id, locale, seed: this.apiKey.split("-").at(0) });
-    const baseLocaleWasRequested = locale == null;
-    const canAttemptLocaleFallback = !baseLocaleWasRequested && allowLocaleFallback;
-    const parseElementTreeResponse = async (response) => {
-      if (!response.ok) {
-        const failedBody = await failedResponseBody(response);
-        if (response.status === 404) {
-          return null;
-        }
-        throw new RestApiClientError(`Failed to get component snapshot for '${id}'`, response, {
-          body: failedBody,
-          siteVersion,
-          locale
-        });
-      }
-      const responseBody = await response.json();
-      const parsed = Schema.componentDocumentResponse.parse(responseBody);
-      if ("notFound" in parsed)
-        return null;
-      return parsed;
-    };
-    const getElementTree = async (searchParams) => {
-      const response = await this.fetch(
-        `v2/element-trees/${encodeURIComponent(id)}?${searchParams.toString()}`,
-        siteVersion
-      );
-      return await parseElementTreeResponse(response);
-    };
-    const getPrimaryTree = async () => {
-      const searchParams = new URLSearchParams();
-      if (locale)
-        searchParams.set("locale", locale);
-      if (unstable_enforceSuccess)
-        searchParams.set("unstable_enforceSuccess", "true");
-      return await getElementTree(searchParams);
-    };
-    const getFallbackTree = async () => {
-      const searchParams = new URLSearchParams();
-      if (unstable_enforceSuccess)
-        searchParams.set("unstable_enforceSuccess", "true");
-      return await getElementTree(searchParams);
-    };
-    const primaryTree = await getPrimaryTree();
-    const result = primaryTree == null && canAttemptLocaleFallback ? await getFallbackTree() : primaryTree;
-    if (result == null) {
-      return {
-        document: {
-          id,
-          locale: locale ?? null,
-          data: null
-        },
-        key,
-        cacheData: CacheData.empty(),
-        meta: {
-          allowLocaleFallback,
-          requestedLocale: locale ?? null
-        }
-      };
+    const searchParams = new URLSearchParams();
+    if (locale)
+      searchParams.set("locale", locale);
+    const response = await this.fetch(
+      `content/v1/element-trees/${encodeURIComponent(id)}?${searchParams.toString()}`,
+      siteVersion
+    );
+    if (!response.ok) {
+      const failedBody = await failedResponseBody(response);
+      throw new RestApiClientError(`Failed to get component snapshot for '${id}'`, response, {
+        body: failedBody,
+        siteVersion,
+        locale
+      });
     }
-    const document = result;
-    const cacheData = await this.introspect(document.data, siteVersion, document.locale);
+    const responseBody = await response.json();
+    const documentResponse = Schema.componentDocumentResponse.parse(responseBody);
+    const document = !allowLocaleFallback && documentResponse.locale != locale ? {
+      id,
+      locale: locale ?? null,
+      data: null
+    } : documentResponse;
+    const cacheData = document.data == null ? CacheData.empty() : await this.introspect(document.data, siteVersion, document.locale);
     return {
       document,
       cacheData,