cspell-lib 10.4.0-alpha.1 → 10.4.0

package/dist/lib/Settings/LanguageSettings.d.ts

@@ -5,6 +5,12 @@ export declare function normalizeLanguageId(langId: LanguageId | LanguageId[]):
 export declare function normalizeLocale(locale: LocaleId | LocaleId[]): Set<LocaleId>;
 export declare function normalizeLocaleIntl(locale: LocaleId | LocaleId[]): Set<LocaleId>;
 export declare function isLocaleInSet(locale: LocaleId | LocaleId[], setOfLocals: Set<LocaleId>): boolean;
+/**
+ * Normalize a locale for use with `Intl` and `toLocaleLowerCase`. Locales that aren't valid are dropped.
+ * @param locale - a locale or a list of locales, for example `en,tr_TR`.
+ * @returns the valid locales, or `undefined` if there are none.
+ */
+export declare function normalizeLocaleForIntl(locale: LocaleId | LocaleId[] | undefined): string | string[] | undefined;
 /**
  * Test if a locale should be ok with Intl
  * @param locale - locale string

package/dist/lib/Settings/LanguageSettings.js

@@ -61,6 +61,21 @@ export function isLocaleInSet(locale, setOfLocals) {
     const locales = normalizeLocale(locale);
     return doSetsIntersect(locales, setOfLocals);
 }
+/**
+ * Normalize a locale for use with `Intl` and `toLocaleLowerCase`. Locales that aren't valid are dropped.
+ * @param locale - a locale or a list of locales, for example `en,tr_TR`.
+ * @returns the valid locales, or `undefined` if there are none.
+ */
+export function normalizeLocaleForIntl(locale) {
+    if (!locale)
+        return undefined;
+    const locales = [...normalizeLocaleIntl(locale)].filter((locale) => isValidLocaleIntlFormat(locale));
+    if (!locales.length)
+        return undefined;
+    if (locales.length === 1)
+        return locales[0];
+    return locales;
+}
 const regExpValidIntlLocaleStrict = /^[a-z]{2}(-[A-Z]{2})?$/;
 const regExpValidIntlLocale = new RegExp(regExpValidIntlLocaleStrict, 'i');
 /**

package/dist/lib/SpellingDictionary/DictionaryController/DictionaryLoader.js

@@ -56,6 +56,7 @@ import { createFailedToLoadDictionary, createFlagWordsDictionary, createFlagWord
 import { compareStats, toFileURL, urlBasename } from 'cspell-io';
 import { measurePerf } from '../../perf/index.js';
 import { isDictionaryDefinitionInlineInternal, isDictionaryFileDefinitionInternal } from '../../Settings/index.js';
+import { normalizeLocaleForIntl } from '../../Settings/LanguageSettings.js';
 import { AutoResolveWeakCache, AutoResolveWeakWeakCache } from '../../util/AutoResolve.js';
 import { toError } from '../../util/errors.js';
 import { SimpleCache } from '../../util/simpleCache.js';
@@ -260,7 +261,7 @@ async function legacyWordList(reader, filename, options) {
         if (options.kind === 'suggest-words') {
             return createSuggestDictionary([...words], options.name, filename.toString());
         }
-        return createSpellingDictionary(words, options.name, filename.toString(), applyKind(options), true);
+        return createSpellingDictionary(words, options.name, filename.toString(), toSpellingDictionaryOptions(options), true);
     }
     catch (e_1) {
         env_1.error = e_1;
@@ -283,7 +284,7 @@ async function wordsPerLineWordList(reader, filename, options) {
     if (options.kind === 'suggest-words') {
         return createSuggestDictionary([...words], options.name, filename.href);
     }
-    return createSpellingDictionary(words, options.name, filename.href, applyKind(options), true);
+    return createSpellingDictionary(words, options.name, filename.href, toSpellingDictionaryOptions(options), true);
 }
 async function loadSimpleWordList(reader, filename, options) {
     const env_2 = { stack: [], error: void 0, hasError: false };
@@ -296,7 +297,7 @@ async function loadSimpleWordList(reader, filename, options) {
         if (options.kind === 'suggest-words') {
             return createSuggestDictionary(lines, options.name, filename.href);
         }
-        return createSpellingDictionary(lines, options.name, filename.href, applyKind(options));
+        return createSpellingDictionary(lines, options.name, filename.href, toSpellingDictionaryOptions(options));
     }
     catch (e_2) {
         env_2.error = e_2;
@@ -317,7 +318,7 @@ async function loadTrie(reader, filename, options) {
         if (options.kind === 'suggest-words') {
             return createSuggestDictionaryFromTrieFile(content, options.name, filename.href);
         }
-        return createSpellingDictionaryFromTrieFile(content, options.name, filename.href, applyKind(options));
+        return createSpellingDictionaryFromTrieFile(content, options.name, filename.href, toSpellingDictionaryOptions(options));
     }
     catch (e_3) {
         env_3.error = e_3;
@@ -327,6 +328,21 @@ async function loadTrie(reader, filename, options) {
         __disposeResources(env_3);
     }
 }
+/**
+ * The options for a spelling dictionary: the effect of `kind`, and the dictionary's locale, normalized once here so
+ * lookups don't have to. A locale that isn't valid is dropped.
+ */
+function toSpellingDictionaryOptions(options) {
+    const opts = applyKind(options);
+    if (!isDictionaryFileDefinitionInternal(opts))
+        return opts;
+    const locales = normalizeLocaleForIntl(opts.dictionaryInformation?.locale);
+    const locale = Array.isArray(locales) ? locales[0] : locales;
+    if (!locale)
+        return opts;
+    // `weightMap` is a getter on some definitions, so copy it explicitly.
+    return { ...opts, weightMap: opts.weightMap, locale };
+}
 /**
  * Apply the effect of `kind` on the options passed to a normal `words` dictionary loader.
  * `flag-words` and `suggest-words` are handled by the callers directly since they use a different

package/dist/lib/suggestions.js

@@ -1,7 +1,7 @@
 import assert from 'node:assert';
 import { satisfiesCSpellConfigFile } from 'cspell-config-lib';
 import { finalizeSettings, getDefaultSettings, getGlobalSettingsAsync, mergeSettings, resolveConfigFileImports, } from './Settings/index.js';
-import { calcSettingsForLanguageId, isValidLocaleIntlFormat, normalizeLocaleIntl, } from './Settings/LanguageSettings.js';
+import { calcSettingsForLanguageId, normalizeLocaleForIntl } from './Settings/LanguageSettings.js';
 import { getDictionaryInternal, refreshDictionaryCache } from './SpellingDictionary/index.js';
 import { createAutoResolveCache } from './util/AutoResolve.js';
 import { memoizeLastCall } from './util/memoizeLastCall.js';
@@ -58,7 +58,7 @@ async function _suggestionsForWordAsync(word, options, settings, dictionaryColle
         : settings;
     const opts = { ignoreCase, numChanges, numSuggestions, includeTies };
     const suggestionsByDictionary = dictionaryCollection.dictionaries.flatMap((dict) => dict.suggest(word, opts).map((r) => ({ ...r, dictName: dict.name })));
-    const locale = adjustLocale(language || config.language || undefined);
+    const locale = normalizeLocaleForIntl(language || config.language || undefined);
     const collator = Intl.Collator(locale);
     const combined = limitResults(combine(suggestionsByDictionary.sort((a, b) => a.cost - b.cost || collator.compare(a.word, b.word))), numSuggestions, includeTies);
     const sugsAdjusted = calcSuggestionAdjustedToToMatchCase(word, combined, locale, ignoreCase, extendsDictionaryCollection);
@@ -87,18 +87,8 @@ function combine(suggestions) {
     }
     return [...words.values()];
 }
-function adjustLocale(locale) {
-    if (!locale)
-        return undefined;
-    const locales = [...normalizeLocaleIntl(locale)].filter((locale) => isValidLocaleIntlFormat(locale));
-    if (!locales.length)
-        return undefined;
-    if (locales.length === 1)
-        return locales[0];
-    return locales;
-}
 export function calcSuggestionAdjustedToToMatchCase(originalWord, sugs, locale, ignoreCase, dict) {
-    locale = adjustLocale(locale);
+    locale = normalizeLocaleForIntl(locale);
     const knownSugs = new Set(sugs.map((sug) => sug.word));
     const matchStyle = { ...analyzeCase(originalWord), locale, ignoreCase };
     /* Add adjusted words */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cspell-lib",
