@uniformdev/canvas-next 19.69.0 → 19.71.1-alpha.103

package/dist/route/index.d.ts

@@ -1,12 +1,12 @@
 import * as next from 'next';
 import { GetServerSidePropsContext, GetServerSidePropsResult, GetServerSideProps, GetStaticPropsContext, GetStaticPropsResult, GetStaticProps } from 'next';
-import { a as UniformPreviewData } from '../models-f9fd03c4.js';
+import { a as UniformPreviewData } from '../models--s4UGr5M.js';
 import * as querystring from 'querystring';
 import { ParsedUrlQuery } from 'querystring';
-export { w as withUniformGetStaticPaths } from '../withUniformGetStaticPaths-77db0164.js';
 import { RouteGetResponseEdgehancedComposition, RouteGetResponseNotFound, RouteGetResponseRedirect, RouteClient, RouteGetParameters, RootComponentInstance } from '@uniformdev/canvas';
+import { ProjectMapNodeGetResponse, ProjectMapClient } from '@uniformdev/project-map';
+import { RedirectClient } from '@uniformdev/redirect';
 import '@uniformdev/canvas-react';
-import '@uniformdev/project-map';
 
 type HandleRouteCompositionFunction<TContext, TResult> = (composition: RouteGetResponseEdgehancedComposition, context: TContext, defaultHandler: (composition: RouteGetResponseEdgehancedComposition) => Promise<TResult | null> | TResult | null, duration: number) => Promise<TResult | null> | TResult | null;
 type HandleRouteNotFoundFunction<TContext, TResult> = (result: RouteGetResponseNotFound, context: TContext, defaultHandler: (result: RouteGetResponseNotFound) => TResult, duration: number) => TResult;
@@ -46,6 +46,44 @@ declare const withUniformGetServerSideProps: <TProps extends {
     data: RootComponentInstance;
 }>(options?: RouteHandlerOptions<GetServerSidePropsContext<ParsedUrlQuery, UniformPreviewData>, GetServerSidePropsResult<never>, GetServerSidePropsResult<TProps>> | undefined) => GetServerSideProps<TProps, ParsedUrlQuery, UniformPreviewData>;
 
