interpolateName.js: fix unreachable code; add tests

webpack · Apr 28, 2024 · a083806 · a083806
1 parent 50890cd
commit a083806
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/lib/interpolateName.js b/lib/interpolateName.js
@@ -51,9 +51,10 @@ function interpolateName(loaderContext, name, options = {}) {
       directory = resourcePath.replace(/\\/g, "/").replace(/\.\.(\/)?/g, "_$1");
     }
 
-    if (directory.length === 1) {
+    if (directory.length <= 1) {
       directory = "";
-    } else if (directory.length > 1) {
+    } else {
+      // directory.length > 1
       folder = path.basename(directory);
     }
   }

diff --git a/test/interpolateName.test.js b/test/interpolateName.test.js
@@ -308,11 +308,21 @@ describe("interpolateName()", () => {
         "/path/to/",
         "should interpolate [path] token",
       ],
+      [
+        [loaderContext, "[path]", { context: "/path/" }],
+        "to/",
+        "should interpolate [path] token with context",
+      ],
       [
         [loaderContext, "[folder]", {}],
         "to",
         "should interpolate [folder] token",
       ],
+      [
+        [{ resourcePath: "." }, "[folder]", {}],
+        "",
+        "should interpolate [folder] token with short resourcePath",
+      ],
     ]);
   });