cspell 8.15.1 → 8.15.2

package/dist/esm/lint/LintRequest.d.ts

@@ -1,5 +1,5 @@
 import type { Issue } from '@cspell/cspell-types';
-import type { LinterCliOptions, LinterOptions } from '../options.js';
+import type { CSpellConfigFile, LinterCliOptions, LinterOptions } from '../options.js';
 import type { GlobSrcInfo } from '../util/glob.js';
 import type { FinalizedReporter } from '../util/reporters.js';
 interface Deprecated {
@@ -12,7 +12,7 @@ export declare class LintRequest {
     readonly reporter: FinalizedReporter;
     readonly uniqueFilter: (issue: Issue) => boolean;
     readonly locale: string;
-    readonly configFile: string | undefined;
+    readonly configFile: string | CSpellConfigFile | undefined;
     readonly excludes: GlobSrcInfo[];
     readonly root: string;
     readonly showContext: number;

package/dist/esm/options.d.ts

@@ -1,5 +1,6 @@
+import { CSpellSettings } from '@cspell/cspell-types';
 import type { CacheOptions } from './util/cache/index.js';
-export interface LinterOptions extends BaseOptions, Omit<CacheOptions, 'version'> {
+export interface LinterOptions extends Omit<BaseOptions, 'config'>, Omit<CacheOptions, 'version'> {
     /**
      * Display verbose information
      */
@@ -87,6 +88,10 @@ export interface LinterOptions extends BaseOptions, Omit<CacheOptions, 'version'
      * Load and parse documents, but do not spell check.
      */
     skipValidation?: boolean;
+    /**
+     * Path to configuration file.
+     */
+    config?: string | CSpellConfigFile;
 }
 export interface TraceOptions extends BaseOptions {
     stdin?: boolean;
@@ -134,6 +139,7 @@ export interface SuggestionOptions extends BaseOptions {
 export interface LegacyOptions {
     local?: string;
 }
+export type LegacyFixes = Pick<BaseOptions, 'locale'>;
 export interface BaseOptions {
     /**
      * Path to configuration file.
@@ -236,5 +242,9 @@ export interface LinterCliOptions extends LinterOptions {
      */
     issueTemplate?: string;
 }
-export declare function fixLegacy<T extends BaseOptions>(opts: T & LegacyOptions): Omit<T & LegacyOptions, 'local'>;
+export declare function fixLegacy<T extends LegacyFixes>(opts: T & LegacyOptions): Omit<T & LegacyOptions, 'local'>;
+export interface CSpellConfigFile {
+    url: URL;
+    settings: CSpellSettings;
+}
 //# sourceMappingURL=options.d.ts.map

package/dist/esm/pkgInfo.d.ts

@@ -1,6 +1,6 @@
 export { pkgDir } from './dirname.js';
 export declare const name = "cspell";
-export declare const version = "8.15.1";
+export declare const version = "8.15.2";
 export declare const engines: {
     node: string;
 };

package/dist/esm/pkgInfo.js

@@ -1,7 +1,7 @@
 // This file is generated by tools/patch-version.mjs
 export { pkgDir } from './dirname.js';
 export const name = 'cspell';
-export const version = '8.15.1';
+export const version = '8.15.2';
 export const engines = { node: '>=18' };
 export const npmPackage = { name, version, engines };
 //# sourceMappingURL=pkgInfo.js.map

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

@@ -1,6 +1,7 @@
 import type { BufferEncoding } from 'cspell-io';
 import type { CSpellUserSettings, Document, Issue } from 'cspell-lib';
 import * as cspell from 'cspell-lib';
+import { CSpellConfigFile } from '../options.js';
 import type { GlobOptions } from './glob.js';
 export interface ConfigInfo {
     source: string;
@@ -12,7 +13,8 @@ export interface FileConfigInfo {
     text: string;
     languageIds: string[];
 }
-export declare function readConfig(configFile: string | undefined, root: string | undefined): Promise<ConfigInfo>;
+export declare function readConfig(configFile: string | CSpellConfigFile | undefined, root: string | undefined): Promise<ConfigInfo>;
+export declare function readConfigFile(filename: string | URL): Promise<CSpellConfigFile>;
 export interface FileInfo {
     filename: string;
     text?: string;
@@ -30,7 +32,7 @@ export interface FileResult {
     cached?: boolean;
 }
 export declare function fileInfoToDocument(fileInfo: FileInfo, languageId: string | undefined, locale: string | undefined): Document;
-export declare function filenameToUrl(filename: string, cwd?: string): URL;
+export declare function filenameToUrl(filename: string | URL, cwd?: string): URL;
 export declare function filenameToUri(filename: string, cwd?: string): URL;
 export declare function isBinaryFile(filename: string, cwd?: string): boolean;
 export interface ReadFileInfoResult extends FileInfo {

package/dist/esm/util/fileHelper.js

@@ -1,7 +1,7 @@
 import { promises as fsp } from 'node:fs';
 import * as path from 'node:path';
 import { fileURLToPath, pathToFileURL } from 'node:url';
-import { toFileDirURL, toFileURL } from '@cspell/url';
+import { toFileDirURL, toFilePathOrHref, toFileURL } from '@cspell/url';
 import { readFileText as cioReadFile, toURL } from 'cspell-io';
 import * as cspell from 'cspell-lib';
 import { fileToDocument, isBinaryFile as isUriBinaryFile } from 'cspell-lib';
@@ -15,12 +15,31 @@ import { isStdinUrl, resolveStdinUrl } from './stdinUrl.js';
 import { clean } from './util.js';
 export async function readConfig(configFile, root) {
     if (configFile) {
-        const config = (await cspell.loadConfig(configFile)) || {};
-        return { source: configFile, config };
+        const cfgFile = typeof configFile === 'string' ? await readConfigHandleError(configFile) : configFile;
+        const config = await cspell.resolveConfigFileImports(cfgFile);
+        const source = toFilePathOrHref(cfgFile.url);
+        return { source, config };
     }
     const config = await cspell.searchForConfig(root);
     return { source: config?.__importRef?.filename || 'None found', config: config || {} };
 }
+export function readConfigFile(filename) {
+    return cspell.readConfigFile(filename);
+}
+async function readConfigHandleError(filename) {
+    try {
+        return await readConfigFile(filename);
+    }
+    catch (e) {
+        const settings = {
+            __importRef: {
+                filename: filename.toString(),
+                error: e,
+            },
+        };
+        return { url: filenameToUrl(filename), settings };
+    }
+}
 export function fileInfoToDocument(fileInfo, languageId, locale) {
     const { filename, text } = fileInfo;
     languageId = languageId || undefined;
@@ -37,6 +56,8 @@ export function fileInfoToDocument(fileInfo, languageId, locale) {
     return fileToDocument(uri.href, text, languageId, locale);
 }
 export function filenameToUrl(filename, cwd = '.') {
+    if (filename instanceof URL)
+        return filename;
     const cwdURL = toFileDirURL(cwd);
     if (filename === STDIN)
         return new URL('stdin:///');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cspell",
-  "version": "8.15.1",
+  "version": "8.15.2",
   "description": "A Spelling Checker for Code!",
   "funding": "https://github.com/streetsidesoftware/cspell?sponsor=1",
   "bin": {
@@ -81,19 +81,19 @@
   },
   "homepage": "https://cspell.org/",
   "dependencies": {
-    "@cspell/cspell-json-reporter": "8.15.1",
-    "@cspell/cspell-pipe": "8.15.1",
-    "@cspell/cspell-types": "8.15.1",
-    "@cspell/dynamic-import": "8.15.1",
-    "@cspell/url": "8.15.1",
+    "@cspell/cspell-json-reporter": "8.15.2",
+    "@cspell/cspell-pipe": "8.15.2",
+    "@cspell/cspell-types": "8.15.2",
+    "@cspell/dynamic-import": "8.15.2",
+    "@cspell/url": "8.15.2",
     "chalk": "^5.3.0",
     "chalk-template": "^1.1.0",
     "commander": "^12.1.0",
-    "cspell-dictionary": "8.15.1",
-    "cspell-gitignore": "8.15.1",
-    "cspell-glob": "8.15.1",
-    "cspell-io": "8.15.1",
-    "cspell-lib": "8.15.1",
+    "cspell-dictionary": "8.15.2",
+    "cspell-gitignore": "8.15.2",
+    "cspell-glob": "8.15.2",
+    "cspell-io": "8.15.2",
+    "cspell-lib": "8.15.2",
     "fast-json-stable-stringify": "^2.1.0",
     "file-entry-cache": "^9.1.0",
     "get-stdin": "^9.0.0",
@@ -111,5 +111,5 @@
     "micromatch": "^4.0.8",
     "minimatch": "^9.0.5"
   },
-  "gitHead": "6a99d22627f0e360fcfc5b98afa670464ec763f6"
+  "gitHead": "63f8b976a0711780646f63283cf4f0457db740ee"
 }