@microsoft/powerquery-language-services 0.3.38 → 0.5.0

package/lib/powerquery-language-services/inspection/deferenceIdentifier.js.map

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

package/lib/powerquery-language-services/inspection/expectedType.d.ts

@@ -1,8 +1,8 @@
 import * as PQP from "@microsoft/powerquery-parser";
 import { Type } from "@microsoft/powerquery-parser/lib/powerquery-parser/language";
 import { TXorNode } from "@microsoft/powerquery-parser/lib/powerquery-parser/parser";
-import { ActiveNode, TMaybeActiveNode } from "./activeNode";
+import { ActiveNode, TActiveNode } from "./activeNode";
 export declare type TriedExpectedType = PQP.Result<Type.TPowerQueryType | undefined, PQP.CommonError.CommonError>;
-export declare function tryExpectedType(settings: PQP.CommonSettings, maybeActiveNode: TMaybeActiveNode): TriedExpectedType;
-export declare function maybeExpectedType(activeNode: ActiveNode): Type.TPowerQueryType | undefined;
+export declare function tryExpectedType(settings: PQP.CommonSettings, activeNode: TActiveNode): TriedExpectedType;
+export declare function findExpectedType(activeNode: ActiveNode): Type.TPowerQueryType | undefined;
 export declare function expectedType(parentXorNode: TXorNode, childIndex: number): Type.TPowerQueryType;

package/lib/powerquery-language-services/inspection/expectedType.js

@@ -2,19 +2,19 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.expectedType = exports.maybeExpectedType = exports.tryExpectedType = void 0;
+exports.expectedType = exports.findExpectedType = exports.tryExpectedType = void 0;
 const PQP = require("@microsoft/powerquery-parser");
 const powerquery_parser_1 = require("@microsoft/powerquery-parser");
 const language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
 const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
 const activeNode_1 = require("./activeNode");
