@uniformdev/canvas-next-rsc 19.121.0 → 19.123.1-alpha.9

package/dist/handler.d.mts

@@ -1,7 +1,20 @@
 import { NextRequest } from 'next/server';
 
+type ResolveFullPath = (options: {
+    /** The ID of the composition */
+    id?: string | null;
+    /** The slug of the composition */
+    slug?: string | null;
+    /** The path of the project map node attached to the composition, if there is one */
+    path?: string | null;
+}) => string;
 type CreatePreviewGETRouteHandlerOptions = {
     playgroundPath?: string;
+    /**
+     * Should return the full path to redirect to. Will respond with `400` error if `undefined` is returned.
+     * defaults to a function that returns the `path` if truthy, otherwise returns `slug`.
+     */
+    resolveFullPath?: ResolveFullPath;
 };
 declare const createPreviewGETRouteHandler: (options?: CreatePreviewGETRouteHandlerOptions) => (request: NextRequest) => Promise<Response>;
 

package/dist/handler.d.ts

@@ -1,7 +1,20 @@
 import { NextRequest } from 'next/server';
 
+type ResolveFullPath = (options: {
+    /** The ID of the composition */
+    id?: string | null;
+    /** The slug of the composition */
+    slug?: string | null;
+    /** The path of the project map node attached to the composition, if there is one */
+    path?: string | null;
+}) => string;
 type CreatePreviewGETRouteHandlerOptions = {
     playgroundPath?: string;
+    /**
+     * Should return the full path to redirect to. Will respond with `400` error if `undefined` is returned.
+     * defaults to a function that returns the `path` if truthy, otherwise returns `slug`.
+     */
+    resolveFullPath?: ResolveFullPath;
 };
 declare const createPreviewGETRouteHandler: (options?: CreatePreviewGETRouteHandlerOptions) => (request: NextRequest) => Promise<Response>;
 

package/dist/handler.js

@@ -297,14 +297,18 @@ var getQueryParam = (req, paramName) => {
   }
   return Array.isArray(value) ? value[0] : value;
 };
