cspell-lib 6.31.0 → 6.31.2

package/dist/cjs/Cache/cspell.cache.js

@@ -11,5 +11,5 @@ var IssueCode;
     IssueCode[IssueCode["ForbiddenWord"] = 2] = "ForbiddenWord";
     IssueCode[IssueCode["KnownIssue"] = 4] = "KnownIssue";
     IssueCode[IssueCode["ALL"] = 7] = "ALL";
-})(IssueCode = exports.IssueCode || (exports.IssueCode = {}));
+})(IssueCode || (exports.IssueCode = IssueCode = {}));
 //# sourceMappingURL=cspell.cache.js.map

package/dist/cjs/Settings/CSpellSettingsServer.js

@@ -36,24 +36,21 @@ const util = __importStar(require("../util/util.js"));
 const constants_js_1 = require("./constants.js");
 const DictionarySettings_js_1 = require("./DictionarySettings.js");
 const patterns_js_1 = require("./patterns.js");
-function _unique(a) {
-    return [...new Set(a)];
-}
 function mergeListUnique(left, right) {
-    if (left === undefined)
-        return right;
-    if (right === undefined)
+    if (!Array.isArray(left))
+        return Array.isArray(right) ? right : undefined;
+    if (!Array.isArray(right))
         return left;
     if (!right.length)
         return left;
     if (!left.length)
         return right;
-    return _unique([...left, ...right]);
+    return [...new Set([...left, ...right])];
 }
 function mergeList(left, right) {
-    if (left === undefined)
-        return right;
-    if (right === undefined)
+    if (!Array.isArray(left))
+        return Array.isArray(right) ? right : undefined;
+    if (!Array.isArray(right))
         return left;
     if (!left.length)
         return right;
@@ -69,20 +66,17 @@ function _mergeWordsCached(left, right) {
     return (0, AutoResolve_js_1.autoResolveWeak)(map, right, () => left.concat(right));
 }
 function mergeWordsCached(left, right) {
-    if (left === undefined)
-        return !right || right.length ? right : emptyWords;
-    if (right === undefined)
-        return !left || left.length ? left : emptyWords;
-    if (!left.length)
-        return !right || right.length ? right : emptyWords;
-    if (!right.length)
-        return !left || left.length ? left : emptyWords;
+    if (!Array.isArray(left) || !left.length) {
+        return Array.isArray(right) ? (right.length ? right : emptyWords) : undefined;
+    }
+    if (!Array.isArray(right) || !right.length)
+        return left;
     return _mergeWordsCached(left, right);
 }
 function mergeObjects(left, right) {
-    if (left === undefined)
-        return right;
-    if (right === undefined)
+    if (!left || typeof left !== 'object')
+        return !right || typeof right !== 'object' ? undefined : right;
+    if (!right || typeof right !== 'object')
         return left;
     return { ...left, ...right };
 }

package/dist/cjs/textValidation/checkText.js

@@ -72,7 +72,7 @@ var IncludeExcludeFlag;
 (function (IncludeExcludeFlag) {
     IncludeExcludeFlag["INCLUDE"] = "I";
     IncludeExcludeFlag["EXCLUDE"] = "E";
-})(IncludeExcludeFlag = exports.IncludeExcludeFlag || (exports.IncludeExcludeFlag = {}));
+})(IncludeExcludeFlag || (exports.IncludeExcludeFlag = IncludeExcludeFlag = {}));
 /**
  * Calculate document issues and include / exclude zones.
  * @param doc - document to check

package/dist/cjs/util/util.d.ts

@@ -4,7 +4,7 @@ export declare function uniqueFilterFnGenerator<T>(): (v: T) => boolean;
 export declare function uniqueFilterFnGenerator<T, U>(extractFn: (v: T) => U): (v: T) => boolean;
 export declare function unique<T>(src: T[]): T[];
 /**
- * Delete all `undefined` fields from an object.
+ * Delete all `undefined` and `null` fields from an object.
  * @param src - object to be cleaned
  */
 export declare function clean<T extends object>(src: T): RemoveUndefined<T>;

package/dist/cjs/util/util.js

