@uniformdev/project-map 19.38.2 → 19.38.3-alpha.78

package/dist/index.d.mts

@@ -635,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

@@ -635,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.38.2",
+  "version": "19.38.3-alpha.78+5c9892bf1",
   "description": "Uniform Project Map",
   "license": "SEE LICENSE IN LICENSE.txt",
   "main": "./dist/index.js",
@@ -32,11 +32,11 @@
     "/dist"
   ],
   "dependencies": {
-    "@uniformdev/canvas": "19.38.2",
-    "@uniformdev/context": "19.38.2"
+    "@uniformdev/canvas": "19.38.3-alpha.78+5c9892bf1",
+    "@uniformdev/context": "19.38.3-alpha.78+5c9892bf1"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "b97fd17fd44e0f5bd3806e942b516cb2bd218096"
+  "gitHead": "5c9892bf101584d351d06b65e1658a1237594cfb"
 }