+declare const withUniformGetStaticPaths: (options?: {
+    projectMapId?: string | undefined;
+    /** Starting path to fetch nodes from */
+    rootPath?: string | undefined;
+    /** A string that you want prepended to paths returned by your project map. Useful when calling from a nested folder which is not part of your project map structure */
+    prefix?: string | undefined;
+    /** Set to true if you want to include draft compositions */
+    preview?: boolean | undefined;
+    /** Way to override getNodes request params */
+    requestOptions?: Partial<{
+        projectMapId?: string | undefined;
+        projectId: string;
+        id?: string | undefined;
+        path?: string | undefined;
+        compositionId?: string | undefined;
+        limit?: number | undefined;
+        offset?: number | undefined;
+        depth?: number | undefined;
+        state?: number | undefined;
+        tree?: boolean | undefined;
+        search?: string | undefined;
+        includeAncestors?: boolean | undefined;
+        expanded?: boolean | undefined;
+        withCompositionData?: boolean | undefined;
+        withCompositionUIStatus?: boolean | undefined;
+        withRedirectData?: boolean | undefined;
+    }> | undefined;
+    /** Way to modify list of nodes before building array of paths */
+    callback?: ((nodes: ProjectMapNodeGetResponse['nodes']) => Promise<ProjectMapNodeGetResponse['nodes']>) | undefined;
+    /** If you need to override the default client, you can pass it here */
+    client?: ProjectMapClient | undefined;
+    /** If you need to override the default redirect client, you can pass it here */
+    redirectClient?: RedirectClient | undefined;
+} | undefined) => () => Promise<{
+    paths: string[];
+    fallback: boolean;
+}>;
+
 /**
  * Creates an implementation of `getStaticProps` using the Uniform Route API.
  * Static and dynamic routing as well as redirection is automatically supported.
@@ -70,12 +108,15 @@ declare const getServerSideProps: next.GetServerSideProps<{
         type: string;
         parameters?: {
             [key: string]: {
-                value: unknown;
+                value?: unknown;
                 type: string;
                 connectedData?: {
                     pointer: string;
                     syntax: "jptr";
                 } | undefined;
+                locales?: {
+                    [key: string]: unknown;
+                } | undefined;
             };
         } | undefined;
         variant?: string | undefined;
@@ -89,12 +130,15 @@ declare const getServerSideProps: next.GetServerSideProps<{
                 type: string;
                 parameters?: {
                     [key: string]: {
-                        value: unknown;
+                        value?: unknown;
                         type: string;
                         connectedData?: {
                             pointer: string;
                             syntax: "jptr";
                         } | undefined;
+                        locales?: {
+                            [key: string]: unknown;
+                        } | undefined;
                     };
                 } | undefined;
                 variant?: string | undefined;
@@ -128,12 +172,15 @@ declare const getServerSideProps: next.GetServerSideProps<{
                     [key: string]: {
                         parameters?: {
                             [key: string]: {
-                                value: unknown;
+                                value?: unknown;
                                 type: string;
                                 connectedData?: {
                                     pointer: string;
                                     syntax: "jptr";
                                 } | undefined;
+                                locales?: {
+                                    [key: string]: unknown;
+                                } | undefined;
                             };
                         } | undefined;
                         variant?: string | undefined;
@@ -164,12 +211,15 @@ declare const getServerSideProps: next.GetServerSideProps<{
             [key: string]: {
                 parameters?: {
                     [key: string]: {
-                        value: unknown;
+                        value?: unknown;
                         type: string;
                         connectedData?: {
                             pointer: string;
                             syntax: "jptr";
                         } | undefined;
+                        locales?: {
+                            [key: string]: unknown;
+                        } | undefined;
                     };
                 } | undefined;
                 variant?: string | undefined;
@@ -181,9 +231,9 @@ declare const getServerSideProps: next.GetServerSideProps<{
             } | undefined;
             variants?: boolean | undefined;
         } | undefined;
+        _locales?: string[] | undefined;
     };
 }, querystring.ParsedUrlQuery, UniformPreviewData>;
-
 /**
  * Default implementation of getStaticProps with routes
  * To configure custom behavior, use:
@@ -194,12 +244,15 @@ declare const getStaticProps: next.GetStaticProps<{
         type: string;
         parameters?: {
             [key: string]: {
-                value: unknown;
+                value?: unknown;
                 type: string;
                 connectedData?: {
                     pointer: string;
                     syntax: "jptr";
                 } | undefined;
+                locales?: {
+                    [key: string]: unknown;
+                } | undefined;
             };
         } | undefined;
         variant?: string | undefined;
@@ -213,12 +266,15 @@ declare const getStaticProps: next.GetStaticProps<{
                 type: string;
                 parameters?: {
                     [key: string]: {
-                        value: unknown;
+                        value?: unknown;
                         type: string;
                         connectedData?: {
                             pointer: string;
                             syntax: "jptr";
                         } | undefined;
+                        locales?: {
+                            [key: string]: unknown;
+                        } | undefined;
                     };
                 } | undefined;
                 variant?: string | undefined;
@@ -252,12 +308,15 @@ declare const getStaticProps: next.GetStaticProps<{
                     [key: string]: {
                         parameters?: {
                             [key: string]: {
-                                value: unknown;
+                                value?: unknown;
                                 type: string;
                                 connectedData?: {
                                     pointer: string;
                                     syntax: "jptr";
                                 } | undefined;
+                                locales?: {
+                                    [key: string]: unknown;
+                                } | undefined;
                             };
                         } | undefined;
                         variant?: string | undefined;
@@ -288,12 +347,15 @@ declare const getStaticProps: next.GetStaticProps<{
             [key: string]: {
                 parameters?: {
                     [key: string]: {
-                        value: unknown;
+                        value?: unknown;
                         type: string;
                         connectedData?: {
                             pointer: string;
                             syntax: "jptr";
                         } | undefined;
+                        locales?: {
+                            [key: string]: unknown;
+                        } | undefined;
                     };
                 } | undefined;
                 variant?: string | undefined;
@@ -305,6 +367,7 @@ declare const getStaticProps: next.GetStaticProps<{
             } | undefined;
             variants?: boolean | undefined;
         } | undefined;
+        _locales?: string[] | undefined;
     };
 }, querystring.ParsedUrlQuery, UniformPreviewData>;
 /**
@@ -315,8 +378,8 @@ declare const getStaticProps: next.GetStaticProps<{
  * NOTE: fallback must be supported. You cannot generate static paths for dynamic routes which contain query parameters.
  */
 declare const getStaticPaths: () => Promise<{
-    paths: string[] | undefined;
+    paths: string[];
     fallback: boolean;
 }>;
 
