@cspell/cspell-tools 6.29.0 → 6.29.1

package/dist/compiler/compile.js

@@ -141,7 +141,7 @@ async function readFileSource(fileSource, sourceOptions) {
     const legacy = split === 'legacy';
     const splitWords = legacy ? false : split;
     // console.warn('fileSource: %o,\n targetOptions %o, \n opt: %o', fileSource, targetOptions, opt);
-    const allowedSplitWords = await (0, createWordsCollection_1.createAllowedSplitWords)(fileSource.allowedSplitWords || sourceOptions.allowedSplitWords);
+    const allowedSplitWords = await (0, createWordsCollection_1.createAllowedSplitWordsFromFiles)(fileSource.allowedSplitWords || sourceOptions.allowedSplitWords);
     const readerOptions = {
         maxDepth,
         legacy,

package/dist/compiler/createWordsCollection.d.ts

@@ -1,6 +1,9 @@
 import type { FilePath } from '../config/config';
 import type { AllowedSplitWordsCollection, ExcludeWordsCollection, WordsCollection } from './WordsCollection';
-export declare function createAllowedSplitWords(files: FilePath | FilePath[] | undefined): Promise<AllowedSplitWordsCollection>;
-export declare function createWordsCollection(files: FilePath | FilePath[]): Promise<WordsCollection>;
-export declare function createExcludeWordsCollection(files: FilePath | FilePath[] | undefined): Promise<ExcludeWordsCollection>;
+export declare function createAllowedSplitWordsFromFiles(files: FilePath | FilePath[] | undefined): Promise<AllowedSplitWordsCollection>;
+export declare function createAllowedSplitWords(words: Iterable<string> | undefined): AllowedSplitWordsCollection;
+export declare function createWordsCollectionFromFiles(files: FilePath | FilePath[]): Promise<WordsCollection>;
+export declare function createWordsCollection(words: Iterable<string>): WordsCollection;
+export declare function createExcludeWordsCollectionFromFiles(files: FilePath | FilePath[] | undefined): Promise<ExcludeWordsCollection>;
+export declare function createExcludeWordsCollection(words: Iterable<string> | undefined): ExcludeWordsCollection;
 //# sourceMappingURL=createWordsCollection.d.ts.map

package/dist/compiler/createWordsCollection.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createExcludeWordsCollection = exports.createWordsCollection = exports.createAllowedSplitWords = void 0;
+exports.createExcludeWordsCollection = exports.createExcludeWordsCollectionFromFiles = exports.createWordsCollection = exports.createWordsCollectionFromFiles = exports.createAllowedSplitWords = exports.createAllowedSplitWordsFromFiles = void 0;
 const Reader_1 = require("./Reader");
 const WordsCollection_1 = require("./WordsCollection");
 class AllowedSplitWordsImpl {
@@ -12,32 +12,44 @@ class AllowedSplitWordsImpl {
         return !this.size || this.words.has(word);
     }
 }
-async function createAllowedSplitWords(files) {
+async function createAllowedSplitWordsFromFiles(files) {
     if (!files || !files.length)
         return WordsCollection_1.defaultAllowedSplitWords;
-    const collection = await createWordsCollection(files);
+    const collection = await createWordsCollectionFromFiles(files);
     return new AllowedSplitWordsImpl(collection);
 }
+exports.createAllowedSplitWordsFromFiles = createAllowedSplitWordsFromFiles;
+function createAllowedSplitWords(words) {
+    if (!words)
+        return WordsCollection_1.defaultAllowedSplitWords;
+    return new AllowedSplitWordsImpl(createWordsCollection(words));
+}
 exports.createAllowedSplitWords = createAllowedSplitWords;
 async function readFile(filename) {
     const reader = await (0, Reader_1.createReader)(filename, {});
     return [...reader];
 }
 const cache = new WeakMap();
-async function createWordsCollection(files) {
+async function createWordsCollectionFromFiles(files) {
     files = Array.isArray(files) ? files : [files];
     const cached = cache.get(files);
     if (cached)
         return cached;
     const sources = await Promise.all(files.map((file) => readFile(file)));
-    const collection = new Set(sources
-        .flatMap((a) => a)
-        .map((a) => a.trim())
-        .filter((a) => !!a)
-        .filter((a) => !a.startsWith('#')));
+    const collection = createWordsCollection(sources.flatMap((a) => a));
     cache.set(files, collection);
     return collection;
 }
+exports.createWordsCollectionFromFiles = createWordsCollectionFromFiles;
+function createWordsCollection(words) {
+    if (words instanceof Set)
+        return words;
+    const arrWords = (Array.isArray(words) ? words : [...words])
+        .map((a) => a.trim())
+        .filter((a) => !!a)
+        .filter((a) => !a.startsWith('#'));
+    return new Set(arrWords);
+}
 exports.createWordsCollection = createWordsCollection;
 class ExcludeWordsCollectionImpl {
     constructor(collection) {
@@ -48,11 +60,15 @@ class ExcludeWordsCollectionImpl {
         return this.words.has(word);
     }
 }
-async function createExcludeWordsCollection(files) {
+async function createExcludeWordsCollectionFromFiles(files) {
     if (!files || !files.length)
         return WordsCollection_1.defaultExcludeWordsCollection;
-    const collection = await createWordsCollection(files);
+    const collection = await createWordsCollectionFromFiles(files);
     return new ExcludeWordsCollectionImpl(collection);
 }
+exports.createExcludeWordsCollectionFromFiles = createExcludeWordsCollectionFromFiles;
+function createExcludeWordsCollection(words) {
+    return new ExcludeWordsCollectionImpl(words ? createWordsCollection(words) : new Set());
+}
 exports.createExcludeWordsCollection = createExcludeWordsCollection;
 //# sourceMappingURL=createWordsCollection.js.map

package/dist/compiler/legacyLineToWords.js

@@ -1,40 +1,15 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.legacyLinesToWords = exports.legacyLineToWords = void 0;
 const sync_1 = require("@cspell/cspell-pipe/sync");
-const Text = __importStar(require("./text"));
+const splitCamelCaseIfAllowed_1 = require("./splitCamelCaseIfAllowed");
 const regNonWord = /[^\p{L}\p{M}' \d]+/giu;
-const regExpSpaceOrDash = /[- ]+/g;
 const regExpRepeatChars = /(.)\1{5}/i;
-const regExpIsNumber = /^\d+$/;
 function legacyLineToWords(line, keepCase, allowedSplitWords) {
     // Remove punctuation and non-letters.
     const filteredLine = line.replace(regNonWord, '|');
     const wordGroups = filteredLine.split('|');
-    const words = (0, sync_1.pipe)(wordGroups, (0, sync_1.opConcatMap)((a) => [...a.split(regExpSpaceOrDash)]), (0, sync_1.opConcatMap)((a) => splitCamelCaseIfAllowed(a, allowedSplitWords, keepCase)), (0, sync_1.opMap)((a) => a.trim()), (0, sync_1.opFilter)((a) => !!a), (0, sync_1.opFilter)((s) => !regExpRepeatChars.test(s)));
+    const words = (0, sync_1.pipe)(wordGroups, (0, sync_1.opConcatMap)((a) => [...a.split(splitCamelCaseIfAllowed_1.regExpSpaceOrDash)]), (0, sync_1.opConcatMap)((a) => (0, splitCamelCaseIfAllowed_1.splitCamelCaseIfAllowed)(a, allowedSplitWords, keepCase)), (0, sync_1.opMap)((a) => a.trim()), (0, sync_1.opFilter)((a) => !!a), (0, sync_1.opFilter)((s) => !regExpRepeatChars.test(s)));
     return words;
 }
 exports.legacyLineToWords = legacyLineToWords;
@@ -44,30 +19,4 @@ function* legacyLinesToWords(lines, keepCase, allowedSplitWords) {
     }
 }
 exports.legacyLinesToWords = legacyLinesToWords;
-function splitCamelCaseIfAllowed(word, allowedWords, keepCase) {
-    const split = [...splitCamelCase(word)].map((a) => (keepCase ? a : a.toLowerCase()));
-    const missing = split.find((w) => isUnknown(w, allowedWords));
-    const words = missing === undefined ? split : [word];
-    return keepCase ? words : words.map(adjustCase);
-}
-function adjustCase(word) {
-    if (word[0].toLowerCase() == word[0])
-        return word;
-    if (word.slice(1).toLowerCase() === word.slice(1))
-        return word[0].toLowerCase() + word.slice(1);
-    if (word.toUpperCase() === word)
-        return word.toLowerCase();
-    return word;
-}
-function isUnknown(word, allowedWords) {
-    return word.length > 3 && !allowedWords.has(word);
-}
-function splitCamelCase(word) {
-    const splitWords = Text.splitCamelCaseWord(word).filter((word) => !regExpIsNumber.test(word));
-    // We only want to preserve this: "New York" and not "Namespace DNSLookup"
-    if (splitWords.length > 1 && regExpSpaceOrDash.test(word)) {
-        return (0, sync_1.pipe)(splitWords, (0, sync_1.opConcatMap)((w) => w.split(regExpSpaceOrDash)));
-    }
-    return splitWords;
-}
 //# sourceMappingURL=legacyLineToWords.js.map

package/dist/compiler/splitCamelCaseIfAllowed.d.ts

@@ -0,0 +1,5 @@
+import type { AllowedSplitWordsCollection } from './WordsCollection';
+export declare const regExpSpaceOrDash: RegExp;
+export declare const regExpIsNumber: RegExp;
+export declare function splitCamelCaseIfAllowed(word: string, allowedWords: AllowedSplitWordsCollection, keepCase: boolean): string[];
+//# sourceMappingURL=splitCamelCaseIfAllowed.d.ts.map

package/dist/compiler/splitCamelCaseIfAllowed.js

@@ -0,0 +1,66 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.splitCamelCaseIfAllowed = exports.regExpIsNumber = exports.regExpSpaceOrDash = void 0;
+const Text = __importStar(require("./text"));
+exports.regExpSpaceOrDash = /[- ]+/g;
+exports.regExpIsNumber = /^\d+$/;
+function splitCamelCaseIfAllowed(word, allowedWords, keepCase) {
+    const split = [...splitCamelCase(word)];
+    if (split.length == 1)
+        return adjustCases(split, allowedWords, keepCase);
+    const missing = split.find((w) => isUnknown(w, allowedWords));
+    if (missing !== undefined)
+        return [word];
+    return adjustCases(split, allowedWords, keepCase);
+}
+exports.splitCamelCaseIfAllowed = splitCamelCaseIfAllowed;
+function adjustCases(words, allowedWords, keepCase) {
+    return words.map((w) => adjustCase(w, allowedWords, keepCase));
+}
+function adjustCase(word, allowedWords, keepCase) {
+    const lc = word.toLowerCase();
+    if (!allowedWords.has(lc))
+        return word;
+    if (lc === word)
+        return word;
+    if (word.slice(1).toLowerCase() === word.slice(1))
+        return lc;
+    if (!keepCase && word.toUpperCase() === word)
+        return word.toLowerCase();
+    return word;
+}
+function isUnknown(word, allowedWords) {
+    return !allowedWords.has(word) && !allowedWords.has(word.toLowerCase());
+}
+function splitCamelCase(word) {
+    const splitWords = Text.splitCamelCaseWord(word).filter((word) => !exports.regExpIsNumber.test(word));
+    // We only want to preserve this: "New York" and not "Namespace DNSLookup"
+    if (splitWords.length > 1 && exports.regExpSpaceOrDash.test(word)) {
+        return splitWords.flatMap((w) => w.split(exports.regExpSpaceOrDash));
+    }
+    return splitWords;
+}
+//# sourceMappingURL=splitCamelCaseIfAllowed.js.map

package/dist/compiler/text.js

@@ -12,7 +12,7 @@ function splitCamelCaseWord(word) {
     const wPrime = word.replace(regExUpperSOrIng, (s) => s[0] + s.slice(1).toLowerCase());
     const pass1 = wPrime.replace(regExSplitWords, '$1|$2');
     const pass2 = pass1.replace(regExSplitWords2, '$1|$2');
-    const pass3 = pass2.replace(/\d+/g, '|');
+    const pass3 = pass2.replace(/[\d_]+/g, '|');
     return pass3.split('|').filter((a) => !!a);
 }
 exports.splitCamelCaseWord = splitCamelCaseWord;

package/dist/compiler/wordListParser.js

@@ -5,6 +5,7 @@ const sync_1 = require("@cspell/cspell-pipe/sync");
 const cspell_trie_lib_1 = require("cspell-trie-lib");
 const util_1 = require("hunspell-reader/dist/util");
 const legacyLineToWords_1 = require("./legacyLineToWords");
+const splitCamelCaseIfAllowed_1 = require("./splitCamelCaseIfAllowed");
 function normalizeTargetWords(options) {
     const lineParser = (0, cspell_trie_lib_1.createDictionaryLineParser)({
         stripCaseAndAccents: options.generateNonStrict,
@@ -61,7 +62,6 @@ function createParseFileLineMapper(options) {
     const { splitKeepBoth = _defaultOptions.splitKeepBoth, allowedSplitWords = _defaultOptions.allowedSplitWords } = _options;
     let { legacy = _defaultOptions.legacy } = _options;
     let { split = _defaultOptions.split, keepCase = legacy ? false : _defaultOptions.keepCase } = _options;
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     function isString(line) {
         return typeof line === 'string';
     }
@@ -136,7 +136,13 @@ function createParseFileLineMapper(options) {
                 continue;
             }
             if (split) {
-                yield* splitLine(line);
+                const words = splitLine(line);
+                if (!allowedSplitWords.size) {
+                    yield* words;
+                }
+                else {
+                    yield* words.flatMap((word) => (0, splitCamelCaseIfAllowed_1.splitCamelCaseIfAllowed)(word, allowedSplitWords, keepCase));
+                }
                 if (!splitKeepBoth)
                     continue;
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cspell/cspell-tools",
-  "version": "6.29.0",
+  "version": "6.29.1",
   "description": "Tools to assist with the development of cSpell",
   "typings": "dist/index.d.ts",
   "publishConfig": {
@@ -48,13 +48,13 @@
   },
   "homepage": "https://github.com/streetsidesoftware/cspell#readme",
   "dependencies": {
-    "@cspell/cspell-pipe": "6.29.0",
+    "@cspell/cspell-pipe": "6.29.1",
     "commander": "^10.0.0",
     "cosmiconfig": "^8.1.0",
-    "cspell-trie-lib": "6.29.0",
+    "cspell-trie-lib": "6.29.1",
     "gensequence": "^5.0.2",
     "glob": "^8.1.0",
-    "hunspell-reader": "6.29.0"
+    "hunspell-reader": "6.29.1"
   },
   "engines": {
     "node": ">=14"
@@ -69,5 +69,5 @@
     "ts-json-schema-generator": "^1.2.0"
   },
   "main": "bin.js",
-  "gitHead": "2eabb1c47c12c2a42eb95d30329be6f544ee2ffc"
+  "gitHead": "e524c611f3529b22a7e8ae3449a5c9a01332d44f"
 }