-  "version": "10.4.0-alpha.1",
+  "version": "10.4.0",
   "description": "A library of useful functions used across various cspell tools.",
   "publishConfig": {
     "access": "public",
@@ -75,22 +75,22 @@
     "watch": "tsc -p . --watch"
   },
   "dependencies": {
-    "@cspell/cspell-bundled-dicts": "10.4.0-alpha.1",
-    "@cspell/cspell-performance-monitor": "10.4.0-alpha.1",
-    "@cspell/cspell-pipe": "10.4.0-alpha.1",
-    "@cspell/cspell-resolver": "10.4.0-alpha.1",
-    "@cspell/cspell-types": "10.4.0-alpha.1",
-    "@cspell/dynamic-import": "10.4.0-alpha.1",
-    "@cspell/filetypes": "10.4.0-alpha.1",
-    "@cspell/rpc": "10.4.0-alpha.1",
-    "@cspell/strong-weak-map": "10.4.0-alpha.1",
-    "@cspell/url": "10.4.0-alpha.1",
-    "cspell-config-lib": "10.4.0-alpha.1",
-    "cspell-dictionary": "10.4.0-alpha.1",
-    "cspell-glob": "10.4.0-alpha.1",
-    "cspell-grammar": "10.4.0-alpha.1",
-    "cspell-io": "10.4.0-alpha.1",
-    "cspell-trie-lib": "10.4.0-alpha.1",
+    "@cspell/cspell-bundled-dicts": "10.4.0",
+    "@cspell/cspell-performance-monitor": "10.4.0",
+    "@cspell/cspell-pipe": "10.4.0",
+    "@cspell/cspell-resolver": "10.4.0",
+    "@cspell/cspell-types": "10.4.0",
+    "@cspell/dynamic-import": "10.4.0",
+    "@cspell/filetypes": "10.4.0",
+    "@cspell/rpc": "10.4.0",
+    "@cspell/strong-weak-map": "10.4.0",
+    "@cspell/url": "10.4.0",
+    "cspell-config-lib": "10.4.0",
+    "cspell-dictionary": "10.4.0",
+    "cspell-glob": "10.4.0",
+    "cspell-grammar": "10.4.0",
+    "cspell-io": "10.4.0",
+    "cspell-trie-lib": "10.4.0",
     "env-paths": "^4.0.0",
     "gensequence": "^8.0.8",
     "import-fresh": "^4.0.1",
@@ -100,16 +100,16 @@
     "xdg-basedir": "^5.1.0"
   },
   "devDependencies": {
-    "@cspell/dict-cpp": "^7.1.2",
+    "@cspell/dict-cpp": "^7.1.3",
     "@cspell/dict-csharp": "^4.0.8",
     "@cspell/dict-css": "^4.1.2",
-    "@cspell/dict-en_us": "^4.4.40",
-    "@cspell/dict-fa-ir": "^4.0.5",
+    "@cspell/dict-en_us": "^4.4.41",
+    "@cspell/dict-fa-ir": "^4.0.6",
     "@cspell/dict-fr-fr": "^2.3.2",
     "@cspell/dict-html": "^4.0.16",
     "@cspell/dict-nl-nl": "^2.4.2",
     "@cspell/dict-python": "^4.5.2",
-    "@cspell/dict-th-th": "^1.0.1",
+    "@cspell/dict-th-th": "^1.0.3",
     "@cspell/dictionary-bundler-plugin": "",
     "@types/configstore": "^6.0.2",
     "comment-json": "^5.0.0",
@@ -122,5 +122,5 @@
   "engines": {
     "node": ">=22.18.0"
   },
-  "gitHead": "628768a6e62b792e628189b41e63e12e5d3d8fe3"
+  "gitHead": "7e2bbb5e866c827ac5d2cf6b84bf3e1a016d0823"
 }