@uniformdev/canvas-next 19.9.2-alpha.3 → 19.10.0

package/dist/route/index.mjs

@@ -1,227 +1,179 @@
-import {
-  withUniformGetStaticPaths
-} from "../chunk-ZOXJSPVQ.mjs";
-import {
-  resolveSlugFromParams
-} from "../chunk-TR7V6ABJ.mjs";
-
 // src/route/withUniformGetServerSideProps.ts
-import { RedirectClient } from "@uniformdev/redirect";
-
-// src/route/createRouteFetcher.ts
 import {
   ApiClientError,
   EMPTY_COMPOSITION,
-  logRouteResponse,
   unstable_RouteClient
 } from "@uniformdev/canvas";
-import ansicolors from "ansi-colors";
-var { red } = ansicolors;
-function createRouteFetcher(options) {
-  const {
-    handleNotFound,
-    handleComposition,
-    handleRedirect,
-    defaultHandleComposition,
-    defaultHandleNotFound,
-    defaultHandleRedirect,
-    modifyPath,
-    projectMapId = process.env.UNIFORM_PROJECT_MAP_ID,
-    client,
-    prefix,
-    requestOptions,
-    silent,
-    parseContext
-  } = options;
-  const routeClient = client || new unstable_RouteClient({
-    apiKey: process.env.UNIFORM_API_KEY,
-    projectId: process.env.UNIFORM_PROJECT_ID,
-    edgeApiHost: process.env.UNIFORM_CLI_BASE_EDGE_URL
-  });
-  const handleModifyPath = modifyPath != null ? modifyPath : (path) => decodeURI(path);
-  return async function fetcher(context) {
-    const { contextualEditingCompositionId, resolvedUrl } = parseContext(context);
-    let nodePath = prefix ? resolvedUrl.replace(new RegExp(`^${prefix}`), "") : resolvedUrl;
-    nodePath = handleModifyPath(nodePath, context);
-    const invokeRedirectResult = (redirect, duration) => (handleRedirect != null ? handleRedirect : defaultHandleRedirect)(
-      nodePath,
-      redirect,
-      context,
-      (response) => defaultHandleRedirect(
-        nodePath,
-        response,
-        context,
-        () => {
-          throw new Error();
-        },
-        duration
-      ),
-      duration
-    );
-    const invokeNotFoundResult = (response, duration) => (handleNotFound != null ? handleNotFound : defaultHandleNotFound)(
-      response,
-      context,
-      (response2) => defaultHandleNotFound(
-        response2,
-        context,
-        () => {
-          throw new Error();
-        },
-        duration
-      ),
-      duration
+import chalk3 from "chalk";
+
+// src/route/defaultHandleComposition.ts
+import chalk2 from "chalk";
+
+// src/route/logIssues.ts
+import chalk from "chalk";
+function unstable_logIssues(prefix, issues, colour) {
+  colour = colour != null ? colour : "red";
+  const reversedIssues = [...issues].reverse();
+  console.error(
+    `${chalk[colour](prefix)}
+${reversedIssues.map(
+      (issue) => `${chalk[colour](">")} ${chalk.italic.gray(indent(issue.type.toUpperCase(), 7))} ${renderIssue(
+        issue
+      )}`
+    ).join("\n")}`
+  );
+}
+function renderIssue(issue) {
+  var _a;
+  let path;
+  let type;
+  let message = issue.message;
+  let detail;
+  if (issue.type !== "config") {
+    path = issue.componentPath;
+    type = issue.componentType;
+    message = issue.message;
+  }
+  if (issue.type === "binding") {
+    detail = `Binding expression: ${(_a = issue.expression) == null ? void 0 : _a.pointer}`;
+  } else if (issue.type === "data") {
+    detail = `Data resource name: ${issue.dataName}, data type: ${issue.dataType}`;
+  }
+  if (issue.type === "input") {
+    detail = issue.inputName;
+  }
+  let result = `${chalk.white(blockify(message))}`;
+  if (detail) {
+    result += `
+${indent(" ", 10)}${chalk.gray(`${detail}`)}`;
+  }
+  if (path && type) {
+    result += `
+${indent(" ", 10)}${chalk.gray(`Occurred on component ${type} at slot path ${path}`)}`;
+  }
+  return result;
+}
+function indent(str, len) {
+  const indent2 = len != null ? len : 10;
+  return str.padStart(indent2);
+}
+function blockify(str, len) {
+  const indentSize = len != null ? len : 10;
+  return str.split("\n").map((line, index) => index === 0 ? line : `${indent(" ", indentSize)}${line}`).join("\n");
+}
+
+// src/route/defaultHandleComposition.ts
+function defaultHandleComposition(matched) {
+  var _a, _b;
+  const resErrors = (_a = matched.compositionApiResponse.errors) != null ? _a : [];
+  const resWarnings = (_b = matched.compositionApiResponse.warnings) != null ? _b : [];
+  const colour = resErrors.length > 0 ? "red" : resWarnings.length > 0 ? "yellow" : "green";
+  console.log(`[canvas-next] ${chalk2[colour]("matched")} ${matched.matchedRoute}`, matched.type);
+  if (matched.dynamicInputs) {
+    const entries = Object.entries(matched.dynamicInputs);
+    if (entries.length > 0) {
+      console.log(
+        `  ${chalk2.gray("Matched dynamic inputs:\n   ")}`,
+        entries.map(([k, v]) => `${k}: ${v}`).join("\n    ")
+      );
+    }
+  }
+  if (resErrors.length > 0) {
+    unstable_logIssues(
+      `[canvas-next] ${matched.matchedRoute} composition data error${resErrors.length === 1 ? "" : "s"}; some content may be missing`,
+      resErrors,
+      "red"
     );
-    const invokeCompositionResult = (response, duration) => (handleComposition != null ? handleComposition : defaultHandleComposition)(
-      response,
-      context,
-      (response2) => defaultHandleComposition(
-        response2,
-        context,
-        () => {
-          throw new Error();
-        },
-        duration
-      ),
-      duration
+  }
+  if (resWarnings.length > 0) {
+    unstable_logIssues(
+      `[canvas-next] ${matched.matchedRoute} composition data warning${resWarnings.length === 1 ? "" : "s"}; some content may be missing`,
+      resWarnings,
+      "yellow"
     );
-    if (contextualEditingCompositionId) {
-      const previewEmptyComposition = await invokeCompositionResult(
-        {
-          type: "composition",
-          matchedRoute: "contextual-editing",
-          compositionApiResponse: {
-            composition: {
-              ...EMPTY_COMPOSITION,
-              _id: contextualEditingCompositionId != null ? contextualEditingCompositionId : EMPTY_COMPOSITION._id
-            }
-          }
-        },
-        0
-      );
-      return previewEmptyComposition;
+  }
+  if (matched.compositionApiResponse.diagnostics) {
+    console.log(`[canvas-next] ${chalk2.green("Route diagnostics are enabled. Diagnostic data:")}`);
+    console.log(JSON.stringify(matched.compositionApiResponse.diagnostics, null, 2));
+  }
+  return matched.compositionApiResponse.composition;
+}
+
+// src/route/defaultHandleRedirect.ts
+import { RedirectClient } from "@uniformdev/redirect";
+function defaultHandleRedirect(matched, requestUrl) {
+  return {
+    redirect: {
+      destination: RedirectClient.getTargetVariableExpandedUrl(requestUrl, matched.redirect),
+      statusCode: matched.redirect.targetStatusCode
+    }
+  };
+}
+
+// src/route/withUniformGetServerSideProps.ts
+var unstable_withUniformGetServerSideProps = (options) => {
+  var _a, _b, _c, _d;
+  const handleNotFound = (_a = options == null ? void 0 : options.handleNotFound) != null ? _a : () => ({ notFound: true });
+  const handleComposition = (_b = options == null ? void 0 : options.handleComposition) != null ? _b : defaultHandleComposition;
+  const handleRedirect = (_c = options == null ? void 0 : options.handleRedirect) != null ? _c : defaultHandleRedirect;
+  const handleModifyPath = (_d = options == null ? void 0 : options.modifyPath) != null ? _d : (path) => decodeURI(path);
+  return async function wrappedGetServerSideProps(context) {
+    var _a2, _b2;
+    const projectMapId = (_a2 = options == null ? void 0 : options.projectMapId) != null ? _a2 : process.env.UNIFORM_PROJECT_MAP_ID;
+    const routeClient = (options == null ? void 0 : options.client) || new unstable_RouteClient({
+      apiKey: process.env.UNIFORM_API_KEY,
+      projectId: process.env.UNIFORM_PROJECT_ID,
+      edgeApiHost: process.env.UNIFORM_CLI_BASE_EDGE_URL
+    });
+    const { previewData } = context;
+    let composition = void 0;
+    let nodePath = (options == null ? void 0 : options.prefix) ? context.resolvedUrl.replace(new RegExp(`^${options.prefix}`), "") : context.resolvedUrl;
+    nodePath = handleModifyPath(nodePath, context);
+    if (previewData == null ? void 0 : previewData.isUniformContextualEditing) {
+      composition = { ...EMPTY_COMPOSITION, _id: (_b2 = previewData.compositionId) != null ? _b2 : EMPTY_COMPOSITION._id };
     } else {
       try {
-        console.log("Fetch route", nodePath);
-        const time = Date.now();
+        console.log("[canvas-next] get route", nodePath);
         const response = await routeClient.getRoute({
-          ...requestOptions,
+          ...options == null ? void 0 : options.requestOptions,
           projectMapId,
           path: nodePath
         });
-        const duration = Date.now() - time;
-        if (!silent) {
-          logRouteResponse(response, duration);
-        }
         if (response.type === "redirect") {
-          return invokeRedirectResult(response, duration);
+          return handleRedirect(response, nodePath, context, defaultHandleRedirect);
         }
         if (response.type === "notFound") {
-          return invokeNotFoundResult(response, duration);
+          return handleNotFound(response, context);
         }
-        const handleResult = await invokeCompositionResult(response, duration);
+        const handleResult = handleComposition(response, context, defaultHandleComposition);
         if (!handleResult) {
-          return invokeNotFoundResult({ type: "notFound" }, duration);
+          return { notFound: true };
         }
-        return handleResult;
+        composition = handleResult;
       } catch (e) {
-        console.error(red("Failed to fetch route"), e);
+        console.error(chalk3.red("[canvas-next] Failed to fetch composition"), e);
         if (e instanceof ApiClientError) {
           if (e.statusCode === 404) {
-            return invokeNotFoundResult({ type: "notFound" }, 0);
+            return { notFound: true };
           }
-          throw new Error(`Failed to fetch route. See server logs for details.`);
+          throw new Error(`Failed to fetch composition. See server logs for details.`);
         }
         throw e;
       }
     }
-  };
-}
-
-// src/route/withUniformGetServerSideProps.ts
-var unstable_withUniformGetServerSideProps = (options) => {
-  const defaultHandleRedirect = (requestUrl, matched) => {
-    return {
-      redirect: {
-        destination: RedirectClient.getTargetVariableExpandedUrl(requestUrl, matched.redirect),
-        statusCode: matched.redirect.targetStatusCode
-      }
-    };
-  };
-  const defaultHandleNotFound = () => ({
-    notFound: true
-  });
-  const defaultHandleComposition = async (matched) => {
-    return {
-      props: {
-        data: matched.compositionApiResponse.composition
-      }
-    };
-  };
-  const routeFetcher = createRouteFetcher({
-    ...options,
-    defaultHandleComposition,
-    defaultHandleNotFound,
-    defaultHandleRedirect,
-    parseContext(context) {
-      var _a;
-      return {
-        contextualEditingCompositionId: (_a = context.previewData) == null ? void 0 : _a.compositionId,
-        resolvedUrl: context.resolvedUrl
-      };
+    const ret = (options == null ? void 0 : options.callback) ? await options.callback(context, composition) : { props: {} };
+    if (Object.hasOwn(ret, "props")) {
+      const casted = ret;
+      casted.props["data"] = composition;
     }
-  });
-  return routeFetcher;
-};
-
-// src/route/withUniformGetStaticProps.ts
-import { RedirectClient as RedirectClient2 } from "@uniformdev/redirect";
-var unstable_withUniformGetStaticProps = (options) => {
-  const defaultHandleRedirect = (requestUrl, matched) => {
-    return {
-      redirect: {
-        destination: RedirectClient2.getTargetVariableExpandedUrl(requestUrl, matched.redirect),
-        statusCode: matched.redirect.targetStatusCode
-      }
-    };
+    return ret;
   };
-  const defaultHandleNotFound = () => ({
-    notFound: true
-  });
-  const defaultHandleComposition = async (matched) => {
-    return {
-      props: {
-        data: matched.compositionApiResponse.composition
-      }
-    };
-  };
-  const routeFetcher = createRouteFetcher({
-    ...options,
-    defaultHandleComposition,
-    defaultHandleNotFound,
-    defaultHandleRedirect,
-    parseContext(context) {
-      var _a, _b;
-      return {
-        contextualEditingCompositionId: (_a = context.previewData) == null ? void 0 : _a.compositionId,
-        resolvedUrl: resolveSlugFromParams({
-          params: context.params,
-          param: (_b = options == null ? void 0 : options.param) != null ? _b : "route"
-        })
-      };
-    }
-  });
-  return routeFetcher;
 };
 
 // src/route/index.ts
 var unstable_getServerSideProps = unstable_withUniformGetServerSideProps();
-var unstable_getStaticProps = unstable_withUniformGetStaticProps();
-var getStaticPaths = withUniformGetStaticPaths();
 export {
-  getStaticPaths,
   unstable_getServerSideProps,
-  unstable_getStaticProps,
-  unstable_withUniformGetServerSideProps,
-  unstable_withUniformGetStaticProps,
-  withUniformGetStaticPaths
+  unstable_logIssues,
+  unstable_withUniformGetServerSideProps
 };

package/dist/slug/index.d.ts

@@ -20,7 +20,7 @@ declare const withUniformGetServerSideProps: <TProps extends {
     preview?: boolean | undefined;
     /** If you need to override the default client, you can pass it here */
     client?: CanvasClient | undefined;
-    requestOptions?: Omit<Partial<{
+    requestOptions?: Partial<{
         skipEnhance?: boolean | undefined;
         skipPatternResolution?: boolean | undefined;
         skipOverridesResolution?: boolean | undefined;
@@ -28,10 +28,8 @@ declare const withUniformGetServerSideProps: <TProps extends {
         withComponentIDs?: boolean | undefined;
         withTotalCount?: boolean | undefined;
         withUIStatus?: boolean | undefined;
-    } & Required<Pick<_uniformdev_canvas.CompositionGetParameters, "slug">> & DataResolutionOption>, "state"> | undefined;
+    } & Required<Pick<_uniformdev_canvas.CompositionGetParameters, "slug">> & DataResolutionOption> | undefined;
     callback?: UniformGetServerSideProps<TProps> | undefined;
-    /** Disables logging of response information and timings */
-    silent?: boolean | undefined;
 } | undefined) => GetServerSideProps<TProps, ParsedUrlQuery, UniformPreviewData>;
 
 declare const withUniformGetStaticPaths: (options?: {
@@ -65,7 +63,7 @@ declare const withUniformGetStaticProps: <TProps extends {
     /** If you need to override the default client, you can pass it here */
     client?: CanvasClient | undefined;
     /** Way to override getCompositionBySlug request params */
-    requestOptions?: Omit<Partial<{
+    requestOptions?: Partial<{
         skipEnhance?: boolean | undefined;
         skipPatternResolution?: boolean | undefined;
         skipOverridesResolution?: boolean | undefined;
@@ -73,11 +71,9 @@ declare const withUniformGetStaticProps: <TProps extends {
         withComponentIDs?: boolean | undefined;
         withTotalCount?: boolean | undefined;
         withUIStatus?: boolean | undefined;
-    } & Required<Pick<_uniformdev_canvas.CompositionGetParameters, "slug">> & DataResolutionOption>, "state"> | undefined;
+    } & Required<Pick<_uniformdev_canvas.CompositionGetParameters, "slug">> & DataResolutionOption> | undefined;
     /** Custom handler to specify return value and modify composition - e.g. enhance with CMS data */
     callback?: UniformGetStaticProps<TProps> | undefined;
-    /** Disables logging of response information and timings */
-    silent?: boolean | undefined;
 }) => GetStaticProps<TProps, ParsedUrlQuery, UniformPreviewData>;
 
 declare const getServerSideProps: next.GetServerSideProps<{

package/dist/slug/index.js

@@ -32,14 +32,14 @@ module.exports = __toCommonJS(slug_exports);
 // src/slug/withUniformGetServerSideProps.ts
 var import_canvas = require("@uniformdev/canvas");
 var withUniformGetServerSideProps = (options) => {
-  const canvasClient = (options == null ? void 0 : options.client) || new import_canvas.CanvasClient({
-    apiKey: process.env.UNIFORM_API_KEY,
-    projectId: process.env.UNIFORM_PROJECT_ID,
-    apiHost: process.env.UNIFORM_CLI_BASE_URL,
-    edgeApiHost: process.env.UNIFORM_CLI_BASE_EDGE_URL
-  });
   return async function wrappedGetServerSideProps(context) {
     var _a;
+    const canvasClient = (options == null ? void 0 : options.client) || new import_canvas.CanvasClient({
+      apiKey: process.env.UNIFORM_API_KEY,
+      projectId: process.env.UNIFORM_PROJECT_ID,
+      apiHost: process.env.UNIFORM_CLI_BASE_URL,
+      edgeApiHost: process.env.UNIFORM_CLI_BASE_EDGE_URL
+    });
     const { preview, previewData } = context;
     let composition = void 0;
     let slug = (options == null ? void 0 : options.prefix) ? context.resolvedUrl.replace(new RegExp(`^${options.prefix}`), "") : context.resolvedUrl;
@@ -50,17 +50,12 @@ var withUniformGetServerSideProps = (options) => {
       composition = { ...import_canvas.EMPTY_COMPOSITION, _id: (_a = previewData.compositionId) != null ? _a : import_canvas.EMPTY_COMPOSITION._id };
     } else {
       try {
-        const time = Date.now();
         const response = await canvasClient.getCompositionBySlug({
           ...options == null ? void 0 : options.requestOptions,
           slug,
           state: preview || (options == null ? void 0 : options.preview) ? import_canvas.CANVAS_DRAFT_STATE : import_canvas.CANVAS_PUBLISHED_STATE
         });
-        const duration = Date.now() - time;
         composition = response.composition;
-        if (!(options == null ? void 0 : options.silent)) {
-          (0, import_canvas.logCompositionResponse)(response, duration);
-        }
       } catch (e) {
         console.error("[canvas-next] Failed to fetch composition", e);
         return {
@@ -107,7 +102,7 @@ var withUniformGetStaticPaths = (options) => {
 // src/slug/withUniformGetStaticProps.ts
 var import_canvas3 = require("@uniformdev/canvas");
 
-// src/helpers/resolveSlugFromParams.ts
+// src/helpers/slug.ts
 var resolveSlugFromParams = ({
   param = "slug",
   params
@@ -119,15 +114,8 @@ var resolveSlugFromParams = ({
 
 // src/slug/withUniformGetStaticProps.ts
 var withUniformGetStaticProps = (options) => {
-  var _a;
-  const canvasClient = (_a = options == null ? void 0 : options.client) != null ? _a : new import_canvas3.CanvasClient({
-    apiKey: process.env.UNIFORM_API_KEY,
-    projectId: process.env.UNIFORM_PROJECT_ID,
-    apiHost: process.env.UNIFORM_CLI_BASE_URL,
-    edgeApiHost: process.env.UNIFORM_CLI_BASE_EDGE_URL
-  });
   return async function wrappedGetStaticProps(context) {
-    var _a2;
+    var _a, _b;
     let slugString = resolveSlugFromParams({
       param: options == null ? void 0 : options.param,
       params: context == null ? void 0 : context.params
@@ -135,23 +123,24 @@ var withUniformGetStaticProps = (options) => {
     if (options == null ? void 0 : options.modifySlug) {
       slugString = options.modifySlug(slugString, context);
     }
+    const canvasClient = (_a = options == null ? void 0 : options.client) != null ? _a : new import_canvas3.CanvasClient({
+      apiKey: process.env.UNIFORM_API_KEY,
+      projectId: process.env.UNIFORM_PROJECT_ID,
+      apiHost: process.env.UNIFORM_CLI_BASE_URL,
+      edgeApiHost: process.env.UNIFORM_CLI_BASE_EDGE_URL
+    });
     const { preview, previewData } = context;
     let composition = void 0;
     if (previewData == null ? void 0 : previewData.isUniformContextualEditing) {
-      composition = { ...import_canvas3.EMPTY_COMPOSITION, _id: (_a2 = previewData.compositionId) != null ? _a2 : import_canvas3.EMPTY_COMPOSITION._id };
+      composition = { ...import_canvas3.EMPTY_COMPOSITION, _id: (_b = previewData.compositionId) != null ? _b : import_canvas3.EMPTY_COMPOSITION._id };
     } else {
       try {
-        const time = Date.now();
         const response = await canvasClient.getCompositionBySlug({
           slug: slugString,
           state: preview || (options == null ? void 0 : options.preview) ? import_canvas3.CANVAS_DRAFT_STATE : import_canvas3.CANVAS_PUBLISHED_STATE,
           ...options == null ? void 0 : options.requestOptions
         });
-        const duration = Date.now() - time;
         composition = response.composition;
-        if (!(options == null ? void 0 : options.silent)) {
-          (0, import_canvas3.logCompositionResponse)(response, duration);
-        }
       } catch (e) {
         console.error("[canvas-next] Failed to fetch composition", e);
         return {

package/dist/slug/index.mjs

@@ -1,24 +1,23 @@
 import {
   resolveSlugFromParams
-} from "../chunk-TR7V6ABJ.mjs";
+} from "../chunk-2MI7UYW7.mjs";
 
 // src/slug/withUniformGetServerSideProps.ts
 import {
   CANVAS_DRAFT_STATE,
   CANVAS_PUBLISHED_STATE,
   CanvasClient,
-  EMPTY_COMPOSITION,
-  logCompositionResponse
+  EMPTY_COMPOSITION
 } from "@uniformdev/canvas";
 var withUniformGetServerSideProps = (options) => {
-  const canvasClient = (options == null ? void 0 : options.client) || new CanvasClient({
-    apiKey: process.env.UNIFORM_API_KEY,
-    projectId: process.env.UNIFORM_PROJECT_ID,
-    apiHost: process.env.UNIFORM_CLI_BASE_URL,
-    edgeApiHost: process.env.UNIFORM_CLI_BASE_EDGE_URL
-  });
   return async function wrappedGetServerSideProps(context) {
     var _a;
+    const canvasClient = (options == null ? void 0 : options.client) || new CanvasClient({
+      apiKey: process.env.UNIFORM_API_KEY,
+      projectId: process.env.UNIFORM_PROJECT_ID,
+      apiHost: process.env.UNIFORM_CLI_BASE_URL,
+      edgeApiHost: process.env.UNIFORM_CLI_BASE_EDGE_URL
+    });
     const { preview, previewData } = context;
     let composition = void 0;
     let slug = (options == null ? void 0 : options.prefix) ? context.resolvedUrl.replace(new RegExp(`^${options.prefix}`), "") : context.resolvedUrl;
@@ -29,17 +28,12 @@ var withUniformGetServerSideProps = (options) => {
       composition = { ...EMPTY_COMPOSITION, _id: (_a = previewData.compositionId) != null ? _a : EMPTY_COMPOSITION._id };
     } else {
       try {
-        const time = Date.now();
         const response = await canvasClient.getCompositionBySlug({
           ...options == null ? void 0 : options.requestOptions,
           slug,
           state: preview || (options == null ? void 0 : options.preview) ? CANVAS_DRAFT_STATE : CANVAS_PUBLISHED_STATE
         });
-        const duration = Date.now() - time;
         composition = response.composition;
-        if (!(options == null ? void 0 : options.silent)) {
-          logCompositionResponse(response, duration);
-        }
       } catch (e) {
         console.error("[canvas-next] Failed to fetch composition", e);
         return {
@@ -92,19 +86,11 @@ import {
   CANVAS_DRAFT_STATE as CANVAS_DRAFT_STATE3,
   CANVAS_PUBLISHED_STATE as CANVAS_PUBLISHED_STATE3,
   CanvasClient as CanvasClient3,
-  EMPTY_COMPOSITION as EMPTY_COMPOSITION2,
-  logCompositionResponse as logCompositionResponse2
+  EMPTY_COMPOSITION as EMPTY_COMPOSITION2
 } from "@uniformdev/canvas";
 var withUniformGetStaticProps = (options) => {
-  var _a;
-  const canvasClient = (_a = options == null ? void 0 : options.client) != null ? _a : new CanvasClient3({
-    apiKey: process.env.UNIFORM_API_KEY,
-    projectId: process.env.UNIFORM_PROJECT_ID,
-    apiHost: process.env.UNIFORM_CLI_BASE_URL,
-    edgeApiHost: process.env.UNIFORM_CLI_BASE_EDGE_URL
-  });
   return async function wrappedGetStaticProps(context) {
-    var _a2;
+    var _a, _b;
     let slugString = resolveSlugFromParams({
       param: options == null ? void 0 : options.param,
       params: context == null ? void 0 : context.params
@@ -112,23 +98,24 @@ var withUniformGetStaticProps = (options) => {
     if (options == null ? void 0 : options.modifySlug) {
       slugString = options.modifySlug(slugString, context);
     }
+    const canvasClient = (_a = options == null ? void 0 : options.client) != null ? _a : new CanvasClient3({
+      apiKey: process.env.UNIFORM_API_KEY,
+      projectId: process.env.UNIFORM_PROJECT_ID,
+      apiHost: process.env.UNIFORM_CLI_BASE_URL,
+      edgeApiHost: process.env.UNIFORM_CLI_BASE_EDGE_URL
+    });
     const { preview, previewData } = context;
     let composition = void 0;
     if (previewData == null ? void 0 : previewData.isUniformContextualEditing) {
-      composition = { ...EMPTY_COMPOSITION2, _id: (_a2 = previewData.compositionId) != null ? _a2 : EMPTY_COMPOSITION2._id };
+      composition = { ...EMPTY_COMPOSITION2, _id: (_b = previewData.compositionId) != null ? _b : EMPTY_COMPOSITION2._id };
     } else {
       try {
-        const time = Date.now();
         const response = await canvasClient.getCompositionBySlug({
           slug: slugString,
           state: preview || (options == null ? void 0 : options.preview) ? CANVAS_DRAFT_STATE3 : CANVAS_PUBLISHED_STATE3,
           ...options == null ? void 0 : options.requestOptions
         });
-        const duration = Date.now() - time;
         composition = response.composition;
-        if (!(options == null ? void 0 : options.silent)) {
-          logCompositionResponse2(response, duration);
-        }
       } catch (e) {
         console.error("[canvas-next] Failed to fetch composition", e);
         return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/canvas-next",
-  "version": "19.9.2-alpha.3+547c8b11d",
+  "version": "19.10.0",
   "description": "Next.js SDK for Uniform Canvas",
   "license": "SEE LICENSE IN LICENSE.txt",
   "main": "./dist/index.js",
@@ -63,11 +63,11 @@
     "document": "api-extractor run --local"
   },
   "dependencies": {
-    "@uniformdev/canvas": "19.9.2-alpha.3+547c8b11d",
-    "@uniformdev/canvas-react": "19.9.2-alpha.3+547c8b11d",
-    "@uniformdev/project-map": "19.9.2-alpha.3+547c8b11d",
-    "@uniformdev/redirect": "19.9.2-alpha.3+547c8b11d",
-    "ansi-colors": "^4.1.3"
+    "@uniformdev/canvas": "19.10.0",
+    "@uniformdev/canvas-react": "19.10.0",
+    "@uniformdev/project-map": "19.10.0",
+    "@uniformdev/redirect": "19.10.0",
+    "chalk": "^5.2.0"
   },
   "peerDependencies": {
     "next": ">= 12.0.0",
@@ -86,5 +86,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "547c8b11d4655b34250c2fbe3f016c9bc12c3905"
+  "gitHead": "149f942da715ed802545850283f9b99291829a04"
 }