@uniformdev/next-app-router 20.72.1 → 20.72.2

package/dist/cache.js

@@ -1498,6 +1498,17 @@ var RouteClient = class extends ApiClient {
     );
   }
 };
+var getDataSourceVariantFromRouteGetParams = (params, defaultPreviewState) => {
+  var _a, _b;
+  const dataSourceVariant = (
+    // support explicit 'undefined' as a way to opt out of data resources variant
+    "dataSourceVariant" in params ? params.dataSourceVariant : (
+      // in case of DRAFT state we still want to fetch unpublished data
+      ((_b = (_a = params == null ? void 0 : params.state) != null ? _a : defaultPreviewState) != null ? _b : CANVAS_PUBLISHED_STATE) !== CANVAS_PUBLISHED_STATE ? "unpublished" : void 0
+    )
+  );
+  return dataSourceVariant;
+};
 
 // src/data/client.ts
 var import_functions = require("@vercel/functions");
@@ -2010,6 +2021,7 @@ var DefaultDataClient = class {
     const originalRoute = {
       path: options.pageState.routePath,
       state: options.pageState.compositionState,
+      dataSourceVariant: getDataSourceVariantFromRouteGetParams({}, options.pageState.compositionState),
       withComponentIDs: true,
       releaseId: options.pageState.releaseId,
       locale: options.pageState.locale,

package/dist/cache.mjs

@@ -1485,6 +1485,17 @@ var RouteClient = class extends ApiClient {
     );
   }
 };
+var getDataSourceVariantFromRouteGetParams = (params, defaultPreviewState) => {
+  var _a, _b;
+  const dataSourceVariant = (
+    // support explicit 'undefined' as a way to opt out of data resources variant
+    "dataSourceVariant" in params ? params.dataSourceVariant : (
+      // in case of DRAFT state we still want to fetch unpublished data
+      ((_b = (_a = params == null ? void 0 : params.state) != null ? _a : defaultPreviewState) != null ? _b : CANVAS_PUBLISHED_STATE) !== CANVAS_PUBLISHED_STATE ? "unpublished" : void 0
+    )
+  );
+  return dataSourceVariant;
+};
 
 // src/data/client.ts
 import { getCache, waitUntil } from "@vercel/functions";
