cspell-lib 6.8.0 → 6.8.1

package/dist/Settings/CSpellSettingsServer.js

@@ -269,9 +269,9 @@ function mergeSources(left, right) {
     };
 }
 function max(a, b) {
-    if (a === undefined)
+    if (a === undefined || a === null)
         return b;
-    if (b === undefined)
+    if (b === undefined || b === null)
         return a;
     return a > b ? a : b;
 }

package/dist/Settings/InDocSettings.js

@@ -46,11 +46,21 @@ const officialDirectives = [
     'ignore',
     'ignoreWord',
     'ignoreWords',
+    'ignore-word',
+    'ignore-words',
     'includeRegExp',
     'ignoreRegExp',
+    'local',
     'locale',
     'language',
     'dictionaries',
+    'dictionary',
+    'forbid',
+    'forbidWord',
+    'forbid-word',
+    'flag',
+    'flagWord',
+    'flag-word',
     'enableCompoundWords',
     'enableAllowCompoundWords',
     'disableCompoundWords',
@@ -58,6 +68,7 @@ const officialDirectives = [
     'enableCaseSensitive',
     'disableCaseSensitive',
 ];
+const noSuggestDirectives = new Set(['local']);
 const preferredDirectives = [
     'enable',
     'disable',
@@ -65,7 +76,9 @@ const preferredDirectives = [
     'disable-next-line',
     'words',
     'ignore',
+    'forbid',
     'locale',
+    'dictionary',
     'dictionaries',
     'enableCaseSensitive',
     'disableCaseSensitive',
@@ -95,14 +108,15 @@ const settingParsers = [
     [/^(?:enable|disable)CaseSensitive\b/i, parseCaseSensitive],
     [/^enable\b(?!-)/i, parseEnable],
     [/^disable(-line|-next(-line)?)?\b(?!-)/i, parseDisable],
-    [/^words?\s/i, parseWords],
-    [/^ignore(?:words?)?\s/i, parseIgnoreWords],
+    [/^words?\b/i, parseWords],
+    [/^ignore(?:-?words?)?\b/i, parseIgnoreWords],
+    [/^(?:flag|forbid)(?:-?words?)?\b/i, parseFlagWords],
     [/^ignore_?Reg_?Exp\s+.+$/i, parseIgnoreRegExp],
     [/^include_?Reg_?Exp\s+.+$/i, parseIncludeRegExp],
-    [/^locale?\s/i, parseLocale],
+    [/^locale?\b/i, parseLocale],
     [/^language\s/i, parseLocale],
-    [/^dictionaries\s/i, parseDictionaries],
-    [/^LocalWords:/, (w) => parseWords(w.replace(/LocalWords:?/gi, ' '))],
+    [/^dictionar(?:y|ies)\b/i, parseDictionaries],
+    [/^LocalWords:/, (w) => parseWords(w.replace(/^LocalWords:?/gi, ' '))],
 ];
 exports.regExSpellingGuardBlock = /(\bc?spell(?:-?checker)?::?)\s*disable(?!-line|-next)\b[\s\S]*?((?:\1\s*enable\b)|$)/gi;
 exports.regExSpellingGuardNext = /\bc?spell(?:-?checker)?::?\s*disable-next\b.*\s\s?.*/gi;
@@ -128,7 +142,10 @@ function parseSettingMatchValidation(matchArray) {
     if (matchingParsers.length > 0)
         return undefined;
     // No matches were found, let make some suggestions.
-    const dictSugs = dictInDocSettings.suggest(text, { ignoreCase: false }).map((sug) => sug.word);
+    const dictSugs = dictInDocSettings
+        .suggest(text, { ignoreCase: false })
+        .map((sug) => sug.word)
+        .filter((a) => !noSuggestDirectives.has(a));
     const sugs = new Set((0, cspell_pipe_1.pipeSync)(dictSugs, (0, cspell_pipe_1.opAppend)(allDirectives)));
     const suggestions = [...sugs].slice(0, 8);
     const issue = {
@@ -156,7 +173,11 @@ function parseCaseSensitive(match) {
     return { id: 'in-doc-caseSensitive', caseSensitive };
 }
 function parseWords(match) {
-    const words = match.split(/[,\s]+/g).slice(1);
+    const words = match
+        // .replace(/[@#$%^&={}/"]/g, ' ')
+        .split(/[,\s;]+/g)
+        .slice(1)
+        .filter((a) => !!a);
     return { id: 'in-doc-words', words };
 }
 function parseLocale(match) {
@@ -168,6 +189,10 @@ function parseIgnoreWords(match) {
     const wordsSetting = parseWords(match);
     return (0, util_1.clean)({ id: 'in-doc-ignore', ignoreWords: wordsSetting.words });
 }
+function parseFlagWords(match) {
+    const wordsSetting = parseWords(match);
+    return (0, util_1.clean)({ id: 'in-doc-forbid', flagWords: wordsSetting.words });
+}
 function parseRegEx(match) {
     const patterns = [match.replace(/^[^\s]+\s+/, '')].map((a) => {
         const m = a.match(regExMatchRegEx);

package/dist/util/util.d.ts

@@ -7,7 +7,7 @@ export declare function unique<T>(src: T[]): T[];
  * Delete all `undefined` fields from an object.
  * @param src - object to be cleaned
  */
-export declare function clean<T>(src: T): RemoveUndefined<T>;
+export declare function clean<T extends object>(src: T): RemoveUndefined<T>;
 /**
  * Creates a scan function that can be used in a map function.
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cspell-lib",
-  "version": "6.8.0",
+  "version": "6.8.1",
   "description": "A library of useful functions used across various cspell tools.",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -48,18 +48,18 @@
   },
   "homepage": "https://github.com/streetsidesoftware/cspell#readme",
   "dependencies": {
-    "@cspell/cspell-bundled-dicts": "^6.8.0",
-    "@cspell/cspell-pipe": "^6.8.0",
-    "@cspell/cspell-types": "^6.8.0",
+    "@cspell/cspell-bundled-dicts": "^6.8.1",
+    "@cspell/cspell-pipe": "^6.8.1",
+    "@cspell/cspell-types": "^6.8.1",
     "clear-module": "^4.1.2",
     "comment-json": "^4.2.3",
     "configstore": "^5.0.1",
     "cosmiconfig": "^7.0.1",
-    "cspell-glob": "^6.8.0",
-    "cspell-grammar": "^6.8.0",
-    "cspell-io": "^6.8.0",
-    "cspell-trie-lib": "^6.8.0",
-    "fast-equals": "^4.0.1",
+    "cspell-glob": "^6.8.1",
+    "cspell-grammar": "^6.8.1",
+    "cspell-io": "^6.8.1",
+    "cspell-trie-lib": "^6.8.1",
+    "fast-equals": "^4.0.3",
     "find-up": "^5.0.0",
     "fs-extra": "^10.1.0",
     "gensequence": "^3.1.1",
@@ -83,8 +83,8 @@
     "@cspell/dict-python": "^2.0.6",
     "@types/configstore": "^5.0.1",
     "@types/fs-extra": "^9.0.13",
-    "@types/jest": "^28.1.7",
-    "@types/node": "^18.7.8",
+    "@types/jest": "^28.1.8",
+    "@types/node": "^18.7.13",
     "cspell-dict-nl-nl": "^1.1.2",
     "jest": "^28.1.3",
     "lorem-ipsum": "^2.0.8",
@@ -93,5 +93,5 @@
     "rollup-plugin-dts": "^4.2.2",
     "ts-jest": "^28.0.8"
   },
-  "gitHead": "8a1bd03222ffc9776c2cdd09180db6150abb3f25"
+  "gitHead": "3c5c8c51b6cad9bc728f3383f5fe6ba34d6d559f"
 }