@microsoft/powerquery-language-services 0.2.11 → 0.2.17

package/lib/powerquery-language-services/inspection/activeNode/activeNodeUtils.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;
@@ -36,8 +40,9 @@ var __values = (this && this.__values) || function(o) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.maybeFirstXorOfNodeKind = exports.isPositionInBounds = exports.assertPositionInBounds = exports.assertGetLeaf = exports.assertActiveNode = exports.createOutOfBoundPosition = exports.createActiveNode = exports.maybeActiveNode = void 0;
 var PQP = require("@microsoft/powerquery-parser");
+var parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
 var __1 = require("../..");
-// Searches all leaf PQP.Language.Ast.TNodes and all Context nodes to find the "active" node.
+// Searches all leaf Ast.TNodes and all Context nodes to find the "active" node.
 // ' 1 + |' -> the second operand, a Context node, in an ArithmeticExpression.
 // 'let x=|1 in x' -> the value part of the key-value-pair.
 // 'foo(|)' -> the zero length ArrayWrapper of an InvokeExpression
@@ -46,14 +51,14 @@ var __1 = require("../..");
 // This approach breaks under several edge cases.
 //
 // Take a look at the ArithmeticExpression example above,
-// it doesn't make sense for the ActiveNode to be the '+' PQP.Language.constant.
-// When the position is on a constant the selected PQP.Language.Ast.TNode might need to be shifted one to the right.
+// it doesn't make sense for the ActiveNode to be the '+' Constant.
+// When the position is on a constant the selected Ast.TNode might need to be shifted one to the right.
 // This happens with atomic constants such as '+', '=>', '[', '(' etc.
 // However if you shifted right on '(' for 'foo(|)' then the ActiveNode would be ')' instead of the ArrayWrapper.
 //
 // Sometimes we don't want to shift at all.
 // Nodes that prevent shifting are called anchor nodes.
