@uniformdev/project-map 19.37.1 → 19.38.3-alpha.70

package/dist/index.d.mts

@@ -211,6 +211,8 @@ interface paths {
                      * This internal status is subject to change without notice, and is thus marked deprecated to discourage use of internal data.
                      */
                     withCompositionUIStatus?: boolean;
+                    /** Include basic redirect information. */
+                    withRedirectData?: boolean;
                 };
             };
             responses: {
@@ -362,7 +364,23 @@ interface components {
             /** @description returns true if the node is a leaf node, meaning having no children, only included if requested with the expanded flag */
             isLeaf?: boolean;
             compositionData?: components["schemas"]["ProjectMapNodeCompositionData"];
+            sourceRedirects?: components["schemas"]["ProjectMapSourceRedirectData"];
+            targetRedirects?: components["schemas"]["ProjectMapTargetRedirectData"];
         };
+        ProjectMapSourceRedirectData: {
+            /**
+             * Format: uuid
+             * @description The public UUID of the source redirect
+             */
+            id?: string;
+        }[];
+        ProjectMapTargetRedirectData: {
+            /**
+             * Format: uuid
+             * @description The public UUID of the target redirect
+             */
+            id?: string;
+        }[];
         /** @description Basic information about a composition from the context of a project map node. */
         ProjectMapNodeCompositionData: {
             /** @description Type of the composition instance (public_id of its definition) */
@@ -617,8 +635,10 @@ type UnmatchedRoute = {
     match: false;
 };
 type ExpandOptions = {
-    dynamicInputValues?: Record<string, string>;
+    dynamicInputValues?: Record<string, string | number | boolean>;
     allowedQueryParams?: Array<string>;
+    /** Prevents URL-escaping of variable expressions of the form ${...} in the expand result */
+    doNotEscapeVariables?: boolean;
 };
 declare class Route {
     #private;

package/dist/index.d.ts

@@ -211,6 +211,8 @@ interface paths {
                      * This internal status is subject to change without notice, and is thus marked deprecated to discourage use of internal data.
                      */
                     withCompositionUIStatus?: boolean;
+                    /** Include basic redirect information. */
+                    withRedirectData?: boolean;
                 };
             };
             responses: {
@@ -362,7 +364,23 @@ interface components {
             /** @description returns true if the node is a leaf node, meaning having no children, only included if requested with the expanded flag */
             isLeaf?: boolean;
             compositionData?: components["schemas"]["ProjectMapNodeCompositionData"];
+            sourceRedirects?: components["schemas"]["ProjectMapSourceRedirectData"];
+            targetRedirects?: components["schemas"]["ProjectMapTargetRedirectData"];
         };
+        ProjectMapSourceRedirectData: {
+            /**
+             * Format: uuid
+             * @description The public UUID of the source redirect
+             */
+            id?: string;
+        }[];
+        ProjectMapTargetRedirectData: {
+            /**
+             * Format: uuid
+             * @description The public UUID of the target redirect
+             */
+            id?: string;
+        }[];
         /** @description Basic information about a composition from the context of a project map node. */
         ProjectMapNodeCompositionData: {
             /** @description Type of the composition instance (public_id of its definition) */
@@ -617,8 +635,10 @@ type UnmatchedRoute = {
     match: false;
 };
 type ExpandOptions = {
-    dynamicInputValues?: Record<string, string>;
+    dynamicInputValues?: Record<string, string | number | boolean>;
     allowedQueryParams?: Array<string>;
+    /** Prevents URL-escaping of variable expressions of the form ${...} in the expand result */
+    doNotEscapeVariables?: boolean;
 };
 declare class Route {
     #private;

package/dist/index.esm.js

@@ -193,6 +193,7 @@ var cutReferences = (node) => node ? {
 } : void 0;
 
 // src/util/Route.ts
+import { createVariableReference, parseVariableExpression } from "@uniformdev/canvas";
 var _routeInfo, _parseRouteOrPath, parseRouteOrPath_fn, _isDynamicRouteSegment, isDynamicRouteSegment_fn;
 var _Route = class _Route {
   constructor(route) {
@@ -244,7 +245,7 @@ var _Route = class _Route {
    * Creates an expanded path value for this route given dynamic input values and allowed query string values
    */
   expand(options) {
-    const { dynamicInputValues = {}, allowedQueryParams = [] } = options != null ? options : {};
+    const { dynamicInputValues = {}, allowedQueryParams = [], doNotEscapeVariables = false } = options != null ? options : {};
     const path = __privateGet(this, _routeInfo).segments.map((segment) => {
       const dynamicSegmentName = _Route.getDynamicRouteSegmentName(segment);
       if (!dynamicSegmentName) {
@@ -261,9 +262,17 @@ var _Route = class _Route {
         );
         return segment;
       }
-      return encodeURIComponent(dynamicSegmentValue);
+      return encodeRouteComponent(dynamicSegmentValue, doNotEscapeVariables);
     }).join("/");
-    const queries = allowedQueryParams.filter((qs) => typeof dynamicInputValues[qs] === "string").map((qs) => `${encodeURIComponent(qs)}=${encodeURIComponent(dynamicInputValues[qs])}`);
+    const queries = allowedQueryParams.filter((qs) => {
+      const type = typeof dynamicInputValues[qs];
+      return type === "string" || type === "number" || type === "boolean";
+    }).map(
+      (qs) => `${encodeRouteComponent(qs, doNotEscapeVariables)}=${encodeRouteComponent(
+        dynamicInputValues[qs],
+        doNotEscapeVariables
+      )}`
+    );
     const query = queries.length ? `?${queries.join("&")}` : "";
     return `/${path}${query}`;
   }
@@ -295,6 +304,20 @@ __privateAdd(_Route, _parseRouteOrPath);
 __privateAdd(_Route, _isDynamicRouteSegment);
 _Route.dynamicSegmentPrefix = ":";
 var Route = _Route;
+function encodeRouteComponent(value, doNotEscapeVariables) {
+  if (!doNotEscapeVariables) {
+    return encodeURIComponent(value);
+  }
+  const result = [];
+  parseVariableExpression(value.toString(10), (token, type) => {
+    if (type === "variable") {
+      result.push(createVariableReference(token));
+    } else {
+      result.push(encodeURIComponent(token));
+    }
+  });
+  return result.join("");
+}
 export {
   ProjectMapClient,
   ROOT_NODE_PATH,

package/dist/index.js

@@ -221,6 +221,7 @@ var cutReferences = (node) => node ? {
 } : void 0;
 
 // src/util/Route.ts
+var import_canvas = require("@uniformdev/canvas");
 var _routeInfo, _parseRouteOrPath, parseRouteOrPath_fn, _isDynamicRouteSegment, isDynamicRouteSegment_fn;
 var _Route = class _Route {
   constructor(route) {
@@ -272,7 +273,7 @@ var _Route = class _Route {
    * Creates an expanded path value for this route given dynamic input values and allowed query string values
    */
   expand(options) {
-    const { dynamicInputValues = {}, allowedQueryParams = [] } = options != null ? options : {};
+    const { dynamicInputValues = {}, allowedQueryParams = [], doNotEscapeVariables = false } = options != null ? options : {};
     const path = __privateGet(this, _routeInfo).segments.map((segment) => {
       const dynamicSegmentName = _Route.getDynamicRouteSegmentName(segment);
       if (!dynamicSegmentName) {
@@ -289,9 +290,17 @@ var _Route = class _Route {
         );
         return segment;
       }
-      return encodeURIComponent(dynamicSegmentValue);
+      return encodeRouteComponent(dynamicSegmentValue, doNotEscapeVariables);
     }).join("/");
-    const queries = allowedQueryParams.filter((qs) => typeof dynamicInputValues[qs] === "string").map((qs) => `${encodeURIComponent(qs)}=${encodeURIComponent(dynamicInputValues[qs])}`);
+    const queries = allowedQueryParams.filter((qs) => {
+      const type = typeof dynamicInputValues[qs];
+      return type === "string" || type === "number" || type === "boolean";
+    }).map(
+      (qs) => `${encodeRouteComponent(qs, doNotEscapeVariables)}=${encodeRouteComponent(
+        dynamicInputValues[qs],
+        doNotEscapeVariables
+      )}`
+    );
     const query = queries.length ? `?${queries.join("&")}` : "";
     return `/${path}${query}`;
   }
@@ -323,6 +332,20 @@ __privateAdd(_Route, _parseRouteOrPath);
 __privateAdd(_Route, _isDynamicRouteSegment);
 _Route.dynamicSegmentPrefix = ":";
 var Route = _Route;
+function encodeRouteComponent(value, doNotEscapeVariables) {
+  if (!doNotEscapeVariables) {
+    return encodeURIComponent(value);
+  }
+  const result = [];
+  (0, import_canvas.parseVariableExpression)(value.toString(10), (token, type) => {
+    if (type === "variable") {
+      result.push((0, import_canvas.createVariableReference)(token));
+    } else {
+      result.push(encodeURIComponent(token));
+    }
+  });
+  return result.join("");
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ProjectMapClient,

package/dist/index.mjs

@@ -193,6 +193,7 @@ var cutReferences = (node) => node ? {
 } : void 0;
 
 // src/util/Route.ts
+import { createVariableReference, parseVariableExpression } from "@uniformdev/canvas";
 var _routeInfo, _parseRouteOrPath, parseRouteOrPath_fn, _isDynamicRouteSegment, isDynamicRouteSegment_fn;
 var _Route = class _Route {
   constructor(route) {
@@ -244,7 +245,7 @@ var _Route = class _Route {
    * Creates an expanded path value for this route given dynamic input values and allowed query string values
    */
   expand(options) {
-    const { dynamicInputValues = {}, allowedQueryParams = [] } = options != null ? options : {};
+    const { dynamicInputValues = {}, allowedQueryParams = [], doNotEscapeVariables = false } = options != null ? options : {};
     const path = __privateGet(this, _routeInfo).segments.map((segment) => {
       const dynamicSegmentName = _Route.getDynamicRouteSegmentName(segment);
       if (!dynamicSegmentName) {
@@ -261,9 +262,17 @@ var _Route = class _Route {
         );
         return segment;
       }
-      return encodeURIComponent(dynamicSegmentValue);
+      return encodeRouteComponent(dynamicSegmentValue, doNotEscapeVariables);
     }).join("/");
-    const queries = allowedQueryParams.filter((qs) => typeof dynamicInputValues[qs] === "string").map((qs) => `${encodeURIComponent(qs)}=${encodeURIComponent(dynamicInputValues[qs])}`);
+    const queries = allowedQueryParams.filter((qs) => {
+      const type = typeof dynamicInputValues[qs];
+      return type === "string" || type === "number" || type === "boolean";
+    }).map(
+      (qs) => `${encodeRouteComponent(qs, doNotEscapeVariables)}=${encodeRouteComponent(
+        dynamicInputValues[qs],
+        doNotEscapeVariables
+      )}`
+    );
     const query = queries.length ? `?${queries.join("&")}` : "";
     return `/${path}${query}`;
   }
@@ -295,6 +304,20 @@ __privateAdd(_Route, _parseRouteOrPath);
 __privateAdd(_Route, _isDynamicRouteSegment);
 _Route.dynamicSegmentPrefix = ":";
 var Route = _Route;
+function encodeRouteComponent(value, doNotEscapeVariables) {
+  if (!doNotEscapeVariables) {
+    return encodeURIComponent(value);
+  }
+  const result = [];
+  parseVariableExpression(value.toString(10), (token, type) => {
+    if (type === "variable") {
+      result.push(createVariableReference(token));
+    } else {
+      result.push(encodeURIComponent(token));
+    }
+  });
+  return result.join("");
+}
 export {
   ProjectMapClient,
   ROOT_NODE_PATH,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/project-map",
-  "version": "19.37.1",
+  "version": "19.38.3-alpha.70+55e5a8fe1",
   "description": "Uniform Project Map",
   "license": "SEE LICENSE IN LICENSE.txt",
   "main": "./dist/index.js",
@@ -32,11 +32,11 @@
     "/dist"
   ],
   "dependencies": {
-    "@uniformdev/canvas": "19.37.1",
-    "@uniformdev/context": "19.37.1"
+    "@uniformdev/canvas": "19.38.3-alpha.70+55e5a8fe1",
+    "@uniformdev/context": "19.38.3-alpha.70+55e5a8fe1"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "9de2a3f7515d658d07d7d1fb8ebf4805172e655c"
+  "gitHead": "55e5a8fe1d80971a93ea31d3a50cec72e71be70a"
 }