-export { HandleRouteCompositionFunction, HandleRouteNotFoundFunction, HandleRouteRedirectFunction, RouteHandlerOptions, getServerSideProps, getStaticPaths, getStaticProps, withUniformGetServerSideProps, withUniformGetStaticProps };
+export { type HandleRouteCompositionFunction, type HandleRouteNotFoundFunction, type HandleRouteRedirectFunction, type RouteHandlerOptions, getServerSideProps, getStaticPaths, getStaticProps, withUniformGetServerSideProps, withUniformGetStaticPaths, withUniformGetStaticProps };

package/dist/route/index.js

@@ -20,17 +20,22 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/route/index.ts
 var route_exports = {};
 __export(route_exports, {
-  getServerSideProps: () => getServerSideProps2,
-  getStaticPaths: () => getStaticPaths2,
-  getStaticProps: () => getStaticProps2,
-  withUniformGetServerSideProps: () => withUniformGetServerSideProps2,
+  getServerSideProps: () => getServerSideProps,
+  getStaticPaths: () => getStaticPaths,
+  getStaticProps: () => getStaticProps,
+  withUniformGetServerSideProps: () => withUniformGetServerSideProps,
   withUniformGetStaticPaths: () => withUniformGetStaticPaths,
-  withUniformGetStaticProps: () => withUniformGetStaticProps2
+  withUniformGetStaticProps: () => withUniformGetStaticProps
 });
 module.exports = __toCommonJS(route_exports);
 
-// src/project-map/withUniformGetServerSideProps.ts
+// src/route/withUniformGetServerSideProps.ts
+var import_canvas2 = require("@uniformdev/canvas");
+var import_redirect = require("@uniformdev/redirect");
+
+// src/route/createRouteFetcher.ts
 var import_canvas = require("@uniformdev/canvas");
+var import_colorette6 = require("colorette");
 
 // src/logging/logCompositionIssues.ts
 var import_colorette = require("colorette");
@@ -183,163 +188,7 @@ function logRouteResponse(response, duration) {
   logRouteCompositionResponse(response, duration);
 }
 
