@mpen/rerouter 0.1.7 → 0.1.9

package/dist/bundle.cjs

@@ -227,18 +227,20 @@ class UriTemplate {
                 for (const v of p.vars) {
                     if (Object.hasOwn(variables, v.name)) {
                         const x = variables[v.name];
-                        const esc = x => percentEncodeRegExp(x, ReservedExpansion[p.prefix], v.length);
+                        if (x == null) continue;
+                        const sep = v.repeat ? SeparatorMap[p.prefix] : ",";
+                        const esc = x => percentEncodeRegExp(x, ReservedExpansion[p.prefix], v.length, v.repeat ? "=" : ",");
                         let pre = "";
                         if (Named[p.prefix]) {
                             pre = v.name + (isEmpty(x) ? IfEmp[p.prefix] : "=");
                         }
                         if (Array.isArray(x)) {
                             if (x.length) {
-                                vs.push((v.repeat ? "" : pre) + x.map((z => (v.repeat ? pre : "") + esc(z))).join(v.repeat ? SeparatorMap[p.prefix] : ","));
+                                vs.push((v.repeat ? "" : pre) + x.map((z => (v.repeat ? pre : "") + esc(z))).join(sep));
                             }
-                        } else if (x != null && typeof x === "object") {
+                        } else if (typeof x === "object") {
                             if (Object.keys(x).length) {
-                                vs.push((v.repeat ? "" : pre) + Object.entries(x).map((([ok, ov]) => `${esc(ok)}${v.repeat ? "=" : ","}${esc(ov)}`)).join(v.repeat ? SeparatorMap[p.prefix] : ","));
+                                vs.push((v.repeat ? "" : pre) + Object.entries(x).map((([ok, ov]) => `${esc(ok)}${v.repeat ? "=" : ","}${esc(ov)}`)).join(sep));
                             }
                         } else {
                             vs.push(pre + esc(x));
@@ -375,18 +377,32 @@ function escapeRegExp(string) {
     return string.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
 
-function percentEncodeRegExp(x, reserved, length) {
-    if (typeof x === "number") {
-        return String(x);
+function fullWide(n) {
+    try {
+        return n.toLocaleString("en-US", {
+            useGrouping: false,
+            maximumFractionDigits: 20
+        });
+    } catch {
+        return n.toFixed(14).replace(/\.?0+$/, "");
+    }
+}
+
+function percentEncodeRegExp(value, reserved, length, separator) {
+    if (typeof value === "number") {
+        return fullWide(value);
+    }
+    if (value === true) return "1";
+    if (value === false) return "0";
+    if (value == null) return "";
+    if (Array.isArray(value)) {
+        return value.map((v => percentEncodeRegExp(v, reserved, length, separator))).join(separator);
     }
-    if (x === true) return "1";
-    if (x === false) return "0";
-    if (x === null) return "";
     if (length != null) {
-        x = x.slice(0, length);
+        value = value.slice(0, length);
     }
     if (reserved) {
-        return x.replace(/%[0-9a-fA-F]{2}|./gsu, (m => {
+        return value.replace(/%[0-9a-fA-F]{2}|./gsu, (m => {
             let v = PERCENT_RE.test(m) ? decodeURIComponent(m) : m;
             if (UR_SET.test(v)) {
                 return percentEncode(v);
@@ -394,7 +410,7 @@ function percentEncodeRegExp(x, reserved, length) {
             return m;
         }));
     }
-    return x.replace(UNRESERVED, percentEncode);
+    return value.replace(UNRESERVED, percentEncode);
 }
 
 const UTF8_ENCODER = new TextEncoder;

package/dist/bundle.mjs

@@ -225,18 +225,20 @@ class UriTemplate {
                 for (const v of p.vars) {
                     if (Object.hasOwn(variables, v.name)) {
                         const x = variables[v.name];
-                        const esc = x => percentEncodeRegExp(x, ReservedExpansion[p.prefix], v.length);
+                        if (x == null) continue;
+                        const sep = v.repeat ? SeparatorMap[p.prefix] : ",";
+                        const esc = x => percentEncodeRegExp(x, ReservedExpansion[p.prefix], v.length, v.repeat ? "=" : ",");
                         let pre = "";
                         if (Named[p.prefix]) {
                             pre = v.name + (isEmpty(x) ? IfEmp[p.prefix] : "=");
                         }
                         if (Array.isArray(x)) {
                             if (x.length) {
-                                vs.push((v.repeat ? "" : pre) + x.map((z => (v.repeat ? pre : "") + esc(z))).join(v.repeat ? SeparatorMap[p.prefix] : ","));
+                                vs.push((v.repeat ? "" : pre) + x.map((z => (v.repeat ? pre : "") + esc(z))).join(sep));
                             }
-                        } else if (x != null && typeof x === "object") {
+                        } else if (typeof x === "object") {
                             if (Object.keys(x).length) {
-                                vs.push((v.repeat ? "" : pre) + Object.entries(x).map((([ok, ov]) => `${esc(ok)}${v.repeat ? "=" : ","}${esc(ov)}`)).join(v.repeat ? SeparatorMap[p.prefix] : ","));
+                                vs.push((v.repeat ? "" : pre) + Object.entries(x).map((([ok, ov]) => `${esc(ok)}${v.repeat ? "=" : ","}${esc(ov)}`)).join(sep));
                             }
                         } else {
                             vs.push(pre + esc(x));
@@ -373,18 +375,32 @@ function escapeRegExp(string) {
     return string.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
 
-function percentEncodeRegExp(x, reserved, length) {
-    if (typeof x === "number") {
-        return String(x);
+function fullWide(n) {
+    try {
+        return n.toLocaleString("en-US", {
+            useGrouping: false,
+            maximumFractionDigits: 20
+        });
+    } catch {
+        return n.toFixed(14).replace(/\.?0+$/, "");
+    }
+}
+
+function percentEncodeRegExp(value, reserved, length, separator) {
+    if (typeof value === "number") {
+        return fullWide(value);
+    }
+    if (value === true) return "1";
+    if (value === false) return "0";
+    if (value == null) return "";
+    if (Array.isArray(value)) {
+        return value.map((v => percentEncodeRegExp(v, reserved, length, separator))).join(separator);
     }
-    if (x === true) return "1";
-    if (x === false) return "0";
-    if (x === null) return "";
     if (length != null) {
-        x = x.slice(0, length);
+        value = value.slice(0, length);
     }
     if (reserved) {
-        return x.replace(/%[0-9a-fA-F]{2}|./gsu, (m => {
+        return value.replace(/%[0-9a-fA-F]{2}|./gsu, (m => {
             let v = PERCENT_RE.test(m) ? decodeURIComponent(m) : m;
             if (UR_SET.test(v)) {
                 return percentEncode(v);
@@ -392,7 +408,7 @@ function percentEncodeRegExp(x, reserved, length) {
             return m;
         }));
     }
-    return x.replace(UNRESERVED, percentEncode);
+    return value.replace(UNRESERVED, percentEncode);
 }
 
 const UTF8_ENCODER = new TextEncoder;

package/dist/uri-template.d.ts

@@ -12,6 +12,7 @@ interface StringLiteral {
 type TemplateParts = Array<Placeholder | StringLiteral>;
 interface VarSpec {
     name: string;
+    /** Max length, in characters. */
     length: number | null;
     func: string | null;
     repeat: boolean;
@@ -40,9 +41,14 @@ export declare class UriTemplate<P extends UriParams> {
     expand(variables: P): string;
     match(url: string): UriMatch<P> | null;
 }
-export type UrlParamValue = string | number | boolean | string[] | number[] | Record<string, string | number | boolean | null>;
-type NullableUrlParamValue = UrlParamValue | null;
-export type UriParams = Record<string, NullableUrlParamValue>;
+type Primitive = string | number | boolean | null;
+type PrimitivePair = [key: string, value: Primitive];
+type PrimitiveMap = {
+    [K in string]: Primitive;
+};
+export type UrlParamValue = Primitive | Primitive[] | PrimitivePair[] | PrimitiveMap;
+export declare function fullWide(n: number): string;
+export type UriParams = Record<string, UrlParamValue>;
 export type UriMatch<P extends UriParams> = {
     score: number;
     params: P;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpen/rerouter",
-  "version": "0.1.7",
+  "version": "0.1.9",
   "packageManager": "bun",
   "exports": "./dist/bundle.cjs",
   "module": "./dist/bundle.mjs",