cspell-lib 5.12.2 → 5.12.6

package/dist/LanguageIds.js

@@ -95,6 +95,7 @@ exports.languageExtensionDefinitions = [
     { id: 'typescript', extensions: ['.ts'] },
     { id: 'typescriptreact', extensions: ['.tsx'] },
     { id: 'vb', extensions: ['.vb', '.brs', '.vbs', '.bas'] },
+    { id: 'vue', extensions: ['.vue'] },
     {
         id: 'xml',
         extensions: [

package/dist/Settings/InDocSettings.js

@@ -25,7 +25,7 @@ const Text = __importStar(require("../util/text"));
 const CSpellSettingsServer_1 = require("./CSpellSettingsServer");
 // cspell:ignore gimuy
 const regExMatchRegEx = /\/.*\/[gimuy]*/;
-const regExInFileSettings = [/(?:spell-?checker|cSpell)::?\s*(.*)/gi, /(LocalWords:?\s+.*)/g];
+const regExInFileSettings = [/(?:spell-?checker|c?spell)::?(.*)/gi, /(LocalWords:?.*)/g];
 function getInDocumentSettings(text) {
     const settings = getPossibleInDocSettings(text)
         .concatMap((a) => parseSettingMatch(a))
@@ -36,17 +36,18 @@ function getInDocumentSettings(text) {
 }
 exports.getInDocumentSettings = getInDocumentSettings;
 function parseSettingMatch(matchArray) {
-    const [, possibleSetting = ''] = matchArray;
+    const [, match = ''] = matchArray;
+    const possibleSetting = match.trim();
     const settingParsers = [
         [/^(?:enable|disable)(?:allow)?CompoundWords/i, parseCompoundWords],
         [/^words?\s/i, parseWords],
         [/^ignore(?:words?)?\s/i, parseIgnoreWords],
         [/^ignore_?Reg_?Exp\s+.+$/i, parseIgnoreRegExp],
         [/^include_?Reg_?Exp\s+.+$/i, parseIncludeRegExp],
-        [/^locale?\s/i, parseLocal],
-        [/^language\s/i, parseLocal],
+        [/^locale?\s/i, parseLocale],
+        [/^language\s/i, parseLocale],
         [/^dictionaries\s/i, parseDictionaries],
-        [/^LocalWords:/, parseWords],
+        [/^LocalWords:/, (w) => parseWords(w.replace(/LocalWords:?/gi, ' '))],
     ];
     return settingParsers
         .filter(([regex]) => regex.test(possibleSetting))
@@ -61,9 +62,9 @@ function parseWords(match) {
     const words = match.split(/[,\s]+/g).slice(1);
     return { id: 'in-doc-words', words };
 }
-function parseLocal(match) {
-    const parts = match.trim().split(/\s+/);
-    const language = parts.slice(1).join(' ');
+function parseLocale(match) {
+    const parts = match.trim().split(/[\s,]+/);
+    const language = parts.slice(1).join(',');
     return language ? { id: 'in-doc-local', language } : {};
 }
 function parseIgnoreWords(match) {

package/dist/Settings/LanguageSettings.js

@@ -27,13 +27,19 @@ function getDefaultLanguageSettings() {
     return defaultLanguageSettings;
 }
 exports.getDefaultLanguageSettings = getDefaultLanguageSettings;
+function localesToList(locales) {
+    locales = typeof locales !== 'string' ? locales.join(',') : locales;
+    return stringToList(locales.replace(/\s+/g, ','));
+}
 function stringToList(sList) {
-    if (typeof sList === 'string') {
-        sList = sList
-            .replace(/[|;]/g, ',')
-            .split(',')
-            .map((s) => s.trim());
+    if (typeof sList !== 'string') {
+        sList = sList.join(',');
     }
+    sList = sList
+        .replace(/[|;]/g, ',')
+        .split(',')
+        .map((s) => s.trim())
+        .filter((s) => !!s);
     return sList;
 }
 function normalizeLanguageId(langId) {
@@ -45,7 +51,7 @@ function normalizeLanguageIdToString(langId) {
     return [...normalizeLanguageId(langId)].join(',');
 }
 function normalizeLocale(locale) {
-    locale = stringToList(locale);
+    locale = localesToList(locale);
     return new Set(locale.map((locale) => locale.toLowerCase().replace(/[^a-z]/g, '')));
 }
 exports.normalizeLocale = normalizeLocale;

package/dist/SpellingDictionary/DictionaryLoader.d.ts

@@ -14,6 +14,7 @@ export interface Loaders {
     S: Loader;
     C: Loader;
     T: Loader;
+    W: Loader;
     default: Loader;
 }
 export declare function loadDictionary(uri: string, options: DictionaryDefinitionPreferred): Promise<SpellingDictionary>;

package/dist/SpellingDictionary/DictionaryLoader.js

@@ -31,6 +31,7 @@ const MAX_AGE = 10000;
 const loaders = {
     S: loadSimpleWordList,
     C: legacyWordList,
+    W: wordsPerLineWordList,
     T: loadTrie,
     default: loadSimpleWordList,
 };
@@ -115,6 +116,16 @@ async function legacyWordList(filename, options) {
         .filter((word) => !!word);
     return (0, createSpellingDictionary_1.createSpellingDictionary)(words, determineName(filename, options), filename, options);
 }
+async function wordsPerLineWordList(filename, options) {
+    const lines = await (0, fileReader_1.readLines)(filename);
+    const words = (0, gensequence_1.genSequence)(lines)
+        // Remove comments
+        .map((line) => line.replace(/#.*/g, ''))
+        // Split on everything else
+        .concatMap((line) => line.split(/\s+/gu))
+        .filter((word) => !!word);
+    return (0, createSpellingDictionary_1.createSpellingDictionary)(words, determineName(filename, options), filename, options);
+}
 async function loadSimpleWordList(filename, options) {
     const lines = await (0, fileReader_1.readLines)(filename);
     return (0, createSpellingDictionary_1.createSpellingDictionary)(lines, determineName(filename, options), filename, options);

package/dist/textValidator.js

@@ -104,12 +104,9 @@ function lineValidator(dict, options) {
             }
             const codeWordResults = Text.extractWordsFromCodeTextOffset(vr)
                 .filter(filterAlreadyChecked)
-                .filter(rememberFilter((wo) => wo.text.length >= minWordLength))
                 .map((t) => ({ ...t, line: vr.line }))
-                .map((wo) => {
-                const vr = wo;
-                return vr;
-            })
+                .map(checkFlagWords)
+                .filter(rememberFilter((wo) => wo.text.length >= minWordLength || !!wo.isFlagged))
                 .map((wo) => (wo.isFlagged ? wo : checkWord(wo, hasWordOptions)))
                 .filter(rememberFilter((wo) => wo.isFlagged || !wo.isFound))
                 .filter(rememberFilter((wo) => !RxPat.regExRepeatedChar.test(wo.text))) // Filter out any repeated characters like xxxxxxxxxx
@@ -128,9 +125,9 @@ function lineValidator(dict, options) {
         function checkPossibleWords(possibleWord) {
             const mismatches = Text.extractWordsFromTextOffset(possibleWord)
                 .filter(filterAlreadyChecked)
-                .filter(rememberFilter((wo) => wo.text.length >= minWordLength))
                 .map((wo) => ({ ...wo, line: lineSegment }))
                 .map(checkFlagWords)
+                .filter(rememberFilter((wo) => wo.text.length >= minWordLength || !!wo.isFlagged))
                 .concatMap(checkFullWord)
                 .toArray();
             if (mismatches.length) {

package/dist/trace.d.ts

@@ -16,6 +16,7 @@ export interface TraceOptions {
     languageId?: LanguageId | LanguageId[];
     locale?: LocaleId;
     ignoreCase?: boolean;
+    allowCompoundWords?: boolean;
 }
 export declare function traceWords(words: string[], settings: CSpellSettings, options: TraceOptions | undefined): Promise<TraceResult[]>;
 //# sourceMappingURL=trace.d.ts.map

package/dist/trace.js

@@ -26,10 +26,13 @@ const LanguageSettings_1 = require("./Settings/LanguageSettings");
 const SpellingDictionary_1 = require("./SpellingDictionary");
 const util = __importStar(require("./util/util"));
 async function traceWords(words, settings, options) {
-    const { languageId, locale: language, ignoreCase = true } = options || {};
+    const { languageId, locale: language, ignoreCase = true, allowCompoundWords } = options || {};
     async function finalize(config) {
         var _a;
-        const withLocale = (0, Settings_1.mergeSettings)(config, { language });
+        const withLocale = (0, Settings_1.mergeSettings)(config, {
+            language,
+            allowCompoundWords: allowCompoundWords !== null && allowCompoundWords !== void 0 ? allowCompoundWords : config.allowCompoundWords,
+        });
         const withLanguageId = (0, LanguageSettings_1.calcSettingsForLanguageId)(withLocale, (_a = languageId !== null && languageId !== void 0 ? languageId : withLocale.languageId) !== null && _a !== void 0 ? _a : 'plaintext');
         const settings = (0, Settings_1.finalizeSettings)(withLanguageId);
         const dictionaries = (settings.dictionaries || [])

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cspell-lib",
-  "version": "5.12.2",
+  "version": "5.12.6",
   "description": "A library of useful functions used across various cspell tools.",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -47,15 +47,15 @@
   },
   "homepage": "https://github.com/streetsidesoftware/cspell#readme",
   "dependencies": {
-    "@cspell/cspell-bundled-dicts": "^5.12.2",
-    "@cspell/cspell-types": "^5.12.2",
-    "clear-module": "^4.1.1",
+    "@cspell/cspell-bundled-dicts": "^5.12.6",
+    "@cspell/cspell-types": "^5.12.6",
+    "clear-module": "^4.1.2",
     "comment-json": "^4.1.1",
     "configstore": "^5.0.1",
     "cosmiconfig": "^7.0.1",
-    "cspell-glob": "^5.12.2",
-    "cspell-io": "^5.12.2",
-    "cspell-trie-lib": "^5.12.2",
+    "cspell-glob": "^5.12.6",
+    "cspell-io": "^5.12.6",
+    "cspell-trie-lib": "^5.12.6",
     "find-up": "^5.0.0",
     "fs-extra": "^10.0.0",
     "gensequence": "^3.1.1",
@@ -72,19 +72,19 @@
     "@cspell/dict-csharp": "^1.0.11",
     "@cspell/dict-css": "^1.0.12",
     "@cspell/dict-fa-ir": "^1.0.17",
-    "@cspell/dict-fr-fr": "^1.2.21",
+    "@cspell/dict-fr-fr": "^2.0.1",
     "@cspell/dict-html": "^1.1.9",
     "@cspell/dict-nl-nl": "^2.0.1",
-    "@cspell/dict-python": "^2.0.3",
+    "@cspell/dict-python": "^2.0.4",
     "@types/configstore": "^5.0.1",
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^27.0.2",
-    "@types/node": "^16.10.3",
+    "@types/node": "^16.11.6",
     "cspell-dict-nl-nl": "^1.1.2",
-    "jest": "^27.2.4",
+    "jest": "^27.3.1",
     "lorem-ipsum": "^2.0.4",
     "rimraf": "^3.0.2",
-    "ts-jest": "^27.0.5"
+    "ts-jest": "^27.0.7"
   },
-  "gitHead": "1418785bb9c3a29b794a6e9d447b5638f8eb9fbf"
+  "gitHead": "430bb6103b03793d5f0b746e7c643d12fa313216"
 }