@makeswift/runtime 0.11.6 → 0.11.8

package/dist/index.es.js

@@ -213,7 +213,7 @@ function fetchAPIResource(resourceType, resourceId, locale) {
         break;
       }
       case APIResourceType.PagePathnameSlice:
-        resource = await fetchJson(`/api/makeswift/page-pathname-slices/${resourceId}`);
+        resource = await fetchJson(`/api/makeswift/page-pathname-slices/${resourceId}?locale=${locale}`);
         break;
       case APIResourceType.Table:
         resource = await fetchJson(`/api/makeswift/tables/${resourceId}`);
@@ -263,13 +263,6 @@ const FileFragment = `
     }
   }
 `;
-const PagePathnameSliceFragment = `
-  fragment PagePathnameSlice on PagePathnameSlice {
-    __typename
-    id
-    pathname
-  }
-`;
 const TableFragment = `
   fragment Table on Table {
     __typename
@@ -297,22 +290,17 @@ const TableFragment = `
   }
 `;
 const IntrospectedResourcesQuery = `
-  query IntrospectedResources($fileIds: [ID!]!, $pageIds: [ID!]!, $tableIds: [ID!]!) {
+  query IntrospectedResources($fileIds: [ID!]!, $tableIds: [ID!]!) {
     files(ids: $fileIds) {
       ...File
     }
 
-    pagePathnamesById(ids: $pageIds) {
-      ...PagePathnameSlice
-    }
-
     tables(ids: $tableIds) {
       ...Table
     }
   }
 
   ${FileFragment}
-  ${PagePathnameSliceFragment}
   ${TableFragment}
 `;
 const FileQuery = `
@@ -324,15 +312,6 @@ const FileQuery = `
 
   ${FileFragment}
 `;
-const PagePathnamesByIdQuery = `
-  query PagePathnamesById($pageIds: [ID!]!) {
-    pagePathnamesById(ids: $pageIds) {
-      ...PagePathnameSlice
-    }
-  }
-
-  ${PagePathnameSliceFragment}
-`;
 const TableQuery = `
   query Table($tableId: ID!) {
     table(id: $tableId) {
@@ -423,7 +402,7 @@ class MakeswiftClient {
     return getAPIResource(this.makeswiftApiClient.getState(), APIResourceType.PagePathnameSlice, pageId);
   }
   async fetchPagePathnameSlice(pageId) {
-    return await this.makeswiftApiClient.dispatch(fetchAPIResource(APIResourceType.PagePathnameSlice, pageId));
+    return await this.makeswiftApiClient.dispatch(fetchAPIResource(APIResourceType.PagePathnameSlice, pageId, this.locale));
   }
   readTable(tableId) {
     return getAPIResource(this.makeswiftApiClient.getState(), APIResourceType.Table, tableId);
@@ -538,7 +517,6 @@ function Page$1({
   const socialImage = (_e = baseLocalizedPage == null ? void 0 : baseLocalizedPage.meta.socialImage) != null ? _e : page.meta.socialImage;
   const canonicalUrl = (_f = baseLocalizedPage == null ? void 0 : baseLocalizedPage.seo.canonicalUrl) != null ? _f : page.seo.canonicalUrl;
   const isIndexingBlocked = (_g = baseLocalizedPage == null ? void 0 : baseLocalizedPage.seo.isIndexingBlocked) != null ? _g : page.seo.isIndexingBlocked;
-  const hreflangs = page.hreflangs;
   const fontFamilyParamValue = useMemo(() => {
     if (site == null) {
       return page.fonts.map(({
@@ -650,14 +628,7 @@ function Page$1({
           rel: "stylesheet",
           href: `https://fonts.googleapis.com/css?family=${fontFamilyParamValue}&display=swap`
         })
-      }), hreflangs.map(({
-        hreflang,
-        href
-      }) => /* @__PURE__ */ jsx("link", {
-        rel: "alternate",
-        hrefLang: hreflang,
-        href
-      }, hreflang)), headSnippets.map(snippetToElement).map((children) => Children.map(children, (child) => {
+      }), headSnippets.map(snippetToElement).map((children) => Children.map(children, (child) => {
         if (typeof child === "string")
           return child;
         if (VALID_HEAD_ELEMENT_TYPES.includes(child.type))
@@ -787,6 +758,20 @@ if (window.parent !== window) {
     })]
   });
 }
+const pagePathnameSlicesAPISchema = z.array(z.object({
+  id: z.string(),
+  basePageId: z.string(),
+  pathname: z.string(),
+  __typename: z.literal("PagePathnameSlice")
+}).nullable());
+const getPageAPISchema = z.object({
+  pathname: z.string(),
+  locale: z.string(),
+  alternate: z.array(z.object({
+    pathname: z.string(),
+    locale: z.string()
+  }))
+});
 class Makeswift {
   constructor(apiKey, {
     apiOrigin = "https://api.makeswift.com",
@@ -840,6 +825,25 @@ Received "${apiKey}" instead.`);
     const json = await response.json();
     return json;
   }
+  async getPage(pathname, {
+    preview: previewOverride = false,
+    locale: localeInput
+  } = {}) {
+    var _a;
+    const siteVersion = (_a = this.siteVersion) != null ? _a : previewOverride ? MakeswiftSiteVersion.Working : MakeswiftSiteVersion.Live;
+    const searchParams = new URLSearchParams();
+    if (localeInput)
+      searchParams.set("locale", localeInput);
+    const response = await this.fetch(`v1/pages/${encodeURIComponent(pathname)}?${searchParams.toString()}`, { headers: { "Makeswift-Site-Version": siteVersion } });
+    if (!response.ok) {
+      if (response.status === 404)
+        return null;
+      console.error("Failed to get page snapshot", await response.json());
+      throw new Error(`Failed to get page snapshot with error: "${response.statusText}"`);
+    }
+    const json = await response.json();
+    return getPageAPISchema.parse(json);
+  }
   async getTypographies(typographyIds, preview) {
     var _a;
     const url = new URL(`${this.siteVersion == null ? "v1" : "v2"}/typographies/bulk`, this.apiOrigin);
@@ -952,15 +956,12 @@ Received "${apiKey}" instead.`);
           swatchIds.add(swatchId);
       });
     });
