fix rare error when publicDir path has character in the 'alias' option

Author: pzmosquito

index.js

@@ -9,7 +9,7 @@ const log = debug(namespace);
 
 const logError = (message) => {
     log(message);
-    console.log(`[${namespace}] ${message}`);
+    console.error(`[${namespace}] ${message}`);
 };
 
 exports.interfaceVersion = 2;
@@ -32,7 +32,7 @@ exports.resolve = (source, file, config) => {
         // load vite config
         const viteConfigPath = path.resolve(pluginConfig.configPath);
         if (!fs.existsSync(viteConfigPath)) {
-            logError(`vite config file doesn't exist at '${viteConfigPath}'`);
+            throw new Error(`Vite config file doesn't exist at '${viteConfigPath}'`)
         }
         const viteConfigFile = require(viteConfigPath);
 
@@ -50,19 +50,22 @@ exports.resolve = (source, file, config) => {
 
         let actualSource = source;
 
-        // public dir
-        const publicDir = viteConfig.publicDir || "public";
-        if (actualSource.charAt(0) === "/" && !fs.existsSync(actualSource)) {
-            actualSource = path.join(path.resolve(publicDir), actualSource);
-        }
-
         // parse and replace alias
         if (alias) {
             Object.entries(alias).forEach(([find, replacement]) => {
                 actualSource = actualSource.replace(find, replacement);
             });
         }
 
+        // public dir
+        // TODO this can lead to incorrect path error if `actualSource` is absolute path and DNE.
+        if (viteConfig.publicDir !== false) {
+            const publicDir = viteConfig.publicDir ?? "public";
+            if (actualSource.charAt(0) === "/" && !fs.existsSync(actualSource)) {
+                actualSource = path.join(path.resolve(publicDir), actualSource);
+            }
+        }
+
         // resolve module
         const resolvedPath = resolve.sync(actualSource, {
             basedir: path.dirname(file),
@@ -73,7 +76,7 @@ exports.resolve = (source, file, config) => {
         return { found: true, path: resolvedPath };
     }
     catch (err) {
-        log("Path not found:", err);
+        logError(err.message);
         return { found: false };
     }
 };

index.test.js

@@ -1,14 +1,11 @@
 const resolve = require("resolve");
+const fs = require("fs");
 const resolver = require("./index");
 
 jest.mock("resolve");
 jest.mock("fs");
 
 describe("Resolver Plugin Tests", () => {
-    beforeEach(() => {
-        jest.restoreAllMocks();
-    });
-
     test("should resolve core module", () => {
         resolve.isCore.mockReturnValue(true);
 
@@ -18,8 +15,9 @@ describe("Resolver Plugin Tests", () => {
         expect(result.path).toBe(null);
     });
 
-    test("should resolve non-core module with ESM vite config", () => {
+    test("should resolve non-core module", () => {
         resolve.sync = jest.fn(() => "/path/to/resolved.js");
+        fs.existsSync = jest.fn(() => true);
 
         jest.mock("/path/to/vite.config.js", () => ({
             default: {
@@ -37,39 +35,89 @@ describe("Resolver Plugin Tests", () => {
 
         expect(result.found).toBe(true);
         expect(result.path).toBe("/path/to/resolved.js");
-        expect(resolve.sync).toHaveBeenCalledWith("/path/to/src/module", {
-            basedir: "/path/to",
-            extensions: [".js"],
+        expect(resolve.sync).toHaveBeenCalledWith(
+            "/path/to/src/module",
+            { basedir: "/path/to", extensions: [".js"] }
+        );
+    });
+
+    test("should resolve non-core module with publicDir", () => {
+        resolve.sync = jest.fn(() => "/path/to/resolved.js");
+        fs.existsSync = jest.fn((param) => {
+            if (param === "/path/to/vite.config.js") {
+                return true;
+            }
+            return false;
         });
+
+        jest.mock("/path/to/vite.config.js", () => ({
+            default: {
+                resolve: {
+                    extensions: [".js"],
+                    alias: {
+                        "_": "/path/to/src",
+                    },
+                },
+                publicDir: "/path/to/public",
+            },
+        }), { virtual: true });
+
+        // JS module
+        const result = resolver.resolve("/_/module", "/path/to/file.js", { configPath: "/path/to/vite.config.js" });
+
+        expect(result.found).toBe(true);
+        expect(result.path).toBe("/path/to/resolved.js");
+        expect(resolve.sync).toHaveBeenCalledWith(
+            "/path/to/public/path/to/src/module",
+            { basedir: "/path/to", extensions: [".js"] }
+        );
     });
 
-    test("should resolve non-core module with CJS vite config", () => {
+    test("should resolve non-core module with absolute path", () => {
         resolve.sync = jest.fn(() => "/path/to/resolved.js");
+        fs.existsSync = jest.fn(() => true);
 
         jest.mock("/path/to/vite.config.js", () => ({
-            resolve: {
-                extensions: [".js"],
-                alias: {
-                    "_": "/path/to/src",
+            default: {
+                resolve: {
+                    extensions: [".js"],
+                    alias: {
+                        "_": "/path/to/src",
+                    },
                 },
+                publicDir: "/path/to/public",
             },
         }), { virtual: true });
 
         // JS module
-        let result = resolver.resolve("_/module", "/path/to/file.js", { configPath: "/path/to/vite.config.js" });
+        const result = resolver.resolve("/path/to/module", "/path/to/file.js", { configPath: "/path/to/vite.config.js" });
 
         expect(result.found).toBe(true);
         expect(result.path).toBe("/path/to/resolved.js");
-        expect(resolve.sync).toHaveBeenCalledWith("/path/to/src/module", {
-            basedir: "/path/to",
-            extensions: [".js"],
+        expect(resolve.sync).toHaveBeenCalledWith(
+            "/path/to/module",
+            { basedir: "/path/to", extensions: [".js"] }
+        );
+    });
+
+    test("should handle vite config DNE error", () => {
+        fs.existsSync = jest.fn((param) => {
+            if (param === "/path/to/vite.config.js") {
+                return false;
+            }
+            return true;
         });
+
+        const result = resolver.resolve("module", "/path/to/file.js", { configPath: "/path/to/vite.config.js" });
+
+        expect(result.found).toBe(false);
     });
 
     test("should handle resolve error", () => {
         resolve.sync = jest.fn(() => {
             throw new Error("Resolve error");
         });
+        fs.existsSync = jest.fn((param) => true);
 
         const result = resolver.resolve("module", "/path/to/file.js", {});
 

jest.config.js

@@ -0,0 +1,6 @@
+module.exports = {
+    clearMocks: true,
+    resetMocks: true,
+    restoreMocks: true,
+    resetModules: true,
+};

package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-import-resolver-vite",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "Vite module resolution plugin for eslint-plugin-import.",
   "keywords": [
     "eslint",
@@ -32,6 +32,6 @@
     "jest": "^29.5.0"
   },
   "scripts": {
-    "test": "jest"
+    "test": "jest --watchAll"
   }
 }