@uniformdev/canvas-next 19.58.2-alpha.0 → 19.58.2-alpha.11

package/dist/{chunk-6IDBHA5X.mjs → chunk-JQWYBVLI.mjs}

@@ -4,11 +4,10 @@ import { white as white2 } from "colorette";
 // src/logging/logCompositionIssues.ts
 import { gray, green, italic, red, white, yellow } from "colorette";
 function logCompositionIssues(prefix, issues, colour = "red") {
-  const reversedIssues = [...issues].reverse();
   const colours = { red, green, yellow, white };
   console.error(
     `${colours[colour](prefix)}
-${reversedIssues.map(
+${issues.map(
       (issue) => `${colours[colour](">")} ${italic(gray(indent(issue.type.toUpperCase(), 7)))} ${renderIssue(issue)}`
     ).join("\n")}`
   );

package/dist/{chunk-23O4NSDU.mjs → chunk-ZLQ2WCJC.mjs}

@@ -1,6 +1,6 @@
 import {
   logCompositionResponse
-} from "./chunk-6IDBHA5X.mjs";
+} from "./chunk-JQWYBVLI.mjs";
 import {
   resolveSlugFromParams
 } from "./chunk-TR7V6ABJ.mjs";

package/dist/index.esm.js

@@ -51,7 +51,8 @@ var UniformRichTextNode = ({
 // src/preview/previewHandlerGet.ts
 import {
   IN_CONTEXT_EDITOR_PLAYGROUND_QUERY_STRING_PARAM,
-  IN_CONTEXT_EDITOR_QUERY_STRING_PARAM
+  IN_CONTEXT_EDITOR_QUERY_STRING_PARAM,
+  SECRET_QUERY_STRING_PARAM
 } from "@uniformdev/canvas";
 import { isAllowedReferrer } from "@uniformdev/canvas";
 var BASE_URL_EXAMPLE = "https://example.com";
@@ -62,10 +63,16 @@ var getQueryParam = (req, paramName) => {
   }
   return Array.isArray(value) ? value[0] : value;
 };
-var queryParamsToPreserve = [
+var contextualEditingQueryParams = [
   IN_CONTEXT_EDITOR_QUERY_STRING_PARAM,
   IN_CONTEXT_EDITOR_PLAYGROUND_QUERY_STRING_PARAM
 ];
+var compositionQueryParam = {
+  id: "id",
+  slug: "slug",
+  path: "path",
+  locale: "locale"
+};
 var createPreviewHandlerGet = ({ secret, resolveFullPath = resolveFullPathDefault, playgroundPath } = {}) => async (req, res) => {
   const isConfigCheck = getQueryParam(req, "is_config_check") === "true";
   if (isConfigCheck) {
@@ -82,10 +89,10 @@ var createPreviewHandlerGet = ({ secret, resolveFullPath = resolveFullPathDefaul
   if (isPlayground && playgroundPath) {
     pathToRedirectTo = playgroundPath;
   }
-  const id = getQueryParam(req, "id");
-  const slug = getQueryParam(req, "slug");
-  const path = getQueryParam(req, "path");
-  const locale = getQueryParam(req, "locale");
+  const id = getQueryParam(req, compositionQueryParam.id);
+  const slug = getQueryParam(req, compositionQueryParam.slug);
+  const path = getQueryParam(req, compositionQueryParam.path);
+  const locale = getQueryParam(req, compositionQueryParam.locale);
   if (typeof pathToRedirectTo === "undefined") {
     pathToRedirectTo = resolveFullPath({ id, slug, path, locale });
   }
@@ -100,7 +107,7 @@ var createPreviewHandlerGet = ({ secret, resolveFullPath = resolveFullPathDefaul
   }
   const previewSecret = typeof secret === "function" ? secret == null ? void 0 : secret() : secret;
   const isUsingPreviewSecret = Boolean(previewSecret);
-  if (isUsingPreviewSecret && req.query.secret !== previewSecret) {
+  if (isUsingPreviewSecret && req.query[SECRET_QUERY_STRING_PARAM] !== previewSecret) {
     return res.status(401).json({ message: "Invalid token" });
   }
   const isUniformContextualEditing = req.query[IN_CONTEXT_EDITOR_QUERY_STRING_PARAM] === "true" && isAllowedReferrer(req.headers.referer);
@@ -127,12 +134,10 @@ var createPreviewHandlerGet = ({ secret, resolveFullPath = resolveFullPathDefaul
     cookies == null ? void 0 : cookies.map((cookie) => cookie.replace("SameSite=Lax", "SameSite=None;Secure"))
   );
   const redirectionUrl = new URL(pathToRedirectTo, BASE_URL_EXAMPLE);
-  if (isUniformContextualEditing) {
-    queryParamsToPreserve.forEach((param) => {
-      const paramValue = req.query[param];
-      if (typeof paramValue === "string") {
-        redirectionUrl.searchParams.append(param, paramValue);
-      }
+  assignRequestQueryToSearchParams(redirectionUrl.searchParams, req.query);
+  if (!isUniformContextualEditing) {
+    contextualEditingQueryParams.forEach((param) => {
+      redirectionUrl.searchParams.delete(param);
     });
   }
   const fullPathToRedirectTo = redirectionUrl.href.replace(BASE_URL_EXAMPLE, "");
@@ -146,6 +151,25 @@ function validateLocalRedirectUrl(pathToRedirectTo) {
     throw new Error("Tried to redirect to absolute URL with protocol. Disallowing open redirect.");
   }
 }
+var assignRequestQueryToSearchParams = (searchParams, query) => {
+  const compositionQueryParamNames = Object.values(compositionQueryParam);
+  Object.entries(query).forEach(([name, value]) => {
+    if (name === SECRET_QUERY_STRING_PARAM) {
+      return;
+    }
+    if (compositionQueryParamNames.includes(name)) {
+      return;
+    }
+    if (typeof value === "undefined") {
+      return;
+    }
+    if (typeof value === "object") {
+      value.forEach((singleValue) => searchParams.append(name, singleValue));
+      return;
+    }
+    searchParams.append(name, value);
+  });
+};
 
 // src/preview/previewHandlerPost.ts
 import { generateHash } from "@uniformdev/canvas";

package/dist/index.js

@@ -105,10 +105,16 @@ var getQueryParam = (req, paramName) => {
   }
   return Array.isArray(value) ? value[0] : value;
 };
-var queryParamsToPreserve = [
+var contextualEditingQueryParams = [
   import_canvas.IN_CONTEXT_EDITOR_QUERY_STRING_PARAM,
   import_canvas.IN_CONTEXT_EDITOR_PLAYGROUND_QUERY_STRING_PARAM
 ];
+var compositionQueryParam = {
+  id: "id",
+  slug: "slug",
+  path: "path",
+  locale: "locale"
+};
 var createPreviewHandlerGet = ({ secret, resolveFullPath = resolveFullPathDefault, playgroundPath } = {}) => async (req, res) => {
   const isConfigCheck = getQueryParam(req, "is_config_check") === "true";
   if (isConfigCheck) {
@@ -125,10 +131,10 @@ var createPreviewHandlerGet = ({ secret, resolveFullPath = resolveFullPathDefaul
   if (isPlayground && playgroundPath) {
     pathToRedirectTo = playgroundPath;
   }
-  const id = getQueryParam(req, "id");
-  const slug = getQueryParam(req, "slug");
-  const path = getQueryParam(req, "path");
-  const locale = getQueryParam(req, "locale");
+  const id = getQueryParam(req, compositionQueryParam.id);
+  const slug = getQueryParam(req, compositionQueryParam.slug);
+  const path = getQueryParam(req, compositionQueryParam.path);
+  const locale = getQueryParam(req, compositionQueryParam.locale);
   if (typeof pathToRedirectTo === "undefined") {
     pathToRedirectTo = resolveFullPath({ id, slug, path, locale });
   }
@@ -143,7 +149,7 @@ var createPreviewHandlerGet = ({ secret, resolveFullPath = resolveFullPathDefaul
   }
   const previewSecret = typeof secret === "function" ? secret == null ? void 0 : secret() : secret;
   const isUsingPreviewSecret = Boolean(previewSecret);
-  if (isUsingPreviewSecret && req.query.secret !== previewSecret) {
+  if (isUsingPreviewSecret && req.query[import_canvas.SECRET_QUERY_STRING_PARAM] !== previewSecret) {
     return res.status(401).json({ message: "Invalid token" });
   }
   const isUniformContextualEditing = req.query[import_canvas.IN_CONTEXT_EDITOR_QUERY_STRING_PARAM] === "true" && (0, import_canvas2.isAllowedReferrer)(req.headers.referer);
@@ -170,12 +176,10 @@ var createPreviewHandlerGet = ({ secret, resolveFullPath = resolveFullPathDefaul
     cookies == null ? void 0 : cookies.map((cookie) => cookie.replace("SameSite=Lax", "SameSite=None;Secure"))
   );
   const redirectionUrl = new URL(pathToRedirectTo, BASE_URL_EXAMPLE);
-  if (isUniformContextualEditing) {
-    queryParamsToPreserve.forEach((param) => {
-      const paramValue = req.query[param];
-      if (typeof paramValue === "string") {
-        redirectionUrl.searchParams.append(param, paramValue);
-      }
+  assignRequestQueryToSearchParams(redirectionUrl.searchParams, req.query);
+  if (!isUniformContextualEditing) {
+    contextualEditingQueryParams.forEach((param) => {
+      redirectionUrl.searchParams.delete(param);
     });
   }
   const fullPathToRedirectTo = redirectionUrl.href.replace(BASE_URL_EXAMPLE, "");
@@ -189,6 +193,25 @@ function validateLocalRedirectUrl(pathToRedirectTo) {
     throw new Error("Tried to redirect to absolute URL with protocol. Disallowing open redirect.");
   }
 }
+var assignRequestQueryToSearchParams = (searchParams, query) => {
+  const compositionQueryParamNames = Object.values(compositionQueryParam);
+  Object.entries(query).forEach(([name, value]) => {
+    if (name === import_canvas.SECRET_QUERY_STRING_PARAM) {
+      return;
+    }
+    if (compositionQueryParamNames.includes(name)) {
+      return;
+    }
+    if (typeof value === "undefined") {
+      return;
+    }
+    if (typeof value === "object") {
+      value.forEach((singleValue) => searchParams.append(name, singleValue));
+      return;
+    }
+    searchParams.append(name, value);
+  });
+};
 
 // src/preview/previewHandlerPost.ts
 var import_canvas3 = require("@uniformdev/canvas");

package/dist/index.mjs

@@ -51,7 +51,8 @@ var UniformRichTextNode = ({
 // src/preview/previewHandlerGet.ts
 import {
   IN_CONTEXT_EDITOR_PLAYGROUND_QUERY_STRING_PARAM,
-  IN_CONTEXT_EDITOR_QUERY_STRING_PARAM
+  IN_CONTEXT_EDITOR_QUERY_STRING_PARAM,
+  SECRET_QUERY_STRING_PARAM
 } from "@uniformdev/canvas";
 import { isAllowedReferrer } from "@uniformdev/canvas";
 var BASE_URL_EXAMPLE = "https://example.com";
@@ -62,10 +63,16 @@ var getQueryParam = (req, paramName) => {
   }
   return Array.isArray(value) ? value[0] : value;
 };
-var queryParamsToPreserve = [
+var contextualEditingQueryParams = [
   IN_CONTEXT_EDITOR_QUERY_STRING_PARAM,
   IN_CONTEXT_EDITOR_PLAYGROUND_QUERY_STRING_PARAM
 ];
+var compositionQueryParam = {
+  id: "id",
+  slug: "slug",
+  path: "path",
+  locale: "locale"
+};
 var createPreviewHandlerGet = ({ secret, resolveFullPath = resolveFullPathDefault, playgroundPath } = {}) => async (req, res) => {
   const isConfigCheck = getQueryParam(req, "is_config_check") === "true";
   if (isConfigCheck) {
@@ -82,10 +89,10 @@ var createPreviewHandlerGet = ({ secret, resolveFullPath = resolveFullPathDefaul
   if (isPlayground && playgroundPath) {
     pathToRedirectTo = playgroundPath;
   }
-  const id = getQueryParam(req, "id");
-  const slug = getQueryParam(req, "slug");
-  const path = getQueryParam(req, "path");
-  const locale = getQueryParam(req, "locale");
+  const id = getQueryParam(req, compositionQueryParam.id);
+  const slug = getQueryParam(req, compositionQueryParam.slug);
+  const path = getQueryParam(req, compositionQueryParam.path);
+  const locale = getQueryParam(req, compositionQueryParam.locale);
   if (typeof pathToRedirectTo === "undefined") {
     pathToRedirectTo = resolveFullPath({ id, slug, path, locale });
   }
@@ -100,7 +107,7 @@ var createPreviewHandlerGet = ({ secret, resolveFullPath = resolveFullPathDefaul
   }
   const previewSecret = typeof secret === "function" ? secret == null ? void 0 : secret() : secret;
   const isUsingPreviewSecret = Boolean(previewSecret);
-  if (isUsingPreviewSecret && req.query.secret !== previewSecret) {
+  if (isUsingPreviewSecret && req.query[SECRET_QUERY_STRING_PARAM] !== previewSecret) {
     return res.status(401).json({ message: "Invalid token" });
   }
   const isUniformContextualEditing = req.query[IN_CONTEXT_EDITOR_QUERY_STRING_PARAM] === "true" && isAllowedReferrer(req.headers.referer);
@@ -127,12 +134,10 @@ var createPreviewHandlerGet = ({ secret, resolveFullPath = resolveFullPathDefaul
     cookies == null ? void 0 : cookies.map((cookie) => cookie.replace("SameSite=Lax", "SameSite=None;Secure"))
   );
   const redirectionUrl = new URL(pathToRedirectTo, BASE_URL_EXAMPLE);
-  if (isUniformContextualEditing) {
-    queryParamsToPreserve.forEach((param) => {
-      const paramValue = req.query[param];
-      if (typeof paramValue === "string") {
-        redirectionUrl.searchParams.append(param, paramValue);
-      }
+  assignRequestQueryToSearchParams(redirectionUrl.searchParams, req.query);
+  if (!isUniformContextualEditing) {
+    contextualEditingQueryParams.forEach((param) => {
+      redirectionUrl.searchParams.delete(param);
     });
   }
   const fullPathToRedirectTo = redirectionUrl.href.replace(BASE_URL_EXAMPLE, "");
@@ -146,6 +151,25 @@ function validateLocalRedirectUrl(pathToRedirectTo) {
     throw new Error("Tried to redirect to absolute URL with protocol. Disallowing open redirect.");
   }
 }
+var assignRequestQueryToSearchParams = (searchParams, query) => {
+  const compositionQueryParamNames = Object.values(compositionQueryParam);
+  Object.entries(query).forEach(([name, value]) => {
+    if (name === SECRET_QUERY_STRING_PARAM) {
+      return;
+    }
+    if (compositionQueryParamNames.includes(name)) {
+      return;
+    }
+    if (typeof value === "undefined") {
+      return;
+    }
+    if (typeof value === "object") {
+      value.forEach((singleValue) => searchParams.append(name, singleValue));
+      return;
+    }
+    searchParams.append(name, value);
+  });
+};
 
 // src/preview/previewHandlerPost.ts
 import { generateHash } from "@uniformdev/canvas";

package/dist/project-map/index.js

@@ -35,11 +35,10 @@ var import_canvas = require("@uniformdev/canvas");
 // src/logging/logCompositionIssues.ts
 var import_colorette = require("colorette");
 function logCompositionIssues(prefix, issues, colour = "red") {
-  const reversedIssues = [...issues].reverse();
   const colours = { red: import_colorette.red, green: import_colorette.green, yellow: import_colorette.yellow, white: import_colorette.white };
   console.error(
     `${colours[colour](prefix)}
-${reversedIssues.map(
+${issues.map(
       (issue) => `${colours[colour](">")} ${(0, import_colorette.italic)((0, import_colorette.gray)(indent(issue.type.toUpperCase(), 7)))} ${renderIssue(issue)}`
     ).join("\n")}`
   );

package/dist/project-map/index.mjs

@@ -5,8 +5,8 @@ import {
   withUniformGetServerSideProps,
   withUniformGetStaticPaths,
   withUniformGetStaticProps
-} from "../chunk-23O4NSDU.mjs";
-import "../chunk-6IDBHA5X.mjs";
+} from "../chunk-ZLQ2WCJC.mjs";
+import "../chunk-JQWYBVLI.mjs";
 import "../chunk-TR7V6ABJ.mjs";
 export {
   getServerSideProps,

package/dist/route/index.js

@@ -35,11 +35,10 @@ var import_canvas = require("@uniformdev/canvas");
 // src/logging/logCompositionIssues.ts
 var import_colorette = require("colorette");
 function logCompositionIssues(prefix, issues, colour = "red") {
-  const reversedIssues = [...issues].reverse();
   const colours = { red: import_colorette.red, green: import_colorette.green, yellow: import_colorette.yellow, white: import_colorette.white };
   console.error(
     `${colours[colour](prefix)}
-${reversedIssues.map(
+${issues.map(
       (issue) => `${colours[colour](">")} ${(0, import_colorette.italic)((0, import_colorette.gray)(indent(issue.type.toUpperCase(), 7)))} ${renderIssue(issue)}`
     ).join("\n")}`
   );

package/dist/route/index.mjs

@@ -1,9 +1,9 @@
 import {
   withUniformGetStaticPaths
-} from "../chunk-23O4NSDU.mjs";
+} from "../chunk-ZLQ2WCJC.mjs";
 import {
   logCompositionResponse
-} from "../chunk-6IDBHA5X.mjs";
+} from "../chunk-JQWYBVLI.mjs";
 import {
   resolveSlugFromParams
 } from "../chunk-TR7V6ABJ.mjs";

package/dist/slug/index.js

@@ -35,11 +35,10 @@ var import_canvas = require("@uniformdev/canvas");
 // src/logging/logCompositionIssues.ts
 var import_colorette = require("colorette");
 function logCompositionIssues(prefix, issues, colour = "red") {
-  const reversedIssues = [...issues].reverse();
   const colours = { red: import_colorette.red, green: import_colorette.green, yellow: import_colorette.yellow, white: import_colorette.white };
   console.error(
     `${colours[colour](prefix)}
-${reversedIssues.map(
+${issues.map(
       (issue) => `${colours[colour](">")} ${(0, import_colorette.italic)((0, import_colorette.gray)(indent(issue.type.toUpperCase(), 7)))} ${renderIssue(issue)}`
     ).join("\n")}`
   );

package/dist/slug/index.mjs

@@ -1,6 +1,6 @@
 import {
   logCompositionResponse
-} from "../chunk-6IDBHA5X.mjs";
+} from "../chunk-JQWYBVLI.mjs";
 import {
   resolveSlugFromParams
 } from "../chunk-TR7V6ABJ.mjs";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/canvas-next",
-  "version": "19.58.2-alpha.0+68d890cf9",
+  "version": "19.58.2-alpha.11+9a1da0c41",
   "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.58.2-alpha.0+68d890cf9",
-    "@uniformdev/canvas-react": "19.58.2-alpha.0+68d890cf9",
-    "@uniformdev/project-map": "19.58.2-alpha.0+68d890cf9",
-    "@uniformdev/redirect": "19.58.2-alpha.0+68d890cf9",
-    "@uniformdev/richtext": "19.58.2-alpha.0+68d890cf9",
+    "@uniformdev/canvas": "19.58.2-alpha.11+9a1da0c41",
+    "@uniformdev/canvas-react": "19.58.2-alpha.11+9a1da0c41",
+    "@uniformdev/project-map": "19.58.2-alpha.11+9a1da0c41",
+    "@uniformdev/redirect": "19.58.2-alpha.11+9a1da0c41",
+    "@uniformdev/richtext": "19.58.2-alpha.11+9a1da0c41",
     "colorette": "2.0.20"
   },
   "peerDependencies": {
@@ -91,5 +91,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "68d890cf94dc44136dd88bcc2d703248bae10bea"
+  "gitHead": "9a1da0c4162d8d70477d87a876eeaaf4525d94ac"
 }