feat: reduce number of regex operations for normalizing paths

unjs · Oct 13, 2023 · 2b225be · 2b225be
1 parent babcc16
commit 2b225be
Showing 1 changed file with 6 additions and 17 deletions.
diff --git a/src/drivers/utils/opfs-utils.ts b/src/drivers/utils/opfs-utils.ts
@@ -11,15 +11,11 @@ function ignoreNotfoundError(error: any): null {
  * Normalize a path, removing empty segments and leading/trailing slashes
  */
 export function normalizePath(path: string): string {
-  const normalizedWrappedPath = `/${path}/`
-    // Replace colons with slashes
-    .replace(/:/g, "/")
-
-    // Remove . segments
-    .replace(/\/\.\//g, "/")
-
-    // Remove duplicate slashes
-    .replace(/\/{2,}/g, "/");
+  // Wrap path in slashes, remove . segments and collapse subsequent namespace separators
+  const normalizedWrappedPath = `/${path}/`.replace(
+    /[/:]+(\.[/:]+)*[/:]*/g,
+    "/"
+  );
 
   // Disallow .. segments
   if (normalizedWrappedPath.includes("/../")) {
@@ -29,14 +25,7 @@ export function normalizePath(path: string): string {
     );
   }
 
-  return (
-    normalizedWrappedPath
-      // Remove leading slashes
-      .replace(/^\//g, "")
-
-      // Remove trailing slashes
-      .replace(/\/$/g, "")
-  );
+  return normalizedWrappedPath.slice(1, -1);
 }
 
 /**