cspell-lib 6.1.3-alpha.0 → 6.1.3-alpha.1

package/dist/Settings/CSpellSettingsServer.js

@@ -22,8 +22,12 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.__testing__ = exports.extractDependencies = exports.getSources = exports.checkFilenameMatchesGlob = exports.toInternalSettings = exports.finalizeSettings = exports.calcOverrideSettings = exports.mergeInDocSettings = exports.mergeSettings = exports.ENV_CSPELL_GLOB_ROOT = exports.currentSettingsFileVersion = exports.configSettingsFileVersion0_2 = exports.configSettingsFileVersion0_1 = void 0;
+const assert_1 = __importDefault(require("assert"));
 const cspell_glob_1 = require("cspell-glob");
 const path = __importStar(require("path"));
 const CSpellSettingsInternalDef_1 = require("../Models/CSpellSettingsInternalDef");
@@ -224,6 +228,7 @@ function _finalizeSettings(settings) {
         finalized: true,
         ignoreRegExpList: (0, patterns_1.resolvePatterns)(settings.ignoreRegExpList, settings.patterns),
         includeRegExpList: (0, patterns_1.resolvePatterns)(settings.includeRegExpList, settings.patterns),
+        parser: resolveParser(settings),
     };
     finalized.name = 'Finalized ' + (finalized.name || '');
     finalized.source = { name: settings.name || 'src', sources: [settings] };
@@ -320,6 +325,39 @@ function resolveCwd() {
     const cwd = envGlobRoot || process.cwd();
     return cwd;
 }
+function resolveParser(settings) {
+    if (!settings.parser)
+        return undefined;
+    if (typeof settings.parser === 'function')
+        return settings.parser;
+    const parserName = settings.parser;
+    (0, assert_1.default)(typeof parserName === 'string');
+    const parsers = extractParsers(settings.plugins);
+    const parser = parsers.get(parserName);
+    (0, assert_1.default)(parser, `Parser "${parserName}" not found.`);
+    return parser;
+}
+const parserCache = new WeakMap();
+const emptyParserMap = new Map();
+function extractParsers(plugins) {
+    if (!plugins || !plugins.length)
+        return emptyParserMap;
+    const found = parserCache.get(plugins);
+    if (found)
+        return found;
+    function* parsers(plugins) {
+        for (const plugin of plugins) {
+            if (!plugin.parsers)
+                continue;
+            for (const parser of plugin.parsers) {
+                yield [parser.name, parser];
+            }
+        }
+    }
+    const map = new Map(parsers(plugins));
+    parserCache.set(plugins, map);
+    return map;
+}
 exports.__testing__ = {
     mergeObjects,
 };

package/dist/textValidation/docValidator.d.ts

@@ -1,9 +1,9 @@
-import type { CSpellUserSettings } from '@cspell/cspell-types';
-import { CSpellSettingsInternal } from '../Models/CSpellSettingsInternalDef';
+import type { CSpellUserSettings, ParsedText } from '@cspell/cspell-types';
+import { CSpellSettingsInternal, CSpellSettingsInternalFinalized } from '../Models/CSpellSettingsInternalDef';
 import { TextDocument } from '../Models/TextDocument';
 import { SpellingDictionaryCollection } from '../SpellingDictionary';
 import { MatchRange } from '../util/TextRange';
