cspell 5.19.4 → 5.19.5

package/dist/application.js

@@ -43,11 +43,13 @@ 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 config = (0, cspell_lib_1.mergeSettings)((0, cspell_lib_1.getDefaultSettings)(), (0, cspell_lib_1.getGlobalSettings)(), configFile.config);
+    const loadDefault = (_b = (_a = options.defaultConfiguration) !== null && _a !== void 0 ? _a : configFile.config.loadDefaultConfiguration) !== null && _b !== void 0 ? _b : 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 });
 }
 exports.trace = trace;
@@ -58,6 +60,7 @@ async function checkText(filename, options) {
     const settingsFromCommandLine = util.clean({
         languageId: options.languageId || undefined,
         language: options.locale || options.local || undefined,
+        loadDefaultConfiguration: options.defaultConfiguration,
     });
     const info = (0, fileHelper_1.calcFinalConfigInfo)(foundSettings, settingsFromCommandLine, filename, text);
     return (0, cspell_lib_1.checkText)(text, info.configInfo.config);

package/dist/commandCheck.js

@@ -24,6 +24,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.commandCheck = void 0;
+const commander_1 = require("commander");
 const App = __importStar(require("./application"));
 const application_1 = require("./application");
 const errors_1 = require("./util/errors");
@@ -35,6 +36,8 @@ function commandCheck(prog) {
         .option('-c, --config <cspell.json>', 'Configuration file to use.  By default cspell looks for cspell.json in the current directory.')
         .option('--no-color', 'Turn off color.')
         .option('--color', 'Force color')
+        .addOption(new commander_1.Option('--default-configuration', 'Load the default configuration and dictionaries.').hideHelp())
+        .addOption(new commander_1.Option('--no-default-configuration', 'Do not load the default configuration and dictionaries.'))
         .action(async (files, options) => {
         let issueCount = 0;
         for (const filename of files) {

package/dist/commandLint.js

@@ -92,6 +92,8 @@ function commandLint(prog) {
         .option('--gitignore-root <path>', 'Prevent searching for .gitignore files past root.', collect)
         .option('--no-color', 'Turn off color.')
         .option('--color', 'Force color.')
+        .addOption(new commander_1.Option('--default-configuration', 'Load the default configuration and dictionaries.').hideHelp())
+        .addOption(new commander_1.Option('--no-default-configuration', 'Do not load the default configuration and dictionaries.'))
         .option('--debug', 'Output information useful for debugging cspell.json files.')
         .addHelpText('after', usage)
         .arguments('[globs...]')

package/dist/commandTrace.js

@@ -43,6 +43,8 @@ function commandTrace(prog) {
         .option('--stdin', 'Read words from stdin.')
         .option('--no-color', 'Turn off color.')
         .option('--color', 'Force color')
+        .addOption(new commander_1.Option('--default-configuration', 'Load the default configuration and dictionaries.').hideHelp())
+        .addOption(new commander_1.Option('--no-default-configuration', 'Do not load the default configuration and dictionaries.'))
         .arguments('[words...]')
         .action(async (words, options) => {
         let numFound = 0;

package/dist/lint/lint.js

@@ -51,7 +51,7 @@ async function runLint(cfg) {
     await reporter.result(lintResult);
     return lintResult;
     async function processFile(filename, configInfo, cache) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
         const getElapsedTimeMs = (0, timer_1.getTimeMeasurer)();
         const cachedResult = await cache.getCachedLintResults(filename);
         if (cachedResult) {
@@ -79,10 +79,9 @@ async function runLint(cfg) {
         }
         const doc = (0, fileHelper_1.fileInfoToDocument)(fileInfo, cfg.options.languageId, cfg.locale);
         const { text } = fileInfo;
-        reporter.debug(`Filename: ${filename}, LanguageIds: ${(_a = doc.languageId) !== null && _a !== void 0 ? _a : 'default'}`);
         result.fileInfo = fileInfo;
         let spellResult = {};
-        reporter.info(`Checking: ${filename}, File type: ${(_b = doc.languageId) !== null && _b !== void 0 ? _b : 'auto'}, Language: ${(_c = doc.locale) !== null && _c !== void 0 ? _c : 'default'}`, cspell_types_1.MessageTypes.Info);
+        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);
         try {
             const validateOptions = { generateSuggestions: cfg.options.showSuggestions, numSuggestions: 5 };
             const r = await cspell.spellCheckDocument(doc, validateOptions, configInfo.config);
@@ -95,18 +94,23 @@ async function runLint(cfg) {
             result.errors += 1;
         }
         result.elapsedTimeMs = getElapsedTimeMs();
-        const config = (_d = spellResult.settingsUsed) !== null && _d !== void 0 ? _d : {};
+        const config = (_c = spellResult.settingsUsed) !== null && _c !== void 0 ? _c : {};
         result.configErrors += await reportConfigurationErrors(config);
-        if (cfg.options.debug) {
-            const { id: _id, name: _name, ...cfg } = config;
-            const debugCfg = { config: { ...cfg, source: null }, source: spellResult.localConfigFilepath };
-            reporter.debug(JSON.stringify(debugCfg, undefined, 2));
-        }
         const elapsed = result.elapsedTimeMs / 1000.0;
         const dictionaries = config.dictionaries || [];
         reporter.info(`Checked: ${filename}, File type: ${config.languageId}, Language: ${config.language} ... Issues: ${result.issues.length} ${elapsed}S`, cspell_types_1.MessageTypes.Info);
         reporter.info(`Config file Used: ${spellResult.localConfigFilepath || configInfo.source}`, cspell_types_1.MessageTypes.Info);
         reporter.info(`Dictionaries Used: ${dictionaries.join(', ')}`, cspell_types_1.MessageTypes.Info);
+        if (cfg.options.debug) {
+            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',
+                config: { ...cfg, source: null },
+                source: spellResult.localConfigFilepath,
+            };
+            reporter.debug(JSON.stringify(debugCfg, undefined, 2));
+        }
         const dep = calcDependencies(config);
         cache.setCachedLintResults(result, dep.files);
         return result;
@@ -207,6 +211,9 @@ async function runLint(cfg) {
             process.env[cspell.ENV_CSPELL_GLOB_ROOT] = cfg.root;
         }
         const configInfo = await (0, fileHelper_1.readConfig)(cfg.configFile, cfg.root);
+        if (cfg.options.defaultConfiguration !== undefined) {
+            configInfo.config.loadDefaultConfiguration = cfg.options.defaultConfiguration;
+        }
         reporter = (0, reporters_1.mergeReporters)(cfg.reporter, ...(0, reporters_1.loadReporters)(configInfo.config));
         cspell.setLogger(getLoggerFromReporter(reporter));
         const globInfo = await determineGlobs(configInfo, cfg);

package/dist/options.d.ts

@@ -119,6 +119,11 @@ export interface BaseOptions {
      * Locale to use.
      */
     locale?: string;
+    /**
+     * Load the default configuration
+     * @default true
+     */
+    defaultConfiguration?: boolean;
 }
 export interface LinterCliOptions extends Omit<LinterOptions, 'fileLists'> {
     legacy?: boolean;

package/dist/util/fileHelper.js

@@ -92,9 +92,11 @@ 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 settings = cspell.mergeSettings(cspell.getDefaultSettings(), cspell.getGlobalSettings(), fileSettings, settingsFromCommandLine);
+    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 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);
     return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cspell",
-  "version": "5.19.4",
+  "version": "5.19.5",
   "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": "^5.19.4",
+    "@cspell/cspell-pipe": "^5.19.5",
     "chalk": "^4.1.2",
     "commander": "^9.1.0",
-    "cspell-gitignore": "^5.19.4",
-    "cspell-glob": "^5.19.4",
-    "cspell-lib": "^5.19.4",
+    "cspell-gitignore": "^5.19.5",
+    "cspell-glob": "^5.19.5",
+    "cspell-lib": "^5.19.5",
     "fast-json-stable-stringify": "^2.1.0",
     "file-entry-cache": "^6.0.1",
     "fs-extra": "^10.0.1",
@@ -90,8 +90,8 @@
     "node": ">=12.13.0"
   },
   "devDependencies": {
-    "@cspell/cspell-json-reporter": "^5.19.4",
-    "@cspell/cspell-types": "^5.19.4",
+    "@cspell/cspell-json-reporter": "^5.19.5",
+    "@cspell/cspell-types": "^5.19.5",
     "@types/file-entry-cache": "^5.0.2",
     "@types/fs-extra": "^9.0.13",
     "@types/glob": "^7.2.0",
@@ -106,5 +106,5 @@
     "rollup": "^2.70.1",
     "rollup-plugin-dts": "^4.2.0"
   },
-  "gitHead": "9f7e77c95eb1e8fabf53c5b74b7418b2d114ef02"
+  "gitHead": "0d113f01b51c3bc149a01269878d4217a58ecb97"
 }