@markuplint/file-resolver 5.0.0-alpha.0 → 5.0.0-alpha.2

package/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [5.0.0-alpha.2](https://github.com/markuplint/markuplint/compare/v5.0.0-alpha.1...v5.0.0-alpha.2) (2026-02-23)
+
+**Note:** Version bump only for package @markuplint/file-resolver
+
+# [5.0.0-alpha.1](https://github.com/markuplint/markuplint/compare/v5.0.0-alpha.0...v5.0.0-alpha.1) (2026-02-22)
+
+### Bug Fixes
+
+- **file-resolver:** fix matches() normalization asymmetry and harden tests ([4651df9](https://github.com/markuplint/markuplint/commit/4651df9679427755a3848937b3b8f5546cb04371))
+- **file-resolver:** fix Windows path normalization for non-C: drives ([f31a942](https://github.com/markuplint/markuplint/commit/f31a9427fc417f444df26ad1a931d4df5957f29f)), closes [#1806](https://github.com/markuplint/markuplint/issues/1806)
+- **file-resolver:** skip platform-specific fromFileURL tests per OS ([4c05356](https://github.com/markuplint/markuplint/commit/4c0535657a748d63f7832efeb3d33b43e5b8e081))
+
 # [5.0.0-alpha.0](https://github.com/markuplint/markuplint/compare/v4.14.1...v5.0.0-alpha.0) (2026-02-20)
 
 ### Bug Fixes

package/lib/force-import-json-in-module.js

@@ -1,6 +1,6 @@
 import { readFile } from 'node:fs/promises';
-import path from 'node:path';
 import { log } from './debug.js';
+import { fromFileURL } from './path-utils.js';
 const fLog = log.extend('force-import-json-in-module');
 export async function forceImportJsonInModule(modPath) {
     const error = await import(modPath).catch(error => error);
@@ -18,11 +18,7 @@ export async function forceImportJsonInModule(modPath) {
         if (!absPath) {
             return error;
         }
-        const normalizePath = absPath
-            .replace(/^file:\/\//, '')
-            .replaceAll('/', path.sep)
-            // Windows
-            .replace(/^[/\\](?=[a-z]:)/i, ''); // only remove a leading slash
+        const normalizePath = absPath.startsWith('file:') ? fromFileURL(absPath) : absPath;
         fLog('Find JSON file path: %s', normalizePath);
         const fileContent = await readFile(normalizePath, { encoding: 'utf8' });
         return JSON.parse(fileContent);

package/lib/general-import.js

@@ -4,6 +4,7 @@ import path from 'node:path';
 import { pathToFileURL } from 'node:url';
 import { resolve } from 'import-meta-resolve';
 import { log } from './debug.js';
+import { fromFileURL } from './path-utils.js';
 const gLog = log.extend('general-import');
 const gLogSuccess = gLog.extend('success');
 const gLogError = gLog.extend('error');
@@ -53,7 +54,8 @@ export async function generalImport(name) {
                 ?.groups ?? {};
             if (filePath && packageName) {
                 const modFile = resolve(packageName, import.meta.url);
-                const modPath = path.dirname(modFile);
+                const modNativePath = modFile.startsWith('file:') ? fromFileURL(modFile) : modFile;
+                const modPath = path.dirname(modNativePath);
                 const candidate = path.join(modPath, filePath);
                 gLog('Try import absolute path: "%s"', candidate);
                 const result = await generalImport(candidate);

package/lib/ml-file/get-files.js

@@ -1,5 +1,6 @@
 import { glob } from 'glob';
 import { minimatch } from 'minimatch';
+import { normalizeForGlob } from '../path-utils.js';
 import { getFile } from './get-file.js';
 /**
  * Get files
@@ -9,7 +10,7 @@ import { getFile } from './get-file.js';
  * @param filePathOrGlob
  */
 export async function getFiles(filePathOrGlob, ignoreGlob) {
-    const fileList = await glob(filePathOrGlob, {}).catch(() => []);
-    const filtered = fileList.filter(fileName => !minimatch(fileName, ignoreGlob ?? ''));
+    const fileList = await glob(normalizeForGlob(filePathOrGlob), {}).catch(() => []);
+    const filtered = fileList.filter(fileName => !minimatch(fileName, normalizeForGlob(ignoreGlob ?? '')));
     return filtered.map(fileName => getFile(fileName));
 }

package/lib/ml-file/ml-file.js

@@ -2,6 +2,7 @@ import { promises as fs } from 'node:fs';
 import path from 'node:path';
 import ignore from 'ignore';
 import { minimatch } from 'minimatch';
+import { normalizeForIgnore } from '../path-utils.js';
 export class MLFile {
     #basename;
     #code;
@@ -39,13 +40,13 @@ export class MLFile {
      * Normalized `MLFile.dirname`
      */
     get nDirname() {
-        return pathNormalize(this.dirname);
+        return normalizeForIgnore(this.dirname);
     }
     /**
      * Normalized `MLFile.path`
      */
     get nPath() {
-        return pathNormalize(this.path);
+        return normalizeForIgnore(this.path);
     }
     get path() {
         return path.resolve(this.#dirname, this.#basename);
@@ -64,10 +65,10 @@ export class MLFile {
     }
     ignored(globPath) {
         globPath = typeof globPath === 'string' ? [globPath] : globPath;
-        const normalizedPaths = globPath.map(p => pathNormalize(p, true));
+        const normalizedPaths = globPath.map(p => normalizeForIgnore(p, true));
         // @ts-ignore
         const ig = ignore().add(normalizedPaths);
-        const ignored = ig.ignores(pathNormalize(this.nPath, true));
+        const ignored = ig.ignores(normalizeForIgnore(this.path, true));
         return ignored;
     }
     async isExist() {
@@ -85,7 +86,7 @@ export class MLFile {
         return !!stat && stat.isFile();
     }
     matches(globPath) {
-        return minimatch(this.nPath, pathNormalize(globPath));
+        return minimatch(normalizeForIgnore(this.path), normalizeForIgnore(globPath));
     }
     setCode(code) {
         if (this.#type === 'file-base') {
@@ -121,22 +122,3 @@ async function stat(filePath) {
         throw error;
     }
 }
-function pathNormalize(filePath, relative = false) {
-    const hasBang = filePath.startsWith('!');
-    if (hasBang) {
-        filePath = filePath.slice(1);
-    }
-    // Remove the local disk scheme of Windows OS
-    if (path.isAbsolute(filePath)) {
-        filePath = filePath.replace(/^[a-z]+:/i, '');
-        if (relative) {
-            filePath = path.relative(path.sep, filePath);
-        }
-    }
-    // Replace the separator of Windows OS
-    filePath = filePath.split(path.sep).join('/');
-    if (hasBang) {
-        filePath = `!${filePath}`;
-    }
-    return filePath;
-}

package/lib/path-utils.d.ts

@@ -0,0 +1,19 @@
+/**
+ * Convert OS-native separators to forward slashes.
+ * Identity function on POSIX.
+ */
+export declare function toSlash(filePath: string): string;
+/**
+ * Convert a `file://` URL to a native file path using Node.js built-in.
+ * Correctly handles URL encoding, UNC paths, and all drive letters.
+ */
+export declare function fromFileURL(fileUrl: string): string;
+/**
+ * Normalize a path for the `ignore` library (gitignore-style matching).
+ * Removes drive letters, converts to forward slashes, and optionally makes relative.
+ */
+export declare function normalizeForIgnore(filePath: string, relative?: boolean): string;
+/**
+ * Normalize a path for glob libraries (forward slashes required).
+ */
+export declare function normalizeForGlob(filePath: string): string;

package/lib/path-utils.js

@@ -0,0 +1,46 @@
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+/**
+ * Convert OS-native separators to forward slashes.
+ * Identity function on POSIX.
+ */
+export function toSlash(filePath) {
+    return filePath.replaceAll('\\', '/');
+}
+/**
+ * Convert a `file://` URL to a native file path using Node.js built-in.
+ * Correctly handles URL encoding, UNC paths, and all drive letters.
+ */
+export function fromFileURL(fileUrl) {
+    return fileURLToPath(fileUrl);
+}
+/**
+ * Normalize a path for the `ignore` library (gitignore-style matching).
+ * Removes drive letters, converts to forward slashes, and optionally makes relative.
+ */
+export function normalizeForIgnore(filePath, relative = false) {
+    const hasBang = filePath.startsWith('!');
+    if (hasBang) {
+        filePath = filePath.slice(1);
+    }
+    // Remove the local disk scheme of Windows OS (e.g. "C:", "P:")
+    if (path.isAbsolute(filePath) || /^[a-z]:/i.test(filePath)) {
+        filePath = filePath.replace(/^[a-z]:/i, '');
+    }
+    // Convert backslashes to forward slashes
+    filePath = toSlash(filePath);
+    if (relative) {
+        // Strip leading slashes to make the path relative
+        filePath = filePath.replace(/^\/+/, '');
+    }
+    if (hasBang) {
+        filePath = `!${filePath}`;
+    }
+    return filePath;
+}
+/**
+ * Normalize a path for glob libraries (forward slashes required).
+ */
+export function normalizeForGlob(filePath) {
+    return toSlash(filePath);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@markuplint/file-resolver",
-	"version": "5.0.0-alpha.0",
+	"version": "5.0.0-alpha.2",
 	"description": "The file resolver of markuplint",
 	"repository": "git@github.com:markuplint/markuplint.git",
 	"author": "Yusuke Hirao <yusukehirao@me.com>",
@@ -30,14 +30,14 @@
 		"@types/node": "24.5.1"
 	},
 	"dependencies": {
-		"@markuplint/html-parser": "5.0.0-alpha.0",
-		"@markuplint/ml-ast": "5.0.0-alpha.0",
-		"@markuplint/ml-config": "5.0.0-alpha.0",
-		"@markuplint/ml-core": "5.0.0-alpha.0",
-		"@markuplint/ml-spec": "5.0.0-alpha.0",
-		"@markuplint/parser-utils": "5.0.0-alpha.0",
-		"@markuplint/selector": "5.0.0-alpha.0",
-		"@markuplint/shared": "5.0.0-alpha.0",
+		"@markuplint/html-parser": "5.0.0-alpha.2",
+		"@markuplint/ml-ast": "5.0.0-alpha.2",
+		"@markuplint/ml-config": "5.0.0-alpha.2",
+		"@markuplint/ml-core": "5.0.0-alpha.2",
+		"@markuplint/ml-spec": "5.0.0-alpha.2",
+		"@markuplint/parser-utils": "5.0.0-alpha.2",
+		"@markuplint/selector": "5.0.0-alpha.2",
+		"@markuplint/shared": "5.0.0-alpha.2",
 		"cosmiconfig": "9.0.0",
 		"debug": "4.4.3",
 		"glob": "13.0.6",
@@ -46,5 +46,5 @@
 		"jsonc": "2.0.0",
 		"minimatch": "10.2.2"
 	},
-	"gitHead": "13dcfc84ec83d87360c720e253383b60767e1b56"
+	"gitHead": "31ccf1e81443ea3f93597d287595211f1823ddcf"
 }