@cspell/cspell-types 9.6.4 → 9.8.0

package/dist/index.mjs

@@ -44,6 +44,8 @@ const ConfigFields = {
 	reporters: "reporters",
 	showStatus: "showStatus",
 	spellCheckDelayMs: "spellCheckDelayMs",
+	substitutionDefinitions: "substitutionDefinitions",
+	substitutions: "substitutions",
 	suggestionNumChanges: "suggestionNumChanges",
 	suggestionsTimeout: "suggestionsTimeout",
 	suggestWords: "suggestWords",
@@ -56,7 +58,6 @@ const ConfigFields = {
 	words: "words",
 	parser: "parser"
 };
-
 //#endregion
 //#region src/CSpellReporter.ts
 let IssueType = /* @__PURE__ */ function(IssueType) {
@@ -75,20 +76,130 @@ const unknownWordsChoices = {
 	ReportCommonTypos: "report-common-typos",
 	ReportFlagged: "report-flagged"
 };
-
 //#endregion
 //#region src/defaultConfigSettings.ts
 const defaultCSpellSettings = {
 	ignoreRandomStrings: true,
 	minRandomLength: 40
 };
-
 //#endregion
 //#region src/defineConfig.ts
 function defineConfig(config) {
 	return config;
 }
-
 //#endregion
-export { ConfigFields, IssueType, MessageTypes, defaultCSpellSettings, defineConfig, unknownWordsChoices };
+//#region src/merge.ts
+const mArr = mergeAppendArrays;
+const mRec = mergeRecords;
+const exKV = extractKeyValues;
+const mergeDefinitionFunctions = {
+	$schema: (key) => recKV(key, void 0),
+	allowCompoundWords: (key, settings) => recKV(key, lastValue(exKV(key, settings))),
+	cache: (key, settings) => recKV(key, mRec(exKV(key, settings))),
+	caseSensitive: (key, settings) => recKV(key, lastValue(exKV(key, settings))),
+	description: (key, settings) => recKV(key, lastValue(exKV(key, settings))),
+	dictionaries: (key, settings) => recKV(key, mArr(exKV(key, settings))),
+	dictionaryDefinitions: (key, settings) => recKV(key, mArr(exKV(key, settings))),
+	enabled: (key, settings) => recKV(key, lastValue(exKV(key, settings))),
+	enabledFileTypes: (key, settings) => recKV(key, mRec(exKV(key, settings))),
+	enabledLanguageIds: (key, settings) => recKV(key, mArr(exKV(key, settings))),
+	enableFiletypes: (key, settings) => recKV(key, mArr(exKV(key, settings))),
+	enableGlobDot: (key, settings) => recKV(key, lastValue(exKV(key, settings))),
+	engines: (key, settings) => recKV(key, mRec(exKV(key, settings))),
+	failFast: (key, settings) => recKV(key, lastValue(exKV(key, settings))),
+	features: (key, settings) => recKV(key, mRec(exKV(key, settings))),
+	files: (key, settings) => recKV(key, mArr(exKV(key, settings))),
+	flagWords: (key, settings) => recKV(key, mArr(exKV(key, settings))),
+	gitignoreRoot: (key, settings) => recKV(key, lastValue(exKV(key, settings))),
+	globRoot: (key, settings) => recKV(key, lastValue(exKV(key, settings))),
+	id: (key, settings) => recKV(key, lastValue(exKV(key, settings))),
+	ignorePaths: (key, settings) => recKV(key, mArr(exKV(key, settings))),
+	ignoreRandomStrings: (key, settings) => recKV(key, lastValue(exKV(key, settings))),
+	ignoreRegExpList: (key, settings) => recKV(key, mArr(exKV(key, settings))),
+	ignoreWords: (key, settings) => recKV(key, mArr(exKV(key, settings))),
+	import: (key, settings) => recKV(key, mArr(exKV(key, settings).map(strArrToArr))),
+	includeRegExpList: (key, settings) => recKV(key, mArr(exKV(key, settings))),
+	language: (key, settings) => recKV(key, lastValue(exKV(key, settings))),
+	languageId: (key, settings) => recKV(key, lastValue(exKV(key, settings))),
+	languageSettings: (key, settings) => recKV(key, mArr(exKV(key, settings))),
+	loadDefaultConfiguration: (key, settings) => recKV(key, lastValue(exKV(key, settings))),
+	maxDuplicateProblems: (key, settings) => recKV(key, lastValue(exKV(key, settings))),
+	maxFileSize: (key, settings) => recKV(key, lastValue(exKV(key, settings))),
+	maxNumberOfProblems: (key, settings) => recKV(key, lastValue(exKV(key, settings))),
+	minRandomLength: (key, settings) => recKV(key, lastValue(exKV(key, settings))),
+	minWordLength: (key, settings) => recKV(key, lastValue(exKV(key, settings))),
+	name: (key, settings) => recKV(key, lastValue(exKV(key, settings))),
+	noConfigSearch: (key, settings) => recKV(key, lastValue(exKV(key, settings))),
+	noSuggestDictionaries: (key, settings) => recKV(key, mArr(exKV(key, settings))),
+	numSuggestions: (key, settings) => recKV(key, lastValue(exKV(key, settings))),
+	overrides: (key, settings) => recKV(key, mArr(exKV(key, settings))),
+	parser: (key, settings) => recKV(key, lastValue(exKV(key, settings))),
+	patterns: (key, settings) => recKV(key, mArr(exKV(key, settings))),
+	pnpFiles: (key, settings) => recKV(key, mArr(exKV(key, settings))),
+	readonly: (key, settings) => recKV(key, orValue(exKV(key, settings))),
+	reporters: (key, settings) => recKV(key, mArr(exKV(key, settings))),
+	showStatus: (key, settings) => recKV(key, lastValue(exKV(key, settings))),
+	spellCheckDelayMs: (key, settings) => recKV(key, lastValue(exKV(key, settings))),
+	substitutionDefinitions: (key, settings) => recKV(key, mArr(exKV(key, settings))),
+	substitutions: (key, settings) => recKV(key, mArr(exKV(key, settings))),
+	suggestionNumChanges: (key, settings) => recKV(key, lastValue(exKV(key, settings))),
+	suggestionsTimeout: (key, settings) => recKV(key, lastValue(exKV(key, settings))),
+	suggestWords: (key, settings) => recKV(key, mArr(exKV(key, settings))),
+	unknownWords: (key, settings) => recKV(key, lastValue(exKV(key, settings))),
+	useGitignore: (key, settings) => recKV(key, lastValue(exKV(key, settings))),
+	usePnP: (key, settings) => recKV(key, lastValue(exKV(key, settings))),
+	userWords: (key, settings) => recKV(key, mArr(exKV(key, settings))),
+	validateDirectives: (key, settings) => recKV(key, lastValue(exKV(key, settings))),
+	version: (key, settings) => recKV(key, lastValue(exKV(key, settings))),
+	vfs: (key, settings) => recKV(key, mRec(exKV(key, settings))),
+	words: (key, settings) => recKV(key, mArr(exKV(key, settings)))
+};
+function makeMergeFn(key) {
+	const fn = mergeDefinitionFunctions[key];
+	return (settings) => fn(key, settings);
+}
+const mergeIndividualSettingsFns = Object.keys(mergeDefinitionFunctions).map((k) => makeMergeFn(k));
+function mergeConfig(first, ...configs) {
+	const settings = [first, ...configs].flat();
+	if (settings.length === 1) return settings[0];
+	const result = Object.assign(Object.create(null), ...settings);
+	Object.assign(result, ...mergeIndividualSettingsFns.map((fn) => fn(settings)));
+	return result;
+}
+function orValue(values) {
+	let v = void 0;
+	for (const value of values) v ||= value;
+	return v;
+}
+function lastValue(values) {
+	for (let i = values.length - 1; i >= 0; i--) {
+		const value = values[i];
+		if (value !== void 0) return value;
+	}
+}
+function strArrToArr(value) {
+	return Array.isArray(value) ? value : [value];
+}
+function mergeAppendArrays(arrays) {
+	const values = arrays.filter((a) => !!a);
+	if (values.length === 1) return values[0];
+	const merged = values.flat();
+	return merged.length ? merged : void 0;
+}
+function mergeRecords(records) {
+	const values = records.filter((r) => !!r);
+	if (!values.length) return void 0;
+	if (values.length === 1) return values[0];
+	return Object.assign(Object.create(null), ...values);
+}
+function extractKeyValues(key, records) {
+	return records.filter((r) => !!r).map((r) => r[key]).filter((v) => v !== void 0);
+}
+function recKV(key, value) {
+	if (value === void 0) return void 0;
+	return { [key]: value };
+}
+//#endregion
+export { ConfigFields, IssueType, MessageTypes, defaultCSpellSettings, defineConfig, mergeConfig, unknownWordsChoices };
+
 //# sourceMappingURL=index.mjs.map

package/package.json

@@ -4,7 +4,7 @@
     "access": "public",
     "provenance": true
   },
-  "version": "9.6.4",
+  "version": "9.8.0",
   "description": "Types for cspell and cspell-lib",
   "type": "commonjs",
   "sideEffects": false,
@@ -85,5 +85,5 @@
     "node": ">=20"
   },
   "homepage": "https://github.com/streetsidesoftware/cspell/tree/main/packages/cspell-types#readme",
-  "gitHead": "e126c7f5708d4258ada35ba1d29d18952d7f0886"
+  "gitHead": "c822013ce676dffb5fa5544567c25a3ae666718f"
 }