cspell-lib 8.8.4 → 8.9.0

package/dist/esm/Settings/DefaultSettings.js

@@ -67,7 +67,7 @@ const definedDefaultRegExpExcludeList = [
     'UnicodeRef',
     'UUID',
 ];
-// This bit of copying is done to have the complier ensure that the defaults exist.
+// This bit of copying is done to have the compiler ensure that the defaults exist.
 const defaultRegExpExcludeList = definedDefaultRegExpExcludeList;
 export const _defaultSettingsBasis = Object.freeze(createCSpellSettingsInternal({
     id: 'static_defaults',

package/dist/esm/util/url.d.ts

@@ -1,9 +1,4 @@
-/**
- * Convert a URL into a string. If it is a file URL, convert it to a path.
- * @param url - URL
- * @returns path or href
- */
-export declare function toFilePathOrHref(url: URL | string): string;
+export { addTrailingSlash, isDataURL, isFileURL, isUrlLike as isURLLike, toFileURL as resolveFileWithURL, toFileDirURL, toFilePathOrHref, toURL, } from '@cspell/url';
 /**
  * This is a URL that can be used for searching for modules.
  * @returns URL for the source directory
@@ -16,15 +11,7 @@ export declare function getSourceDirectoryUrl(): URL;
  */
 export declare function relativeTo(path: string, relativeTo?: URL | string): URL;
 export declare function cwdURL(): URL;
-export declare function resolveFileWithURL(file: string | URL, relativeToURL: URL): URL;
-export declare function normalizePathSlashesForUrl(filePath: string, sep?: string | RegExp): string;
 export declare function toFileUrl(file: string | URL): URL;
-export declare function toFileDirUrl(dir: string | URL): URL;
-export declare function addTrailingSlash(url: URL): URL;
-export declare function toURL(href: string | URL, relativeTo?: string | URL): URL;
 export declare function fileURLOrPathToPath(filenameOrURL: string | URL): string;
-export declare function isURLLike(url: string | URL): boolean;
-export declare function isFileURL(url: string | URL): boolean;
-export declare function isDataURL(url: string | URL): boolean;
 export declare function windowsDriveLetterToUpper(absoluteFilePath: string): string;
 //# sourceMappingURL=url.d.ts.map

package/dist/esm/util/url.js

@@ -1,15 +1,8 @@
 import path from 'node:path';
-import { fileURLToPath, pathToFileURL } from 'node:url';
+import { pathToFileURL } from 'node:url';
+import { toFilePathOrHref, toFileURL } from '@cspell/url';
 import { srcDirectory } from '../../lib-cjs/pkg-info.cjs';
-const isUrlRegExp = /^(?:[\w][\w-]+:\/|data:|untitled:)/i;
-/**
- * Convert a URL into a string. If it is a file URL, convert it to a path.
- * @param url - URL
- * @returns path or href
- */
-export function toFilePathOrHref(url) {
-    return fileURLOrPathToPath(url);
-}
+export { addTrailingSlash, isDataURL, isFileURL, isUrlLike as isURLLike, toFileURL as resolveFileWithURL, toFileDirURL, toFilePathOrHref, toURL, } from '@cspell/url';
 /**
  * This is a URL that can be used for searching for modules.
  * @returns URL for the source directory
@@ -24,71 +17,16 @@ export function getSourceDirectoryUrl() {
  * @returns a URL
  */
 export function relativeTo(path, relativeTo) {
-    return new URL(normalizePathSlashesForUrl(path), relativeTo || cwdURL());
+    return toFileURL(path, relativeTo ?? cwdURL());
 }
 export function cwdURL() {
     return pathToFileURL('./');
 }
-export function resolveFileWithURL(file, relativeToURL) {
-    if (file instanceof URL)
-        return file;
-    if (isURLLike(file))
-        return toURL(file);
-    const isRelativeToFile = isFileURL(relativeToURL);
-    if (isRelativeToFile && path.isAbsolute(file)) {
-        return pathToFileURL(file);
-    }
-    if (isRelativeToFile) {
-        const rootURL = new URL('.', relativeToURL);
-        const root = fileURLToPath(rootURL);
-        const suffix = file === '.' || file == '..' || file.endsWith('/') || file.endsWith(path.sep) ? '/' : '';
-        const filePath = path.resolve(root, file);
-        return pathToFileURL(filePath + suffix);
-    }
-    return relativeTo(file, relativeToURL);
-}
-export function normalizePathSlashesForUrl(filePath, sep = /[/\\]/g) {
-    return filePath
-        .replace(/^([a-z]:)/i, '/$1')
-        .split(sep)
-        .join('/');
-}
 export function toFileUrl(file) {
-    if (file instanceof URL)
-        return file;
-    return resolveFileWithURL(file, cwdURL());
-}
-export function toFileDirUrl(dir) {
-    return addTrailingSlash(toFileUrl(dir));
-}
-export function addTrailingSlash(url) {
-    if (url.pathname.endsWith('/'))
-        return url;
-    const urlWithSlash = new URL(url.href);
-    urlWithSlash.pathname += '/';
-    return urlWithSlash;
-}
-export function toURL(href, relativeTo) {
-    return href instanceof URL ? href : new URL(href, relativeTo);
+    return toFileURL(file, cwdURL());
 }
 export function fileURLOrPathToPath(filenameOrURL) {
-    return isFileURL(filenameOrURL) ? toFilePath(filenameOrURL) : filenameOrURL.toString();
-}
-function toFilePath(url) {
-    return windowsDriveLetterToUpper(fileURLToPath(url));
-}
-export function isURLLike(url) {
-    return url instanceof URL || isUrlRegExp.test(url);
-}
-export function isFileURL(url) {
-    return isUrlWithProtocol(url, 'file');
-}
-export function isDataURL(url) {
-    return isUrlWithProtocol(url, 'data');
-}
-function isUrlWithProtocol(url, protocol) {
-    protocol = protocol.endsWith(':') ? protocol : protocol + ':';
-    return url instanceof URL ? url.protocol === protocol : url.startsWith(protocol);
+    return toFilePathOrHref(filenameOrURL);
 }
 export function windowsDriveLetterToUpper(absoluteFilePath) {
     return absoluteFilePath.replace(/^([a-z]):\\/, (s) => s.toUpperCase());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cspell-lib",
-  "version": "8.8.4",
+  "version": "8.9.0",
   "description": "A library of useful functions used across various cspell tools.",
   "type": "module",
   "sideEffects": false,
@@ -59,20 +59,21 @@
   },
   "homepage": "https://github.com/streetsidesoftware/cspell#readme",
   "dependencies": {
-    "@cspell/cspell-bundled-dicts": "8.8.4",
-    "@cspell/cspell-pipe": "8.8.4",
-    "@cspell/cspell-resolver": "8.8.4",
-    "@cspell/cspell-types": "8.8.4",
-    "@cspell/dynamic-import": "8.8.4",
-    "@cspell/strong-weak-map": "8.8.4",
+    "@cspell/cspell-bundled-dicts": "8.9.0",
+    "@cspell/cspell-pipe": "8.9.0",
+    "@cspell/cspell-resolver": "8.9.0",
+    "@cspell/cspell-types": "8.9.0",
+    "@cspell/dynamic-import": "8.9.0",
+    "@cspell/strong-weak-map": "8.9.0",
+    "@cspell/url": "8.9.0",
     "clear-module": "^4.1.2",
     "comment-json": "^4.2.3",
-    "cspell-config-lib": "8.8.4",
-    "cspell-dictionary": "8.8.4",
-    "cspell-glob": "8.8.4",
-    "cspell-grammar": "8.8.4",
-    "cspell-io": "8.8.4",
-    "cspell-trie-lib": "8.8.4",
+    "cspell-config-lib": "8.9.0",
+    "cspell-dictionary": "8.9.0",
+    "cspell-glob": "8.9.0",
+    "cspell-grammar": "8.9.0",
+    "cspell-io": "8.9.0",
+    "cspell-trie-lib": "8.9.0",
     "env-paths": "^3.0.0",
     "fast-equals": "^5.0.1",
     "gensequence": "^7.0.0",
@@ -86,19 +87,19 @@
     "node": ">=18"
   },
   "devDependencies": {
-    "@cspell/dict-cpp": "^5.1.8",
+    "@cspell/dict-cpp": "^5.1.10",
     "@cspell/dict-csharp": "^4.0.2",
     "@cspell/dict-css": "^4.0.12",
     "@cspell/dict-fa-ir": "^4.0.0",
     "@cspell/dict-fr-fr": "^2.2.2",
     "@cspell/dict-html": "^4.0.5",
     "@cspell/dict-nl-nl": "^2.3.0",
-    "@cspell/dict-python": "^4.1.11",
+    "@cspell/dict-python": "^4.2.1",
     "@types/configstore": "^6.0.2",
     "configstore": "^6.0.0",
     "cspell-dict-nl-nl": "^1.1.2",
     "leaked-handles": "^5.2.0",
     "lorem-ipsum": "^2.0.8"
   },
-  "gitHead": "e1df92825ed0dacedb1830eeb6d918f01690c69a"
+  "gitHead": "33c513cf848a61fb1ebcea1b9c67505a31447411"
 }