cspell-lib 5.12.0-alpha.0 → 5.12.3

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

@@ -26,10 +26,12 @@ const fileReader_1 = require("../util/fileReader");
 const createSpellingDictionary_1 = require("./createSpellingDictionary");
 const SpellingDictionaryError_1 = require("./SpellingDictionaryError");
 const SpellingDictionaryFromTrie_1 = require("./SpellingDictionaryFromTrie");
+const gensequence_1 = require("gensequence");
 const MAX_AGE = 10000;
 const loaders = {
     S: loadSimpleWordList,
-    C: loadSimpleWordList,
+    C: legacyWordList,
+    W: wordsPerLineWordList,
     T: loadTrie,
     default: loadSimpleWordList,
 };
@@ -47,7 +49,7 @@ function loadDictionary(uri, options) {
 exports.loadDictionary = loadDictionary;
 const importantOptionKeys = ['noSuggest', 'useCompounds'];
 function calcKey(uri, options) {
-    const loaderType = determineType(uri);
+    const loaderType = determineType(uri, options);
     const optValues = importantOptionKeys.map((k) => { var _a; return ((_a = options[k]) === null || _a === void 0 ? void 0 : _a.toString()) || ''; });
     const parts = [uri, loaderType].concat(optValues);
     return parts.join('|');
@@ -92,16 +94,38 @@ function loadEntry(uri, options, now = Date.now()) {
         dictionary,
     };
 }
-function determineType(uri) {
-    const defType = uri.endsWith('.trie.gz') ? 'T' : uri.endsWith('.txt.gz') ? 'S' : 'S';
+function determineType(uri, opts) {
+    const t = (opts.type && opts.type in loaders && opts.type) || 'S';
+    const defLoaderType = t;
+    const defType = uri.endsWith('.trie.gz') ? 'T' : uri.endsWith('.txt.gz') ? defLoaderType : defLoaderType;
     const regTrieTest = /\.trie\b/i;
     return regTrieTest.test(uri) ? 'T' : defType;
 }
 function load(uri, options) {
-    const type = determineType(uri);
+    const type = determineType(uri, options);
     const loader = loaders[type] || loaders.default;
     return loader(uri, options);
 }
+async function legacyWordList(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(/[^\w\p{L}\p{M}'’]+/gu))
+        .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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cspell-lib",
-  "version": "5.12.0-alpha.0",
+  "version": "5.12.3",
   "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.0-alpha.0",
-    "@cspell/cspell-types": "^5.12.0-alpha.0",
+    "@cspell/cspell-bundled-dicts": "^5.12.3",
+    "@cspell/cspell-types": "^5.12.3",
     "clear-module": "^4.1.1",
     "comment-json": "^4.1.1",
     "configstore": "^5.0.1",
     "cosmiconfig": "^7.0.1",
-    "cspell-glob": "^5.12.0-alpha.0",
-    "cspell-io": "^5.12.0-alpha.0",
-    "cspell-trie-lib": "^5.12.0-alpha.0",
+    "cspell-glob": "^5.12.3",
+    "cspell-io": "^5.12.3",
+    "cspell-trie-lib": "^5.12.3",
     "find-up": "^5.0.0",
     "fs-extra": "^10.0.0",
     "gensequence": "^3.1.1",
@@ -79,12 +79,12 @@
     "@types/configstore": "^5.0.1",
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^27.0.2",
-    "@types/node": "^16.10.2",
+    "@types/node": "^16.10.3",
     "cspell-dict-nl-nl": "^1.1.2",
-    "jest": "^27.2.4",
+    "jest": "^27.2.5",
     "lorem-ipsum": "^2.0.4",
     "rimraf": "^3.0.2",
     "ts-jest": "^27.0.5"
   },
-  "gitHead": "babee46ac49f4388112e1bc562282b49051197aa"
+  "gitHead": "6c424aed933adb8d983ab09dd45042d63d7a5cd8"
 }