@cspell/cspell-tools 10.0.0 → 10.1.0

package/dist/app.d.mts

@@ -1,5 +1,4 @@
 import { Command } from "commander";
-
 //#region src/FeatureFlags/FeatureFlags.d.ts
 interface FeatureFlag {
   name: string;
@@ -7,9 +6,9 @@ interface FeatureFlag {
 }
 type FlagTypes = string | boolean;
 /**
-* Feature Flags are used to turn on/off features.
-* These are primarily used before a feature has been fully released.
-*/
+ * Feature Flags are used to turn on/off features.
+ * These are primarily used before a feature has been fully released.
+ */
 declare class FeatureFlags {
   private flags;
   private flagValues;

package/dist/app.mjs

@@ -1,4 +1,4 @@
-import { a as reportCheckChecksumFile, c as toError, d as compressFile, i as logWithTimestamp, l as generateBTrie, n as compile, o as reportChecksumForFiles, r as setLogger, s as updateChecksumForFiles, t as build, u as OSFlags } from "./build-JrGA5AHH.mjs";
+import { a as reportCheckChecksumFile, c as toError, i as logWithTimestamp, l as generateBTrie, n as compile, o as reportChecksumForFiles, r as setLogger, s as updateChecksumForFiles, t as build, u as compressFile } from "./build-DPX1iG-1.mjs";
 import { readFileSync } from "node:fs";
 import { CommanderError, Option } from "commander";
 import { writeFile } from "node:fs/promises";
@@ -8,7 +8,8 @@ import { opConcatMap, pipe } from "@cspell/cspell-pipe/sync";
 import YAML from "yaml";
 //#region src/util/globP.ts
 function globP(pattern, options) {
-	return glob((Array.isArray(pattern) ? pattern : [pattern]).map((pattern) => pattern.replaceAll("\\", "/")), options);
+	const globs = (Array.isArray(pattern) ? pattern : [pattern]).map((pattern) => pattern.replaceAll("\\", "/"));
+	return glob(globs, options);
 }
 //#endregion
 //#region src/gzip/gzip.ts
@@ -31,6 +32,10 @@ function createCompileRequest(sourceFiles, options) {
 		targets: calcTargets([...sourceFiles, ...(options.listFile || []).map((listFile) => ({ listFile }))], options),
 		maxDepth: parseNumber(maxDepth),
 		split: useLegacySplitter ? "legacy" : split,
+		/**
+		* Do not generate lower case / accent free versions of words.
+		* @default false
+		*/
 		keepRawCase
 	};
 }
@@ -91,7 +96,7 @@ function normalizeSource(source) {
 }
 function normalizeSourcePath(source) {
 	const cwd = process.cwd();
-	return path.relative(cwd, source).split("\\").join("/");
+	return path.relative(cwd, source).replaceAll("\\", "/");
 }
 //#endregion
 //#region src/config/config.ts
@@ -160,6 +165,7 @@ var FeatureFlags = class FeatureFlags {
 	}
 };
 var UnknownFeatureFlagError = class extends Error {
+	flag;
 	constructor(flag) {
 		super(`Unknown feature flag: ${flag}`);
 		this.flag = flag;
@@ -219,7 +225,8 @@ async function useCompile(src, options) {
 	console.log("Compile:\n output: %s\n compress: %s\n files:\n  %s", options.output || "default", options.compress ? "true" : "false", src.join("\n  "));
 	if (options.listFile && options.listFile.length) console.log(" list files:\n  %s", options.listFile.join("\n  "));
 	console.log("\n\n");
-	const request = createCompileRequest([...pipe(await Promise.all(src.map((s) => globP(s))), opConcatMap((a) => a))], options);
+	const globResults = await Promise.all(src.map((s) => globP(s)));
+	const request = createCompileRequest([...pipe(globResults, opConcatMap((a) => a))], options);
 	return options.init ? initConfig(request) : compile(request);
 }
 async function initConfig(runConfig) {
@@ -250,7 +257,7 @@ function addCompileOptions(compileCommand) {
 async function run(program, argv, flags) {
 	async function handleGzip(files) {
 		try {
-			await gzipFiles(files, OSFlags.Unix);
+			await gzipFiles(files, 3);
 		} catch (error) {
 			const err = toError(error);
 			program.error(err.message);

package/dist/{build-JrGA5AHH.mjs → build-DPX1iG-1.mjs}

@@ -17,20 +17,12 @@ import { Buffer } from "node:buffer";
 //#region src/gzip/compressFiles.ts
 const gzip$1 = promisify(gzip);
 const gunzip$1 = promisify(gunzip);
-let OSFlags = /* @__PURE__ */ function(OSFlags) {
-	OSFlags[OSFlags["auto"] = -1] = "auto";
-	OSFlags[OSFlags["FAT"] = 0] = "FAT";
-	OSFlags[OSFlags["Unix"] = 3] = "Unix";
-	OSFlags[OSFlags["HPFS"] = 6] = "HPFS";
-	OSFlags[OSFlags["MACOS"] = 7] = "MACOS";
-	OSFlags[OSFlags["NTFS"] = 11] = "NTFS";
-	return OSFlags;
-}({});
 const OSSystemIDOffset = 9;
 async function compressFile(file, os) {
 	if (file.endsWith(".gz")) return file;
 	const targetFile = file + ".gz";
-	await writeFile(targetFile, await compress(await readFile(file), os));
+	const zBuf = await compress(await readFile(file), os);
+	await writeFile(targetFile, zBuf);
 	return targetFile;
 }
 async function compress(buf, os) {
@@ -53,8 +45,9 @@ function isGZipped(data) {
 	if (typeof data === "string") return false;
 	return data[0] === 31 && data[1] === 139;
 }
-function fixOSSystemID(zBuf, os = OSFlags.Unix) {
-	zBuf[OSSystemIDOffset] = os === OSFlags.auto ? zBuf[OSSystemIDOffset] : os;
+function fixOSSystemID(zBuf, os = 3) {
+	const osFlag = os === -1 ? zBuf[OSSystemIDOffset] : os;
+	zBuf[OSSystemIDOffset] = osFlag;
 	return zBuf;
 }
 async function decompress(buf, encoding) {
@@ -199,7 +192,9 @@ var TrieFileReader = class TrieFileReader {
 	}
 	static async create(filename) {
 		const rawBuffer = await readFile(filename);
-		return new TrieFileReader(filename, decodeTrie(filename.endsWith(".gz") ? gunzipSync(rawBuffer) : rawBuffer));
+		const buffer = filename.endsWith(".gz") ? gunzipSync(rawBuffer) : rawBuffer;
+		const trie = decodeTrie(buffer);
+		return new TrieFileReader(filename, trie);
 	}
 };
 //#endregion
@@ -255,7 +250,8 @@ function bTrieFileName(inputFilename, options) {
 	return filename;
 }
 async function createBTrieFromFile(file, buildOptions) {
-	return encodeTrieDataToBTrie((await createReader(file, {})).toTrie().data, buildOptions);
+	const trie = (await createReader(file, {})).toTrie();
+	return encodeTrieDataToBTrie(trie.data, buildOptions);
 }
 //#endregion
 //#region src/bTrie.ts
@@ -431,7 +427,7 @@ async function calcUpdateChecksumForFiles(filename, files, options) {
 		...entry,
 		filename: normalizeFilename(entry.filename)
 	}));
-	const entriesToUpdate = new Set([...filesToCheck, ...currentEntries.map((e) => e.filename)]);
+	const entriesToUpdate = /* @__PURE__ */ new Set([...filesToCheck, ...currentEntries.map((e) => e.filename)]);
 	const mustExist = new Set(filesToCheck);
 	const checksumMap = new Map(currentEntries.map(({ filename, checksum }) => [filename, checksum]));
 	for (const file of entriesToUpdate) try {
@@ -735,13 +731,14 @@ function normalizeTargetWords(options) {
 		stripCaseAndAccentsOnForbidden: true,
 		keepOptionalCompoundCharacter: true
 	});
-	return opCombine(...[
+	const operations = [
 		opFilter((a) => !!a),
 		lineParser,
 		options.sort ? createInlineBufferedSort(1e4) : void 0,
 		opFilter(uniqueFilter(1e4)),
 		options.filter ? opFilter(options.filter) : void 0
-	].filter(isDefined));
+	].filter(isDefined);
+	return opCombine(...operations);
 }
 function isDefined(v) {
 	return v !== void 0;
@@ -818,7 +815,6 @@ function createParseFileLineMapper(options) {
 				case "legacy":
 					keepCase = false;
 					legacy = true;
-					break;
 			}
 		}
 		return line.slice(0, idx).trim();
@@ -857,7 +853,7 @@ function createParseFileLineMapper(options) {
 				yield* !allowedSplitWords.size ? words : words.flatMap((word) => splitWordIntoWords(word));
 				if (!splitKeepBoth) continue;
 			}
-			yield line.replaceAll(/["]/g, "");
+			yield line.replaceAll("\"", "");
 		}
 	}
 	function* unique(lines) {
@@ -967,7 +963,8 @@ function createWordListCompiler(options) {
 }
 function normalize(lines, options) {
 	const filter = normalizeTargetWords(options);
-	const iter = pipe(options.removeDuplicates ? removeDuplicates(lines) : lines, filter);
+	const cleanLines = options.removeDuplicates ? removeDuplicates(lines) : lines;
+	const iter = pipe(cleanLines, filter);
 	if (!options.sort) return iter;
 	return [...new Set(iter)].sort();
 }
@@ -1009,37 +1006,21 @@ function* removeDuplicates(words) {
 		}
 	}
 }
-/**
-* solo
-* optional_prefix*
-* optional_suffix*
-* required_prefix+
-* required_suffix+
-*/
-var Flags = /* @__PURE__ */ function(Flags) {
-	Flags[Flags["base"] = 0] = "base";
-	Flags[Flags["none"] = 1] = "none";
-	Flags[Flags["both"] = 2] = "both";
-	Flags[Flags["pfx"] = 4] = "pfx";
-	Flags[Flags["sfx"] = 8] = "sfx";
-	Flags[Flags["all"] = 15] = "all";
-	return Flags;
-}(Flags || {});
 function applyFlags(word, flags) {
-	if (flags === Flags.none) return [word];
-	if (flags === Flags.all) return ["*" + word + "*"];
-	if (flags === Flags.both) return ["+" + word + "+"];
-	if (flags === Flags.pfx) return [word + "+"];
-	if (flags === Flags.sfx) return ["+" + word];
-	if (flags === (Flags.none | Flags.sfx)) return ["*" + word];
-	if (flags === (Flags.none | Flags.pfx)) return [word + "*"];
-	if (flags === (Flags.none | Flags.pfx | Flags.sfx)) return [word + "*", "*" + word];
-	if (flags === (Flags.none | Flags.both)) return ["*" + word + "*"];
-	if (flags === (Flags.none | Flags.both | Flags.sfx)) return [word, "+" + word + "*"];
-	if (flags === (Flags.none | Flags.both | Flags.pfx)) return [word, "*" + word + "+"];
-	if (flags === (Flags.both | Flags.pfx)) return ["*" + word + "+"];
-	if (flags === (Flags.both | Flags.sfx)) return ["+" + word + "*"];
-	if (flags === (Flags.both | Flags.pfx | Flags.sfx)) return ["+" + word + "*", "*" + word + "+"];
+	if (flags === 1) return [word];
+	if (flags === 15) return ["*" + word + "*"];
+	if (flags === 2) return ["+" + word + "+"];
+	if (flags === 4) return [word + "+"];
+	if (flags === 8) return ["+" + word];
+	if (flags === 9) return ["*" + word];
+	if (flags === 5) return [word + "*"];
+	if (flags === 13) return [word + "*", "*" + word];
+	if (flags === 3) return ["*" + word + "*"];
+	if (flags === 11) return [word, "+" + word + "*"];
+	if (flags === 7) return [word, "*" + word + "+"];
+	if (flags === 6) return ["*" + word + "+"];
+	if (flags === 10) return ["+" + word + "*"];
+	if (flags === 14) return ["+" + word + "*", "*" + word + "+"];
 	return ["+" + word, word + "+"];
 }
 function removeDuplicateForms(forms) {
@@ -1050,13 +1031,13 @@ function removeDuplicateForms(forms) {
 		const canBeSuffix = word.startsWith("*");
 		const mustBeSuffix = !canBeSuffix && word.startsWith("+");
 		const isSuffix = canBeSuffix || mustBeSuffix;
-		if (canBePrefix && canBeSuffix) return flag | Flags.all;
-		if (mustBePrefix && mustBeSuffix) return flag | Flags.both;
-		if (!isPrefix && !isSuffix) return flag | Flags.none;
-		flag |= isPrefix && !isSuffix ? Flags.pfx : 0;
-		flag |= isSuffix && !isPrefix ? Flags.sfx : 0;
-		flag |= canBePrefix && !mustBeSuffix ? Flags.none : 0;
-		flag |= canBeSuffix && !mustBePrefix ? Flags.none : 0;
+		if (canBePrefix && canBeSuffix) return flag | 15;
+		if (mustBePrefix && mustBeSuffix) return flag | 2;
+		if (!isPrefix && !isSuffix) return flag | 1;
+		flag |= isPrefix && !isSuffix ? 4 : 0;
+		flag |= isSuffix && !isPrefix ? 8 : 0;
+		flag |= canBePrefix && !mustBeSuffix ? 1 : 0;
+		flag |= canBeSuffix && !mustBePrefix ? 1 : 0;
 		return flag;
 	}
 	const m = /* @__PURE__ */ new Map();
@@ -1071,7 +1052,8 @@ function removeDuplicateForms(forms) {
 async function createTargetFile(destFilename, seq, compress) {
 	const rel = path.relative(process.cwd(), destFilename).replaceAll(path.sep, "/");
 	getLogger()(`Writing to file ${rel}${compress ? ".gz" : ""}`);
-	await mkdirp(path.dirname(destFilename));
+	const destDir = path.dirname(destFilename);
+	await mkdirp(destDir);
 	await writeTextToFile(destFilename, seq, compress);
 }
 function createTrieCompiler(options) {
@@ -1170,7 +1152,8 @@ async function buildTargetDictionary(target, options, compileOptions, buildOptio
 		return excludeFromFilter(word) && includeFromFilter(word) && excludeRegexFilter(word);
 	};
 	const compress = generateOnlyCompressedDictionary;
-	const filesToProcess = await toArray(pipeAsync(readSourceList(sources, rootDir), opMapAsync((src) => readFileSource(src, options)), opAwaitAsync()));
+	const filesToProcessAsync = pipeAsync(readSourceList(sources, rootDir), opMapAsync((src) => readFileSource(src, options)), opAwaitAsync());
+	const filesToProcess = await toArray(filesToProcessAsync);
 	const normalizer = normalizeTargetWords({
 		sort: useTrie || sort,
 		generateNonStrict,
@@ -1185,7 +1168,7 @@ async function buildTargetDictionary(target, options, compileOptions, buildOptio
 		}
 	}
 	async function action(words, dst) {
-		await createTargetFile(dst, iterableToString(pipe(words, normalizer, useTrie ? createTrieCompiler({
+		const compiler = useTrie ? createTrieCompiler({
 			base: trieBase,
 			trie3: format === "trie3",
 			trie4: format === "trie4"
@@ -1194,7 +1177,8 @@ async function buildTargetDictionary(target, options, compileOptions, buildOptio
 			generateNonStrict,
 			dictionaryDirectives,
 			removeDuplicates
-		}))), compress);
+		});
+		await createTargetFile(dst, iterableToString(pipe(words, normalizer, compiler)), compress);
 	}
 	await processFiles({
 		action,
@@ -1399,6 +1383,6 @@ function normalizeRequest(buildInfo, root) {
 	};
 }
 //#endregion
-export { reportCheckChecksumFile as a, toError as c, compressFile as d, logWithTimestamp as i, generateBTrie as l, compile as n, reportChecksumForFiles as o, setLogger as r, updateChecksumForFiles as s, build as t, OSFlags as u };
+export { reportCheckChecksumFile as a, toError as c, logWithTimestamp as i, generateBTrie as l, compile as n, reportChecksumForFiles as o, setLogger as r, updateChecksumForFiles as s, build as t, compressFile as u };
 
-//# sourceMappingURL=build-JrGA5AHH.mjs.map
+//# sourceMappingURL=build-DPX1iG-1.mjs.map

package/dist/index.mjs

@@ -1,2 +1,2 @@
-import { l as generateBTrie, t as build } from "./build-JrGA5AHH.mjs";
+import { l as generateBTrie, t as build } from "./build-DPX1iG-1.mjs";
 export { build, generateBTrie };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cspell/cspell-tools",
-  "version": "10.0.0",
+  "version": "10.1.0",
   "description": "Tools to assist with the development of cSpell",
   "publishConfig": {
     "access": "public",
@@ -64,21 +64,21 @@
   },
   "homepage": "https://github.com/streetsidesoftware/cspell/tree/main/packages/cspell-tools#readme",
   "dependencies": {
-    "@cspell/cspell-pipe": "10.0.0",
-    "commander": "^14.0.3",
-    "cosmiconfig": "9.0.1",
-    "cspell-trie-lib": "10.0.0",
+    "@cspell/cspell-pipe": "10.1.0",
+    "commander": "^15.0.0",
+    "cosmiconfig": "10.0.0",
+    "cspell-trie-lib": "10.1.0",
     "glob": "^13.0.6",
-    "hunspell-reader": "10.0.0",
-    "yaml": "^2.8.3"
+    "hunspell-reader": "10.1.0",
+    "yaml": "^2.9.0"
   },
   "engines": {
     "node": ">=22.18.0"
   },
   "devDependencies": {
-    "lorem-ipsum": "^2.0.8",
+    "lorem-ipsum": "^3.0.0",
     "ts-json-schema-generator": "2.9.0"
   },
   "module": "bin.mjs",
-  "gitHead": "6ddfd576b6bb554a7cb8dba1ab053a0b6ff8021f"
+  "gitHead": "401518c5e37c06fb406aedadb3fc7a1c27eca8e6"
 }