-function tryExpectedType(settings, maybeActiveNode) {
-    const trace = settings.traceManager.entry("Inspection.ExpectedType" /* InspectExpectedType */, tryExpectedType.name, settings.maybeInitialCorrelationId);
-    if (!activeNode_1.ActiveNodeUtils.isPositionInBounds(maybeActiveNode)) {
+function tryExpectedType(settings, activeNode) {
+    const trace = settings.traceManager.entry("Inspection.ExpectedType" /* InspectExpectedType */, tryExpectedType.name, settings.initialCorrelationId);
+    if (!activeNode_1.ActiveNodeUtils.isPositionInBounds(activeNode)) {
         trace.exit();
         return powerquery_parser_1.ResultUtils.boxOk(undefined);
     }
-    const result = powerquery_parser_1.ResultUtils.ensureResult(() => maybeExpectedType(maybeActiveNode), settings.locale);
+    const result = powerquery_parser_1.ResultUtils.ensureResult(() => findExpectedType(activeNode), settings.locale);
     trace.exit();
     return result;
 }
@@ -22,14 +22,14 @@ exports.tryExpectedType = tryExpectedType;
 // Traverse up the ancestry and find what type is expected as the nth child of a node's kind.
 // The last type generated this way should have the widest typing,
 // which then can be used for type hinting.
-function maybeExpectedType(activeNode) {
+function findExpectedType(activeNode) {
     const ancestry = activeNode.ancestry;
     const upperBound = ancestry.length - 1;
     let bestMatch;
     for (let index = 0; index < upperBound; index += 1) {
         const parent = ancestry[index + 1];
         const child = ancestry[index];
-        const childAttributeIndex = powerquery_parser_1.Assert.asDefined(child.node.maybeAttributeIndex, `Expected child to have an attribute index.`, { childId: child.node.id });
+        const childAttributeIndex = powerquery_parser_1.Assert.asDefined(child.node.attributeIndex, `Expected child to have an attribute index.`, { childId: child.node.id });
         const attributeIndex = parser_1.XorNodeUtils.isAstXor(parent) && activeNode.leafKind === "AfterAstNode" /* AfterAstNode */
             ? childAttributeIndex + 1
             : childAttributeIndex;
@@ -40,7 +40,7 @@ function maybeExpectedType(activeNode) {
     }
     return bestMatch;
 }
-exports.maybeExpectedType = maybeExpectedType;
+exports.findExpectedType = findExpectedType;
 // For a given parent node, what is the expected type for a child at a given index?
 function expectedType(parentXorNode, childIndex) {
     switch (parentXorNode.node.kind) {

package/lib/powerquery-language-services/inspection/expectedType.js.map

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

package/lib/powerquery-language-services/inspection/invokeExpression/common.d.ts

@@ -4,8 +4,8 @@ export interface IInvokeExpression<T extends InvokeExpressionArguments> {
     readonly invokeExpressionXorNode: TXorNode;
     readonly functionType: Type.TPowerQueryType;
     readonly isNameInLocalScope: boolean;
-    readonly maybeName: string | undefined;
-    readonly maybeArguments: T | undefined;
+    readonly name: string | undefined;
+    readonly arguments: T | undefined;
 }
 export interface InvokeExpressionArguments {
     readonly numMaxExpectedArguments: number;

package/lib/powerquery-language-services/inspection/invokeExpression/currentInvokeExpression.d.ts

@@ -1,6 +1,6 @@
 import * as PQP from "@microsoft/powerquery-parser";
 import { NodeIdMap } from "@microsoft/powerquery-parser/lib/powerquery-parser/parser";
-import { TMaybeActiveNode } from "../activeNode";
+import { TActiveNode } from "../activeNode";
 import { IInvokeExpression, InvokeExpressionArguments } from "./common";
 import { TypeCache } from "../typeCache";
 import { InspectionSettings } from "../../inspectionSettings";
@@ -9,4 +9,4 @@ export declare type CurrentInvokeExpression = IInvokeExpression<CurrentInvokeExp
 export interface CurrentInvokeExpressionArguments extends InvokeExpressionArguments {
     readonly argumentOrdinal: number;
 }
-export declare function tryCurrentInvokeExpression(settings: InspectionSettings, nodeIdMapCollection: NodeIdMap.Collection, maybeActiveNode: TMaybeActiveNode, typeCache?: TypeCache): Promise<TriedCurrentInvokeExpression>;
+export declare function tryCurrentInvokeExpression(settings: InspectionSettings, nodeIdMapCollection: NodeIdMap.Collection, activeNode: TActiveNode, typeCache?: TypeCache): Promise<TriedCurrentInvokeExpression>;

package/lib/powerquery-language-services/inspection/invokeExpression/currentInvokeExpression.js

@@ -24,46 +24,46 @@ const typeCache_1 = require("../typeCache");
 //  * the given argument nodes
 //  * the given argument types
 //  * type checking for parameter types vs given types
-function tryCurrentInvokeExpression(settings, nodeIdMapCollection, maybeActiveNode, 
+function tryCurrentInvokeExpression(settings, nodeIdMapCollection, activeNode, 
 // If a TypeCache is given, then potentially add to its values and include it as part of the return,
 // Else create a new TypeCache and include it in the return.
 typeCache = typeCache_1.TypeCacheUtils.createEmptyCache()) {
     return __awaiter(this, void 0, void 0, function* () {
-        const trace = settings.traceManager.entry("Inspection.CurrentInvokeExpression" /* InspectCurrentInvokeExpression */, tryCurrentInvokeExpression.name, settings.maybeInitialCorrelationId);
-        const updatedSettings = Object.assign(Object.assign({}, settings), { maybeInitialCorrelationId: trace.id });
-        if (!activeNode_1.ActiveNodeUtils.isPositionInBounds(maybeActiveNode)) {
+        const trace = settings.traceManager.entry("Inspection.CurrentInvokeExpression" /* InspectCurrentInvokeExpression */, tryCurrentInvokeExpression.name, settings.initialCorrelationId);
+        const updatedSettings = Object.assign(Object.assign({}, settings), { initialCorrelationId: trace.id });
+        if (!activeNode_1.ActiveNodeUtils.isPositionInBounds(activeNode)) {
             trace.exit();
             return Promise.resolve(powerquery_parser_1.ResultUtils.boxOk(undefined));
         }
-        const result = yield powerquery_parser_1.ResultUtils.ensureResultAsync(() => inspectInvokeExpression(updatedSettings, nodeIdMapCollection, maybeActiveNode, typeCache, trace.id), updatedSettings.locale);
+        const result = yield powerquery_parser_1.ResultUtils.ensureResultAsync(() => inspectInvokeExpression(updatedSettings, nodeIdMapCollection, activeNode, typeCache, trace.id), updatedSettings.locale);
         trace.exit();
         return result;
     });
 }
 exports.tryCurrentInvokeExpression = tryCurrentInvokeExpression;
-function inspectInvokeExpression(settings, nodeIdMapCollection, activeNode, typeCache, maybeCorrelationId) {
+function inspectInvokeExpression(settings, nodeIdMapCollection, activeNode, typeCache, correlationId) {
     return __awaiter(this, void 0, void 0, function* () {
-        const trace = settings.traceManager.entry("Inspection.CurrentInvokeExpression" /* InspectCurrentInvokeExpression */, inspectInvokeExpression.name, maybeCorrelationId);
-        const updatedSettings = Object.assign(Object.assign({}, settings), { maybeInitialCorrelationId: trace.id });
+        const trace = settings.traceManager.entry("Inspection.CurrentInvokeExpression" /* InspectCurrentInvokeExpression */, inspectInvokeExpression.name, correlationId);
+        const updatedSettings = Object.assign(Object.assign({}, settings), { initialCorrelationId: trace.id });
         const ancestry = activeNode.ancestry;
-        const maybeInvokeExpression = parser_1.AncestryUtils.maybeFirstXorAndIndexOfNodeKind(ancestry, "InvokeExpression" /* InvokeExpression */);
-        if (!maybeInvokeExpression) {
+        const findResult = parser_1.AncestryUtils.findXorAndIndexOfNodeKind(ancestry, "InvokeExpression" /* InvokeExpression */);
+        if (!findResult) {
             trace.exit();
             return undefined;
         }
-        const [invokeExpressionXorNode, ancestryIndex] = maybeInvokeExpression;
+        const [invokeExpressionXorNode, ancestryIndex] = findResult;
         const triedInvokeExpression = yield (0, invokeExpression_1.tryInvokeExpression)(updatedSettings, nodeIdMapCollection, invokeExpressionXorNode.node.id, typeCache);
         if (powerquery_parser_1.ResultUtils.isError(triedInvokeExpression)) {
             trace.exit({ ["IsThrowing" /* IsThrowing */]: true });
             throw triedInvokeExpression;
         }
         const invokeExpression = triedInvokeExpression.value;
-        const maybeArguments = invokeExpression.maybeArguments;
-        let maybeWithArgumentOrdinal;
-        if (maybeArguments !== undefined) {
-            maybeWithArgumentOrdinal = Object.assign(Object.assign({}, maybeArguments), { argumentOrdinal: getArgumentOrdinal(nodeIdMapCollection, activeNode, ancestryIndex, invokeExpressionXorNode) });
+        const args = invokeExpression.arguments;
+        let argumentOrdinal;
+        if (args !== undefined) {
+            argumentOrdinal = Object.assign(Object.assign({}, args), { argumentOrdinal: getArgumentOrdinal(nodeIdMapCollection, activeNode, ancestryIndex, invokeExpressionXorNode) });
         }
-        const result = Object.assign(Object.assign({}, invokeExpression), { maybeArguments: maybeWithArgumentOrdinal });
+        const result = Object.assign(Object.assign({}, invokeExpression), { arguments: argumentOrdinal });
         trace.exit();
         return result;
     });
@@ -71,22 +71,22 @@ function inspectInvokeExpression(settings, nodeIdMapCollection, activeNode, type
 function getArgumentOrdinal(nodeIdMapCollection, activeNode, ancestryIndex, invokeExpressionXorNode) {
     var _a;
     // `foo(1|)
-    const maybeAncestoryCsv = parser_1.AncestryUtils.maybeNthPreviousXorChecked(activeNode.ancestry, ancestryIndex, 2, "Csv" /* Csv */);
-    if (maybeAncestoryCsv !== undefined) {
-        return (_a = maybeAncestoryCsv.node.maybeAttributeIndex) !== null && _a !== void 0 ? _a : 0;
+    const ancestryCsv = parser_1.AncestryUtils.nthPreviousXorChecked(activeNode.ancestry, ancestryIndex, 2, "Csv" /* Csv */);
+    if (ancestryCsv !== undefined) {
+        return (_a = ancestryCsv.node.attributeIndex) !== null && _a !== void 0 ? _a : 0;
     }
-    const maybePreviousXor = parser_1.AncestryUtils.maybePreviousXorChecked(activeNode.ancestry, ancestryIndex, [
+    const previousXor = parser_1.AncestryUtils.previousXorChecked(activeNode.ancestry, ancestryIndex, [
         "ArrayWrapper" /* ArrayWrapper */,
         "Constant" /* Constant */,
     ]);
     let arrayWrapperXorNode;
-    switch (maybePreviousXor === null || maybePreviousXor === void 0 ? void 0 : maybePreviousXor.node.kind) {
+    switch (previousXor === null || previousXor === void 0 ? void 0 : previousXor.node.kind) {
         case "Constant" /* Constant */: {
             arrayWrapperXorNode = parser_1.NodeIdMapUtils.assertGetNthChildChecked(nodeIdMapCollection, invokeExpressionXorNode.node.id, 1, "ArrayWrapper" /* ArrayWrapper */);
             break;
         }
         case "ArrayWrapper" /* ArrayWrapper */: {
-            arrayWrapperXorNode = maybePreviousXor;
+            arrayWrapperXorNode = previousXor;
             break;
         }
         case undefined:
@@ -96,7 +96,7 @@ function getArgumentOrdinal(nodeIdMapCollection, activeNode, ancestryIndex, invo
                 ancestryNodeKinds: activeNode.ancestry.map((xorNode) => xorNode.node.kind),
             });
     }
-    const maybeArrayWrapperChildIds = nodeIdMapCollection.childIdsById.get(arrayWrapperXorNode.node.id);
-    return maybeArrayWrapperChildIds !== undefined ? maybeArrayWrapperChildIds.length - 1 : 0;
+    const arrayWrapperChildIds = nodeIdMapCollection.childIdsById.get(arrayWrapperXorNode.node.id);
+    return arrayWrapperChildIds !== undefined ? arrayWrapperChildIds.length - 1 : 0;
 }
 //# sourceMappingURL=currentInvokeExpression.js.map

package/lib/powerquery-language-services/inspection/invokeExpression/currentInvokeExpression.js.map

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

package/lib/powerquery-language-services/inspection/invokeExpression/invokeExpression.js

@@ -23,8 +23,8 @@ function tryInvokeExpression(settings, nodeIdMapCollection, invokeExpressionId,
 // If a TypeCache is given, then potentially add to its values and include it as part of the return,
 // Else create a new TypeCache and include it in the return.
 typeCache = typeCache_1.TypeCacheUtils.createEmptyCache()) {
-    const trace = settings.traceManager.entry("Inspection.InvokeExpression" /* InspectInvokeExpression */, tryInvokeExpression.name, settings.maybeInitialCorrelationId);
-    const updatedSettings = Object.assign(Object.assign({}, settings), { maybeInitialCorrelationId: trace.id });
+    const trace = settings.traceManager.entry("Inspection.InvokeExpression" /* InspectInvokeExpression */, tryInvokeExpression.name, settings.initialCorrelationId);
+    const updatedSettings = Object.assign(Object.assign({}, settings), { initialCorrelationId: trace.id });
     const result = powerquery_parser_1.ResultUtils.ensureResultAsync(() => inspectInvokeExpression(updatedSettings, nodeIdMapCollection, invokeExpressionId, typeCache, trace.id), settings.locale);
     return result;
 }
@@ -33,26 +33,25 @@ function inspectInvokeExpression(settings, nodeIdMapCollection, invokeExpression
     var _a;
     return __awaiter(this, void 0, void 0, function* () {
         const trace = settings.traceManager.entry("Inspection.InvokeExpression" /* InspectInvokeExpression */, inspectInvokeExpression.name, correlationId);
-        (_a = settings.maybeCancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
-        const maybeInvokeExpressionXorNode = parser_1.NodeIdMapUtils.maybeXor(nodeIdMapCollection, invokeExpressionId);
-        if (maybeInvokeExpressionXorNode === undefined) {
+        (_a = settings.cancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
+        const invokeExpressionXorNode = parser_1.NodeIdMapUtils.xor(nodeIdMapCollection, invokeExpressionId);
+        if (invokeExpressionXorNode === undefined) {
             trace.exit({ ["IsThrowing" /* IsThrowing */]: true });
             throw new PQP.CommonError.InvariantError(`expected invokeExpressionId to be present in nodeIdMapCollection`, {
                 invokeExpressionId,
             });
         }
-        const invokeExpressionXorNode = maybeInvokeExpressionXorNode;
         parser_1.XorNodeUtils.assertIsInvokeExpression(invokeExpressionXorNode);
-        const previousNode = parser_1.NodeIdMapUtils.assertGetRecursiveExpressionPreviousSibling(nodeIdMapCollection, invokeExpressionId);
+        const previousNode = parser_1.NodeIdMapUtils.assertRecursiveExpressionPreviousSibling(nodeIdMapCollection, invokeExpressionId);
         const functionType = powerquery_parser_1.Assert.unboxOk(yield (0, type_1.tryType)(settings, nodeIdMapCollection, previousNode.node.id, typeCache));
-        const maybeName = parser_1.NodeIdMapUtils.maybeInvokeExpressionIdentifierLiteral(nodeIdMapCollection, invokeExpressionId);
-        let maybeInvokeExpressionArgs;
+        const name = parser_1.NodeIdMapUtils.invokeExpressionIdentifierLiteral(nodeIdMapCollection, invokeExpressionId);
+        let invokeExpressionArgs;
         if (language_1.TypeUtils.isDefinedFunction(functionType)) {
             const iterableArguments = parser_1.NodeIdMapIterator.iterInvokeExpression(nodeIdMapCollection, invokeExpressionXorNode);
             const givenArgumentTypes = yield getArgumentTypes(settings, nodeIdMapCollection, typeCache, iterableArguments);
             const givenArguments = iterableArguments.slice(0, givenArgumentTypes.length);
             const [numMinExpectedArguments, numMaxExpectedArguments] = getNumExpectedArguments(functionType);
-            maybeInvokeExpressionArgs = {
+            invokeExpressionArgs = {
                 givenArguments,
                 givenArgumentTypes,
                 numMaxExpectedArguments,
@@ -63,25 +62,25 @@ function inspectInvokeExpression(settings, nodeIdMapCollection, invokeExpression
         const result = {
             invokeExpressionXorNode,
             functionType,
-            isNameInLocalScope: yield getIsNameInLocalScope(settings, nodeIdMapCollection, typeCache, invokeExpressionXorNode, maybeName, trace.id),
-            maybeName,
-            maybeArguments: maybeInvokeExpressionArgs,
+            isNameInLocalScope: yield getIsNameInLocalScope(settings, nodeIdMapCollection, typeCache, invokeExpressionXorNode, name, trace.id),
+            name,
+            arguments: invokeExpressionArgs,
         };
         trace.exit();
         return result;
     });
 }
-function getIsNameInLocalScope(settings, nodeIdMapCollection, typeCache, invokeExpressionXorNode, maybeName, correlationId) {
+function getIsNameInLocalScope(settings, nodeIdMapCollection, typeCache, invokeExpressionXorNode, name, correlationId) {
     return __awaiter(this, void 0, void 0, function* () {
         const trace = settings.traceManager.entry("Inspection.InvokeExpression" /* InspectInvokeExpression */, getIsNameInLocalScope.name, correlationId);
-        const updatedSettings = Object.assign(Object.assign({}, settings), { maybeInitialCorrelationId: trace.id });
+        const updatedSettings = Object.assign(Object.assign({}, settings), { initialCorrelationId: trace.id });
         // Try to find out if the identifier is a local or external name.
-        if (maybeName !== undefined) {
+        if (name !== undefined) {
             // Seed local scope
             const scope = powerquery_parser_1.Assert.unboxOk(yield (0, scope_1.assertGetOrCreateNodeScope)(updatedSettings, nodeIdMapCollection, invokeExpressionXorNode.node.id, typeCache.scopeById));
-            const maybeNameScopeItem = scope.get(maybeName);
+            const nameScopeItem = scope.get(name);
             trace.exit();
-            return maybeNameScopeItem !== undefined && maybeNameScopeItem.kind !== "Undefined" /* Undefined */;
+            return nameScopeItem !== undefined && nameScopeItem.kind !== "Undefined" /* Undefined */;
         }
         else {
             trace.exit();

package/lib/powerquery-language-services/inspection/invokeExpression/invokeExpression.js.map

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

package/lib/powerquery-language-services/inspection/pseudoFunctionExpressionType.js

@@ -11,51 +11,49 @@ function pseudoFunctionExpressionType(nodeIdMapCollection, fnExpr) {
     // Iterates all parameters as TXorNodes if they exist, otherwise early exists from an empty list.
     for (const parameter of functionParameterXorNodes(nodeIdMapCollection, fnExpr)) {
         // A parameter isn't examinable if it doesn't have an Ast.Identifier for its name.
-        const maybeName = parser_1.NodeIdMapUtils.maybeUnboxNthChildIfAstChecked(nodeIdMapCollection, parameter.node.id, 1, "Identifier" /* Identifier */);
-        if (maybeName === undefined) {
+        const name = parser_1.NodeIdMapUtils.unboxNthChildIfAstChecked(nodeIdMapCollection, parameter.node.id, 1, "Identifier" /* Identifier */);
+        if (name === undefined) {
             break;
         }
-        const maybeExaminable = language_1.TypeUtils.inspectParameter(nodeIdMapCollection, parser_1.XorNodeUtils.assertAsParameter(parameter));
-        if (maybeExaminable !== undefined) {
+        const examinable = language_1.TypeUtils.inspectParameter(nodeIdMapCollection, parser_1.XorNodeUtils.assertAsParameter(parameter));
+        if (examinable !== undefined) {
             examinedParameters.push({
                 id: parameter.node.id,
-                isNullable: maybeExaminable.isNullable,
-                isOptional: maybeExaminable.isOptional,
-                maybeType: maybeExaminable.maybeType,
-                name: maybeName,
+                isNullable: examinable.isNullable,
+                isOptional: examinable.isOptional,
+                type: examinable.type,
+                name,
             });
         }
     }
-    const maybeReturnType = parser_1.NodeIdMapUtils.maybeUnboxNthChildIfAstChecked(nodeIdMapCollection, fnExpr.node.id, 1, "AsNullablePrimitiveType" /* AsNullablePrimitiveType */);
+    const returnType = parser_1.NodeIdMapUtils.unboxNthChildIfAstChecked(nodeIdMapCollection, fnExpr.node.id, 1, "AsNullablePrimitiveType" /* AsNullablePrimitiveType */);
     let isReturnNullable;
-    let returnType;
-    if (maybeReturnType !== undefined) {
-        const simplified = language_1.AstUtils.simplifyAsNullablePrimitiveType(maybeReturnType);
+    let returnTypeKind;
+    if (returnType !== undefined) {
+        const simplified = language_1.AstUtils.simplifyAsNullablePrimitiveType(returnType);
         isReturnNullable = simplified.isNullable;
-        returnType = language_1.TypeUtils.typeKindFromPrimitiveTypeConstantKind(simplified.primitiveTypeConstantKind);
+        returnTypeKind = language_1.TypeUtils.typeKindFromPrimitiveTypeConstantKind(simplified.primitiveTypeConstantKind);
     }
     else {
         isReturnNullable = true;
-        returnType = "Any" /* Any */;
+        returnTypeKind = "Any" /* Any */;
     }
     return {
         parameters: examinedParameters,
         returnType: {
-            kind: returnType,
-            maybeExtendedKind: undefined,
+            kind: returnTypeKind,
+            extendedKind: undefined,
             isNullable: isReturnNullable,
         },
     };
 }
 exports.pseudoFunctionExpressionType = pseudoFunctionExpressionType;
 function functionParameterXorNodes(nodeIdMapCollection, fnExpr) {
-    const maybeParameterList = parser_1.NodeIdMapUtils.maybeNthChildChecked(nodeIdMapCollection, fnExpr.node.id, 0, "ParameterList" /* ParameterList */);
-    if (maybeParameterList === undefined) {
+    const parametersList = parser_1.NodeIdMapUtils.nthChildChecked(nodeIdMapCollection, fnExpr.node.id, 0, "ParameterList" /* ParameterList */);
+    if (parametersList === undefined) {
         return [];
     }
-    const maybeWrappedContent = parser_1.NodeIdMapUtils.maybeUnboxWrappedContent(nodeIdMapCollection, maybeParameterList.node.id);
-    return maybeWrappedContent === undefined
-        ? []
-        : parser_1.NodeIdMapIterator.iterArrayWrapper(nodeIdMapCollection, maybeWrappedContent);
+    const wrappedContent = parser_1.NodeIdMapUtils.unboxWrappedContent(nodeIdMapCollection, parametersList.node.id);
+    return wrappedContent === undefined ? [] : parser_1.NodeIdMapIterator.iterArrayWrapper(nodeIdMapCollection, wrappedContent);
 }
 //# sourceMappingURL=pseudoFunctionExpressionType.js.map

package/lib/powerquery-language-services/inspection/pseudoFunctionExpressionType.js.map

@@ -1 +1 @@
-{"version":3,"file":"pseudoFunctionExpressionType.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/inspection/pseudoFunctionExpressionType.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,0FAA6G;AAC7G,sFAOmE;AAcnE,SAAgB,4BAA4B,CACxC,mBAAyC,EACzC,MAAgB;IAEhB,qBAAY,CAAC,gBAAgB,CAAyB,MAAM,gDAAkC,CAAC;IAE/F,MAAM,kBAAkB,GAAkC,EAAE,CAAC;IAE7D,iGAAiG;IACjG,KAAK,MAAM,SAAS,IAAI,yBAAyB,CAAC,mBAAmB,EAAE,MAAM,CAAC,EAAE;QAC5E,kFAAkF;QAClF,MAAM,SAAS,GAA+B,uBAAc,CAAC,8BAA8B,CACvF,mBAAmB,EACnB,SAAS,CAAC,IAAI,CAAC,EAAE,EACjB,CAAC,gCAEJ,CAAC;QAEF,IAAI,SAAS,KAAK,SAAS,EAAE;YACzB,MAAM;SACT;QAED,MAAM,eAAe,GAAuC,oBAAS,CAAC,gBAAgB,CAClF,mBAAmB,EACnB,qBAAY,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAC5C,CAAC;QAEF,IAAI,eAAe,KAAK,SAAS,EAAE;YAC/B,kBAAkB,CAAC,IAAI,CAAC;gBACpB,EAAE,EAAE,SAAS,CAAC,IAAI,CAAC,EAAE;gBACrB,UAAU,EAAE,eAAe,CAAC,UAAU;gBACtC,UAAU,EAAE,eAAe,CAAC,UAAU;gBACtC,SAAS,EAAE,eAAe,CAAC,SAAS;gBACpC,IAAI,EAAE,SAAS;aAClB,CAAC,CAAC;SACN;KACJ;IAED,MAAM,eAAe,GACjB,uBAAc,CAAC,8BAA8B,CACzC,mBAAmB,EACnB,MAAM,CAAC,IAAI,CAAC,EAAE,EACd,CAAC,0DAEJ,CAAC;IAEN,IAAI,gBAAyB,CAAC;IAC9B,IAAI,UAAyB,CAAC;IAE9B,IAAI,eAAe,KAAK,SAAS,EAAE;QAC/B,MAAM,UAAU,GAA4B,mBAAQ,CAAC,+BAA+B,CAAC,eAAe,CAAC,CAAC;QACtG,gBAAgB,GAAG,UAAU,CAAC,UAAU,CAAC;QACzC,UAAU,GAAG,oBAAS,CAAC,qCAAqC,CAAC,UAAU,CAAC,yBAAyB,CAAC,CAAC;KACtG;SAAM;QACH,gBAAgB,GAAG,IAAI,CAAC;QACxB,UAAU,kBAAoB,CAAC;KAClC;IAED,OAAO;QACH,UAAU,EAAE,kBAAkB;QAC9B,UAAU,EAAE;YACR,IAAI,EAAE,UAAU;YAChB,iBAAiB,EAAE,SAAS;YAC5B,UAAU,EAAE,gBAAgB;SAC/B;KACJ,CAAC;AACN,CAAC;AAlED,oEAkEC;AAED,SAAS,yBAAyB,CAC9B,mBAAyC,EACzC,MAAgB;IAEhB,MAAM,kBAAkB,GACpB,uBAAc,CAAC,oBAAoB,CAC/B,mBAAmB,EACnB,MAAM,CAAC,IAAI,CAAC,EAAE,EACd,CAAC,sCAEJ,CAAC;IAEN,IAAI,kBAAkB,KAAK,SAAS,EAAE;QAClC,OAAO,EAAE,CAAC;KACb;IAED,MAAM,mBAAmB,GAAyB,uBAAc,CAAC,wBAAwB,CACrF,mBAAmB,EACnB,kBAAkB,CAAC,IAAI,CAAC,EAAE,CAC7B,CAAC;IAEF,OAAO,mBAAmB,KAAK,SAAS;QACpC,CAAC,CAAC,EAAE;QACJ,CAAC,CAAC,0BAAiB,CAAC,gBAAgB,CAAC,mBAAmB,EAAE,mBAAmB,CAAC,CAAC;AACvF,CAAC"}
+{"version":3,"file":"pseudoFunctionExpressionType.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/inspection/pseudoFunctionExpressionType.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,0FAA6G;AAC7G,sFAOmE;AAcnE,SAAgB,4BAA4B,CACxC,mBAAyC,EACzC,MAAgB;IAEhB,qBAAY,CAAC,gBAAgB,CAAyB,MAAM,gDAAkC,CAAC;IAE/F,MAAM,kBAAkB,GAAkC,EAAE,CAAC;IAE7D,iGAAiG;IACjG,KAAK,MAAM,SAAS,IAAI,yBAAyB,CAAC,mBAAmB,EAAE,MAAM,CAAC,EAAE;QAC5E,kFAAkF;QAClF,MAAM,IAAI,GAA+B,uBAAc,CAAC,yBAAyB,CAC7E,mBAAmB,EACnB,SAAS,CAAC,IAAI,CAAC,EAAE,EACjB,CAAC,gCAEJ,CAAC;QAEF,IAAI,IAAI,KAAK,SAAS,EAAE;YACpB,MAAM;SACT;QAED,MAAM,UAAU,GAAuC,oBAAS,CAAC,gBAAgB,CAC7E,mBAAmB,EACnB,qBAAY,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAC5C,CAAC;QAEF,IAAI,UAAU,KAAK,SAAS,EAAE;YAC1B,kBAAkB,CAAC,IAAI,CAAC;gBACpB,EAAE,EAAE,SAAS,CAAC,IAAI,CAAC,EAAE;gBACrB,UAAU,EAAE,UAAU,CAAC,UAAU;gBACjC,UAAU,EAAE,UAAU,CAAC,UAAU;gBACjC,IAAI,EAAE,UAAU,CAAC,IAAI;gBACrB,IAAI;aACP,CAAC,CAAC;SACN;KACJ;IAED,MAAM,UAAU,GACZ,uBAAc,CAAC,yBAAyB,CACpC,mBAAmB,EACnB,MAAM,CAAC,IAAI,CAAC,EAAE,EACd,CAAC,0DAEJ,CAAC;IAEN,IAAI,gBAAyB,CAAC;IAC9B,IAAI,cAA6B,CAAC;IAElC,IAAI,UAAU,KAAK,SAAS,EAAE;QAC1B,MAAM,UAAU,GAA4B,mBAAQ,CAAC,+BAA+B,CAAC,UAAU,CAAC,CAAC;QACjG,gBAAgB,GAAG,UAAU,CAAC,UAAU,CAAC;QACzC,cAAc,GAAG,oBAAS,CAAC,qCAAqC,CAAC,UAAU,CAAC,yBAAyB,CAAC,CAAC;KAC1G;SAAM;QACH,gBAAgB,GAAG,IAAI,CAAC;QACxB,cAAc,kBAAoB,CAAC;KACtC;IAED,OAAO;QACH,UAAU,EAAE,kBAAkB;QAC9B,UAAU,EAAE;YACR,IAAI,EAAE,cAAc;YACpB,YAAY,EAAE,SAAS;YACvB,UAAU,EAAE,gBAAgB;SAC/B;KACJ,CAAC;AACN,CAAC;AAlED,oEAkEC;AAED,SAAS,yBAAyB,CAC9B,mBAAyC,EACzC,MAAgB;IAEhB,MAAM,cAAc,GAA4C,uBAAc,CAAC,eAAe,CAC1F,mBAAmB,EACnB,MAAM,CAAC,IAAI,CAAC,EAAE,EACd,CAAC,sCAEJ,CAAC;IAEF,IAAI,cAAc,KAAK,SAAS,EAAE;QAC9B,OAAO,EAAE,CAAC;KACb;IAED,MAAM,cAAc,GAAyB,uBAAc,CAAC,mBAAmB,CAC3E,mBAAmB,EACnB,cAAc,CAAC,IAAI,CAAC,EAAE,CACzB,CAAC;IAEF,OAAO,cAAc,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,0BAAiB,CAAC,gBAAgB,CAAC,mBAAmB,EAAE,cAAc,CAAC,CAAC;AACvH,CAAC"}

package/lib/powerquery-language-services/inspection/scope/scope.d.ts

@@ -23,7 +23,7 @@ export interface IScopeItem {
 export interface IKeyValuePairScopeItem<Key extends Ast.Identifier | Ast.GeneralizedIdentifier, Kind extends ScopeItemKind.LetVariable | ScopeItemKind.RecordField | ScopeItemKind.SectionMember> extends IScopeItem {
     readonly kind: Kind;
     readonly key: Key;
-    readonly maybeValue: TXorNode | undefined;
+    readonly value: TXorNode | undefined;
 }
 export interface EachScopeItem extends IScopeItem {
     readonly kind: ScopeItemKind.Each;
@@ -35,7 +35,7 @@ export interface ParameterScopeItem extends IScopeItem {
     readonly name: Ast.Identifier;
     readonly isOptional: boolean;
     readonly isNullable: boolean;
-    readonly maybeType: Constant.PrimitiveTypeConstant | undefined;
+    readonly type: Constant.PrimitiveTypeConstant | undefined;
 }
 export declare type RecordFieldScopeItem = IKeyValuePairScopeItem<Ast.GeneralizedIdentifier, ScopeItemKind.RecordField>;
 export declare type SectionMemberScopeItem = IKeyValuePairScopeItem<Ast.Identifier, ScopeItemKind.SectionMember>;