-    const { swatches, files, tables, pagePathnamesById } = await this.getIntrospectedResources({
+    const pagePathnames = await this.getPagePathnameSlices([...pageIds], { preview, locale });
+    const { swatches, files, tables } = await this.getIntrospectedResources({
       swatchIds: [...swatchIds],
       fileIds: [...fileIds],
-      tableIds: [...tableIds],
-      pageIds: [...pageIds]
+      tableIds: [...tableIds]
     }, preview);
-    const pagePathnameSlices = pagePathnamesById.map((pagePathnameSlice) => pagePathnameSlice && __spreadProps(__spreadValues({}, pagePathnameSlice), {
-      id: Buffer.from(`Page:${pagePathnameSlice.id}`).toString("base64")
-    }));
     const cacheData = {
       [APIResourceType.Swatch]: [...swatchIds].map((id) => {
         var _a2;
@@ -994,7 +995,7 @@ Received "${apiKey}" instead.`);
         var _a2;
         return {
           id,
-          value: (_a2 = pagePathnameSlices.find((pagePathnameSlice) => (pagePathnameSlice == null ? void 0 : pagePathnameSlice.id) === id)) != null ? _a2 : null
+          value: (_a2 = pagePathnames.find((pagePathnameSlice) => (pagePathnameSlice == null ? void 0 : pagePathnameSlice.id) === id)) != null ? _a2 : null
         };
       }),
       [APIResourceType.GlobalElement]: [...globalElements.entries()].map(([id, value]) => ({
@@ -1086,10 +1087,37 @@ Received "${apiKey}" instead.`);
     const localizedGlobalElement = await response.json();
     return localizedGlobalElement;
   }
-  async getPagePathnameSlice(pageId) {
+  async getPagePathnameSlices(pageIds, { preview: previewOverride = false, locale } = {}) {
+    var _a;
+    const url = new URL(`${this.siteVersion == null ? "v1" : "v2"}/page-pathname-slices/bulk`, this.apiOrigin);
+    pageIds.forEach((id) => url.searchParams.append("ids", id));
+    if (locale != null)
+      url.searchParams.set("locale", locale);
+    const response = await this.fetch(url.pathname + url.search, {
+      headers: {
+        "Makeswift-Site-Version": (_a = this.siteVersion) != null ? _a : previewOverride ? MakeswiftSiteVersion.Working : MakeswiftSiteVersion.Live
+      }
+    });
+    if (!response.ok) {
+      console.error("Failed to get page pathname slices", await response.json());
+      return [];
+    }
+    const json = await response.json();
+    const pagePathnameSlices = pagePathnameSlicesAPISchema.parse(json);
+    return pagePathnameSlices.map((pagePathnameSlice) => {
+      if (pagePathnameSlice == null)
+        return null;
+      return {
+        id: pagePathnameSlice.basePageId,
+        pathname: pagePathnameSlice.pathname,
+        __typename: pagePathnameSlice.__typename
+      };
+    });
+  }
+  async getPagePathnameSlice(pageId, { preview = false, locale } = {}) {
     var _a;
-    const result = await this.graphqlClient.request(PagePathnamesByIdQuery, { pageIds: [pageId] });
-    return (_a = result.pagePathnamesById.at(0)) != null ? _a : null;
+    const pagePathnameSlices = await this.getPagePathnameSlices([pageId], { preview, locale });
+    return (_a = pagePathnameSlices.at(0)) != null ? _a : null;
   }
   async getTable(tableId) {
     const result = await this.graphqlClient.request(TableQuery, { tableId });
@@ -1178,7 +1206,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.11.6";
+const version = "0.11.8";
 async function handler(req, res, { apiKey, siteVersions }) {
   if (req.query.secret !== apiKey) {
     return res.status(401).json({ message: "Unauthorized" });
@@ -1367,7 +1395,8 @@ Read more about dynamic catch-all routes here: https://nextjs.org/docs/routing/d
       return client.getLocalizedGlobalElement(m.params.globalElementId, m.params.locale).then((resource) => resource === null ? res.json({ message: "Not Found" }) : res.json(resource));
     }
     if (m = matches("/page-pathname-slices/:id")) {
-      return client.getPagePathnameSlice(m.params.id).then(handleResource);
+      const locale = typeof req.query.locale === "string" ? req.query.locale : void 0;
+      return client.getPagePathnameSlice(m.params.id, { locale }).then(handleResource);
     }
     if (m = matches("/tables/:id")) {
       return client.getTable(m.params.id).then(handleResource);