@@ -1997,6 +2008,7 @@ var DefaultDataClient = class {
     const originalRoute = {
       path: options.pageState.routePath,
       state: options.pageState.compositionState,
+      dataSourceVariant: getDataSourceVariantFromRouteGetParams({}, options.pageState.compositionState),
       withComponentIDs: true,
       releaseId: options.pageState.releaseId,
       locale: options.pageState.locale,

package/dist/component.js

@@ -899,11 +899,11 @@ var ATTRIBUTE_PARAMETER_ID = "data-uniform-parameter-id";
 var ATTRIBUTE_PARAMETER_TYPE = "data-uniform-parameter-type";
 
 // src/components/UniformRichText.tsx
-var import_richtext6 = require("@uniformdev/richtext");
+var import_richtext5 = require("@uniformdev/richtext");
 var import_react12 = __toESM(require("react"));
 
 // src/components/UniformRichTextNode.tsx
-var import_richtext5 = require("@uniformdev/richtext");
+var import_richtext4 = require("@uniformdev/richtext");
 var import_react11 = __toESM(require("react"));
 
 // src/components/nodes/AssetRichTextNode.tsx
@@ -941,11 +941,11 @@ var LinebreakRichTextNode = () => {
 };
 
 // src/components/nodes/LinkRichTextNode.tsx
-var import_richtext = require("@uniformdev/richtext");
+var import_canvas_react = require("@uniformdev/canvas-react");
 var import_react4 = __toESM(require("react"));
 var LinkRichTextNode = ({ children, node }) => {
   const { link } = node;
-  return /* @__PURE__ */ import_react4.default.createElement("a", { href: (0, import_richtext.linkParamValueToHref)(link) }, children);
+  return /* @__PURE__ */ import_react4.default.createElement("a", { ...(0, import_canvas_react.linkParamValueToAnchorProps)(link) }, children);
 };
 
 // src/components/nodes/ListItemRichTextNode.tsx
@@ -964,26 +964,26 @@ var ListRichTextNode = ({ children, node }) => {
 };
 
 // src/components/nodes/ParagraphRichTextNode.tsx
-var import_richtext2 = require("@uniformdev/richtext");
+var import_richtext = require("@uniformdev/richtext");
 var import_react7 = __toESM(require("react"));
 var ParagraphRichTextNode = ({ children, node }) => {
   const { format, direction } = node;
   return /* @__PURE__ */ import_react7.default.createElement(
     "p",
     {
-      dir: (0, import_richtext2.isPureDirection)(direction) ? direction : void 0,
-      style: (0, import_richtext2.isPureTextAlign)(format) ? { textAlign: format } : void 0
+      dir: (0, import_richtext.isPureDirection)(direction) ? direction : void 0,
+      style: (0, import_richtext.isPureTextAlign)(format) ? { textAlign: format } : void 0
     },
     children
   );
 };
 
 // src/components/nodes/TableCellRichTextNode.tsx
-var import_richtext3 = require("@uniformdev/richtext");
+var import_richtext2 = require("@uniformdev/richtext");
 var import_react8 = __toESM(require("react"));
 var TableCellRichTextNode = ({ children, node }) => {
   const { headerState } = node;
-  const TableCellTag = (0, import_richtext3.getRichTextTagFromTableCellHeaderState)(headerState);
+  const TableCellTag = (0, import_richtext2.getRichTextTagFromTableCellHeaderState)(headerState);
   return /* @__PURE__ */ import_react8.default.createElement(TableCellTag, null, children);
 };
 
@@ -994,18 +994,18 @@ var TabRichTextNode = () => {
 };
 
 // src/components/nodes/TextRichTextNode.tsx
-var import_richtext4 = require("@uniformdev/richtext");
+var import_richtext3 = require("@uniformdev/richtext");
 var import_react10 = __toESM(require("react"));
 var TextRichTextNode = ({ node }) => {
   const { text, format } = node;
-  const tags = (0, import_richtext4.getRichTextTagsFromTextFormat)(format);
+  const tags = (0, import_richtext3.getRichTextTagsFromTextFormat)(format);
   return /* @__PURE__ */ import_react10.default.createElement(import_react10.default.Fragment, null, tags.length > 0 ? tags.reduceRight((children, Tag) => /* @__PURE__ */ import_react10.default.createElement(Tag, null, children), text) : text);
 };
 
 // src/components/UniformRichTextNode.tsx
 function UniformRichTextNode({ node, ...props }) {
   var _a;
-  if (!(0, import_richtext5.isRichTextNode)(node)) return null;
+  if (!(0, import_richtext4.isRichTextNode)(node)) return null;
   let NodeRenderer = (_a = props.resolveRichTextRenderer) == null ? void 0 : _a.call(props, node);
   if (typeof NodeRenderer === "undefined") {
     NodeRenderer = resolveRichTextDefaultRenderer(node);
@@ -1059,8 +1059,8 @@ var UniformRichText = import_react12.default.forwardRef(function UniformRichText
   }
   const computedPlaceholder = typeof placeholder === "function" ? placeholder({ id: parameter.parameterId }) : placeholder;
   const value = parameter.value;
-  if (!value || !(0, import_richtext6.isRichTextValue)(value)) return null;
-  if (!isContextualEditing && (0, import_richtext6.isRichTextValueConsideredEmpty)(value)) return null;
+  if (!value || !(0, import_richtext5.isRichTextValue)(value)) return null;
+  if (!isContextualEditing && (0, import_richtext5.isRichTextValueConsideredEmpty)(value)) return null;
   return Tag === null ? /* @__PURE__ */ import_react12.default.createElement(UniformRichTextNode, { node: value.root, resolveRichTextRenderer }) : /* @__PURE__ */ import_react12.default.createElement(
     Tag,
     {
@@ -1072,7 +1072,7 @@ var UniformRichText = import_react12.default.forwardRef(function UniformRichText
         [ATTRIBUTE_PARAMETER_TYPE]: "richText"
       } : {}
     },
-    (0, import_richtext6.isRichTextValueConsideredEmpty)(value) ? /* @__PURE__ */ import_react12.default.createElement("p", null, /* @__PURE__ */ import_react12.default.createElement("i", null, computedPlaceholder)) : /* @__PURE__ */ import_react12.default.createElement(UniformRichTextNode, { node: value.root, resolveRichTextRenderer })
+    (0, import_richtext5.isRichTextValueConsideredEmpty)(value) ? /* @__PURE__ */ import_react12.default.createElement("p", null, /* @__PURE__ */ import_react12.default.createElement("i", null, computedPlaceholder)) : /* @__PURE__ */ import_react12.default.createElement(UniformRichTextNode, { node: value.root, resolveRichTextRenderer })
   );
 });
 

package/dist/component.mjs

@@ -929,11 +929,11 @@ var LinebreakRichTextNode = () => {
 };
 
 // src/components/nodes/LinkRichTextNode.tsx
-import { linkParamValueToHref } from "@uniformdev/richtext";
+import { linkParamValueToAnchorProps } from "@uniformdev/canvas-react";
 import React4 from "react";
 var LinkRichTextNode = ({ children, node }) => {
   const { link } = node;
-  return /* @__PURE__ */ React4.createElement("a", { href: linkParamValueToHref(link) }, children);
+  return /* @__PURE__ */ React4.createElement("a", { ...linkParamValueToAnchorProps(link) }, children);
 };
 
 // src/components/nodes/ListItemRichTextNode.tsx

package/dist/handler.js

@@ -2419,6 +2419,38 @@ var _Route = class _Route2 {
     }
     return segment.slice(_Route2.dynamicSegmentPrefix.length);
   }
+  /**
+   * Splits a path into the path portion and an optional `#fragment`
+   * (everything after the first `#`).
+   *
+   * Variable expressions (`${...}`) may legitimately contain `#` characters
+   * (e.g. JSON-pointer tokens like `${#jptr:/foo/_slug}`), so the fragment
+   * delimiter is the first `#` that falls outside of a variable expression.
+   */
+  static splitFragment(path) {
+    let fragmentIndex = -1;
+    let length = 0;
+    parseVariableExpression(path, (token, type) => {
+      if (type === "variable") {
+        length += createVariableReference(token).length;
+        return;
+      }
+      const hashOffset = token.indexOf("#");
+      if (hashOffset === -1) {
+        length += token.length;
+        return;
+      }
+      fragmentIndex = length + hashOffset;
+      return false;
+    });
+    if (fragmentIndex === -1) {
+      return { path, fragment: void 0 };
+    }
+    return {
+      path: path.slice(0, fragmentIndex),
+      fragment: path.slice(fragmentIndex + 1)
+    };
+  }
 };
 _routeInfo = /* @__PURE__ */ new WeakMap();
 _Route_static = /* @__PURE__ */ new WeakSet();

