@uniformdev/canvas-next 19.20.1-alpha.32 → 19.22.0

package/dist/route/index.d.ts

@@ -20,8 +20,8 @@ type RouteHandlerOptions<TContext, TResult, TSuccessResult> = {
     modifyPath?: (path: string, context: TContext) => string;
     /** The project map ID to connect to. If not set, the default project map for the configured project will be used. */
     projectMapId?: string;
-    /** Way to override getRoute request params */
-    requestOptions?: Partial<RouteGetParameters>;
+    /** Way to override getRoute request params. Can also be a function to compute options based on context values. */
+    requestOptions?: Partial<RouteGetParameters> | ((context: TContext) => Partial<RouteGetParameters>);
     /** Disables logging of response information and timings */
     silent?: boolean;
     /** Override handling of a composition route response. Return null to signal not found. */

package/dist/route/index.js

@@ -335,6 +335,7 @@ var getStaticProps = withUniformGetStaticProps({ param: "path" });
 var getStaticPaths = withUniformGetStaticPaths();
 
 // src/route/withUniformGetServerSideProps.ts
+var import_canvas5 = require("@uniformdev/canvas");
 var import_redirect = require("@uniformdev/redirect");
 
 // src/route/createRouteFetcher.ts
@@ -363,7 +364,12 @@ function createRouteFetcher(options) {
   });
   const handleModifyPath = modifyPath != null ? modifyPath : (path) => decodeURI(path);
   return async function fetcher(context) {
-    const { contextualEditingCompositionId, resolvedUrl } = parseContext(context);
+    var _a, _b;
+    const {
+      contextualEditingCompositionId,
+      resolvedUrl,
+      defaultFetchState: defaultPreviewState
+    } = parseContext(context);
     let nodePath = prefix ? resolvedUrl.replace(new RegExp(`^${prefix}`), "") : resolvedUrl;
     nodePath = handleModifyPath(nodePath, context);
     const invokeRedirectResult = (redirect, duration) => (handleRedirect != null ? handleRedirect : defaultHandleRedirect)(
@@ -427,9 +433,11 @@ function createRouteFetcher(options) {
         if (!silent) {
           console.log("Fetch route", nodePath);
         }
+        const resolvedOptions = typeof requestOptions === "function" ? requestOptions(context) : requestOptions;
         const time = Date.now();
         const response = await routeClient.getRoute({
-          ...requestOptions,
+          ...resolvedOptions,
+          state: (_b = (_a = resolvedOptions == null ? void 0 : resolvedOptions.state) != null ? _a : defaultPreviewState) != null ? _b : import_canvas4.CANVAS_PUBLISHED_STATE,
           projectMapId,
           path: nodePath
         });
@@ -496,7 +504,10 @@ var withUniformGetServerSideProps2 = (options) => {
       var _a;
       return {
         contextualEditingCompositionId: (_a = context.previewData) == null ? void 0 : _a.compositionId,
-        resolvedUrl: context.resolvedUrl
+        resolvedUrl: context.resolvedUrl,
+        // auto engage draft content when in next preview mode
+        // (can override with explicit setting of request options)'
+        defaultFetchState: context.preview ? import_canvas5.CANVAS_DRAFT_STATE : void 0
       };
     }
   });
@@ -504,6 +515,7 @@ var withUniformGetServerSideProps2 = (options) => {
 };
 
 // src/route/withUniformGetStaticProps.ts
+var import_canvas6 = require("@uniformdev/canvas");
 var import_redirect2 = require("@uniformdev/redirect");
 var withUniformGetStaticProps2 = (options) => {
   const defaultHandleRedirect = (requestUrl, matched) => {
@@ -536,7 +548,10 @@ var withUniformGetStaticProps2 = (options) => {
         resolvedUrl: resolveSlugFromParams({
           params: context.params,
           param: (_b = options == null ? void 0 : options.param) != null ? _b : "route"
-        })
+        }),
+        // auto engage draft content when in next preview mode
+        // (can override with explicit setting of request options)
+        defaultFetchState: context.preview ? import_canvas6.CANVAS_DRAFT_STATE : void 0
       };
     }
   });

package/dist/route/index.mjs

@@ -57,11 +57,13 @@ function logRouteResponse(response, duration) {
 }
 
 // src/route/withUniformGetServerSideProps.ts
