@vercel/routing-utils 5.0.2 → 5.0.4

package/dist/superstatic.d.ts

@@ -1,4 +1,10 @@
 import { Route, Redirect, Rewrite, HasField, Header } from './types';
+import { Key } from 'path-to-regexp';
+export declare function pathToRegexp(callerId: string, path: string, keys?: Key[], options?: {
+    strict: boolean;
+    sensitive: boolean;
+    delimiter: string;
+}): RegExp;
 export declare function getCleanUrls(filePaths: string[]): {
     html: string;
     clean: string;

package/dist/superstatic.js

@@ -25,17 +25,29 @@ __export(superstatic_exports, {
   convertRewrites: () => convertRewrites,
   convertTrailingSlash: () => convertTrailingSlash,
   getCleanUrls: () => getCleanUrls,
+  pathToRegexp: () => pathToRegexp,
   sourceToRegex: () => sourceToRegex
 });
 module.exports = __toCommonJS(superstatic_exports);
 var import_url = require("url");
 var import_path_to_regexp = require("path-to-regexp");
 var import_path_to_regexp_updated = require("path-to-regexp-updated");
+function cloneKeys(keys) {
+  if (typeof keys === "undefined") {
+    return void 0;
+  }
+  return keys.slice(0);
+}
+function compareKeys(left, right) {
+  const leftSerialized = typeof left === "undefined" ? "undefined" : left.toString();
+  const rightSerialized = typeof right === "undefined" ? "undefined" : right.toString();
+  return leftSerialized === rightSerialized;
+}
 function pathToRegexp(callerId, path, keys, options) {
+  const newKeys = cloneKeys(keys);
   const currentRegExp = (0, import_path_to_regexp.pathToRegexp)(path, keys, options);
   try {
     const currentKeys = keys;
-    const newKeys = [];
     const newRegExp = (0, import_path_to_regexp_updated.pathToRegexp)(path, newKeys, options);
     const isDiffRegExp = currentRegExp.toString() !== newRegExp.toString();
     if (process.env.FORCE_PATH_TO_REGEXP_LOG || isDiffRegExp) {
@@ -46,7 +58,7 @@ function pathToRegexp(callerId, path, keys, options) {
       });
       console.error(`[vc] PATH TO REGEXP PATH DIFF @ #${callerId}: ${message}`);
     }
-    const isDiffKeys = keys?.toString() !== newKeys?.toString();
+    const isDiffKeys = !compareKeys(keys, newKeys);
     if (process.env.FORCE_PATH_TO_REGEXP_LOG || isDiffKeys) {
       const message = JSON.stringify({
         isDiffKeys,
@@ -57,7 +69,11 @@ function pathToRegexp(callerId, path, keys, options) {
     }
   } catch (err) {
     const error = err;
-    console.error(`[vc] PATH TO REGEXP ERROR @ #${callerId}: ${error.message}`);
+    const message = JSON.stringify({
+      path,
+      error: error.message
+    });
+    console.error(`[vc] PATH TO REGEXP ERROR @ #${callerId}: ${message}`);
   }
   return currentRegExp;
 }
@@ -379,5 +395,6 @@ function toRoute(filePath) {
   convertRewrites,
   convertTrailingSlash,
   getCleanUrls,
+  pathToRegexp,
   sourceToRegex
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/routing-utils",
-  "version": "5.0.2",
+  "version": "5.0.4",
   "description": "Vercel routing utilities",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",