@uniformdev/canvas-next 19.79.0 → 19.79.1-alpha.7

package/dist/route/index.mjs

@@ -1,6 +1,3 @@
-import {
-  withUniformGetStaticPaths
-} from "../chunk-ZLQ2WCJC.mjs";
 import {
   logCompositionResponse
 } from "../chunk-JQWYBVLI.mjs";
@@ -8,6 +5,19 @@ import {
   resolveSlugFromParams
 } from "../chunk-TR7V6ABJ.mjs";
 
+// src/route/withUniformGetServerSideProps.ts
+import { CANVAS_DRAFT_STATE } from "@uniformdev/canvas";
+import { getTargetVariableExpandedUrl } from "@uniformdev/redirect";
+
+// src/route/createRouteFetcher.ts
+import {
+  ApiClientError,
+  CANVAS_PUBLISHED_STATE,
+  EMPTY_COMPOSITION,
+  RouteClient
+} from "@uniformdev/canvas";
+import { red as red2 } from "colorette";
+
 // src/logging/logCompositionRouteResponse.ts
 import { gray, green, red, yellow } from "colorette";
 function logRouteCompositionResponse(matched, duration) {
@@ -56,18 +66,7 @@ function logRouteResponse(response, duration) {
   logRouteCompositionResponse(response, duration);
 }
 
-// src/route/withUniformGetServerSideProps.ts
-import { CANVAS_DRAFT_STATE } from "@uniformdev/canvas";
-import { getTargetVariableExpandedUrl } from "@uniformdev/redirect";
-
 // src/route/createRouteFetcher.ts
-import {
-  ApiClientError,
-  CANVAS_PUBLISHED_STATE,
-  EMPTY_COMPOSITION,
-  RouteClient
-} from "@uniformdev/canvas";
-import { red as red2 } from "colorette";
 function createRouteFetcher(options) {
   const {
     handleNotFound,
@@ -209,7 +208,8 @@ var withUniformGetServerSideProps = (options) => {
     return {
       redirect: {
         destination: getTargetVariableExpandedUrl(absoluteUrl, matched.redirect),
-        statusCode: matched.redirect.targetStatusCode
+        statusCode: matched.redirect.targetStatusCode,
+        basePath: matched.redirect.targetPreserveIncomingDomain === false || matched.redirect.targetPreserveIncomingProtocol === false ? false : void 0
       }
     };
   };
@@ -242,8 +242,64 @@ var withUniformGetServerSideProps = (options) => {
   return routeFetcher;
 };
 
+// src/route/withUniformGetStaticPaths.ts
+import { CANVAS_DRAFT_STATE as CANVAS_DRAFT_STATE2, CANVAS_PUBLISHED_STATE as CANVAS_PUBLISHED_STATE2 } from "@uniformdev/canvas";
+import {
+  ProjectMapClient
+} from "@uniformdev/project-map";
+import { RedirectClient } from "@uniformdev/redirect";
+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 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 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) ? CANVAS_DRAFT_STATE2 : CANVAS_PUBLISHED_STATE2
+      }),
+      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
-import { CANVAS_DRAFT_STATE as CANVAS_DRAFT_STATE2 } from "@uniformdev/canvas";
+import { CANVAS_DRAFT_STATE as CANVAS_DRAFT_STATE3 } from "@uniformdev/canvas";
 import { getTargetVariableExpandedUrl as getTargetVariableExpandedUrl2 } from "@uniformdev/redirect";
 var withUniformGetStaticProps = (options) => {
   const defaultHandleRedirect = (requestUrl, matched) => {
@@ -279,7 +335,7 @@ var withUniformGetStaticProps = (options) => {
         }),
         // 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
+        defaultFetchState: context.preview ? CANVAS_DRAFT_STATE3 : void 0
       };
     }
   });

package/dist/slug/index.d.mts

@@ -1,6 +1,6 @@
 import * as next from 'next';
 import { GetServerSidePropsContext, GetServerSideProps, GetStaticPropsContext, GetStaticProps } from 'next';
-import { a as UniformPreviewData, c as UniformGetServerSideProps, b as UniformGetStaticProps } from '../models-f9fd03c4.js';
+import { a as UniformPreviewData, c as UniformGetServerSideProps, b as UniformGetStaticProps } from '../models--s4UGr5M.mjs';
 import * as querystring from 'querystring';
 import { ParsedUrlQuery } from 'querystring';
 import * as _uniformdev_canvas from '@uniformdev/canvas';
@@ -30,6 +30,7 @@ declare const withUniformGetServerSideProps: <TProps extends {
         withTotalCount?: boolean | undefined;
         withUIStatus?: boolean | undefined;
         withContentSourceMap?: boolean | undefined;
+        locale?: string | undefined;
     } & Required<Pick<_uniformdev_canvas.CompositionGetParameters, "slug">> & DataResolutionOption>, "state"> | undefined;
     callback?: UniformGetServerSideProps<TProps> | undefined;
     /** Disables logging of response information and timings */
@@ -77,6 +78,7 @@ declare const withUniformGetStaticProps: <TProps extends {
         withTotalCount?: boolean | undefined;
         withUIStatus?: boolean | undefined;
         withContentSourceMap?: boolean | undefined;
+        locale?: string | undefined;
     } & Required<Pick<_uniformdev_canvas.CompositionGetParameters, "slug">> & DataResolutionOption>, "state"> | undefined;
     /** Custom handler to specify return value and modify composition - e.g. enhance with CMS data */
     callback?: UniformGetStaticProps<TProps> | undefined;

package/dist/slug/index.d.ts

