@microsoft/powerquery-language-services 0.2.11 → 0.2.17

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

@@ -3,54 +3,55 @@
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.inspectTypeConstant = void 0;
-var PQP = require("@microsoft/powerquery-parser");
+var language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
+var parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
 function inspectTypeConstant(xorNode) {
-    PQP.Parser.XorNodeUtils.assertAstNodeKind(xorNode, "Constant" /* Constant */);
-    if (xorNode.kind === "Context" /* Context */) {
-        return PQP.Language.Type.UnknownInstance;
+    parser_1.XorNodeUtils.assertIsNodeKind(xorNode, "Constant" /* Constant */);
+    if (parser_1.XorNodeUtils.isContextXor(xorNode)) {
+        return language_1.Type.UnknownInstance;
     }
     var constant = xorNode.node;
     switch (constant.constantKind) {
         case "action" /* Action */:
-            return PQP.Language.TypeUtils.createPrimitiveType(false, "Action" /* Action */);
+            return language_1.TypeUtils.createPrimitiveType(false, "Action" /* Action */);
         case "any" /* Any */:
-            return PQP.Language.Type.AnyInstance;
+            return language_1.Type.AnyInstance;
         case "anynonnull" /* AnyNonNull */:
-            return PQP.Language.TypeUtils.createPrimitiveType(false, "AnyNonNull" /* AnyNonNull */);
+            return language_1.TypeUtils.createPrimitiveType(false, "AnyNonNull" /* AnyNonNull */);
         case "binary" /* Binary */:
-            return PQP.Language.TypeUtils.createPrimitiveType(false, "Binary" /* Binary */);
+            return language_1.TypeUtils.createPrimitiveType(false, "Binary" /* Binary */);
         case "date" /* Date */:
-            return PQP.Language.TypeUtils.createPrimitiveType(false, "Date" /* Date */);
+            return language_1.TypeUtils.createPrimitiveType(false, "Date" /* Date */);
         case "datetime" /* DateTime */:
-            return PQP.Language.TypeUtils.createPrimitiveType(false, "DateTime" /* DateTime */);
+            return language_1.TypeUtils.createPrimitiveType(false, "DateTime" /* DateTime */);
         case "datetimezone" /* DateTimeZone */:
-            return PQP.Language.TypeUtils.createPrimitiveType(false, "DateTimeZone" /* DateTimeZone */);
+            return language_1.TypeUtils.createPrimitiveType(false, "DateTimeZone" /* DateTimeZone */);
         case "duration" /* Duration */:
-            return PQP.Language.TypeUtils.createPrimitiveType(false, "Duration" /* Duration */);
+            return language_1.TypeUtils.createPrimitiveType(false, "Duration" /* Duration */);
         case "function" /* Function */:
-            return PQP.Language.TypeUtils.createPrimitiveType(false, "Function" /* Function */);
+            return language_1.TypeUtils.createPrimitiveType(false, "Function" /* Function */);
         case "list" /* List */:
-            return PQP.Language.TypeUtils.createPrimitiveType(false, "List" /* List */);
+            return language_1.TypeUtils.createPrimitiveType(false, "List" /* List */);
         case "logical" /* Logical */:
-            return PQP.Language.TypeUtils.createPrimitiveType(false, "Logical" /* Logical */);
+            return language_1.TypeUtils.createPrimitiveType(false, "Logical" /* Logical */);
         case "none" /* None */:
-            return PQP.Language.TypeUtils.createPrimitiveType(false, "None" /* None */);
+            return language_1.TypeUtils.createPrimitiveType(false, "None" /* None */);
         case "null" /* Null */:
-            return PQP.Language.Type.NoneInstance;
+            return language_1.Type.NoneInstance;
         case "number" /* Number */:
-            return PQP.Language.TypeUtils.createPrimitiveType(false, "Number" /* Number */);
+            return language_1.TypeUtils.createPrimitiveType(false, "Number" /* Number */);
         case "record" /* Record */:
-            return PQP.Language.TypeUtils.createPrimitiveType(false, "Record" /* Record */);
+            return language_1.TypeUtils.createPrimitiveType(false, "Record" /* Record */);
         case "table" /* Table */:
-            return PQP.Language.TypeUtils.createPrimitiveType(false, "Table" /* Table */);
+            return language_1.TypeUtils.createPrimitiveType(false, "Table" /* Table */);
         case "text" /* Text */:
-            return PQP.Language.TypeUtils.createPrimitiveType(false, "Text" /* Text */);
+            return language_1.TypeUtils.createPrimitiveType(false, "Text" /* Text */);
         case "time" /* Time */:
-            return PQP.Language.TypeUtils.createPrimitiveType(false, "Time" /* Time */);
+            return language_1.TypeUtils.createPrimitiveType(false, "Time" /* Time */);
         case "type" /* Type */:
-            return PQP.Language.TypeUtils.createPrimitiveType(false, "Type" /* Type */);
+            return language_1.TypeUtils.createPrimitiveType(false, "Type" /* Type */);
         default:
-            return PQP.Language.Type.UnknownInstance;
+            return language_1.Type.UnknownInstance;
     }
 }
 exports.inspectTypeConstant = inspectTypeConstant;

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

@@ -1 +1 @@
-{"version":3,"file":"inspectTypeConstant.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeConstant.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,kDAAoD;AAEpD,SAAgB,mBAAmB,CAAC,OAA4B;IAC5D,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,iBAAiB,CAAC,OAAO,4BAAqC,CAAC;IAEvF,IAAI,OAAO,CAAC,IAAI,4BAAmC,EAAE;QACjD,OAAO,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,eAAe,CAAC;KAC5C;IAED,IAAM,QAAQ,GAA+B,OAAO,CAAC,IAAkC,CAAC;IACxF,QAAQ,QAAQ,CAAC,YAAY,EAAE;QAC3B;YACI,OAAO,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,mBAAmB,CAAC,KAAK,wBAAoC,CAAC;QAEhG;YACI,OAAO,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC;QAEzC;YACI,OAAO,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,mBAAmB,CAAC,KAAK,gCAAwC,CAAC;QAEpG;YACI,OAAO,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,mBAAmB,CAAC,KAAK,wBAAoC,CAAC;QAEhG;YACI,OAAO,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,mBAAmB,CAAC,KAAK,oBAAkC,CAAC;QAE9F;YACI,OAAO,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,mBAAmB,CAAC,KAAK,4BAAsC,CAAC;QAElG;YACI,OAAO,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,mBAAmB,CAAC,KAAK,oCAA0C,CAAC;QAEtG;YACI,OAAO,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,mBAAmB,CAAC,KAAK,4BAAsC,CAAC;QAElG;YACI,OAAO,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,mBAAmB,CAAC,KAAK,4BAAsC,CAAC;QAElG;YACI,OAAO,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,mBAAmB,CAAC,KAAK,oBAAkC,CAAC;QAE9F;YACI,OAAO,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,mBAAmB,CAAC,KAAK,0BAAqC,CAAC;QAEjG;YACI,OAAO,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,mBAAmB,CAAC,KAAK,oBAAkC,CAAC;QAE9F;YACI,OAAO,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC;QAE1C;YACI,OAAO,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,mBAAmB,CAAC,KAAK,wBAAoC,CAAC;QAEhG;YACI,OAAO,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,mBAAmB,CAAC,KAAK,wBAAoC,CAAC;QAEhG;YACI,OAAO,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,mBAAmB,CAAC,KAAK,sBAAmC,CAAC;QAE/F;YACI,OAAO,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,mBAAmB,CAAC,KAAK,oBAAkC,CAAC;QAE9F;YACI,OAAO,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,mBAAmB,CAAC,KAAK,oBAAkC,CAAC;QAE9F;YACI,OAAO,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,mBAAmB,CAAC,KAAK,oBAAkC,CAAC;QAE9F;YACI,OAAO,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,eAAe,CAAC;KAChD;AACL,CAAC;AArED,kDAqEC"}
+{"version":3,"file":"inspectTypeConstant.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeConstant.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wFAA6G;AAC7G,oFAAmG;AAEnG,SAAgB,mBAAmB,CAAC,OAAiB;IACjD,qBAAY,CAAC,gBAAgB,CAAgB,OAAO,4BAAwB,CAAC;IAE7E,IAAI,qBAAY,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE;QACpC,OAAO,eAAI,CAAC,eAAe,CAAC;KAC/B;IAED,IAAM,QAAQ,GAAkB,OAAO,CAAC,IAAI,CAAC;IAC7C,QAAQ,QAAQ,CAAC,YAAY,EAAE;QAC3B;YACI,OAAO,oBAAS,CAAC,mBAAmB,CAAC,KAAK,wBAAuB,CAAC;QAEtE;YACI,OAAO,eAAI,CAAC,WAAW,CAAC;QAE5B;YACI,OAAO,oBAAS,CAAC,mBAAmB,CAAC,KAAK,gCAA2B,CAAC;QAE1E;YACI,OAAO,oBAAS,CAAC,mBAAmB,CAAC,KAAK,wBAAuB,CAAC;QAEtE;YACI,OAAO,oBAAS,CAAC,mBAAmB,CAAC,KAAK,oBAAqB,CAAC;QAEpE;YACI,OAAO,oBAAS,CAAC,mBAAmB,CAAC,KAAK,4BAAyB,CAAC;QAExE;YACI,OAAO,oBAAS,CAAC,mBAAmB,CAAC,KAAK,oCAA6B,CAAC;QAE5E;YACI,OAAO,oBAAS,CAAC,mBAAmB,CAAC,KAAK,4BAAyB,CAAC;QAExE;YACI,OAAO,oBAAS,CAAC,mBAAmB,CAAC,KAAK,4BAAyB,CAAC;QAExE;YACI,OAAO,oBAAS,CAAC,mBAAmB,CAAC,KAAK,oBAAqB,CAAC;QAEpE;YACI,OAAO,oBAAS,CAAC,mBAAmB,CAAC,KAAK,0BAAwB,CAAC;QAEvE;YACI,OAAO,oBAAS,CAAC,mBAAmB,CAAC,KAAK,oBAAqB,CAAC;QAEpE;YACI,OAAO,eAAI,CAAC,YAAY,CAAC;QAE7B;YACI,OAAO,oBAAS,CAAC,mBAAmB,CAAC,KAAK,wBAAuB,CAAC;QAEtE;YACI,OAAO,oBAAS,CAAC,mBAAmB,CAAC,KAAK,wBAAuB,CAAC;QAEtE;YACI,OAAO,oBAAS,CAAC,mBAAmB,CAAC,KAAK,sBAAsB,CAAC;QAErE;YACI,OAAO,oBAAS,CAAC,mBAAmB,CAAC,KAAK,oBAAqB,CAAC;QAEpE;YACI,OAAO,oBAAS,CAAC,mBAAmB,CAAC,KAAK,oBAAqB,CAAC;QAEpE;YACI,OAAO,oBAAS,CAAC,mBAAmB,CAAC,KAAK,oBAAqB,CAAC;QAEpE;YACI,OAAO,eAAI,CAAC,eAAe,CAAC;KACnC;AACL,CAAC;AArED,kDAqEC"}

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

@@ -1,3 +1,4 @@
-import * as PQP from "@microsoft/powerquery-parser";
+import { Type } from "@microsoft/powerquery-parser/lib/powerquery-parser/language";
+import { TXorNode } from "@microsoft/powerquery-parser/lib/powerquery-parser/parser";
 import { InspectTypeState } from "./common";
-export declare function inspectTypeEachExpression(state: InspectTypeState, xorNode: PQP.Parser.TXorNode): PQP.Language.Type.TPowerQueryType;
+export declare function inspectTypeEachExpression(state: InspectTypeState, xorNode: TXorNode): Type.TPowerQueryType;

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

@@ -3,14 +3,18 @@
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.inspectTypeEachExpression = void 0;
-var PQP = require("@microsoft/powerquery-parser");
+var language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
+var parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
 var common_1 = require("./common");
+var __1 = require("../../..");
 function inspectTypeEachExpression(state, xorNode) {
     var _a;
-    (_a = state.settings.maybeCancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
-    PQP.Parser.XorNodeUtils.assertAstNodeKind(xorNode, "EachExpression" /* EachExpression */);
-    var expressionType = common_1.inspectTypeFromChildAttributeIndex(state, xorNode, 1);
-    return PQP.Language.TypeUtils.createDefinedFunction(false, [
+    var _b;
+    var trace = state.traceManager.entry("Type" /* Type */, inspectTypeEachExpression.name, __1.TraceUtils.createXorNodeDetails(xorNode));
+    (_b = state.maybeCancellationToken) === null || _b === void 0 ? void 0 : _b.throwIfCancelled();
+    parser_1.XorNodeUtils.assertIsNodeKind(xorNode, "EachExpression" /* EachExpression */);
+    var expressionType = (0, common_1.inspectTypeFromChildAttributeIndex)(state, xorNode, 1);
+    var result = language_1.TypeUtils.createDefinedFunction(false, [
         {
             isNullable: false,
             isOptional: false,
@@ -18,6 +22,8 @@ function inspectTypeEachExpression(state, xorNode) {
             nameLiteral: "_",
         },
     ], expressionType);
+    trace.exit((_a = {}, _a["Result" /* Result */] = __1.TraceUtils.createTypeDetails(result), _a));
+    return result;
 }
 exports.inspectTypeEachExpression = inspectTypeEachExpression;
 //# sourceMappingURL=inspectTypeEachExpression.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"inspectTypeEachExpression.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeEachExpression.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,kDAAoD;AAEpD,mCAAgF;AAEhF,SAAgB,yBAAyB,CACrC,KAAuB,EACvB,OAA4B;;IAE5B,MAAA,KAAK,CAAC,QAAQ,CAAC,sBAAsB,0CAAE,gBAAgB,EAAE,CAAC;IAC1D,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,iBAAiB,CAAC,OAAO,wCAA2C,CAAC;IAE7F,IAAM,cAAc,GAAsC,2CAAkC,CAAC,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;IAEhH,OAAO,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,qBAAqB,CAC/C,KAAK,EACL;QACI;YACI,UAAU,EAAE,KAAK;YACjB,UAAU,EAAE,KAAK;YACjB,SAAS,iBAAgC;YACzC,WAAW,EAAE,GAAG;SACnB;KACJ,EACD,cAAc,CACjB,CAAC;AACN,CAAC;AArBD,8DAqBC"}
+{"version":3,"file":"inspectTypeEachExpression.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeEachExpression.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wFAAmG;AAEnG,oFAAmG;AAEnG,mCAAgF;AAChF,8BAAoE;AAEpE,SAAgB,yBAAyB,CAAC,KAAuB,EAAE,OAAiB;;;IAChF,IAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,oBAEzC,yBAAyB,CAAC,IAAI,EAC9B,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;IACF,MAAA,KAAK,CAAC,sBAAsB,0CAAE,gBAAgB,EAAE,CAAC;IACjD,qBAAY,CAAC,gBAAgB,CAAqB,OAAO,wCAA8B,CAAC;IAExF,IAAM,cAAc,GAAyB,IAAA,2CAAkC,EAAC,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;IACnG,IAAM,MAAM,GAAyB,oBAAS,CAAC,qBAAqB,CAChE,KAAK,EACL;QACI;YACI,UAAU,EAAE,KAAK;YACjB,UAAU,EAAE,KAAK;YACjB,SAAS,iBAAmB;YAC5B,WAAW,EAAE,GAAG;SACnB;KACJ,EACD,cAAc,CACjB,CAAC;IACF,KAAK,CAAC,IAAI,WAAG,4BAAwB,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,MAAG,CAAC;IAE7E,OAAO,MAAM,CAAC;AAClB,CAAC;AAzBD,8DAyBC"}

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

@@ -1,3 +1,4 @@
-import * as PQP from "@microsoft/powerquery-parser";
+import { Type } from "@microsoft/powerquery-parser/lib/powerquery-parser/language";
+import { TXorNode } from "@microsoft/powerquery-parser/lib/powerquery-parser/parser";
 import { InspectTypeState } from "./common";
-export declare function inspectTypeErrorHandlingExpression(state: InspectTypeState, xorNode: PQP.Parser.TXorNode): PQP.Language.Type.TPowerQueryType;
+export declare function inspectTypeErrorHandlingExpression(state: InspectTypeState, xorNode: TXorNode): Type.TPowerQueryType;

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

@@ -3,19 +3,25 @@
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.inspectTypeErrorHandlingExpression = void 0;
-var PQP = require("@microsoft/powerquery-parser");
+var language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
+var parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
 var common_1 = require("./common");
+var __1 = require("../../..");
 function inspectTypeErrorHandlingExpression(state, xorNode) {
     var _a;
-    (_a = state.settings.maybeCancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
-    PQP.Parser.XorNodeUtils.assertAstNodeKind(xorNode, "ErrorHandlingExpression" /* ErrorHandlingExpression */);
-    var maybeOtherwiseExpression = PQP.Parser.NodeIdMapUtils.maybeChildXorByAttributeIndex(state.nodeIdMapCollection, xorNode.node.id, 2, ["OtherwiseExpression" /* OtherwiseExpression */]);
-    return PQP.Language.TypeUtils.createAnyUnion([
-        common_1.inspectTypeFromChildAttributeIndex(state, xorNode, 1),
+    var _b;
+    var trace = state.traceManager.entry("Type" /* Type */, inspectTypeErrorHandlingExpression.name, __1.TraceUtils.createXorNodeDetails(xorNode));
+    (_b = state.maybeCancellationToken) === null || _b === void 0 ? void 0 : _b.throwIfCancelled();
+    parser_1.XorNodeUtils.assertIsNodeKind(xorNode, "ErrorHandlingExpression" /* ErrorHandlingExpression */);
+    var maybeOtherwiseExpression = parser_1.NodeIdMapUtils.maybeNthChildChecked(state.nodeIdMapCollection, xorNode.node.id, 2, "OtherwiseExpression" /* OtherwiseExpression */);
+    var result = language_1.TypeUtils.createAnyUnion([
+        (0, common_1.inspectTypeFromChildAttributeIndex)(state, xorNode, 1),
         maybeOtherwiseExpression !== undefined
-            ? common_1.inspectXor(state, maybeOtherwiseExpression)
-            : PQP.Language.TypeUtils.createPrimitiveType(false, "Record" /* Record */),
+            ? (0, common_1.inspectXor)(state, maybeOtherwiseExpression)
+            : language_1.TypeUtils.createPrimitiveType(false, "Record" /* Record */),
     ]);
+    trace.exit((_a = {}, _a["Result" /* Result */] = __1.TraceUtils.createTypeDetails(result), _a));
+    return result;
 }
 exports.inspectTypeErrorHandlingExpression = inspectTypeErrorHandlingExpression;
 //# sourceMappingURL=inspectTypeErrorHandlingExpression.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"inspectTypeErrorHandlingExpression.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeErrorHandlingExpression.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,kDAAoD;AAEpD,mCAA4F;AAE5F,SAAgB,kCAAkC,CAC9C,KAAuB,EACvB,OAA4B;;IAE5B,MAAA,KAAK,CAAC,QAAQ,CAAC,sBAAsB,0CAAE,gBAAgB,EAAE,CAAC;IAC1D,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,iBAAiB,CAAC,OAAO,0DAAoD,CAAC;IAEtG,IAAM,wBAAwB,GAEZ,GAAG,CAAC,MAAM,CAAC,cAAc,CAAC,6BAA6B,CACrE,KAAK,CAAC,mBAAmB,EACzB,OAAO,CAAC,IAAI,CAAC,EAAE,EACf,CAAC,EACD,iDAA+C,CAClD,CAAC;IAEF,OAAO,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,cAAc,CAAC;QACzC,2CAAkC,CAAC,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC;QACrD,wBAAwB,KAAK,SAAS;YAClC,CAAC,CAAC,mBAAU,CAAC,KAAK,EAAE,wBAAwB,CAAC;YAC7C,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,mBAAmB,CAAC,KAAK,wBAAoC;KAC7F,CAAC,CAAC;AACP,CAAC;AAtBD,gFAsBC"}
+{"version":3,"file":"inspectTypeErrorHandlingExpression.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeErrorHandlingExpression.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wFAAmG;AACnG,oFAKmE;AAGnE,mCAA4F;AAC5F,8BAAoE;AAEpE,SAAgB,kCAAkC,CAAC,KAAuB,EAAE,OAAiB;;;IACzF,IAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,oBAEzC,kCAAkC,CAAC,IAAI,EACvC,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;IACF,MAAA,KAAK,CAAC,sBAAsB,0CAAE,gBAAgB,EAAE,CAAC;IACjD,qBAAY,CAAC,gBAAgB,CAA8B,OAAO,0DAAuC,CAAC;IAE1G,IAAM,wBAAwB,GAC1B,uBAAc,CAAC,oBAAoB,CAC/B,KAAK,CAAC,mBAAmB,EACzB,OAAO,CAAC,IAAI,CAAC,EAAE,EACf,CAAC,kDAEJ,CAAC;IAEN,IAAM,MAAM,GAAyB,oBAAS,CAAC,cAAc,CAAC;QAC1D,IAAA,2CAAkC,EAAC,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC;QACrD,wBAAwB,KAAK,SAAS;YAClC,CAAC,CAAC,IAAA,mBAAU,EAAC,KAAK,EAAE,wBAAwB,CAAC;YAC7C,CAAC,CAAC,oBAAS,CAAC,mBAAmB,CAAC,KAAK,wBAAuB;KACnE,CAAC,CAAC;IACH,KAAK,CAAC,IAAI,WAAG,4BAAwB,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,MAAG,CAAC;IAE7E,OAAO,MAAM,CAAC;AAClB,CAAC;AA1BD,gFA0BC"}

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

@@ -1,3 +1,4 @@
-import * as PQP from "@microsoft/powerquery-parser";
+import { Type } from "@microsoft/powerquery-parser/lib/powerquery-parser/language";
+import { TXorNode } from "@microsoft/powerquery-parser/lib/powerquery-parser/parser";
 import { InspectTypeState } from "./common";
-export declare function inspectTypeFieldProjection(state: InspectTypeState, xorNode: PQP.Parser.TXorNode): PQP.Language.Type.TPowerQueryType;
+export declare function inspectTypeFieldProjection(state: InspectTypeState, xorNode: TXorNode): Type.TPowerQueryType;

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

@@ -28,32 +28,41 @@ var __read = (this && this.__read) || function (o, n) {
     }
     return ar;
 };
-var __spreadArray = (this && this.__spreadArray) || function (to, from) {
-    for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
-        to[j] = from[i];
-    return to;
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.inspectTypeFieldProjection = void 0;
 var PQP = require("@microsoft/powerquery-parser");
+var language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
+var parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
 var common_1 = require("./common");
+var __1 = require("../../..");
 function inspectTypeFieldProjection(state, xorNode) {
     var _a;
-    (_a = state.settings.maybeCancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
-    PQP.Parser.XorNodeUtils.assertAstNodeKind(xorNode, "FieldProjection" /* FieldProjection */);
-    var projectedFieldNames = PQP.Parser.NodeIdMapIterator.iterFieldProjectionNames(state.nodeIdMapCollection, xorNode);
-    var previousSibling = PQP.Parser.NodeIdMapUtils.assertGetRecursiveExpressionPreviousSibling(state.nodeIdMapCollection, xorNode.node.id);
-    var previousSiblingType = common_1.inspectXor(state, previousSibling);
-    var isOptional = PQP.Parser.NodeIdMapUtils.maybeChildAstByAttributeIndex(state.nodeIdMapCollection, xorNode.node.id, 3, [
-        "Constant" /* Constant */,
-    ]) !== undefined;
-    return inspectFieldProjectionHelper(previousSiblingType, projectedFieldNames, isOptional);
+    var _b;
+    var trace = state.traceManager.entry("Type" /* Type */, inspectTypeFieldProjection.name, __1.TraceUtils.createXorNodeDetails(xorNode));
+    (_b = state.maybeCancellationToken) === null || _b === void 0 ? void 0 : _b.throwIfCancelled();
+    parser_1.XorNodeUtils.assertIsNodeKind(xorNode, "FieldProjection" /* FieldProjection */);
+    var projectedFieldNames = parser_1.NodeIdMapIterator.iterFieldProjectionNames(state.nodeIdMapCollection, xorNode);
+    var previousSibling = parser_1.NodeIdMapUtils.assertGetRecursiveExpressionPreviousSibling(state.nodeIdMapCollection, xorNode.node.id);
+    var previousSiblingType = (0, common_1.inspectXor)(state, previousSibling);
+    var isOptional = parser_1.NodeIdMapUtils.maybeUnboxNthChildIfAstChecked(state.nodeIdMapCollection, xorNode.node.id, 3, "Constant" /* Constant */) !== undefined;
+    var result = inspectFieldProjectionHelper(previousSiblingType, projectedFieldNames, isOptional);
+    trace.exit((_a = {}, _a["Result" /* Result */] = __1.TraceUtils.createTypeDetails(result), _a));
+    return result;
 }
 exports.inspectTypeFieldProjection = inspectTypeFieldProjection;
 function inspectFieldProjectionHelper(previousSiblingType, projectedFieldNames, isOptional) {
     switch (previousSiblingType.kind) {
         case "Any" /* Any */: {
-            var projectedFields = new Map(projectedFieldNames.map(function (fieldName) { return [fieldName, PQP.Language.Type.AnyInstance]; }));
+            var projectedFields = new Map(projectedFieldNames.map(function (fieldName) { return [fieldName, language_1.Type.AnyInstance]; }));
             return {
                 kind: "Any" /* Any */,
                 maybeExtendedKind: "AnyUnion" /* AnyUnion */,
@@ -70,7 +79,7 @@ function inspectFieldProjectionHelper(previousSiblingType, projectedFieldNames,
                         kind: "Table" /* Table */,
                         maybeExtendedKind: "DefinedTable" /* DefinedTable */,
                         isNullable: previousSiblingType.isNullable,
-                        fields: new PQP.OrderedMap(__spreadArray([], __read(projectedFields))),
+                        fields: new PQP.OrderedMap(__spreadArray([], __read(projectedFields), false)),
                         isOpen: false,
                     },
                 ],
@@ -80,29 +89,29 @@ function inspectFieldProjectionHelper(previousSiblingType, projectedFieldNames,
         case "Table" /* Table */: {
             // All we know is previousSibling was a Record/Table.
             // Create a DefinedRecord/DefinedTable with the projected fields.
-            if (PQP.Language.TypeUtils.isDefinedRecord(previousSiblingType)) {
+            if (language_1.TypeUtils.isDefinedRecord(previousSiblingType)) {
                 return reducedFieldsToKeys(previousSiblingType, projectedFieldNames, isOptional, reducedRecordFields);
             }
-            else if (PQP.Language.TypeUtils.isDefinedTable(previousSiblingType)) {
+            else if (language_1.TypeUtils.isDefinedTable(previousSiblingType)) {
                 return reducedFieldsToKeys(previousSiblingType, projectedFieldNames, isOptional, reducedTableFields);
             }
             else {
-                var newFields = new Map(projectedFieldNames.map(function (fieldName) { return [fieldName, PQP.Language.Type.AnyInstance]; }));
+                var newFields = new Map(projectedFieldNames.map(function (fieldName) { return [fieldName, language_1.Type.AnyInstance]; }));
                 return previousSiblingType.kind === "Record" /* Record */
-                    ? PQP.Language.TypeUtils.createDefinedRecord(false, newFields, false)
-                    : PQP.Language.TypeUtils.createDefinedTable(false, new PQP.OrderedMap(__spreadArray([], __read(newFields))), false);
+                    ? language_1.TypeUtils.createDefinedRecord(false, newFields, false)
+                    : language_1.TypeUtils.createDefinedTable(false, new PQP.OrderedMap(__spreadArray([], __read(newFields), false)), false);
             }
         }
         default:
-            return PQP.Language.Type.NoneInstance;
+            return language_1.Type.NoneInstance;
     }
 }
 // Returns a subset of `current` using `keys`.
 // If a mismatch is found it either returns Null if isOptional, else None.
 function reducedFieldsToKeys(current, keys, isOptional, createFieldsFn) {
-    var currentFieldNames = __spreadArray([], __read(current.fields.keys()));
+    var currentFieldNames = __spreadArray([], __read(current.fields.keys()), false);
     if (!current.isOpen && !PQP.ArrayUtils.isSubset(currentFieldNames, keys)) {
-        return isOptional ? PQP.Language.Type.NullInstance : PQP.Language.Type.NoneInstance;
+        return isOptional ? language_1.Type.NullInstance : language_1.Type.NoneInstance;
     }
     return __assign(__assign({}, current), { fields: createFieldsFn(current, keys), isOpen: false });
 }
@@ -110,6 +119,6 @@ function reducedRecordFields(current, keys) {
     return PQP.MapUtils.pick(current.fields, keys);
 }
 function reducedTableFields(current, keys) {
-    return new PQP.OrderedMap(__spreadArray([], __read(PQP.MapUtils.pick(current.fields, keys).entries())));
+    return new PQP.OrderedMap(__spreadArray([], __read(PQP.MapUtils.pick(current.fields, keys).entries()), false));
 }
 //# sourceMappingURL=inspectTypeFieldProjection.js.map

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

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

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

@@ -1,3 +1,4 @@
-import * as PQP from "@microsoft/powerquery-parser";
+import { Type } from "@microsoft/powerquery-parser/lib/powerquery-parser/language";
+import { TXorNode } from "@microsoft/powerquery-parser/lib/powerquery-parser/parser";
 import { InspectTypeState } from "./common";
-export declare function inspectTypeFieldSelector(state: InspectTypeState, xorNode: PQP.Parser.TXorNode): PQP.Language.Type.TPowerQueryType;
+export declare function inspectTypeFieldSelector(state: InspectTypeState, xorNode: TXorNode): Type.TPowerQueryType;

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

@@ -3,52 +3,66 @@
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.inspectTypeFieldSelector = void 0;
-var PQP = require("@microsoft/powerquery-parser");
+var language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
+var parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
 var powerquery_parser_1 = require("@microsoft/powerquery-parser");
 var common_1 = require("./common");
+var __1 = require("../../..");
 function inspectTypeFieldSelector(state, xorNode) {
-    var _a;
-    (_a = state.settings.maybeCancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
-    PQP.Parser.XorNodeUtils.assertAstNodeKind(xorNode, "FieldSelector" /* FieldSelector */);
-    var maybeFieldName = PQP.Parser.NodeIdMapUtils.maybeWrappedContentAst(state.nodeIdMapCollection, xorNode, "GeneralizedIdentifier" /* GeneralizedIdentifier */);
+    var _a, _b;
+    var _c;
+    var trace = state.traceManager.entry("Type" /* Type */, inspectTypeFieldSelector.name, __1.TraceUtils.createXorNodeDetails(xorNode));
+    (_c = state.maybeCancellationToken) === null || _c === void 0 ? void 0 : _c.throwIfCancelled();
+    parser_1.XorNodeUtils.assertIsNodeKind(xorNode, "FieldSelector" /* FieldSelector */);
+    var maybeFieldName = parser_1.NodeIdMapUtils.maybeUnboxWrappedContentIfAstChecked(state.nodeIdMapCollection, xorNode.node.id, "GeneralizedIdentifier" /* GeneralizedIdentifier */);
     if (maybeFieldName === undefined) {
-        return PQP.Language.Type.UnknownInstance;
+        trace.exit((_a = {}, _a["Result" /* Result */] = __1.TraceUtils.createTypeDetails(language_1.Type.UnknownInstance), _a));
+        return language_1.Type.UnknownInstance;
     }
     var fieldName = maybeFieldName.literal;
-    var previousSibling = PQP.Parser.NodeIdMapUtils.assertGetRecursiveExpressionPreviousSibling(state.nodeIdMapCollection, xorNode.node.id);
-    var previousSiblingType = common_1.inspectXor(state, previousSibling);
-    var isOptional = PQP.Parser.NodeIdMapUtils.maybeChildAstByAttributeIndex(state.nodeIdMapCollection, xorNode.node.id, 3, [
-        "Constant" /* Constant */,
-    ]) !== undefined;
+    var previousSibling = parser_1.NodeIdMapUtils.assertGetRecursiveExpressionPreviousSibling(state.nodeIdMapCollection, xorNode.node.id);
+    var previousSiblingType = (0, common_1.inspectXor)(state, previousSibling);
+    var isOptional = parser_1.NodeIdMapUtils.maybeUnboxNthChildIfAstChecked(state.nodeIdMapCollection, xorNode.node.id, 3, "Constant" /* Constant */) !== undefined;
+    var result;
     switch (previousSiblingType.kind) {
         case "Any" /* Any */:
-            return PQP.Language.Type.AnyInstance;
+            result = language_1.Type.AnyInstance;
+            break;
         case "Unknown" /* Unknown */:
-            return PQP.Language.Type.UnknownInstance;
+            result = language_1.Type.UnknownInstance;
+            break;
         case "Record" /* Record */:
         case "Table" /* Table */:
             switch (previousSiblingType.maybeExtendedKind) {
                 case undefined:
-                    return PQP.Language.Type.AnyInstance;
+                    result = language_1.Type.AnyInstance;
+                    break;
                 case "DefinedRecord" /* DefinedRecord */:
                 case "DefinedTable" /* DefinedTable */: {
                     var maybeNamedField = previousSiblingType.fields.get(fieldName);
                     if (maybeNamedField !== undefined) {
-                        return maybeNamedField;
+                        result = maybeNamedField;
+                        break;
                     }
                     else if (previousSiblingType.isOpen) {
-                        return PQP.Language.Type.AnyInstance;
+                        result = language_1.Type.AnyInstance;
+                        break;
                     }
                     else {
-                        return isOptional ? PQP.Language.Type.NullInstance : PQP.Language.Type.NoneInstance;
+                        result = isOptional ? language_1.Type.NullInstance : language_1.Type.NoneInstance;
+                        break;
                     }
                 }
                 default:
                     throw powerquery_parser_1.Assert.isNever(previousSiblingType);
             }
+            break;
         default:
-            return PQP.Language.Type.NoneInstance;
+            result = language_1.Type.NoneInstance;
+            break;
     }
+    trace.exit((_b = {}, _b["Result" /* Result */] = __1.TraceUtils.createTypeDetails(result), _b));
+    return result;
 }
 exports.inspectTypeFieldSelector = inspectTypeFieldSelector;
 //# sourceMappingURL=inspectTypeFieldSelector.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"inspectTypeFieldSelector.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeFieldSelector.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,kDAAoD;AAEpD,kEAAsD;AAEtD,mCAAwD;AAExD,SAAgB,wBAAwB,CACpC,KAAuB,EACvB,OAA4B;;IAE5B,MAAA,KAAK,CAAC,QAAQ,CAAC,sBAAsB,0CAAE,gBAAgB,EAAE,CAAC;IAC1D,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,iBAAiB,CAAC,OAAO,sCAA0C,CAAC;IAE5F,IAAM,cAAc,GAAuC,GAAG,CAAC,MAAM,CAAC,cAAc,CAAC,sBAAsB,CACvG,KAAK,CAAC,mBAAmB,EACzB,OAAO,sDAEV,CAAC;IACF,IAAI,cAAc,KAAK,SAAS,EAAE;QAC9B,OAAO,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,eAAe,CAAC;KAC5C;IACD,IAAM,SAAS,GAAY,cAAyD,CAAC,OAAO,CAAC;IAE7F,IAAM,eAAe,GAAwB,GAAG,CAAC,MAAM,CAAC,cAAc,CAAC,2CAA2C,CAC9G,KAAK,CAAC,mBAAmB,EACzB,OAAO,CAAC,IAAI,CAAC,EAAE,CAClB,CAAC;IACF,IAAM,mBAAmB,GAAsC,mBAAU,CAAC,KAAK,EAAE,eAAe,CAAC,CAAC;IAClG,IAAM,UAAU,GACZ,GAAG,CAAC,MAAM,CAAC,cAAc,CAAC,6BAA6B,CAAC,KAAK,CAAC,mBAAmB,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,EAAE;;KAEtG,CAAC,KAAK,SAAS,CAAC;IAErB,QAAQ,mBAAmB,CAAC,IAAI,EAAE;QAC9B;YACI,OAAO,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC;QAEzC;YACI,OAAO,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,eAAe,CAAC;QAE7C,2BAAuC;QACvC;YACI,QAAQ,mBAAmB,CAAC,iBAAiB,EAAE;gBAC3C,KAAK,SAAS;oBACV,OAAO,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC;gBAEzC,yCAAsD;gBACtD,sCAAoD,CAAC,CAAC;oBAClD,IAAM,eAAe,GAEH,mBAAmB,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;oBAC5D,IAAI,eAAe,KAAK,SAAS,EAAE;wBAC/B,OAAO,eAAe,CAAC;qBAC1B;yBAAM,IAAI,mBAAmB,CAAC,MAAM,EAAE;wBACnC,OAAO,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC;qBACxC;yBAAM;wBACH,OAAO,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC;qBACvF;iBACJ;gBAED;oBACI,MAAM,0BAAM,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC;aACjD;QAEL;YACI,OAAO,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC;KAC7C;AACL,CAAC;AA7DD,4DA6DC"}
+{"version":3,"file":"inspectTypeFieldSelector.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeFieldSelector.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wFAAwF;AACxF,oFAAmH;AAEnH,kEAAsD;AAEtD,mCAAwD;AACxD,8BAAoE;AAEpE,SAAgB,wBAAwB,CAAC,KAAuB,EAAE,OAAiB;;;IAC/E,IAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,oBAEzC,wBAAwB,CAAC,IAAI,EAC7B,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;IACF,MAAA,KAAK,CAAC,sBAAsB,0CAAE,gBAAgB,EAAE,CAAC;IACjD,qBAAY,CAAC,gBAAgB,CAAoB,OAAO,sCAA6B,CAAC;IAEtF,IAAM,cAAc,GAA0C,uBAAc,CAAC,oCAAoC,CAC7G,KAAK,CAAC,mBAAmB,EACzB,OAAO,CAAC,IAAI,CAAC,EAAE,sDAElB,CAAC;IACF,IAAI,cAAc,KAAK,SAAS,EAAE;QAC9B,KAAK,CAAC,IAAI,WAAG,4BAAwB,cAAU,CAAC,iBAAiB,CAAC,eAAI,CAAC,eAAe,CAAC,MAAG,CAAC;QAE3F,OAAO,eAAI,CAAC,eAAe,CAAC;KAC/B;IACD,IAAM,SAAS,GAAW,cAAc,CAAC,OAAO,CAAC;IAEjD,IAAM,eAAe,GAAa,uBAAc,CAAC,2CAA2C,CACxF,KAAK,CAAC,mBAAmB,EACzB,OAAO,CAAC,IAAI,CAAC,EAAE,CAClB,CAAC;IACF,IAAM,mBAAmB,GAAyB,IAAA,mBAAU,EAAC,KAAK,EAAE,eAAe,CAAC,CAAC;IACrF,IAAM,UAAU,GACZ,uBAAc,CAAC,8BAA8B,CACzC,KAAK,CAAC,mBAAmB,EACzB,OAAO,CAAC,IAAI,CAAC,EAAE,EACf,CAAC,4BAEJ,KAAK,SAAS,CAAC;IAEpB,IAAI,MAA4B,CAAC;IACjC,QAAQ,mBAAmB,CAAC,IAAI,EAAE;QAC9B;YACI,MAAM,GAAG,eAAI,CAAC,WAAW,CAAC;YAC1B,MAAM;QAEV;YACI,MAAM,GAAG,eAAI,CAAC,eAAe,CAAC;YAC9B,MAAM;QAEV,2BAA0B;QAC1B;YACI,QAAQ,mBAAmB,CAAC,iBAAiB,EAAE;gBAC3C,KAAK,SAAS;oBACV,MAAM,GAAG,eAAI,CAAC,WAAW,CAAC;oBAC1B,MAAM;gBAEV,yCAAyC;gBACzC,sCAAuC,CAAC,CAAC;oBACrC,IAAM,eAAe,GAAqC,mBAAmB,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;oBACpG,IAAI,eAAe,KAAK,SAAS,EAAE;wBAC/B,MAAM,GAAG,eAAe,CAAC;wBACzB,MAAM;qBACT;yBAAM,IAAI,mBAAmB,CAAC,MAAM,EAAE;wBACnC,MAAM,GAAG,eAAI,CAAC,WAAW,CAAC;wBAC1B,MAAM;qBACT;yBAAM;wBACH,MAAM,GAAG,UAAU,CAAC,CAAC,CAAC,eAAI,CAAC,YAAY,CAAC,CAAC,CAAC,eAAI,CAAC,YAAY,CAAC;wBAC5D,MAAM;qBACT;iBACJ;gBAED;oBACI,MAAM,0BAAM,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC;aACjD;YACD,MAAM;QAEV;YACI,MAAM,GAAG,eAAI,CAAC,YAAY,CAAC;YAC3B,MAAM;KACb;IACD,KAAK,CAAC,IAAI,WAAG,4BAAwB,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,MAAG,CAAC;IAE7E,OAAO,MAAM,CAAC;AAClB,CAAC;AA9ED,4DA8EC"}

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

@@ -1,3 +1,4 @@
-import * as PQP from "@microsoft/powerquery-parser";
+import { Type } from "@microsoft/powerquery-parser/lib/powerquery-parser/language";
+import { TXorNode } from "@microsoft/powerquery-parser/lib/powerquery-parser/parser";
 import { InspectTypeState } from "./common";
-export declare function inspectTypeFieldSpecification(state: InspectTypeState, xorNode: PQP.Parser.TXorNode): PQP.Language.Type.TPowerQueryType;
+export declare function inspectTypeFieldSpecification(state: InspectTypeState, xorNode: TXorNode): Type.TPowerQueryType;

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

@@ -3,16 +3,20 @@
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.inspectTypeFieldSpecification = void 0;
-var PQP = require("@microsoft/powerquery-parser");
+var language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
+var parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
 var common_1 = require("./common");
+var __1 = require("../../..");
 function inspectTypeFieldSpecification(state, xorNode) {
     var _a;
-    (_a = state.settings.maybeCancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
-    PQP.Parser.XorNodeUtils.assertAstNodeKind(xorNode, "FieldSpecification" /* FieldSpecification */);
-    var maybeFieldTypeSpecification = PQP.Parser.NodeIdMapUtils.maybeChildXorByAttributeIndex(state.nodeIdMapCollection, xorNode.node.id, 2, undefined);
-    return maybeFieldTypeSpecification !== undefined
-        ? common_1.inspectXor(state, maybeFieldTypeSpecification)
-        : PQP.Language.Type.AnyInstance;
+    var _b;
+    var trace = state.traceManager.entry("Type" /* Type */, inspectTypeFieldSpecification.name, __1.TraceUtils.createXorNodeDetails(xorNode));
+    (_b = state.maybeCancellationToken) === null || _b === void 0 ? void 0 : _b.throwIfCancelled();
+    parser_1.XorNodeUtils.assertIsNodeKind(xorNode, "FieldSpecification" /* FieldSpecification */);
+    var maybeFieldTypeSpecification = parser_1.NodeIdMapUtils.maybeNthChild(state.nodeIdMapCollection, xorNode.node.id, 2);
+    var result = maybeFieldTypeSpecification !== undefined ? (0, common_1.inspectXor)(state, maybeFieldTypeSpecification) : language_1.Type.AnyInstance;
+    trace.exit((_a = {}, _a["Result" /* Result */] = __1.TraceUtils.createTypeDetails(result), _a));
+    return result;
 }
 exports.inspectTypeFieldSpecification = inspectTypeFieldSpecification;
 //# sourceMappingURL=inspectTypeFieldSpecification.js.map

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,kDAAoD;AAEpD,mCAAwD;AAExD,SAAgB,6BAA6B,CACzC,KAAuB,EACvB,OAA4B;;IAE5B,MAAA,KAAK,CAAC,QAAQ,CAAC,sBAAsB,0CAAE,gBAAgB,EAAE,CAAC;IAC1D,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,iBAAiB,CAAC,OAAO,gDAA+C,CAAC;IAEjG,IAAM,2BAA2B,GAEf,GAAG,CAAC,MAAM,CAAC,cAAc,CAAC,6BAA6B,CACrE,KAAK,CAAC,mBAAmB,EACzB,OAAO,CAAC,IAAI,CAAC,EAAE,EACf,CAAC,EACD,SAAS,CACZ,CAAC;IAEF,OAAO,2BAA2B,KAAK,SAAS;QAC5C,CAAC,CAAC,mBAAU,CAAC,KAAK,EAAE,2BAA2B,CAAC;QAChD,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC;AACxC,CAAC;AAnBD,sEAmBC"}
+{"version":3,"file":"inspectTypeFieldSpecification.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeFieldSpecification.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wFAAwF;AACxF,oFAAmH;AAGnH,mCAAwD;AACxD,8BAAoE;AAEpE,SAAgB,6BAA6B,CAAC,KAAuB,EAAE,OAAiB;;;IACpF,IAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,oBAEzC,6BAA6B,CAAC,IAAI,EAClC,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;IACF,MAAA,KAAK,CAAC,sBAAsB,0CAAE,gBAAgB,EAAE,CAAC;IACjD,qBAAY,CAAC,gBAAgB,CAAyB,OAAO,gDAAkC,CAAC;IAEhG,IAAM,2BAA2B,GAAyB,uBAAc,CAAC,aAAa,CAClF,KAAK,CAAC,mBAAmB,EACzB,OAAO,CAAC,IAAI,CAAC,EAAE,EACf,CAAC,CACJ,CAAC;IAEF,IAAM,MAAM,GACR,2BAA2B,KAAK,SAAS,CAAC,CAAC,CAAC,IAAA,mBAAU,EAAC,KAAK,EAAE,2BAA2B,CAAC,CAAC,CAAC,CAAC,eAAI,CAAC,WAAW,CAAC;IAClH,KAAK,CAAC,IAAI,WAAG,4BAAwB,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,MAAG,CAAC;IAE7E,OAAO,MAAM,CAAC;AAClB,CAAC;AApBD,sEAoBC"}

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

@@ -1,3 +1,4 @@
-import * as PQP from "@microsoft/powerquery-parser";
+import { Type } from "@microsoft/powerquery-parser/lib/powerquery-parser/language";
+import { TXorNode } from "@microsoft/powerquery-parser/lib/powerquery-parser/parser";
 import { InspectTypeState } from "./common";
-export declare function inspectTypeFunctionExpression(state: InspectTypeState, xorNode: PQP.Parser.TXorNode): PQP.Language.Type.TPowerQueryType;
+export declare function inspectTypeFunctionExpression(state: InspectTypeState, xorNode: TXorNode): Type.TPowerQueryType;

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

@@ -3,16 +3,20 @@
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.inspectTypeFunctionExpression = void 0;
-var PQP = require("@microsoft/powerquery-parser");
-var pseudoFunctionExpressionType_1 = require("../../pseudoFunctionExpressionType");
+var language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
+var parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
 var common_1 = require("./common");
+var __1 = require("../../..");
+var pseudoFunctionExpressionType_1 = require("../../pseudoFunctionExpressionType");
 function inspectTypeFunctionExpression(state, xorNode) {
-    var _a;
-    (_a = state.settings.maybeCancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
-    PQP.Parser.XorNodeUtils.assertAstNodeKind(xorNode, "FunctionExpression" /* FunctionExpression */);
-    var pseudoType = pseudoFunctionExpressionType_1.pseudoFunctionExpressionType(state.nodeIdMapCollection, xorNode);
+    var _a, _b;
+    var _c;
+    var trace = state.traceManager.entry("Type" /* Type */, inspectTypeFunctionExpression.name, __1.TraceUtils.createXorNodeDetails(xorNode));
+    (_c = state.maybeCancellationToken) === null || _c === void 0 ? void 0 : _c.throwIfCancelled();
+    parser_1.XorNodeUtils.assertIsNodeKind(xorNode, "FunctionExpression" /* FunctionExpression */);
+    var pseudoType = (0, pseudoFunctionExpressionType_1.pseudoFunctionExpressionType)(state.nodeIdMapCollection, xorNode);
     var pseudoReturnType = pseudoType.returnType;
-    var expressionType = common_1.inspectTypeFromChildAttributeIndex(state, xorNode, 3);
+    var expressionType = (0, common_1.inspectTypeFromChildAttributeIndex)(state, xorNode, 3);
     // FunctionExpression.maybeFunctionReturnType 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).
@@ -22,27 +26,26 @@ function inspectTypeFunctionExpression(state, xorNode) {
     if (pseudoReturnType.kind === "Any" /* Any */) {
         returnType = expressionType;
     }
-    // If the return type is Any then see if we can narrow it to the stated return PQP.Language.type.
+    // 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 */ &&
-        common_1.allForAnyUnion(expressionType, function (type) {
-            return type.kind === pseudoReturnType.kind || type.kind === "Any" /* Any */;
-        })) {
+        (0, common_1.allForAnyUnion)(expressionType, function (type) { return type.kind === pseudoReturnType.kind || type.kind === "Any" /* Any */; })) {
         returnType = expressionType;
     }
     // If the stated return type doesn't match the expression's type then it's None.
     else if (pseudoReturnType.kind !== expressionType.kind) {
-        return PQP.Language.Type.NoneInstance;
+        trace.exit((_a = {}, _a["Result" /* Result */] = __1.TraceUtils.createTypeDetails(language_1.Type.NoneInstance), _a));
+        return language_1.Type.NoneInstance;
     }
-    // If the expression's type can't be known, then assume it's the stated return PQP.Language.type.
+    // If the expression's type can't be known, then assume it's the stated return Type.
     else if (expressionType.kind === "Unknown" /* Unknown */) {
         returnType = pseudoReturnType;
     }
-    // Else fallback to the expression's PQP.Language.type.
+    // Else fallback to the expression's Type.
     else {
         returnType = expressionType;
     }
-    return {
+    var result = {
         kind: "Function" /* Function */,
         maybeExtendedKind: "DefinedFunction" /* DefinedFunction */,
         isNullable: false,
@@ -56,6 +59,8 @@ function inspectTypeFunctionExpression(state, xorNode) {
         }),
         returnType: returnType,
     };
+    trace.exit((_b = {}, _b["Result" /* Result */] = __1.TraceUtils.createTypeDetails(result), _b));
+    return result;
 }
 exports.inspectTypeFunctionExpression = inspectTypeFunctionExpression;
 //# sourceMappingURL=inspectTypeFunctionExpression.js.map