package/dist/handler.mjs

@@ -2404,6 +2404,38 @@ var _Route = class _Route2 {
     }
     return segment.slice(_Route2.dynamicSegmentPrefix.length);
   }
+  /**
+   * Splits a path into the path portion and an optional `#fragment`
+   * (everything after the first `#`).
+   *
+   * Variable expressions (`${...}`) may legitimately contain `#` characters
+   * (e.g. JSON-pointer tokens like `${#jptr:/foo/_slug}`), so the fragment
+   * delimiter is the first `#` that falls outside of a variable expression.
+   */
+  static splitFragment(path) {
+    let fragmentIndex = -1;
+    let length = 0;
+    parseVariableExpression(path, (token, type) => {
+      if (type === "variable") {
+        length += createVariableReference(token).length;
+        return;
+      }
+      const hashOffset = token.indexOf("#");
+      if (hashOffset === -1) {
+        length += token.length;
+        return;
+      }
+      fragmentIndex = length + hashOffset;
+      return false;
+    });
+    if (fragmentIndex === -1) {
+      return { path, fragment: void 0 };
+    }
+    return {
+      path: path.slice(0, fragmentIndex),
+      fragment: path.slice(fragmentIndex + 1)
+    };
+  }
 };
 _routeInfo = /* @__PURE__ */ new WeakMap();
 _Route_static = /* @__PURE__ */ new WeakSet();

package/dist/index.esm.js

@@ -2048,6 +2048,17 @@ var RouteClient = class extends ApiClient {
     );
   }
 };