@@ -19,13 +19,13 @@ function unique(src) {
 }
 exports.unique = unique;
 /**
- * Delete all `undefined` fields from an object.
+ * Delete all `undefined` and `null` fields from an object.
  * @param src - object to be cleaned
  */
 function clean(src) {
     const r = src;
     for (const key of Object.keys(r)) {
-        if (r[key] === undefined) {
+        if (r[key] === undefined || r[key] === null) {
             delete r[key];
         }
     }

package/dist/esm/Settings/CSpellSettingsServer.mjs

@@ -7,24 +7,21 @@ import * as util from '../util/util.mjs';
 import { configSettingsFileVersion0_1, ENV_CSPELL_GLOB_ROOT } from './constants.mjs';
 import { calcDictionaryDefsToLoad, mapDictDefsToInternal } from './DictionarySettings.mjs';
 import { resolvePatterns } from './patterns.mjs';
-function _unique(a) {
-    return [...new Set(a)];
-}
 function mergeListUnique(left, right) {
-    if (left === undefined)
-        return right;
-    if (right === undefined)
+    if (!Array.isArray(left))
+        return Array.isArray(right) ? right : undefined;
+    if (!Array.isArray(right))
         return left;
     if (!right.length)
         return left;
     if (!left.length)
         return right;
-    return _unique([...left, ...right]);
+    return [...new Set([...left, ...right])];
 }
 function mergeList(left, right) {
-    if (left === undefined)
-        return right;
-    if (right === undefined)
+    if (!Array.isArray(left))
+        return Array.isArray(right) ? right : undefined;
+    if (!Array.isArray(right))
         return left;
     if (!left.length)
         return right;
@@ -40,20 +37,17 @@ function _mergeWordsCached(left, right) {
     return autoResolveWeak(map, right, () => left.concat(right));
 }
 function mergeWordsCached(left, right) {
-    if (left === undefined)
-        return !right || right.length ? right : emptyWords;
-    if (right === undefined)
-        return !left || left.length ? left : emptyWords;
-    if (!left.length)
-        return !right || right.length ? right : emptyWords;
-    if (!right.length)
-        return !left || left.length ? left : emptyWords;
+    if (!Array.isArray(left) || !left.length) {
+        return Array.isArray(right) ? (right.length ? right : emptyWords) : undefined;
+    }
+    if (!Array.isArray(right) || !right.length)
+        return left;
     return _mergeWordsCached(left, right);
 }
 function mergeObjects(left, right) {
-    if (left === undefined)
-        return right;
-    if (right === undefined)
+    if (!left || typeof left !== 'object')
+        return !right || typeof right !== 'object' ? undefined : right;
+    if (!right || typeof right !== 'object')
         return left;
     return { ...left, ...right };
 }

package/dist/esm/util/util.d.mts

@@ -4,7 +4,7 @@ export declare function uniqueFilterFnGenerator<T>(): (v: T) => boolean;
 export declare function uniqueFilterFnGenerator<T, U>(extractFn: (v: T) => U): (v: T) => boolean;
 export declare function unique<T>(src: T[]): T[];
 /**
- * Delete all `undefined` fields from an object.
+ * Delete all `undefined` and `null` fields from an object.
  * @param src - object to be cleaned
  */
 export declare function clean<T extends object>(src: T): RemoveUndefined<T>;

package/dist/esm/util/util.mjs

@@ -14,13 +14,13 @@ export function unique(src) {
     return [...new Set(src)];
 }
 /**
- * Delete all `undefined` fields from an object.
+ * Delete all `undefined` and `null` fields from an object.
  * @param src - object to be cleaned
  */
 export function clean(src) {
     const r = src;
     for (const key of Object.keys(r)) {
-        if (r[key] === undefined) {
+        if (r[key] === undefined || r[key] === null) {
             delete r[key];
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cspell-lib",
-  "version": "6.31.0",
+  "version": "6.31.2",
   "description": "A library of useful functions used across various cspell tools.",
   "type": "commonjs",
   "main": "dist/cjs/index.js",
@@ -57,19 +57,19 @@
   },
   "homepage": "https://github.com/streetsidesoftware/cspell#readme",
   "dependencies": {
-    "@cspell/cspell-bundled-dicts": "6.31.0",
-    "@cspell/cspell-pipe": "6.31.0",
-    "@cspell/cspell-types": "6.31.0",
-    "@cspell/strong-weak-map": "6.31.0",
+    "@cspell/cspell-bundled-dicts": "6.31.2",
+    "@cspell/cspell-pipe": "6.31.1",
+    "@cspell/cspell-types": "6.31.1",
+    "@cspell/strong-weak-map": "6.31.1",
     "clear-module": "^4.1.2",
     "comment-json": "^4.2.3",
     "configstore": "^5.0.1",
     "cosmiconfig": "8.0.0",
-    "cspell-dictionary": "6.31.0",
-    "cspell-glob": "6.31.0",
-    "cspell-grammar": "6.31.0",
-    "cspell-io": "6.31.0",
-    "cspell-trie-lib": "6.31.0",
+    "cspell-dictionary": "6.31.1",
+    "cspell-glob": "6.31.2",
+    "cspell-grammar": "6.31.1",
+    "cspell-io": "6.31.2",
+    "cspell-trie-lib": "6.31.1",
     "fast-equals": "^4.0.3",
     "find-up": "^5.0.0",
     "gensequence": "^5.0.2",
@@ -97,7 +97,7 @@
     "expect": "^29.5.0",
     "jest": "^29.5.0",
     "lorem-ipsum": "^2.0.8",
-    "ts-jest": "^29.0.5"
+    "ts-jest": "^29.1.0"
   },
-  "gitHead": "1c0c3eb875bc1aab334bd56d952c0d0964468b7a"
+  "gitHead": "aa78fdb9d4fc45dc74bcf31b6a6366784fe0d1c4"
 }