@microsoft/powerquery-language-services 0.3.40 → 0.5.1

package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeField/inspectTypeFieldProjection.js.map

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

package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeField/inspectTypeFieldSelector.d.ts

@@ -1,4 +1,4 @@
 import { Type } from "@microsoft/powerquery-parser/lib/powerquery-parser/language";
 import { TXorNode } from "@microsoft/powerquery-parser/lib/powerquery-parser/parser";
 import { InspectTypeState } from "../common";
-export declare function inspectTypeFieldSelector(state: InspectTypeState, xorNode: TXorNode, maybeCorrelationId: number | undefined): Promise<Type.TPowerQueryType>;
+export declare function inspectTypeFieldSelector(state: InspectTypeState, xorNode: TXorNode, correlationId: number | undefined): Promise<Type.TPowerQueryType>;

package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeField/inspectTypeFieldSelector.js

@@ -21,25 +21,24 @@ const common_1 = require("./common");
 // In the code below that target for the FieldSelector/FieldProjection is called the scope.
 //
 // In the case of EachExpression:
-//  use whatever scope was provided in InspectionTypeState.maybeEachScopeById, else Unknown
+//  use whatever scope was provided in InspectionTypeState.eachScopeById, else Unknown
 //
 // In the case of RecursivePrimaryExpression:
