cspell 6.1.2 → 6.1.3

package/dist/application.js

@@ -43,12 +43,11 @@ function lint(fileGlobs, options, emitters) {
 }
 exports.lint = lint;
 async function* trace(words, options) {
-    var _a, _b;
     options = (0, options_1.fixLegacy)(options);
     const iWords = options.stdin ? (0, cspell_pipe_1.toAsyncIterable)(words, (0, stdin_1.readStdin)()) : words;
     const { languageId, locale, allowCompoundWords, ignoreCase } = options;
     const configFile = await (0, fileHelper_1.readConfig)(options.config, undefined);
-    const loadDefault = (_b = (_a = options.defaultConfiguration) !== null && _a !== void 0 ? _a : configFile.config.loadDefaultConfiguration) !== null && _b !== void 0 ? _b : true;
+    const loadDefault = options.defaultConfiguration ?? configFile.config.loadDefaultConfiguration ?? true;
     const config = (0, cspell_lib_1.mergeSettings)((0, cspell_lib_1.getDefaultSettings)(loadDefault), (0, cspell_lib_1.getGlobalSettings)(), configFile.config);
     yield* (0, cspell_lib_1.traceWordsAsync)(iWords, config, { languageId, locale, ignoreCase, allowCompoundWords });
 }
@@ -78,7 +77,7 @@ async function* suggestions(words, options) {
         return v;
     }
     function mapEnd(v) {
-        const elapsedTimeMs = timer === null || timer === void 0 ? void 0 : timer();
+        const elapsedTimeMs = timer?.();
         return { ...v, elapsedTimeMs };
     }
     const iWords = options.repl

package/dist/cli-reporter.js

@@ -117,8 +117,7 @@ function getReporter(options) {
         Warning: (s) => console.info(chalk.yellow(s)),
     };
     function infoEmitter(message, msgType) {
-        var _a;
-        (_a = emitters[msgType]) === null || _a === void 0 ? void 0 : _a.call(emitters, message);
+        emitters[msgType]?.(message);
     }
     const root = vscode_uri_1.URI.file(options.root || process.cwd());
     const fsPathRoot = root.fsPath;