-// '[foo = bar|' should be anchored on the identifier 'bar' and not the context node for the ']' PQP.Language.constant.
+// '[foo = bar|' should be anchored on the identifier 'bar' and not the context node for the ']' Constant.
 function maybeActiveNode(nodeIdMapCollection, position) {
     // Search for the closest Ast node on or to the left of Position, as well as the closest shifted right Ast node.
     var astSearch = maybeFindAstNodes(nodeIdMapCollection, position);
@@ -67,20 +72,20 @@ function maybeActiveNode(nodeIdMapCollection, position) {
     //  * Context
     //  * Ast
     if (astSearch.maybeShiftedRightNode !== undefined) {
-        maybeLeaf = PQP.Parser.XorNodeUtils.createAstNode(astSearch.maybeShiftedRightNode);
+        maybeLeaf = parser_1.XorNodeUtils.boxAst(astSearch.maybeShiftedRightNode);
         leafKind = "ShiftedRight" /* ShiftedRight */;
     }
     else if (astSearch.maybeBestOnOrBeforeNode !== undefined &&
         isAnchorNode(position, astSearch.maybeBestOnOrBeforeNode)) {
-        maybeLeaf = PQP.Parser.XorNodeUtils.createAstNode(astSearch.maybeBestOnOrBeforeNode);
+        maybeLeaf = parser_1.XorNodeUtils.boxAst(astSearch.maybeBestOnOrBeforeNode);
         leafKind = "Anchored" /* Anchored */;
     }
     else if (maybeContextNode !== undefined) {
-        maybeLeaf = PQP.Parser.XorNodeUtils.createContextNode(maybeContextNode);
+        maybeLeaf = parser_1.XorNodeUtils.boxContext(maybeContextNode);
         leafKind = "Context" /* ContextNode */;
     }
     else if (astSearch.maybeBestOnOrBeforeNode !== undefined) {
-        maybeLeaf = PQP.Parser.XorNodeUtils.createAstNode(astSearch.maybeBestOnOrBeforeNode);
+        maybeLeaf = parser_1.XorNodeUtils.boxAst(astSearch.maybeBestOnOrBeforeNode);
         leafKind = __1.PositionUtils.isAfterAst(position, astSearch.maybeBestOnOrBeforeNode, false)
             ? "AfterAstNode" /* AfterAstNode */
             : "OnAstNode" /* OnAstNode */;
@@ -89,7 +94,7 @@ function maybeActiveNode(nodeIdMapCollection, position) {
         return createOutOfBoundPosition(position);
     }
     var leaf = maybeLeaf;
-    return createActiveNode(leafKind, position, PQP.Parser.AncestryUtils.assertGetAncestry(nodeIdMapCollection, leaf.node.id), findIdentifierUnderPosition(nodeIdMapCollection, position, leaf));
+    return createActiveNode(leafKind, position, parser_1.AncestryUtils.assertGetAncestry(nodeIdMapCollection, leaf.node.id), findIdentifierUnderPosition(nodeIdMapCollection, position, leaf));
 }
 exports.maybeActiveNode = maybeActiveNode;
 function createActiveNode(leafKind, position, ancestry, maybeIdentifierUnderPosition) {
@@ -116,7 +121,7 @@ function assertActiveNode(nodeIdMapCollection, position) {
 }
 exports.assertActiveNode = assertActiveNode;
 function assertGetLeaf(activeNode) {
-    return PQP.Parser.AncestryUtils.assertGetLeaf(activeNode.ancestry);
+    return parser_1.AncestryUtils.assertGetLeaf(activeNode.ancestry);
 }
 exports.assertGetLeaf = assertGetLeaf;
 function assertPositionInBounds(maybeValue) {
@@ -130,7 +135,7 @@ function isPositionInBounds(maybeValue) {
 }
 exports.isPositionInBounds = isPositionInBounds;
 function maybeFirstXorOfNodeKind(activeNode, nodeKind) {
-    return PQP.Parser.AncestryUtils.maybeFirstXorWhere(activeNode.ancestry, function (xorNode) { return xorNode.node.kind === nodeKind; });
+    return parser_1.AncestryUtils.maybeFirstXorOfNodeKind(activeNode.ancestry, nodeKind);
 }
 exports.maybeFirstXorOfNodeKind = maybeFirstXorOfNodeKind;
 var DrilldownConstantKind = [
@@ -146,17 +151,15 @@ var ShiftRightConstantKinds = __spreadArray([
     "]" /* RightBracket */,
     ")" /* RightParenthesis */,
     ";" /* Semicolon */
-], __read(DrilldownConstantKind));
+], __read(DrilldownConstantKind), false);
 function isAnchorNode(position, astNode) {
     if (!__1.PositionUtils.isInAst(position, astNode, true, true)) {
         return false;
     }
-    if (astNode.kind === "Identifier" /* Identifier */ ||
-        astNode.kind === "GeneralizedIdentifier" /* GeneralizedIdentifier */) {
+    if (astNode.kind === "Identifier" /* Identifier */ || astNode.kind === "GeneralizedIdentifier" /* GeneralizedIdentifier */) {
         return true;
     }
-    else if (astNode.kind === "LiteralExpression" /* LiteralExpression */ &&
-        astNode.literalKind === "Numeric" /* Numeric */) {
+    else if (astNode.kind === "LiteralExpression" /* LiteralExpression */ && astNode.literalKind === "Numeric" /* Numeric */) {
         return true;
     }
     else if (astNode.kind === "Constant" /* Constant */) {
@@ -243,14 +246,14 @@ function maybeFindAstNodes(nodeIdMapCollection, position) {
         if (DrilldownConstantKind.indexOf(maybeBestOnOrBeforeNode.constantKind) !== -1 &&
             (maybeBestAfter === null || maybeBestAfter === void 0 ? void 0 : maybeBestAfter.kind) === "Constant" /* Constant */ &&
             PQP.Language.ConstantUtils.isPairedWrapperConstantKinds(maybeBestOnOrBeforeNode.constantKind, maybeBestAfter.constantKind)) {
-            var parent_1 = PQP.Parser.NodeIdMapUtils.assertGetParentAst(nodeIdMapCollection, currentOnOrBefore.id, [
+            var parent_1 = parser_1.NodeIdMapUtils.assertUnboxParentAstChecked(nodeIdMapCollection, currentOnOrBefore.id, [
                 "RecordExpression" /* RecordExpression */,
                 "RecordLiteral" /* RecordLiteral */,
                 "ListExpression" /* ListExpression */,
                 "ListLiteral" /* ListLiteral */,
                 "InvokeExpression" /* InvokeExpression */,
             ]);
-            var arrayWrapper = PQP.Parser.NodeIdMapUtils.assertGetChildAstByAttributeIndex(nodeIdMapCollection, parent_1.id, 1, ["ArrayWrapper" /* ArrayWrapper */]);
+            var arrayWrapper = parser_1.NodeIdMapUtils.assertUnboxArrayWrapperAst(nodeIdMapCollection, parent_1.id);
             maybeShiftedRightNode = arrayWrapper;
         }
         // Requires a shift to the right.
@@ -300,26 +303,24 @@ function maybeFindContext(nodeIdMapCollection, astNodeSearch) {
     return maybeCurrent;
 }
 function findIdentifierUnderPosition(nodeIdMapCollection, position, leaf) {
-    if (PQP.Parser.XorNodeUtils.isContext(leaf)) {
+    if (parser_1.XorNodeUtils.isContextXor(leaf)) {
         return undefined;
     }
     var identifier;
     // If closestLeaf is '@', then check if it's part of an IdentifierExpression.
-    if (leaf.node.kind === "Constant" /* Constant */ &&
-        leaf.node.constantKind === "@" /* AtSign */) {
+    if (leaf.node.kind === "Constant" /* Constant */ && leaf.node.constantKind === "@" /* AtSign */) {
         var maybeParentId = nodeIdMapCollection.parentIdById.get(leaf.node.id);
         if (maybeParentId === undefined) {
             return undefined;
         }
         var parentId = maybeParentId;
-        var parent_2 = PQP.Parser.NodeIdMapUtils.assertGetAst(nodeIdMapCollection.astNodeById, parentId);
+        var parent_2 = parser_1.NodeIdMapUtils.assertUnboxAst(nodeIdMapCollection.astNodeById, parentId);
         if (parent_2.kind !== "IdentifierExpression" /* IdentifierExpression */) {
             return undefined;
         }
         identifier = parent_2.identifier;
     }
-    else if (leaf.node.kind === "Identifier" /* Identifier */ ||
-        leaf.node.kind === "GeneralizedIdentifier" /* GeneralizedIdentifier */) {
+    else if (leaf.node.kind === "Identifier" /* Identifier */ || leaf.node.kind === "GeneralizedIdentifier" /* GeneralizedIdentifier */) {
         identifier = leaf.node;
     }
     else {

package/lib/powerquery-language-services/inspection/activeNode/activeNodeUtils.js.map

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

package/lib/powerquery-language-services/inspection/autocomplete/autocompleteFieldAccess.d.ts

@@ -1,6 +1,6 @@
 import * as PQP from "@microsoft/powerquery-parser";
-import { InspectionSettings } from "../../inspectionSettings";
 import { TMaybeActiveNode } from "../activeNode";
-import { TypeCache } from "../typeCache";
 import { TriedAutocompleteFieldAccess } from "./commonTypes";
+import { InspectionSettings } from "../../inspectionSettings";
+import { TypeCache } from "../typeCache";
 export declare function tryAutocompleteFieldAccess(settings: InspectionSettings, parseState: PQP.Parser.ParseState, maybeActiveNode: TMaybeActiveNode, typeCache: TypeCache): TriedAutocompleteFieldAccess;

package/lib/powerquery-language-services/inspection/autocomplete/autocompleteFieldAccess.js

@@ -28,26 +28,38 @@ 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.tryAutocompleteFieldAccess = void 0;
 var PQP = require("@microsoft/powerquery-parser");
+var parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
 var powerquery_parser_1 = require("@microsoft/powerquery-parser");
-var __1 = require("../..");
 var activeNode_1 = require("../activeNode");
-var type_1 = require("../type");
 var autocompleteItem_1 = require("./autocompleteItem");
+var __1 = require("../..");
+var type_1 = require("../type");
 function tryAutocompleteFieldAccess(settings, parseState, maybeActiveNode, typeCache) {
+    var _a;
+    var trace = settings.traceManager.entry("FieldAccess" /* FieldAccess */, tryAutocompleteFieldAccess.name);
+    var result;
     if (!activeNode_1.ActiveNodeUtils.isPositionInBounds(maybeActiveNode)) {
-        return PQP.ResultUtils.createOk(undefined);
+        result = powerquery_parser_1.ResultUtils.boxOk(undefined);
+    }
+    else {
+        result = powerquery_parser_1.ResultUtils.ensureResult(settings.locale, function () {
+            return autocompleteFieldAccess(settings, parseState, maybeActiveNode, typeCache);
+        });
     }
-    return PQP.ResultUtils.ensureResult(settings.locale, function () {
-        return autocompleteFieldAccess(settings, parseState, maybeActiveNode, typeCache);
-    });
+    trace.exit((_a = {}, _a["IsError" /* IsError */] = powerquery_parser_1.ResultUtils.isError(result), _a));
+    return result;
 }
 exports.tryAutocompleteFieldAccess = tryAutocompleteFieldAccess;
 var AllowedExtendedTypeKindsForFieldEntries = [
@@ -55,10 +67,6 @@ var AllowedExtendedTypeKindsForFieldEntries = [
     "DefinedRecord" /* DefinedRecord */,
     "DefinedTable" /* DefinedTable */,
 ];
-var FieldAccessNodeKinds = [
-    "FieldSelector" /* FieldSelector */,
-    "FieldProjection" /* FieldProjection */,
-];
 function autocompleteFieldAccess(settings, parseState, activeNode, typeCache) {
     var e_1, _a;
     var maybeInspectedFieldAccess = undefined;
@@ -67,7 +75,10 @@ function autocompleteFieldAccess(settings, parseState, activeNode, typeCache) {
     try {
         for (var _b = __values(activeNode.ancestry), _c = _b.next(); !_c.done; _c = _b.next()) {
             var ancestor = _c.value;
-            if (FieldAccessNodeKinds.includes(ancestor.node.kind)) {
+            if (parser_1.XorNodeUtils.isNodeKind(ancestor, [
+                "FieldSelector" /* FieldSelector */,
+                "FieldProjection" /* FieldProjection */,
+            ])) {
                 maybeFieldAccessAncestor = ancestor;
             }
         }
@@ -93,7 +104,7 @@ function autocompleteFieldAccess(settings, parseState, activeNode, typeCache) {
     if (inspectedFieldAccess.isAutocompleteAllowed === false) {
         return undefined;
     }
-    // After a field access was found then find the field it's accessing and inspect the field's PQP.Language.type.
+    // After a field access was found then find the field it's accessing and inspect the field's Type.
     // This is delayed until after the field access because running static type analysis on an
     // arbitrary field could be costly.
     var nodeIdMapCollection = parseState.contextState.nodeIdMapCollection;
@@ -102,8 +113,8 @@ function autocompleteFieldAccess(settings, parseState, activeNode, typeCache) {
         return undefined;
     }
     var field = maybeField;
-    var triedFieldType = type_1.tryType(settings, nodeIdMapCollection, field.node.id, typeCache);
-    if (PQP.ResultUtils.isError(triedFieldType)) {
+    var triedFieldType = (0, type_1.tryType)(settings, nodeIdMapCollection, field.node.id, typeCache);
+    if (powerquery_parser_1.ResultUtils.isError(triedFieldType)) {
         throw triedFieldType.error;
     }
     var fieldType = triedFieldType.value;
@@ -144,7 +155,7 @@ function fieldEntriesFromFieldType(type) {
         }
         case "DefinedRecord" /* DefinedRecord */:
         case "DefinedTable" /* DefinedTable */:
-            return __spreadArray([], __read(type.fields.entries()));
+            return __spreadArray([], __read(type.fields.entries()), false);
         default:
             return [];
     }
@@ -156,11 +167,7 @@ function inspectFieldAccess(lexerSnapshot, nodeIdMapCollection, position, fieldA
         case "FieldSelector" /* FieldSelector */:
             return inspectFieldSelector(lexerSnapshot, nodeIdMapCollection, position, fieldAccess);
         default:
-            var details = {
-                nodeId: fieldAccess.node.id,
-                nodeKind: fieldAccess.node.kind,
-            };
-            throw new PQP.CommonError.InvariantError("fieldAccess should be either " + "FieldProjection" /* FieldProjection */ + " or " + "FieldSelector" /* FieldSelector */, details);
+            throw powerquery_parser_1.Assert.isNever(fieldAccess.node);
     }
 }
 function inspectFieldProjection(lexerSnapshot, nodeIdMapCollection, position, fieldProjection) {
@@ -169,14 +176,14 @@ function inspectFieldProjection(lexerSnapshot, nodeIdMapCollection, position, fi
     var maybeIdentifierUnderPosition;
     var fieldNames = [];
     try {
-        for (var _b = __values(PQP.Parser.NodeIdMapIterator.iterFieldProjection(nodeIdMapCollection, fieldProjection)), _c = _b.next(); !_c.done; _c = _b.next()) {
+        for (var _b = __values(parser_1.NodeIdMapIterator.iterFieldProjection(nodeIdMapCollection, fieldProjection)), _c = _b.next(); !_c.done; _c = _b.next()) {
             var fieldSelector = _c.value;
             var inspectedFieldSelector = inspectFieldSelector(lexerSnapshot, nodeIdMapCollection, position, fieldSelector);
             if (inspectedFieldSelector.isAutocompleteAllowed || inspectedFieldSelector.maybeIdentifierUnderPosition) {
                 isAutocompleteAllowed = true;
                 maybeIdentifierUnderPosition = inspectedFieldSelector.maybeIdentifierUnderPosition;
             }
-            fieldNames.push.apply(fieldNames, __spreadArray([], __read(inspectedFieldSelector.fieldNames)));
+            fieldNames.push.apply(fieldNames, __spreadArray([], __read(inspectedFieldSelector.fieldNames), false));
         }
     }
     catch (e_3_1) { e_3 = { error: e_3_1 }; }
@@ -209,8 +216,7 @@ function inspectFieldSelector(lexerSnapshot, nodeIdMapCollection, position, fiel
         return createInspectedFieldAccess(nodeIdMapCollection.astNodeById.has(childIds[0]));
     }
     var generalizedIdentifierId = childIds[1];
-    var generalizedIdentifierXor = PQP.Parser.NodeIdMapUtils.assertGetXor(nodeIdMapCollection, generalizedIdentifierId);
-    powerquery_parser_1.Assert.isTrue(generalizedIdentifierXor.node.kind === "GeneralizedIdentifier" /* GeneralizedIdentifier */, "generalizedIdentifier.node.kind === PQP.Language.Ast.NodeKind.GeneralizedIdentifier");
+    var generalizedIdentifierXor = parser_1.NodeIdMapUtils.assertGetXorChecked(nodeIdMapCollection, generalizedIdentifierId, "GeneralizedIdentifier" /* GeneralizedIdentifier */);
     switch (generalizedIdentifierXor.kind) {
         case "Ast" /* Ast */: {
             var generalizedIdentifier = generalizedIdentifierXor.node;
@@ -225,7 +231,7 @@ function inspectFieldSelector(lexerSnapshot, nodeIdMapCollection, position, fiel
             // TODO [Autocomplete]:
             // This doesn't take into account of generalized identifiers consisting of multiple tokens.
             // Eg. `foo[bar baz]` or `foo[#"bar baz"].
-            var openBracketConstant = PQP.Parser.NodeIdMapUtils.assertGetChildAstByAttributeIndex(nodeIdMapCollection, fieldSelector.node.id, 0, ["Constant" /* Constant */]);
+            var openBracketConstant = parser_1.NodeIdMapUtils.assertUnboxNthChildAsAstChecked(nodeIdMapCollection, fieldSelector.node.id, 0, "Constant" /* Constant */);
             var maybeNextTokenPosition = (_a = lexerSnapshot.tokens[openBracketConstant.tokenRange.tokenIndexEnd + 1]) === null || _a === void 0 ? void 0 : _a.positionStart;
             var isAutocompleteAllowed = __1.PositionUtils.isAfterAst(position, openBracketConstant, false) &&
                 (maybeNextTokenPosition === undefined ||
@@ -238,7 +244,7 @@ function inspectFieldSelector(lexerSnapshot, nodeIdMapCollection, position, fiel
             };
         }
         default:
-            throw PQP.Assert.isNever(generalizedIdentifierXor);
+            throw powerquery_parser_1.Assert.isNever(generalizedIdentifierXor);
     }
 }
 function createAutocompleteItems(fieldEntries, inspectedFieldAccess) {
@@ -274,7 +280,7 @@ function maybeTypablePrimaryExpression(nodeIdMapCollection, activeNode) {
         var xorNode = ancestry[index];
         if (xorNode.node.kind === "RecursivePrimaryExpression" /* RecursivePrimaryExpression */) {
             // The previous ancestor must be an attribute of Rpe, which is either its head or ArrrayWrapper.
-            var xorNodeBeforeRpe = PQP.Parser.AncestryUtils.assertGetNthPreviousXor(ancestry, index);
+            var xorNodeBeforeRpe = parser_1.AncestryUtils.assertGetNthPreviousXor(ancestry, index);
             // If we're coming from the head node,
             // then return undefined as there can be no nodes before the head ode.
             if (xorNodeBeforeRpe.node.maybeAttributeIndex === 0) {
@@ -283,17 +289,17 @@ function maybeTypablePrimaryExpression(nodeIdMapCollection, activeNode) {
             // Else if we're coming from the ArrayWrapper,
             // then grab the previous sibling.
             else if (xorNodeBeforeRpe.node.maybeAttributeIndex === 1) {
-                var rpeChild = PQP.Parser.AncestryUtils.assertGetNthPreviousXor(ancestry, index, 2);
-                return PQP.Parser.NodeIdMapUtils.assertGetRecursiveExpressionPreviousSibling(nodeIdMapCollection, rpeChild.node.id);
+                var rpeChild = parser_1.AncestryUtils.assertGetNthPreviousXor(ancestry, index, 2);
+                return parser_1.NodeIdMapUtils.assertGetRecursiveExpressionPreviousSibling(nodeIdMapCollection, rpeChild.node.id);
             }
             else {
-                throw new PQP.CommonError.InvariantError("the child of a " + "RecursivePrimaryExpression" /* RecursivePrimaryExpression */ + " should have an attribute index of either 1 or 2", {
+                throw new PQP.CommonError.InvariantError("the child of a ".concat("RecursivePrimaryExpression" /* RecursivePrimaryExpression */, " should have an attribute index of either 1 or 2"), {
                     parentId: xorNode.node.id,
                     childId: xorNodeBeforeRpe.node.id,
                 });
             }
         }
-        else if (matchingContiguousPrimaryExpression && PQP.Parser.XorNodeUtils.isTPrimaryExpression(xorNode)) {
+        else if (matchingContiguousPrimaryExpression && parser_1.XorNodeUtils.isTPrimaryExpression(xorNode)) {
             maybeContiguousPrimaryExpression = xorNode;
         }
         else {

package/lib/powerquery-language-services/inspection/autocomplete/autocompleteFieldAccess.js.map

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

package/lib/powerquery-language-services/inspection/autocomplete/autocompleteItem/autocompleteItem.d.ts

@@ -1,6 +1,6 @@
-import * as PQP from "@microsoft/powerquery-parser";
 import { CompletionItem } from "vscode-languageserver-types";
+import { Type } from "@microsoft/powerquery-parser/lib/powerquery-parser/language";
 export interface AutocompleteItem extends CompletionItem {
     readonly jaroWinklerScore: number;
-    readonly powerQueryType: PQP.Language.Type.TPowerQueryType;
+    readonly powerQueryType: Type.TPowerQueryType;
 }

package/lib/powerquery-language-services/inspection/autocomplete/autocompleteItem/autocompleteItemUtils.d.ts

@@ -1,11 +1,11 @@
-import * as PQP from "@microsoft/powerquery-parser";
+import { Constant, Keyword, Type } from "@microsoft/powerquery-parser/lib/powerquery-parser/language";
+import type { AutocompleteItem } from "./autocompleteItem";
 import { Inspection } from "../../..";
 import { Library } from "../../../library";
-import type { AutocompleteItem } from "./autocompleteItem";
-export declare function createFromFieldAccess(label: string, powerQueryType: PQP.Language.Type.TPowerQueryType, maybeOther?: string): AutocompleteItem;
-export declare function createFromKeywordKind(label: PQP.Language.Keyword.KeywordKind, maybeOther?: string): AutocompleteItem;
-export declare function createFromLanguageConstantKind(label: PQP.Language.Constant.LanguageConstantKind, maybeOther?: string): AutocompleteItem;
+export declare function createFromFieldAccess(label: string, powerQueryType: Type.TPowerQueryType, maybeOther?: string): AutocompleteItem;
+export declare function createFromKeywordKind(label: Keyword.KeywordKind, maybeOther?: string): AutocompleteItem;
+export declare function createFromLanguageConstant(label: Constant.LanguageConstant, maybeOther?: string): AutocompleteItem;
 export declare function createFromLibraryDefinition(label: string, libraryDefinition: Library.TLibraryDefinition, maybeOther?: string): Inspection.AutocompleteItem;
-export declare function createFromPrimitiveTypeConstantKind(label: PQP.Language.Constant.PrimitiveTypeConstantKind, maybeOther?: string): AutocompleteItem;
-export declare function maybeCreateFromScopeItem(label: string, scopeItem: Inspection.TScopeItem, powerQueryType: PQP.Language.Type.TPowerQueryType, maybeOther?: string): AutocompleteItem | undefined;
+export declare function createFromPrimitiveTypeConstant(label: Constant.PrimitiveTypeConstant, maybeOther?: string): AutocompleteItem;
+export declare function maybeCreateFromScopeItem(label: string, scopeItem: Inspection.TScopeItem, powerQueryType: Type.TPowerQueryType, maybeOther?: string): AutocompleteItem | undefined;
 export declare function compareFn(left: AutocompleteItem, right: AutocompleteItem): number;

package/lib/powerquery-language-services/inspection/autocomplete/autocompleteItem/autocompleteItemUtils.js

@@ -2,12 +2,15 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.compareFn = exports.maybeCreateFromScopeItem = exports.createFromPrimitiveTypeConstantKind = exports.createFromLibraryDefinition = exports.createFromLanguageConstantKind = exports.createFromKeywordKind = exports.createFromFieldAccess = void 0;
+exports.compareFn = exports.maybeCreateFromScopeItem = exports.createFromPrimitiveTypeConstant = exports.createFromLibraryDefinition = exports.createFromLanguageConstant = exports.createFromKeywordKind = exports.createFromFieldAccess = void 0;
 var PQP = require("@microsoft/powerquery-parser");
+var language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
+var powerquery_parser_1 = require("@microsoft/powerquery-parser");
 var vscode_languageserver_types_1 = require("vscode-languageserver-types");
+var parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
 var jaroWinkler_1 = require("../../jaroWinkler");
 function createFromFieldAccess(label, powerQueryType, maybeOther) {
-    var jaroWinklerScore = maybeOther !== undefined ? jaroWinkler_1.calculateJaroWinkler(label, maybeOther) : 1;
+    var jaroWinklerScore = maybeOther !== undefined ? (0, jaroWinkler_1.calculateJaroWinkler)(label, maybeOther) : 1;
     // If the key is a quoted identifier but doesn't need to be one then slice out the quote contents.
     var identifierKind = PQP.StringUtils.identifierKind(label, false);
     var normalizedLabel = identifierKind === "Quote" /* Quote */ ? label.slice(2, -1) : label;
@@ -20,27 +23,27 @@ function createFromFieldAccess(label, powerQueryType, maybeOther) {
 }
 exports.createFromFieldAccess = createFromFieldAccess;
 function createFromKeywordKind(label, maybeOther) {
-    var jaroWinklerScore = maybeOther !== undefined ? jaroWinkler_1.calculateJaroWinkler(label, maybeOther) : 1;
+    var jaroWinklerScore = maybeOther !== undefined ? (0, jaroWinkler_1.calculateJaroWinkler)(label, maybeOther) : 1;
     return {
         jaroWinklerScore: jaroWinklerScore,
         kind: vscode_languageserver_types_1.CompletionItemKind.Keyword,
         label: label,
-        powerQueryType: PQP.Language.Type.NotApplicableInstance,
+        powerQueryType: language_1.Type.NotApplicableInstance,
     };
 }
 exports.createFromKeywordKind = createFromKeywordKind;
-function createFromLanguageConstantKind(label, maybeOther) {
-    var jaroWinklerScore = maybeOther !== undefined ? jaroWinkler_1.calculateJaroWinkler(label, maybeOther) : 1;
+function createFromLanguageConstant(label, maybeOther) {
+    var jaroWinklerScore = maybeOther !== undefined ? (0, jaroWinkler_1.calculateJaroWinkler)(label, maybeOther) : 1;
     return {
         jaroWinklerScore: jaroWinklerScore,
         kind: vscode_languageserver_types_1.CompletionItemKind.Keyword,
         label: label,
-        powerQueryType: PQP.Language.Type.NotApplicableInstance,
+        powerQueryType: language_1.Type.NotApplicableInstance,
     };
 }
-exports.createFromLanguageConstantKind = createFromLanguageConstantKind;
+exports.createFromLanguageConstant = createFromLanguageConstant;
 function createFromLibraryDefinition(label, libraryDefinition, maybeOther) {
-    var jaroWinklerScore = maybeOther !== undefined ? jaroWinkler_1.calculateJaroWinkler(label, maybeOther) : 1;
+    var jaroWinklerScore = maybeOther !== undefined ? (0, jaroWinkler_1.calculateJaroWinkler)(label, maybeOther) : 1;
     return {
         jaroWinklerScore: jaroWinklerScore,
         kind: libraryDefinition.completionItemKind,
@@ -49,16 +52,16 @@ function createFromLibraryDefinition(label, libraryDefinition, maybeOther) {
     };
 }
 exports.createFromLibraryDefinition = createFromLibraryDefinition;
-function createFromPrimitiveTypeConstantKind(label, maybeOther) {
-    var jaroWinklerScore = maybeOther !== undefined ? jaroWinkler_1.calculateJaroWinkler(label, maybeOther) : 1;
+function createFromPrimitiveTypeConstant(label, maybeOther) {
+    var jaroWinklerScore = maybeOther !== undefined ? (0, jaroWinkler_1.calculateJaroWinkler)(label, maybeOther) : 1;
     return {
         jaroWinklerScore: jaroWinklerScore,
         kind: vscode_languageserver_types_1.CompletionItemKind.Keyword,
         label: label,
-        powerQueryType: PQP.Language.TypeUtils.createPrimitiveType(label === "null" /* Null */, PQP.Language.TypeUtils.typeKindFromPrimitiveTypeConstantKind(label)),
+        powerQueryType: language_1.TypeUtils.createPrimitiveType(label === "null" /* Null */, language_1.TypeUtils.typeKindFromPrimitiveTypeConstantKind(label)),
     };
 }
-exports.createFromPrimitiveTypeConstantKind = createFromPrimitiveTypeConstantKind;
+exports.createFromPrimitiveTypeConstant = createFromPrimitiveTypeConstant;
 function maybeCreateFromScopeItem(label, scopeItem, powerQueryType, maybeOther) {
     switch (scopeItem.kind) {
         case "LetVariable" /* LetVariable */:
@@ -67,7 +70,7 @@ function maybeCreateFromScopeItem(label, scopeItem, powerQueryType, maybeOther)
             if (scopeItem.maybeValue === undefined) {
                 return undefined;
             }
-            label = scopeItem.isRecursive ? "@" + label : label;
+            label = scopeItem.isRecursive ? "@".concat(label) : label;
             break;
         }
         case "Each" /* Each */:
@@ -76,15 +79,15 @@ function maybeCreateFromScopeItem(label, scopeItem, powerQueryType, maybeOther)
             break;
         }
         case "Undefined" /* Undefined */: {
-            if (scopeItem.xorNode.kind !== "Ast" /* Ast */) {
+            if (parser_1.XorNodeUtils.isContextXor(scopeItem.xorNode)) {
                 return undefined;
             }
             break;
         }
         default:
-            throw PQP.Assert.isNever(scopeItem);
+            throw powerquery_parser_1.Assert.isNever(scopeItem);
     }
-    var jaroWinklerScore = maybeOther !== undefined ? jaroWinkler_1.calculateJaroWinkler(label, maybeOther) : 1;
+    var jaroWinklerScore = maybeOther !== undefined ? (0, jaroWinkler_1.calculateJaroWinkler)(label, maybeOther) : 1;
     return {
         jaroWinklerScore: jaroWinklerScore,
         kind: vscode_languageserver_types_1.CompletionItemKind.Variable,
@@ -98,16 +101,14 @@ function compareFn(left, right) {
     if (jaroWinklerScoreDiff !== 0) {
         return jaroWinklerScoreDiff;
     }
+    else if (left.label < right.label) {
+        return -1;
+    }
+    else if (left.label > right.label) {
+        return 1;
+    }
     else {
-        if (left.label < right.label) {
-            return -1;
-        }
-        else if (left.label > right.label) {
-            return 1;
-        }
-        else {
-            return 0;
-        }
+        return 0;
     }
 }
 exports.compareFn = compareFn;