-// src/project-map/withUniformGetServerSideProps.ts
-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, _b;
-    const projectMapId = (_a = options == null ? void 0 : options.projectMapId) != null ? _a : process.env.UNIFORM_PROJECT_MAP_ID;
-    const { preview, previewData } = context;
-    let composition = void 0;
-    let nodePath = (options == null ? void 0 : options.prefix) ? context.resolvedUrl.replace(new RegExp(`^${options.prefix}`), "") : context.resolvedUrl;
-    if (options == null ? void 0 : options.modifyPath) {
-      nodePath = options.modifyPath(nodePath, context);
-    }
-    if (previewData == null ? void 0 : previewData.isUniformContextualEditing) {
-      composition = { ...import_canvas.EMPTY_COMPOSITION, _id: (_b = previewData.compositionId) != null ? _b : import_canvas.EMPTY_COMPOSITION._id };
-    } else {
-      try {
-        const time = Date.now();
-        const response = await canvasClient.getCompositionByNodePath({
-          ...options == null ? void 0 : options.requestOptions,
-          projectMapId,
-          projectMapNodePath: nodePath,
-          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)) {
-          logCompositionResponse(response, duration);
-        }
-      } catch (e) {
-        console.error("[canvas-next] Failed to fetch composition", e);
-        return {
-          notFound: true
-        };
-      }
-    }
-    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 ret;
-  };
-};
-
-// src/project-map/withUniformGetStaticPaths.ts
-var import_canvas2 = require("@uniformdev/canvas");
-var import_project_map = require("@uniformdev/project-map");
-var withUniformGetStaticPaths = (options) => {
-  return async function wrappedGetStaticPaths() {
-    var _a, _b;
-    const projectMapId = (_a = options == null ? void 0 : options.projectMapId) != null ? _a : process.env.UNIFORM_PROJECT_MAP_ID;
-    const projectMapClient = (_b = options == null ? void 0 : options.client) != null ? _b : new import_project_map.ProjectMapClient({
-      apiKey: process.env.UNIFORM_API_KEY,
-      projectId: process.env.UNIFORM_PROJECT_ID,
-      apiHost: process.env.UNIFORM_CLI_BASE_URL
-    });
-    const response = await projectMapClient.getNodes({
-      ...options == null ? void 0 : options.requestOptions,
-      path: options == null ? void 0 : options.rootPath,
-      projectMapId,
-      state: (options == null ? void 0 : options.preview) ? import_canvas2.CANVAS_DRAFT_STATE : import_canvas2.CANVAS_PUBLISHED_STATE
-    });
-    const nodes = (options == null ? void 0 : options.callback) ? await options.callback(response.nodes) : response.nodes;
-    const paths = nodes == null ? void 0 : nodes.filter((node) => Boolean(node.compositionId)).map((node) => {
-      var _a2;
-      return `${(_a2 = options == null ? void 0 : options.prefix) != null ? _a2 : ""}${node.path}`;
-    });
-    return {
-      paths,
-      fallback: true
-    };
-  };
-};
-
-// src/project-map/withUniformGetStaticProps.ts
-var import_canvas3 = require("@uniformdev/canvas");
-
-// src/helpers/resolveSlugFromParams.ts
-var resolveSlugFromParams = ({
-  param = "slug",
-  params
-}) => {
-  const slug = (params == null ? void 0 : params[param]) || "";
-  const slugString = Array.isArray(slug) ? slug.join("/") : slug;
-  return `/${slugString}`;
-};
-
-// src/project-map/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, _b;
-    const projectMapId = (_a2 = options == null ? void 0 : options.projectMapId) != null ? _a2 : process.env.UNIFORM_PROJECT_MAP_ID;
-    let pathString = resolveSlugFromParams({
-      param: options == null ? void 0 : options.param,
-      params: context == null ? void 0 : context.params
-    });
-    if (options == null ? void 0 : options.modifyPath) {
-      pathString = options.modifyPath(pathString, context);
-    }
-    const { preview, previewData } = context;
-    let composition = void 0;
-    if (previewData == null ? void 0 : previewData.isUniformContextualEditing) {
-      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.getCompositionByNodePath({
-          ...options == null ? void 0 : options.requestOptions,
-          projectMapId,
-          projectMapNodePath: pathString,
-          state: preview || (options == null ? void 0 : options.preview) ? import_canvas3.CANVAS_DRAFT_STATE : import_canvas3.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 {
-          notFound: true
-        };
-      }
-    }
-    const ret = options.callback ? await options.callback(context, composition) : { props: {} };
-    if (composition && Object.hasOwn(ret, "props")) {
-      const casted = ret;
-      casted.props["data"] = composition;
-    }
-    return ret;
-  };
-};
-
-// src/project-map/index.ts
-var getServerSideProps = withUniformGetServerSideProps();
-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
-var import_canvas4 = require("@uniformdev/canvas");
-var import_colorette6 = require("colorette");
 function createRouteFetcher(options) {
   const {
     handleNotFound,
@@ -356,7 +205,7 @@ function createRouteFetcher(options) {
     silent,
     parseContext
   } = options;
-  const routeClient = client || new import_canvas4.RouteClient({
+  const routeClient = client || new import_canvas.RouteClient({
     apiKey: process.env.UNIFORM_API_KEY,
     projectId: process.env.UNIFORM_PROJECT_ID,
     edgeApiHost: process.env.UNIFORM_CLI_BASE_EDGE_URL
@@ -419,8 +268,8 @@ function createRouteFetcher(options) {
           matchedRoute: "contextual-editing",
           compositionApiResponse: {
             composition: {
-              ...import_canvas4.EMPTY_COMPOSITION,
-              _id: contextualEditingCompositionId != null ? contextualEditingCompositionId : import_canvas4.EMPTY_COMPOSITION._id
+              ...import_canvas.EMPTY_COMPOSITION,
+              _id: contextualEditingCompositionId != null ? contextualEditingCompositionId : import_canvas.EMPTY_COMPOSITION._id
             }
           }
         },
@@ -436,7 +285,7 @@ function createRouteFetcher(options) {
         const time = Date.now();
         const response = await routeClient.getRoute({
           ...resolvedOptions,
-          state: (_b = (_a = resolvedOptions == null ? void 0 : resolvedOptions.state) != null ? _a : defaultPreviewState) != null ? _b : import_canvas4.CANVAS_PUBLISHED_STATE,
+          state: (_b = (_a = resolvedOptions == null ? void 0 : resolvedOptions.state) != null ? _a : defaultPreviewState) != null ? _b : import_canvas.CANVAS_PUBLISHED_STATE,
           projectMapId,
           path: nodePath
         });
@@ -457,7 +306,7 @@ function createRouteFetcher(options) {
         return handleResult;
       } catch (e) {
         console.error((0, import_colorette6.red)("Failed to fetch route"), e);
-        if (e instanceof import_canvas4.ApiClientError) {
+        if (e instanceof import_canvas.ApiClientError) {
           if (e.statusCode === 404) {
             return invokeNotFoundResult({ type: "notFound" }, 0);
           }
@@ -470,7 +319,7 @@ function createRouteFetcher(options) {
 }
 
 // src/route/withUniformGetServerSideProps.ts
-var withUniformGetServerSideProps2 = (options) => {
+var withUniformGetServerSideProps = (options) => {
   const defaultHandleRedirect = (requestUrl, matched, context) => {
     if (matched.redirect.targetStatusCode > 400) {
       return {
@@ -480,8 +329,9 @@ var withUniformGetServerSideProps2 = (options) => {
     const absoluteUrl = `${context.req.headers["x-forwarded-proto"]}://${context.req.headers.host}${requestUrl}`;
     return {
       redirect: {
-        destination: import_redirect.RedirectClient.getTargetVariableExpandedUrl(absoluteUrl, matched.redirect),
-        statusCode: matched.redirect.targetStatusCode
+        destination: (0, import_redirect.getTargetVariableExpandedUrl)(absoluteUrl, matched.redirect),
+        statusCode: matched.redirect.targetStatusCode,
+        basePath: matched.redirect.targetPreserveIncomingDomain === false || matched.redirect.targetPreserveIncomingProtocol === false ? false : void 0
       }
     };
   };
@@ -507,21 +357,87 @@ var withUniformGetServerSideProps2 = (options) => {
         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
+        defaultFetchState: context.preview ? import_canvas2.CANVAS_DRAFT_STATE : void 0
       };
     }
   });
   return routeFetcher;
 };
 
-// src/route/withUniformGetStaticProps.ts
-var import_canvas6 = require("@uniformdev/canvas");
+// src/route/withUniformGetStaticPaths.ts
+var import_canvas3 = require("@uniformdev/canvas");
+var import_project_map = require("@uniformdev/project-map");
 var import_redirect2 = require("@uniformdev/redirect");
-var withUniformGetStaticProps2 = (options) => {
+var findChildRedirects = async (allRedirects, parentPath) => {
+  const children = [];
+  let redirect = await allRedirects.next();
+  while (!redirect.done) {
+    const index = parentPath ? redirect.value.redirect.sourceUrl.indexOf(parentPath) : 0;
+    if (index > -1) {
+      children.push(redirect.value);
+    }
+    redirect = await allRedirects.next();
+  }
+  return children;
+};
+var withUniformGetStaticPaths = (options) => {
+  return async function wrappedGetStaticPaths() {
+    var _a, _b, _c;
+    const projectMapId = (_a = options == null ? void 0 : options.projectMapId) != null ? _a : process.env.UNIFORM_PROJECT_MAP_ID;
+    const projectMapClient = (_b = options == null ? void 0 : options.client) != null ? _b : new import_project_map.ProjectMapClient({
+      apiKey: process.env.UNIFORM_API_KEY,
+      projectId: process.env.UNIFORM_PROJECT_ID,
+      apiHost: process.env.UNIFORM_CLI_BASE_URL
+    });
+    const finalRedirectClient = (_c = options == null ? void 0 : options.redirectClient) != null ? _c : new import_redirect2.RedirectClient({
+      apiKey: process.env.UNIFORM_API_KEY,
+      projectId: process.env.UNIFORM_PROJECT_ID,
+      apiHost: process.env.UNIFORM_CLI_BASE_URL
+    });
+    const [response, redirectResponse] = await Promise.all([
+      projectMapClient.getNodes({
+        ...options == null ? void 0 : options.requestOptions,
+        path: options == null ? void 0 : options.rootPath,
+        projectMapId,
+        state: (options == null ? void 0 : options.preview) ? import_canvas3.CANVAS_DRAFT_STATE : import_canvas3.CANVAS_PUBLISHED_STATE
+      }),
+      finalRedirectClient.getAllRedirects()
+    ]);
+    const nodes = (options == null ? void 0 : options.callback) ? await options.callback(response.nodes) : response.nodes;
+    const redirectSources = (await findChildRedirects(redirectResponse, options == null ? void 0 : options.rootPath)).map(
+      (r) => r.redirect.sourceUrl
+    );
+    const paths = nodes == null ? void 0 : nodes.filter((node) => Boolean(node.compositionId)).map((node) => {
+      var _a2;
+      return `${(_a2 = options == null ? void 0 : options.prefix) != null ? _a2 : ""}${node.path}`;
+    });
+    return {
+      paths: [...paths != null ? paths : [], ...redirectSources],
+      fallback: true
+    };
+  };
+};
+
+// src/route/withUniformGetStaticProps.ts
+var import_canvas4 = require("@uniformdev/canvas");
+var import_redirect3 = require("@uniformdev/redirect");
+
+// src/helpers/resolveSlugFromParams.ts
+var resolveSlugFromParams = ({
+  param = "slug",
+  params
+}) => {
+  const slug = (params == null ? void 0 : params[param]) || "";
+  const slugString = Array.isArray(slug) ? slug.join("/") : slug;
+  return `/${slugString}`;
+};
+
+// src/route/withUniformGetStaticProps.ts
+var withUniformGetStaticProps = (options) => {
   const defaultHandleRedirect = (requestUrl, matched) => {
     return {
       redirect: {
-        destination: import_redirect2.RedirectClient.getTargetVariableExpandedUrl(requestUrl, matched.redirect),
+        destination: (0, import_redirect3.getTargetVariableExpandedUrl)(requestUrl, matched.redirect),
         statusCode: matched.redirect.targetStatusCode
       }
     };
@@ -551,7 +467,7 @@ var withUniformGetStaticProps2 = (options) => {
         }),
         // 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
+        defaultFetchState: context.preview ? import_canvas4.CANVAS_DRAFT_STATE : void 0
       };
     }
   });
@@ -559,9 +475,9 @@ var withUniformGetStaticProps2 = (options) => {
 };
 
 // src/route/index.ts
-var getServerSideProps2 = withUniformGetServerSideProps2();
-var getStaticProps2 = withUniformGetStaticProps2();
-var getStaticPaths2 = withUniformGetStaticPaths();
+var getServerSideProps = withUniformGetServerSideProps();
+var getStaticProps = withUniformGetStaticProps();
+var getStaticPaths = withUniformGetStaticPaths();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   getServerSideProps,