@microsoft/powerquery-language-services 0.2.11 → 0.2.17

package/lib/powerquery-language-services/validate/validateDuplicateIdentifiers.js

@@ -17,10 +17,14 @@ var __read = (this && this.__read) || function (o, n) {
     }
     return ar;
 };
-var __spreadArray = (this && this.__spreadArray) || function (to, from) {
-    for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
-        to[j] = from[i];
-    return to;
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
 };
 var __values = (this && this.__values) || function(o) {
     var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
@@ -37,9 +41,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateDuplicateIdentifiers = void 0;
 var PQP = require("@microsoft/powerquery-parser");
 var vscode_languageserver_types_1 = require("vscode-languageserver-types");
-var diagnosticErrorCode_1 = require("../diagnosticErrorCode");
+var parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
 var localization_1 = require("../localization");
 var workspaceCache_1 = require("../workspaceCache");
+var diagnosticErrorCode_1 = require("../diagnosticErrorCode");
 var __1 = require("..");
 function validateDuplicateIdentifiers(textDocument, validationSettings) {
     if (!validationSettings.checkForDuplicateIdentifiers) {
@@ -58,23 +63,23 @@ function validateDuplicateIdentifiers(textDocument, validationSettings) {
     }
     var documentUri = textDocument.uri;
     var nodeIdMapCollection = maybeNodeIdMapCollection;
-    return __spreadArray(__spreadArray(__spreadArray([], __read(validateDuplicateIdentifiersForLetExpresion(documentUri, nodeIdMapCollection, validationSettings))), __read(validateDuplicateIdentifiersForRecord(documentUri, nodeIdMapCollection, validationSettings))), __read(validateDuplicateIdentifiersForSection(documentUri, nodeIdMapCollection, validationSettings)));
+    return __spreadArray(__spreadArray(__spreadArray([], __read(validateDuplicateIdentifiersForLetExpresion(documentUri, nodeIdMapCollection, validationSettings)), false), __read(validateDuplicateIdentifiersForRecord(documentUri, nodeIdMapCollection, validationSettings)), false), __read(validateDuplicateIdentifiersForSection(documentUri, nodeIdMapCollection, validationSettings)), false);
 }
 exports.validateDuplicateIdentifiers = validateDuplicateIdentifiers;
 function validateDuplicateIdentifiersForLetExpresion(documentUri, nodeIdMapCollection, validationSettings) {
     var _a;
-    var letIds = __spreadArray([], __read(((_a = nodeIdMapCollection.idsByNodeKind.get("LetExpression" /* LetExpression */)) !== null && _a !== void 0 ? _a : [])));
-    return validateDuplicateIdentifiersForKeyValuePair(documentUri, nodeIdMapCollection, letIds, PQP.Parser.NodeIdMapIterator.iterLetExpression, validationSettings);
+    var letIds = __spreadArray([], __read(((_a = nodeIdMapCollection.idsByNodeKind.get("LetExpression" /* LetExpression */)) !== null && _a !== void 0 ? _a : [])), false);
+    return validateDuplicateIdentifiersForKeyValuePair(documentUri, nodeIdMapCollection, letIds, parser_1.NodeIdMapIterator.iterLetExpression, validationSettings);
 }
 function validateDuplicateIdentifiersForRecord(documentUri, nodeIdMapCollection, validationSettings) {
     var _a, _b, _c;
-    var recordIds = __spreadArray(__spreadArray(__spreadArray([], __read(((_a = nodeIdMapCollection.idsByNodeKind.get("RecordExpression" /* RecordExpression */)) !== null && _a !== void 0 ? _a : []))), __read(((_b = nodeIdMapCollection.idsByNodeKind.get("RecordLiteral" /* RecordLiteral */)) !== null && _b !== void 0 ? _b : []))), __read(((_c = nodeIdMapCollection.idsByNodeKind.get("RecordType" /* RecordType */)) !== null && _c !== void 0 ? _c : [])));
-    return validateDuplicateIdentifiersForKeyValuePair(documentUri, nodeIdMapCollection, recordIds, PQP.Parser.NodeIdMapIterator.iterRecord, validationSettings);
+    var recordIds = __spreadArray(__spreadArray(__spreadArray([], __read(((_a = nodeIdMapCollection.idsByNodeKind.get("RecordExpression" /* RecordExpression */)) !== null && _a !== void 0 ? _a : [])), false), __read(((_b = nodeIdMapCollection.idsByNodeKind.get("RecordLiteral" /* RecordLiteral */)) !== null && _b !== void 0 ? _b : [])), false), __read(((_c = nodeIdMapCollection.idsByNodeKind.get("RecordType" /* RecordType */)) !== null && _c !== void 0 ? _c : [])), false);
+    return validateDuplicateIdentifiersForKeyValuePair(documentUri, nodeIdMapCollection, recordIds, parser_1.NodeIdMapIterator.iterRecord, validationSettings);
 }
 function validateDuplicateIdentifiersForSection(documentUri, nodeIdMapCollection, validationSettings) {
     var _a;
-    var recordIds = __spreadArray([], __read(((_a = nodeIdMapCollection.idsByNodeKind.get("Section" /* Section */)) !== null && _a !== void 0 ? _a : [])));
-    return validateDuplicateIdentifiersForKeyValuePair(documentUri, nodeIdMapCollection, recordIds, PQP.Parser.NodeIdMapIterator.iterSection, validationSettings);
+    var recordIds = __spreadArray([], __read(((_a = nodeIdMapCollection.idsByNodeKind.get("Section" /* Section */)) !== null && _a !== void 0 ? _a : [])), false);
+    return validateDuplicateIdentifiersForKeyValuePair(documentUri, nodeIdMapCollection, recordIds, parser_1.NodeIdMapIterator.iterSection, validationSettings);
 }
 // Generalized logic for iterating over some collection and their children, essentially by doing:
 //  for node in nodeIds:
@@ -89,7 +94,7 @@ function validateDuplicateIdentifiersForKeyValuePair(documentUri, nodeIdMapColle
     try {
         for (var nodeIds_1 = __values(nodeIds), nodeIds_1_1 = nodeIds_1.next(); !nodeIds_1_1.done; nodeIds_1_1 = nodeIds_1.next()) {
             var nodeId = nodeIds_1_1.value;
-            var node = PQP.Parser.NodeIdMapUtils.assertGetXor(nodeIdMapCollection, nodeId);
+            var node = parser_1.NodeIdMapUtils.assertGetXor(nodeIdMapCollection, nodeId);
             var duplicateFieldsByKey = new Map();
             var knownFieldByKey = new Map();
             try {

package/lib/powerquery-language-services/validate/validateDuplicateIdentifiers.js.map

@@ -1 +1 @@
-{"version":3,"file":"validateDuplicateIdentifiers.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/validate/validateDuplicateIdentifiers.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"validateDuplicateIdentifiers.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/validate/validateDuplicateIdentifiers.ts"],"names":[],"mappings":"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"}

package/lib/powerquery-language-services/validate/validateFunctionExpression.d.ts

@@ -0,0 +1,5 @@
+import { Diagnostic } from "vscode-languageserver-types";
+import { NodeIdMap } from "@microsoft/powerquery-parser/lib/powerquery-parser/parser";
+import { Inspection } from "..";
+import { ValidationSettings } from "./validationSettings";
+export declare function validateFunctionExpression(validationSettings: ValidationSettings, nodeIdMapCollection: NodeIdMap.Collection, maybeCache?: Inspection.TypeCache): Diagnostic[];

package/lib/powerquery-language-services/validate/validateFunctionExpression.js

@@ -0,0 +1,149 @@
+"use strict";
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+var __values = (this && this.__values) || function(o) {
+    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
+    if (m) return m.call(o);
+    if (o && typeof o.length === "number") return {
+        next: function () {
+            if (o && i >= o.length) o = void 0;
+            return { value: o && o[i++], done: !o };
+        }
+    };
+    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
+};
+var __read = (this && this.__read) || function (o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+};
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateFunctionExpression = void 0;
+var powerquery_parser_1 = require("@microsoft/powerquery-parser");
+var language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
+var vscode_languageserver_types_1 = require("vscode-languageserver-types");
+var parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
+var __1 = require("..");
+var localization_1 = require("../localization");
+var diagnosticErrorCode_1 = require("../diagnosticErrorCode");
+function validateFunctionExpression(validationSettings, nodeIdMapCollection, maybeCache) {
+    var e_1, _a;
+    var maybeInvokeExpressionIds = nodeIdMapCollection.idsByNodeKind.get("FunctionExpression" /* FunctionExpression */);
+    if (maybeInvokeExpressionIds === undefined) {
+        return [];
+    }
+    var result = [];
+    try {
+        for (var maybeInvokeExpressionIds_1 = __values(maybeInvokeExpressionIds), maybeInvokeExpressionIds_1_1 = maybeInvokeExpressionIds_1.next(); !maybeInvokeExpressionIds_1_1.done; maybeInvokeExpressionIds_1_1 = maybeInvokeExpressionIds_1.next()) {
+            var nodeId = maybeInvokeExpressionIds_1_1.value;
+            var triedInvokeExpression = __1.Inspection.tryInvokeExpression(validationSettings, nodeIdMapCollection, nodeId, maybeCache);
+            if (powerquery_parser_1.ResultUtils.isError(triedInvokeExpression)) {
+                throw triedInvokeExpression;
+            }
+            result.push.apply(result, __spreadArray([], __read(invokeExpressionToDiagnostics(validationSettings, nodeIdMapCollection, triedInvokeExpression.value)), false));
+        }
+    }
+    catch (e_1_1) { e_1 = { error: e_1_1 }; }
+    finally {
+        try {
+            if (maybeInvokeExpressionIds_1_1 && !maybeInvokeExpressionIds_1_1.done && (_a = maybeInvokeExpressionIds_1.return)) _a.call(maybeInvokeExpressionIds_1);
+        }
+        finally { if (e_1) throw e_1.error; }
+    }
+    return result;
+}
+exports.validateFunctionExpression = validateFunctionExpression;
+function invokeExpressionToDiagnostics(validationSettings, nodeIdMapCollection, inspected) {
+    var e_2, _a;
+    var result = [];
+    if (inspected.maybeArguments !== undefined) {
+        var invokeExpressionArguments = inspected.maybeArguments;
+        var givenArguments = inspected.maybeArguments.givenArguments;
+        var invokeExpressionRange = powerquery_parser_1.Assert.asDefined(__1.PositionUtils.createRangeFromXorNode(nodeIdMapCollection, inspected.invokeExpressionXorNode), "expected at least one leaf node under InvokeExpression");
+        var maybeFunctionName = parser_1.NodeIdMapUtils.maybeInvokeExpressionIdentifierLiteral(nodeIdMapCollection, inspected.invokeExpressionXorNode.node.id);
+        try {
+            for (var _b = __values(invokeExpressionArguments.typeChecked.invalid.entries()), _c = _b.next(); !_c.done; _c = _b.next()) {
+                var _d = __read(_c.value, 2), argIndex = _d[0], mismatch = _d[1];
+                var maybeGivenArgumentRange = __1.PositionUtils.createRangeFromXorNode(nodeIdMapCollection, givenArguments[argIndex]);
+                result.push(createDiagnosticForArgumentMismatch(validationSettings, mismatch, maybeFunctionName, invokeExpressionRange, maybeGivenArgumentRange));
+            }
+        }
+        catch (e_2_1) { e_2 = { error: e_2_1 }; }
+        finally {
+            try {
+                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+            }
+            finally { if (e_2) throw e_2.error; }
+        }
+        var numGivenArguments = invokeExpressionArguments.givenArguments.length;
+        if (numGivenArguments < invokeExpressionArguments.numMinExpectedArguments ||
+            numGivenArguments > invokeExpressionArguments.numMaxExpectedArguments) {
+            result.push(createDiagnosticForArgumentNumberMismatch(validationSettings, invokeExpressionRange, invokeExpressionArguments.numMinExpectedArguments, invokeExpressionArguments.numMaxExpectedArguments, numGivenArguments));
+        }
+    }
+    return result;
+}
+function createDiagnosticForArgumentNumberMismatch(validationSettings, invokeExpressionRange, numMin, numMax, numGiven) {
+    var templates = localization_1.LocalizationUtils.getLocalizationTemplates(validationSettings.locale);
+    return {
+        code: diagnosticErrorCode_1.DiagnosticErrorCode.InvokeArgumentCountMismatch,
+        message: localization_1.Localization.error_validation_invokeExpression_numArgs(templates, numMin, numMax, numGiven),
+        range: invokeExpressionRange,
+        severity: vscode_languageserver_types_1.DiagnosticSeverity.Error,
+        source: validationSettings.source,
+    };
+}
+function createDiagnosticForArgumentMismatch(validationSettings, mismatch, maybeFunctionName, invokeExpressionRange, maybeGivenArgumentRange) {
+    var _a;
+    var range;
+    var message;
+    var parameter = mismatch.expected;
+    var argName = parameter.nameLiteral;
+    var expected = language_1.TypeUtils.nameOfTypeKind((_a = parameter.maybeType) !== null && _a !== void 0 ? _a : language_1.Type.AnyInstance.kind);
+    // An argument containing at least one leaf node was given.
+    if (maybeGivenArgumentRange) {
+        var actual = language_1.TypeUtils.nameOfTypeKind(powerquery_parser_1.Assert.asDefined(mismatch.actual).kind);
+        range = maybeGivenArgumentRange;
+        message = createTypeMismatchMessage(validationSettings.locale, maybeFunctionName, argName, expected, actual);
+    }
+    else {
+        range = invokeExpressionRange;
+        message = createMissingMandatoryMessage(validationSettings.locale, maybeFunctionName, argName);
+    }
+    return {
+        code: diagnosticErrorCode_1.DiagnosticErrorCode.InvokeArgumentTypeMismatch,
+        message: message,
+        range: range,
+        severity: vscode_languageserver_types_1.DiagnosticSeverity.Error,
+        source: validationSettings.source,
+    };
+}
+function createMissingMandatoryMessage(locale, maybeFunctionName, argName) {
+    var templates = localization_1.LocalizationUtils.getLocalizationTemplates(locale);
+    return localization_1.Localization.error_validation_invokeExpression_missingMandatory(templates, maybeFunctionName, argName);
+}
+function createTypeMismatchMessage(locale, maybeFunctionName, argName, expected, actual) {
+    var templates = localization_1.LocalizationUtils.getLocalizationTemplates(locale);
+    return localization_1.Localization.error_validation_invokeExpression_typeMismatch(templates, maybeFunctionName, argName, expected, actual);
+}
+//# sourceMappingURL=validateFunctionExpression.js.map

package/lib/powerquery-language-services/validate/validateFunctionExpression.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"validateFunctionExpression.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/validate/validateFunctionExpression.ts"],"names":[],"mappings":"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"}

package/lib/powerquery-language-services/validate/validateInvokeExpression.d.ts

@@ -1,5 +1,5 @@
-import * as PQP from "@microsoft/powerquery-parser";
 import { Diagnostic } from "vscode-languageserver-types";
+import { NodeIdMap } from "@microsoft/powerquery-parser/lib/powerquery-parser/parser";
 import { Inspection } from "..";
 import { ValidationSettings } from "./validationSettings";
-export declare function validateInvokeExpression(validationSettings: ValidationSettings, nodeIdMapCollection: PQP.Parser.NodeIdMap.Collection, maybeCache?: Inspection.TypeCache): Diagnostic[];
+export declare function validateInvokeExpression(validationSettings: ValidationSettings, nodeIdMapCollection: NodeIdMap.Collection, maybeCache?: Inspection.TypeCache): Diagnostic[];

package/lib/powerquery-language-services/validate/validateInvokeExpression.js

@@ -28,18 +28,24 @@ var __read = (this && this.__read) || function (o, n) {
     }
     return ar;
 };
-var __spreadArray = (this && this.__spreadArray) || function (to, from) {
-    for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
-        to[j] = from[i];
-    return to;
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateInvokeExpression = void 0;
-var PQP = require("@microsoft/powerquery-parser");
+var powerquery_parser_1 = require("@microsoft/powerquery-parser");
+var language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
 var vscode_languageserver_types_1 = require("vscode-languageserver-types");
+var parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
 var __1 = require("..");
-var diagnosticErrorCode_1 = require("../diagnosticErrorCode");
 var localization_1 = require("../localization");
+var diagnosticErrorCode_1 = require("../diagnosticErrorCode");
 function validateInvokeExpression(validationSettings, nodeIdMapCollection, maybeCache) {
     var e_1, _a;
     var maybeInvokeExpressionIds = nodeIdMapCollection.idsByNodeKind.get("InvokeExpression" /* InvokeExpression */);
@@ -51,10 +57,10 @@ function validateInvokeExpression(validationSettings, nodeIdMapCollection, maybe
         for (var maybeInvokeExpressionIds_1 = __values(maybeInvokeExpressionIds), maybeInvokeExpressionIds_1_1 = maybeInvokeExpressionIds_1.next(); !maybeInvokeExpressionIds_1_1.done; maybeInvokeExpressionIds_1_1 = maybeInvokeExpressionIds_1.next()) {
             var nodeId = maybeInvokeExpressionIds_1_1.value;
             var triedInvokeExpression = __1.Inspection.tryInvokeExpression(validationSettings, nodeIdMapCollection, nodeId, maybeCache);
-            if (PQP.ResultUtils.isError(triedInvokeExpression)) {
+            if (powerquery_parser_1.ResultUtils.isError(triedInvokeExpression)) {
                 throw triedInvokeExpression;
             }
-            result.push.apply(result, __spreadArray([], __read(invokeExpressionToDiagnostics(validationSettings, nodeIdMapCollection, triedInvokeExpression.value))));
+            result.push.apply(result, __spreadArray([], __read(invokeExpressionToDiagnostics(validationSettings, nodeIdMapCollection, triedInvokeExpression.value)), false));
         }
     }
     catch (e_1_1) { e_1 = { error: e_1_1 }; }
@@ -73,8 +79,8 @@ function invokeExpressionToDiagnostics(validationSettings, nodeIdMapCollection,
     if (inspected.maybeArguments !== undefined) {
         var invokeExpressionArguments = inspected.maybeArguments;
         var givenArguments = inspected.maybeArguments.givenArguments;
-        var invokeExpressionRange = PQP.Assert.asDefined(__1.PositionUtils.createRangeFromXorNode(nodeIdMapCollection, inspected.invokeExpressionXorNode), "expected at least one leaf node under InvokeExpression");
-        var maybeFunctionName = PQP.Parser.NodeIdMapUtils.maybeInvokeExpressionIdentifierLiteral(nodeIdMapCollection, inspected.invokeExpressionXorNode.node.id);
+        var invokeExpressionRange = powerquery_parser_1.Assert.asDefined(__1.PositionUtils.createRangeFromXorNode(nodeIdMapCollection, inspected.invokeExpressionXorNode), "expected at least one leaf node under InvokeExpression");
+        var maybeFunctionName = parser_1.NodeIdMapUtils.maybeInvokeExpressionIdentifierLiteral(nodeIdMapCollection, inspected.invokeExpressionXorNode.node.id);
         try {
             for (var _b = __values(invokeExpressionArguments.typeChecked.invalid.entries()), _c = _b.next(); !_c.done; _c = _b.next()) {
                 var _d = __read(_c.value, 2), argIndex = _d[0], mismatch = _d[1];
@@ -113,10 +119,10 @@ function createDiagnosticForArgumentMismatch(validationSettings, mismatch, maybe
     var message;
     var parameter = mismatch.expected;
     var argName = parameter.nameLiteral;
-    var expected = PQP.Language.TypeUtils.nameOfTypeKind((_a = parameter.maybeType) !== null && _a !== void 0 ? _a : PQP.Language.Type.AnyInstance.kind);
+    var expected = language_1.TypeUtils.nameOfTypeKind((_a = parameter.maybeType) !== null && _a !== void 0 ? _a : language_1.Type.AnyInstance.kind);
     // An argument containing at least one leaf node was given.
     if (maybeGivenArgumentRange) {
-        var actual = PQP.Language.TypeUtils.nameOfTypeKind(PQP.Assert.asDefined(mismatch.actual).kind);
+        var actual = language_1.TypeUtils.nameOfTypeKind(powerquery_parser_1.Assert.asDefined(mismatch.actual).kind);
         range = maybeGivenArgumentRange;
         message = createTypeMismatchMessage(validationSettings.locale, maybeFunctionName, argName, expected, actual);
     }

package/lib/powerquery-language-services/validate/validateInvokeExpression.js.map

@@ -1 +1 @@
-{"version":3,"file":"validateInvokeExpression.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/validate/validateInvokeExpression.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"validateInvokeExpression.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/validate/validateInvokeExpression.ts"],"names":[],"mappings":"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"}

package/lib/powerquery-language-services/validate/validateLexAndParse.d.ts

@@ -1,4 +1,4 @@
+import { Diagnostic } from "vscode-languageserver-types";
 import { TextDocument } from "vscode-languageserver-textdocument";
-import type { Diagnostic } from "vscode-languageserver-types";
 import { ValidationSettings } from "./validationSettings";
 export declare function validateLexAndParse(textDocument: TextDocument, validationSettings: ValidationSettings): Diagnostic[];

package/lib/powerquery-language-services/validate/validateLexAndParse.js

@@ -16,8 +16,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateLexAndParse = void 0;
 var PQP = require("@microsoft/powerquery-parser");
 var vscode_languageserver_types_1 = require("vscode-languageserver-types");
-var diagnosticErrorCode_1 = require("../diagnosticErrorCode");
+var parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
 var workspaceCache_1 = require("../workspaceCache");
+var diagnosticErrorCode_1 = require("../diagnosticErrorCode");
 function validateLexAndParse(textDocument, validationSettings) {
     var cacheItem = workspaceCache_1.WorkspaceCacheUtils.getOrCreateParse(textDocument, validationSettings);
     if (PQP.TaskUtils.isLexStage(cacheItem)) {
@@ -44,7 +45,9 @@ function validateLex(triedLex, validationSettings) {
             for (var _b = __values(error.errorLineMap.values()), _c = _b.next(); !_c.done; _c = _b.next()) {
                 var errorLine = _c.value;
                 var innerError = errorLine.error.innerError;
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
                 if (innerError.graphemePosition) {
+                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
                     var graphemePosition = innerError.graphemePosition;
                     var message = innerError.message;
                     var position = {
@@ -119,7 +122,7 @@ function validateParse(triedParse, validationSettings) {
         if (maybeRoot === undefined) {
             return [];
         }
-        var maybeLeaf = PQP.Parser.NodeIdMapUtils.maybeRightMostLeaf(error.state.contextState.nodeIdMapCollection, maybeRoot.id);
+        var maybeLeaf = parser_1.NodeIdMapUtils.maybeRightMostLeaf(error.state.contextState.nodeIdMapCollection, maybeRoot.id);
         if (maybeLeaf === undefined) {
             return [];
         }

package/lib/powerquery-language-services/validate/validateLexAndParse.js.map

@@ -1 +1 @@
-{"version":3,"file":"validateLexAndParse.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/validate/validateLexAndParse.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"validateLexAndParse.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/validate/validateLexAndParse.ts"],"names":[],"mappings":"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"}

package/lib/powerquery-language-services/validate/validationSettings/validationSettings.d.ts

@@ -2,4 +2,5 @@ import { InspectionSettings } from "../../inspectionSettings";
 export interface ValidationSettings extends InspectionSettings {
     readonly source: string;
     readonly checkForDuplicateIdentifiers: boolean;
+    readonly checkInvokeExpressions: boolean;
 }

package/lib/powerquery-language-services/validate/validationSettings/validationSettingsUtils.d.ts

@@ -1,3 +1,3 @@
 import { InspectionSettings } from "../..";
 import { ValidationSettings } from "./validationSettings";
-export declare function createValidationSettings(inspectionSettings: InspectionSettings, source: string, checkForDuplicateIdentifiers?: boolean): ValidationSettings;
+export declare function createValidationSettings(inspectionSettings: InspectionSettings, source: string, checkForDuplicateIdentifiers?: boolean, checkInvokeExpressions?: boolean): ValidationSettings;

package/lib/powerquery-language-services/validate/validationSettings/validationSettingsUtils.js

@@ -14,8 +14,8 @@ var __assign = (this && this.__assign) || function () {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createValidationSettings = void 0;
-function createValidationSettings(inspectionSettings, source, checkForDuplicateIdentifiers) {
-    return __assign(__assign({}, inspectionSettings), { checkForDuplicateIdentifiers: checkForDuplicateIdentifiers !== null && checkForDuplicateIdentifiers !== void 0 ? checkForDuplicateIdentifiers : true, source: source });
+function createValidationSettings(inspectionSettings, source, checkForDuplicateIdentifiers, checkInvokeExpressions) {
+    return __assign(__assign({}, inspectionSettings), { checkForDuplicateIdentifiers: checkForDuplicateIdentifiers !== null && checkForDuplicateIdentifiers !== void 0 ? checkForDuplicateIdentifiers : true, checkInvokeExpressions: checkInvokeExpressions !== null && checkInvokeExpressions !== void 0 ? checkInvokeExpressions : true, source: source });
 }
 exports.createValidationSettings = createValidationSettings;
 //# sourceMappingURL=validationSettingsUtils.js.map

package/lib/powerquery-language-services/validate/validationSettings/validationSettingsUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"validationSettingsUtils.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/validate/validationSettings/validationSettingsUtils.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;;;AAKlC,SAAgB,wBAAwB,CACpC,kBAAsC,EACtC,MAAc,EACd,4BAAsC;IAEtC,6BACO,kBAAkB,KACrB,4BAA4B,EAAE,4BAA4B,aAA5B,4BAA4B,cAA5B,4BAA4B,GAAI,IAAI,EAClE,MAAM,QAAA,IACR;AACN,CAAC;AAVD,4DAUC"}
+{"version":3,"file":"validationSettingsUtils.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/validate/validationSettings/validationSettingsUtils.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;;;AAKlC,SAAgB,wBAAwB,CACpC,kBAAsC,EACtC,MAAc,EACd,4BAAsC,EACtC,sBAAgC;IAEhC,6BACO,kBAAkB,KACrB,4BAA4B,EAAE,4BAA4B,aAA5B,4BAA4B,cAA5B,4BAA4B,GAAI,IAAI,EAClE,sBAAsB,EAAE,sBAAsB,aAAtB,sBAAsB,cAAtB,sBAAsB,GAAI,IAAI,EACtD,MAAM,QAAA,IACR;AACN,CAAC;AAZD,4DAYC"}

package/lib/powerquery-language-services/workspaceCache/workspaceCacheUtils.d.ts

@@ -1,9 +1,9 @@
 import * as PQP from "@microsoft/powerquery-parser";
 import { TextDocument, TextDocumentContentChangeEvent } from "vscode-languageserver-textdocument";
 import type { Position } from "vscode-languageserver-types";
+import type { CacheItem, InspectionCacheItem, InspectionTask, LexCacheItem, ParseCacheItem } from "./workspaceCache";
 import { Inspection } from "..";
 import { InspectionSettings } from "../inspectionSettings";
-import type { CacheItem, InspectionCacheItem, InspectionTask, LexCacheItem, ParseCacheItem } from "./workspaceCache";
 export declare function assertIsInspectionTask(cacheItem: CacheItem): asserts cacheItem is InspectionTask;
 export declare function getOrCreateTypeCache(textDocument: TextDocument): Inspection.TypeCache;
 export declare function getOrCreateLex(textDocument: TextDocument, lexSettings: PQP.LexSettings): LexCacheItem;

package/lib/powerquery-language-services/workspaceCache/workspaceCacheUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"workspaceCacheUtils.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/workspaceCache/workspaceCacheUtils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"workspaceCacheUtils.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/workspaceCache/workspaceCacheUtils.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,17 +1,14 @@
 {
     "name": "@microsoft/powerquery-language-services",
-    "version": "0.2.11",
+    "version": "0.2.17",
     "author": "Microsoft",
     "license": "MIT",
     "scripts": {
         "prepublishOnly": "git clean -xdf && npm install && npm run lint && npm run build && npm run test",
         "build": ".\\node_modules\\.bin\\tsc",
         "watch": ".\\node_modules\\.bin\\tsc -b -watch",
-        "lint": "npm run lint:prettier && npm run lint:tslint",
-        "lint:prettier": ".\\node_modules\\.bin\\prettier --config \".prettierrc\" --list-different src\\**\\*.ts",
-        "lint:tslint": ".\\node_modules\\.bin\\tslint src/*.ts",
-        "test": "mocha --reporter mocha-multi-reporters --reporter-options configFile=src/test/mochaConfig.json -r ts-node/register src/test/**/*.ts",
-        "preUnitTests": "cpy src/test/powerquery-language-services/files/*.pq lib/test/files/ && npm run watch"
+        "lint": "eslint src --ext ts",
+        "test": "mocha --reporter mocha-multi-reporters --reporter-options configFile=src/test/mochaConfig.json -r ts-node/register src/test/**/*.ts"
     },
     "homepage": "https://github.com/microsoft/powerquery-language-services#readme",
     "repository": {
@@ -29,28 +26,29 @@
         "power bi"
     ],
     "devDependencies": {
-        "@types/chai": "^4.2.11",
-        "@types/mocha": "^8.0.0",
-        "@types/node": "^14.0.23",
-        "chai": "^4.2.0",
-        "cpy-cli": "^3.1.1",
-        "mocha": "^8.0.1",
-        "mocha-junit-reporter": "^2.0.0",
-        "mocha-multi-reporters": "^1.1.7",
-        "prettier": "^2.0.5",
-        "ts-loader": "^8.0.1",
-        "ts-node": "^8.10.2",
-        "tslint": "^6.1.2",
-        "tslint-config-prettier": "^1.18.0",
-        "tslint-microsoft-contrib": "^6.2.0",
-        "tslint-plugin-prettier": "^2.3.0",
-        "typescript": "^4.3.5"
+        "@types/chai": "4.3.0",
+        "@types/mocha": "9.0.0",
+        "@types/node": "17.0.0",
+        "@typescript-eslint/eslint-plugin": "5.7.0",
+        "@typescript-eslint/parser": "5.7.0",
+        "chai": "4.3.4",
+        "eslint": "8.4.1",
+        "eslint-config-prettier": "8.3.0",
+        "eslint-plugin-prettier": "4.0.0",
+        "eslint-plugin-security": "1.4.0",
+        "mocha": "9.1.3",
+        "mocha-junit-reporter": "2.0.2",
+        "mocha-multi-reporters": "1.5.1",
+        "prettier": "2.5.1",
+        "ts-loader": "9.2.6",
+        "ts-node": "10.4.0",
+        "typescript": "4.5.4"
     },
     "dependencies": {
-        "@microsoft/powerquery-formatter": "0.0.37",
-        "@microsoft/powerquery-parser": "0.4.10",
-        "vscode-languageserver-textdocument": "1.0.1",
-        "vscode-languageserver-types": "3.15.1"
+        "@microsoft/powerquery-formatter": "0.0.43",
+        "@microsoft/powerquery-parser": "0.4.21",
+        "vscode-languageserver-textdocument": "1.0.3",
+        "vscode-languageserver-types": "3.16.0"
     },
     "files": [
         "lib/powerquery-language-services/**/*"