@@ -1,6 +1,6 @@
 import * as next from 'next';
 import { GetServerSidePropsContext, GetServerSideProps, GetStaticPropsContext, GetStaticProps } from 'next';
-import { a as UniformPreviewData, c as UniformGetServerSideProps, b as UniformGetStaticProps } from '../models-f9fd03c4.js';
+import { a as UniformPreviewData, c as UniformGetServerSideProps, b as UniformGetStaticProps } from '../models--s4UGr5M.js';
 import * as querystring from 'querystring';
 import { ParsedUrlQuery } from 'querystring';
 import * as _uniformdev_canvas from '@uniformdev/canvas';
@@ -30,6 +30,7 @@ declare const withUniformGetServerSideProps: <TProps extends {
         withTotalCount?: boolean | undefined;
         withUIStatus?: boolean | undefined;
         withContentSourceMap?: boolean | undefined;
+        locale?: string | undefined;
     } & Required<Pick<_uniformdev_canvas.CompositionGetParameters, "slug">> & DataResolutionOption>, "state"> | undefined;
     callback?: UniformGetServerSideProps<TProps> | undefined;
     /** Disables logging of response information and timings */
@@ -77,6 +78,7 @@ declare const withUniformGetStaticProps: <TProps extends {
         withTotalCount?: boolean | undefined;
         withUIStatus?: boolean | undefined;
         withContentSourceMap?: boolean | undefined;
+        locale?: string | undefined;
     } & Required<Pick<_uniformdev_canvas.CompositionGetParameters, "slug">> & DataResolutionOption>, "state"> | undefined;
     /** Custom handler to specify return value and modify composition - e.g. enhance with CMS data */
     callback?: UniformGetStaticProps<TProps> | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/canvas-next",
-  "version": "19.79.0",
+  "version": "19.79.1-alpha.7+bd4b0c6f4",
   "description": "Next.js SDK for Uniform Canvas",
   "license": "SEE LICENSE IN LICENSE.txt",
   "main": "./dist/index.js",
@@ -67,11 +67,11 @@
     "document": "api-extractor run --local"
   },
   "dependencies": {
-    "@uniformdev/canvas": "19.79.0",
-    "@uniformdev/canvas-react": "19.79.0",
-    "@uniformdev/project-map": "19.79.0",
-    "@uniformdev/redirect": "19.79.0",
-    "@uniformdev/richtext": "19.79.0",
+    "@uniformdev/canvas": "19.79.1-alpha.7+bd4b0c6f4",
+    "@uniformdev/canvas-react": "19.79.1-alpha.7+bd4b0c6f4",
+    "@uniformdev/project-map": "19.79.1-alpha.7+bd4b0c6f4",
+    "@uniformdev/redirect": "19.79.1-alpha.7+bd4b0c6f4",
+    "@uniformdev/richtext": "19.79.1-alpha.7+bd4b0c6f4",
     "colorette": "2.0.20"
   },
   "peerDependencies": {
@@ -80,7 +80,7 @@
     "react-dom": ">=16"
   },
   "devDependencies": {
-    "@types/react": "18.2.21",
+    "@types/react": "18.2.40",
     "next": "13.4.12",
     "react": "18.2.0",
     "react-dom": "18.2.0"
@@ -91,5 +91,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "78f5ededbaa1a67d58d808eac23ab64769e14e10"
+  "gitHead": "bd4b0c6f4a67549f8eb7e127a85927c798e7eed0"
 }

package/dist/chunk-ZLQ2WCJC.mjs

@@ -1,166 +0,0 @@
-import {
-  logCompositionResponse
-} from "./chunk-JQWYBVLI.mjs";
-import {
-  resolveSlugFromParams
-} from "./chunk-TR7V6ABJ.mjs";
-
-// src/project-map/withUniformGetServerSideProps.ts
-import {
-  CANVAS_DRAFT_STATE,
-  CANVAS_PUBLISHED_STATE,
-  CanvasClient,
-  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, _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 = { ...EMPTY_COMPOSITION, _id: (_b = previewData.compositionId) != null ? _b : 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) ? 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 {
-          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
-import { CANVAS_DRAFT_STATE as CANVAS_DRAFT_STATE2, CANVAS_PUBLISHED_STATE as CANVAS_PUBLISHED_STATE2 } from "@uniformdev/canvas";
-import {
-  ProjectMapClient
-} from "@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 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) ? CANVAS_DRAFT_STATE2 : CANVAS_PUBLISHED_STATE2
-    });
-    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
-import {
-  CANVAS_DRAFT_STATE as CANVAS_DRAFT_STATE3,
-  CANVAS_PUBLISHED_STATE as CANVAS_PUBLISHED_STATE3,
-  CanvasClient as CanvasClient2,
-  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 CanvasClient2({
-    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 = { ...EMPTY_COMPOSITION2, _id: (_b = previewData.compositionId) != null ? _b : EMPTY_COMPOSITION2._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) ? CANVAS_DRAFT_STATE3 : CANVAS_PUBLISHED_STATE3
-        });
-        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();
-
-export {
-  withUniformGetServerSideProps,
-  withUniformGetStaticPaths,
-  withUniformGetStaticProps,
-  getServerSideProps,
-  getStaticProps,
-  getStaticPaths
-};

package/dist/withUniformGetStaticPaths-77db0164.d.ts

@@ -1,39 +0,0 @@
-import { ProjectMapNodeGetResponse, ProjectMapClient } from '@uniformdev/project-map';
-
-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;
-} | undefined) => () => Promise<{
-    paths: string[] | undefined;
-    fallback: boolean;
-}>;
-
-export { withUniformGetStaticPaths as w };