+var resolveFullPathDefault = ({ path }) => {
+  return path || "";
+};
 var createPreviewGETRouteHandler = (options) => {
   return async (request) => {
+    const { playgroundPath, resolveFullPath = resolveFullPathDefault } = options || {};
     const isConfigCheck = getQueryParam(request, "is_config_check") === "true";
     if (isConfigCheck) {
       return Response.json(
         {
-          hasPlayground: Boolean(options == null ? void 0 : options.playgroundPath),
-          isUsingCustomFullPathResolver: false
+          hasPlayground: Boolean(playgroundPath),
+          isUsingCustomFullPathResolver: resolveFullPath !== resolveFullPathDefault
         },
         {
           headers: {
@@ -324,15 +328,16 @@ var createPreviewGETRouteHandler = (options) => {
     const path = searchParams.get("path");
     const isPlayground = searchParams.get(import_canvas5.IN_CONTEXT_EDITOR_PLAYGROUND_QUERY_STRING_PARAM) === "true";
     const id = searchParams.get("id");
+    const resolbedPath = resolveFullPath({ id, path });
     if (secret !== process.env.UNIFORM_PREVIEW_SECRET) {
       return new Response("Invalid preview secret", { status: 401 });
     }
     if (!isPlayground) {
-      if (!path) {
+      if (!resolbedPath) {
         return new Response("Path not provided", { status: 401 });
       }
       const resolveResult = await retrieveRouteByPath({
-        path,
+        path: resolbedPath,
         state: import_canvas5.CANVAS_DRAFT_STATE,
         searchParams: {
           // about to be in draft mode so pretend for now.
@@ -341,7 +346,7 @@ var createPreviewGETRouteHandler = (options) => {
       });
       (0, import_headers2.draftMode)().enable();
       if (resolveResult.type === "redirect") {
-        const href = resolveRedirectHref(resolveResult, path);
+        const href = resolveRedirectHref(resolveResult, resolbedPath);
         if (resolveResult.redirect.targetProjectMapNodeId) {
           (0, import_navigation.redirect)(`${href}?${import_canvas5.IN_CONTEXT_EDITOR_QUERY_STRING_PARAM}=true`);
         } else {
@@ -351,13 +356,13 @@ var createPreviewGETRouteHandler = (options) => {
       if (resolveResult.type === "notFound") {
         return new Response("Invalid path", { status: 401 });
       }
-      (0, import_navigation.redirect)(`${path}?${import_canvas5.IN_CONTEXT_EDITOR_QUERY_STRING_PARAM}=true`);
+      (0, import_navigation.redirect)(`${resolbedPath}?${import_canvas5.IN_CONTEXT_EDITOR_QUERY_STRING_PARAM}=true`);
     } else {
       if (!(options == null ? void 0 : options.playgroundPath)) {
         return new Response("No playground path is configured", { status: 401 });
       }
       (0, import_headers2.draftMode)().enable();
-      (0, import_navigation.redirect)(`${options.playgroundPath}?id=${id}&${import_canvas5.IN_CONTEXT_EDITOR_QUERY_STRING_PARAM}=true`);
+      (0, import_navigation.redirect)(`${playgroundPath}?id=${id}&${import_canvas5.IN_CONTEXT_EDITOR_QUERY_STRING_PARAM}=true`);
     }
   };
 };

package/dist/handler.mjs

@@ -277,14 +277,18 @@ var getQueryParam = (req, paramName) => {
   }
   return Array.isArray(value) ? value[0] : value;
 };
+var resolveFullPathDefault = ({ path }) => {
+  return path || "";
+};
 var createPreviewGETRouteHandler = (options) => {
   return async (request) => {
+    const { playgroundPath, resolveFullPath = resolveFullPathDefault } = options || {};
     const isConfigCheck = getQueryParam(request, "is_config_check") === "true";
     if (isConfigCheck) {
       return Response.json(
         {
-          hasPlayground: Boolean(options == null ? void 0 : options.playgroundPath),
-          isUsingCustomFullPathResolver: false
+          hasPlayground: Boolean(playgroundPath),
+          isUsingCustomFullPathResolver: resolveFullPath !== resolveFullPathDefault
         },
         {
           headers: {
@@ -304,15 +308,16 @@ var createPreviewGETRouteHandler = (options) => {
     const path = searchParams.get("path");
     const isPlayground = searchParams.get(IN_CONTEXT_EDITOR_PLAYGROUND_QUERY_STRING_PARAM) === "true";
     const id = searchParams.get("id");
+    const resolbedPath = resolveFullPath({ id, path });
     if (secret !== process.env.UNIFORM_PREVIEW_SECRET) {
       return new Response("Invalid preview secret", { status: 401 });
     }
     if (!isPlayground) {
-      if (!path) {
+      if (!resolbedPath) {
         return new Response("Path not provided", { status: 401 });
       }
       const resolveResult = await retrieveRouteByPath({
-        path,
+        path: resolbedPath,
         state: CANVAS_DRAFT_STATE2,
         searchParams: {
           // about to be in draft mode so pretend for now.
@@ -321,7 +326,7 @@ var createPreviewGETRouteHandler = (options) => {
       });
       draftMode2().enable();
       if (resolveResult.type === "redirect") {
-        const href = resolveRedirectHref(resolveResult, path);
+        const href = resolveRedirectHref(resolveResult, resolbedPath);
         if (resolveResult.redirect.targetProjectMapNodeId) {
           redirect(`${href}?${IN_CONTEXT_EDITOR_QUERY_STRING_PARAM2}=true`);
         } else {
@@ -331,13 +336,13 @@ var createPreviewGETRouteHandler = (options) => {
       if (resolveResult.type === "notFound") {
         return new Response("Invalid path", { status: 401 });
       }
-      redirect(`${path}?${IN_CONTEXT_EDITOR_QUERY_STRING_PARAM2}=true`);
+      redirect(`${resolbedPath}?${IN_CONTEXT_EDITOR_QUERY_STRING_PARAM2}=true`);
     } else {
       if (!(options == null ? void 0 : options.playgroundPath)) {
         return new Response("No playground path is configured", { status: 401 });
       }
       draftMode2().enable();
-      redirect(`${options.playgroundPath}?id=${id}&${IN_CONTEXT_EDITOR_QUERY_STRING_PARAM2}=true`);
+      redirect(`${playgroundPath}?id=${id}&${IN_CONTEXT_EDITOR_QUERY_STRING_PARAM2}=true`);
     }
   };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/canvas-next-rsc",
-  "version": "19.121.0",
+  "version": "19.123.1-alpha.9+0f8fa37358",
   "license": "SEE LICENSE IN LICENSE.txt",
   "scripts": {
     "build": "tsup",
@@ -61,15 +61,15 @@
     "react-dom": "18.2.0"
   },
   "dependencies": {
-    "@uniformdev/canvas": "19.121.0",
-    "@uniformdev/canvas-next-rsc-client": "^19.121.0",
-    "@uniformdev/canvas-next-rsc-shared": "^19.121.0",
-    "@uniformdev/canvas-react": "19.121.0",
-    "@uniformdev/context": "19.121.0",
-    "@uniformdev/project-map": "19.121.0",
-    "@uniformdev/redirect": "19.121.0",
-    "@uniformdev/richtext": "19.121.0",
-    "@uniformdev/webhooks": "19.121.0",
+    "@uniformdev/canvas": "19.123.1-alpha.9+0f8fa37358",
+    "@uniformdev/canvas-next-rsc-client": "^19.123.1-alpha.9+0f8fa37358",
+    "@uniformdev/canvas-next-rsc-shared": "^19.123.1-alpha.9+0f8fa37358",
+    "@uniformdev/canvas-react": "19.123.1-alpha.9+0f8fa37358",
+    "@uniformdev/context": "19.123.1-alpha.9+0f8fa37358",
+    "@uniformdev/project-map": "19.123.1-alpha.9+0f8fa37358",
+    "@uniformdev/redirect": "19.123.1-alpha.9+0f8fa37358",
+    "@uniformdev/richtext": "19.123.1-alpha.9+0f8fa37358",
+    "@uniformdev/webhooks": "19.123.1-alpha.9+0f8fa37358",
     "@vercel/edge-config": "^0.4.0",
     "encoding": "^0.1.13",
     "server-only": "^0.0.1",
@@ -86,5 +86,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "4bab305415aa38c7d473a08c15bcd78fcb7d8d88"
+  "gitHead": "0f8fa37358fa0d8bc2e77e00b09d456c7053ee63"
 }