+import { CANVAS_DRAFT_STATE } from "@uniformdev/canvas";
 import { RedirectClient } from "@uniformdev/redirect";
 
 // src/route/createRouteFetcher.ts
 import {
   ApiClientError,
+  CANVAS_PUBLISHED_STATE,
   EMPTY_COMPOSITION,
   RouteClient
 } from "@uniformdev/canvas";
@@ -89,7 +91,12 @@ function createRouteFetcher(options) {
   });
   const handleModifyPath = modifyPath != null ? modifyPath : (path) => decodeURI(path);
   return async function fetcher(context) {
-    const { contextualEditingCompositionId, resolvedUrl } = parseContext(context);
+    var _a, _b;
+    const {
+      contextualEditingCompositionId,
+      resolvedUrl,
+      defaultFetchState: defaultPreviewState
+    } = parseContext(context);
     let nodePath = prefix ? resolvedUrl.replace(new RegExp(`^${prefix}`), "") : resolvedUrl;
     nodePath = handleModifyPath(nodePath, context);
     const invokeRedirectResult = (redirect, duration) => (handleRedirect != null ? handleRedirect : defaultHandleRedirect)(
@@ -153,9 +160,11 @@ function createRouteFetcher(options) {
         if (!silent) {
           console.log("Fetch route", nodePath);
         }
+        const resolvedOptions = typeof requestOptions === "function" ? requestOptions(context) : requestOptions;
         const time = Date.now();
         const response = await routeClient.getRoute({
-          ...requestOptions,
+          ...resolvedOptions,
+          state: (_b = (_a = resolvedOptions == null ? void 0 : resolvedOptions.state) != null ? _a : defaultPreviewState) != null ? _b : CANVAS_PUBLISHED_STATE,
           projectMapId,
           path: nodePath
         });
@@ -222,7 +231,10 @@ var withUniformGetServerSideProps = (options) => {
       var _a;
       return {
         contextualEditingCompositionId: (_a = context.previewData) == null ? void 0 : _a.compositionId,
-        resolvedUrl: context.resolvedUrl
+        resolvedUrl: context.resolvedUrl,
+        // auto engage draft content when in next preview mode
+        // (can override with explicit setting of request options)'
+        defaultFetchState: context.preview ? CANVAS_DRAFT_STATE : void 0
       };
     }
   });
@@ -230,6 +242,7 @@ var withUniformGetServerSideProps = (options) => {
 };
 
 // src/route/withUniformGetStaticProps.ts
+import { CANVAS_DRAFT_STATE as CANVAS_DRAFT_STATE2 } from "@uniformdev/canvas";
 import { RedirectClient as RedirectClient2 } from "@uniformdev/redirect";
 var withUniformGetStaticProps = (options) => {
   const defaultHandleRedirect = (requestUrl, matched) => {
@@ -262,7 +275,10 @@ var withUniformGetStaticProps = (options) => {
         resolvedUrl: resolveSlugFromParams({
           params: context.params,
           param: (_b = options == null ? void 0 : options.param) != null ? _b : "route"
-        })
+        }),
+        // auto engage draft content when in next preview mode
+        // (can override with explicit setting of request options)
+        defaultFetchState: context.preview ? CANVAS_DRAFT_STATE2 : void 0
       };
     }
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/canvas-next",
-  "version": "19.20.1-alpha.32+9ad53dedb",
+  "version": "19.22.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.20.1-alpha.32+9ad53dedb",
-    "@uniformdev/canvas-react": "19.20.1-alpha.32+9ad53dedb",
-    "@uniformdev/project-map": "19.20.1-alpha.32+9ad53dedb",
-    "@uniformdev/redirect": "19.20.1-alpha.32+9ad53dedb",
-    "@uniformdev/richtext": "19.20.1-alpha.32+9ad53dedb",
+    "@uniformdev/canvas": "19.22.0",
+    "@uniformdev/canvas-react": "19.22.0",
+    "@uniformdev/project-map": "19.22.0",
+    "@uniformdev/redirect": "19.22.0",
+    "@uniformdev/richtext": "19.22.0",
     "colorette": "2.0.20"
   },
   "peerDependencies": {
@@ -87,5 +87,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "9ad53dedb0a0c580abc314fe1422f48a09efd0aa"
+  "gitHead": "f3b826c15f64a8abc5bd7ca08c0539bd85684cf9"
 }