@microsoft/powerquery-language-services 0.3.40 → 0.5.1

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

@@ -17,24 +17,24 @@ const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/par
 const powerquery_parser_1 = require("@microsoft/powerquery-parser");
 const __1 = require("../../..");
 const common_1 = require("./common");
-function inspectTypeListType(state, xorNode, maybeCorrelationId) {
+function inspectTypeListType(state, xorNode, correlationId) {
     var _a;
     return __awaiter(this, void 0, void 0, function* () {
-        const trace = state.traceManager.entry("Inspection.Type" /* InspectType */, inspectTypeListType.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 */, inspectTypeListType.name, correlationId, __1.TraceUtils.createXorNodeDetails(xorNode));
+        (_a = state.cancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
         parser_1.XorNodeUtils.assertIsNodeKind(xorNode, "ListType" /* ListType */);
         let result;
         switch (state.typeStrategy) {
             case "Extended" /* Extended */: {
-                const maybeListItem = parser_1.NodeIdMapUtils.maybeNthChild(state.nodeIdMapCollection, xorNode.node.id, 1);
-                if (maybeListItem === undefined) {
+                const listItem = parser_1.NodeIdMapUtils.nthChild(state.nodeIdMapCollection, xorNode.node.id, 1);
+                if (listItem === undefined) {
                     result = language_1.Type.UnknownInstance;
                 }
                 else {
-                    const itemType = yield (0, common_1.inspectXor)(state, maybeListItem, trace.id);
+                    const itemType = yield (0, common_1.inspectXor)(state, listItem, trace.id);
                     result = {
                         kind: "Type" /* Type */,
-                        maybeExtendedKind: "ListType" /* ListType */,
+                        extendedKind: "ListType" /* ListType */,
                         isNullable: false,
                         itemType,
                     };

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

@@ -1 +1 @@
-{"version":3,"file":"inspectTypeListType.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeListType.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,0FAAwF;AACxF,sFAAmH;AAEnH,oEAAsD;AAEtD,gCAA+D;AAC/D,qCAAwD;AAGxD,SAAsB,mBAAmB,CACrC,KAAuB,EACvB,OAAiB,EACjB,kBAAsC;;;QAEtC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,mBAAmB,CAAC,IAAI,EACxB,kBAAkB,EAClB,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,MAAA,KAAK,CAAC,sBAAsB,0CAAE,gBAAgB,EAAE,CAAC;QACjD,qBAAY,CAAC,gBAAgB,CAAe,OAAO,4BAAwB,CAAC;QAE5E,IAAI,MAAgD,CAAC;QAErD,QAAQ,KAAK,CAAC,YAAY,EAAE;YACxB,8BAA0B,CAAC,CAAC;gBACxB,MAAM,aAAa,GAAyB,uBAAc,CAAC,aAAa,CACpE,KAAK,CAAC,mBAAmB,EACzB,OAAO,CAAC,IAAI,CAAC,EAAE,EACf,CAAC,CACJ,CAAC;gBAEF,IAAI,aAAa,KAAK,SAAS,EAAE;oBAC7B,MAAM,GAAG,eAAI,CAAC,eAAe,CAAC;iBACjC;qBAAM;oBACH,MAAM,QAAQ,GAAyB,MAAM,IAAA,mBAAU,EAAC,KAAK,EAAE,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;oBAExF,MAAM,GAAG;wBACL,IAAI,mBAAoB;wBACxB,iBAAiB,2BAAgC;wBACjD,UAAU,EAAE,KAAK;wBACjB,QAAQ;qBACX,CAAC;iBACL;gBAED,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;AApDD,kDAoDC"}
+{"version":3,"file":"inspectTypeListType.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeListType.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,0FAAwF;AACxF,sFAAmH;AAEnH,oEAAsD;AAEtD,gCAA+D;AAC/D,qCAAwD;AAGxD,SAAsB,mBAAmB,CACrC,KAAuB,EACvB,OAAiB,EACjB,aAAiC;;;QAEjC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,mBAAmB,CAAC,IAAI,EACxB,aAAa,EACb,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,MAAA,KAAK,CAAC,iBAAiB,0CAAE,gBAAgB,EAAE,CAAC;QAC5C,qBAAY,CAAC,gBAAgB,CAAe,OAAO,4BAAwB,CAAC;QAE5E,IAAI,MAAgD,CAAC;QAErD,QAAQ,KAAK,CAAC,YAAY,EAAE;YACxB,8BAA0B,CAAC,CAAC;gBACxB,MAAM,QAAQ,GAAyB,uBAAc,CAAC,QAAQ,CAC1D,KAAK,CAAC,mBAAmB,EACzB,OAAO,CAAC,IAAI,CAAC,EAAE,EACf,CAAC,CACJ,CAAC;gBAEF,IAAI,QAAQ,KAAK,SAAS,EAAE;oBACxB,MAAM,GAAG,eAAI,CAAC,eAAe,CAAC;iBACjC;qBAAM;oBACH,MAAM,QAAQ,GAAyB,MAAM,IAAA,mBAAU,EAAC,KAAK,EAAE,QAAQ,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;oBAEnF,MAAM,GAAG;wBACL,IAAI,mBAAoB;wBACxB,YAAY,2BAAgC;wBAC5C,UAAU,EAAE,KAAK;wBACjB,QAAQ;qBACX,CAAC;iBACL;gBAED,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;AApDD,kDAoDC"}

package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeLiteralExpression.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 ".";
-export declare function inspectTypeLiteralExpression(state: InspectTypeState, xorNode: TXorNode, maybeCorrelationId: number | undefined): Type.TPrimitiveType | Type.TextLiteral | Type.NumberLiteral;
+export declare function inspectTypeLiteralExpression(state: InspectTypeState, xorNode: TXorNode, correlationId: number | undefined): Type.TPrimitiveType | Type.TextLiteral | Type.NumberLiteral;

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

@@ -7,8 +7,8 @@ const language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/l
 const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
 const powerquery_parser_1 = require("@microsoft/powerquery-parser");
 const __1 = require("../../..");
-function inspectTypeLiteralExpression(state, xorNode, maybeCorrelationId) {
-    const trace = state.traceManager.entry("Inspection.Type" /* InspectType */, inspectTypeLiteralExpression.name, maybeCorrelationId, __1.TraceUtils.createXorNodeDetails(xorNode));
+function inspectTypeLiteralExpression(state, xorNode, correlationId) {
+    const trace = state.traceManager.entry("Inspection.Type" /* InspectType */, inspectTypeLiteralExpression.name, correlationId, __1.TraceUtils.createXorNodeDetails(xorNode));
     parser_1.XorNodeUtils.assertIsNodeKind(xorNode, "LiteralExpression" /* LiteralExpression */);
     let literalExpression;
     let typeKind;

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

@@ -1 +1 @@
-{"version":3,"file":"inspectTypeLiteralExpression.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeLiteralExpression.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,0FAAmG;AAEnG,sFAAgH;AAChH,oEAAsD;AAEtD,gCAA+D;AAG/D,SAAgB,4BAA4B,CACxC,KAAuB,EACvB,OAAiB,EACjB,kBAAsC;IAEtC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,4BAA4B,CAAC,IAAI,EACjC,kBAAkB,EAClB,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;IAEF,qBAAY,CAAC,gBAAgB,CAAwB,OAAO,8CAAiC,CAAC;IAE9F,IAAI,iBAAoD,CAAC;IACzD,IAAI,QAAmC,CAAC;IACxC,IAAI,MAA4B,CAAC;IAEjC,QAAQ,OAAO,CAAC,IAAI,EAAE;QAClB,oBAAoB,CAAC,CAAC;YAClB,oDAAoD;YACpD,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;YACjC,QAAQ,GAAG,oBAAS,CAAC,uBAAuB,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;YAE5E,QAAQ,QAAQ,EAAE;gBACd;oBACI,MAAM,GAAG,oBAAS,CAAC,mBAAmB,CAAC,KAAK,EAAE,iBAAiB,CAAC,OAAO,CAAC,CAAC;oBACzE,MAAM;gBAEV;oBACI,MAAM,GAAG,oBAAS,CAAC,iBAAiB,CAAC,KAAK,EAAE,iBAAiB,CAAC,OAAO,CAAC,CAAC;oBACvE,MAAM;gBAEV;oBACI,MAAM,GAAG,oBAAS,CAAC,mBAAmB,CAClC,iBAAiB,CAAC,WAAW,sBAAyB,EACtD,QAAQ,CACX,CAAC;oBAEF,MAAM;aACb;YAED,MAAM;SACT;QAED;YACI,MAAM,GAAG,eAAI,CAAC,eAAe,CAAC;YAC9B,MAAM;QAEV;YACI,MAAM,0BAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;KACrC;IAED,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAE7E,OAAO,MAAM,CAAC;AAClB,CAAC;AAxDD,oEAwDC"}
+{"version":3,"file":"inspectTypeLiteralExpression.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeLiteralExpression.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,0FAAmG;AAEnG,sFAAgH;AAChH,oEAAsD;AAEtD,gCAA+D;AAG/D,SAAgB,4BAA4B,CACxC,KAAuB,EACvB,OAAiB,EACjB,aAAiC;IAEjC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,4BAA4B,CAAC,IAAI,EACjC,aAAa,EACb,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;IAEF,qBAAY,CAAC,gBAAgB,CAAwB,OAAO,8CAAiC,CAAC;IAE9F,IAAI,iBAAoD,CAAC;IACzD,IAAI,QAAmC,CAAC;IACxC,IAAI,MAA4B,CAAC;IAEjC,QAAQ,OAAO,CAAC,IAAI,EAAE;QAClB,oBAAoB,CAAC,CAAC;YAClB,oDAAoD;YACpD,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;YACjC,QAAQ,GAAG,oBAAS,CAAC,uBAAuB,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;YAE5E,QAAQ,QAAQ,EAAE;gBACd;oBACI,MAAM,GAAG,oBAAS,CAAC,mBAAmB,CAAC,KAAK,EAAE,iBAAiB,CAAC,OAAO,CAAC,CAAC;oBACzE,MAAM;gBAEV;oBACI,MAAM,GAAG,oBAAS,CAAC,iBAAiB,CAAC,KAAK,EAAE,iBAAiB,CAAC,OAAO,CAAC,CAAC;oBACvE,MAAM;gBAEV;oBACI,MAAM,GAAG,oBAAS,CAAC,mBAAmB,CAClC,iBAAiB,CAAC,WAAW,sBAAyB,EACtD,QAAQ,CACX,CAAC;oBAEF,MAAM;aACb;YAED,MAAM;SACT;QAED;YACI,MAAM,GAAG,eAAI,CAAC,eAAe,CAAC;YAC9B,MAAM;QAEV;YACI,MAAM,0BAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;KACrC;IAED,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAE7E,OAAO,MAAM,CAAC;AAClB,CAAC;AAxDD,oEAwDC"}

package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeNullCoalescingExpression.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 inspectTypeNullCoalescingExpression(state: InspectTypeState, xorNode: TXorNode, maybeCorrelationId: number | undefined): Promise<Type.TPowerQueryType>;
+export declare function inspectTypeNullCoalescingExpression(state: InspectTypeState, xorNode: TXorNode, correlationId: number | undefined): Promise<Type.TPowerQueryType>;

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

@@ -16,26 +16,26 @@ 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 inspectTypeNullCoalescingExpression(state, xorNode, maybeCorrelationId) {
+function inspectTypeNullCoalescingExpression(state, xorNode, correlationId) {
     var _a;
     return __awaiter(this, void 0, void 0, function* () {
-        const trace = state.traceManager.entry("Inspection.Type" /* InspectType */, inspectTypeNullCoalescingExpression.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 */, inspectTypeNullCoalescingExpression.name, correlationId, __1.TraceUtils.createXorNodeDetails(xorNode));
+        (_a = state.cancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
         parser_1.XorNodeUtils.assertIsNodeKind(xorNode, "NullCoalescingExpression" /* NullCoalescingExpression */);
-        const maybeLeftType = yield (0, common_1.inspectTypeFromChildAttributeIndex)(state, xorNode, 0, trace.id);
-        const maybeNullCoalescingOperator = parser_1.NodeIdMapUtils.maybeUnboxNthChildIfAstChecked(state.nodeIdMapCollection, xorNode.node.id, 1, "Constant" /* Constant */);
+        const leftType = yield (0, common_1.inspectTypeFromChildAttributeIndex)(state, xorNode, 0, trace.id);
+        const nullCoalescingOperator = parser_1.NodeIdMapUtils.unboxNthChildIfAstChecked(state.nodeIdMapCollection, xorNode.node.id, 1, "Constant" /* Constant */);
         let result;
         // '??' isn't present, treat it as an Expression.
-        if (maybeNullCoalescingOperator === undefined) {
-            result = maybeLeftType;
+        if (nullCoalescingOperator === undefined) {
+            result = leftType;
         }
         else {
-            const maybeRightType = yield (0, common_1.inspectTypeFromChildAttributeIndex)(state, xorNode, 2, trace.id);
-            if (maybeLeftType.kind === "None" /* None */ || maybeRightType.kind === "None" /* None */) {
+            const rightType = yield (0, common_1.inspectTypeFromChildAttributeIndex)(state, xorNode, 2, trace.id);
+            if (leftType.kind === "None" /* None */ || rightType.kind === "None" /* None */) {
                 result = language_1.Type.NoneInstance;
             }
             else {
-                result = language_1.TypeUtils.createAnyUnion([maybeLeftType, maybeRightType], state.traceManager, trace.id);
+                result = language_1.TypeUtils.createAnyUnion([leftType, rightType], state.traceManager, trace.id);
             }
         }
         trace.exit({ ["Result" /* Result */]: __1.TraceUtils.createTypeDetails(result) });

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

@@ -1 +1 @@
-{"version":3,"file":"inspectTypeNullCoalescingExpression.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeNullCoalescingExpression.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,0FAAmG;AACnG,sFAAmH;AAGnH,gCAA+D;AAC/D,qCAAgF;AAEhF,SAAsB,mCAAmC,CACrD,KAAuB,EACvB,OAAiB,EACjB,kBAAsC;;;QAEtC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,mCAAmC,CAAC,IAAI,EACxC,kBAAkB,EAClB,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,MAAA,KAAK,CAAC,sBAAsB,0CAAE,gBAAgB,EAAE,CAAC;QACjD,qBAAY,CAAC,gBAAgB,CAA+B,OAAO,4DAAwC,CAAC;QAE5G,MAAM,aAAa,GAAyB,MAAM,IAAA,2CAAkC,EAAC,KAAK,EAAE,OAAO,EAAE,CAAC,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;QAElH,MAAM,2BAA2B,GAC7B,uBAAc,CAAC,8BAA8B,CACzC,KAAK,CAAC,mBAAmB,EACzB,OAAO,CAAC,IAAI,CAAC,EAAE,EACf,CAAC,4BAEJ,CAAC;QAEN,IAAI,MAA4B,CAAC;QAEjC,iDAAiD;QACjD,IAAI,2BAA2B,KAAK,SAAS,EAAE;YAC3C,MAAM,GAAG,aAAa,CAAC;SAC1B;aAAM;YACH,MAAM,cAAc,GAAyB,MAAM,IAAA,2CAAkC,EACjF,KAAK,EACL,OAAO,EACP,CAAC,EACD,KAAK,CAAC,EAAE,CACX,CAAC;YAEF,IAAI,aAAa,CAAC,IAAI,sBAAuB,IAAI,cAAc,CAAC,IAAI,sBAAuB,EAAE;gBACzF,MAAM,GAAG,eAAI,CAAC,YAAY,CAAC;aAC9B;iBAAM;gBACH,MAAM,GAAG,oBAAS,CAAC,cAAc,CAAC,CAAC,aAAa,EAAE,cAAc,CAAC,EAAE,KAAK,CAAC,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;aACpG;SACJ;QAED,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAE7E,OAAO,MAAM,CAAC;;CACjB;AAhDD,kFAgDC"}
+{"version":3,"file":"inspectTypeNullCoalescingExpression.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeNullCoalescingExpression.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,0FAAmG;AACnG,sFAAmH;AAGnH,gCAA+D;AAC/D,qCAAgF;AAEhF,SAAsB,mCAAmC,CACrD,KAAuB,EACvB,OAAiB,EACjB,aAAiC;;;QAEjC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,mCAAmC,CAAC,IAAI,EACxC,aAAa,EACb,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,MAAA,KAAK,CAAC,iBAAiB,0CAAE,gBAAgB,EAAE,CAAC;QAC5C,qBAAY,CAAC,gBAAgB,CAA+B,OAAO,4DAAwC,CAAC;QAE5G,MAAM,QAAQ,GAAyB,MAAM,IAAA,2CAAkC,EAAC,KAAK,EAAE,OAAO,EAAE,CAAC,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;QAE7G,MAAM,sBAAsB,GAA8B,uBAAc,CAAC,yBAAyB,CAC9F,KAAK,CAAC,mBAAmB,EACzB,OAAO,CAAC,IAAI,CAAC,EAAE,EACf,CAAC,4BAEJ,CAAC;QAEF,IAAI,MAA4B,CAAC;QAEjC,iDAAiD;QACjD,IAAI,sBAAsB,KAAK,SAAS,EAAE;YACtC,MAAM,GAAG,QAAQ,CAAC;SACrB;aAAM;YACH,MAAM,SAAS,GAAyB,MAAM,IAAA,2CAAkC,EAAC,KAAK,EAAE,OAAO,EAAE,CAAC,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;YAE9G,IAAI,QAAQ,CAAC,IAAI,sBAAuB,IAAI,SAAS,CAAC,IAAI,sBAAuB,EAAE;gBAC/E,MAAM,GAAG,eAAI,CAAC,YAAY,CAAC;aAC9B;iBAAM;gBACH,MAAM,GAAG,oBAAS,CAAC,cAAc,CAAC,CAAC,QAAQ,EAAE,SAAS,CAAC,EAAE,KAAK,CAAC,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;aAC1F;SACJ;QAED,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAE7E,OAAO,MAAM,CAAC;;CACjB;AA1CD,kFA0CC"}

package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeParameter.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 inspectTypeParameter(state: InspectTypeState, xorNode: TXorNode, maybeCorrelationId: number | undefined): Promise<Type.TPowerQueryType>;
+export declare function inspectTypeParameter(state: InspectTypeState, xorNode: TXorNode, correlationId: number | undefined): Promise<Type.TPowerQueryType>;

package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeParameter.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 inspectTypeParameter(state, xorNode, maybeCorrelationId) {
+function inspectTypeParameter(state, xorNode, correlationId) {
     var _a;
     return __awaiter(this, void 0, void 0, function* () {
-        const trace = state.traceManager.entry("Inspection.Type" /* InspectType */, inspectTypeParameter.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 */, inspectTypeParameter.name, correlationId, __1.TraceUtils.createXorNodeDetails(xorNode));
+        (_a = state.cancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
         parser_1.XorNodeUtils.assertIsNodeKind(xorNode, "Parameter" /* Parameter */);
-        const maybeOptionalConstant = parser_1.NodeIdMapUtils.maybeUnboxNthChildIfAstChecked(state.nodeIdMapCollection, xorNode.node.id, 0, "Constant" /* Constant */);
-        const maybeParameterType = language_1.TypeUtils.assertAsTPrimitiveType(yield (0, common_1.inspectTypeFromChildAttributeIndex)(state, xorNode, 2, trace.id));
-        const result = Object.assign(Object.assign({}, maybeParameterType), { isNullable: maybeOptionalConstant !== undefined || maybeParameterType.isNullable });
+        const optionalConstant = parser_1.NodeIdMapUtils.unboxNthChildIfAstChecked(state.nodeIdMapCollection, xorNode.node.id, 0, "Constant" /* Constant */);
+        const parameterType = language_1.TypeUtils.assertAsTPrimitiveType(yield (0, common_1.inspectTypeFromChildAttributeIndex)(state, xorNode, 2, trace.id));
+        const result = Object.assign(Object.assign({}, parameterType), { isNullable: optionalConstant !== undefined || parameterType.isNullable });
         trace.exit({ ["Result" /* Result */]: __1.TraceUtils.createTypeDetails(result) });
         return result;
     });

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

@@ -1 +1 @@
-{"version":3,"file":"inspectTypeParameter.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeParameter.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,0FAAmG;AACnG,sFAAmH;AAGnH,gCAA+D;AAC/D,qCAAgF;AAEhF,SAAsB,oBAAoB,CACtC,KAAuB,EACvB,OAAiB,EACjB,kBAAsC;;;QAEtC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,oBAAoB,CAAC,IAAI,EACzB,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,8BAAyB,CAAC;QAE/E,MAAM,qBAAqB,GACvB,uBAAc,CAAC,8BAA8B,CACzC,KAAK,CAAC,mBAAmB,EACzB,OAAO,CAAC,IAAI,CAAC,EAAE,EACf,CAAC,4BAEJ,CAAC;QAEN,MAAM,kBAAkB,GAAqC,oBAAS,CAAC,sBAAsB,CACzF,MAAM,IAAA,2CAAkC,EAAC,KAAK,EAAE,OAAO,EAAE,CAAC,EAAE,KAAK,CAAC,EAAE,CAAC,CACxE,CAAC;QAEF,MAAM,MAAM,mCACL,kBAAkB,KACrB,UAAU,EAAE,qBAAqB,KAAK,SAAS,IAAI,kBAAkB,CAAC,UAAU,GACnF,CAAC;QAEF,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAE7E,OAAO,MAAM,CAAC;;CACjB;AAnCD,oDAmCC"}
+{"version":3,"file":"inspectTypeParameter.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeParameter.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,0FAAmG;AACnG,sFAAmH;AAGnH,gCAA+D;AAC/D,qCAAgF;AAEhF,SAAsB,oBAAoB,CACtC,KAAuB,EACvB,OAAiB,EACjB,aAAiC;;;QAEjC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,oBAAoB,CAAC,IAAI,EACzB,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,8BAAyB,CAAC;QAE/E,MAAM,gBAAgB,GAA8B,uBAAc,CAAC,yBAAyB,CACxF,KAAK,CAAC,mBAAmB,EACzB,OAAO,CAAC,IAAI,CAAC,EAAE,EACf,CAAC,4BAEJ,CAAC;QAEF,MAAM,aAAa,GAAqC,oBAAS,CAAC,sBAAsB,CACpF,MAAM,IAAA,2CAAkC,EAAC,KAAK,EAAE,OAAO,EAAE,CAAC,EAAE,KAAK,CAAC,EAAE,CAAC,CACxE,CAAC;QAEF,MAAM,MAAM,mCACL,aAAa,KAChB,UAAU,EAAE,gBAAgB,KAAK,SAAS,IAAI,aAAa,CAAC,UAAU,GACzE,CAAC;QAEF,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAE7E,OAAO,MAAM,CAAC;;CACjB;AAlCD,oDAkCC"}

package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypePrimitiveType.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 ".";
-export declare function inspectTypePrimitiveType(state: InspectTypeState, xorNode: TXorNode, maybeCorrelationId: number | undefined): Type.TPowerQueryType;
+export declare function inspectTypePrimitiveType(state: InspectTypeState, xorNode: TXorNode, correlationId: number | undefined): Type.TPowerQueryType;

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

@@ -6,8 +6,8 @@ exports.inspectTypePrimitiveType = 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("../../..");
-function inspectTypePrimitiveType(state, xorNode, maybeCorrelationId) {
-    const trace = state.traceManager.entry("Inspection.Type" /* InspectType */, inspectTypePrimitiveType.name, maybeCorrelationId, __1.TraceUtils.createXorNodeDetails(xorNode));
+function inspectTypePrimitiveType(state, xorNode, correlationId) {
+    const trace = state.traceManager.entry("Inspection.Type" /* InspectType */, inspectTypePrimitiveType.name, correlationId, __1.TraceUtils.createXorNodeDetails(xorNode));
     parser_1.XorNodeUtils.assertIsNodeKind(xorNode, "PrimitiveType" /* PrimitiveType */);
     if (parser_1.XorNodeUtils.isContextXor(xorNode)) {
         trace.exit({ ["Result" /* Result */]: __1.TraceUtils.createTypeDetails(language_1.Type.UnknownInstance) });
@@ -16,7 +16,7 @@ function inspectTypePrimitiveType(state, xorNode, maybeCorrelationId) {
     const kind = language_1.TypeUtils.typeKindFromPrimitiveTypeConstantKind(xorNode.node.primitiveTypeKind);
     const result = {
         kind,
-        maybeExtendedKind: undefined,
+        extendedKind: undefined,
         isNullable: false,
     };
     trace.exit({ ["Result" /* Result */]: __1.TraceUtils.createTypeDetails(result) });

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

@@ -1 +1 @@
-{"version":3,"file":"inspectTypePrimitiveType.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypePrimitiveType.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,0FAAmG;AAEnG,sFAAmG;AAEnG,gCAA+D;AAG/D,SAAgB,wBAAwB,CACpC,KAAuB,EACvB,OAAiB,EACjB,kBAAsC;IAEtC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,wBAAwB,CAAC,IAAI,EAC7B,kBAAkB,EAClB,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;IAEF,qBAAY,CAAC,gBAAgB,CAAoB,OAAO,sCAA6B,CAAC;IAEtF,IAAI,qBAAY,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE;QACpC,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,eAAI,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;QAE3F,OAAO,eAAI,CAAC,eAAe,CAAC;KAC/B;IAED,MAAM,IAAI,GAAkB,oBAAS,CAAC,qCAAqC,CAAC,OAAO,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;IAE5G,MAAM,MAAM,GAAyB;QACjC,IAAI;QACJ,iBAAiB,EAAE,SAAS;QAC5B,UAAU,EAAE,KAAK;KACpB,CAAC;IAEF,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAE7E,OAAO,MAAM,CAAC;AAClB,CAAC;AA/BD,4DA+BC"}
+{"version":3,"file":"inspectTypePrimitiveType.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypePrimitiveType.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,0FAAmG;AAEnG,sFAAmG;AAEnG,gCAA+D;AAG/D,SAAgB,wBAAwB,CACpC,KAAuB,EACvB,OAAiB,EACjB,aAAiC;IAEjC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,wBAAwB,CAAC,IAAI,EAC7B,aAAa,EACb,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;IAEF,qBAAY,CAAC,gBAAgB,CAAoB,OAAO,sCAA6B,CAAC;IAEtF,IAAI,qBAAY,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE;QACpC,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,eAAI,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;QAE3F,OAAO,eAAI,CAAC,eAAe,CAAC;KAC/B;IAED,MAAM,IAAI,GAAkB,oBAAS,CAAC,qCAAqC,CAAC,OAAO,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;IAE5G,MAAM,MAAM,GAAyB;QACjC,IAAI;QACJ,YAAY,EAAE,SAAS;QACvB,UAAU,EAAE,KAAK;KACpB,CAAC;IAEF,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAE7E,OAAO,MAAM,CAAC;AAClB,CAAC;AA/BD,4DA+BC"}

package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRangeExpression.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 inspectTypeRangeExpression(state: InspectTypeState, xorNode: TXorNode, maybeCorrelationId: number | undefined): Promise<Type.TPowerQueryType>;
+export declare function inspectTypeRangeExpression(state: InspectTypeState, xorNode: TXorNode, correlationId: number | undefined): Promise<Type.TPowerQueryType>;

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

@@ -17,33 +17,33 @@ const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/par
 const __1 = require("../../..");
 const common_1 = require("./common");
 const powerquery_parser_1 = require("@microsoft/powerquery-parser");
-function inspectTypeRangeExpression(state, xorNode, maybeCorrelationId) {
+function inspectTypeRangeExpression(state, xorNode, correlationId) {
     var _a;
     return __awaiter(this, void 0, void 0, function* () {
-        const trace = state.traceManager.entry("Inspection.Type" /* InspectType */, inspectTypeRangeExpression.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 */, inspectTypeRangeExpression.name, correlationId, __1.TraceUtils.createXorNodeDetails(xorNode));
+        (_a = state.cancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
         parser_1.XorNodeUtils.assertIsNodeKind(xorNode, "RangeExpression" /* RangeExpression */);
         let result;
         switch (state.typeStrategy) {
             case "Extended" /* Extended */: {
-                const maybeLeftType = yield (0, common_1.inspectTypeFromChildAttributeIndex)(state, xorNode, 0, trace.id);
-                const maybeRightType = yield (0, common_1.inspectTypeFromChildAttributeIndex)(state, xorNode, 2, trace.id);
-                if (maybeLeftType === undefined || maybeRightType === undefined) {
+                const leftType = yield (0, common_1.inspectTypeFromChildAttributeIndex)(state, xorNode, 0, trace.id);
+                const rightType = yield (0, common_1.inspectTypeFromChildAttributeIndex)(state, xorNode, 2, trace.id);
+                if (leftType === undefined || rightType === undefined) {
                     result = language_1.Type.UnknownInstance;
                 }
-                else if (maybeLeftType.kind === "Number" /* Number */ && maybeRightType.kind === "Number" /* Number */) {
+                else if (leftType.kind === "Number" /* Number */ && rightType.kind === "Number" /* Number */) {
                     // TODO: handle isNullable better
-                    if (maybeLeftType.isNullable === true || maybeRightType.isNullable === true) {
+                    if (leftType.isNullable === true || rightType.isNullable === true) {
                         result = language_1.Type.NoneInstance;
                     }
                     else {
                         result = language_1.Type.ListInstance;
                     }
                 }
-                else if (maybeLeftType.kind === "None" /* None */ || maybeRightType.kind === "None" /* None */) {
+                else if (leftType.kind === "None" /* None */ || rightType.kind === "None" /* None */) {
                     result = language_1.Type.NoneInstance;
                 }
-                else if (maybeLeftType.kind === "Unknown" /* Unknown */ || maybeRightType.kind === "Unknown" /* Unknown */) {
+                else if (leftType.kind === "Unknown" /* Unknown */ || rightType.kind === "Unknown" /* Unknown */) {
                     result = language_1.Type.UnknownInstance;
                 }
                 else {

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

@@ -1 +1 @@
-{"version":3,"file":"inspectTypeRangeExpression.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeRangeExpression.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,0FAAwF;AAExF,sFAAmG;AAEnG,gCAA+D;AAC/D,qCAAgF;AAChF,oEAAsD;AAGtD,SAAsB,0BAA0B,CAC5C,KAAuB,EACvB,OAAiB,EACjB,kBAAsC;;;QAEtC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,0BAA0B,CAAC,IAAI,EAC/B,kBAAkB,EAClB,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,MAAA,KAAK,CAAC,sBAAsB,0CAAE,gBAAgB,EAAE,CAAC;QACjD,qBAAY,CAAC,gBAAgB,CAAsB,OAAO,0CAA+B,CAAC;QAE1F,IAAI,MAA4C,CAAC;QAEjD,QAAQ,KAAK,CAAC,YAAY,EAAE;YACxB,8BAA0B,CAAC,CAAC;gBACxB,MAAM,aAAa,GAAqC,MAAM,IAAA,2CAAkC,EAC5F,KAAK,EACL,OAAO,EACP,CAAC,EACD,KAAK,CAAC,EAAE,CACX,CAAC;gBAEF,MAAM,cAAc,GAAqC,MAAM,IAAA,2CAAkC,EAC7F,KAAK,EACL,OAAO,EACP,CAAC,EACD,KAAK,CAAC,EAAE,CACX,CAAC;gBAEF,IAAI,aAAa,KAAK,SAAS,IAAI,cAAc,KAAK,SAAS,EAAE;oBAC7D,MAAM,GAAG,eAAI,CAAC,eAAe,CAAC;iBACjC;qBAAM,IAAI,aAAa,CAAC,IAAI,0BAAyB,IAAI,cAAc,CAAC,IAAI,0BAAyB,EAAE;oBACpG,iCAAiC;oBACjC,IAAI,aAAa,CAAC,UAAU,KAAK,IAAI,IAAI,cAAc,CAAC,UAAU,KAAK,IAAI,EAAE;wBACzE,MAAM,GAAG,eAAI,CAAC,YAAY,CAAC;qBAC9B;yBAAM;wBACH,MAAM,GAAG,eAAI,CAAC,YAAY,CAAC;qBAC9B;iBACJ;qBAAM,IAAI,aAAa,CAAC,IAAI,sBAAuB,IAAI,cAAc,CAAC,IAAI,sBAAuB,EAAE;oBAChG,MAAM,GAAG,eAAI,CAAC,YAAY,CAAC;iBAC9B;qBAAM,IAAI,aAAa,CAAC,IAAI,4BAA0B,IAAI,cAAc,CAAC,IAAI,4BAA0B,EAAE;oBACtG,MAAM,GAAG,eAAI,CAAC,eAAe,CAAC;iBACjC;qBAAM;oBACH,MAAM,GAAG,eAAI,CAAC,YAAY,CAAC;iBAC9B;gBAED,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;AAhED,gEAgEC"}
+{"version":3,"file":"inspectTypeRangeExpression.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeRangeExpression.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,0FAAwF;AAExF,sFAAmG;AAEnG,gCAA+D;AAC/D,qCAAgF;AAChF,oEAAsD;AAGtD,SAAsB,0BAA0B,CAC5C,KAAuB,EACvB,OAAiB,EACjB,aAAiC;;;QAEjC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,0BAA0B,CAAC,IAAI,EAC/B,aAAa,EACb,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,MAAA,KAAK,CAAC,iBAAiB,0CAAE,gBAAgB,EAAE,CAAC;QAC5C,qBAAY,CAAC,gBAAgB,CAAsB,OAAO,0CAA+B,CAAC;QAE1F,IAAI,MAA4C,CAAC;QAEjD,QAAQ,KAAK,CAAC,YAAY,EAAE;YACxB,8BAA0B,CAAC,CAAC;gBACxB,MAAM,QAAQ,GAAqC,MAAM,IAAA,2CAAkC,EACvF,KAAK,EACL,OAAO,EACP,CAAC,EACD,KAAK,CAAC,EAAE,CACX,CAAC;gBAEF,MAAM,SAAS,GAAqC,MAAM,IAAA,2CAAkC,EACxF,KAAK,EACL,OAAO,EACP,CAAC,EACD,KAAK,CAAC,EAAE,CACX,CAAC;gBAEF,IAAI,QAAQ,KAAK,SAAS,IAAI,SAAS,KAAK,SAAS,EAAE;oBACnD,MAAM,GAAG,eAAI,CAAC,eAAe,CAAC;iBACjC;qBAAM,IAAI,QAAQ,CAAC,IAAI,0BAAyB,IAAI,SAAS,CAAC,IAAI,0BAAyB,EAAE;oBAC1F,iCAAiC;oBACjC,IAAI,QAAQ,CAAC,UAAU,KAAK,IAAI,IAAI,SAAS,CAAC,UAAU,KAAK,IAAI,EAAE;wBAC/D,MAAM,GAAG,eAAI,CAAC,YAAY,CAAC;qBAC9B;yBAAM;wBACH,MAAM,GAAG,eAAI,CAAC,YAAY,CAAC;qBAC9B;iBACJ;qBAAM,IAAI,QAAQ,CAAC,IAAI,sBAAuB,IAAI,SAAS,CAAC,IAAI,sBAAuB,EAAE;oBACtF,MAAM,GAAG,eAAI,CAAC,YAAY,CAAC;iBAC9B;qBAAM,IAAI,QAAQ,CAAC,IAAI,4BAA0B,IAAI,SAAS,CAAC,IAAI,4BAA0B,EAAE;oBAC5F,MAAM,GAAG,eAAI,CAAC,eAAe,CAAC;iBACjC;qBAAM;oBACH,MAAM,GAAG,eAAI,CAAC,YAAY,CAAC;iBAC9B;gBAED,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;AAhED,gEAgEC"}

package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecord.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 inspectTypeRecord(state: InspectTypeState, xorNode: TXorNode, maybeCorrelationId: number | undefined): Promise<Type.Record | Type.DefinedRecord>;
+export declare function inspectTypeRecord(state: InspectTypeState, xorNode: TXorNode, correlationId: number | undefined): Promise<Type.Record | Type.DefinedRecord>;

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

@@ -17,20 +17,21 @@ 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 inspectTypeRecord(state, xorNode, maybeCorrelationId) {
+function inspectTypeRecord(state, xorNode, correlationId) {
     var _a;
     return __awaiter(this, void 0, void 0, function* () {
-        const trace = state.traceManager.entry("Inspection.Type" /* InspectType */, inspectTypeRecord.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 */, inspectTypeRecord.name, correlationId, __1.TraceUtils.createXorNodeDetails(xorNode));
+        (_a = state.cancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
         parser_1.XorNodeUtils.assertIsRecord(xorNode);
         let result;
         switch (state.typeStrategy) {
             case "Extended" /* Extended */: {
                 const fields = new Map();
                 for (const keyValuePair of parser_1.NodeIdMapIterator.iterRecord(state.nodeIdMapCollection, xorNode)) {
-                    if (keyValuePair.maybeValue) {
+                    if (keyValuePair.value) {
+                        fields.set(keyValuePair.normalizedKeyLiteral, 
                         // eslint-disable-next-line no-await-in-loop
-                        fields.set(keyValuePair.keyLiteral, yield (0, common_1.inspectXor)(state, keyValuePair.maybeValue, trace.id));
+                        yield (0, common_1.inspectXor)(state, keyValuePair.value, trace.id));
                     }
                     else {
                         fields.set(keyValuePair.keyLiteral, language_1.Type.UnknownInstance);
@@ -38,7 +39,7 @@ function inspectTypeRecord(state, xorNode, maybeCorrelationId) {
                 }
                 result = {
                     kind: "Record" /* Record */,
-                    maybeExtendedKind: "DefinedRecord" /* DefinedRecord */,
+                    extendedKind: "DefinedRecord" /* DefinedRecord */,
                     isNullable: false,
                     fields,
                     isOpen: false,

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

@@ -1 +1 @@
-{"version":3,"file":"inspectTypeRecord.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeRecord.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,sFAAsH;AAEtH,oEAAsD;AACtD,0FAAmF;AAEnF,gCAA+D;AAC/D,qCAAwD;AAGxD,SAAsB,iBAAiB,CACnC,KAAuB,EACvB,OAAiB,EACjB,kBAAsC;;;QAEtC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,iBAAiB,CAAC,IAAI,EACtB,kBAAkB,EAClB,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,MAAA,KAAK,CAAC,sBAAsB,0CAAE,gBAAgB,EAAE,CAAC;QACjD,qBAAY,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QACrC,IAAI,MAAwC,CAAC;QAE7C,QAAQ,KAAK,CAAC,YAAY,EAAE;YACxB,8BAA0B,CAAC,CAAC;gBACxB,MAAM,MAAM,GAAsC,IAAI,GAAG,EAAE,CAAC;gBAE5D,KAAK,MAAM,YAAY,IAAI,0BAAiB,CAAC,UAAU,CAAC,KAAK,CAAC,mBAAmB,EAAE,OAAO,CAAC,EAAE;oBACzF,IAAI,YAAY,CAAC,UAAU,EAAE;wBACzB,4CAA4C;wBAC5C,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,UAAU,EAAE,MAAM,IAAA,mBAAU,EAAC,KAAK,EAAE,YAAY,CAAC,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;qBACnG;yBAAM;wBACH,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,UAAU,EAAE,eAAI,CAAC,eAAe,CAAC,CAAC;qBAC7D;iBACJ;gBAED,MAAM,GAAG;oBACL,IAAI,uBAAsB;oBAC1B,iBAAiB,qCAAqC;oBACtD,UAAU,EAAE,KAAK;oBACjB,MAAM;oBACN,MAAM,EAAE,KAAK;iBAChB,CAAC;gBAEF,MAAM;aACT;YAED;gBACI,MAAM,GAAG,eAAI,CAAC,cAAc,CAAC;gBAC7B,MAAM;YAEV;gBACI,MAAM,0BAAM,CAAC,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;SAChD;QAED,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAE7E,OAAO,MAAM,CAAC;;CACjB;AAnDD,8CAmDC"}
+{"version":3,"file":"inspectTypeRecord.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeRecord.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,sFAAsH;AAEtH,oEAAsD;AACtD,0FAAmF;AAEnF,gCAA+D;AAC/D,qCAAwD;AAGxD,SAAsB,iBAAiB,CACnC,KAAuB,EACvB,OAAiB,EACjB,aAAiC;;;QAEjC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,iBAAiB,CAAC,IAAI,EACtB,aAAa,EACb,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,MAAA,KAAK,CAAC,iBAAiB,0CAAE,gBAAgB,EAAE,CAAC;QAC5C,qBAAY,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QACrC,IAAI,MAAwC,CAAC;QAE7C,QAAQ,KAAK,CAAC,YAAY,EAAE;YACxB,8BAA0B,CAAC,CAAC;gBACxB,MAAM,MAAM,GAAsC,IAAI,GAAG,EAAE,CAAC;gBAE5D,KAAK,MAAM,YAAY,IAAI,0BAAiB,CAAC,UAAU,CAAC,KAAK,CAAC,mBAAmB,EAAE,OAAO,CAAC,EAAE;oBACzF,IAAI,YAAY,CAAC,KAAK,EAAE;wBACpB,MAAM,CAAC,GAAG,CACN,YAAY,CAAC,oBAAoB;wBACjC,4CAA4C;wBAC5C,MAAM,IAAA,mBAAU,EAAC,KAAK,EAAE,YAAY,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,CACxD,CAAC;qBACL;yBAAM;wBACH,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,UAAU,EAAE,eAAI,CAAC,eAAe,CAAC,CAAC;qBAC7D;iBACJ;gBAED,MAAM,GAAG;oBACL,IAAI,uBAAsB;oBAC1B,YAAY,qCAAqC;oBACjD,UAAU,EAAE,KAAK;oBACjB,MAAM;oBACN,MAAM,EAAE,KAAK;iBAChB,CAAC;gBAEF,MAAM;aACT;YAED;gBACI,MAAM,GAAG,eAAI,CAAC,cAAc,CAAC;gBAC7B,MAAM;YAEV;gBACI,MAAM,0BAAM,CAAC,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;SAChD;QAED,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAE7E,OAAO,MAAM,CAAC;;CACjB;AAtDD,8CAsDC"}

package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecordType.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 inspectTypeRecordType(state: InspectTypeState, xorNode: TXorNode, maybeCorrelationId: number | undefined): Promise<Type.Type | Type.RecordType | Type.Unknown>;
+export declare function inspectTypeRecordType(state: InspectTypeState, xorNode: TXorNode, correlationId: number | undefined): Promise<Type.Type | Type.RecordType | Type.Unknown>;

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

@@ -17,21 +17,21 @@ const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/par
 const powerquery_parser_1 = require("@microsoft/powerquery-parser");
 const __1 = require("../../..");
 const examineFieldSpecificationList_1 = require("./examineFieldSpecificationList");
-function inspectTypeRecordType(state, xorNode, maybeCorrelationId) {
+function inspectTypeRecordType(state, xorNode, correlationId) {
     var _a;
     return __awaiter(this, void 0, void 0, function* () {
-        const trace = state.traceManager.entry("Inspection.Type" /* InspectType */, inspectTypeRecordType.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 */, inspectTypeRecordType.name, correlationId, __1.TraceUtils.createXorNodeDetails(xorNode));
+        (_a = state.cancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
         parser_1.XorNodeUtils.assertIsNodeKind(xorNode, "RecordType" /* RecordType */);
         let result;
         switch (state.typeStrategy) {
             case "Extended" /* Extended */: {
-                const maybeFields = parser_1.NodeIdMapUtils.maybeNthChildChecked(state.nodeIdMapCollection, xorNode.node.id, 0, "FieldSpecificationList" /* FieldSpecificationList */);
-                if (maybeFields === undefined) {
+                const fields = parser_1.NodeIdMapUtils.nthChildChecked(state.nodeIdMapCollection, xorNode.node.id, 0, "FieldSpecificationList" /* FieldSpecificationList */);
+                if (fields === undefined) {
                     result = language_1.Type.UnknownInstance;
                 }
                 else {
-                    result = Object.assign({ kind: "Type" /* Type */, maybeExtendedKind: "RecordType" /* RecordType */, isNullable: false }, (yield (0, examineFieldSpecificationList_1.examineFieldSpecificationList)(state, maybeFields, trace.id)));
+                    result = Object.assign({ kind: "Type" /* Type */, extendedKind: "RecordType" /* RecordType */, isNullable: false }, (yield (0, examineFieldSpecificationList_1.examineFieldSpecificationList)(state, fields, trace.id)));
                 }
                 break;
             }

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

@@ -1 +1 @@
-{"version":3,"file":"inspectTypeRecordType.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeRecordType.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,0FAAwF;AACxF,sFAAmH;AAEnH,oEAAsD;AAEtD,gCAA+D;AAC/D,mFAAgF;AAIhF,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,MAAkD,CAAC;QAEvD,QAAQ,KAAK,CAAC,YAAY,EAAE;YACxB,8BAA0B,CAAC,CAAC;gBACxB,MAAM,WAAW,GAAyB,uBAAc,CAAC,oBAAoB,CACzE,KAAK,CAAC,mBAAmB,EACzB,OAAO,CAAC,IAAI,CAAC,EAAE,EACf,CAAC,wDAEJ,CAAC;gBAEF,IAAI,WAAW,KAAK,SAAS,EAAE;oBAC3B,MAAM,GAAG,eAAI,CAAC,eAAe,CAAC;iBACjC;qBAAM;oBACH,MAAM,mBACF,IAAI,qBACJ,iBAAiB,iCACjB,UAAU,EAAE,KAAK,IACd,CAAC,MAAM,IAAA,6DAA6B,EAAC,KAAK,EAAE,WAAW,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC,CACzE,CAAC;iBACL;gBAED,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;AAnDD,sDAmDC"}
+{"version":3,"file":"inspectTypeRecordType.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeRecordType.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,0FAAwF;AACxF,sFAAmH;AAEnH,oEAAsD;AAEtD,gCAA+D;AAC/D,mFAAgF;AAIhF,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,MAAkD,CAAC;QAEvD,QAAQ,KAAK,CAAC,YAAY,EAAE;YACxB,8BAA0B,CAAC,CAAC;gBACxB,MAAM,MAAM,GAAyB,uBAAc,CAAC,eAAe,CAC/D,KAAK,CAAC,mBAAmB,EACzB,OAAO,CAAC,IAAI,CAAC,EAAE,EACf,CAAC,wDAEJ,CAAC;gBAEF,IAAI,MAAM,KAAK,SAAS,EAAE;oBACtB,MAAM,GAAG,eAAI,CAAC,eAAe,CAAC;iBACjC;qBAAM;oBACH,MAAM,mBACF,IAAI,qBACJ,YAAY,iCACZ,UAAU,EAAE,KAAK,IACd,CAAC,MAAM,IAAA,6DAA6B,EAAC,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC,CACpE,CAAC;iBACL;gBAED,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;AAnDD,sDAmDC"}

package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecursivePrimaryExpression.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 inspectTypeRecursivePrimaryExpression(state: InspectTypeState, xorNode: TXorNode, maybeCorrelationId: number | undefined): Promise<Type.TPowerQueryType>;
+export declare function inspectTypeRecursivePrimaryExpression(state: InspectTypeState, xorNode: TXorNode, correlationId: number | undefined): Promise<Type.TPowerQueryType>;

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

@@ -16,14 +16,14 @@ const language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/l
 const __1 = require("../../..");
 const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
 const common_1 = require("./common");
-function inspectTypeRecursivePrimaryExpression(state, xorNode, maybeCorrelationId) {
+function inspectTypeRecursivePrimaryExpression(state, xorNode, correlationId) {
     var _a;
     return __awaiter(this, void 0, void 0, function* () {
-        const trace = state.traceManager.entry("Inspection.Type" /* InspectType */, inspectTypeRecursivePrimaryExpression.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 */, inspectTypeRecursivePrimaryExpression.name, correlationId, __1.TraceUtils.createXorNodeDetails(xorNode));
+        (_a = state.cancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
         parser_1.XorNodeUtils.assertIsNodeKind(xorNode, "RecursivePrimaryExpression" /* RecursivePrimaryExpression */);
-        const maybeHead = parser_1.NodeIdMapUtils.maybeNthChild(state.nodeIdMapCollection, xorNode.node.id, 0);
-        if (maybeHead === undefined) {
+        const head = parser_1.NodeIdMapUtils.nthChild(state.nodeIdMapCollection, xorNode.node.id, 0);
+        if (head === undefined) {
             trace.exit({ ["Result" /* Result */]: __1.TraceUtils.createTypeDetails(language_1.Type.UnknownInstance) });
             return language_1.Type.UnknownInstance;
         }
@@ -32,18 +32,18 @@ function inspectTypeRecursivePrimaryExpression(state, xorNode, maybeCorrelationI
             trace.exit({ ["Result" /* Result */]: __1.TraceUtils.createTypeDetails(headType) });
             return headType;
         }
-        const maybeArrayWrapper = parser_1.NodeIdMapUtils.maybeNthChildChecked(state.nodeIdMapCollection, xorNode.node.id, 1, "ArrayWrapper" /* ArrayWrapper */);
-        if (maybeArrayWrapper === undefined) {
+        const arrayWrapper = parser_1.NodeIdMapUtils.nthChildChecked(state.nodeIdMapCollection, xorNode.node.id, 1, "ArrayWrapper" /* ArrayWrapper */);
+        if (arrayWrapper === undefined) {
             trace.exit({ ["Result" /* Result */]: __1.TraceUtils.createTypeDetails(language_1.Type.UnknownInstance) });
             return language_1.Type.UnknownInstance;
         }
-        const maybeExpressions = parser_1.NodeIdMapIterator.assertIterChildrenXor(state.nodeIdMapCollection, maybeArrayWrapper.node.id);
-        if (maybeExpressions === undefined) {
+        const expressions = parser_1.NodeIdMapIterator.assertIterChildrenXor(state.nodeIdMapCollection, arrayWrapper.node.id);
+        if (expressions === undefined) {
             trace.exit({ ["Result" /* Result */]: __1.TraceUtils.createTypeDetails(language_1.Type.UnknownInstance) });
             return language_1.Type.UnknownInstance;
         }
         let leftType = headType;
-        for (const right of maybeExpressions) {
+        for (const right of expressions) {
             // eslint-disable-next-line no-await-in-loop
             const rightType = yield (0, common_1.inspectXor)(state, right, trace.id);
             leftType = rightType;

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

@@ -1 +1 @@
-{"version":3,"file":"inspectTypeRecursivePrimaryExpression.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeRecursivePrimaryExpression.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,0FAAwF;AACxF,gCAA+D;AAC/D,sFAMmE;AAGnE,qCAA4F;AAE5F,SAAsB,qCAAqC,CACvD,KAAuB,EACvB,OAAiB,EACjB,kBAAsC;;;QAEtC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,qCAAqC,CAAC,IAAI,EAC1C,kBAAkB,EAClB,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,MAAA,KAAK,CAAC,sBAAsB,0CAAE,gBAAgB,EAAE,CAAC;QACjD,qBAAY,CAAC,gBAAgB,CAAiC,OAAO,gEAA0C,CAAC;QAEhH,MAAM,SAAS,GAAyB,uBAAc,CAAC,aAAa,CAAC,KAAK,CAAC,mBAAmB,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;QAEpH,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,QAAQ,GAAyB,MAAM,IAAA,2CAAkC,EAAC,KAAK,EAAE,OAAO,EAAE,CAAC,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;QAE7G,IAAI,QAAQ,CAAC,IAAI,sBAAuB,IAAI,QAAQ,CAAC,IAAI,4BAA0B,EAAE;YACjF,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;YAE/E,OAAO,QAAQ,CAAC;SACnB;QAED,MAAM,iBAAiB,GACnB,uBAAc,CAAC,oBAAoB,CAC/B,KAAK,CAAC,mBAAmB,EACzB,OAAO,CAAC,IAAI,CAAC,EAAE,EACf,CAAC,oCAEJ,CAAC;QAEN,IAAI,iBAAiB,KAAK,SAAS,EAAE;YACjC,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,gBAAgB,GAAwC,0BAAiB,CAAC,qBAAqB,CACjG,KAAK,CAAC,mBAAmB,EACzB,iBAAiB,CAAC,IAAI,CAAC,EAAE,CAC5B,CAAC;QAEF,IAAI,gBAAgB,KAAK,SAAS,EAAE;YAChC,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,IAAI,QAAQ,GAAyB,QAAQ,CAAC;QAE9C,KAAK,MAAM,KAAK,IAAI,gBAAgB,EAAE;YAClC,4CAA4C;YAC5C,MAAM,SAAS,GAAyB,MAAM,IAAA,mBAAU,EAAC,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;YACjF,QAAQ,GAAG,SAAS,CAAC;SACxB;QAED,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QAE/E,OAAO,QAAQ,CAAC;;CACnB;AAnED,sFAmEC"}
+{"version":3,"file":"inspectTypeRecursivePrimaryExpression.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeRecursivePrimaryExpression.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,0FAAwF;AACxF,gCAA+D;AAC/D,sFAMmE;AAGnE,qCAA4F;AAE5F,SAAsB,qCAAqC,CACvD,KAAuB,EACvB,OAAiB,EACjB,aAAiC;;;QAEjC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,qCAAqC,CAAC,IAAI,EAC1C,aAAa,EACb,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,MAAA,KAAK,CAAC,iBAAiB,0CAAE,gBAAgB,EAAE,CAAC;QAC5C,qBAAY,CAAC,gBAAgB,CAAiC,OAAO,gEAA0C,CAAC;QAEhH,MAAM,IAAI,GAAyB,uBAAc,CAAC,QAAQ,CAAC,KAAK,CAAC,mBAAmB,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;QAE1G,IAAI,IAAI,KAAK,SAAS,EAAE;YACpB,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,QAAQ,GAAyB,MAAM,IAAA,2CAAkC,EAAC,KAAK,EAAE,OAAO,EAAE,CAAC,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;QAE7G,IAAI,QAAQ,CAAC,IAAI,sBAAuB,IAAI,QAAQ,CAAC,IAAI,4BAA0B,EAAE;YACjF,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;YAE/E,OAAO,QAAQ,CAAC;SACnB;QAED,MAAM,YAAY,GAA2C,uBAAc,CAAC,eAAe,CACvF,KAAK,CAAC,mBAAmB,EACzB,OAAO,CAAC,IAAI,CAAC,EAAE,EACf,CAAC,oCAEJ,CAAC;QAEF,IAAI,YAAY,KAAK,SAAS,EAAE;YAC5B,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,WAAW,GAAwC,0BAAiB,CAAC,qBAAqB,CAC5F,KAAK,CAAC,mBAAmB,EACzB,YAAY,CAAC,IAAI,CAAC,EAAE,CACvB,CAAC;QAEF,IAAI,WAAW,KAAK,SAAS,EAAE;YAC3B,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,IAAI,QAAQ,GAAyB,QAAQ,CAAC;QAE9C,KAAK,MAAM,KAAK,IAAI,WAAW,EAAE;YAC7B,4CAA4C;YAC5C,MAAM,SAAS,GAAyB,MAAM,IAAA,mBAAU,EAAC,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;YACjF,QAAQ,GAAG,SAAS,CAAC;SACxB;QAED,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QAE/E,OAAO,QAAQ,CAAC;;CACnB;AAlED,sFAkEC"}

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

@@ -1,7 +1,7 @@
 import { Constant, 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 inspectTypeTBinOpExpression(state: InspectTypeState, xorNode: TXorNode, maybeCorrelationId: number | undefined): Promise<Type.TPowerQueryType>;
+export declare function inspectTypeTBinOpExpression(state: InspectTypeState, xorNode: TXorNode, correlationId: number | undefined): Promise<Type.TPowerQueryType>;
 export declare const Lookup: ReadonlyMap<string, Type.TypeKind>;
 export declare const PartialLookup: ReadonlyMap<string, ReadonlySet<Type.TypeKind>>;
 export declare function lookupKey(leftTypeKind: Type.TypeKind, operatorKind: Constant.TBinOpExpressionOperator, rightTypeKind: Type.TypeKind): string;