@vercel/routing-utils 5.0.3 → 5.0.5

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,11 +25,58 @@ __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("@vercel-internals/path-to-regexp");
+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 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) {
+      const message = JSON.stringify({
+        path,
+        currentRegExp: currentRegExp.toString(),
+        newRegExp: newRegExp.toString()
+      });
+      console.error(`[vc] PATH TO REGEXP PATH DIFF @ #${callerId}: ${message}`);
+    }
+    const isDiffKeys = !compareKeys(keys, newKeys);
+    if (process.env.FORCE_PATH_TO_REGEXP_LOG || isDiffKeys) {
+      const message = JSON.stringify({
+        isDiffKeys,
+        currentKeys,
+        newKeys
+      });
+      console.error(`[vc] PATH TO REGEXP KEYS DIFF @ #${callerId}: ${message}`);
+    }
+  } catch (err) {
+    const error = err;
+    const message = JSON.stringify({
+      path,
+      error: error.message
+    });
+    console.error(`[vc] PATH TO REGEXP ERROR @ #${callerId}: ${message}`);
+  }
+  return currentRegExp;
+}
 const UN_NAMED_SEGMENT = "__UN_NAMED_SEGMENT__";
 function getCleanUrls(filePaths) {
   const htmlFiles = filePaths.map(toRoute).filter((f) => f.endsWith(".html")).map((f) => ({
@@ -185,7 +232,7 @@ function convertTrailingSlash(enable, status = 308) {
 }
 function sourceToRegex(source) {
   const keys = [];
-  const r = (0, import_path_to_regexp.pathToRegexp)("632", source, keys, {
+  const r = pathToRegexp("632", source, keys, {
     strict: true,
     sensitive: true,
     delimiter: "/"
@@ -258,9 +305,9 @@ function replaceSegments(segments, hasItemSegments, destination, isRedirect, int
   const hashKeys = [];
   const hostnameKeys = [];
   try {
-    (0, import_path_to_regexp.pathToRegexp)("528", pathname, pathnameKeys);
-    (0, import_path_to_regexp.pathToRegexp)("834", hash || "", hashKeys);
-    (0, import_path_to_regexp.pathToRegexp)("712", hostname || "", hostnameKeys);
+    pathToRegexp("528", pathname, pathnameKeys);
+    pathToRegexp("834", hash || "", hashKeys);
+    pathToRegexp("712", hostname || "", hostnameKeys);
   } catch (_) {
   }
   destParams = new Set(
@@ -348,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.3",
+  "version": "5.0.5",
   "description": "Vercel routing utilities",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -13,11 +13,13 @@
     "directory": "packages/routing-utils"
   },
   "license": "Apache-2.0",
-  "dependencies": {},
+  "dependencies": {
+    "path-to-regexp-updated": "npm:path-to-regexp@6.3.0",
+    "path-to-regexp": "6.1.0"
+  },
   "devDependencies": {
     "@types/jest": "27.4.1",
     "@types/node": "14.18.33",
-    "@vercel-internals/path-to-regexp": "1.0.0",
     "ajv": "^6.12.3",
     "jest-junit": "16.0.0",
     "typescript": "4.9.5"