cspell-lib 5.19.4 → 5.19.7

package/dist/Models/PatternRegExp.d.ts

@@ -0,0 +1,5 @@
+export declare class PatternRegExp extends RegExp {
+    constructor(pattern: RegExp | string);
+    toJSON(): string;
+}
+//# sourceMappingURL=PatternRegExp.d.ts.map

package/dist/Models/PatternRegExp.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PatternRegExp = void 0;
+class PatternRegExp extends RegExp {
+    constructor(pattern) {
+        super(pattern);
+    }
+    toJSON() {
+        return this.toString();
+    }
+}
+exports.PatternRegExp = PatternRegExp;
+//# sourceMappingURL=PatternRegExp.js.map

package/dist/Settings/DefaultSettings.d.ts

@@ -1,4 +1,6 @@
 import { CSpellSettingsInternal } from '../Models/CSpellSettingsInternalDef';
+export declare const _defaultSettingsBasis: Readonly<CSpellSettingsInternal>;
 export declare const _defaultSettings: Readonly<CSpellSettingsInternal>;
-export declare function getDefaultSettings(): CSpellSettingsInternal;
+export declare function getDefaultSettings(useDefaultDictionaries?: boolean): CSpellSettingsInternal;
+export declare function getDefaultBundledSettings(): CSpellSettingsInternal;
 //# sourceMappingURL=DefaultSettings.d.ts.map

package/dist/Settings/DefaultSettings.js

@@ -23,8 +23,9 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDefaultSettings = exports._defaultSettings = void 0;
+exports.getDefaultBundledSettings = exports.getDefaultSettings = exports._defaultSettings = exports._defaultSettingsBasis = void 0;
 const CSpellSettingsInternalDef_1 = require("../Models/CSpellSettingsInternalDef");
+const PatternRegExp_1 = require("../Models/PatternRegExp");
 const resolveFile_1 = require("../util/resolveFile");
 const configLoader_1 = require("./configLoader");
 const index_1 = require("./index");
