cspell-lib 8.4.1 → 8.6.0

package/dist/esm/Settings/Controller/configLoader/configLoader.d.ts

@@ -144,11 +144,23 @@ declare function resolveGlobRoot(settings: CSpellSettingsWST, urlSettingsFile: U
 declare function validateRawConfigVersion(config: CSpellConfigFile): void;
 export declare function createConfigLoader(fs?: VFileSystem): IConfigLoader;
 export declare function getDefaultConfigLoaderInternal(): ConfigLoaderInternal;
+export declare class ConfigurationLoaderError extends Error {
+    readonly configurationFile?: string | undefined;
+    readonly relativeTo?: string | URL | undefined;
+    constructor(message: string, configurationFile?: string | undefined, relativeTo?: string | URL | undefined, cause?: unknown);
+}
+export declare class ConfigurationLoaderFailedToResolveError extends ConfigurationLoaderError {
+    readonly configurationFile: string;
+    readonly relativeTo: string | URL;
+    constructor(configurationFile: string, relativeTo: string | URL, cause?: unknown);
+}
+declare function relativeToCwd(file: string | URL): string;
 export declare const __testing__: {
     getDefaultConfigLoaderInternal: typeof getDefaultConfigLoaderInternal;
     normalizeCacheSettings: typeof normalizeCacheSettings;
     validateRawConfigVersion: typeof validateRawConfigVersion;
     resolveGlobRoot: typeof resolveGlobRoot;
+    relativeToCwd: typeof relativeToCwd;
 };
 export {};
 //# sourceMappingURL=configLoader.d.ts.map

package/dist/esm/Settings/Controller/configLoader/configLoader.js

@@ -12,7 +12,7 @@ import { AutoResolveCache } from '../../../util/AutoResolve.js';
 import { logError, logWarning } from '../../../util/logger.js';
 import { FileResolver } from '../../../util/resolveFile.js';
 import { envToTemplateVars } from '../../../util/templates.js';
-import { addTrailingSlash, cwdURL, resolveFileWithURL, toFilePathOrHref, windowsDriveLetterToUpper, } from '../../../util/url.js';
+import { addTrailingSlash, cwdURL, resolveFileWithURL, toFilePathOrHref, toFileUrl, windowsDriveLetterToUpper, } from '../../../util/url.js';
 import { configSettingsFileVersion0_1, configSettingsFileVersion0_2, currentSettingsFileVersion, defaultConfigFileModuleRef, ENV_CSPELL_GLOB_ROOT, } from '../../constants.js';
 import { getMergeStats, mergeSettings } from '../../CSpellSettingsServer.js';
 import { getGlobalConfig } from '../../GlobalSettings.js';
@@ -351,7 +351,7 @@ export class ConfigLoader {
         }
         return {
             filename: r.filename.startsWith('file:/') ? fileURLToPath(r.filename) : r.filename,
-            error: r.found ? undefined : new Error(`Failed to resolve file: "${filename}"`),
+            error: r.found ? undefined : new ConfigurationLoaderFailedToResolveError(filename, relativeTo),
         };
     }
     get isTrusted() {
@@ -454,10 +454,58 @@ async function isDirectory(fs, path) {
         return false;
     }
 }
+export class ConfigurationLoaderError extends Error {
+    configurationFile;
+    relativeTo;
+    constructor(message, configurationFile, relativeTo, cause) {
+        super(message);
+        this.configurationFile = configurationFile;
+        this.relativeTo = relativeTo;
+        this.name = 'Configuration Loader Error';
+        if (cause) {
+            this.cause = cause;
+        }
+    }
+}
+export class ConfigurationLoaderFailedToResolveError extends ConfigurationLoaderError {
+    configurationFile;
+    relativeTo;
+    constructor(configurationFile, relativeTo, cause) {
+        const filename = configurationFile.startsWith('file:/') ? fileURLToPath(configurationFile) : configurationFile;
+        const relSource = relativeToCwd(relativeTo);
+        const message = `Failed to resolve configuration file: "${filename}" referenced from "${relSource}"`;
+        super(message, configurationFile, relativeTo, cause);
+        this.configurationFile = configurationFile;
+        this.relativeTo = relativeTo;
+        // this.name = 'Configuration Loader Error';
+    }
+}
+function relativeToCwd(file) {
+    const url = toFileUrl(file);
+    const cwdPath = cwdURL().pathname.split('/').slice(0, -1);
+    const urlPath = url.pathname.split('/');
+    if (urlPath[0] !== cwdPath[0])
+        return toFilePathOrHref(file);
+    let i = 0;
+    for (; i < cwdPath.length; ++i) {
+        if (cwdPath[i] !== urlPath[i])
+            break;
+    }
+    const segments = cwdPath.length - i;
+    if (segments > 3)
+        return toFilePathOrHref(file);
+    const prefix = '.'
+        .repeat(segments)
+        .split('')
+        .map(() => '..')
+        .join('/');
+    return [prefix || '.', ...urlPath.slice(i)].join('/');
+}
 export const __testing__ = {
     getDefaultConfigLoaderInternal,
     normalizeCacheSettings,
     validateRawConfigVersion,
     resolveGlobRoot,
+    relativeToCwd,
 };
 //# sourceMappingURL=configLoader.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cspell-lib",
-  "version": "8.4.1",
+  "version": "8.6.0",
   "description": "A library of useful functions used across various cspell tools.",
   "type": "module",
   "sideEffects": false,
@@ -58,23 +58,23 @@
   },
   "homepage": "https://github.com/streetsidesoftware/cspell#readme",
   "dependencies": {
-    "@cspell/cspell-bundled-dicts": "8.4.1",
-    "@cspell/cspell-pipe": "8.4.1",
-    "@cspell/cspell-resolver": "8.4.1",
-    "@cspell/cspell-types": "8.4.1",
-    "@cspell/dynamic-import": "8.4.1",
-    "@cspell/strong-weak-map": "8.4.1",
+    "@cspell/cspell-bundled-dicts": "8.6.0",
+    "@cspell/cspell-pipe": "8.6.0",
+    "@cspell/cspell-resolver": "8.6.0",
+    "@cspell/cspell-types": "8.6.0",
+    "@cspell/dynamic-import": "8.6.0",
+    "@cspell/strong-weak-map": "8.6.0",
     "clear-module": "^4.1.2",
     "comment-json": "^4.2.3",
     "configstore": "^6.0.0",
-    "cspell-config-lib": "8.4.1",
-    "cspell-dictionary": "8.4.1",
-    "cspell-glob": "8.4.1",
-    "cspell-grammar": "8.4.1",
-    "cspell-io": "8.4.1",
-    "cspell-trie-lib": "8.4.1",
+    "cspell-config-lib": "8.6.0",
+    "cspell-dictionary": "8.6.0",
+    "cspell-glob": "8.6.0",
+    "cspell-grammar": "8.6.0",
+    "cspell-io": "8.6.0",
+    "cspell-trie-lib": "8.6.0",
     "fast-equals": "^5.0.1",
-    "gensequence": "^6.0.0",
+    "gensequence": "^7.0.0",
     "import-fresh": "^3.3.0",
     "resolve-from": "^5.0.0",
     "vscode-languageserver-textdocument": "^1.0.11",
@@ -97,5 +97,5 @@
     "leaked-handles": "^5.2.0",
     "lorem-ipsum": "^2.0.8"
   },
-  "gitHead": "d57dbadb81b859d659c578cd8e81ac5dbcbaae8c"
+  "gitHead": "78eadb48e8ab400f4fcd159344c5b15968d7ab2e"
 }