@microsoft/powerquery-language-services 0.6.12 → 0.9.6

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

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

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

@@ -16,47 +16,49 @@ const PQP = require("@microsoft/powerquery-parser");
 const language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
 const __1 = require("../../..");
 const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
+const trace_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/common/trace");
 const powerquery_parser_1 = require("@microsoft/powerquery-parser");
 const common_1 = require("./common");
+const inspectionSettings_1 = require("../../../inspectionSettings");
 function inspectTypeFunctionType(state, xorNode, correlationId) {
     var _a;
     return __awaiter(this, void 0, void 0, function* () {
-        const trace = state.traceManager.entry("Inspection.Type" /* InspectType */, inspectTypeFunctionType.name, correlationId, __1.TraceUtils.createXorNodeDetails(xorNode));
+        const trace = state.traceManager.entry(__1.InspectionTraceConstant.InspectType, inspectTypeFunctionType.name, correlationId, __1.TraceUtils.xorNodeDetails(xorNode));
         (_a = state.cancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
-        parser_1.XorNodeUtils.assertIsNodeKind(xorNode, "FunctionType" /* FunctionType */);
+        parser_1.XorNodeUtils.assertIsNodeKind(xorNode, language_1.Ast.NodeKind.FunctionType);
         let result;
         switch (state.typeStrategy) {
-            case "Extended" /* Extended */: {
-                const parameters = parser_1.NodeIdMapUtils.nthChildChecked(state.nodeIdMapCollection, xorNode.node.id, 1, "ParameterList" /* ParameterList */);
+            case inspectionSettings_1.TypeStrategy.Extended: {
+                const parameters = parser_1.NodeIdMapUtils.nthChildXorChecked(state.nodeIdMapCollection, xorNode.node.id, 1, language_1.Ast.NodeKind.ParameterList);
                 if (parameters === undefined) {
-                    trace.exit({ ["Result" /* Result */]: __1.TraceUtils.createTypeDetails(language_1.Type.UnknownInstance) });
+                    trace.exit({ [trace_1.TraceConstant.Result]: __1.TraceUtils.typeDetails(language_1.Type.UnknownInstance) });
                     return language_1.Type.UnknownInstance;
                 }
-                const arrayWrapper = parser_1.NodeIdMapUtils.unboxArrayWrapper(state.nodeIdMapCollection, parameters.node.id);
+                const arrayWrapper = parser_1.NodeIdMapUtils.arrayWrapperContentXor(state.nodeIdMapCollection, parameters.node.id);
                 if (arrayWrapper === undefined) {
-                    trace.exit({ ["Result" /* Result */]: __1.TraceUtils.createTypeDetails(language_1.Type.UnknownInstance) });
+                    trace.exit({ [trace_1.TraceConstant.Result]: __1.TraceUtils.typeDetails(language_1.Type.UnknownInstance) });
                     return language_1.Type.UnknownInstance;
                 }
                 const parameterTypes = parser_1.NodeIdMapIterator.iterArrayWrapper(state.nodeIdMapCollection, arrayWrapper)
-                    .map((parameter) => language_1.TypeUtils.inspectParameter(state.nodeIdMapCollection, parser_1.XorNodeUtils.assertAsParameter(parameter)))
+                    .map((parameter) => language_1.TypeUtils.inspectParameter(state.nodeIdMapCollection, parser_1.XorNodeUtils.assertAsNodeKind(parameter, language_1.Ast.NodeKind.Parameter)))
                     .filter(PQP.TypeScriptUtils.isDefined);
                 const returnType = yield (0, common_1.inspectTypeFromChildAttributeIndex)(state, xorNode, 2, trace.id);
                 result = {
-                    kind: "Type" /* Type */,
-                    extendedKind: "FunctionType" /* FunctionType */,
+                    kind: language_1.Type.TypeKind.Type,
+                    extendedKind: language_1.Type.ExtendedTypeKind.FunctionType,
                     isNullable: false,
                     parameters: parameterTypes,
                     returnType,
                 };
                 break;
             }
-            case "Primitive" /* Primitive */:
+            case inspectionSettings_1.TypeStrategy.Primitive:
                 result = language_1.Type.TypePrimitiveInstance;
                 break;
             default:
                 powerquery_parser_1.Assert.isNever(state.typeStrategy);
         }
-        trace.exit({ ["Result" /* Result */]: __1.TraceUtils.createTypeDetails(result) });
+        trace.exit({ [trace_1.TraceConstant.Result]: __1.TraceUtils.typeDetails(result) });
         return result;
     });
 }

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

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

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

@@ -13,24 +13,25 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.inspectTypeIdentifier = void 0;
 const language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
+const trace_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/common/trace");
 const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
 const common_1 = require("./common");
 const __1 = require("../../..");
 function inspectTypeIdentifier(state, xorNode, correlationId) {
     var _a;
     return __awaiter(this, void 0, void 0, function* () {
-        const trace = state.traceManager.entry("Inspection.Type" /* InspectType */, inspectTypeIdentifier.name, correlationId, __1.TraceUtils.createXorNodeDetails(xorNode));
+        const trace = state.traceManager.entry(__1.InspectionTraceConstant.InspectType, inspectTypeIdentifier.name, correlationId, __1.TraceUtils.xorNodeDetails(xorNode));
         (_a = state.cancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
-        parser_1.XorNodeUtils.assertIsNodeKind(xorNode, "Identifier" /* Identifier */);
+        parser_1.XorNodeUtils.assertIsNodeKind(xorNode, language_1.Ast.NodeKind.Identifier);
         let result;
-        if (parser_1.XorNodeUtils.isContextXor(xorNode)) {
+        if (parser_1.XorNodeUtils.isContext(xorNode)) {
             result = language_1.Type.UnknownInstance;
         }
         else {
             const dereferencedType = yield (0, common_1.dereferencedIdentifierType)(state, xorNode, trace.id);
             result = dereferencedType !== null && dereferencedType !== void 0 ? dereferencedType : language_1.Type.UnknownInstance;
         }
-        trace.exit({ ["Result" /* Result */]: __1.TraceUtils.createTypeDetails(result) });
+        trace.exit({ [trace_1.TraceConstant.Result]: __1.TraceUtils.typeDetails(result) });
         return result;
     });
 }

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

@@ -1 +1 @@
-{"version":3,"file":"inspectTypeIdentifier.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeIdentifier.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,0FAAwF;AAExF,sFAAmG;AAEnG,qCAAwE;AACxE,gCAA+D;AAE/D,SAAsB,qBAAqB,CACvC,KAAuB,EACvB,OAAiB,EACjB,aAAiC;;;QAEjC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,qBAAqB,CAAC,IAAI,EAC1B,aAAa,EACb,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,MAAA,KAAK,CAAC,iBAAiB,0CAAE,gBAAgB,EAAE,CAAC;QAC5C,qBAAY,CAAC,gBAAgB,CAAiB,OAAO,gCAA0B,CAAC;QAEhF,IAAI,MAA4B,CAAC;QAEjC,IAAI,qBAAY,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE;YACpC,MAAM,GAAG,eAAI,CAAC,eAAe,CAAC;SACjC;aAAM;YACH,MAAM,gBAAgB,GAAqC,MAAM,IAAA,mCAA0B,EACvF,KAAK,EACL,OAAO,EACP,KAAK,CAAC,EAAE,CACX,CAAC;YAEF,MAAM,GAAG,gBAAgB,aAAhB,gBAAgB,cAAhB,gBAAgB,GAAI,eAAI,CAAC,eAAe,CAAC;SACrD;QAED,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAE7E,OAAO,MAAM,CAAC;;CACjB;AAhCD,sDAgCC"}
+{"version":3,"file":"inspectTypeIdentifier.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeIdentifier.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,0FAAwF;AACxF,2FAAuG;AACvG,sFAAmG;AAEnG,qCAAwE;AACxE,gCAA+D;AAE/D,SAAsB,qBAAqB,CACvC,KAAuB,EACvB,OAAiB,EACjB,aAAiC;;;QAEjC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,CACzC,2BAAuB,CAAC,WAAW,EACnC,qBAAqB,CAAC,IAAI,EAC1B,aAAa,EACb,cAAU,CAAC,cAAc,CAAC,OAAO,CAAC,CACrC,CAAC;QAEF,MAAA,KAAK,CAAC,iBAAiB,0CAAE,gBAAgB,EAAE,CAAC;QAC5C,qBAAY,CAAC,gBAAgB,CAAiB,OAAO,EAAE,cAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;QAEhF,IAAI,MAA4B,CAAC;QAEjC,IAAI,qBAAY,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE;YACjC,MAAM,GAAG,eAAI,CAAC,eAAe,CAAC;SACjC;aAAM;YACH,MAAM,gBAAgB,GAAqC,MAAM,IAAA,mCAA0B,EACvF,KAAK,EACL,OAAO,EACP,KAAK,CAAC,EAAE,CACX,CAAC;YAEF,MAAM,GAAG,gBAAgB,aAAhB,gBAAgB,cAAhB,gBAAgB,GAAI,eAAI,CAAC,eAAe,CAAC;SACrD;QAED,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,qBAAa,CAAC,MAAM,CAAC,EAAE,cAAU,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAEvE,OAAO,MAAM,CAAC;;CACjB;AAhCD,sDAgCC"}

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

@@ -13,24 +13,25 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.inspectTypeIdentifierExpression = void 0;
 const language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
+const trace_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/common/trace");
 const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
 const common_1 = require("./common");
 const __1 = require("../../..");
 function inspectTypeIdentifierExpression(state, xorNode, correlationId) {
     var _a;
     return __awaiter(this, void 0, void 0, function* () {
-        const trace = state.traceManager.entry("Inspection.Type" /* InspectType */, inspectTypeIdentifierExpression.name, correlationId, __1.TraceUtils.createXorNodeDetails(xorNode));
+        const trace = state.traceManager.entry(__1.InspectionTraceConstant.InspectType, inspectTypeIdentifierExpression.name, correlationId, __1.TraceUtils.xorNodeDetails(xorNode));
         (_a = state.cancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
-        parser_1.XorNodeUtils.assertIsNodeKind(xorNode, "IdentifierExpression" /* IdentifierExpression */);
+        parser_1.XorNodeUtils.assertIsNodeKind(xorNode, language_1.Ast.NodeKind.IdentifierExpression);
         let result;
-        if (parser_1.XorNodeUtils.isContextXor(xorNode)) {
+        if (parser_1.XorNodeUtils.isContext(xorNode)) {
             result = language_1.Type.UnknownInstance;
         }
         else {
             const dereferencedType = yield (0, common_1.dereferencedIdentifierType)(state, xorNode, trace.id);
             result = dereferencedType !== null && dereferencedType !== void 0 ? dereferencedType : language_1.Type.UnknownInstance;
         }
-        trace.exit({ ["Result" /* Result */]: __1.TraceUtils.createTypeDetails(result) });
+        trace.exit({ [trace_1.TraceConstant.Result]: __1.TraceUtils.typeDetails(result) });
         return result;
     });
 }

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

@@ -1 +1 @@
-{"version":3,"file":"inspectTypeIdentifierExpression.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeIdentifierExpression.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,0FAAwF;AAExF,sFAAmG;AAEnG,qCAAwE;AACxE,gCAA+D;AAE/D,SAAsB,+BAA+B,CACjD,KAAuB,EACvB,OAAiB,EACjB,aAAiC;;;QAEjC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,+BAA+B,CAAC,IAAI,EACpC,aAAa,EACb,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,MAAA,KAAK,CAAC,iBAAiB,0CAAE,gBAAgB,EAAE,CAAC;QAC5C,qBAAY,CAAC,gBAAgB,CAA2B,OAAO,oDAAoC,CAAC;QAEpG,IAAI,MAA4B,CAAC;QAEjC,IAAI,qBAAY,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE;YACpC,MAAM,GAAG,eAAI,CAAC,eAAe,CAAC;SACjC;aAAM;YACH,MAAM,gBAAgB,GAAqC,MAAM,IAAA,mCAA0B,EACvF,KAAK,EACL,OAAO,EACP,KAAK,CAAC,EAAE,CACX,CAAC;YAEF,MAAM,GAAG,gBAAgB,aAAhB,gBAAgB,cAAhB,gBAAgB,GAAI,eAAI,CAAC,eAAe,CAAC;SACrD;QAED,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAE7E,OAAO,MAAM,CAAC;;CACjB;AAhCD,0EAgCC"}
+{"version":3,"file":"inspectTypeIdentifierExpression.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeIdentifierExpression.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,0FAAwF;AACxF,2FAAuG;AACvG,sFAAmG;AAEnG,qCAAwE;AACxE,gCAA+D;AAE/D,SAAsB,+BAA+B,CACjD,KAAuB,EACvB,OAAiB,EACjB,aAAiC;;;QAEjC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,CACzC,2BAAuB,CAAC,WAAW,EACnC,+BAA+B,CAAC,IAAI,EACpC,aAAa,EACb,cAAU,CAAC,cAAc,CAAC,OAAO,CAAC,CACrC,CAAC;QAEF,MAAA,KAAK,CAAC,iBAAiB,0CAAE,gBAAgB,EAAE,CAAC;QAC5C,qBAAY,CAAC,gBAAgB,CAA2B,OAAO,EAAE,cAAG,CAAC,QAAQ,CAAC,oBAAoB,CAAC,CAAC;QAEpG,IAAI,MAA4B,CAAC;QAEjC,IAAI,qBAAY,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE;YACjC,MAAM,GAAG,eAAI,CAAC,eAAe,CAAC;SACjC;aAAM;YACH,MAAM,gBAAgB,GAAqC,MAAM,IAAA,mCAA0B,EACvF,KAAK,EACL,OAAO,EACP,KAAK,CAAC,EAAE,CACX,CAAC;YAEF,MAAM,GAAG,gBAAgB,aAAhB,gBAAgB,cAAhB,gBAAgB,GAAI,eAAI,CAAC,eAAe,CAAC;SACrD;QAED,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,qBAAa,CAAC,MAAM,CAAC,EAAE,cAAU,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAEvE,OAAO,MAAM,CAAC;;CACjB;AAhCD,0EAgCC"}

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

@@ -13,47 +13,48 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.inspectTypeIfExpression = void 0;
 const language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
+const trace_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/common/trace");
 const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
 const common_1 = require("./common");
 const __1 = require("../../..");
 function inspectTypeIfExpression(state, xorNode, correlationId) {
     var _a;
     return __awaiter(this, void 0, void 0, function* () {
-        const trace = state.traceManager.entry("Inspection.Type" /* InspectType */, inspectTypeIfExpression.name, correlationId, __1.TraceUtils.createXorNodeDetails(xorNode));
+        const trace = state.traceManager.entry(__1.InspectionTraceConstant.InspectType, inspectTypeIfExpression.name, correlationId, __1.TraceUtils.xorNodeDetails(xorNode));
         (_a = state.cancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
-        parser_1.XorNodeUtils.assertIsNodeKind(xorNode, "IfExpression" /* IfExpression */);
+        parser_1.XorNodeUtils.assertIsNodeKind(xorNode, language_1.Ast.NodeKind.IfExpression);
         const conditionType = yield (0, common_1.inspectTypeFromChildAttributeIndex)(state, xorNode, 1, trace.id);
         let result;
-        if (conditionType.kind === "Unknown" /* Unknown */) {
+        if (conditionType.kind === language_1.Type.TypeKind.Unknown) {
             result = language_1.Type.UnknownInstance;
         }
         // Any is allowed so long as AnyUnion only contains Any or Logical.
-        else if (conditionType.kind === "Any" /* Any */) {
-            if (conditionType.extendedKind === "AnyUnion" /* AnyUnion */ &&
-                !(0, common_1.allForAnyUnion)(conditionType, (type) => type.kind === "Logical" /* Logical */ || type.kind === "Any" /* Any */)) {
+        else if (conditionType.kind === language_1.Type.TypeKind.Any) {
+            if (conditionType.extendedKind === language_1.Type.ExtendedTypeKind.AnyUnion &&
+                !(0, common_1.allForAnyUnion)(conditionType, (type) => type.kind === language_1.Type.TypeKind.Logical || type.kind === language_1.Type.TypeKind.Any)) {
                 result = language_1.Type.NoneInstance;
             }
             else {
                 result = yield createAnyUnion(state, xorNode, trace.id);
             }
         }
-        else if (conditionType.kind !== "Logical" /* Logical */) {
+        else if (conditionType.kind !== language_1.Type.TypeKind.Logical) {
             result = language_1.Type.NoneInstance;
         }
         else {
             result = yield createAnyUnion(state, xorNode, trace.id);
         }
-        trace.exit({ ["Result" /* Result */]: __1.TraceUtils.createTypeDetails(result) });
+        trace.exit({ [trace_1.TraceConstant.Result]: __1.TraceUtils.typeDetails(result) });
         return result;
     });
 }
 exports.inspectTypeIfExpression = inspectTypeIfExpression;
 function createAnyUnion(state, xorNode, correlationId) {
     return __awaiter(this, void 0, void 0, function* () {
-        const trace = state.traceManager.entry("Inspection.Type" /* InspectType */, createAnyUnion.name, correlationId, __1.TraceUtils.createXorNodeDetails(xorNode));
+        const trace = state.traceManager.entry(__1.InspectionTraceConstant.InspectType, createAnyUnion.name, correlationId, __1.TraceUtils.xorNodeDetails(xorNode));
         const trueExprType = yield (0, common_1.inspectTypeFromChildAttributeIndex)(state, xorNode, 3, trace.id);
         const falseExprType = yield (0, common_1.inspectTypeFromChildAttributeIndex)(state, xorNode, 5, trace.id);
-        const result = language_1.TypeUtils.createAnyUnion([trueExprType, falseExprType], state.traceManager, trace.id);
+        const result = language_1.TypeUtils.anyUnion([trueExprType, falseExprType], state.traceManager, trace.id);
         trace.exit();
         return result;
     });

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

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

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

@@ -15,6 +15,7 @@ exports.inspectTypeInvokeExpression = void 0;
 const powerquery_parser_1 = require("@microsoft/powerquery-parser");
 const language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
 const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
+const trace_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/common/trace");
 const externalType_1 = require("../../../externalType");
 const __1 = require("../../..");
 const common_1 = require("./common");
@@ -22,40 +23,40 @@ const deferenceIdentifier_1 = require("../../deferenceIdentifier");
 function inspectTypeInvokeExpression(state, xorNode, correlationId) {
     var _a;
     return __awaiter(this, void 0, void 0, function* () {
-        const trace = state.traceManager.entry("Inspection.Type" /* InspectType */, inspectTypeInvokeExpression.name, correlationId, __1.TraceUtils.createXorNodeDetails(xorNode));
+        const trace = state.traceManager.entry(__1.InspectionTraceConstant.InspectType, inspectTypeInvokeExpression.name, correlationId, __1.TraceUtils.xorNodeDetails(xorNode));
         (_a = state.cancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
-        parser_1.XorNodeUtils.assertIsNodeKind(xorNode, "InvokeExpression" /* InvokeExpression */);
+        parser_1.XorNodeUtils.assertIsNodeKind(xorNode, language_1.Ast.NodeKind.InvokeExpression);
         const request = yield externalInvokeRequest(state, xorNode, trace.id);
         if (request !== undefined) {
             const type = state.library.externalTypeResolver(request);
             if (type !== undefined) {
-                trace.exit({ ["Result" /* Result */]: __1.TraceUtils.createTypeDetails(type) });
+                trace.exit({ [trace_1.TraceConstant.Result]: __1.TraceUtils.typeDetails(type) });
                 return type;
             }
         }
         const previousSibling = parser_1.NodeIdMapUtils.assertRecursiveExpressionPreviousSibling(state.nodeIdMapCollection, xorNode.node.id);
         const previousSiblingType = yield (0, common_1.inspectXor)(state, previousSibling, trace.id);
         let result;
-        if (previousSiblingType.kind === "Any" /* Any */) {
+        if (previousSiblingType.kind === language_1.Type.TypeKind.Any) {
             result = language_1.Type.AnyInstance;
         }
-        else if (previousSiblingType.kind !== "Function" /* Function */) {
+        else if (previousSiblingType.kind !== language_1.Type.TypeKind.Function) {
             result = language_1.Type.NoneInstance;
         }
-        else if (previousSiblingType.extendedKind === "DefinedFunction" /* DefinedFunction */) {
+        else if (previousSiblingType.extendedKind === language_1.Type.ExtendedTypeKind.DefinedFunction) {
             result = previousSiblingType.returnType;
         }
         else {
             result = language_1.Type.AnyInstance;
         }
-        trace.exit({ ["Result" /* Result */]: __1.TraceUtils.createTypeDetails(result) });
+        trace.exit({ [trace_1.TraceConstant.Result]: __1.TraceUtils.typeDetails(result) });
         return result;
     });
 }
 exports.inspectTypeInvokeExpression = inspectTypeInvokeExpression;
 function externalInvokeRequest(state, xorNode, correlationId) {
     return __awaiter(this, void 0, void 0, function* () {
-        const trace = state.traceManager.entry("Inspection.Type" /* InspectType */, externalInvokeRequest.name, correlationId, __1.TraceUtils.createXorNodeDetails(xorNode));
+        const trace = state.traceManager.entry(__1.InspectionTraceConstant.InspectType, externalInvokeRequest.name, correlationId, __1.TraceUtils.xorNodeDetails(xorNode));
         const identifier = parser_1.NodeIdMapUtils.invokeExpressionIdentifier(state.nodeIdMapCollection, xorNode.node.id);
         if (identifier === undefined) {
             trace.exit();
@@ -67,11 +68,11 @@ function externalInvokeRequest(state, xorNode, correlationId) {
             return undefined;
         }
         const types = [];
-        for (const argument of parser_1.NodeIdMapIterator.iterInvokeExpression(state.nodeIdMapCollection, parser_1.XorNodeUtils.assertAsInvokeExpression(xorNode))) {
+        for (const argument of parser_1.NodeIdMapIterator.iterInvokeExpression(state.nodeIdMapCollection, parser_1.XorNodeUtils.assertAsNodeKind(xorNode, language_1.Ast.NodeKind.InvokeExpression))) {
             // eslint-disable-next-line no-await-in-loop
             types.push(yield (0, common_1.inspectXor)(state, argument, trace.id));
         }
-        const result = externalType_1.ExternalTypeUtils.createInvocationTypeRequest(powerquery_parser_1.Assert.asDefined(parser_1.XorNodeUtils.identifierExpressionLiteral(triedDeferencedIdentifier.value)), types);
+        const result = externalType_1.ExternalTypeUtils.invocationTypeRequest(powerquery_parser_1.Assert.asDefined(parser_1.XorNodeUtils.identifierExpressionLiteral(triedDeferencedIdentifier.value)), types);
         trace.exit();
         return result;
     });

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

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

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

@@ -13,35 +13,37 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.inspectTypeList = void 0;
 const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
+const trace_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/common/trace");
 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");
+const inspectionSettings_1 = require("../../../inspectionSettings");
 function inspectTypeList(state, xorNode, correlationId) {
     var _a;
     return __awaiter(this, void 0, void 0, function* () {
-        const trace = state.traceManager.entry("Inspection.Type" /* InspectType */, inspectTypeList.name, correlationId, __1.TraceUtils.createXorNodeDetails(xorNode));
+        const trace = state.traceManager.entry(__1.InspectionTraceConstant.InspectType, inspectTypeList.name, correlationId, __1.TraceUtils.xorNodeDetails(xorNode));
         let result;
         switch (state.typeStrategy) {
-            case "Extended" /* Extended */: {
+            case inspectionSettings_1.TypeStrategy.Extended: {
                 (_a = state.cancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
                 const items = parser_1.NodeIdMapIterator.iterListItems(state.nodeIdMapCollection, xorNode);
                 const elements = yield Promise.all(items.map((item) => (0, common_1.inspectXor)(state, item, trace.id)));
                 result = {
-                    kind: "List" /* List */,
+                    kind: language_1.Type.TypeKind.List,
                     isNullable: false,
-                    extendedKind: "DefinedList" /* DefinedList */,
+                    extendedKind: language_1.Type.ExtendedTypeKind.DefinedList,
                     elements,
                 };
                 break;
             }
-            case "Primitive" /* Primitive */:
+            case inspectionSettings_1.TypeStrategy.Primitive:
                 result = language_1.Type.ListInstance;
                 break;
             default:
                 powerquery_parser_1.Assert.isNever(state.typeStrategy);
         }
-        trace.exit({ ["Result" /* Result */]: __1.TraceUtils.createTypeDetails(result) });
+        trace.exit({ [trace_1.TraceConstant.Result]: __1.TraceUtils.typeDetails(result) });
         return result;
     });
 }

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

@@ -1 +1 @@
-{"version":3,"file":"inspectTypeList.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeList.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,sFAAwG;AAExG,oEAAsD;AACtD,0FAAmF;AAEnF,gCAA+D;AAC/D,qCAAwD;AAGxD,SAAsB,eAAe,CACjC,KAAuB,EACvB,OAAiB,EACjB,aAAiC;;;QAEjC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,eAAe,CAAC,IAAI,EACpB,aAAa,EACb,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,IAAI,MAAoC,CAAC;QAEzC,QAAQ,KAAK,CAAC,YAAY,EAAE;YACxB,8BAA0B,CAAC,CAAC;gBACxB,MAAA,KAAK,CAAC,iBAAiB,0CAAE,gBAAgB,EAAE,CAAC;gBAC5C,MAAM,KAAK,GAA4B,0BAAiB,CAAC,aAAa,CAAC,KAAK,CAAC,mBAAmB,EAAE,OAAO,CAAC,CAAC;gBAE3G,MAAM,QAAQ,GAAwC,MAAM,OAAO,CAAC,GAAG,CACnE,KAAK,CAAC,GAAG,CAAC,CAAC,IAAc,EAAE,EAAE,CAAC,IAAA,mBAAU,EAAC,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC,CACnE,CAAC;gBAEF,MAAM,GAAG;oBACL,IAAI,mBAAoB;oBACxB,UAAU,EAAE,KAAK;oBACjB,YAAY,iCAAmC;oBAC/C,QAAQ;iBACX,CAAC;gBAEF,MAAM;aACT;YAED;gBACI,MAAM,GAAG,eAAI,CAAC,YAAY,CAAC;gBAC3B,MAAM;YAEV;gBACI,0BAAM,CAAC,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;SAC1C;QAED,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAE7E,OAAO,MAAM,CAAC;;CACjB;AA5CD,0CA4CC"}
+{"version":3,"file":"inspectTypeList.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeList.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,sFAAwG;AACxG,2FAAuG;AACvG,oEAAsD;AACtD,0FAAmF;AAEnF,gCAA+D;AAC/D,qCAAwD;AACxD,oEAA2D;AAE3D,SAAsB,eAAe,CACjC,KAAuB,EACvB,OAAiB,EACjB,aAAiC;;;QAEjC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,CACzC,2BAAuB,CAAC,WAAW,EACnC,eAAe,CAAC,IAAI,EACpB,aAAa,EACb,cAAU,CAAC,cAAc,CAAC,OAAO,CAAC,CACrC,CAAC;QAEF,IAAI,MAAoC,CAAC;QAEzC,QAAQ,KAAK,CAAC,YAAY,EAAE;YACxB,KAAK,iCAAY,CAAC,QAAQ,CAAC,CAAC;gBACxB,MAAA,KAAK,CAAC,iBAAiB,0CAAE,gBAAgB,EAAE,CAAC;gBAC5C,MAAM,KAAK,GAA4B,0BAAiB,CAAC,aAAa,CAAC,KAAK,CAAC,mBAAmB,EAAE,OAAO,CAAC,CAAC;gBAE3G,MAAM,QAAQ,GAAwC,MAAM,OAAO,CAAC,GAAG,CACnE,KAAK,CAAC,GAAG,CAAC,CAAC,IAAc,EAAE,EAAE,CAAC,IAAA,mBAAU,EAAC,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC,CACnE,CAAC;gBAEF,MAAM,GAAG;oBACL,IAAI,EAAE,eAAI,CAAC,QAAQ,CAAC,IAAI;oBACxB,UAAU,EAAE,KAAK;oBACjB,YAAY,EAAE,eAAI,CAAC,gBAAgB,CAAC,WAAW;oBAC/C,QAAQ;iBACX,CAAC;gBAEF,MAAM;aACT;YAED,KAAK,iCAAY,CAAC,SAAS;gBACvB,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,CAAC,qBAAa,CAAC,MAAM,CAAC,EAAE,cAAU,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAEvE,OAAO,MAAM,CAAC;;CACjB;AA5CD,0CA4CC"}

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

@@ -14,40 +14,42 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.inspectTypeListType = 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 trace_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/common/trace");
 const powerquery_parser_1 = require("@microsoft/powerquery-parser");
 const __1 = require("../../..");
 const common_1 = require("./common");
+const inspectionSettings_1 = require("../../../inspectionSettings");
 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, correlationId, __1.TraceUtils.createXorNodeDetails(xorNode));
+        const trace = state.traceManager.entry(__1.InspectionTraceConstant.InspectType, inspectTypeListType.name, correlationId, __1.TraceUtils.xorNodeDetails(xorNode));
         (_a = state.cancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
-        parser_1.XorNodeUtils.assertIsNodeKind(xorNode, "ListType" /* ListType */);
+        parser_1.XorNodeUtils.assertIsNodeKind(xorNode, language_1.Ast.NodeKind.ListType);
         let result;
         switch (state.typeStrategy) {
-            case "Extended" /* Extended */: {
-                const listItem = parser_1.NodeIdMapUtils.nthChild(state.nodeIdMapCollection, xorNode.node.id, 1);
+            case inspectionSettings_1.TypeStrategy.Extended: {
+                const listItem = parser_1.NodeIdMapUtils.nthChildXor(state.nodeIdMapCollection, xorNode.node.id, 1);
                 if (listItem === undefined) {
                     result = language_1.Type.UnknownInstance;
                 }
                 else {
                     const itemType = yield (0, common_1.inspectXor)(state, listItem, trace.id);
                     result = {
-                        kind: "Type" /* Type */,
-                        extendedKind: "ListType" /* ListType */,
+                        kind: language_1.Type.TypeKind.Type,
+                        extendedKind: language_1.Type.ExtendedTypeKind.ListType,
                         isNullable: false,
                         itemType,
                     };
                 }
                 break;
             }
-            case "Primitive" /* Primitive */:
+            case inspectionSettings_1.TypeStrategy.Primitive:
                 result = language_1.Type.TypePrimitiveInstance;
                 break;
             default:
                 powerquery_parser_1.Assert.isNever(state.typeStrategy);
         }
-        trace.exit({ ["Result" /* Result */]: __1.TraceUtils.createTypeDetails(result) });
+        trace.exit({ [trace_1.TraceConstant.Result]: __1.TraceUtils.typeDetails(result) });
         return result;
     });
 }

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,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"}
+{"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;AACnH,2FAAuG;AACvG,oEAAsD;AAEtD,gCAA+D;AAC/D,qCAAwD;AACxD,oEAA2D;AAE3D,SAAsB,mBAAmB,CACrC,KAAuB,EACvB,OAAiB,EACjB,aAAiC;;;QAEjC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,CACzC,2BAAuB,CAAC,WAAW,EACnC,mBAAmB,CAAC,IAAI,EACxB,aAAa,EACb,cAAU,CAAC,cAAc,CAAC,OAAO,CAAC,CACrC,CAAC;QAEF,MAAA,KAAK,CAAC,iBAAiB,0CAAE,gBAAgB,EAAE,CAAC;QAC5C,qBAAY,CAAC,gBAAgB,CAAe,OAAO,EAAE,cAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAE5E,IAAI,MAAgD,CAAC;QAErD,QAAQ,KAAK,CAAC,YAAY,EAAE;YACxB,KAAK,iCAAY,CAAC,QAAQ,CAAC,CAAC;gBACxB,MAAM,QAAQ,GAAyB,uBAAc,CAAC,WAAW,CAC7D,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,EAAE,eAAI,CAAC,QAAQ,CAAC,IAAI;wBACxB,YAAY,EAAE,eAAI,CAAC,gBAAgB,CAAC,QAAQ;wBAC5C,UAAU,EAAE,KAAK;wBACjB,QAAQ;qBACX,CAAC;iBACL;gBAED,MAAM;aACT;YAED,KAAK,iCAAY,CAAC,SAAS;gBACvB,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,CAAC,qBAAa,CAAC,MAAM,CAAC,EAAE,cAAU,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAEvE,OAAO,MAAM,CAAC;;CACjB;AApDD,kDAoDC"}

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

@@ -4,40 +4,41 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.inspectTypeLiteralExpression = void 0;
 const language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
+const trace_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/common/trace");
 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, correlationId) {
-    const trace = state.traceManager.entry("Inspection.Type" /* InspectType */, inspectTypeLiteralExpression.name, correlationId, __1.TraceUtils.createXorNodeDetails(xorNode));
-    parser_1.XorNodeUtils.assertIsNodeKind(xorNode, "LiteralExpression" /* LiteralExpression */);
+    const trace = state.traceManager.entry(__1.InspectionTraceConstant.InspectType, inspectTypeLiteralExpression.name, correlationId, __1.TraceUtils.xorNodeDetails(xorNode));
+    parser_1.XorNodeUtils.assertIsNodeKind(xorNode, language_1.Ast.NodeKind.LiteralExpression);
     let literalExpression;
     let typeKind;
     let result;
     switch (xorNode.kind) {
-        case "Ast" /* Ast */: {
+        case parser_1.XorNodeKind.Ast: {
             // We already checked it's a Ast Literal Expression.
             literalExpression = xorNode.node;
             typeKind = language_1.TypeUtils.typeKindFromLiteralKind(literalExpression.literalKind);
             switch (typeKind) {
-                case "Number" /* Number */:
-                    result = language_1.TypeUtils.createNumberLiteral(false, literalExpression.literal);
+                case language_1.Type.TypeKind.Number:
+                    result = language_1.TypeUtils.numberLiteral(false, literalExpression.literal);
                     break;
-                case "Text" /* Text */:
-                    result = language_1.TypeUtils.createTextLiteral(false, literalExpression.literal);
+                case language_1.Type.TypeKind.Text:
+                    result = language_1.TypeUtils.textLiteral(false, literalExpression.literal);
                     break;
                 default:
-                    result = language_1.TypeUtils.createPrimitiveType(literalExpression.literalKind === "Null" /* Null */, typeKind);
+                    result = language_1.TypeUtils.primitiveType(literalExpression.literalKind === language_1.Ast.LiteralKind.Null, typeKind);
                     break;
             }
             break;
         }
-        case "Context" /* Context */:
+        case parser_1.XorNodeKind.Context:
             result = language_1.Type.UnknownInstance;
             break;
         default:
             throw powerquery_parser_1.Assert.isNever(xorNode);
     }
-    trace.exit({ ["Result" /* Result */]: __1.TraceUtils.createTypeDetails(result) });
+    trace.exit({ [trace_1.TraceConstant.Result]: __1.TraceUtils.typeDetails(result) });
     return result;
 }
 exports.inspectTypeLiteralExpression = inspectTypeLiteralExpression;

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,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"}
+{"version":3,"file":"inspectTypeLiteralExpression.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeLiteralExpression.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,0FAAmG;AACnG,2FAAuG;AACvG,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,CACzC,2BAAuB,CAAC,WAAW,EACnC,4BAA4B,CAAC,IAAI,EACjC,aAAa,EACb,cAAU,CAAC,cAAc,CAAC,OAAO,CAAC,CACrC,CAAC;IAEF,qBAAY,CAAC,gBAAgB,CAAwB,OAAO,EAAE,cAAG,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC;IAE9F,IAAI,iBAAoD,CAAC;IACzD,IAAI,QAAmC,CAAC;IACxC,IAAI,MAA4B,CAAC;IAEjC,QAAQ,OAAO,CAAC,IAAI,EAAE;QAClB,KAAK,oBAAW,CAAC,GAAG,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,KAAK,eAAI,CAAC,QAAQ,CAAC,MAAM;oBACrB,MAAM,GAAG,oBAAS,CAAC,aAAa,CAAC,KAAK,EAAE,iBAAiB,CAAC,OAAO,CAAC,CAAC;oBACnE,MAAM;gBAEV,KAAK,eAAI,CAAC,QAAQ,CAAC,IAAI;oBACnB,MAAM,GAAG,oBAAS,CAAC,WAAW,CAAC,KAAK,EAAE,iBAAiB,CAAC,OAAO,CAAC,CAAC;oBACjE,MAAM;gBAEV;oBACI,MAAM,GAAG,oBAAS,CAAC,aAAa,CAAC,iBAAiB,CAAC,WAAW,KAAK,cAAG,CAAC,WAAW,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;oBAEnG,MAAM;aACb;YAED,MAAM;SACT;QAED,KAAK,oBAAW,CAAC,OAAO;YACpB,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,CAAC,qBAAa,CAAC,MAAM,CAAC,EAAE,cAAU,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAEvE,OAAO,MAAM,CAAC;AAClB,CAAC;AArDD,oEAqDC"}

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

@@ -14,16 +14,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.inspectTypeNullCoalescingExpression = 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 trace_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/common/trace");
 const __1 = require("../../..");
 const common_1 = require("./common");
 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, correlationId, __1.TraceUtils.createXorNodeDetails(xorNode));
+        const trace = state.traceManager.entry(__1.InspectionTraceConstant.InspectType, inspectTypeNullCoalescingExpression.name, correlationId, __1.TraceUtils.xorNodeDetails(xorNode));
         (_a = state.cancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
-        parser_1.XorNodeUtils.assertIsNodeKind(xorNode, "NullCoalescingExpression" /* NullCoalescingExpression */);
+        parser_1.XorNodeUtils.assertIsNodeKind(xorNode, language_1.Ast.NodeKind.NullCoalescingExpression);
         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 */);
+        const nullCoalescingOperator = parser_1.NodeIdMapUtils.nthChildAstChecked(state.nodeIdMapCollection, xorNode.node.id, 1, language_1.Ast.NodeKind.Constant);
         let result;
         // '??' isn't present, treat it as an Expression.
         if (nullCoalescingOperator === undefined) {
@@ -31,14 +32,17 @@ function inspectTypeNullCoalescingExpression(state, xorNode, correlationId) {
         }
         else {
             const rightType = yield (0, common_1.inspectTypeFromChildAttributeIndex)(state, xorNode, 2, trace.id);
-            if (leftType.kind === "None" /* None */ || rightType.kind === "None" /* None */) {
+            if (leftType.kind === language_1.Type.TypeKind.None || rightType.kind === language_1.Type.TypeKind.None) {
                 result = language_1.Type.NoneInstance;
             }
+            else if (!leftType.isNullable) {
+                result = leftType;
+            }
             else {
-                result = language_1.TypeUtils.createAnyUnion([leftType, rightType], state.traceManager, trace.id);
+                result = language_1.TypeUtils.anyUnion([leftType, rightType], state.traceManager, trace.id);
             }
         }
-        trace.exit({ ["Result" /* Result */]: __1.TraceUtils.createTypeDetails(result) });
+        trace.exit({ [trace_1.TraceConstant.Result]: __1.TraceUtils.typeDetails(result) });
         return 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,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"}
+{"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;AACnH,2FAAuG;AAEvG,gCAA+D;AAC/D,qCAAgF;AAEhF,SAAsB,mCAAmC,CACrD,KAAuB,EACvB,OAAiB,EACjB,aAAiC;;;QAEjC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,CACzC,2BAAuB,CAAC,WAAW,EACnC,mCAAmC,CAAC,IAAI,EACxC,aAAa,EACb,cAAU,CAAC,cAAc,CAAC,OAAO,CAAC,CACrC,CAAC;QAEF,MAAA,KAAK,CAAC,iBAAiB,0CAAE,gBAAgB,EAAE,CAAC;QAC5C,qBAAY,CAAC,gBAAgB,CAA+B,OAAO,EAAE,cAAG,CAAC,QAAQ,CAAC,wBAAwB,CAAC,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,kBAAkB,CACvF,KAAK,CAAC,mBAAmB,EACzB,OAAO,CAAC,IAAI,CAAC,EAAE,EACf,CAAC,EACD,cAAG,CAAC,QAAQ,CAAC,QAAQ,CACxB,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,KAAK,eAAI,CAAC,QAAQ,CAAC,IAAI,IAAI,SAAS,CAAC,IAAI,KAAK,eAAI,CAAC,QAAQ,CAAC,IAAI,EAAE;gBAC/E,MAAM,GAAG,eAAI,CAAC,YAAY,CAAC;aAC9B;iBAAM,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE;gBAC7B,MAAM,GAAG,QAAQ,CAAC;aACrB;iBAAM;gBACH,MAAM,GAAG,oBAAS,CAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE,SAAS,CAAC,EAAE,KAAK,CAAC,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;aACpF;SACJ;QAED,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,qBAAa,CAAC,MAAM,CAAC,EAAE,cAAU,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAEvE,OAAO,MAAM,CAAC;;CACjB;AA5CD,kFA4CC"}