@cspell/url 8.11.0 → 8.13.0

package/dist/FileUrlBuilder.d.mts

@@ -1,6 +1,5 @@
 import Path from 'node:path';
 export declare const isWindows: boolean;
-export declare const isWindowsPathRegEx: RegExp;
 export declare const percentRegEx: RegExp;
 export declare const backslashRegEx: RegExp;
 export declare const newlineRegEx: RegExp;

package/dist/FileUrlBuilder.mjs

@@ -1,10 +1,11 @@
 import assert from 'node:assert';
 import Path from 'node:path';
-import { toFilePathOrHref } from './fileUrl.mjs';
-import { addTrailingSlash, isUrlLike, urlParent, urlToUrlRelative } from './url.mjs';
+import { pathToFileURL } from 'node:url';
+import { pathWindowsDriveLetterToUpper, regExpWindowsPathDriveLetter, toFilePathOrHref } from './fileUrl.mjs';
+import { addTrailingSlash, isUrlLike, normalizeWindowsUrl, regExpWindowsPath, urlParent, urlToUrlRelative, } from './url.mjs';
 export const isWindows = process.platform === 'win32';
-export const isWindowsPathRegEx = /^[a-z]:[\\/]/i;
-const isWindowsPathname = /^[\\/]([a-z]:[\\/])/i;
+const isWindowsPathRegEx = regExpWindowsPathDriveLetter;
+const isWindowsPathname = regExpWindowsPath;
 export const percentRegEx = /%/g;
 export const backslashRegEx = /\\/g;
 export const newlineRegEx = /\n/g;
@@ -13,7 +14,6 @@ export const tabRegEx = /\t/g;
 export const questionRegex = /\?/g;
 export const hashRegex = /#/g;
 const ProtocolFile = 'file:';