-import { ParsedText, SimpleRange } from './parsedText';
+import { SimpleRange } from './parsedText';
 import { LineValidator, ValidationOptions, type LineSegment } from './textValidator';
 import { ValidateTextOptions, ValidationIssue } from './validator';
 export interface DocumentValidatorOptions extends ValidateTextOptions {
@@ -51,10 +51,12 @@ export declare class DocumentValidator {
     checkDocument(forceCheck?: boolean): ValidationIssue[];
     get document(): TextDocument;
     updateDocumentText(text: string): void;
-    private checkDocumentLines;
+    private defaultParser;
+    private _checkParsedText;
     private addPossibleError;
     private catchError;
     private errorCatcherWrapper;
+    private _parse;
     private suggest;
     private genSuggestions;
     getFinalizedDocSettings(): CSpellSettingsInternal;
@@ -77,6 +79,7 @@ interface Preparations {
     dictionary: SpellingDictionaryCollection;
     /** configuration after applying in-doc settings */
     docSettings: CSpellSettingsInternal;
+    finalSettings: CSpellSettingsInternalFinalized;
     includeRanges: MatchRange[];
     lineValidator: LineValidator;
     segmenter: (lineSegment: LineSegment) => LineSegment[];

package/dist/textValidation/docValidator.js

@@ -70,6 +70,7 @@ class DocumentValidator {
             config,
             dictionary: dict,
             docSettings,
+            finalSettings,
             shouldCheck,
             validateOptions,
             includeRanges,
@@ -117,6 +118,7 @@ class DocumentValidator {
             config,
             dictionary: dict,
             docSettings,
+            finalSettings,
             shouldCheck,
             validateOptions,
             includeRanges,
@@ -160,7 +162,7 @@ class DocumentValidator {
     }
     checkText(range, _text, scope) {
         const text = this._document.text.slice(range[0], range[1]);
-        return this.check({ text, range, scope });
+        return this.check({ text, range, scope: scope.join(' ') });
     }
     check(parsedText) {
         (0, assert_1.default)(this._ready);
@@ -195,7 +197,7 @@ class DocumentValidator {
     checkDocument(forceCheck = false) {
         (0, assert_1.default)(this._ready);
         (0, assert_1.default)(this._preparations, ERROR_NOT_PREPARED);
-        return forceCheck || this.shouldCheckDocument() ? [...this.checkDocumentLines()] : [];
+        return forceCheck || this.shouldCheckDocument() ? [...this._checkParsedText(this._parse())] : [];
     }
     get document() {
         return this._document;
@@ -204,15 +206,20 @@ class DocumentValidator {
         (0, TextDocument_1.updateTextDocument)(this._document, [{ text }]);
         this._updatePrep();
     }
-    *checkDocumentLines() {
+    defaultParser() {
+        return (0, cspell_pipe_1.pipeSync)(this.document.getLines(), (0, cspell_pipe_1.opMap)((line) => {
+            const { text, offset } = line;
+            const range = [offset, offset + text.length];
+            return { text, range };
+        }));
+    }
+    *_checkParsedText(parsedTexts) {
         (0, assert_1.default)(this._preparations, ERROR_NOT_PREPARED);
         const { maxNumberOfProblems = textValidator_1.defaultMaxNumberOfProblems, maxDuplicateProblems = textValidator_1.defaultMaxDuplicateProblems } = this._preparations.validateOptions;
         let numProblems = 0;
         const mapOfProblems = new Map();
-        for (const line of this.document.getLines()) {
-            const { text, offset } = line;
-            const range = [offset, offset + text.length];
-            for (const issue of this.check({ text, range })) {
+        for (const pText of parsedTexts) {
+            for (const issue of this.check(pText)) {
                 const { text } = issue;
                 const n = (mapOfProblems.get(text) || 0) + 1;
                 mapOfProblems.set(text, n);
@@ -244,6 +251,13 @@ class DocumentValidator {
         }
         return undefined;
     }
+    _parse() {
+        (0, assert_1.default)(this._preparations, ERROR_NOT_PREPARED);
+        const parser = this._preparations.finalSettings.parser;
+        if (typeof parser !== 'object')
+            return this.defaultParser();
+        return parser.parse(this.document.text, this.document.uri.path).parsedTexts;
+    }
     suggest(text) {
         return this._suggestions.get(text);
     }

package/dist/textValidation/index.d.ts

@@ -4,5 +4,5 @@ export { checkText, IncludeExcludeFlag, validateText } from './validator';
 export type { CheckTextInfo, TextInfoItem, ValidateTextOptions, ValidationIssue } from './validator';
 export { DocumentValidator } from './docValidator';
 export type { DocumentValidatorOptions } from './docValidator';
-export type { Offset, SimpleRange, ParsedText } from './parsedText';
+export type { Offset, SimpleRange } from './parsedText';
 //# sourceMappingURL=index.d.ts.map

package/dist/textValidation/parsedText.d.ts

@@ -1,21 +1,7 @@
+import { ParsedText } from '@cspell/cspell-types';
 import { ValidationIssue } from './validator';
 export declare type Offset = number;
 export declare type SimpleRange = readonly [Offset, Offset];
-export interface ParsedText {
-    /**
-     * Transformed text
-     */
-    text: string;
-    /**
-     * Offset pair of the original text
-     */
-    range: SimpleRange;
-    /**
-     * Relative map to the original text.
-     */
-    map?: number[];
-    scope?: string[];
-}
 export declare function mapIssueBackToOriginalPos(parsedText: ParsedText, issue: ValidationIssue): ValidationIssue;
 export declare function mapRangeBackToOriginalPos(offRange: SimpleRange, map: number[]): SimpleRange;
 //# sourceMappingURL=parsedText.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cspell-lib",
-  "version": "6.1.3-alpha.0",
+  "version": "6.1.3-alpha.1",
   "description": "A library of useful functions used across various cspell tools.",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -48,16 +48,16 @@
   },
   "homepage": "https://github.com/streetsidesoftware/cspell#readme",
   "dependencies": {
-    "@cspell/cspell-bundled-dicts": "^6.1.3-alpha.0",
-    "@cspell/cspell-pipe": "^6.1.3-alpha.0",
-    "@cspell/cspell-types": "^6.1.3-alpha.0",
+    "@cspell/cspell-bundled-dicts": "^6.1.3-alpha.1",
+    "@cspell/cspell-pipe": "^6.1.3-alpha.1",
+    "@cspell/cspell-types": "^6.1.3-alpha.1",
     "clear-module": "^4.1.2",
     "comment-json": "^4.2.2",
     "configstore": "^5.0.1",
     "cosmiconfig": "^7.0.1",
-    "cspell-glob": "^6.1.3-alpha.0",
-    "cspell-io": "^6.1.3-alpha.0",
-    "cspell-trie-lib": "^6.1.3-alpha.0",
+    "cspell-glob": "^6.1.3-alpha.1",
+    "cspell-io": "^6.1.3-alpha.1",
+    "cspell-trie-lib": "^6.1.3-alpha.1",
     "fast-equals": "^4.0.1",
     "find-up": "^5.0.0",
     "fs-extra": "^10.1.0",
@@ -92,5 +92,5 @@
     "rollup-plugin-dts": "^4.2.2",
     "ts-jest": "^28.0.5"
   },
-  "gitHead": "b3cde7e463fd8a6f2c03f990adc70b913239baeb"
+  "gitHead": "3b0a99870292387ca96aba8a7da701575b56ed5b"
 }