@makeswift/runtime 0.12.4 → 0.13.0

package/dist/index.cjs.js

@@ -810,16 +810,11 @@ const getPageAPISchema = zod.z.object({
   }))
 });
 class Makeswift {
-  constructor(apiKey, {
-    apiOrigin = "https://api.makeswift.com",
-    runtime = ReactRuntime,
-    siteVersion
-  } = {}) {
+  constructor(apiKey, { apiOrigin = "https://api.makeswift.com", runtime = ReactRuntime } = {}) {
     __publicField(this, "apiKey");
     __publicField(this, "apiOrigin");
     __publicField(this, "graphqlClient");
     __publicField(this, "runtime");
-    __publicField(this, "siteVersion");
     if (typeof apiKey !== "string") {
       throw new Error(`The Makeswift client must be passed a valid Makeswift site API key: \`new Makeswift('<makeswift_site_api_key>')\`
 Received "${apiKey}" instead.`);
@@ -832,29 +827,25 @@ Received "${apiKey}" instead.`);
     }
     this.graphqlClient = new GraphQLClient(new URL("graphql", apiOrigin).href);
     this.runtime = runtime;
-    this.siteVersion = siteVersion != null ? siteVersion : null;
   }
   static getSiteVersion(previewData) {
     var _a;
     return (_a = getMakeswiftSiteVersion(previewData)) != null ? _a : MakeswiftSiteVersion.Live;
   }
-  async fetch(path, init) {
-    var _a;
+  async fetch(path, siteVersion = MakeswiftSiteVersion.Live, init) {
     const response = await fetch(new URL(path, this.apiOrigin).toString(), __spreadProps(__spreadValues({}, init), {
       headers: __spreadValues({
         ["X-API-Key"]: this.apiKey,
         "Makeswift-Site-API-Key": this.apiKey,
-        "Makeswift-Site-Version": (_a = this.siteVersion) != null ? _a : MakeswiftSiteVersion.Live
+        "Makeswift-Site-Version": siteVersion
       }, init == null ? void 0 : init.headers)
     }));
     return response;
   }
-  async getPages() {
-    const response = await this.fetch(`/${this.siteVersion == null ? "v2" : "v3"}/pages`, {
-      headers: {
-        "Makeswift-Site-Version": MakeswiftSiteVersion.Live
-      }
-    });
+  async getPages({
+    siteVersion = MakeswiftSiteVersion.Live
+  } = {}) {
+    const response = await this.fetch(`v3/pages`, siteVersion);
     if (!response.ok) {
       console.error("Failed to get pages", await response.json());
       throw new Error(`Failed to get pages with error: "${response.statusText}"`);
@@ -863,17 +854,13 @@ Received "${apiKey}" instead.`);
     return json;
   }
   async getPage(pathname, {
-    preview: previewOverride = false,
+    siteVersion = MakeswiftSiteVersion.Live,
     locale: localeInput
   } = {}) {
-    var _a;
-    const siteVersion = (_a = this.siteVersion) != null ? _a : previewOverride ? MakeswiftSiteVersion.Working : MakeswiftSiteVersion.Live;
-    const url = new URL(`${this.siteVersion == null ? "v1" : "v2"}/pages/${encodeURIComponent(pathname)}`, this.apiOrigin);
+    const url = new URL(`v2/pages/${encodeURIComponent(pathname)}`, this.apiOrigin);
     if (localeInput)
       url.searchParams.set("locale", localeInput);
-    const response = await this.fetch(url.pathname + url.search, {
-      headers: { "Makeswift-Site-Version": siteVersion }
-    });
+    const response = await this.fetch(url.pathname + url.search, siteVersion);
     if (!response.ok) {
       if (response.status === 404)
         return null;
@@ -883,19 +870,14 @@ Received "${apiKey}" instead.`);
     const json = await response.json();
     return getPageAPISchema.parse(json);
   }
-  async getTypographies(typographyIds, preview) {
-    var _a;
+  async getTypographies(typographyIds, siteVersion) {
     if (typographyIds.length === 0)
       return [];
-    const url = new URL(`${this.siteVersion == null ? "v1" : "v2"}/typographies/bulk`, this.apiOrigin);
+    const url = new URL(`v2/typographies/bulk`, this.apiOrigin);
     typographyIds.forEach((id) => {
       url.searchParams.append("ids", id);
     });
-    const response = await this.fetch(url.pathname + url.search, {
-      headers: {
-        "Makeswift-Site-Version": (_a = this.siteVersion) != null ? _a : preview ? MakeswiftSiteVersion.Working : MakeswiftSiteVersion.Live
-      }
-    });
+    const response = await this.fetch(url.pathname + url.search, siteVersion);
     if (!response.ok) {
       console.error("Failed to get typographies", await response.json());
       return [];
@@ -903,36 +885,31 @@ Received "${apiKey}" instead.`);
     const body = await response.json();
     return body;
   }
-  async getSwatches(ids, preview) {
-    var _a;
+  async getSwatches(ids, siteVersion) {
     if (ids.length === 0)
       return [];
-    const url = new URL(`${this.siteVersion == null ? "v1" : "v2"}/swatches/bulk`, this.apiOrigin);
+    const url = new URL(`v2/swatches/bulk`, this.apiOrigin);
     ids.forEach((id) => {
       url.searchParams.append("ids", id);
     });
-    const response = await this.fetch(url.pathname + url.search, {
-      headers: {
-        "Makeswift-Site-Version": (_a = this.siteVersion) != null ? _a : preview ? MakeswiftSiteVersion.Working : MakeswiftSiteVersion.Live
-      }
-    });
+    const response = await this.fetch(url.pathname + url.search, siteVersion);
     if (!response.ok) {
       console.error("Failed to get swatches", await response.json());
       return [];
     }
     return await response.json();
   }
-  async getIntrospectedResources(_a, preview) {
+  async getIntrospectedResources(_a, siteVersion) {
     var _b = _a, {
       swatchIds
     } = _b, introspectedResourceIds = __objRest(_b, [
       "swatchIds"
     ]);
     const result = await this.graphqlClient.request(IntrospectedResourcesQuery, introspectedResourceIds);
-    const swatches = await this.getSwatches(swatchIds, preview);
+    const swatches = await this.getSwatches(swatchIds, siteVersion);
     return __spreadProps(__spreadValues({}, result), { swatches });
   }
-  async introspect(element, preview, locale) {
+  async introspect(element, siteVersion, locale) {
     var _a;
     const runtime = this.runtime;
     const descriptors = reactPage.getPropControllerDescriptors(runtime.store.getState());
@@ -968,10 +945,10 @@ Received "${apiKey}" instead.`);
       let element2;
       if (reactPage.isElementReference(current)) {
         const globalElementId = current.value;
-        const globalElement = await this.getGlobalElement(globalElementId);
+        const globalElement = await this.getGlobalElement(globalElementId, siteVersion);
         let elementData = globalElement == null ? void 0 : globalElement.data;
         if (locale) {
-          const localizedGlobalElement = await this.getLocalizedGlobalElement(globalElementId, locale);
+          const localizedGlobalElement = await this.getLocalizedGlobalElement(globalElementId, locale, siteVersion);
           localizedResourcesMap.set(globalElementId, (_a = localizedGlobalElement == null ? void 0 : localizedGlobalElement.id) != null ? _a : null);
           if (localizedGlobalElement) {
             elementData = localizedGlobalElement.data;
@@ -990,7 +967,7 @@ Received "${apiKey}" instead.`);
         continue;
       getResourcesFromElementDescriptors(elementDescriptors, element2.props);
     }
-    const typographies = await this.getTypographies([...typographyIds], preview);
+    const typographies = await this.getTypographies([...typographyIds], siteVersion);
     typographies.forEach((typography) => {
       typography == null ? void 0 : typography.style.forEach((style) => {
         var _a2;
@@ -999,12 +976,12 @@ Received "${apiKey}" instead.`);
           swatchIds.add(swatchId);
       });
     });
-    const pagePathnames = await this.getPagePathnameSlices([...pageIds], { preview, locale });
+    const pagePathnames = await this.getPagePathnameSlices([...pageIds], siteVersion, { locale });
     const { swatches, files, tables } = await this.getIntrospectedResources({
       swatchIds: [...swatchIds],
       fileIds: [...fileIds],
       tableIds: [...tableIds]
-    }, preview);
+    }, siteVersion);
     const cacheData = {
       [types.APIResourceType.Swatch]: [...swatchIds].map((id) => {
         var _a2;
@@ -1052,19 +1029,13 @@ Received "${apiKey}" instead.`);
     };
     return { cacheData, localizedResourcesMap: Object.fromEntries(localizedResourcesMap.entries()) };
   }
-  async getPageSnapshot(pathname, {
-    preview: previewOverride = false,
-    locale: localeInput
-  } = {}) {
-    var _a, _b;
-    const siteVersion = (_a = this.siteVersion) != null ? _a : previewOverride ? MakeswiftSiteVersion.Working : MakeswiftSiteVersion.Live;
+  async getPageSnapshot(pathname, { siteVersion, locale: localeInput }) {
+    var _a;
     const searchParams = new URLSearchParams();
     if (localeInput) {
       searchParams.set("locale", localeInput);
     }
-    const response = await this.fetch(`/${this.siteVersion == null ? "v2" : "v3"}/pages/${encodeURIComponent(pathname)}/document?${searchParams.toString()}`, {
-      headers: { "Makeswift-Site-Version": siteVersion }
-    });
+    const response = await this.fetch(`v3/pages/${encodeURIComponent(pathname)}/document?${searchParams.toString()}`, siteVersion);
     if (!response.ok) {
       if (response.status === 404)
         return null;
@@ -1074,7 +1045,7 @@ Received "${apiKey}" instead.`);
     const document2 = await response.json();
     const baseLocalizedPage = document2.localizedPages.find(({ parentId }) => parentId == null);
     const locale = document2.locale;
-    const { cacheData, localizedResourcesMap } = await this.introspect((_b = baseLocalizedPage == null ? void 0 : baseLocalizedPage.data) != null ? _b : document2.data, previewOverride, locale != null ? locale : void 0);
+    const { cacheData, localizedResourcesMap } = await this.introspect((_a = baseLocalizedPage == null ? void 0 : baseLocalizedPage.data) != null ? _a : document2.data, siteVersion, locale != null ? locale : void 0);
     const apiOrigin = this.apiOrigin.href;
     const preview = siteVersion === MakeswiftSiteVersion.Working;
     return {
@@ -1086,8 +1057,8 @@ Received "${apiKey}" instead.`);
       locale
     };
   }
-  async getSwatch(swatchId) {
-    const response = await this.fetch(`${this.siteVersion == null ? "v1" : "v2"}/swatches/${swatchId}`);
+  async getSwatch(swatchId, siteVersion) {
+    const response = await this.fetch(`v2/swatches/${swatchId}`, siteVersion);
     if (!response.ok) {
       if (response.status !== 404)
         console.error("Failed to get swatch", await response.json());
@@ -1100,8 +1071,8 @@ Received "${apiKey}" instead.`);
     const result = await this.graphqlClient.request(FileQuery, { fileId });
     return result.file;
   }
-  async getTypography(typographyId) {
-    const response = await this.fetch(`${this.siteVersion == null ? "v1" : "v2"}/typographies/${typographyId}`);
+  async getTypography(typographyId, siteVersion) {
+    const response = await this.fetch(`v2/typographies/${typographyId}`, siteVersion);
     if (!response.ok) {
       if (response.status !== 404)
         console.error("Failed to get typography", await response.json());
@@ -1110,8 +1081,8 @@ Received "${apiKey}" instead.`);
     const typography = await response.json();
     return typography;
   }
-  async getGlobalElement(globalElementId) {
-    const response = await this.fetch(`${this.siteVersion == null ? "v1" : "v2"}/global-elements/${globalElementId}`);
+  async getGlobalElement(globalElementId, siteVersion) {
+    const response = await this.fetch(`v2/global-elements/${globalElementId}`, siteVersion);
     if (!response.ok) {
       if (response.status !== 404)
         console.error("Failed to get global element", await response.json());
@@ -1120,8 +1091,8 @@ Received "${apiKey}" instead.`);
     const globalElement = await response.json();
     return globalElement;
   }
-  async getLocalizedGlobalElement(globalElementId, locale) {
-    const response = await this.fetch(`${this.siteVersion == null ? "v1" : "v2"}/localized-global-elements/${globalElementId}?locale=${locale}`);
+  async getLocalizedGlobalElement(globalElementId, locale, siteVersion) {
+    const response = await this.fetch(`v2/localized-global-elements/${globalElementId}?locale=${locale}`, siteVersion);
     if (!response.ok) {
       if (response.status !== 404)
         console.error("Failed to get localized global element", await response.json());
@@ -1130,19 +1101,14 @@ Received "${apiKey}" instead.`);
     const localizedGlobalElement = await response.json();
     return localizedGlobalElement;
   }
-  async getPagePathnameSlices(pageIds, { preview: previewOverride = false, locale } = {}) {
-    var _a;
+  async getPagePathnameSlices(pageIds, siteVersion, { locale }) {
     if (pageIds.length === 0)
       return [];
-    const url = new URL(`${this.siteVersion == null ? "v1" : "v2"}/page-pathname-slices/bulk`, this.apiOrigin);
+    const url = new URL(`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
-      }
-    });
+    const response = await this.fetch(url.pathname + url.search, siteVersion);
     if (!response.ok) {
       console.error("Failed to get page pathname slices", await response.json());
       return [];
@@ -1159,9 +1125,9 @@ Received "${apiKey}" instead.`);
       };
     });
   }
-  async getPagePathnameSlice(pageId, { preview = false, locale } = {}) {
+  async getPagePathnameSlice(pageId, siteVersion, { locale } = {}) {
     var _a;
-    const pagePathnameSlices = await this.getPagePathnameSlices([pageId], { preview, locale });
+    const pagePathnameSlices = await this.getPagePathnameSlices([pageId], siteVersion, { locale });
     return (_a = pagePathnameSlices.at(0)) != null ? _a : null;
   }
   async getTable(tableId) {
@@ -1251,8 +1217,8 @@ async function fonts(_req, res, { getFonts } = {}) {
   const fonts2 = (_a = await (getFonts == null ? void 0 : getFonts())) != null ? _a : [];
   return res.json(fonts2);
 }
-const version = "0.12.4";
-async function handler(req, res, { apiKey, siteVersions }) {
+const version = "0.13.0";
+async function handler(req, res, { apiKey }) {
   if (req.query.secret !== apiKey) {
     return res.status(401).json({ message: "Unauthorized" });
   }
@@ -1263,8 +1229,8 @@ async function handler(req, res, { apiKey, siteVersions }) {
     clientSideNavigation: true,
     elementFromPoint: false,
     customBreakpoints: true,
-    siteVersions,
-    unstable_siteVersions: siteVersions,
+    siteVersions: true,
+    unstable_siteVersions: true,
     localizedPageSSR: true
   });
 }
@@ -1381,7 +1347,6 @@ function MakeswiftApiHandler(apiKey, {
   appOrigin = "https://app.makeswift.com",
   apiOrigin = "https://api.makeswift.com",
   getFonts,
-  siteVersions = false,
   runtime = ReactRuntime
 } = {}) {
   const cors = Cors__default["default"]({ origin: appOrigin });
@@ -1404,16 +1369,13 @@ Received "${apiKey}" instead.`);
 Received "${makeswift}" for the \`makeswift\` param instead.
 Read more about dynamic catch-all routes here: https://nextjs.org/docs/routing/dynamic-routes#catch-all-routes`);
     }
-    const client = new Makeswift(apiKey, {
-      apiOrigin,
-      siteVersion: siteVersions ? Makeswift.getSiteVersion(req.previewData) : void 0,
-      runtime
-    });
+    const client = new Makeswift(apiKey, { apiOrigin, runtime });
+    const siteVersion = Makeswift.getSiteVersion(req.previewData);
     const action = "/" + makeswift.join("/");
     const matches = (pattern) => pathToRegexp.match(pattern, { decode: decodeURIComponent })(action);
     let m;
     if (matches("/manifest"))
-      return handler(req, res, { apiKey, siteVersions });
+      return handler(req, res, { apiKey });
     if (matches("/revalidate"))
       return revalidate(req, res, { apiKey });
     if (matches("/proxy-preview-mode"))
@@ -1428,23 +1390,23 @@ Read more about dynamic catch-all routes here: https://nextjs.org/docs/routing/d
       return mergeTranslatedData(req, res, client);
     const handleResource = (resource) => resource === null ? res.status(404).json({ message: "Not Found" }) : res.json(resource);
     if (m = matches("/swatches/:id")) {
-      return client.getSwatch(m.params.id).then(handleResource);
+      return client.getSwatch(m.params.id, siteVersion).then(handleResource);
     }
     if (m = matches("/files/:id")) {
       return client.getFile(m.params.id).then(handleResource);
     }
     if (m = matches("/typographies/:id")) {
-      return client.getTypography(m.params.id).then(handleResource);
+      return client.getTypography(m.params.id, siteVersion).then(handleResource);
     }
     if (m = matches("/global-elements/:id")) {
-      return client.getGlobalElement(m.params.id).then(handleResource);
+      return client.getGlobalElement(m.params.id, siteVersion).then(handleResource);
     }
     if (m = matches("/localized-global-elements/:globalElementId/:locale")) {
-      return client.getLocalizedGlobalElement(m.params.globalElementId, m.params.locale).then((resource) => resource === null ? res.json({ message: "Not Found" }) : res.json(resource));
+      return client.getLocalizedGlobalElement(m.params.globalElementId, m.params.locale, siteVersion).then((resource) => resource === null ? res.json({ message: "Not Found" }) : res.json(resource));
     }
     if (m = matches("/page-pathname-slices/:id")) {
       const locale = typeof req.query.locale === "string" ? req.query.locale : void 0;
-      return client.getPagePathnameSlice(m.params.id, { locale }).then(handleResource);
+      return client.getPagePathnameSlice(m.params.id, siteVersion, { locale }).then(handleResource);
     }
     if (m = matches("/tables/:id")) {
       return client.getTable(m.params.id).then(handleResource);
@@ -1524,14 +1486,14 @@ async function getStaticPaths() {
 }
 const REVALIDATE_SECONDS = 1;
 async function getStaticProps(ctx) {
-  var _a, _b, _c;
+  var _a, _b;
   deprecationWarning("getStaticProps");
   const makeswift = new Makeswift(getApiKey(), {
     apiOrigin: getApiOrigin()
   });
   const path = "/" + ((_b = (_a = ctx.params) == null ? void 0 : _a.path) != null ? _b : []).join("/");
   const snapshot = await makeswift.getPageSnapshot(path, {
-    preview: ((_c = ctx.previewData) == null ? void 0 : _c.makeswift) === true
+    siteVersion: Makeswift.getSiteVersion(ctx.previewData)
   });
   if (snapshot == null)
     return {
@@ -1553,7 +1515,7 @@ async function getServerSideProps(ctx) {
   });
   const path = "/" + ((_b = (_a = ctx.params) == null ? void 0 : _a.path) != null ? _b : []).join("/");
   const snapshot = await makeswift.getPageSnapshot(path, {
-    preview: true
+    siteVersion: MakeswiftSiteVersion.Working
   });
   if (snapshot == null)
     return {