-const RootFileURL = 'file:///';
 export class FileUrlBuilder {
     windows;
     path;
@@ -81,6 +81,16 @@ export class FileUrlBuilder {
      * @returns a URL
      */
     toFileURL(filenameOrUrl, relativeTo) {
+        return normalizeWindowsUrl(this.#toFileURL(filenameOrUrl, relativeTo));
+    }
+    /**
+     * Try to make a file URL.
+     * - if filenameOrUrl is already a URL, it is returned as is.
+     * @param filenameOrUrl
+     * @param relativeTo - optional URL, if given, filenameOrUrl will be parsed as relative.
+     * @returns a URL
+     */
+    #toFileURL(filenameOrUrl, relativeTo) {
         if (typeof filenameOrUrl !== 'string')
             return filenameOrUrl;
         if (isUrlLike(filenameOrUrl))
@@ -116,7 +126,7 @@ export class FileUrlBuilder {
         const p = this.path === Path
             ? toFilePathOrHref(url)
             : decodeURIComponent(url.pathname.split('/').join(this.path.sep));
-        return p.replace(isWindowsPathRegEx, (drive) => drive.toUpperCase()).replace(isWindowsPathname, '$1');
+        return pathWindowsDriveLetterToUpper(p.replace(isWindowsPathname, '$1'));
     }
     /**
      * Calculate the relative path to go from `urlFrom` to `urlTo`.
@@ -158,7 +168,13 @@ export class FileUrlBuilder {
     rootFileURL(filePath) {
         const path = this.path;
         const p = path.parse(path.normalize(path.resolve(filePath ?? '.')));
-        return new URL(this.normalizeFilePathForUrl(p.root), RootFileURL);
+        return new URL(this.normalizeFilePathForUrl(p.root), this.#getFsRootURL());
+    }
+    #getFsRootURL() {
+        if (this.path === Path)
+            return pathToFileURL('/');
+        const p = this.path.resolve('/');
+        return new URL(this.normalizeFilePathForUrl(p), 'file:///');
     }
     /**
      * Determine if a filePath is absolute.

package/dist/fileUrl.d.mts

@@ -9,4 +9,6 @@ export declare function isFileURL(url: URL | string): boolean;
  * @returns path or href
  */
 export declare function toFilePathOrHref(url: URL | string): string;
+export declare const regExpWindowsPathDriveLetter: RegExp;
+export declare function pathWindowsDriveLetterToUpper(absoluteFilePath: string): string;
 //# sourceMappingURL=fileUrl.d.mts.map

package/dist/fileUrl.mjs

@@ -16,9 +16,10 @@ export function toFilePathOrHref(url) {
     return isFileURL(url) ? toFilePath(url) : url.toString();
 }
 function toFilePath(url) {
-    return windowsDriveLetterToUpper(fileURLToPath(url));
+    return pathWindowsDriveLetterToUpper(fileURLToPath(url));
 }
-function windowsDriveLetterToUpper(absoluteFilePath) {
-    return absoluteFilePath.replace(/^([a-z]):\\/, (s) => s.toUpperCase());
+export const regExpWindowsPathDriveLetter = /^([a-zA-Z]):[\\/]/;
+export function pathWindowsDriveLetterToUpper(absoluteFilePath) {
+    return absoluteFilePath.replace(regExpWindowsPathDriveLetter, (s) => s.toUpperCase());
 }
 //# sourceMappingURL=fileUrl.mjs.map

package/dist/url.d.mts

@@ -96,4 +96,13 @@ export declare function urlRelative(urlFrom: string | URL, urlTo: string | URL):
  * @returns the relative path
  */
 export declare function urlToUrlRelative(urlFrom: URL, urlTo: URL): string;
+export declare const regExpWindowsPath: RegExp;
+export declare const regExpEncodedColon: RegExp;
+/**
+ * Ensure that a windows file url is correctly formatted with a capitol letter for the drive.
+ *
+ * @param url - URL to check.
+ * @returns a new URL if modified or converted from a string.
+ */
+export declare function normalizeWindowsUrl(url: URL | string): URL;
 //# sourceMappingURL=url.d.mts.map

package/dist/url.mjs

@@ -6,7 +6,7 @@ const isURLRegEx = /^(\w[\w-]{1,63}:\/|data:|stdin:)/i;
  * @returns a URL
  */
 export function toURL(url, relativeTo) {
-    return url instanceof URL ? url : new URL(url, relativeTo);
+    return normalizeWindowsUrl(url instanceof URL ? url : new URL(url, relativeTo));
 }
 /**
  * Try to determine the parent directory URL of the uri.
@@ -148,4 +148,26 @@ export function urlToUrlRelative(urlFrom, urlTo) {
     const rel = '../'.repeat(p0Parts.length - i) + p1Parts.slice(i).join('/');
     return decodeURIComponent(rel.length < p1.length ? rel : p1);
 }
+export const regExpWindowsPath = /^[\\/]([a-zA-Z]:[\\/])/;
+export const regExpEncodedColon = /%3[aA]/g;
+/**
+ * Ensure that a windows file url is correctly formatted with a capitol letter for the drive.
+ *
+ * @param url - URL to check.
+ * @returns a new URL if modified or converted from a string.
+ */
+export function normalizeWindowsUrl(url) {
+    url = typeof url === 'string' ? new URL(url) : url;
+    if (url.protocol === 'file:') {
+        const pathname = url.pathname
+            .replaceAll(regExpEncodedColon, ':')
+            .replace(regExpWindowsPath, (d) => d.toUpperCase());
+        if (pathname !== url.pathname) {
+            url = new URL(url);
+            url.pathname = pathname;
+            return url;
+        }
+    }
+    return url;
+}
 //# sourceMappingURL=url.mjs.map

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "8.11.0",
+  "version": "8.13.0",
   "description": "URL parsing and manipulation utilities for cspell",
   "keywords": [
     "cspell",
@@ -56,5 +56,5 @@
   "engines": {
     "node": ">=18.0"
   },
-  "gitHead": "2b85b2b458b1117870a4f0aee18fb45ce991848d"
+  "gitHead": "2fd3fb430cc96a8a50543f57d96b288219a11923"
 }