@@ -34,9 +35,9 @@ const defaultConfigFileModuleRef = '@cspell/cspell-bundled-dicts/cspell-default.
 // Do not use require.resolve because webpack will mess it up.
 const defaultConfigFile = resolveConfigModule(defaultConfigFileModuleRef);
 const regExpSpellCheckerDisable = [
-    RegPat.regExSpellingGuardBlock,
-    RegPat.regExSpellingGuardLine,
-    RegPat.regExSpellingGuardNext,
+    new PatternRegExp_1.PatternRegExp(RegPat.regExSpellingGuardBlock),
+    new PatternRegExp_1.PatternRegExp(RegPat.regExSpellingGuardLine),
+    new PatternRegExp_1.PatternRegExp(RegPat.regExSpellingGuardNext),
 ];
 // cspell:ignore filetypes
 const predefinedPatterns = [
@@ -71,7 +72,7 @@ const predefinedPatterns = [
     { name: 'CStyleComment', pattern: RegPat.regExCStyleComments },
     { name: 'Everything', pattern: '.*' },
 ];
-const defaultRegExpPatterns = [...predefinedPatterns];
+const defaultRegExpPatterns = [...predefinedPatterns].map(normalizePattern);
 const definedDefaultRegExpExcludeList = [
     'SpellCheckerDisable',
     'SpellCheckerIgnoreInDocSetting',
@@ -92,11 +93,28 @@ const definedDefaultRegExpExcludeList = [
 ];
 // This bit of copying is done to have the complier ensure that the defaults exist.
 const defaultRegExpExcludeList = definedDefaultRegExpExcludeList;
-exports._defaultSettings = Object.freeze((0, CSpellSettingsInternalDef_1.createCSpellSettingsInternal)({
+exports._defaultSettingsBasis = Object.freeze((0, CSpellSettingsInternalDef_1.createCSpellSettingsInternal)({
     id: 'static_defaults',
     language: 'en',
     name: 'Static Defaults',
     enabled: true,
+    enabledLanguageIds: [],
+    maxNumberOfProblems: 100,
+    numSuggestions: 10,
+    suggestionsTimeout: 500,
+    suggestionNumChanges: 3,
+    words: [],
+    userWords: [],
+    ignorePaths: [],
+    allowCompoundWords: false,
+    patterns: defaultRegExpPatterns,
+    ignoreRegExpList: [],
+    languageSettings: [],
+    source: { name: 'defaultSettings' },
+    reporters: [],
+}));
+exports._defaultSettings = Object.freeze((0, CSpellSettingsInternalDef_1.createCSpellSettingsInternal)({
+    ...exports._defaultSettingsBasis,
     enabledLanguageIds: [
         'ada',
         'csharp',
@@ -123,23 +141,15 @@ exports._defaultSettings = Object.freeze((0, CSpellSettingsInternalDef_1.createC
         'shellscript',
         'toml',
     ],
-    maxNumberOfProblems: 100,
-    numSuggestions: 10,
-    suggestionsTimeout: 500,
-    suggestionNumChanges: 3,
-    words: [],
-    userWords: [],
-    ignorePaths: [],
-    allowCompoundWords: false,
-    patterns: defaultRegExpPatterns,
     ignoreRegExpList: defaultRegExpExcludeList,
     languageSettings: LanguageSettings.getDefaultLanguageSettings(),
-    source: { name: 'defaultSettings' },
-    reporters: [],
 }));
 const getSettings = (function () {
     let settings = undefined;
-    return function () {
+    return function (useDefaultDictionaries) {
+        if (!useDefaultDictionaries) {
+            return exports._defaultSettingsBasis;
+        }
         if (!settings) {
             const jsonSettings = (0, configLoader_1.readSettings)(defaultConfigFile);
             settings = (0, index_1.mergeSettings)(exports._defaultSettings, jsonSettings);
@@ -156,8 +166,22 @@ const getSettings = (function () {
 function resolveConfigModule(configModuleName) {
     return (0, resolveFile_1.resolveFile)(configModuleName, __dirname).filename;
 }
-function getDefaultSettings() {
-    return getSettings();
+function normalizePattern(pat) {
+    const { name, pattern, description } = pat;
+    if (!(pattern instanceof RegExp))
+        return pat;
+    return {
+        name,
+        pattern: new PatternRegExp_1.PatternRegExp(pattern),
+        description,
+    };
+}
+function getDefaultSettings(useDefaultDictionaries = true) {
+    return getSettings(useDefaultDictionaries);
 }
 exports.getDefaultSettings = getDefaultSettings;
+function getDefaultBundledSettings() {
+    return getDefaultSettings();
+}
+exports.getDefaultBundledSettings = getDefaultBundledSettings;
 //# sourceMappingURL=DefaultSettings.js.map

package/dist/Settings/index.d.ts

@@ -1,6 +1,6 @@
 export { clearCachedSettingsFiles, defaultConfigFilenames, defaultFileName, extractImportErrors, getCachedFileSize, getGlobalSettings, loadConfig, loadPnP, loadPnPSync, readRawSettings, readSettings, readSettingsFiles, searchForConfig, sectionCSpell, } from './configLoader';
 export { calcOverrideSettings, checkFilenameMatchesGlob, currentSettingsFileVersion, ENV_CSPELL_GLOB_ROOT, extractDependencies, finalizeSettings, getSources, mergeInDocSettings, mergeSettings, } from './CSpellSettingsServer';
 export type { ConfigurationDependencies, ImportFileRefWithError } from './CSpellSettingsServer';
-export { getDefaultSettings } from './DefaultSettings';
+export { getDefaultSettings, getDefaultBundledSettings } from './DefaultSettings';
 export { ImportError } from './ImportError';
 //# sourceMappingURL=index.d.ts.map

package/dist/Settings/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ImportError = exports.getDefaultSettings = exports.mergeSettings = exports.mergeInDocSettings = exports.getSources = exports.finalizeSettings = exports.extractDependencies = exports.ENV_CSPELL_GLOB_ROOT = exports.currentSettingsFileVersion = exports.checkFilenameMatchesGlob = exports.calcOverrideSettings = exports.sectionCSpell = exports.searchForConfig = exports.readSettingsFiles = exports.readSettings = exports.readRawSettings = exports.loadPnPSync = exports.loadPnP = exports.loadConfig = exports.getGlobalSettings = exports.getCachedFileSize = exports.extractImportErrors = exports.defaultFileName = exports.defaultConfigFilenames = exports.clearCachedSettingsFiles = void 0;
+exports.ImportError = exports.getDefaultBundledSettings = exports.getDefaultSettings = exports.mergeSettings = exports.mergeInDocSettings = exports.getSources = exports.finalizeSettings = exports.extractDependencies = exports.ENV_CSPELL_GLOB_ROOT = exports.currentSettingsFileVersion = exports.checkFilenameMatchesGlob = exports.calcOverrideSettings = exports.sectionCSpell = exports.searchForConfig = exports.readSettingsFiles = exports.readSettings = exports.readRawSettings = exports.loadPnPSync = exports.loadPnP = exports.loadConfig = exports.getGlobalSettings = exports.getCachedFileSize = exports.extractImportErrors = exports.defaultFileName = exports.defaultConfigFilenames = exports.clearCachedSettingsFiles = void 0;
 var configLoader_1 = require("./configLoader");
 Object.defineProperty(exports, "clearCachedSettingsFiles", { enumerable: true, get: function () { return configLoader_1.clearCachedSettingsFiles; } });
 Object.defineProperty(exports, "defaultConfigFilenames", { enumerable: true, get: function () { return configLoader_1.defaultConfigFilenames; } });
@@ -28,6 +28,7 @@ Object.defineProperty(exports, "mergeInDocSettings", { enumerable: true, get: fu
 Object.defineProperty(exports, "mergeSettings", { enumerable: true, get: function () { return CSpellSettingsServer_1.mergeSettings; } });
 var DefaultSettings_1 = require("./DefaultSettings");
 Object.defineProperty(exports, "getDefaultSettings", { enumerable: true, get: function () { return DefaultSettings_1.getDefaultSettings; } });
+Object.defineProperty(exports, "getDefaultBundledSettings", { enumerable: true, get: function () { return DefaultSettings_1.getDefaultBundledSettings; } });
 var ImportError_1 = require("./ImportError");
 Object.defineProperty(exports, "ImportError", { enumerable: true, get: function () { return ImportError_1.ImportError; } });
 //# sourceMappingURL=index.js.map

package/dist/SpellingDictionary/SpellingDictionaryCollection.js

@@ -54,7 +54,7 @@ class SpellingDictionaryCollection {
         return this._suggest(word, suggestOptions);
     }
     _suggest(word, suggestOptions) {
-        const { numSuggestions = (0, Settings_1.getDefaultSettings)().numSuggestions || SpellingDictionaryMethods_1.defaultNumSuggestions, numChanges, ignoreCase, includeTies, timeout, } = suggestOptions;
+        const { numSuggestions = (0, Settings_1.getDefaultSettings)(false).numSuggestions || SpellingDictionaryMethods_1.defaultNumSuggestions, numChanges, ignoreCase, includeTies, timeout, } = suggestOptions;
         const prefixNoCase = cspell_trie_lib_1.CASE_INSENSITIVE_PREFIX;
         const filter = (word, _cost) => {
             return ((ignoreCase || word[0] !== prefixNoCase) &&

package/dist/SpellingDictionary/SpellingDictionaryFromTrie.js

@@ -97,7 +97,7 @@ class SpellingDictionaryFromTrie {
         return this._suggest(word, suggestOptions);
     }
     _suggest(word, suggestOptions) {
-        const { numSuggestions = (0, Settings_1.getDefaultSettings)().numSuggestions || SpellingDictionaryMethods_1.defaultNumSuggestions, numChanges, includeTies, ignoreCase, timeout, } = suggestOptions;
+        const { numSuggestions = (0, Settings_1.getDefaultSettings)(false).numSuggestions || SpellingDictionaryMethods_1.defaultNumSuggestions, numChanges, includeTies, ignoreCase, timeout, } = suggestOptions;
         function filter(_word) {
             return true;
         }

package/dist/suggestions.js

@@ -35,6 +35,7 @@ async function* suggestionsForWords(words, options, settings = {}) {
 }
 exports.suggestionsForWords = suggestionsForWords;
 async function suggestionsForWord(word, options, settings = {}) {
+    var _a;
     const { languageId, locale: language, strict = true, numChanges = 4, numSuggestions = 8, includeTies = true, includeDefaultConfig = true, dictionaries, } = options || {};
     const ignoreCase = !strict;
     async function determineDictionaries(config) {
@@ -56,7 +57,9 @@ async function suggestionsForWord(word, options, settings = {}) {
         };
     }
     await (0, SpellingDictionary_1.refreshDictionaryCache)();
-    const config = includeDefaultConfig ? (0, Settings_1.mergeSettings)((0, Settings_1.getDefaultSettings)(), (0, Settings_1.getGlobalSettings)(), settings) : settings;
+    const config = includeDefaultConfig
+        ? (0, Settings_1.mergeSettings)((0, Settings_1.getDefaultSettings)((_a = settings.loadDefaultConfiguration) !== null && _a !== void 0 ? _a : true), (0, Settings_1.getGlobalSettings)(), settings)
+        : settings;
     const { dictionaryCollection, allDictionaryCollection } = await determineDictionaries(config);
     const opts = { ignoreCase, numChanges, numSuggestions, includeTies };
     const suggestionsByDictionary = dictionaryCollection.dictionaries.map((dict) => dict.suggest(word, opts).map((r) => ({ ...r, dictName: dict.name })));

package/dist/textValidation/determineTextDocumentSettings.js

@@ -41,11 +41,11 @@ const TextDocumentSettings_1 = require("../Settings/TextDocumentSettings");
  * @param settings - The near final settings. Should already be the combination of all configuration files.
  */
 function determineTextDocumentSettings(doc, settings) {
-    var _a;
+    var _a, _b;
     const filename = doc.uri.fsPath;
-    const settingsWithDefaults = (0, Settings_1.mergeSettings)((0, Settings_1.getDefaultSettings)(), (0, Settings_1.getGlobalSettings)(), settings);
+    const settingsWithDefaults = (0, Settings_1.mergeSettings)((0, Settings_1.getDefaultSettings)((_a = settings.loadDefaultConfiguration) !== null && _a !== void 0 ? _a : true), (0, Settings_1.getGlobalSettings)(), settings);
     const fileSettings = (0, Settings_1.calcOverrideSettings)(settingsWithDefaults, filename);
-    const languageIds = ((_a = fileSettings === null || fileSettings === void 0 ? void 0 : fileSettings.languageId) === null || _a === void 0 ? void 0 : _a.length)
+    const languageIds = ((_b = fileSettings === null || fileSettings === void 0 ? void 0 : fileSettings.languageId) === null || _b === void 0 ? void 0 : _b.length)
         ? fileSettings.languageId
         : doc.languageId
             ? doc.languageId

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cspell-lib",
-  "version": "5.19.4",
+  "version": "5.19.7",
   "description": "A library of useful functions used across various cspell tools.",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -48,17 +48,17 @@
   },
   "homepage": "https://github.com/streetsidesoftware/cspell#readme",
   "dependencies": {
-    "@cspell/cspell-bundled-dicts": "^5.19.4",
-    "@cspell/cspell-pipe": "^5.19.4",
-    "@cspell/cspell-types": "^5.19.4",
+    "@cspell/cspell-bundled-dicts": "^5.19.7",
+    "@cspell/cspell-pipe": "^5.19.7",
+    "@cspell/cspell-types": "^5.19.7",
     "clear-module": "^4.1.2",
     "comment-json": "^4.2.2",
     "configstore": "^5.0.1",
     "cosmiconfig": "^7.0.1",
-    "cspell-glob": "^5.19.4",
-    "cspell-io": "^5.19.4",
-    "cspell-trie-lib": "^5.19.4",
-    "fast-equals": "^3.0.0",
+    "cspell-glob": "^5.19.7",
+    "cspell-io": "^5.19.7",
+    "cspell-trie-lib": "^5.19.7",
+    "fast-equals": "^3.0.1",
     "find-up": "^5.0.0",
     "fs-extra": "^10.0.1",
     "gensequence": "^3.1.1",
@@ -78,7 +78,7 @@
     "@cspell/dict-fa-ir": "^2.0.0",
     "@cspell/dict-fr-fr": "^2.0.1",
     "@cspell/dict-html": "^1.1.9",
-    "@cspell/dict-nl-nl": "^2.2.3",
+    "@cspell/dict-nl-nl": "^2.2.4",
     "@cspell/dict-python": "^2.0.6",
     "@types/configstore": "^5.0.1",
     "@types/fs-extra": "^9.0.13",
@@ -89,8 +89,8 @@
     "lorem-ipsum": "^2.0.4",
     "rimraf": "^3.0.2",
     "rollup": "^2.70.1",
-    "rollup-plugin-dts": "^4.2.0",
+    "rollup-plugin-dts": "^4.2.1",
     "ts-jest": "^27.1.4"
   },
-  "gitHead": "9f7e77c95eb1e8fabf53c5b74b7418b2d114ef02"
+  "gitHead": "1d33cd1b61250f8c4c5c2c218ec43675614784ca"
 }