cspell-lib 6.30.2 → 6.31.0

package/dist/cjs/Settings/Controller/configLoader/normalizeRawSettings.d.ts

@@ -9,7 +9,7 @@ export declare function normalizeDictionaryDefs(settings: NormalizeDictionaryDef
     dictionaryDefinitions: import("../../../Models/CSpellSettingsInternalDef.js").DictionaryDefinitionInternalWithSource[] | undefined;
     languageSettings: import("../../../util/types.js").RemoveUndefined<{
         dictionaryDefinitions: import("../../../Models/CSpellSettingsInternalDef.js").DictionaryDefinitionInternalWithSource[] | undefined;
-        languageId: string | string[];
+        languageId: import("@cspell/cspell-types").MatchingFileType;
         locale?: string | string[];
         local?: string | string[];
         id?: string;

package/dist/cjs/Settings/LanguageSettings.js

@@ -151,7 +151,7 @@ function calcUserSettingsForLanguage(settings, languageId) {
 }
 exports.calcUserSettingsForLanguage = calcUserSettingsForLanguage;
 function calcSettingsForLanguageId(baseSettings, languageId) {
-    const langIds = ['*'].concat(languageId instanceof Array ? languageId : [languageId]);
+    const langIds = ['*', ...normalizeLanguageId(languageId)];
     const langSettings = langIds.reduce((settings, languageId) => {
         return calcUserSettingsForLanguage(settings, languageId);
     }, baseSettings);

package/dist/cjs/textValidation/checkText.js

@@ -43,10 +43,11 @@ const validator_js_1 = require("./validator.js");
  * @deprecated
  */
 async function checkText(text, settings) {
+    const languageId = settings.languageId || 'plaintext';
     const doc = (0, util_js_1.clean)({
         uri: '',
         text,
-        languageId: settings.languageId || 'plaintext',
+        languageId: Array.isArray(languageId) ? languageId.join(',') : languageId,
         locale: settings.language,
     });
     return checkTextDocument(doc, { noConfigSearch: true }, { loadDefaultConfiguration: false, ...settings });

package/dist/cjs/util/textRegex.d.ts

@@ -15,5 +15,6 @@ export declare const regExEscapeCharacters: RegExp;
 export declare const regExDanglingQuote: RegExp;
 /** Match tailing endings after CAPS words */
 export declare const regExTrailingEndings: RegExp;
+export declare const regExNumericLiteral: RegExp;
 export declare function stringToRegExp(pattern: string | RegExp, defaultFlags?: string, forceFlags?: string): RegExp | undefined;
 //# sourceMappingURL=textRegex.d.ts.map

package/dist/cjs/util/textRegex.js

@@ -1,17 +1,18 @@
 "use strict";
 // cspell:ignore ings ning gimuy anrvtbf gimuxy
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.stringToRegExp = exports.regExTrailingEndings = exports.regExDanglingQuote = exports.regExEscapeCharacters = exports.regExAccents = exports.regExMatchRegExParts = exports.regExPossibleWordBreaks = exports.regExAllLower = exports.regExAllUpper = exports.regExFirstUpper = exports.regExIgnoreCharacters = exports.regExWordsAndDigits = exports.regExWords = exports.regExSplitWords2 = exports.regExSplitWords = exports.regExUpperSOrIng = void 0;
+exports.stringToRegExp = exports.regExNumericLiteral = exports.regExTrailingEndings = exports.regExDanglingQuote = exports.regExEscapeCharacters = exports.regExAccents = exports.regExMatchRegExParts = exports.regExPossibleWordBreaks = exports.regExAllLower = exports.regExAllUpper = exports.regExFirstUpper = exports.regExIgnoreCharacters = exports.regExWordsAndDigits = exports.regExWords = exports.regExSplitWords2 = exports.regExSplitWords = exports.regExUpperSOrIng = void 0;
 exports.regExUpperSOrIng = /([\p{Lu}\p{M}]+\\?['’]?(?:s|ing|ies|es|ings|ed|ning))(?!\p{Ll})/gu;
 exports.regExSplitWords = /(\p{Ll}\p{M}?)(\p{Lu})/gu;
 exports.regExSplitWords2 = /(\p{Lu}\p{M}?)(\p{Lu}\p{M}?\p{Ll})/gu;
 exports.regExWords = /\p{L}\p{M}?(?:(?:\\?['’])?\p{L}\p{M}?)*/gu;
-exports.regExWordsAndDigits = /(?:\d+)?[\p{L}\p{M}_'’-](?:(?:\\?['’])?[\p{L}\p{M}\w'’.-])*/gu;
+// Words can be made of letters, numbers, period, underscore, dash, plus, and single quote
+exports.regExWordsAndDigits = /[\p{L}\w'’`.+-](?:(?:\\(?=[']))?[\p{L}\p{M}\w'’`.+-])*/gu;
 exports.regExIgnoreCharacters = /[\p{sc=Hiragana}\p{sc=Han}\p{sc=Katakana}\u30A0-\u30FF\p{sc=Hangul}]/gu;
 exports.regExFirstUpper = /^\p{Lu}\p{M}?\p{Ll}+$/u;
 exports.regExAllUpper = /^(?:\p{Lu}\p{M}?)+$/u;
 exports.regExAllLower = /^(?:\p{Ll}\p{M}?)+$/u;
-exports.regExPossibleWordBreaks = /[-_’'.]/g;
+exports.regExPossibleWordBreaks = /[-+_’'`.\s]/g;
 exports.regExMatchRegExParts = /^\s*\/([\s\S]*?)\/([gimuxy]*)\s*$/;
 exports.regExAccents = /\p{M}/gu;
 exports.regExEscapeCharacters = /(?<=\\)[anrvtbf]/gi;
@@ -19,6 +20,7 @@ exports.regExEscapeCharacters = /(?<=\\)[anrvtbf]/gi;
 exports.regExDanglingQuote = /(?<=(?:^|(?!\p{M})\P{L})(?:\p{L}\p{M}?)?)[']/gu;
 /** Match tailing endings after CAPS words */
 exports.regExTrailingEndings = /(?<=(?:\p{Lu}\p{M}?){2})['’]?(?:s|d|ings?|ies|e[ds]?|ning|th|nth)(?!\p{Ll})/gu;
+exports.regExNumericLiteral = /^[-+]?(?:\d+(?:\.\d*)?|\.\d+)(?:[eE][-+]?\d+)?$/;
 function stringToRegExp(pattern, defaultFlags = 'gimu', forceFlags = 'g') {
     if (pattern instanceof RegExp) {
         return pattern;

package/dist/cjs/util/wordSplitter.d.ts

@@ -23,6 +23,7 @@ export interface TextOffsetWithValid extends TextOffset {
 export interface SplitOptions extends WordBreakOptions {
 }
 export declare function split(line: TextOffset, offset: number, isValidWord: IsValidWordFn, options?: SplitOptions): SplitResult;
+declare function findNextWordText({ text, offset }: TextOffset): TextOffset;
 type BreakPairs = readonly number[];
 interface PossibleWordBreak {
     /** offset from the start of the string */
@@ -41,6 +42,7 @@ interface WordBreakOptions {
 declare function generateWordBreaks(line: LineSegment, options: WordBreakOptions): SortedBreaks;
 export declare const __testing__: {
     generateWordBreaks: typeof generateWordBreaks;
+    findNextWordText: typeof findNextWordText;
 };
 export {};
 //# sourceMappingURL=wordSplitter.d.ts.map

package/dist/cjs/util/wordSplitter.js

@@ -9,6 +9,7 @@ function split(line, offset, isValidWord, options = {}) {
     const relWordToSplit = findNextWordText({ text: line.text, offset: offset - line.offset });
     const lineOffset = line.offset;
     const requested = new Map();
+    const regExpIgnoreSegment = /^[-.+\d_eE'`\\\s]+$/;
     if (!relWordToSplit.text) {
         const text = rebaseTextOffset(relWordToSplit);
         return {
@@ -42,6 +43,9 @@ function split(line, offset, isValidWord, options = {}) {
         };
     }
     function has(word) {
+        if (regExpIgnoreSegment.test(word.text)) {
+            return true;
+        }
         const i = word.offset;
         const j = word.text.length;
         let v = i + (j << 20);
@@ -84,6 +88,10 @@ function findNextWordText({ text, offset }) {
             offset: offset + text.length,
         };
     }
+    // Skip numeric literals.
+    if (textRegex_js_1.regExNumericLiteral.test(m[0])) {
+        return findNextWordText({ text, offset: offset + m[0].length });
+    }
     return {
         text: m[0],
         offset: m.index,
@@ -322,5 +330,6 @@ function mergeSortedBreaks(...maps) {
 }
 exports.__testing__ = {
     generateWordBreaks,
+    findNextWordText,
 };
 //# sourceMappingURL=wordSplitter.js.map

package/dist/esm/Settings/Controller/configLoader/normalizeRawSettings.d.mts

@@ -9,7 +9,7 @@ export declare function normalizeDictionaryDefs(settings: NormalizeDictionaryDef
     dictionaryDefinitions: import("../../../Models/CSpellSettingsInternalDef.js").DictionaryDefinitionInternalWithSource[] | undefined;
     languageSettings: import("../../../util/types.js").RemoveUndefined<{
         dictionaryDefinitions: import("../../../Models/CSpellSettingsInternalDef.js").DictionaryDefinitionInternalWithSource[] | undefined;
-        languageId: string | string[];
+        languageId: import("@cspell/cspell-types").MatchingFileType;
         locale?: string | string[];
         local?: string | string[];
         id?: string;

package/dist/esm/Settings/LanguageSettings.mjs

@@ -117,7 +117,7 @@ export function calcUserSettingsForLanguage(settings, languageId) {
     return SpellSettings.mergeSettings(settings, langSettings);
 }
 export function calcSettingsForLanguageId(baseSettings, languageId) {
-    const langIds = ['*'].concat(languageId instanceof Array ? languageId : [languageId]);
+    const langIds = ['*', ...normalizeLanguageId(languageId)];
     const langSettings = langIds.reduce((settings, languageId) => {
         return calcUserSettingsForLanguage(settings, languageId);
     }, baseSettings);

package/dist/esm/textValidation/checkText.mjs

@@ -14,10 +14,11 @@ import { validateText } from './validator.mjs';
  * @deprecated
  */
 export async function checkText(text, settings) {
+    const languageId = settings.languageId || 'plaintext';
     const doc = clean({
         uri: '',
         text,
-        languageId: settings.languageId || 'plaintext',
+        languageId: Array.isArray(languageId) ? languageId.join(',') : languageId,
         locale: settings.language,
     });
     return checkTextDocument(doc, { noConfigSearch: true }, { loadDefaultConfiguration: false, ...settings });

package/dist/esm/util/textRegex.d.mts

@@ -15,5 +15,6 @@ export declare const regExEscapeCharacters: RegExp;
 export declare const regExDanglingQuote: RegExp;
 /** Match tailing endings after CAPS words */
 export declare const regExTrailingEndings: RegExp;
+export declare const regExNumericLiteral: RegExp;
 export declare function stringToRegExp(pattern: string | RegExp, defaultFlags?: string, forceFlags?: string): RegExp | undefined;
 //# sourceMappingURL=textRegex.d.mts.map

package/dist/esm/util/textRegex.mjs

@@ -3,12 +3,13 @@ export const regExUpperSOrIng = /([\p{Lu}\p{M}]+\\?['’]?(?:s|ing|ies|es|ings|e
 export const regExSplitWords = /(\p{Ll}\p{M}?)(\p{Lu})/gu;
 export const regExSplitWords2 = /(\p{Lu}\p{M}?)(\p{Lu}\p{M}?\p{Ll})/gu;
 export const regExWords = /\p{L}\p{M}?(?:(?:\\?['’])?\p{L}\p{M}?)*/gu;
-export const regExWordsAndDigits = /(?:\d+)?[\p{L}\p{M}_'’-](?:(?:\\?['’])?[\p{L}\p{M}\w'’.-])*/gu;
+// Words can be made of letters, numbers, period, underscore, dash, plus, and single quote
+export const regExWordsAndDigits = /[\p{L}\w'’`.+-](?:(?:\\(?=[']))?[\p{L}\p{M}\w'’`.+-])*/gu;
 export const regExIgnoreCharacters = /[\p{sc=Hiragana}\p{sc=Han}\p{sc=Katakana}\u30A0-\u30FF\p{sc=Hangul}]/gu;
 export const regExFirstUpper = /^\p{Lu}\p{M}?\p{Ll}+$/u;
 export const regExAllUpper = /^(?:\p{Lu}\p{M}?)+$/u;
 export const regExAllLower = /^(?:\p{Ll}\p{M}?)+$/u;
-export const regExPossibleWordBreaks = /[-_’'.]/g;
+export const regExPossibleWordBreaks = /[-+_’'`.\s]/g;
 export const regExMatchRegExParts = /^\s*\/([\s\S]*?)\/([gimuxy]*)\s*$/;
 export const regExAccents = /\p{M}/gu;
 export const regExEscapeCharacters = /(?<=\\)[anrvtbf]/gi;
@@ -16,6 +17,7 @@ export const regExEscapeCharacters = /(?<=\\)[anrvtbf]/gi;
 export const regExDanglingQuote = /(?<=(?:^|(?!\p{M})\P{L})(?:\p{L}\p{M}?)?)[']/gu;
 /** Match tailing endings after CAPS words */
 export const regExTrailingEndings = /(?<=(?:\p{Lu}\p{M}?){2})['’]?(?:s|d|ings?|ies|e[ds]?|ning|th|nth)(?!\p{Ll})/gu;
+export const regExNumericLiteral = /^[-+]?(?:\d+(?:\.\d*)?|\.\d+)(?:[eE][-+]?\d+)?$/;
 export function stringToRegExp(pattern, defaultFlags = 'gimu', forceFlags = 'g') {
     if (pattern instanceof RegExp) {
         return pattern;

package/dist/esm/util/wordSplitter.d.mts

@@ -23,6 +23,7 @@ export interface TextOffsetWithValid extends TextOffset {
 export interface SplitOptions extends WordBreakOptions {
 }
 export declare function split(line: TextOffset, offset: number, isValidWord: IsValidWordFn, options?: SplitOptions): SplitResult;
+declare function findNextWordText({ text, offset }: TextOffset): TextOffset;
 type BreakPairs = readonly number[];
 interface PossibleWordBreak {
     /** offset from the start of the string */
@@ -41,6 +42,7 @@ interface WordBreakOptions {
 declare function generateWordBreaks(line: LineSegment, options: WordBreakOptions): SortedBreaks;
 export declare const __testing__: {
     generateWordBreaks: typeof generateWordBreaks;
+    findNextWordText: typeof findNextWordText;
 };
 export {};
 //# sourceMappingURL=wordSplitter.d.mts.map

package/dist/esm/util/wordSplitter.mjs

@@ -1,11 +1,12 @@
 import { PairingHeap } from './PairingHeap.mjs';
 import { escapeRegEx } from './regexHelper.mjs';
-import { regExDanglingQuote, regExEscapeCharacters, regExPossibleWordBreaks, regExSplitWords, regExSplitWords2, regExTrailingEndings, regExWordsAndDigits, } from './textRegex.mjs';
+import { regExDanglingQuote, regExEscapeCharacters, regExNumericLiteral, regExPossibleWordBreaks, regExSplitWords, regExSplitWords2, regExTrailingEndings, regExWordsAndDigits, } from './textRegex.mjs';
 const ignoreBreak = Object.freeze([]);
 export function split(line, offset, isValidWord, options = {}) {
     const relWordToSplit = findNextWordText({ text: line.text, offset: offset - line.offset });
     const lineOffset = line.offset;
     const requested = new Map();
+    const regExpIgnoreSegment = /^[-.+\d_eE'`\\\s]+$/;
     if (!relWordToSplit.text) {
         const text = rebaseTextOffset(relWordToSplit);
         return {
@@ -39,6 +40,9 @@ export function split(line, offset, isValidWord, options = {}) {
         };
     }
     function has(word) {
+        if (regExpIgnoreSegment.test(word.text)) {
+            return true;
+        }
         const i = word.offset;
         const j = word.text.length;
         let v = i + (j << 20);
@@ -80,6 +84,10 @@ function findNextWordText({ text, offset }) {
             offset: offset + text.length,
         };
     }
+    // Skip numeric literals.
+    if (regExNumericLiteral.test(m[0])) {
+        return findNextWordText({ text, offset: offset + m[0].length });
+    }
     return {
         text: m[0],
         offset: m.index,
@@ -318,4 +326,5 @@ function mergeSortedBreaks(...maps) {
 }
 export const __testing__ = {
     generateWordBreaks,
+    findNextWordText,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cspell-lib",
-  "version": "6.30.2",
+  "version": "6.31.0",
   "description": "A library of useful functions used across various cspell tools.",
   "type": "commonjs",
   "main": "dist/cjs/index.js",
@@ -57,19 +57,19 @@
   },
   "homepage": "https://github.com/streetsidesoftware/cspell#readme",
   "dependencies": {
-    "@cspell/cspell-bundled-dicts": "6.30.2",
-    "@cspell/cspell-pipe": "6.30.2",
-    "@cspell/cspell-types": "6.30.2",
-    "@cspell/strong-weak-map": "6.30.2",
+    "@cspell/cspell-bundled-dicts": "6.31.0",
+    "@cspell/cspell-pipe": "6.31.0",
+    "@cspell/cspell-types": "6.31.0",
+    "@cspell/strong-weak-map": "6.31.0",
     "clear-module": "^4.1.2",
     "comment-json": "^4.2.3",
     "configstore": "^5.0.1",
     "cosmiconfig": "8.0.0",
-    "cspell-dictionary": "6.30.2",
-    "cspell-glob": "6.30.2",
-    "cspell-grammar": "6.30.2",
-    "cspell-io": "6.30.2",
-    "cspell-trie-lib": "6.30.2",
+    "cspell-dictionary": "6.31.0",
+    "cspell-glob": "6.31.0",
+    "cspell-grammar": "6.31.0",
+    "cspell-io": "6.31.0",
+    "cspell-trie-lib": "6.31.0",
     "fast-equals": "^4.0.3",
     "find-up": "^5.0.0",
     "gensequence": "^5.0.2",
@@ -99,5 +99,5 @@
     "lorem-ipsum": "^2.0.8",
     "ts-jest": "^29.0.5"
   },
-  "gitHead": "4da6895c680084f3b741ad24a73c5bb011a57b35"
+  "gitHead": "1c0c3eb875bc1aab334bd56d952c0d0964468b7a"
 }