+var getDataSourceVariantFromRouteGetParams = (params, defaultPreviewState) => {
+  var _a, _b;
+  const dataSourceVariant = (
+    // support explicit 'undefined' as a way to opt out of data resources variant
+    "dataSourceVariant" in params ? params.dataSourceVariant : (
+      // in case of DRAFT state we still want to fetch unpublished data
+      ((_b = (_a = params == null ? void 0 : params.state) != null ? _a : defaultPreviewState) != null ? _b : CANVAS_PUBLISHED_STATE) !== CANVAS_PUBLISHED_STATE ? "unpublished" : void 0
+    )
+  );
+  return dataSourceVariant;
+};
 function mapSlotToPersonalizedVariations(slot) {
   if (!slot) return [];
   return slot.map((v, i) => {
@@ -2691,6 +2702,38 @@ var _Route = class _Route2 {
     }
     return segment.slice(_Route2.dynamicSegmentPrefix.length);
   }
+  /**
+   * Splits a path into the path portion and an optional `#fragment`
+   * (everything after the first `#`).
+   *
+   * Variable expressions (`${...}`) may legitimately contain `#` characters
+   * (e.g. JSON-pointer tokens like `${#jptr:/foo/_slug}`), so the fragment
+   * delimiter is the first `#` that falls outside of a variable expression.
+   */
+  static splitFragment(path) {
+    let fragmentIndex = -1;
+    let length = 0;
+    parseVariableExpression(path, (token, type) => {
+      if (type === "variable") {
+        length += createVariableReference(token).length;
+        return;
+      }
+      const hashOffset = token.indexOf("#");
+      if (hashOffset === -1) {
+        length += token.length;
+        return;
+      }
+      fragmentIndex = length + hashOffset;
+      return false;
+    });
+    if (fragmentIndex === -1) {
+      return { path, fragment: void 0 };
+    }
+    return {
+      path: path.slice(0, fragmentIndex),
+      fragment: path.slice(fragmentIndex + 1)
+    };
+  }
 };
 _routeInfo = /* @__PURE__ */ new WeakMap();
 _Route_static = /* @__PURE__ */ new WeakSet();
@@ -3926,6 +3969,7 @@ var DefaultDataClient = class {
     const originalRoute = {
       path: options.pageState.routePath,
       state: options.pageState.compositionState,
+      dataSourceVariant: getDataSourceVariantFromRouteGetParams({}, options.pageState.compositionState),
       withComponentIDs: true,
       releaseId: options.pageState.releaseId,
       locale: options.pageState.locale,

package/dist/index.js

@@ -2075,6 +2075,17 @@ var RouteClient = class extends ApiClient {
     );
   }
 };
+var getDataSourceVariantFromRouteGetParams = (params, defaultPreviewState) => {
+  var _a, _b;
+  const dataSourceVariant = (
+    // support explicit 'undefined' as a way to opt out of data resources variant
+    "dataSourceVariant" in params ? params.dataSourceVariant : (
+      // in case of DRAFT state we still want to fetch unpublished data
+      ((_b = (_a = params == null ? void 0 : params.state) != null ? _a : defaultPreviewState) != null ? _b : CANVAS_PUBLISHED_STATE) !== CANVAS_PUBLISHED_STATE ? "unpublished" : void 0
+    )
+  );
+  return dataSourceVariant;
+};
 function mapSlotToPersonalizedVariations(slot) {
   if (!slot) return [];
   return slot.map((v, i) => {
@@ -2718,6 +2729,38 @@ var _Route = class _Route2 {
     }
     return segment.slice(_Route2.dynamicSegmentPrefix.length);
   }
+  /**
+   * Splits a path into the path portion and an optional `#fragment`
+   * (everything after the first `#`).
+   *
+   * Variable expressions (`${...}`) may legitimately contain `#` characters
+   * (e.g. JSON-pointer tokens like `${#jptr:/foo/_slug}`), so the fragment
+   * delimiter is the first `#` that falls outside of a variable expression.
+   */
+  static splitFragment(path) {
+    let fragmentIndex = -1;
+    let length = 0;
+    parseVariableExpression(path, (token, type) => {
+      if (type === "variable") {
+        length += createVariableReference(token).length;
+        return;
+      }
+      const hashOffset = token.indexOf("#");
+      if (hashOffset === -1) {
+        length += token.length;
+        return;
+      }
+      fragmentIndex = length + hashOffset;
+      return false;
+    });
+    if (fragmentIndex === -1) {
+      return { path, fragment: void 0 };
+    }
+    return {
+      path: path.slice(0, fragmentIndex),
+      fragment: path.slice(fragmentIndex + 1)
+    };
+  }
 };
 _routeInfo = /* @__PURE__ */ new WeakMap();
 _Route_static = /* @__PURE__ */ new WeakSet();
@@ -3947,6 +3990,7 @@ var DefaultDataClient = class {
     const originalRoute = {
       path: options.pageState.routePath,
       state: options.pageState.compositionState,
+      dataSourceVariant: getDataSourceVariantFromRouteGetParams({}, options.pageState.compositionState),
       withComponentIDs: true,
       releaseId: options.pageState.releaseId,
       locale: options.pageState.locale,

package/dist/index.mjs

@@ -2048,6 +2048,17 @@ var RouteClient = class extends ApiClient {
     );
   }
 };
+var getDataSourceVariantFromRouteGetParams = (params, defaultPreviewState) => {
+  var _a, _b;
+  const dataSourceVariant = (
+    // support explicit 'undefined' as a way to opt out of data resources variant
+    "dataSourceVariant" in params ? params.dataSourceVariant : (
+      // in case of DRAFT state we still want to fetch unpublished data
+      ((_b = (_a = params == null ? void 0 : params.state) != null ? _a : defaultPreviewState) != null ? _b : CANVAS_PUBLISHED_STATE) !== CANVAS_PUBLISHED_STATE ? "unpublished" : void 0
+    )
+  );
+  return dataSourceVariant;
+};
 function mapSlotToPersonalizedVariations(slot) {
   if (!slot) return [];
   return slot.map((v, i) => {
@@ -2691,6 +2702,38 @@ var _Route = class _Route2 {
     }
     return segment.slice(_Route2.dynamicSegmentPrefix.length);
   }
+  /**
+   * Splits a path into the path portion and an optional `#fragment`
+   * (everything after the first `#`).
+   *
+   * Variable expressions (`${...}`) may legitimately contain `#` characters
+   * (e.g. JSON-pointer tokens like `${#jptr:/foo/_slug}`), so the fragment
+   * delimiter is the first `#` that falls outside of a variable expression.
+   */
+  static splitFragment(path) {
+    let fragmentIndex = -1;
+    let length = 0;
+    parseVariableExpression(path, (token, type) => {
+      if (type === "variable") {
+        length += createVariableReference(token).length;
+        return;
+      }
+      const hashOffset = token.indexOf("#");
+      if (hashOffset === -1) {
+        length += token.length;
+        return;
+      }
+      fragmentIndex = length + hashOffset;
+      return false;
+    });
+    if (fragmentIndex === -1) {
+      return { path, fragment: void 0 };
+    }
+    return {
+      path: path.slice(0, fragmentIndex),
+      fragment: path.slice(fragmentIndex + 1)
+    };
+  }
 };
 _routeInfo = /* @__PURE__ */ new WeakMap();
 _Route_static = /* @__PURE__ */ new WeakSet();
@@ -3926,6 +3969,7 @@ var DefaultDataClient = class {
     const originalRoute = {
       path: options.pageState.routePath,
       state: options.pageState.compositionState,
+      dataSourceVariant: getDataSourceVariantFromRouteGetParams({}, options.pageState.compositionState),
       withComponentIDs: true,
       releaseId: options.pageState.releaseId,
       locale: options.pageState.locale,

package/dist/middleware.js

@@ -3027,6 +3027,7 @@ var DefaultDataClient = class {
     const originalRoute = {
       path: options.pageState.routePath,
       state: options.pageState.compositionState,
+      dataSourceVariant: getDataSourceVariantFromRouteGetParams({}, options.pageState.compositionState),
       withComponentIDs: true,
       releaseId: options.pageState.releaseId,
       locale: options.pageState.locale,

package/dist/middleware.mjs

@@ -3014,6 +3014,7 @@ var DefaultDataClient = class {
     const originalRoute = {
       path: options.pageState.routePath,
       state: options.pageState.compositionState,
+      dataSourceVariant: getDataSourceVariantFromRouteGetParams({}, options.pageState.compositionState),
       withComponentIDs: true,
       releaseId: options.pageState.releaseId,
       locale: options.pageState.locale,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/next-app-router",
-  "version": "20.72.1",
+  "version": "20.72.2",
   "license": "SEE LICENSE IN LICENSE.txt",
   "scripts": {
     "build": "tsup",
@@ -98,12 +98,12 @@
     "vitest": "4.1.9"
   },
   "dependencies": {
-    "@uniformdev/canvas-react": "20.72.1",
-    "@uniformdev/next-app-router-client": "20.72.1",
-    "@uniformdev/next-app-router-shared": "20.72.1",
-    "@uniformdev/redirect": "20.72.1",
-    "@uniformdev/richtext": "20.72.1",
-    "@uniformdev/webhooks": "20.72.1",
+    "@uniformdev/canvas-react": "20.72.2",
+    "@uniformdev/next-app-router-client": "20.72.2",
+    "@uniformdev/next-app-router-shared": "20.72.2",
+    "@uniformdev/redirect": "20.72.2",
+    "@uniformdev/richtext": "20.72.2",
+    "@uniformdev/webhooks": "20.72.2",
     "@vercel/functions": "^3.7.2",
     "encoding": "^0.1.13",
     "server-only": "^0.0.1",
@@ -120,5 +120,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "bff8f45027258b16690597b05c88e148f2ffde96"
+  "gitHead": "8b65535fb3ec81e23f9eb8e0ed0b0be478f6e0e8"
 }