@makeswift/runtime 0.10.7 → 0.10.8

package/dist/index.cjs.js

@@ -509,12 +509,18 @@ class MakeswiftClient {
     return getAPIResource(this.makeswiftApiClient.getState(), types.APIResourceType.LocalizedGlobalElement, localizedGlobalElementId);
   }
   async fetchLocalizedGlobalElement(globalElementId) {
+    var _a;
     const locale = this.locale;
     if (locale == null)
       return null;
+    const noLocalizedResource = this.getLocalizedResourceId(globalElementId) === null;
+    if (noLocalizedResource)
+      return null;
+    const cacheResult = this.readLocalizedGlobalElement(globalElementId);
+    if (cacheResult)
+      return cacheResult;
     const result = await this.makeswiftApiClient.dispatch(fetchAPIResource(types.APIResourceType.LocalizedGlobalElement, globalElementId, locale));
-    if (result != null)
-      this.setLocalizedResourceId(globalElementId, result.id);
+    this.setLocalizedResourceId(globalElementId, (_a = result == null ? void 0 : result.id) != null ? _a : null);
     return result;
   }
   readPagePathnameSlice(pageId) {
@@ -549,8 +555,8 @@ class MakeswiftClient {
     return getAPIResource(this.makeswiftApiClient.getState(), types.APIResourceType.Snippet, snippetId);
   }
   getLocalizedResourceId(resourceId) {
-    var _a, _b;
-    return (_b = (_a = this.localizedResourcesMap) == null ? void 0 : _a.get(resourceId)) != null ? _b : null;
+    var _a;
+    return (_a = this.localizedResourcesMap) == null ? void 0 : _a.get(resourceId);
   }
   setLocalizedResourceId(resourceId, localizedResourceId) {
     this.localizedResourcesMap.set(resourceId, localizedResourceId);
@@ -957,6 +963,7 @@ Received "${apiKey}" instead.`);
     return __spreadProps(__spreadValues({}, result), { swatches });
   }
   async introspect(element, preview, locale) {
+    var _a;
     const runtime = this.runtime;
     const descriptors = reactPage.getPropControllerDescriptors(runtime.store.getState());
     const swatchIds = /* @__PURE__ */ new Set();
@@ -995,9 +1002,9 @@ Received "${apiKey}" instead.`);
         let elementData = globalElement == null ? void 0 : globalElement.data;
         if (locale) {
           const localizedGlobalElement = await this.getLocalizedGlobalElement(globalElementId, locale);
+          localizedResourcesMap.set(globalElementId, (_a = localizedGlobalElement == null ? void 0 : localizedGlobalElement.id) != null ? _a : null);
           if (localizedGlobalElement) {
             elementData = localizedGlobalElement.data;
-            localizedResourcesMap.set(globalElementId, localizedGlobalElement.id);
             localizedGlobalElements.set(localizedGlobalElement.id, localizedGlobalElement);
           }
         }
@@ -1016,8 +1023,8 @@ Received "${apiKey}" instead.`);
     const typographies = await this.getTypographies([...typographyIds]);
     typographies.forEach((typography) => {
       typography == null ? void 0 : typography.style.forEach((style) => {
-        var _a;
-        const swatchId = (_a = style.value.color) == null ? void 0 : _a.swatchId;
+        var _a2;
+        const swatchId = (_a2 = style.value.color) == null ? void 0 : _a2.swatchId;
         if (swatchId != null)
           swatchIds.add(swatchId);
       });
@@ -1033,38 +1040,38 @@ Received "${apiKey}" instead.`);
     }));
     const cacheData = {
       [types.APIResourceType.Swatch]: [...swatchIds].map((id) => {
-        var _a;
+        var _a2;
         return {
           id,
-          value: (_a = swatches.find((swatch) => (swatch == null ? void 0 : swatch.id) === id)) != null ? _a : null
+          value: (_a2 = swatches.find((swatch) => (swatch == null ? void 0 : swatch.id) === id)) != null ? _a2 : null
         };
       }),
       [types.APIResourceType.File]: [...fileIds].map((id) => {
-        var _a;
+        var _a2;
         return {
           id,
-          value: (_a = files.find((file) => (file == null ? void 0 : file.id) === id)) != null ? _a : null
+          value: (_a2 = files.find((file) => (file == null ? void 0 : file.id) === id)) != null ? _a2 : null
         };
       }),
       [types.APIResourceType.Typography]: [...typographyIds].map((id) => {
-        var _a;
+        var _a2;
         return {
           id,
-          value: (_a = typographies.find((typography) => (typography == null ? void 0 : typography.id) === id)) != null ? _a : null
+          value: (_a2 = typographies.find((typography) => (typography == null ? void 0 : typography.id) === id)) != null ? _a2 : null
         };
       }),
       [types.APIResourceType.Table]: [...tableIds].map((id) => {
-        var _a;
+        var _a2;
         return {
           id,
-          value: (_a = tables.find((table) => (table == null ? void 0 : table.id) === id)) != null ? _a : null
+          value: (_a2 = tables.find((table) => (table == null ? void 0 : table.id) === id)) != null ? _a2 : null
         };
       }),
       [types.APIResourceType.PagePathnameSlice]: [...pageIds].map((id) => {
-        var _a;
+        var _a2;
         return {
           id,
-          value: (_a = pagePathnameSlices.find((pagePathnameSlice) => (pagePathnameSlice == null ? void 0 : pagePathnameSlice.id) === id)) != null ? _a : null
+          value: (_a2 = pagePathnameSlices.find((pagePathnameSlice) => (pagePathnameSlice == null ? void 0 : pagePathnameSlice.id) === id)) != null ? _a2 : null
         };
       }),
       [types.APIResourceType.GlobalElement]: [...globalElements.entries()].map(([id, value]) => ({
@@ -1082,7 +1089,7 @@ Received "${apiKey}" instead.`);
     preview: previewOverride = false,
     unstable_locale
   } = {}) {
-    var _a, _b;
+    var _a, _b, _c;
     const isUsingVersioning = this.siteVersion != null;
     const siteVersion = (_a = this.siteVersion) != null ? _a : previewOverride ? MakeswiftSiteVersion.Working : MakeswiftSiteVersion.Live;
     const defaultLocale = (_b = reactPage.getDefaultLocale(this.runtime.store.getState())) == null ? void 0 : _b.toString();
@@ -1105,7 +1112,8 @@ Received "${apiKey}" instead.`);
       throw new Error(`Failed to get page snapshot with error: "${response.statusText}"`);
     }
     const document2 = await response.json();
-    const { cacheData, localizedResourcesMap } = await this.introspect(document2.data, previewOverride, locale != null ? locale : void 0);
+    const baseLocalizedPage = document2.localizedPages.find(({ parentId }) => parentId == null);
+    const { cacheData, localizedResourcesMap } = await this.introspect((_c = baseLocalizedPage == null ? void 0 : baseLocalizedPage.data) != null ? _c : document2.data, previewOverride, locale != null ? locale : void 0);
     const apiOrigin = this.apiOrigin.href;
     const preview = siteVersion === MakeswiftSiteVersion.Working;
     return {
@@ -1227,7 +1235,7 @@ async function fonts(_req, res, { getFonts } = {}) {
   const fonts2 = (_a = await (getFonts == null ? void 0 : getFonts())) != null ? _a : [];
   return res.json(fonts2);
 }
-const version = "0.10.7";
+const version = "0.10.8";
 async function handler(req, res, { apiKey, unstable_siteVersions }) {
   if (req.query.secret !== apiKey) {
     return res.status(401).json({ message: "Unauthorized" });