cspell-lib 10.4.0 → 10.4.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/README.md +1 -1
  2. package/dist/lib/Settings/Controller/configLoader/normalizeRawSettings.js +1 -1
  3. package/dist/lib/Settings/InDocSettings.js +13 -2
  4. package/dist/lib/Settings/LanguageSettings.d.ts +5 -8
  5. package/dist/lib/Settings/LanguageSettings.js +24 -36
  6. package/dist/lib/Transform/IntlSegmentTextTransformer.js +2 -2
  7. package/package.json +23 -26
package/README.md CHANGED
@@ -10,7 +10,7 @@ If our spell checkers save you time, please consider supporting their developmen
10
10
 
11
11
  Please show your support through one of the following sites:
12
12
 
13
- [![GitHub Sponsor](https://cspell.org/img/sponsor/github-sponsor-176px.png)](https://github.com/sponsors/streetsidesoftware) [![PayPal](https://cspell.org/img/sponsor/paypal-176px.png)](https://www.paypal.com/donate/?hosted_button_id=26LNBP2Q6MKCY) [![Open Collective](https://cspell.org/img/sponsor/open-collective-176px.png)](https://opencollective.com/cspell) [![CSpell](https://cspell.org/img/sponsor/cspell-176px.png)](https://streetsidesoftware.com/sponsor/)
13
+ [![GitHub Sponsor](https://cspell.org/img/sponsor/github-sponsor-176px.png)](https://github.com/sponsors/streetsidesoftware) [![PayPal](https://cspell.org/img/sponsor/paypal-176px.png)](https://www.paypal.com/donate/?hosted_button_id=26LNBP2Q6MKCY) [![Open Collective](https://cspell.org/img/sponsor/open-collective-176px.png)](https://opencollective.com/cspell) [![CSpell](https://cspell.org/img/sponsor/cspell-176px.png)](https://streetsidesoftware.com/sponsor/)
14
14
 
15
15
  <!--- @@inject-end: ../../static/sponsor.md --->
16
16
 
package/dist/lib/Settings/Controller/configLoader/normalizeRawSettings.js CHANGED
@@ -56,7 +56,7 @@ export async function normalizeReporters(settings, pathToSettingsFile) {
56
56
  return resolve(s);
57
57
  }
58
58
  if (!Array.isArray(s) || typeof s[0] !== 'string')
59
- throw new Error('Invalid Reporter');
59
+ throw new TypeError('Invalid Reporter');
60
60
  // Preserve the shape of Reporter Setting while resolving the reporter file.
61
61
  const [r, ...rest] = s;
62
62
  return [await resolve(r), ...rest];
package/dist/lib/Settings/InDocSettings.js CHANGED
@@ -213,9 +213,20 @@ function reduceWordList(acc, match, key) {
213
213
  function parseWords(acc, match) {
214
214
  return reduceWordList(acc, match, 'words');
215
215
  }
216
+ // a non-perfect but reasonable regex to match locale-like strings
217
+ // must match "lorem-ipsum" and similar fake locale-like strings
218
+ const localeLikeRegEx = /^[a-z][a-z0-9_-]{0,16}[a-z0-9]$/i;
216
219
  function parseLocale(acc, match) {
217
- const parts = match.trim().split(/[\s,]+/);
218
- const language = parts.slice(1).join(',');
220
+ // Remove the closing marker of an HTML or block comment, it is not a locale.
221
+ const parts = match
222
+ .replace(/[^a-z0-9]+$/i, '')
223
+ .split(/[\s,]+/)
224
+ .slice(1);
225
+ const stop = parts.findIndex((locale) => !localeLikeRegEx.test(locale));
226
+ if (stop !== -1) {
227
+ parts.splice(stop);
228
+ }
229
+ const language = parts.join(',');
219
230
  if (language) {
220
231
  acc.language = language;
221
232
  }
package/dist/lib/Settings/LanguageSettings.d.ts CHANGED
@@ -3,21 +3,18 @@ export type LanguageSettings = LanguageSetting[];
3
3
  export declare function getDefaultLanguageSettings(): LanguageSettings;
4
4
  export declare function normalizeLanguageId(langId: LanguageId | LanguageId[]): Set<LanguageId>;
5
5
  export declare function normalizeLocale(locale: LocaleId | LocaleId[]): Set<LocaleId>;
6
+ /**
7
+ * Normalize locales to the form `Intl` uses, for example `en_us` becomes `en-US`.
8
+ * Locales that `Intl` rejects are dropped.
9
+ */
6
10
  export declare function normalizeLocaleIntl(locale: LocaleId | LocaleId[]): Set<LocaleId>;
7
11
  export declare function isLocaleInSet(locale: LocaleId | LocaleId[], setOfLocals: Set<LocaleId>): boolean;
8
12
  /**
9
- * Normalize a locale for use with `Intl` and `toLocaleLowerCase`. Locales that aren't valid are dropped.
13
+ * Normalize a locale for use with `Intl` and `toLocaleLowerCase`. Locales that `Intl` rejects are dropped.
10
14
  * @param locale - a locale or a list of locales, for example `en,tr_TR`.
11
15
  * @returns the valid locales, or `undefined` if there are none.
12
16
  */
13
17
  export declare function normalizeLocaleForIntl(locale: LocaleId | LocaleId[] | undefined): string | string[] | undefined;
14
- /**
15
- * Test if a locale should be ok with Intl
16
- * @param locale - locale string
17
- * @param strict - case must match
18
- * @returns true if it matches the standard 2 letter or 4 letter forms.
19
- */
20
- export declare function isValidLocaleIntlFormat(locale: LocaleId | LocaleId[], strict?: boolean): boolean;
21
18
  export declare function calcSettingsForLanguage(languageSettings: LanguageSettings, languageId: LanguageId, locale: LocaleId): BaseSetting;
22
19
  export declare function calcUserSettingsForLanguage(settings: CSpellUserSettings, languageId: string): CSpellUserSettings;
23
20
  export declare function calcSettingsForLanguageId(baseSettings: CSpellUserSettings, languageId: LanguageId[] | LanguageId): CSpellUserSettings;
package/dist/lib/Settings/LanguageSettings.js CHANGED
@@ -37,62 +37,50 @@ export function normalizeLocale(locale) {
37
37
  locale = typeof locale === 'string' ? locale : locale.join(',');
38
38
  return _normalizeLocale(locale);
39
39
  }
40
- export function normalizeLocaleIntl(locale) {
41
- const values = [...normalizeLocale(locale)].map((locale) => locale.replace(/^([a-z]{2})(?:-?([a-z]{4}))?-?([a-z]{2})$/, (_, lang, script, region) => toLocaleIntl(lang, script, region)));
42
- return new Set(values);
43
- }
44
40
  /**
45
- * See: https://developer.mozilla.org/en-US/docs/Glossary/BCP_47_language_tag
46
- * @returns locale normalized to BCP_47
41
+ * Normalize locales to the form `Intl` uses, for example `en_us` becomes `en-US`.
42
+ * Locales that `Intl` rejects are dropped.
47
43
  */
48
- function toLocaleIntl(lang, script, region) {
49
- const parts = [lang];
50
- if (script)
51
- parts.push(firstUpper(script.toLowerCase()));
52
- if (region)
53
- parts.push(region.toUpperCase());
54
- return parts.join('-');
55
- }
56
- function firstUpper(str) {
57
- const [first, ...rest] = [...str];
58
- return [first.toUpperCase(), ...rest].join('');
44
+ export function normalizeLocaleIntl(locale) {
45
+ return _normalizeLocaleIntl(typeof locale === 'string' ? locale : locale.join(','));
46
+ }
47
+ const _normalizeLocaleIntl = memoize(__normalizeLocaleIntl);
48
+ function __normalizeLocaleIntl(locale) {
49
+ const locales = localesToList(locale)
50
+ .map((locale) => toLocaleIntl(locale.replaceAll('_', '-')))
51
+ .filter((locale) => locale !== undefined);
52
+ return new Set(locales);
53
+ }
54
+ // A locale written without separators, for example `enUS` or `zhHantTW`.
55
+ const regExpLocaleWithoutSeparators = /^([a-z]{2})([a-z]{4})?([a-z]{2})$/i;
56
+ function toLocaleIntl(locale) {
57
+ locale = locale.replace(regExpLocaleWithoutSeparators, (_, lang, script, region) => script ? `${lang}-${script}-${region}` : `${lang}-${region}`);
58
+ try {
59
+ return Intl.getCanonicalLocales(locale)[0];
60
+ }
61
+ catch {
62
+ return undefined;
63
+ }
59
64
  }
60
65
  export function isLocaleInSet(locale, setOfLocals) {
61
66
  const locales = normalizeLocale(locale);
62
67
  return doSetsIntersect(locales, setOfLocals);
63
68
  }
64
69
  /**
65
- * Normalize a locale for use with `Intl` and `toLocaleLowerCase`. Locales that aren't valid are dropped.
70
+ * Normalize a locale for use with `Intl` and `toLocaleLowerCase`. Locales that `Intl` rejects are dropped.
66
71
  * @param locale - a locale or a list of locales, for example `en,tr_TR`.
67
72
  * @returns the valid locales, or `undefined` if there are none.
68
73
  */
69
74
  export function normalizeLocaleForIntl(locale) {
70
75
  if (!locale)
71
76
  return undefined;
72
- const locales = [...normalizeLocaleIntl(locale)].filter((locale) => isValidLocaleIntlFormat(locale));
77
+ const locales = [...normalizeLocaleIntl(locale)];
73
78
  if (!locales.length)
74
79
  return undefined;
75
80
  if (locales.length === 1)
76
81
  return locales[0];
77
82
  return locales;
78
83
  }
79
- const regExpValidIntlLocaleStrict = /^[a-z]{2}(-[A-Z]{2})?$/;
80
- const regExpValidIntlLocale = new RegExp(regExpValidIntlLocaleStrict, 'i');
81
- /**
82
- * Test if a locale should be ok with Intl
83
- * @param locale - locale string
84
- * @param strict - case must match
85
- * @returns true if it matches the standard 2 letter or 4 letter forms.
86
- */
87
- export function isValidLocaleIntlFormat(locale, strict = false) {
88
- if (typeof locale === 'string')
89
- return strict ? regExpValidIntlLocaleStrict.test(locale) : regExpValidIntlLocale.test(locale);
90
- for (const item of locale) {
91
- if (!isValidLocaleIntlFormat(item, strict))
92
- return false;
93
- }
94
- return locale.length > 0;
95
- }
96
84
  const cacheCalcSettingsForLanguage = createAutoResolveWeakCache();
97
85
  export function calcSettingsForLanguage(languageSettings, languageId, locale) {
98
86
  return cacheCalcSettingsForLanguage
package/dist/lib/Transform/IntlSegmentTextTransformer.js CHANGED
@@ -1,11 +1,11 @@
1
- import { normalizeLocaleIntl } from '../Settings/LanguageSettings.js';
1
+ import { normalizeLocaleForIntl } from '../Settings/LanguageSettings.js';
2
2
  import { applyEditsToMappedText } from './TextMapEdit.js';
3
3
  import { softHyphen, toMappedText } from './Transformer.js';
4
4
  const regExSplitWordCharacters = /(?<=[\p{L}\p{M}])[\p{L}\p{M}]/uy;
5
5
  export class IntlSegmentTextTransformer {
6
6
  #locale;
7
7
  constructor(locale) {
8
- this.#locale = [...normalizeLocaleIntl(locale)];
8
+ this.#locale = normalizeLocaleForIntl(locale);
9
9
  }
10
10
  transform(text) {
11
11
  // Implement the transformation logic here
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "cspell-lib",
3
- "version": "10.4.0",
3
+ "version": "10.4.1",
4
4
  "description": "A library of useful functions used across various cspell tools.",
5
5
  "publishConfig": {
6
6
  "access": "public",
@@ -75,46 +75,43 @@
75
75
  "watch": "tsc -p . --watch"
76
76
  },
77
77
  "dependencies": {
78
- "@cspell/cspell-bundled-dicts": "10.4.0",
79
- "@cspell/cspell-performance-monitor": "10.4.0",
80
- "@cspell/cspell-pipe": "10.4.0",
81
- "@cspell/cspell-resolver": "10.4.0",
82
- "@cspell/cspell-types": "10.4.0",
83
- "@cspell/dynamic-import": "10.4.0",
84
- "@cspell/filetypes": "10.4.0",
85
- "@cspell/rpc": "10.4.0",
86
- "@cspell/strong-weak-map": "10.4.0",
87
- "@cspell/url": "10.4.0",
88
- "cspell-config-lib": "10.4.0",
89
- "cspell-dictionary": "10.4.0",
90
- "cspell-glob": "10.4.0",
91
- "cspell-grammar": "10.4.0",
92
- "cspell-io": "10.4.0",
93
- "cspell-trie-lib": "10.4.0",
78
+ "@cspell/cspell-bundled-dicts": "10.4.1",
79
+ "@cspell/cspell-performance-monitor": "10.4.1",
80
+ "@cspell/cspell-pipe": "10.4.1",
81
+ "@cspell/cspell-resolver": "10.4.1",
82
+ "@cspell/cspell-types": "10.4.1",
83
+ "@cspell/dynamic-import": "10.4.1",
84
+ "@cspell/filetypes": "10.4.1",
85
+ "@cspell/rpc": "10.4.1",
86
+ "@cspell/strong-weak-map": "10.4.1",
87
+ "@cspell/url": "10.4.1",
88
+ "cspell-config-lib": "10.4.1",
89
+ "cspell-dictionary": "10.4.1",
90
+ "cspell-glob": "10.4.1",
91
+ "cspell-grammar": "10.4.1",
92
+ "cspell-io": "10.4.1",
93
+ "cspell-trie-lib": "10.4.1",
94
94
  "env-paths": "^4.0.0",
95
95
  "gensequence": "^8.0.8",
96
96
  "import-fresh": "^4.0.1",
97
97
  "resolve-from": "^5.0.0",
98
- "vscode-languageserver-textdocument": "^1.0.15",
98
+ "vscode-languageserver-textdocument": "^1.0.16",
99
99
  "vscode-uri": "^3.2.0",
100
100
  "xdg-basedir": "^5.1.0"
101
101
  },
102
102
  "devDependencies": {
103
- "@cspell/dict-cpp": "^7.1.3",
103
+ "@cspell/dict-cpp": "^7.2.0",
104
104
  "@cspell/dict-csharp": "^4.0.8",
105
105
  "@cspell/dict-css": "^4.1.2",
106
- "@cspell/dict-en_us": "^4.4.41",
106
+ "@cspell/dict-en_us": "^4.4.43",
107
107
  "@cspell/dict-fa-ir": "^4.0.6",
108
108
  "@cspell/dict-fr-fr": "^2.3.2",
109
109
  "@cspell/dict-html": "^4.0.16",
110
110
  "@cspell/dict-nl-nl": "^2.4.2",
111
- "@cspell/dict-python": "^4.5.2",
112
- "@cspell/dict-th-th": "^1.0.3",
111
+ "@cspell/dict-python": "^4.5.3",
112
+ "@cspell/dict-th-th": "^1.0.4",
113
113
  "@cspell/dictionary-bundler-plugin": "",
114
- "@types/configstore": "^6.0.2",
115
114
  "comment-json": "^5.0.0",
116
- "configstore": "^8.0.0",
117
- "cspell-dict-nl-nl": "^1.1.2",
118
115
  "leaked-handles": "^5.2.0",
119
116
  "lorem-ipsum": "^3.0.0",
120
117
  "perf-insight": "^2.0.1"
@@ -122,5 +119,5 @@
122
119
  "engines": {
123
120
  "node": ">=22.18.0"
124
121
  },
125
- "gitHead": "7e2bbb5e866c827ac5d2cf6b84bf3e1a016d0823"
122
+ "gitHead": "ddb1699a4bfc2766675c2c97412a813d775772eb"
126
123
  }