-//  the scope is the previous sibling's type, so use NodeUtils.assertGetRecursiveExpressionPreviousSibling
-function inspectTypeFieldSelector(state, xorNode, maybeCorrelationId) {
+//  the scope is the previous sibling's type, so use NodeUtils.assertRecursiveExpressionPreviousSibling
+function inspectTypeFieldSelector(state, xorNode, correlationId) {
     var _a;
     return __awaiter(this, void 0, void 0, function* () {
-        const trace = state.traceManager.entry("Inspection.Type" /* InspectType */, inspectTypeFieldSelector.name, maybeCorrelationId, __1.TraceUtils.createXorNodeDetails(xorNode));
-        (_a = state.maybeCancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
+        const trace = state.traceManager.entry("Inspection.Type" /* InspectType */, inspectTypeFieldSelector.name, correlationId, __1.TraceUtils.createXorNodeDetails(xorNode));
+        (_a = state.cancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
         parser_1.XorNodeUtils.assertIsNodeKind(xorNode, "FieldSelector" /* FieldSelector */);
-        const maybeFieldName = parser_1.NodeIdMapUtils.maybeUnboxWrappedContentIfAstChecked(state.nodeIdMapCollection, xorNode.node.id, "GeneralizedIdentifier" /* GeneralizedIdentifier */);
-        if (maybeFieldName === undefined) {
+        const fieldName = parser_1.NodeIdMapUtils.unboxWrappedContentIfAstChecked(state.nodeIdMapCollection, xorNode.node.id, "GeneralizedIdentifier" /* GeneralizedIdentifier */);
+        if (fieldName === undefined) {
             trace.exit({ ["Result" /* Result */]: __1.TraceUtils.createTypeDetails(language_1.Type.UnknownInstance) });
             return language_1.Type.UnknownInstance;
         }
-        const fieldName = maybeFieldName.literal;
         const fieldType = yield (0, common_1.inspectFieldType)(state, xorNode, trace.id);
-        const isOptional = parser_1.NodeIdMapUtils.maybeUnboxNthChildIfAstChecked(state.nodeIdMapCollection, xorNode.node.id, 3, "Constant" /* Constant */) !== undefined;
-        const result = getFieldSelectorType(fieldType, fieldName, isOptional);
+        const isOptional = parser_1.NodeIdMapUtils.unboxNthChildIfAstChecked(state.nodeIdMapCollection, xorNode.node.id, 3, "Constant" /* Constant */) !== undefined;
+        const result = getFieldSelectorType(fieldType, fieldName.literal, isOptional);
         trace.exit({ ["Result" /* Result */]: __1.TraceUtils.createTypeDetails(result) });
         return result;
     });
@@ -59,12 +58,12 @@ function getFieldSelectorType(fieldType, fieldName, isOptional) {
     }
 }
 function inspectRecordOrTable(fieldType, fieldName, isOptional) {
-    if (fieldType.maybeExtendedKind === undefined) {
+    if (fieldType.extendedKind === undefined) {
         return language_1.Type.AnyInstance;
     }
-    const maybeNamedField = fieldType.fields.get(fieldName);
-    if (maybeNamedField !== undefined) {
-        return maybeNamedField;
+    const namedField = fieldType.fields.get(fieldName);
+    if (namedField !== undefined) {
+        return namedField;
     }
     else if (fieldType.isOpen) {
         return language_1.Type.AnyInstance;

package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeField/inspectTypeFieldSelector.js.map

@@ -1 +1 @@
-{"version":3,"file":"inspectTypeFieldSelector.js","sourceRoot":"","sources":["../../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeField/inspectTypeFieldSelector.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,0FAAwF;AACxF,sFAAmH;AAGnH,mCAAkE;AAClE,qCAA4C;AAG5C,mEAAmE;AACnE,8EAA8E;AAC9E,2FAA2F;AAC3F,EAAE;AACF,iCAAiC;AACjC,2FAA2F;AAC3F,EAAE;AACF,6CAA6C;AAC7C,0GAA0G;AAE1G,SAAsB,wBAAwB,CAC1C,KAAuB,EACvB,OAAiB,EACjB,kBAAsC;;;QAEtC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,wBAAwB,CAAC,IAAI,EAC7B,kBAAkB,EAClB,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,MAAA,KAAK,CAAC,sBAAsB,0CAAE,gBAAgB,EAAE,CAAC;QACjD,qBAAY,CAAC,gBAAgB,CAAoB,OAAO,sCAA6B,CAAC;QAEtF,MAAM,cAAc,GAChB,uBAAc,CAAC,oCAAoC,CAC/C,KAAK,CAAC,mBAAmB,EACzB,OAAO,CAAC,IAAI,CAAC,EAAE,sDAElB,CAAC;QAEN,IAAI,cAAc,KAAK,SAAS,EAAE;YAC9B,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,eAAI,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;YAE3F,OAAO,eAAI,CAAC,eAAe,CAAC;SAC/B;QAED,MAAM,SAAS,GAAW,cAAc,CAAC,OAAO,CAAC;QACjD,MAAM,SAAS,GAAyB,MAAM,IAAA,yBAAgB,EAAC,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;QAEzF,MAAM,UAAU,GACZ,uBAAc,CAAC,8BAA8B,CACzC,KAAK,CAAC,mBAAmB,EACzB,OAAO,CAAC,IAAI,CAAC,EAAE,EACf,CAAC,4BAEJ,KAAK,SAAS,CAAC;QAEpB,MAAM,MAAM,GAAyB,oBAAoB,CAAC,SAAS,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;QAC5F,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAE7E,OAAO,MAAM,CAAC;;CACjB;AA3CD,4DA2CC;AAED,SAAS,oBAAoB,CACzB,SAA+B,EAC/B,SAAiB,EACjB,UAAmB;IAEnB,QAAQ,SAAS,CAAC,IAAI,EAAE;QACpB;YACI,OAAO,eAAI,CAAC,WAAW,CAAC;QAE5B;YACI,OAAO,eAAI,CAAC,eAAe,CAAC;QAEhC,2BAA0B;QAC1B;YACI,OAAO,oBAAoB,CAAC,SAAS,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;QAElE;YACI,OAAO,eAAI,CAAC,YAAY,CAAC;KAChC;AACL,CAAC;AAED,SAAS,oBAAoB,CACzB,SAAqC,EACrC,SAAiB,EACjB,UAAmB;IAEnB,IAAI,SAAS,CAAC,iBAAiB,KAAK,SAAS,EAAE;QAC3C,OAAO,eAAI,CAAC,WAAW,CAAC;KAC3B;IAED,MAAM,eAAe,GAAqC,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAE1F,IAAI,eAAe,KAAK,SAAS,EAAE;QAC/B,OAAO,eAAe,CAAC;KAC1B;SAAM,IAAI,SAAS,CAAC,MAAM,EAAE;QACzB,OAAO,eAAI,CAAC,WAAW,CAAC;KAC3B;SAAM;QACH,OAAO,UAAU,CAAC,CAAC,CAAC,eAAI,CAAC,YAAY,CAAC,CAAC,CAAC,eAAI,CAAC,YAAY,CAAC;KAC7D;AACL,CAAC"}
+{"version":3,"file":"inspectTypeFieldSelector.js","sourceRoot":"","sources":["../../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeField/inspectTypeFieldSelector.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,0FAAwF;AACxF,sFAAmH;AAGnH,mCAAkE;AAClE,qCAA4C;AAG5C,mEAAmE;AACnE,8EAA8E;AAC9E,2FAA2F;AAC3F,EAAE;AACF,iCAAiC;AACjC,sFAAsF;AACtF,EAAE;AACF,6CAA6C;AAC7C,uGAAuG;AAEvG,SAAsB,wBAAwB,CAC1C,KAAuB,EACvB,OAAiB,EACjB,aAAiC;;;QAEjC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,wBAAwB,CAAC,IAAI,EAC7B,aAAa,EACb,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,MAAA,KAAK,CAAC,iBAAiB,0CAAE,gBAAgB,EAAE,CAAC;QAC5C,qBAAY,CAAC,gBAAgB,CAAoB,OAAO,sCAA6B,CAAC;QAEtF,MAAM,SAAS,GACX,uBAAc,CAAC,+BAA+B,CAC1C,KAAK,CAAC,mBAAmB,EACzB,OAAO,CAAC,IAAI,CAAC,EAAE,sDAElB,CAAC;QAEN,IAAI,SAAS,KAAK,SAAS,EAAE;YACzB,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,eAAI,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;YAE3F,OAAO,eAAI,CAAC,eAAe,CAAC;SAC/B;QAED,MAAM,SAAS,GAAyB,MAAM,IAAA,yBAAgB,EAAC,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;QAEzF,MAAM,UAAU,GACZ,uBAAc,CAAC,yBAAyB,CACpC,KAAK,CAAC,mBAAmB,EACzB,OAAO,CAAC,IAAI,CAAC,EAAE,EACf,CAAC,4BAEJ,KAAK,SAAS,CAAC;QAEpB,MAAM,MAAM,GAAyB,oBAAoB,CAAC,SAAS,EAAE,SAAS,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;QACpG,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAE7E,OAAO,MAAM,CAAC;;CACjB;AA1CD,4DA0CC;AAED,SAAS,oBAAoB,CACzB,SAA+B,EAC/B,SAAiB,EACjB,UAAmB;IAEnB,QAAQ,SAAS,CAAC,IAAI,EAAE;QACpB;YACI,OAAO,eAAI,CAAC,WAAW,CAAC;QAE5B;YACI,OAAO,eAAI,CAAC,eAAe,CAAC;QAEhC,2BAA0B;QAC1B;YACI,OAAO,oBAAoB,CAAC,SAAS,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;QAElE;YACI,OAAO,eAAI,CAAC,YAAY,CAAC;KAChC;AACL,CAAC;AAED,SAAS,oBAAoB,CACzB,SAAqC,EACrC,SAAiB,EACjB,UAAmB;IAEnB,IAAI,SAAS,CAAC,YAAY,KAAK,SAAS,EAAE;QACtC,OAAO,eAAI,CAAC,WAAW,CAAC;KAC3B;IAED,MAAM,UAAU,GAAqC,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAErF,IAAI,UAAU,KAAK,SAAS,EAAE;QAC1B,OAAO,UAAU,CAAC;KACrB;SAAM,IAAI,SAAS,CAAC,MAAM,EAAE;QACzB,OAAO,eAAI,CAAC,WAAW,CAAC;KAC3B;SAAM;QACH,OAAO,UAAU,CAAC,CAAC,CAAC,eAAI,CAAC,YAAY,CAAC,CAAC,CAAC,eAAI,CAAC,YAAY,CAAC;KAC7D;AACL,CAAC"}

package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFieldSpecification.d.ts

@@ -1,4 +1,4 @@
 import { Type } from "@microsoft/powerquery-parser/lib/powerquery-parser/language";
 import { TXorNode } from "@microsoft/powerquery-parser/lib/powerquery-parser/parser";
 import { InspectTypeState } from "./common";
-export declare function inspectTypeFieldSpecification(state: InspectTypeState, xorNode: TXorNode, maybeCorrelationId: number | undefined): Promise<Type.TPowerQueryType>;
+export declare function inspectTypeFieldSpecification(state: InspectTypeState, xorNode: TXorNode, correlationId: number | undefined): Promise<Type.TPowerQueryType>;

package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFieldSpecification.js

@@ -16,15 +16,15 @@ const language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/l
 const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
 const __1 = require("../../..");
 const common_1 = require("./common");
-function inspectTypeFieldSpecification(state, xorNode, maybeCorrelationId) {
+function inspectTypeFieldSpecification(state, xorNode, correlationId) {
     var _a;
     return __awaiter(this, void 0, void 0, function* () {
-        const trace = state.traceManager.entry("Inspection.Type" /* InspectType */, inspectTypeFieldSpecification.name, maybeCorrelationId, __1.TraceUtils.createXorNodeDetails(xorNode));
-        (_a = state.maybeCancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
+        const trace = state.traceManager.entry("Inspection.Type" /* InspectType */, inspectTypeFieldSpecification.name, correlationId, __1.TraceUtils.createXorNodeDetails(xorNode));
+        (_a = state.cancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
         parser_1.XorNodeUtils.assertIsNodeKind(xorNode, "FieldSpecification" /* FieldSpecification */);
-        const maybeFieldTypeSpecification = parser_1.NodeIdMapUtils.maybeNthChild(state.nodeIdMapCollection, xorNode.node.id, 2);
-        const result = maybeFieldTypeSpecification !== undefined
-            ? yield (0, common_1.inspectXor)(state, maybeFieldTypeSpecification, trace.id)
+        const fieldTypeSpecification = parser_1.NodeIdMapUtils.nthChild(state.nodeIdMapCollection, xorNode.node.id, 2);
+        const result = fieldTypeSpecification !== undefined
+            ? yield (0, common_1.inspectXor)(state, fieldTypeSpecification, trace.id)
             : language_1.Type.AnyInstance;
         trace.exit({ ["Result" /* Result */]: __1.TraceUtils.createTypeDetails(result) });
         return result;

package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFieldSpecification.js.map

@@ -1 +1 @@
-{"version":3,"file":"inspectTypeFieldSpecification.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeFieldSpecification.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,0FAAwF;AACxF,sFAAmH;AAGnH,gCAA+D;AAC/D,qCAAwD;AAExD,SAAsB,6BAA6B,CAC/C,KAAuB,EACvB,OAAiB,EACjB,kBAAsC;;;QAEtC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,6BAA6B,CAAC,IAAI,EAClC,kBAAkB,EAClB,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,MAAA,KAAK,CAAC,sBAAsB,0CAAE,gBAAgB,EAAE,CAAC;QACjD,qBAAY,CAAC,gBAAgB,CAAyB,OAAO,gDAAkC,CAAC;QAEhG,MAAM,2BAA2B,GAAyB,uBAAc,CAAC,aAAa,CAClF,KAAK,CAAC,mBAAmB,EACzB,OAAO,CAAC,IAAI,CAAC,EAAE,EACf,CAAC,CACJ,CAAC;QAEF,MAAM,MAAM,GACR,2BAA2B,KAAK,SAAS;YACrC,CAAC,CAAC,MAAM,IAAA,mBAAU,EAAC,KAAK,EAAE,2BAA2B,EAAE,KAAK,CAAC,EAAE,CAAC;YAChE,CAAC,CAAC,eAAI,CAAC,WAAW,CAAC;QAE3B,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAE7E,OAAO,MAAM,CAAC;;CACjB;AA7BD,sEA6BC"}
+{"version":3,"file":"inspectTypeFieldSpecification.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeFieldSpecification.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,0FAAwF;AACxF,sFAAmH;AAGnH,gCAA+D;AAC/D,qCAAwD;AAExD,SAAsB,6BAA6B,CAC/C,KAAuB,EACvB,OAAiB,EACjB,aAAiC;;;QAEjC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,6BAA6B,CAAC,IAAI,EAClC,aAAa,EACb,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,MAAA,KAAK,CAAC,iBAAiB,0CAAE,gBAAgB,EAAE,CAAC;QAC5C,qBAAY,CAAC,gBAAgB,CAAyB,OAAO,gDAAkC,CAAC;QAEhG,MAAM,sBAAsB,GAAyB,uBAAc,CAAC,QAAQ,CACxE,KAAK,CAAC,mBAAmB,EACzB,OAAO,CAAC,IAAI,CAAC,EAAE,EACf,CAAC,CACJ,CAAC;QAEF,MAAM,MAAM,GACR,sBAAsB,KAAK,SAAS;YAChC,CAAC,CAAC,MAAM,IAAA,mBAAU,EAAC,KAAK,EAAE,sBAAsB,EAAE,KAAK,CAAC,EAAE,CAAC;YAC3D,CAAC,CAAC,eAAI,CAAC,WAAW,CAAC;QAE3B,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAE7E,OAAO,MAAM,CAAC;;CACjB;AA7BD,sEA6BC"}

package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFunctionExpression.d.ts

@@ -1,4 +1,4 @@
 import { Type } from "@microsoft/powerquery-parser/lib/powerquery-parser/language";
 import { TXorNode } from "@microsoft/powerquery-parser/lib/powerquery-parser/parser";
 import { InspectTypeState } from "./common";
-export declare function inspectTypeFunctionExpression(state: InspectTypeState, xorNode: TXorNode, maybeCorrelationId: number | undefined): Promise<Type.TPowerQueryType>;
+export declare function inspectTypeFunctionExpression(state: InspectTypeState, xorNode: TXorNode, correlationId: number | undefined): Promise<Type.TPowerQueryType>;

package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFunctionExpression.js

@@ -18,11 +18,11 @@ const powerquery_parser_1 = require("@microsoft/powerquery-parser");
 const common_1 = require("./common");
 const __1 = require("../../..");
 const pseudoFunctionExpressionType_1 = require("../../pseudoFunctionExpressionType");
-function inspectTypeFunctionExpression(state, xorNode, maybeCorrelationId) {
+function inspectTypeFunctionExpression(state, xorNode, correlationId) {
     var _a;
     return __awaiter(this, void 0, void 0, function* () {
-        const trace = state.traceManager.entry("Inspection.Type" /* InspectType */, inspectTypeFunctionExpression.name, maybeCorrelationId, __1.TraceUtils.createXorNodeDetails(xorNode));
-        (_a = state.maybeCancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
+        const trace = state.traceManager.entry("Inspection.Type" /* InspectType */, inspectTypeFunctionExpression.name, correlationId, __1.TraceUtils.createXorNodeDetails(xorNode));
+        (_a = state.cancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
         parser_1.XorNodeUtils.assertIsNodeKind(xorNode, "FunctionExpression" /* FunctionExpression */);
         const pseudoType = (0, pseudoFunctionExpressionType_1.pseudoFunctionExpressionType)(state.nodeIdMapCollection, xorNode);
         const pseudoReturnType = pseudoType.returnType;
@@ -30,9 +30,9 @@ function inspectTypeFunctionExpression(state, xorNode, maybeCorrelationId) {
         switch (state.typeStrategy) {
             case "Extended" /* Extended */: {
                 const expressionType = yield (0, common_1.inspectTypeFromChildAttributeIndex)(state, xorNode, 3, trace.id);
-                // FunctionExpression.maybeFunctionReturnType doesn't always match FunctionExpression.expression.
+                // FunctionExpression.functionReturnType doesn't always match FunctionExpression.expression.
                 // By examining the expression we might get a more accurate return type (eg. Function vs DefinedFunction),
-                // or discover an error (eg. maybeFunctionReturnType is Number but expression is Text).
+                // or discover an error (eg. functionReturnType is Number but expression is Text).
                 let returnType;
                 // If the stated return type is Any,
                 // then it might as well be the expression's type as it can't be any wider than Any.
@@ -41,7 +41,7 @@ function inspectTypeFunctionExpression(state, xorNode, maybeCorrelationId) {
                 }
                 // If the return type is Any then see if we can narrow it to the stated return Type.
                 else if (expressionType.kind === "Any" /* Any */ &&
-                    expressionType.maybeExtendedKind === "AnyUnion" /* AnyUnion */ &&
+                    expressionType.extendedKind === "AnyUnion" /* AnyUnion */ &&
                     (0, common_1.allForAnyUnion)(expressionType, (type) => type.kind === pseudoReturnType.kind || type.kind === "Any" /* Any */)) {
                     returnType = expressionType;
                 }
@@ -60,13 +60,13 @@ function inspectTypeFunctionExpression(state, xorNode, maybeCorrelationId) {
                 }
                 result = {
                     kind: "Function" /* Function */,
-                    maybeExtendedKind: "DefinedFunction" /* DefinedFunction */,
+                    extendedKind: "DefinedFunction" /* DefinedFunction */,
                     isNullable: false,
                     parameters: pseudoType.parameters.map((pseudoParameter) => ({
                         nameLiteral: pseudoParameter.name.literal,
                         isNullable: pseudoParameter.isNullable,
                         isOptional: pseudoParameter.isOptional,
-                        maybeType: pseudoParameter.maybeType,
+                        type: pseudoParameter.type,
                     })),
                     returnType,
                 };

package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFunctionExpression.js.map

@@ -1 +1 @@
-{"version":3,"file":"inspectTypeFunctionExpression.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeFunctionExpression.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,0FAAwF;AAExF,sFAAmG;AACnG,oEAAsD;AAEtD,qCAAgG;AAChG,gCAA+D;AAC/D,qFAI4C;AAG5C,SAAsB,6BAA6B,CAC/C,KAAuB,EACvB,OAAiB,EACjB,kBAAsC;;;QAEtC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,6BAA6B,CAAC,IAAI,EAClC,kBAAkB,EAClB,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,MAAA,KAAK,CAAC,sBAAsB,0CAAE,gBAAgB,EAAE,CAAC;QACjD,qBAAY,CAAC,gBAAgB,CAAyB,OAAO,gDAAkC,CAAC;QAEhG,MAAM,UAAU,GAAiC,IAAA,2DAA4B,EAAC,KAAK,CAAC,mBAAmB,EAAE,OAAO,CAAC,CAAC;QAClH,MAAM,gBAAgB,GAAyB,UAAU,CAAC,UAAU,CAAC;QAErE,IAAI,MAA4B,CAAC;QAEjC,QAAQ,KAAK,CAAC,YAAY,EAAE;YACxB,8BAA0B,CAAC,CAAC;gBACxB,MAAM,cAAc,GAAyB,MAAM,IAAA,2CAAkC,EACjF,KAAK,EACL,OAAO,EACP,CAAC,EACD,KAAK,CAAC,EAAE,CACX,CAAC;gBAEF,iGAAiG;gBACjG,0GAA0G;gBAC1G,uFAAuF;gBAEvF,IAAI,UAAgC,CAAC;gBAErC,oCAAoC;gBACpC,oFAAoF;gBACpF,IAAI,gBAAgB,CAAC,IAAI,oBAAsB,EAAE;oBAC7C,UAAU,GAAG,cAAc,CAAC;iBAC/B;gBACD,oFAAoF;qBAC/E,IACD,cAAc,CAAC,IAAI,oBAAsB;oBACzC,cAAc,CAAC,iBAAiB,8BAAmC;oBACnE,IAAA,uBAAc,EACV,cAAc,EACd,CAAC,IAA0B,EAAE,EAAE,CAC3B,IAAI,CAAC,IAAI,KAAK,gBAAgB,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,oBAAsB,CAC7E,EACH;oBACE,UAAU,GAAG,cAAc,CAAC;iBAC/B;gBACD,gFAAgF;qBAC3E,IAAI,gBAAgB,CAAC,IAAI,KAAK,cAAc,CAAC,IAAI,EAAE;oBACpD,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,eAAI,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;oBAExF,OAAO,eAAI,CAAC,YAAY,CAAC;iBAC5B;gBACD,oFAAoF;qBAC/E,IAAI,cAAc,CAAC,IAAI,4BAA0B,EAAE;oBACpD,UAAU,GAAG,gBAAgB,CAAC;iBACjC;gBACD,0CAA0C;qBACrC;oBACD,UAAU,GAAG,cAAc,CAAC;iBAC/B;gBAED,MAAM,GAAG;oBACL,IAAI,2BAAwB;oBAC5B,iBAAiB,yCAAuC;oBACxD,UAAU,EAAE,KAAK;oBACjB,UAAU,EAAE,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,eAA4C,EAAE,EAAE,CAAC,CAAC;wBACrF,WAAW,EAAE,eAAe,CAAC,IAAI,CAAC,OAAO;wBACzC,UAAU,EAAE,eAAe,CAAC,UAAU;wBACtC,UAAU,EAAE,eAAe,CAAC,UAAU;wBACtC,SAAS,EAAE,eAAe,CAAC,SAAS;qBACvC,CAAC,CAAC;oBACH,UAAU;iBACb,CAAC;gBAEF,MAAM;aACT;YAED;gBACI,MAAM,GAAG,gBAAgB,CAAC;gBAC1B,MAAM;YAEV;gBACI,0BAAM,CAAC,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;SAC1C;QAED,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAE7E,OAAO,MAAM,CAAC;;CACjB;AA9FD,sEA8FC"}
+{"version":3,"file":"inspectTypeFunctionExpression.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeFunctionExpression.ts"],"names":[],"mappings":"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"}

package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFunctionType.d.ts

@@ -1,4 +1,4 @@
 import { Type } from "@microsoft/powerquery-parser/lib/powerquery-parser/language";
 import { TXorNode } from "@microsoft/powerquery-parser/lib/powerquery-parser/parser";
 import { InspectTypeState } from "./common";
-export declare function inspectTypeFunctionType(state: InspectTypeState, xorNode: TXorNode, maybeCorrelationId: number | undefined): Promise<Type.FunctionType | Type.Type | Type.Unknown>;
+export declare function inspectTypeFunctionType(state: InspectTypeState, xorNode: TXorNode, correlationId: number | undefined): Promise<Type.FunctionType | Type.Type | Type.Unknown>;

package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFunctionType.js

@@ -18,32 +18,32 @@ const __1 = require("../../..");
 const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
 const powerquery_parser_1 = require("@microsoft/powerquery-parser");
 const common_1 = require("./common");
-function inspectTypeFunctionType(state, xorNode, maybeCorrelationId) {
+function inspectTypeFunctionType(state, xorNode, correlationId) {
     var _a;
     return __awaiter(this, void 0, void 0, function* () {
-        const trace = state.traceManager.entry("Inspection.Type" /* InspectType */, inspectTypeFunctionType.name, maybeCorrelationId, __1.TraceUtils.createXorNodeDetails(xorNode));
-        (_a = state.maybeCancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
+        const trace = state.traceManager.entry("Inspection.Type" /* InspectType */, inspectTypeFunctionType.name, correlationId, __1.TraceUtils.createXorNodeDetails(xorNode));
+        (_a = state.cancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
         parser_1.XorNodeUtils.assertIsNodeKind(xorNode, "FunctionType" /* FunctionType */);
         let result;
         switch (state.typeStrategy) {
             case "Extended" /* Extended */: {
-                const maybeParameters = parser_1.NodeIdMapUtils.maybeNthChildChecked(state.nodeIdMapCollection, xorNode.node.id, 1, "ParameterList" /* ParameterList */);
-                if (maybeParameters === undefined) {
+                const parameters = parser_1.NodeIdMapUtils.nthChildChecked(state.nodeIdMapCollection, xorNode.node.id, 1, "ParameterList" /* ParameterList */);
+                if (parameters === undefined) {
                     trace.exit({ ["Result" /* Result */]: __1.TraceUtils.createTypeDetails(language_1.Type.UnknownInstance) });
                     return language_1.Type.UnknownInstance;
                 }
-                const maybeArrayWrapper = parser_1.NodeIdMapUtils.maybeUnboxArrayWrapper(state.nodeIdMapCollection, maybeParameters.node.id);
-                if (maybeArrayWrapper === undefined) {
+                const arrayWrapper = parser_1.NodeIdMapUtils.unboxArrayWrapper(state.nodeIdMapCollection, parameters.node.id);
+                if (arrayWrapper === undefined) {
                     trace.exit({ ["Result" /* Result */]: __1.TraceUtils.createTypeDetails(language_1.Type.UnknownInstance) });
                     return language_1.Type.UnknownInstance;
                 }
-                const parameterTypes = parser_1.NodeIdMapIterator.iterArrayWrapper(state.nodeIdMapCollection, maybeArrayWrapper)
+                const parameterTypes = parser_1.NodeIdMapIterator.iterArrayWrapper(state.nodeIdMapCollection, arrayWrapper)
                     .map((parameter) => language_1.TypeUtils.inspectParameter(state.nodeIdMapCollection, parser_1.XorNodeUtils.assertAsParameter(parameter)))
                     .filter(PQP.TypeScriptUtils.isDefined);
                 const returnType = yield (0, common_1.inspectTypeFromChildAttributeIndex)(state, xorNode, 2, trace.id);
                 result = {
                     kind: "Type" /* Type */,
-                    maybeExtendedKind: "FunctionType" /* FunctionType */,
+                    extendedKind: "FunctionType" /* FunctionType */,
                     isNullable: false,
                     parameters: parameterTypes,
                     returnType,

package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFunctionType.js.map

@@ -1 +1 @@
-{"version":3,"file":"inspectTypeFunctionType.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeFunctionType.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,oDAAoD;AACpD,0FAAmG;AACnG,gCAA+D;AAC/D,sFAMmE;AAEnE,oEAAsD;AAEtD,qCAAgF;AAGhF,SAAsB,uBAAuB,CACzC,KAAuB,EACvB,OAAiB,EACjB,kBAAsC;;;QAEtC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,uBAAuB,CAAC,IAAI,EAC5B,kBAAkB,EAClB,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,MAAA,KAAK,CAAC,sBAAsB,0CAAE,gBAAgB,EAAE,CAAC;QACjD,qBAAY,CAAC,gBAAgB,CAAmB,OAAO,oCAA4B,CAAC;QAEpF,IAAI,MAAoD,CAAC;QAEzD,QAAQ,KAAK,CAAC,YAAY,EAAE;YACxB,8BAA0B,CAAC,CAAC;gBACxB,MAAM,eAAe,GACjB,uBAAc,CAAC,oBAAoB,CAC/B,KAAK,CAAC,mBAAmB,EACzB,OAAO,CAAC,IAAI,CAAC,EAAE,EACf,CAAC,sCAEJ,CAAC;gBAEN,IAAI,eAAe,KAAK,SAAS,EAAE;oBAC/B,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,eAAI,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;oBAE3F,OAAO,eAAI,CAAC,eAAe,CAAC;iBAC/B;gBAED,MAAM,iBAAiB,GAA2C,uBAAc,CAAC,sBAAsB,CACnG,KAAK,CAAC,mBAAmB,EACzB,eAAe,CAAC,IAAI,CAAC,EAAE,CAC1B,CAAC;gBAEF,IAAI,iBAAiB,KAAK,SAAS,EAAE;oBACjC,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,eAAI,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;oBAE3F,OAAO,eAAI,CAAC,eAAe,CAAC;iBAC/B;gBAED,MAAM,cAAc,GAA0C,0BAAiB,CAAC,gBAAgB,CAC5F,KAAK,CAAC,mBAAmB,EACzB,iBAAiB,CACpB;qBACI,GAAG,CAAC,CAAC,SAAmB,EAAE,EAAE,CACzB,oBAAS,CAAC,gBAAgB,CAAC,KAAK,CAAC,mBAAmB,EAAE,qBAAY,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC,CACnG;qBACA,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;gBAE3C,MAAM,UAAU,GAAyB,MAAM,IAAA,2CAAkC,EAC7E,KAAK,EACL,OAAO,EACP,CAAC,EACD,KAAK,CAAC,EAAE,CACX,CAAC;gBAEF,MAAM,GAAG;oBACL,IAAI,mBAAoB;oBACxB,iBAAiB,mCAAoC;oBACrD,UAAU,EAAE,KAAK;oBACjB,UAAU,EAAE,cAAc;oBAC1B,UAAU;iBACb,CAAC;gBAEF,MAAM;aACT;YAED;gBACI,MAAM,GAAG,eAAI,CAAC,qBAAqB,CAAC;gBACpC,MAAM;YAEV;gBACI,0BAAM,CAAC,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;SAC1C;QAED,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAE7E,OAAO,MAAM,CAAC;;CACjB;AAlFD,0DAkFC"}
+{"version":3,"file":"inspectTypeFunctionType.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeFunctionType.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,oDAAoD;AACpD,0FAAmG;AACnG,gCAA+D;AAC/D,sFAMmE;AAEnE,oEAAsD;AAEtD,qCAAgF;AAGhF,SAAsB,uBAAuB,CACzC,KAAuB,EACvB,OAAiB,EACjB,aAAiC;;;QAEjC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,uBAAuB,CAAC,IAAI,EAC5B,aAAa,EACb,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,MAAA,KAAK,CAAC,iBAAiB,0CAAE,gBAAgB,EAAE,CAAC;QAC5C,qBAAY,CAAC,gBAAgB,CAAmB,OAAO,oCAA4B,CAAC;QAEpF,IAAI,MAAoD,CAAC;QAEzD,QAAQ,KAAK,CAAC,YAAY,EAAE;YACxB,8BAA0B,CAAC,CAAC;gBACxB,MAAM,UAAU,GACZ,uBAAc,CAAC,eAAe,CAC1B,KAAK,CAAC,mBAAmB,EACzB,OAAO,CAAC,IAAI,CAAC,EAAE,EACf,CAAC,sCAEJ,CAAC;gBAEN,IAAI,UAAU,KAAK,SAAS,EAAE;oBAC1B,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,eAAI,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;oBAE3F,OAAO,eAAI,CAAC,eAAe,CAAC;iBAC/B;gBAED,MAAM,YAAY,GAA2C,uBAAc,CAAC,iBAAiB,CACzF,KAAK,CAAC,mBAAmB,EACzB,UAAU,CAAC,IAAI,CAAC,EAAE,CACrB,CAAC;gBAEF,IAAI,YAAY,KAAK,SAAS,EAAE;oBAC5B,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,eAAI,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;oBAE3F,OAAO,eAAI,CAAC,eAAe,CAAC;iBAC/B;gBAED,MAAM,cAAc,GAA0C,0BAAiB,CAAC,gBAAgB,CAC5F,KAAK,CAAC,mBAAmB,EACzB,YAAY,CACf;qBACI,GAAG,CAAC,CAAC,SAAmB,EAAE,EAAE,CACzB,oBAAS,CAAC,gBAAgB,CAAC,KAAK,CAAC,mBAAmB,EAAE,qBAAY,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC,CACnG;qBACA,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;gBAE3C,MAAM,UAAU,GAAyB,MAAM,IAAA,2CAAkC,EAC7E,KAAK,EACL,OAAO,EACP,CAAC,EACD,KAAK,CAAC,EAAE,CACX,CAAC;gBAEF,MAAM,GAAG;oBACL,IAAI,mBAAoB;oBACxB,YAAY,mCAAoC;oBAChD,UAAU,EAAE,KAAK;oBACjB,UAAU,EAAE,cAAc;oBAC1B,UAAU;iBACb,CAAC;gBAEF,MAAM;aACT;YAED;gBACI,MAAM,GAAG,eAAI,CAAC,qBAAqB,CAAC;gBACpC,MAAM;YAEV;gBACI,0BAAM,CAAC,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;SAC1C;QAED,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAE7E,OAAO,MAAM,CAAC;;CACjB;AAlFD,0DAkFC"}

package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeIdentifier.d.ts

@@ -1,4 +1,4 @@
 import { Type } from "@microsoft/powerquery-parser/lib/powerquery-parser/language";
 import { TXorNode } from "@microsoft/powerquery-parser/lib/powerquery-parser/parser";
 import { InspectTypeState } from "./common";
-export declare function inspectTypeIdentifier(state: InspectTypeState, xorNode: TXorNode, maybeCorrelationId: number | undefined): Promise<Type.TPowerQueryType>;
+export declare function inspectTypeIdentifier(state: InspectTypeState, xorNode: TXorNode, correlationId: number | undefined): Promise<Type.TPowerQueryType>;

package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeIdentifier.js

@@ -14,20 +14,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.inspectTypeIdentifier = void 0;
 const language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
 const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
-const __1 = require("../../..");
 const common_1 = require("./common");
-function inspectTypeIdentifier(state, xorNode, maybeCorrelationId) {
+const __1 = require("../../..");
+function inspectTypeIdentifier(state, xorNode, correlationId) {
     var _a;
     return __awaiter(this, void 0, void 0, function* () {
-        const trace = state.traceManager.entry("Inspection.Type" /* InspectType */, inspectTypeIdentifier.name, maybeCorrelationId, __1.TraceUtils.createXorNodeDetails(xorNode));
-        (_a = state.maybeCancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
+        const trace = state.traceManager.entry("Inspection.Type" /* InspectType */, inspectTypeIdentifier.name, correlationId, __1.TraceUtils.createXorNodeDetails(xorNode));
+        (_a = state.cancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
         parser_1.XorNodeUtils.assertIsNodeKind(xorNode, "Identifier" /* Identifier */);
         let result;
         if (parser_1.XorNodeUtils.isContextXor(xorNode)) {
             result = language_1.Type.UnknownInstance;
         }
         else {
-            const dereferencedType = yield (0, common_1.maybeDereferencedIdentifierType)(state, xorNode, trace.id);
+            const dereferencedType = yield (0, common_1.dereferencedIdentifierType)(state, xorNode, trace.id);
             result = dereferencedType !== null && dereferencedType !== void 0 ? dereferencedType : language_1.Type.UnknownInstance;
         }
         trace.exit({ ["Result" /* Result */]: __1.TraceUtils.createTypeDetails(result) });

package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeIdentifier.js.map

@@ -1 +1 @@
-{"version":3,"file":"inspectTypeIdentifier.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeIdentifier.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,0FAAwF;AAExF,sFAAmG;AAEnG,gCAA+D;AAC/D,qCAA6E;AAE7E,SAAsB,qBAAqB,CACvC,KAAuB,EACvB,OAAiB,EACjB,kBAAsC;;;QAEtC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,qBAAqB,CAAC,IAAI,EAC1B,kBAAkB,EAClB,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,MAAA,KAAK,CAAC,sBAAsB,0CAAE,gBAAgB,EAAE,CAAC;QACjD,qBAAY,CAAC,gBAAgB,CAAiB,OAAO,gCAA0B,CAAC;QAEhF,IAAI,MAA4B,CAAC;QAEjC,IAAI,qBAAY,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE;YACpC,MAAM,GAAG,eAAI,CAAC,eAAe,CAAC;SACjC;aAAM;YACH,MAAM,gBAAgB,GAAqC,MAAM,IAAA,wCAA+B,EAC5F,KAAK,EACL,OAAO,EACP,KAAK,CAAC,EAAE,CACX,CAAC;YAEF,MAAM,GAAG,gBAAgB,aAAhB,gBAAgB,cAAhB,gBAAgB,GAAI,eAAI,CAAC,eAAe,CAAC;SACrD;QAED,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAE7E,OAAO,MAAM,CAAC;;CACjB;AAhCD,sDAgCC"}
+{"version":3,"file":"inspectTypeIdentifier.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeIdentifier.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,0FAAwF;AAExF,sFAAmG;AAEnG,qCAAwE;AACxE,gCAA+D;AAE/D,SAAsB,qBAAqB,CACvC,KAAuB,EACvB,OAAiB,EACjB,aAAiC;;;QAEjC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,qBAAqB,CAAC,IAAI,EAC1B,aAAa,EACb,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,MAAA,KAAK,CAAC,iBAAiB,0CAAE,gBAAgB,EAAE,CAAC;QAC5C,qBAAY,CAAC,gBAAgB,CAAiB,OAAO,gCAA0B,CAAC;QAEhF,IAAI,MAA4B,CAAC;QAEjC,IAAI,qBAAY,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE;YACpC,MAAM,GAAG,eAAI,CAAC,eAAe,CAAC;SACjC;aAAM;YACH,MAAM,gBAAgB,GAAqC,MAAM,IAAA,mCAA0B,EACvF,KAAK,EACL,OAAO,EACP,KAAK,CAAC,EAAE,CACX,CAAC;YAEF,MAAM,GAAG,gBAAgB,aAAhB,gBAAgB,cAAhB,gBAAgB,GAAI,eAAI,CAAC,eAAe,CAAC;SACrD;QAED,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAE7E,OAAO,MAAM,CAAC;;CACjB;AAhCD,sDAgCC"}

package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeIdentifierExpression.d.ts

@@ -1,4 +1,4 @@
 import { Type } from "@microsoft/powerquery-parser/lib/powerquery-parser/language";
 import { TXorNode } from "@microsoft/powerquery-parser/lib/powerquery-parser/parser";
 import { InspectTypeState } from "./common";
-export declare function inspectTypeIdentifierExpression(state: InspectTypeState, xorNode: TXorNode, maybeCorrelationId: number | undefined): Promise<Type.TPowerQueryType>;
+export declare function inspectTypeIdentifierExpression(state: InspectTypeState, xorNode: TXorNode, correlationId: number | undefined): Promise<Type.TPowerQueryType>;

package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeIdentifierExpression.js

@@ -14,20 +14,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.inspectTypeIdentifierExpression = void 0;
 const language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
 const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
-const __1 = require("../../..");
 const common_1 = require("./common");
-function inspectTypeIdentifierExpression(state, xorNode, maybeCorrelationId) {
+const __1 = require("../../..");
+function inspectTypeIdentifierExpression(state, xorNode, correlationId) {
     var _a;
     return __awaiter(this, void 0, void 0, function* () {
-        const trace = state.traceManager.entry("Inspection.Type" /* InspectType */, inspectTypeIdentifierExpression.name, maybeCorrelationId, __1.TraceUtils.createXorNodeDetails(xorNode));
-        (_a = state.maybeCancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
+        const trace = state.traceManager.entry("Inspection.Type" /* InspectType */, inspectTypeIdentifierExpression.name, correlationId, __1.TraceUtils.createXorNodeDetails(xorNode));
+        (_a = state.cancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
         parser_1.XorNodeUtils.assertIsNodeKind(xorNode, "IdentifierExpression" /* IdentifierExpression */);
         let result;
         if (parser_1.XorNodeUtils.isContextXor(xorNode)) {
             result = language_1.Type.UnknownInstance;
         }
         else {
-            const dereferencedType = yield (0, common_1.maybeDereferencedIdentifierType)(state, xorNode, trace.id);
+            const dereferencedType = yield (0, common_1.dereferencedIdentifierType)(state, xorNode, trace.id);
             result = dereferencedType !== null && dereferencedType !== void 0 ? dereferencedType : language_1.Type.UnknownInstance;
         }
         trace.exit({ ["Result" /* Result */]: __1.TraceUtils.createTypeDetails(result) });

package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeIdentifierExpression.js.map

@@ -1 +1 @@
-{"version":3,"file":"inspectTypeIdentifierExpression.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeIdentifierExpression.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,0FAAwF;AAExF,sFAAmG;AAEnG,gCAA+D;AAC/D,qCAA6E;AAE7E,SAAsB,+BAA+B,CACjD,KAAuB,EACvB,OAAiB,EACjB,kBAAsC;;;QAEtC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,+BAA+B,CAAC,IAAI,EACpC,kBAAkB,EAClB,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,MAAA,KAAK,CAAC,sBAAsB,0CAAE,gBAAgB,EAAE,CAAC;QACjD,qBAAY,CAAC,gBAAgB,CAA2B,OAAO,oDAAoC,CAAC;QAEpG,IAAI,MAA4B,CAAC;QAEjC,IAAI,qBAAY,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE;YACpC,MAAM,GAAG,eAAI,CAAC,eAAe,CAAC;SACjC;aAAM;YACH,MAAM,gBAAgB,GAAqC,MAAM,IAAA,wCAA+B,EAC5F,KAAK,EACL,OAAO,EACP,KAAK,CAAC,EAAE,CACX,CAAC;YAEF,MAAM,GAAG,gBAAgB,aAAhB,gBAAgB,cAAhB,gBAAgB,GAAI,eAAI,CAAC,eAAe,CAAC;SACrD;QAED,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAE7E,OAAO,MAAM,CAAC;;CACjB;AAhCD,0EAgCC"}
+{"version":3,"file":"inspectTypeIdentifierExpression.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeIdentifierExpression.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,0FAAwF;AAExF,sFAAmG;AAEnG,qCAAwE;AACxE,gCAA+D;AAE/D,SAAsB,+BAA+B,CACjD,KAAuB,EACvB,OAAiB,EACjB,aAAiC;;;QAEjC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,+BAA+B,CAAC,IAAI,EACpC,aAAa,EACb,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,MAAA,KAAK,CAAC,iBAAiB,0CAAE,gBAAgB,EAAE,CAAC;QAC5C,qBAAY,CAAC,gBAAgB,CAA2B,OAAO,oDAAoC,CAAC;QAEpG,IAAI,MAA4B,CAAC;QAEjC,IAAI,qBAAY,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE;YACpC,MAAM,GAAG,eAAI,CAAC,eAAe,CAAC;SACjC;aAAM;YACH,MAAM,gBAAgB,GAAqC,MAAM,IAAA,mCAA0B,EACvF,KAAK,EACL,OAAO,EACP,KAAK,CAAC,EAAE,CACX,CAAC;YAEF,MAAM,GAAG,gBAAgB,aAAhB,gBAAgB,cAAhB,gBAAgB,GAAI,eAAI,CAAC,eAAe,CAAC;SACrD;QAED,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAE7E,OAAO,MAAM,CAAC;;CACjB;AAhCD,0EAgCC"}

package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeIfExpression.d.ts

@@ -1,4 +1,4 @@
 import { Type } from "@microsoft/powerquery-parser/lib/powerquery-parser/language";
 import { TXorNode } from "@microsoft/powerquery-parser/lib/powerquery-parser/parser";
 import { InspectTypeState } from "./common";
-export declare function inspectTypeIfExpression(state: InspectTypeState, xorNode: TXorNode, maybeCorrelationId: number | undefined): Promise<Type.TPowerQueryType>;
+export declare function inspectTypeIfExpression(state: InspectTypeState, xorNode: TXorNode, correlationId: number | undefined): Promise<Type.TPowerQueryType>;

package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeIfExpression.js

@@ -16,11 +16,11 @@ const language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/l
 const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
 const common_1 = require("./common");
 const __1 = require("../../..");
-function inspectTypeIfExpression(state, xorNode, maybeCorrelationId) {
+function inspectTypeIfExpression(state, xorNode, correlationId) {
     var _a;
     return __awaiter(this, void 0, void 0, function* () {
-        const trace = state.traceManager.entry("Inspection.Type" /* InspectType */, inspectTypeIfExpression.name, maybeCorrelationId, __1.TraceUtils.createXorNodeDetails(xorNode));
-        (_a = state.maybeCancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
+        const trace = state.traceManager.entry("Inspection.Type" /* InspectType */, inspectTypeIfExpression.name, correlationId, __1.TraceUtils.createXorNodeDetails(xorNode));
+        (_a = state.cancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
         parser_1.XorNodeUtils.assertIsNodeKind(xorNode, "IfExpression" /* IfExpression */);
         const conditionType = yield (0, common_1.inspectTypeFromChildAttributeIndex)(state, xorNode, 1, trace.id);
         let result;
@@ -29,7 +29,7 @@ function inspectTypeIfExpression(state, xorNode, maybeCorrelationId) {
         }
         // Any is allowed so long as AnyUnion only contains Any or Logical.
         else if (conditionType.kind === "Any" /* Any */) {
-            if (conditionType.maybeExtendedKind === "AnyUnion" /* AnyUnion */ &&
+            if (conditionType.extendedKind === "AnyUnion" /* AnyUnion */ &&
                 !(0, common_1.allForAnyUnion)(conditionType, (type) => type.kind === "Logical" /* Logical */ || type.kind === "Any" /* Any */)) {
                 result = language_1.Type.NoneInstance;
             }

package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeIfExpression.js.map

@@ -1 +1 @@
-{"version":3,"file":"inspectTypeIfExpression.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeIfExpression.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,0FAAmG;AAEnG,sFAA4G;AAE5G,qCAAgG;AAChG,gCAA+D;AAE/D,SAAsB,uBAAuB,CACzC,KAAuB,EACvB,OAAiB,EACjB,kBAAsC;;;QAEtC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,uBAAuB,CAAC,IAAI,EAC5B,kBAAkB,EAClB,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,MAAA,KAAK,CAAC,sBAAsB,0CAAE,gBAAgB,EAAE,CAAC;QACjD,qBAAY,CAAC,gBAAgB,CAAmB,OAAO,oCAA4B,CAAC;QAEpF,MAAM,aAAa,GAAyB,MAAM,IAAA,2CAAkC,EAAC,KAAK,EAAE,OAAO,EAAE,CAAC,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;QAClH,IAAI,MAA4B,CAAC;QAEjC,IAAI,aAAa,CAAC,IAAI,4BAA0B,EAAE;YAC9C,MAAM,GAAG,eAAI,CAAC,eAAe,CAAC;SACjC;QACD,mEAAmE;aAC9D,IAAI,aAAa,CAAC,IAAI,oBAAsB,EAAE;YAC/C,IACI,aAAa,CAAC,iBAAiB,8BAAmC;gBAClE,CAAC,IAAA,uBAAc,EACX,aAAa,EACb,CAAC,IAA0B,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,4BAA0B,IAAI,IAAI,CAAC,IAAI,oBAAsB,CACzG,EACH;gBACE,MAAM,GAAG,eAAI,CAAC,YAAY,CAAC;aAC9B;iBAAM;gBACH,MAAM,GAAG,MAAM,cAAc,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;aAC3D;SACJ;aAAM,IAAI,aAAa,CAAC,IAAI,4BAA0B,EAAE;YACrD,MAAM,GAAG,eAAI,CAAC,YAAY,CAAC;SAC9B;aAAM;YACH,MAAM,GAAG,MAAM,cAAc,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;SAC3D;QAED,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAE7E,OAAO,MAAM,CAAC;;CACjB;AA3CD,0DA2CC;AAED,SAAe,cAAc,CACzB,KAAuB,EACvB,OAAkC,EAClC,aAAqB;;QAErB,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,cAAc,CAAC,IAAI,EACnB,aAAa,EACb,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,MAAM,YAAY,GAAyB,MAAM,IAAA,2CAAkC,EAAC,KAAK,EAAE,OAAO,EAAE,CAAC,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;QACjH,MAAM,aAAa,GAAyB,MAAM,IAAA,2CAAkC,EAAC,KAAK,EAAE,OAAO,EAAE,CAAC,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;QAElH,MAAM,MAAM,GAAyB,oBAAS,CAAC,cAAc,CACzD,CAAC,YAAY,EAAE,aAAa,CAAC,EAC7B,KAAK,CAAC,YAAY,EAClB,KAAK,CAAC,EAAE,CACX,CAAC;QAEF,KAAK,CAAC,IAAI,EAAE,CAAC;QAEb,OAAO,MAAM,CAAC;IAClB,CAAC;CAAA"}
+{"version":3,"file":"inspectTypeIfExpression.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeIfExpression.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,0FAAmG;AAEnG,sFAA4G;AAE5G,qCAAgG;AAChG,gCAA+D;AAE/D,SAAsB,uBAAuB,CACzC,KAAuB,EACvB,OAAiB,EACjB,aAAiC;;;QAEjC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,uBAAuB,CAAC,IAAI,EAC5B,aAAa,EACb,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,MAAA,KAAK,CAAC,iBAAiB,0CAAE,gBAAgB,EAAE,CAAC;QAC5C,qBAAY,CAAC,gBAAgB,CAAmB,OAAO,oCAA4B,CAAC;QAEpF,MAAM,aAAa,GAAyB,MAAM,IAAA,2CAAkC,EAAC,KAAK,EAAE,OAAO,EAAE,CAAC,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;QAClH,IAAI,MAA4B,CAAC;QAEjC,IAAI,aAAa,CAAC,IAAI,4BAA0B,EAAE;YAC9C,MAAM,GAAG,eAAI,CAAC,eAAe,CAAC;SACjC;QACD,mEAAmE;aAC9D,IAAI,aAAa,CAAC,IAAI,oBAAsB,EAAE;YAC/C,IACI,aAAa,CAAC,YAAY,8BAAmC;gBAC7D,CAAC,IAAA,uBAAc,EACX,aAAa,EACb,CAAC,IAA0B,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,4BAA0B,IAAI,IAAI,CAAC,IAAI,oBAAsB,CACzG,EACH;gBACE,MAAM,GAAG,eAAI,CAAC,YAAY,CAAC;aAC9B;iBAAM;gBACH,MAAM,GAAG,MAAM,cAAc,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;aAC3D;SACJ;aAAM,IAAI,aAAa,CAAC,IAAI,4BAA0B,EAAE;YACrD,MAAM,GAAG,eAAI,CAAC,YAAY,CAAC;SAC9B;aAAM;YACH,MAAM,GAAG,MAAM,cAAc,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;SAC3D;QAED,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAE7E,OAAO,MAAM,CAAC;;CACjB;AA3CD,0DA2CC;AAED,SAAe,cAAc,CACzB,KAAuB,EACvB,OAAkC,EAClC,aAAqB;;QAErB,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,cAAc,CAAC,IAAI,EACnB,aAAa,EACb,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,MAAM,YAAY,GAAyB,MAAM,IAAA,2CAAkC,EAAC,KAAK,EAAE,OAAO,EAAE,CAAC,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;QACjH,MAAM,aAAa,GAAyB,MAAM,IAAA,2CAAkC,EAAC,KAAK,EAAE,OAAO,EAAE,CAAC,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;QAElH,MAAM,MAAM,GAAyB,oBAAS,CAAC,cAAc,CACzD,CAAC,YAAY,EAAE,aAAa,CAAC,EAC7B,KAAK,CAAC,YAAY,EAClB,KAAK,CAAC,EAAE,CACX,CAAC;QAEF,KAAK,CAAC,IAAI,EAAE,CAAC;QAEb,OAAO,MAAM,CAAC;IAClB,CAAC;CAAA"}

package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeInvokeExpression.d.ts

@@ -1,4 +1,4 @@
 import { Type } from "@microsoft/powerquery-parser/lib/powerquery-parser/language";
 import { TXorNode } from "@microsoft/powerquery-parser/lib/powerquery-parser/parser";
 import { InspectTypeState } from "./common";
-export declare function inspectTypeInvokeExpression(state: InspectTypeState, xorNode: TXorNode, maybeCorrelationId: number | undefined): Promise<Type.TPowerQueryType>;
+export declare function inspectTypeInvokeExpression(state: InspectTypeState, xorNode: TXorNode, correlationId: number | undefined): Promise<Type.TPowerQueryType>;

package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeInvokeExpression.js

@@ -19,21 +19,21 @@ const externalType_1 = require("../../externalType");
 const __1 = require("../../..");
 const common_1 = require("./common");
 const deferenceIdentifier_1 = require("../../deferenceIdentifier");
-function inspectTypeInvokeExpression(state, xorNode, maybeCorrelationId) {
+function inspectTypeInvokeExpression(state, xorNode, correlationId) {
     var _a;
     return __awaiter(this, void 0, void 0, function* () {
-        const trace = state.traceManager.entry("Inspection.Type" /* InspectType */, inspectTypeInvokeExpression.name, maybeCorrelationId, __1.TraceUtils.createXorNodeDetails(xorNode));
-        (_a = state.maybeCancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
+        const trace = state.traceManager.entry("Inspection.Type" /* InspectType */, inspectTypeInvokeExpression.name, correlationId, __1.TraceUtils.createXorNodeDetails(xorNode));
+        (_a = state.cancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
         parser_1.XorNodeUtils.assertIsNodeKind(xorNode, "InvokeExpression" /* InvokeExpression */);
-        const maybeRequest = yield maybeExternalInvokeRequest(state, xorNode, trace.id);
-        if (maybeRequest !== undefined) {
-            const maybeType = state.library.externalTypeResolver(maybeRequest);
-            if (maybeType !== undefined) {
-                trace.exit({ ["Result" /* Result */]: __1.TraceUtils.createTypeDetails(maybeType) });
-                return maybeType;
+        const request = yield externalInvokeRequest(state, xorNode, trace.id);
+        if (request !== undefined) {
+            const type = state.library.externalTypeResolver(request);
+            if (type !== undefined) {
+                trace.exit({ ["Result" /* Result */]: __1.TraceUtils.createTypeDetails(type) });
+                return type;
             }
         }
-        const previousSibling = parser_1.NodeIdMapUtils.assertGetRecursiveExpressionPreviousSibling(state.nodeIdMapCollection, xorNode.node.id);
+        const previousSibling = parser_1.NodeIdMapUtils.assertRecursiveExpressionPreviousSibling(state.nodeIdMapCollection, xorNode.node.id);
         const previousSiblingType = yield (0, common_1.inspectXor)(state, previousSibling, trace.id);
         let result;
         if (previousSiblingType.kind === "Any" /* Any */) {
@@ -42,7 +42,7 @@ function inspectTypeInvokeExpression(state, xorNode, maybeCorrelationId) {
         else if (previousSiblingType.kind !== "Function" /* Function */) {
             result = language_1.Type.NoneInstance;
         }
-        else if (previousSiblingType.maybeExtendedKind === "DefinedFunction" /* DefinedFunction */) {
+        else if (previousSiblingType.extendedKind === "DefinedFunction" /* DefinedFunction */) {
             result = previousSiblingType.returnType;
         }
         else {
@@ -53,16 +53,16 @@ function inspectTypeInvokeExpression(state, xorNode, maybeCorrelationId) {
     });
 }
 exports.inspectTypeInvokeExpression = inspectTypeInvokeExpression;
-function maybeExternalInvokeRequest(state, xorNode, maybeCorrelationId) {
+function externalInvokeRequest(state, xorNode, correlationId) {
     return __awaiter(this, void 0, void 0, function* () {
-        const trace = state.traceManager.entry("Inspection.Type" /* InspectType */, maybeExternalInvokeRequest.name, maybeCorrelationId, __1.TraceUtils.createXorNodeDetails(xorNode));
-        const maybeIdentifier = parser_1.NodeIdMapUtils.maybeInvokeExpressionIdentifier(state.nodeIdMapCollection, xorNode.node.id);
-        if (maybeIdentifier === undefined) {
+        const trace = state.traceManager.entry("Inspection.Type" /* InspectType */, externalInvokeRequest.name, correlationId, __1.TraceUtils.createXorNodeDetails(xorNode));
+        const identifier = parser_1.NodeIdMapUtils.invokeExpressionIdentifier(state.nodeIdMapCollection, xorNode.node.id);
+        if (identifier === undefined) {
             trace.exit();
             return undefined;
         }
-        const updatedSettings = Object.assign(Object.assign({}, state), { maybeInitialCorrelationId: trace.id });
-        const triedDeferencedIdentifier = yield (0, deferenceIdentifier_1.tryDeferenceIdentifier)(updatedSettings, state.nodeIdMapCollection, maybeIdentifier, state.scopeById);
+        const updatedSettings = Object.assign(Object.assign({}, state), { initialCorrelationId: trace.id });
+        const triedDeferencedIdentifier = yield (0, deferenceIdentifier_1.tryDeferenceIdentifier)(updatedSettings, state.nodeIdMapCollection, identifier, state.scopeById);
         if (powerquery_parser_1.ResultUtils.isError(triedDeferencedIdentifier) || triedDeferencedIdentifier.value === undefined) {
             return undefined;
         }
@@ -71,7 +71,7 @@ function maybeExternalInvokeRequest(state, xorNode, maybeCorrelationId) {
             // eslint-disable-next-line no-await-in-loop
             types.push(yield (0, common_1.inspectXor)(state, argument, trace.id));
         }
-        const result = externalType_1.ExternalTypeUtils.createInvocationTypeRequest(powerquery_parser_1.Assert.asDefined(parser_1.XorNodeUtils.maybeIdentifierExpressionLiteral(triedDeferencedIdentifier.value)), types);
+        const result = externalType_1.ExternalTypeUtils.createInvocationTypeRequest(powerquery_parser_1.Assert.asDefined(parser_1.XorNodeUtils.identifierExpressionLiteral(triedDeferencedIdentifier.value)), types);
         trace.exit();
         return result;
     });

package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeInvokeExpression.js.map

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

package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeList.d.ts

@@ -1,4 +1,4 @@
 import { TXorNode } from "@microsoft/powerquery-parser/lib/powerquery-parser/parser";
 import { Type } from "@microsoft/powerquery-parser/lib/powerquery-parser/language";
 import { InspectTypeState } from "./common";
-export declare function inspectTypeList(state: InspectTypeState, xorNode: TXorNode, maybeCorrelationId: number | undefined): Promise<Type.List | Type.DefinedList>;
+export declare function inspectTypeList(state: InspectTypeState, xorNode: TXorNode, correlationId: number | undefined): Promise<Type.List | Type.DefinedList>;

package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeList.js

@@ -17,20 +17,20 @@ const powerquery_parser_1 = require("@microsoft/powerquery-parser");
 const language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
 const __1 = require("../../..");
 const common_1 = require("./common");
-function inspectTypeList(state, xorNode, maybeCorrelationId) {
+function inspectTypeList(state, xorNode, correlationId) {
     var _a;
     return __awaiter(this, void 0, void 0, function* () {
-        const trace = state.traceManager.entry("Inspection.Type" /* InspectType */, inspectTypeList.name, maybeCorrelationId, __1.TraceUtils.createXorNodeDetails(xorNode));
+        const trace = state.traceManager.entry("Inspection.Type" /* InspectType */, inspectTypeList.name, correlationId, __1.TraceUtils.createXorNodeDetails(xorNode));
         let result;
         switch (state.typeStrategy) {
             case "Extended" /* Extended */: {
-                (_a = state.maybeCancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
+                (_a = state.cancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
                 const items = parser_1.NodeIdMapIterator.iterListItems(state.nodeIdMapCollection, xorNode);
                 const elements = yield Promise.all(items.map((item) => (0, common_1.inspectXor)(state, item, trace.id)));
                 result = {
                     kind: "List" /* List */,
                     isNullable: false,
-                    maybeExtendedKind: "DefinedList" /* DefinedList */,
+                    extendedKind: "DefinedList" /* DefinedList */,
                     elements,
                 };
                 break;

package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeList.js.map

@@ -1 +1 @@
-{"version":3,"file":"inspectTypeList.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeList.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,sFAAwG;AAExG,oEAAsD;AACtD,0FAAmF;AAEnF,gCAA+D;AAC/D,qCAAwD;AAGxD,SAAsB,eAAe,CACjC,KAAuB,EACvB,OAAiB,EACjB,kBAAsC;;;QAEtC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,eAAe,CAAC,IAAI,EACpB,kBAAkB,EAClB,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,IAAI,MAAoC,CAAC;QAEzC,QAAQ,KAAK,CAAC,YAAY,EAAE;YACxB,8BAA0B,CAAC,CAAC;gBACxB,MAAA,KAAK,CAAC,sBAAsB,0CAAE,gBAAgB,EAAE,CAAC;gBACjD,MAAM,KAAK,GAA4B,0BAAiB,CAAC,aAAa,CAAC,KAAK,CAAC,mBAAmB,EAAE,OAAO,CAAC,CAAC;gBAE3G,MAAM,QAAQ,GAAwC,MAAM,OAAO,CAAC,GAAG,CACnE,KAAK,CAAC,GAAG,CAAC,CAAC,IAAc,EAAE,EAAE,CAAC,IAAA,mBAAU,EAAC,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC,CACnE,CAAC;gBAEF,MAAM,GAAG;oBACL,IAAI,mBAAoB;oBACxB,UAAU,EAAE,KAAK;oBACjB,iBAAiB,iCAAmC;oBACpD,QAAQ;iBACX,CAAC;gBAEF,MAAM;aACT;YAED;gBACI,MAAM,GAAG,eAAI,CAAC,YAAY,CAAC;gBAC3B,MAAM;YAEV;gBACI,0BAAM,CAAC,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;SAC1C;QAED,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAE7E,OAAO,MAAM,CAAC;;CACjB;AA5CD,0CA4CC"}
+{"version":3,"file":"inspectTypeList.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeList.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,sFAAwG;AAExG,oEAAsD;AACtD,0FAAmF;AAEnF,gCAA+D;AAC/D,qCAAwD;AAGxD,SAAsB,eAAe,CACjC,KAAuB,EACvB,OAAiB,EACjB,aAAiC;;;QAEjC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,eAAe,CAAC,IAAI,EACpB,aAAa,EACb,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,IAAI,MAAoC,CAAC;QAEzC,QAAQ,KAAK,CAAC,YAAY,EAAE;YACxB,8BAA0B,CAAC,CAAC;gBACxB,MAAA,KAAK,CAAC,iBAAiB,0CAAE,gBAAgB,EAAE,CAAC;gBAC5C,MAAM,KAAK,GAA4B,0BAAiB,CAAC,aAAa,CAAC,KAAK,CAAC,mBAAmB,EAAE,OAAO,CAAC,CAAC;gBAE3G,MAAM,QAAQ,GAAwC,MAAM,OAAO,CAAC,GAAG,CACnE,KAAK,CAAC,GAAG,CAAC,CAAC,IAAc,EAAE,EAAE,CAAC,IAAA,mBAAU,EAAC,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC,CACnE,CAAC;gBAEF,MAAM,GAAG;oBACL,IAAI,mBAAoB;oBACxB,UAAU,EAAE,KAAK;oBACjB,YAAY,iCAAmC;oBAC/C,QAAQ;iBACX,CAAC;gBAEF,MAAM;aACT;YAED;gBACI,MAAM,GAAG,eAAI,CAAC,YAAY,CAAC;gBAC3B,MAAM;YAEV;gBACI,0BAAM,CAAC,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;SAC1C;QAED,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAE7E,OAAO,MAAM,CAAC;;CACjB;AA5CD,0CA4CC"}

package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeListType.d.ts

@@ -1,4 +1,4 @@
 import { Type } from "@microsoft/powerquery-parser/lib/powerquery-parser/language";
 import { TXorNode } from "@microsoft/powerquery-parser/lib/powerquery-parser/parser";
 import { InspectTypeState } from "./common";
-export declare function inspectTypeListType(state: InspectTypeState, xorNode: TXorNode, maybeCorrelationId: number | undefined): Promise<Type.Type | Type.ListType | Type.Unknown>;
+export declare function inspectTypeListType(state: InspectTypeState, xorNode: TXorNode, correlationId: number | undefined): Promise<Type.Type | Type.ListType | Type.Unknown>;