@makeswift/runtime 0.10.9 → 0.10.11

package/dist/index.cjs.js

@@ -291,35 +291,6 @@ const FileFragment = `
     }
   }
 `;
-const TypographyFragment = `
-  fragment Typography on Typography {
-    __typename
-    id
-    name
-    style {
-      deviceId
-      value {
-        fontFamily
-        fontSize {
-          value
-          unit
-        }
-        color {
-          swatchId
-          alpha
-        }
-        lineHeight
-        letterSpacing
-        fontWeight
-        textAlign
-        uppercase
-        underline
-        strikethrough
-        italic
-      }
-    }
-  }
-`;
 const PagePathnameSliceFragment = `
   fragment PagePathnameSlice on PagePathnameSlice {
     __typename
@@ -327,20 +298,6 @@ const PagePathnameSliceFragment = `
     pathname
   }
 `;
-const GlobalElementFragment = `
-  fragment GlobalElement on GlobalElement {
-    __typename
-    id
-    data
-  }
-`;
-const LocalizedGlobalElementFragment = `
-  fragment LocalizedGlobalElement on LocalizedGlobalElement {
-    __typename
-    id
-    data
-  }
-`;
 const TableFragment = `
   fragment Table on Table {
     __typename
@@ -395,15 +352,6 @@ const FileQuery = `
 
   ${FileFragment}
 `;
-const TypographyQuery = `
-  query Typography($typographyId: ID!) {
-    typography(id: $typographyId) {
-      ...Typography
-    }
-  }
-
-  ${TypographyFragment}
-`;
 const PagePathnamesByIdQuery = `
   query PagePathnamesById($pageIds: [ID!]!) {
     pagePathnamesById(ids: $pageIds) {
@@ -422,33 +370,6 @@ const TableQuery = `
 
   ${TableFragment}
 `;
-const TypographiesQuery = `
-  query Typographies($typographyIds: [ID!]!) {
-    typographies(ids: $typographyIds) {
-      ...Typography
-    }
-  }
-
-  ${TypographyFragment}
-`;
-const GlobalElementQuery = `
-  query GlobalElement($globalElementId: ID!) {
-    globalElement(id: $globalElementId) {
-      ...GlobalElement
-    }
-  }
-
-  ${GlobalElementFragment}
-`;
-const LocalizedGlobalElementQuery = `
-  query LocalizedGlobalElement($globalElementId: ID!, $locale: Locale!) {
-    localizedGlobalElement(globalElementId: $globalElementId, locale: $locale) {
-      ...LocalizedGlobalElement
-    }
-  }
-
-  ${LocalizedGlobalElementFragment}
-`;
 const CreateTableRecordMutation = `
   mutation CreateTableRecord($input: CreateTableRecordInput!) {
     createTableRecord(input: $input) {
@@ -781,12 +702,12 @@ const makeswiftSiteVersionSchema = zod.z.enum(["Live", "Working"]);
 const MakeswiftSiteVersion = makeswiftSiteVersionSchema.Enum;
 const makeswiftPreviewDataSchema = zod.z.object({
   makeswift: zod.z.literal(true),
-  unstable_siteVersion: makeswiftSiteVersionSchema
+  siteVersion: makeswiftSiteVersionSchema
 });
 function getMakeswiftSiteVersion(previewData) {
   const result = makeswiftPreviewDataSchema.safeParse(previewData);
   if (result.success)
-    return result.data.unstable_siteVersion;
+    return result.data.siteVersion;
   return null;
 }
 function PreviewModeScript({
@@ -884,7 +805,7 @@ class Makeswift {
   constructor(apiKey, {
     apiOrigin = "https://api.makeswift.com",
     runtime = ReactRuntime,
-    unstable_previewData
+    siteVersion
   } = {}) {
     __publicField(this, "apiKey");
     __publicField(this, "apiOrigin");
@@ -903,7 +824,11 @@ Received "${apiKey}" instead.`);
     }
     this.graphqlClient = new GraphQLClient(new URL("graphql", apiOrigin).href);
     this.runtime = runtime;
-    this.siteVersion = getMakeswiftSiteVersion(unstable_previewData);
+    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;
@@ -917,8 +842,7 @@ Received "${apiKey}" instead.`);
     return response;
   }
   async getPages() {
-    const isUsingVersioning = this.siteVersion != null;
-    const response = await this.fetch(`/${isUsingVersioning ? "v3" : "v2"}/pages`, {
+    const response = await this.fetch(`/${this.siteVersion == null ? "v2" : "v3"}/pages`, {
       headers: {
         "Makeswift-Site-Version": MakeswiftSiteVersion.Live
       }
@@ -930,14 +854,27 @@ Received "${apiKey}" instead.`);
     const json = await response.json();
     return json;
   }
-  async getTypographies(typographyIds) {
-    const result = await this.graphqlClient.request(TypographiesQuery, { typographyIds });
-    return result.typographies;
+  async getTypographies(typographyIds, preview) {
+    var _a;
+    const url = new URL(`${this.siteVersion == null ? "v1" : "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
+      }
+    });
+    if (!response.ok) {
+      console.error("Failed to get typographies", await response.json());
+      return [];
+    }
+    const body = await response.json();
+    return body;
   }
   async getSwatches(ids, preview) {
     var _a;
-    const isUsingVersioning = this.siteVersion != null;
-    const url = new URL(`${isUsingVersioning ? "v2" : "v1"}/swatches/bulk`, this.apiOrigin);
+    const url = new URL(`${this.siteVersion == null ? "v1" : "v2"}/swatches/bulk`, this.apiOrigin);
     ids.forEach((id) => {
       url.searchParams.append("ids", id);
     });
@@ -1020,7 +957,7 @@ Received "${apiKey}" instead.`);
         continue;
       getResourcesFromElementDescriptors(elementDescriptors, element2.props);
     }
-    const typographies = await this.getTypographies([...typographyIds]);
+    const typographies = await this.getTypographies([...typographyIds], preview);
     typographies.forEach((typography) => {
       typography == null ? void 0 : typography.style.forEach((style) => {
         var _a2;
@@ -1090,7 +1027,6 @@ Received "${apiKey}" instead.`);
     unstable_locale
   } = {}) {
     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();
     const locale = unstable_locale === defaultLocale ? null : unstable_locale;
@@ -1102,7 +1038,7 @@ Received "${apiKey}" instead.`);
       }
       searchParams.set("locale", locale);
     }
-    const response = await this.fetch(`/${isUsingVersioning ? "v3" : "v2"}/pages/${encodeURIComponent(pathname)}/document?${searchParams.toString()}`, {
+    const response = await this.fetch(`/${this.siteVersion == null ? "v2" : "v3"}/pages/${encodeURIComponent(pathname)}/document?${searchParams.toString()}`, {
       headers: { "Makeswift-Site-Version": siteVersion }
     });
     if (!response.ok) {
@@ -1126,8 +1062,7 @@ Received "${apiKey}" instead.`);
     };
   }
   async getSwatch(swatchId) {
-    const isUsingVersioning = this.siteVersion != null;
-    const response = await this.fetch(`${isUsingVersioning ? "v2" : "v1"}/swatches/${swatchId}`);
+    const response = await this.fetch(`${this.siteVersion == null ? "v1" : "v2"}/swatches/${swatchId}`);
     if (!response.ok) {
       if (response.status !== 404)
         console.error("Failed to get swatch", await response.json());
@@ -1141,16 +1076,34 @@ Received "${apiKey}" instead.`);
     return result.file;
   }
   async getTypography(typographyId) {
-    const result = await this.graphqlClient.request(TypographyQuery, { typographyId });
-    return result.typography;
+    const response = await this.fetch(`${this.siteVersion == null ? "v1" : "v2"}/typographies/${typographyId}`);
+    if (!response.ok) {
+      if (response.status !== 404)
+        console.error("Failed to get typography", await response.json());
+      return null;
+    }
+    const typography = await response.json();
+    return typography;
   }
   async getGlobalElement(globalElementId) {
-    const result = await this.graphqlClient.request(GlobalElementQuery, { globalElementId });
-    return result.globalElement;
+    const response = await this.fetch(`${this.siteVersion == null ? "v1" : "v2"}/global-elements/${globalElementId}`);
+    if (!response.ok) {
+      if (response.status !== 404)
+        console.error("Failed to get global element", await response.json());
+      return null;
+    }
+    const globalElement = await response.json();
+    return globalElement;
   }
   async getLocalizedGlobalElement(globalElementId, locale) {
-    const result = await this.graphqlClient.request(LocalizedGlobalElementQuery, { globalElementId, locale });
-    return result.localizedGlobalElement;
+    const response = await this.fetch(`${this.siteVersion == null ? "v1" : "v2"}/localized-global-elements/${globalElementId}?locale=${locale}`);
+    if (!response.ok) {
+      if (response.status !== 404)
+        console.error("Failed to get localized global element", await response.json());
+      return null;
+    }
+    const localizedGlobalElement = await response.json();
+    return localizedGlobalElement;
   }
   async getPagePathnameSlice(pageId) {
     var _a;
@@ -1235,8 +1188,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.10.9";
-async function handler(req, res, { apiKey, unstable_siteVersions }) {
+const version = "0.10.11";
+async function handler(req, res, { apiKey, siteVersions }) {
   if (req.query.secret !== apiKey) {
     return res.status(401).json({ message: "Unauthorized" });
   }
@@ -1247,7 +1200,8 @@ async function handler(req, res, { apiKey, unstable_siteVersions }) {
     clientSideNavigation: true,
     elementFromPoint: false,
     customBreakpoints: true,
-    unstable_siteVersions,
+    siteVersions,
+    unstable_siteVersions: siteVersions,
     localizedPageSSR: true
   });
 }
@@ -1292,7 +1246,7 @@ async function proxyPreviewMode(req, res, { apiKey }) {
   const secure = process.env["NODE_ENV"] === "production";
   const previewData = {
     makeswift: true,
-    unstable_siteVersion: MakeswiftSiteVersion.Working
+    siteVersion: MakeswiftSiteVersion.Working
   };
   const setCookie = res.setPreviewData(previewData).getHeader("Set-Cookie");
   res.removeHeader("Set-Cookie");
@@ -1337,7 +1291,7 @@ function MakeswiftApiHandler(apiKey, {
   appOrigin = "https://app.makeswift.com",
   apiOrigin = "https://api.makeswift.com",
   getFonts,
-  unstable_siteVersions = false
+  siteVersions = false
 } = {}) {
   const cors = Cors__default["default"]({ origin: appOrigin });
   if (typeof apiKey !== "string") {
@@ -1359,12 +1313,15 @@ 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, unstable_previewData: req.previewData });
+    const client = new Makeswift(apiKey, {
+      apiOrigin,
+      siteVersion: siteVersions ? Makeswift.getSiteVersion(req.previewData) : void 0
+    });
     const action = "/" + makeswift.join("/");
     const matches = (pattern) => pathToRegexp.match(pattern, { decode: decodeURIComponent })(action);
     let m;
     if (matches("/manifest"))
-      return handler(req, res, { apiKey, unstable_siteVersions });
+      return handler(req, res, { apiKey, siteVersions });
     if (matches("/revalidate"))
       return revalidate(req, res, { apiKey });
     if (matches("/proxy-preview-mode"))
@@ -1473,8 +1430,7 @@ async function getStaticProps(ctx) {
   var _a, _b, _c;
   deprecationWarning("getStaticProps");
   const makeswift = new Makeswift(getApiKey(), {
-    apiOrigin: getApiOrigin(),
-    unstable_previewData: ctx.previewData
+    apiOrigin: getApiOrigin()
   });
   const path = "/" + ((_b = (_a = ctx.params) == null ? void 0 : _a.path) != null ? _b : []).join("/");
   const snapshot = await makeswift.getPageSnapshot(path, {
@@ -1496,8 +1452,7 @@ async function getServerSideProps(ctx) {
   var _a, _b;
   deprecationWarning("getServerSideProps");
   const makeswift = new Makeswift(getApiKey(), {
-    apiOrigin: getApiOrigin(),
-    unstable_previewData: ctx.previewData
+    apiOrigin: getApiOrigin()
   });
   const path = "/" + ((_b = (_a = ctx.params) == null ? void 0 : _a.path) != null ? _b : []).join("/");
   const snapshot = await makeswift.getPageSnapshot(path, {