@@ -153,7 +152,6 @@ function getReporter(options) {
 }
 exports.getReporter = getReporter;
 function formatIssue(templateStr, issue, maxIssueTextWidth) {
-    var _a;
     function clean(t) {
         return t.replace(/\s+/, ' ');
     }
@@ -165,7 +163,7 @@ function formatIssue(templateStr, issue, maxIssueTextWidth) {
     const rowText = row.toString();
     const colText = col.toString();
     const padRowCol = ' '.repeat(Math.max(1, 8 - (rowText.length + colText.length)));
-    const suggestions = ((_a = issue.suggestions) === null || _a === void 0 ? void 0 : _a.join(', ')) || '';
+    const suggestions = issue.suggestions?.join(', ') || '';
     const message = issue.isFlagged ? '{yellow Forbidden word}' : 'Unknown word';
     const substitutions = {
         $col: colText,

package/dist/commandSuggestion.js

@@ -39,8 +39,7 @@ function count(_, previous) {
     return (previous || 0) + 1;
 }
 function asNumber(value, prev) {
-    var _a;
-    return (_a = parseInt(value, 10)) !== null && _a !== void 0 ? _a : prev;
+    return parseInt(value, 10) ?? prev;
 }
 function commandSuggestion(prog) {
     const suggestionCommand = prog.command('suggestions');

package/dist/commandTrace.js

@@ -51,7 +51,7 @@ function commandTrace(prog) {
         for await (const results of App.trace(words, options)) {
             (0, traceEmitter_1.emitTraceResults)(results, { cwd: process.cwd() });
             numFound += results.reduce((n, r) => n + (r.found ? 1 : 0), 0);
-            const numErrors = results.map((r) => { var _a; return ((_a = r.errors) === null || _a === void 0 ? void 0 : _a.length) || 0; }).reduce((n, r) => n + r, 0);
+            const numErrors = results.map((r) => r.errors?.length || 0).reduce((n, r) => n + r, 0);
             if (numErrors) {
                 console.error('Dictionary Errors.');
                 throw new errors_1.CheckFailed('dictionary errors', 1);

package/dist/emitters/traceEmitter.js

@@ -33,14 +33,13 @@ const util_1 = require("../util/util");
 const chalk = require("chalk");
 const colWidthDictionaryName = 20;
 function emitTraceResults(results, options) {
-    var _a;
     const maxWordLength = results
         .map((r) => r.foundWord || r.word)
         .reduce((a, b) => Math.max(a, (0, util_1.width)(b)), 'Word'.length);
     const cols = {
         word: maxWordLength,
         dictName: colWidthDictionaryName,
-        terminalWidth: (_a = options.lineWidth) !== null && _a !== void 0 ? _a : (process.stdout.columns || 120),
+        terminalWidth: options.lineWidth ?? (process.stdout.columns || 120),
     };
     const col = new Intl.Collator();
     results.sort((a, b) => col.compare(a.dictName, b.dictName));
@@ -58,9 +57,8 @@ function emitHeader(colWidths) {
     console.log(chalk.underline(line.join(' ').slice(0, colWidths.terminalWidth)));
 }
 function emitTraceResult(r, colWidths, options) {
-    var _a, _b;
     const { word: wordColWidth, terminalWidth, dictName: widthName } = colWidths;
-    const errors = ((_b = (_a = r.errors) === null || _a === void 0 ? void 0 : _a.map((e) => e.message)) === null || _b === void 0 ? void 0 : _b.join('\n\t')) || '';
+    const errors = r.errors?.map((e) => e.message)?.join('\n\t') || '';
     const word = (0, util_1.pad)(r.foundWord || r.word, wordColWidth);
     const cWord = word.replace(/[+]/g, chalk.yellow('+'));
     const w = r.forbidden ? chalk.red(cWord) : chalk.green(cWord);
@@ -90,8 +88,7 @@ function trimMid(s, w) {
     return s.slice(0, l) + '...' + s.slice(-r);
 }
 function calcFoundChar(r) {
-    var _a, _b;
-    const errors = ((_b = (_a = r.errors) === null || _a === void 0 ? void 0 : _a.map((e) => e.message)) === null || _b === void 0 ? void 0 : _b.join('\n\t')) || '';
+    const errors = r.errors?.map((e) => e.message)?.join('\n\t') || '';
     let color = chalk.dim;
     color = r.found ? chalk.whiteBright : color;
     color = r.forbidden ? chalk.red : color;

package/dist/link.js

@@ -13,13 +13,12 @@ function listGlobalImportsResultToTable(results) {
     const header = ['id', 'package', 'name', 'filename', 'dictionaries', 'errors'];
     const decorate = (isError) => (isError ? (s) => chalk_1.default.red(s) : (s) => s);
     function toColumns(r) {
-        var _a, _b;
         return [
             r.id,
-            (_a = r.package) === null || _a === void 0 ? void 0 : _a.name,
+            r.package?.name,
             r.name,
             r.filename,
-            (_b = r.dictionaryDefinitions) === null || _b === void 0 ? void 0 : _b.map((def) => def.name).join(', '),
+            r.dictionaryDefinitions?.map((def) => def.name).join(', '),
             r.error ? 'Failed to read file.' : '',
         ]
             .map((c) => c || '')

package/dist/lint/lint.js

@@ -52,7 +52,6 @@ async function runLint(cfg) {
     await reporter.result(lintResult);
     return lintResult;
     async function processFile(filename, configInfo, cache) {
-        var _a, _b, _c, _d, _e;
         const getElapsedTimeMs = (0, timer_1.getTimeMeasurer)();
         const cachedResult = await cache.getCachedLintResults(filename);
         if (cachedResult) {
@@ -82,7 +81,7 @@ async function runLint(cfg) {
         const { text } = fileInfo;
         result.fileInfo = fileInfo;
         let spellResult = {};
-        reporter.info(`Checking: ${filename}, File type: ${(_a = doc.languageId) !== null && _a !== void 0 ? _a : 'auto'}, Language: ${(_b = doc.locale) !== null && _b !== void 0 ? _b : 'default'}`, cspell_types_1.MessageTypes.Info);
+        reporter.info(`Checking: ${filename}, File type: ${doc.languageId ?? 'auto'}, Language: ${doc.locale ?? 'default'}`, cspell_types_1.MessageTypes.Info);
         try {
             const validateOptions = { generateSuggestions: cfg.options.showSuggestions, numSuggestions: 5 };
             const r = await cspell.spellCheckDocument(doc, validateOptions, configInfo.config);
@@ -95,7 +94,7 @@ async function runLint(cfg) {
             result.errors += 1;
         }
         result.elapsedTimeMs = getElapsedTimeMs();
-        const config = (_c = spellResult.settingsUsed) !== null && _c !== void 0 ? _c : {};
+        const config = spellResult.settingsUsed ?? {};
         result.configErrors += await reportConfigurationErrors(config);
         const elapsed = result.elapsedTimeMs / 1000.0;
         const dictionaries = config.dictionaries || [];
@@ -106,7 +105,7 @@ async function runLint(cfg) {
             const { id: _id, name: _name, __imports, __importRef, ...cfg } = config;
             const debugCfg = {
                 filename,
-                languageId: (_e = (_d = doc.languageId) !== null && _d !== void 0 ? _d : cfg.languageId) !== null && _e !== void 0 ? _e : 'default',
+                languageId: doc.languageId ?? cfg.languageId ?? 'default',
                 config: { ...cfg, source: null },
                 source: spellResult.localConfigFilepath,
             };
@@ -123,14 +122,13 @@ async function runLint(cfg) {
         return { ...tdo, context };
     }
     async function processFiles(files, configInfo, cacheSettings) {
-        var _a, _b;
         const fileCount = files instanceof Array ? files.length : undefined;
         const status = runResult();
         const cache = (0, cache_1.createCache)(cacheSettings);
         if (cfg.options.cacheReset) {
             cache.reset();
         }
-        const failFast = (_b = (_a = cfg.options.failFast) !== null && _a !== void 0 ? _a : configInfo.config.failFast) !== null && _b !== void 0 ? _b : false;
+        const failFast = cfg.options.failFast ?? configInfo.config.failFast ?? false;
         const emitProgressBegin = (filename, fileNum, fileCount) => reporter.progress({
             type: 'ProgressFileBegin',
             fileNum,
@@ -142,16 +140,16 @@ async function runLint(cfg) {
             fileNum,
             fileCount,
             filename,
-            elapsedTimeMs: result === null || result === void 0 ? void 0 : result.elapsedTimeMs,
-            processed: result === null || result === void 0 ? void 0 : result.processed,
-            numErrors: (result === null || result === void 0 ? void 0 : result.issues.length) || (result === null || result === void 0 ? void 0 : result.errors),
-            cached: result === null || result === void 0 ? void 0 : result.cached,
+            elapsedTimeMs: result?.elapsedTimeMs,
+            processed: result?.processed,
+            numErrors: result?.issues.length || result?.errors,
+            cached: result?.cached,
         });
         async function* loadAndProcessFiles() {
             let i = 0;
             for await (const filename of files) {
                 ++i;
-                emitProgressBegin(filename, i, fileCount !== null && fileCount !== void 0 ? fileCount : i);
+                emitProgressBegin(filename, i, fileCount ?? i);
                 const result = await processFile(filename, configInfo, cache);
                 yield { filename, fileNum: i, result };
             }
@@ -160,7 +158,7 @@ async function runLint(cfg) {
             const { filename, fileNum, result } = await fileP;
             status.files += 1;
             status.cachedFiles = (status.cachedFiles || 0) + (result.cached ? 1 : 0);
-            emitProgressComplete(filename, fileNum, fileCount !== null && fileCount !== void 0 ? fileCount : fileNum, result);
+            emitProgressComplete(filename, fileNum, fileCount ?? fileNum, result);
             // Show the spelling errors after emitting the progress.
             result.issues.filter(cfg.uniqueFilter).forEach((issue) => reporter.issue(issue));
             if (result.issues.length || result.errors) {
@@ -193,8 +191,7 @@ async function runLint(cfg) {
         });
         const dictCollection = await cspell.getDictionary(config);
         dictCollection.dictionaries.forEach((dict) => {
-            var _a;
-            const dictErrors = ((_a = dict.getErrors) === null || _a === void 0 ? void 0 : _a.call(dict)) || [];
+            const dictErrors = dict.getErrors?.() || [];
             const msg = `Dictionary Error with (${dict.name})`;
             dictErrors.forEach((error) => {
                 const key = msg + error.toString();
@@ -269,9 +266,8 @@ function checkGlobs(globs, reporter) {
         .forEach((glob) => reporter.error('Linter', new errors_1.CheckFailed(`Glob starting or ending with ' (single quote) is not likely to match any files: ${glob}.`)));
 }
 async function determineGlobs(configInfo, cfg) {
-    var _a, _b, _c;
-    const useGitignore = (_b = (_a = cfg.options.gitignore) !== null && _a !== void 0 ? _a : configInfo.config.useGitignore) !== null && _b !== void 0 ? _b : false;
-    const gitignoreRoots = (_c = cfg.options.gitignoreRoot) !== null && _c !== void 0 ? _c : configInfo.config.gitignoreRoot;
+    const useGitignore = cfg.options.gitignore ?? configInfo.config.useGitignore ?? false;
+    const gitignoreRoots = cfg.options.gitignoreRoot ?? configInfo.config.gitignoreRoot;
     const gitIgnore = useGitignore ? await generateGitIgnore(gitignoreRoots) : undefined;
     const cliGlobs = cfg.fileGlobs;
     const allGlobs = cliGlobs.length ? cliGlobs : configInfo.config.files || [];
@@ -285,7 +281,6 @@ async function determineGlobs(configInfo, cfg) {
 }
 async function determineFilesToCheck(configInfo, cfg, reporter, globInfo) {
     async function _determineFilesToCheck() {
-        var _a;
         const { fileLists } = cfg;
         const hasFileLists = !!fileLists.length;
         const { allGlobs, gitIgnore, fileGlobs, excludeGlobs, normalizedExcludes } = globInfo;
@@ -301,7 +296,7 @@ async function determineFilesToCheck(configInfo, cfg, reporter, globInfo) {
             ignore: ignoreGlobs.concat(normalizedExcludes),
             nodir: true,
         };
-        const enableGlobDot = (_a = cfg.enableGlobDot) !== null && _a !== void 0 ? _a : configInfo.config.enableGlobDot;
+        const enableGlobDot = cfg.enableGlobDot ?? configInfo.config.enableGlobDot;
         if (enableGlobDot !== undefined) {
             globOptions.dot = enableGlobDot;
         }
@@ -403,12 +398,12 @@ function getLoggerFromReporter(reporter) {
 }
 async function generateGitIgnore(roots) {
     const root = (typeof roots === 'string' ? [roots].filter((r) => !!r) : roots) || [];
-    if (!(root === null || root === void 0 ? void 0 : root.length)) {
+    if (!root?.length) {
         const cwd = process.cwd();
         const repo = (await (0, cspell_gitignore_1.findRepoRoot)(cwd)) || cwd;
         root.push(repo);
     }
-    return new cspell_gitignore_1.GitIgnore(root === null || root === void 0 ? void 0 : root.map((p) => path.resolve(p)));
+    return new cspell_gitignore_1.GitIgnore(root?.map((p) => path.resolve(p)));
 }
 async function useFileLists(fileListFiles, includeGlobPatterns, root, dot) {
     includeGlobPatterns = includeGlobPatterns.length ? includeGlobPatterns : ['**'];

package/dist/util/cache/DiskCache.js

@@ -58,9 +58,9 @@ class DiskCache {
     async getCachedLintResults(filename) {
         const fileDescriptor = this.fileEntryCache.getFileDescriptor(filename);
         const meta = fileDescriptor.meta;
-        const data = meta === null || meta === void 0 ? void 0 : meta.data;
-        const result = data === null || data === void 0 ? void 0 : data.r;
-        const versionMatches = this.version === (data === null || data === void 0 ? void 0 : data.v);
+        const data = meta?.data;
+        const result = data?.r;
+        const versionMatches = this.version === data?.v;
         // Cached lint results are valid if and only if:
         // 1. The file is present in the filesystem
         // 2. The file has not changed since the time it was previously linted
@@ -124,7 +124,7 @@ class DiskCache {
     calcDependencyHashes(dependsUponFiles) {
         dependsUponFiles.sort();
         const c = getTreeEntry(this.dependencyCacheTree, dependsUponFiles);
-        if (c === null || c === void 0 ? void 0 : c.d) {
+        if (c?.d) {
             return c.d;
         }
         const dependencies = dependsUponFiles.map((f) => this.getDependency(f));
@@ -179,10 +179,9 @@ class DiskCache {
 }
 exports.DiskCache = DiskCache;
 function getTreeEntry(tree, keys) {
-    var _a;
     let r = tree;
     for (const k of keys) {
-        r = (_a = r.c) === null || _a === void 0 ? void 0 : _a.get(k);
+        r = r.c?.get(k);
         if (!r)
             return r;
     }
@@ -196,7 +195,7 @@ function setTreeEntry(tree, deps, update = false) {
             r.c = new Map();
         }
         const cn = r.c.get(k);
-        const n = cn !== null && cn !== void 0 ? cn : {};
+        const n = cn ?? {};
         if (!cn) {
             r.c.set(k, n);
         }

package/dist/util/cache/ObjectCollection.js

@@ -62,10 +62,9 @@ exports.Collection = Collection;
 function addToCollection(root, v) {
     const known = root.contains;
     function addValToCol(c, v) {
-        var _a;
         const t = toValueType(v);
         const val = c.v || Object.create(null);
-        const r = (_a = val[t]) !== null && _a !== void 0 ? _a : v;
+        const r = val[t] ?? v;
         val[t] = r;
         c.v = val;
         return val[t];

package/dist/util/cache/createCache.js

@@ -24,11 +24,10 @@ function createCache(options) {
 }
 exports.createCache = createCache;
 async function calcCacheSettings(config, cacheOptions, root) {
-    var _a, _b, _c, _d, _e, _f, _g;
-    const cs = (_a = config.cache) !== null && _a !== void 0 ? _a : {};
-    const useCache = (_c = (_b = cacheOptions.cache) !== null && _b !== void 0 ? _b : cs.useCache) !== null && _c !== void 0 ? _c : false;
-    const cacheLocation = await resolveCacheLocation(path_1.default.resolve(root, (_e = (_d = cacheOptions.cacheLocation) !== null && _d !== void 0 ? _d : cs.cacheLocation) !== null && _e !== void 0 ? _e : exports.DEFAULT_CACHE_LOCATION));
-    const cacheStrategy = (_g = (_f = cacheOptions.cacheStrategy) !== null && _f !== void 0 ? _f : cs.cacheStrategy) !== null && _g !== void 0 ? _g : 'metadata';
+    const cs = config.cache ?? {};
+    const useCache = cacheOptions.cache ?? cs.useCache ?? false;
+    const cacheLocation = await resolveCacheLocation(path_1.default.resolve(root, cacheOptions.cacheLocation ?? cs.cacheLocation ?? exports.DEFAULT_CACHE_LOCATION));
+    const cacheStrategy = cacheOptions.cacheStrategy ?? cs.cacheStrategy ?? 'metadata';
     return {
         useCache,
         cacheLocation,

package/dist/util/errors.js

@@ -54,7 +54,7 @@ function toApplicationError(e, message) {
     if (e instanceof ApplicationError && !message)
         return e;
     const err = toError(e);
-    return new ApplicationError(message !== null && message !== void 0 ? message : err.message, undefined, err);
+    return new ApplicationError(message ?? err.message, undefined, err);
 }
 exports.toApplicationError = toApplicationError;
 //# sourceMappingURL=errors.js.map

package/dist/util/fileHelper.js

@@ -39,13 +39,12 @@ const stdin_1 = require("./stdin");
 const UTF8 = 'utf8';
 const STDIN = 'stdin';
 async function readConfig(configFile, root) {
-    var _a;
     if (configFile) {
         const config = (await cspell.loadConfig(configFile)) || {};
         return { source: configFile, config };
     }
     const config = await cspell.searchForConfig(root);
-    return { source: ((_a = config === null || config === void 0 ? void 0 : config.__importRef) === null || _a === void 0 ? void 0 : _a.filename) || 'None found', config: config || {} };
+    return { source: config?.__importRef?.filename || 'None found', config: config || {} };
 }
 exports.readConfig = readConfig;
 function fileInfoToDocument(fileInfo, languageId, locale) {
@@ -92,10 +91,12 @@ async function findFiles(globPatterns, options) {
 }
 exports.findFiles = findFiles;
 function calcFinalConfigInfo(configInfo, settingsFromCommandLine, filename, text) {
-    var _a, _b, _c;
     const ext = path.extname(filename);
     const fileSettings = cspell.calcOverrideSettings(configInfo.config, path.resolve(filename));
-    const loadDefault = (_c = (_b = (_a = settingsFromCommandLine.loadDefaultConfiguration) !== null && _a !== void 0 ? _a : configInfo.config.loadDefaultConfiguration) !== null && _b !== void 0 ? _b : fileSettings.loadDefaultConfiguration) !== null && _c !== void 0 ? _c : true;
+    const loadDefault = settingsFromCommandLine.loadDefaultConfiguration ??
+        configInfo.config.loadDefaultConfiguration ??
+        fileSettings.loadDefaultConfiguration ??
+        true;
     const settings = cspell.mergeSettings(cspell.getDefaultSettings(loadDefault), cspell.getGlobalSettings(), fileSettings, settingsFromCommandLine);
     const languageIds = settings.languageId ? [settings.languageId] : cspell.getLanguagesForExt(ext);
     const config = cspell.constructSettingsForText(settings, text, languageIds);

package/dist/util/glob.js

@@ -39,7 +39,7 @@ const useJoinPatterns = process.env['CSPELL_SINGLE_GLOB'];
  * @param options - search options.
  */
 async function globP(pattern, options) {
-    const root = (options === null || options === void 0 ? void 0 : options.root) || process.cwd();
+    const root = options?.root || process.cwd();
     const opts = options || { root };
     const rawPatterns = typeof pattern === 'string' ? [pattern] : pattern;
     const normPatterns = useJoinPatterns ? joinPatterns(rawPatterns) : rawPatterns;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cspell",
-  "version": "6.1.2",
+  "version": "6.1.3",
   "description": "A Spelling Checker for Code!",
   "funding": "https://github.com/streetsidesoftware/cspell?sponsor=1",
   "main": "dist/index.js",
@@ -70,12 +70,12 @@
   },
   "homepage": "https://streetsidesoftware.github.io/cspell/",
   "dependencies": {
-    "@cspell/cspell-pipe": "^6.1.2",
+    "@cspell/cspell-pipe": "^6.1.3",
     "chalk": "^4.1.2",
     "commander": "^9.3.0",
-    "cspell-gitignore": "^6.1.2",
-    "cspell-glob": "^6.1.2",
-    "cspell-lib": "^6.1.2",
+    "cspell-gitignore": "^6.1.3",
+    "cspell-glob": "^6.1.3",
+    "cspell-lib": "^6.1.3",
     "fast-json-stable-stringify": "^2.1.0",
     "file-entry-cache": "^6.0.1",
     "fs-extra": "^10.1.0",
@@ -90,21 +90,21 @@
     "node": ">=14"
   },
   "devDependencies": {
-    "@cspell/cspell-json-reporter": "^6.1.2",
-    "@cspell/cspell-types": "^6.1.2",
+    "@cspell/cspell-json-reporter": "^6.1.3",
+    "@cspell/cspell-types": "^6.1.3",
     "@types/file-entry-cache": "^5.0.2",
     "@types/fs-extra": "^9.0.13",
     "@types/glob": "^7.2.0",
     "@types/imurmurhash": "^0.1.1",
     "@types/micromatch": "^4.0.2",
     "@types/minimatch": "^3.0.5",
-    "@types/semver": "^7.3.9",
+    "@types/semver": "^7.3.10",
     "jest": "^28.1.1",
     "micromatch": "^4.0.5",
     "minimatch": "^5.1.0",
     "rimraf": "^3.0.2",
-    "rollup": "^2.75.5",
+    "rollup": "^2.75.7",
     "rollup-plugin-dts": "^4.2.2"
   },
-  "gitHead": "5ef579108a81bf7206cf53e301374467a3bbde06"
+  "gitHead": "e96b313542f2ec0a38ac04d1422d97e724ded3a6"
 }