@microsoft/powerquery-language-services 0.3.23 → 0.3.26

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

@@ -13,21 +13,34 @@ 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 powerquery_parser_1 = require("@microsoft/powerquery-parser");
+const language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
 const __1 = require("../../..");
 const common_1 = require("./common");
 function inspectTypeList(state, xorNode, maybeCorrelationId) {
     var _a;
     return __awaiter(this, void 0, void 0, function* () {
         const trace = state.traceManager.entry("Inspection.Type" /* InspectType */, inspectTypeList.name, maybeCorrelationId, __1.TraceUtils.createXorNodeDetails(xorNode));
-        (_a = state.maybeCancellationToken) === 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)));
-        const result = {
-            kind: "List" /* List */,
-            isNullable: false,
-            maybeExtendedKind: "DefinedList" /* DefinedList */,
-            elements,
-        };
+        let result;
+        switch (state.typeStrategy) {
+            case "Extended" /* Extended */: {
+                (_a = state.maybeCancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
+                const items = parser_1.NodeIdMapIterator.iterListItems(state.nodeIdMapCollection, xorNode);
+                const elements = yield Promise.all(items.map((item) => (0, common_1.inspectXor)(state, item, trace.id)));
+                result = {
+                    kind: "List" /* List */,
+                    isNullable: false,
+                    maybeExtendedKind: "DefinedList" /* DefinedList */,
+                    elements,
+                };
+                break;
+            }
+            case "Primitive" /* Primitive */:
+                result = language_1.Type.ListInstance;
+                break;
+            default:
+                powerquery_parser_1.Assert.isNever(state.typeStrategy);
+        }
         trace.exit({ ["Result" /* Result */]: __1.TraceUtils.createTypeDetails(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;AAIxG,gCAA+D;AAC/D,qCAAwD;AAExD,SAAsB,eAAe,CACjC,KAAuB,EACvB,OAAiB,EACjB,kBAAsC;;;QAEtC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,eAAe,CAAC,IAAI,EACpB,kBAAkB,EAClB,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,MAAA,KAAK,CAAC,sBAAsB,0CAAE,gBAAgB,EAAE,CAAC;QACjD,MAAM,KAAK,GAA4B,0BAAiB,CAAC,aAAa,CAAC,KAAK,CAAC,mBAAmB,EAAE,OAAO,CAAC,CAAC;QAE3G,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;QAEF,MAAM,MAAM,GAAyB;YACjC,IAAI,mBAAoB;YACxB,UAAU,EAAE,KAAK;YACjB,iBAAiB,iCAAmC;YACpD,QAAQ;SACX,CAAC;QAEF,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAE7E,OAAO,MAAM,CAAC;;CACjB;AA7BD,0CA6BC"}
+{"version":3,"file":"inspectTypeList.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeList.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,sFAAwG;AAExG,oEAAsD;AACtD,0FAAmF;AAEnF,gCAA+D;AAC/D,qCAAwD;AAGxD,SAAsB,eAAe,CACjC,KAAuB,EACvB,OAAiB,EACjB,kBAAsC;;;QAEtC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,eAAe,CAAC,IAAI,EACpB,kBAAkB,EAClB,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,IAAI,MAAoC,CAAC;QAEzC,QAAQ,KAAK,CAAC,YAAY,EAAE;YACxB,8BAA0B,CAAC,CAAC;gBACxB,MAAA,KAAK,CAAC,sBAAsB,0CAAE,gBAAgB,EAAE,CAAC;gBACjD,MAAM,KAAK,GAA4B,0BAAiB,CAAC,aAAa,CAAC,KAAK,CAAC,mBAAmB,EAAE,OAAO,CAAC,CAAC;gBAE3G,MAAM,QAAQ,GAAwC,MAAM,OAAO,CAAC,GAAG,CACnE,KAAK,CAAC,GAAG,CAAC,CAAC,IAAc,EAAE,EAAE,CAAC,IAAA,mBAAU,EAAC,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC,CACnE,CAAC;gBAEF,MAAM,GAAG;oBACL,IAAI,mBAAoB;oBACxB,UAAU,EAAE,KAAK;oBACjB,iBAAiB,iCAAmC;oBACpD,QAAQ;iBACX,CAAC;gBAEF,MAAM;aACT;YAED;gBACI,MAAM,GAAG,eAAI,CAAC,YAAY,CAAC;gBAC3B,MAAM;YAEV;gBACI,0BAAM,CAAC,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;SAC1C;QAED,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAE7E,OAAO,MAAM,CAAC;;CACjB;AA5CD,0CA4CC"}

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

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

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

@@ -14,6 +14,7 @@ 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 powerquery_parser_1 = require("@microsoft/powerquery-parser");
 const __1 = require("../../..");
 const common_1 = require("./common");
 function inspectTypeListType(state, xorNode, maybeCorrelationId) {
@@ -22,19 +23,29 @@ function inspectTypeListType(state, xorNode, maybeCorrelationId) {
         const trace = state.traceManager.entry("Inspection.Type" /* InspectType */, inspectTypeListType.name, maybeCorrelationId, __1.TraceUtils.createXorNodeDetails(xorNode));
         (_a = state.maybeCancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
         parser_1.XorNodeUtils.assertIsNodeKind(xorNode, "ListType" /* ListType */);
-        const maybeListItem = parser_1.NodeIdMapUtils.maybeNthChild(state.nodeIdMapCollection, xorNode.node.id, 1);
         let result;
-        if (maybeListItem === undefined) {
-            result = language_1.Type.UnknownInstance;
-        }
-        else {
-            const itemType = yield (0, common_1.inspectXor)(state, maybeListItem, trace.id);
-            result = {
-                kind: "Type" /* Type */,
-                maybeExtendedKind: "ListType" /* ListType */,
-                isNullable: false,
-                itemType,
-            };
+        switch (state.typeStrategy) {
+            case "Extended" /* Extended */: {
+                const maybeListItem = parser_1.NodeIdMapUtils.maybeNthChild(state.nodeIdMapCollection, xorNode.node.id, 1);
+                if (maybeListItem === undefined) {
+                    result = language_1.Type.UnknownInstance;
+                }
+                else {
+                    const itemType = yield (0, common_1.inspectXor)(state, maybeListItem, trace.id);
+                    result = {
+                        kind: "Type" /* Type */,
+                        maybeExtendedKind: "ListType" /* ListType */,
+                        isNullable: false,
+                        itemType,
+                    };
+                }
+                break;
+            }
+            case "Primitive" /* Primitive */:
+                result = language_1.Type.TypePrimitiveInstance;
+                break;
+            default:
+                powerquery_parser_1.Assert.isNever(state.typeStrategy);
         }
         trace.exit({ ["Result" /* Result */]: __1.TraceUtils.createTypeDetails(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;AAGnH,gCAA+D;AAC/D,qCAAwD;AAExD,SAAsB,mBAAmB,CACrC,KAAuB,EACvB,OAAiB,EACjB,kBAAsC;;;QAEtC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,mBAAmB,CAAC,IAAI,EACxB,kBAAkB,EAClB,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,MAAA,KAAK,CAAC,sBAAsB,0CAAE,gBAAgB,EAAE,CAAC;QACjD,qBAAY,CAAC,gBAAgB,CAAe,OAAO,4BAAwB,CAAC;QAE5E,MAAM,aAAa,GAAyB,uBAAc,CAAC,aAAa,CACpE,KAAK,CAAC,mBAAmB,EACzB,OAAO,CAAC,IAAI,CAAC,EAAE,EACf,CAAC,CACJ,CAAC;QAEF,IAAI,MAA4B,CAAC;QAEjC,IAAI,aAAa,KAAK,SAAS,EAAE;YAC7B,MAAM,GAAG,eAAI,CAAC,eAAe,CAAC;SACjC;aAAM;YACH,MAAM,QAAQ,GAAyB,MAAM,IAAA,mBAAU,EAAC,KAAK,EAAE,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;YAExF,MAAM,GAAG;gBACL,IAAI,mBAAoB;gBACxB,iBAAiB,2BAAgC;gBACjD,UAAU,EAAE,KAAK;gBACjB,QAAQ;aACX,CAAC;SACL;QAED,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAE7E,OAAO,MAAM,CAAC;;CACjB;AAvCD,kDAuCC"}
+{"version":3,"file":"inspectTypeListType.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeListType.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,0FAAwF;AACxF,sFAAmH;AAEnH,oEAAsD;AAEtD,gCAA+D;AAC/D,qCAAwD;AAGxD,SAAsB,mBAAmB,CACrC,KAAuB,EACvB,OAAiB,EACjB,kBAAsC;;;QAEtC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,mBAAmB,CAAC,IAAI,EACxB,kBAAkB,EAClB,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,MAAA,KAAK,CAAC,sBAAsB,0CAAE,gBAAgB,EAAE,CAAC;QACjD,qBAAY,CAAC,gBAAgB,CAAe,OAAO,4BAAwB,CAAC;QAE5E,IAAI,MAAgD,CAAC;QAErD,QAAQ,KAAK,CAAC,YAAY,EAAE;YACxB,8BAA0B,CAAC,CAAC;gBACxB,MAAM,aAAa,GAAyB,uBAAc,CAAC,aAAa,CACpE,KAAK,CAAC,mBAAmB,EACzB,OAAO,CAAC,IAAI,CAAC,EAAE,EACf,CAAC,CACJ,CAAC;gBAEF,IAAI,aAAa,KAAK,SAAS,EAAE;oBAC7B,MAAM,GAAG,eAAI,CAAC,eAAe,CAAC;iBACjC;qBAAM;oBACH,MAAM,QAAQ,GAAyB,MAAM,IAAA,mBAAU,EAAC,KAAK,EAAE,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;oBAExF,MAAM,GAAG;wBACL,IAAI,mBAAoB;wBACxB,iBAAiB,2BAAgC;wBACjD,UAAU,EAAE,KAAK;wBACjB,QAAQ;qBACX,CAAC;iBACL;gBAED,MAAM;aACT;YAED;gBACI,MAAM,GAAG,eAAI,CAAC,qBAAqB,CAAC;gBACpC,MAAM;YAEV;gBACI,0BAAM,CAAC,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;SAC1C;QAED,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAE7E,OAAO,MAAM,CAAC;;CACjB;AApDD,kDAoDC"}

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

@@ -16,35 +16,46 @@ const language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/l
 const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
 const __1 = require("../../..");
 const common_1 = require("./common");
+const powerquery_parser_1 = require("@microsoft/powerquery-parser");
 function inspectTypeRangeExpression(state, xorNode, maybeCorrelationId) {
     var _a;
     return __awaiter(this, void 0, void 0, function* () {
         const trace = state.traceManager.entry("Inspection.Type" /* InspectType */, inspectTypeRangeExpression.name, maybeCorrelationId, __1.TraceUtils.createXorNodeDetails(xorNode));
         (_a = state.maybeCancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
         parser_1.XorNodeUtils.assertIsNodeKind(xorNode, "RangeExpression" /* RangeExpression */);
-        const maybeLeftType = yield (0, common_1.inspectTypeFromChildAttributeIndex)(state, xorNode, 0, trace.id);
-        const maybeRightType = yield (0, common_1.inspectTypeFromChildAttributeIndex)(state, xorNode, 2, trace.id);
         let result;
-        if (maybeLeftType === undefined || maybeRightType === undefined) {
-            result = language_1.Type.UnknownInstance;
-        }
-        else if (maybeLeftType.kind === "Number" /* Number */ && maybeRightType.kind === "Number" /* Number */) {
-            // TODO: handle isNullable better
-            if (maybeLeftType.isNullable === true || maybeRightType.isNullable === true) {
-                result = language_1.Type.NoneInstance;
-            }
-            else {
-                result = language_1.TypeUtils.createPrimitiveType(maybeLeftType.isNullable, maybeLeftType.kind);
+        switch (state.typeStrategy) {
+            case "Extended" /* Extended */: {
+                const maybeLeftType = yield (0, common_1.inspectTypeFromChildAttributeIndex)(state, xorNode, 0, trace.id);
+                const maybeRightType = yield (0, common_1.inspectTypeFromChildAttributeIndex)(state, xorNode, 2, trace.id);
+                if (maybeLeftType === undefined || maybeRightType === undefined) {
+                    result = language_1.Type.UnknownInstance;
+                }
+                else if (maybeLeftType.kind === "Number" /* Number */ && maybeRightType.kind === "Number" /* Number */) {
+                    // TODO: handle isNullable better
+                    if (maybeLeftType.isNullable === true || maybeRightType.isNullable === true) {
+                        result = language_1.Type.NoneInstance;
+                    }
+                    else {
+                        result = language_1.Type.ListInstance;
+                    }
+                }
+                else if (maybeLeftType.kind === "None" /* None */ || maybeRightType.kind === "None" /* None */) {
+                    result = language_1.Type.NoneInstance;
+                }
+                else if (maybeLeftType.kind === "Unknown" /* Unknown */ || maybeRightType.kind === "Unknown" /* Unknown */) {
+                    result = language_1.Type.UnknownInstance;
+                }
+                else {
+                    result = language_1.Type.NoneInstance;
+                }
+                break;
             }
-        }
-        else if (maybeLeftType.kind === "None" /* None */ || maybeRightType.kind === "None" /* None */) {
-            result = language_1.Type.NoneInstance;
-        }
-        else if (maybeLeftType.kind === "Unknown" /* Unknown */ || maybeRightType.kind === "Unknown" /* Unknown */) {
-            result = language_1.Type.UnknownInstance;
-        }
-        else {
-            result = language_1.Type.NoneInstance;
+            case "Primitive" /* Primitive */:
+                result = language_1.Type.ListInstance;
+                break;
+            default:
+                powerquery_parser_1.Assert.isNever(state.typeStrategy);
         }
         trace.exit({ ["Result" /* Result */]: __1.TraceUtils.createTypeDetails(result) });
         return result;

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

@@ -1 +1 @@
-{"version":3,"file":"inspectTypeRangeExpression.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeRangeExpression.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,0FAAmG;AAEnG,sFAAmG;AAEnG,gCAA+D;AAC/D,qCAAgF;AAEhF,SAAsB,0BAA0B,CAC5C,KAAuB,EACvB,OAAiB,EACjB,kBAAsC;;;QAEtC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,0BAA0B,CAAC,IAAI,EAC/B,kBAAkB,EAClB,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,MAAA,KAAK,CAAC,sBAAsB,0CAAE,gBAAgB,EAAE,CAAC;QACjD,qBAAY,CAAC,gBAAgB,CAAsB,OAAO,0CAA+B,CAAC;QAE1F,MAAM,aAAa,GAAqC,MAAM,IAAA,2CAAkC,EAC5F,KAAK,EACL,OAAO,EACP,CAAC,EACD,KAAK,CAAC,EAAE,CACX,CAAC;QAEF,MAAM,cAAc,GAAqC,MAAM,IAAA,2CAAkC,EAC7F,KAAK,EACL,OAAO,EACP,CAAC,EACD,KAAK,CAAC,EAAE,CACX,CAAC;QAEF,IAAI,MAA4B,CAAC;QAEjC,IAAI,aAAa,KAAK,SAAS,IAAI,cAAc,KAAK,SAAS,EAAE;YAC7D,MAAM,GAAG,eAAI,CAAC,eAAe,CAAC;SACjC;aAAM,IAAI,aAAa,CAAC,IAAI,0BAAyB,IAAI,cAAc,CAAC,IAAI,0BAAyB,EAAE;YACpG,iCAAiC;YACjC,IAAI,aAAa,CAAC,UAAU,KAAK,IAAI,IAAI,cAAc,CAAC,UAAU,KAAK,IAAI,EAAE;gBACzE,MAAM,GAAG,eAAI,CAAC,YAAY,CAAC;aAC9B;iBAAM;gBACH,MAAM,GAAG,oBAAS,CAAC,mBAAmB,CAAC,aAAa,CAAC,UAAU,EAAE,aAAa,CAAC,IAAI,CAAC,CAAC;aACxF;SACJ;aAAM,IAAI,aAAa,CAAC,IAAI,sBAAuB,IAAI,cAAc,CAAC,IAAI,sBAAuB,EAAE;YAChG,MAAM,GAAG,eAAI,CAAC,YAAY,CAAC;SAC9B;aAAM,IAAI,aAAa,CAAC,IAAI,4BAA0B,IAAI,cAAc,CAAC,IAAI,4BAA0B,EAAE;YACtG,MAAM,GAAG,eAAI,CAAC,eAAe,CAAC;SACjC;aAAM;YACH,MAAM,GAAG,eAAI,CAAC,YAAY,CAAC;SAC9B;QAED,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAE7E,OAAO,MAAM,CAAC;;CACjB;AAnDD,gEAmDC"}
+{"version":3,"file":"inspectTypeRangeExpression.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeRangeExpression.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,0FAAwF;AAExF,sFAAmG;AAEnG,gCAA+D;AAC/D,qCAAgF;AAChF,oEAAsD;AAGtD,SAAsB,0BAA0B,CAC5C,KAAuB,EACvB,OAAiB,EACjB,kBAAsC;;;QAEtC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,0BAA0B,CAAC,IAAI,EAC/B,kBAAkB,EAClB,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,MAAA,KAAK,CAAC,sBAAsB,0CAAE,gBAAgB,EAAE,CAAC;QACjD,qBAAY,CAAC,gBAAgB,CAAsB,OAAO,0CAA+B,CAAC;QAE1F,IAAI,MAA4C,CAAC;QAEjD,QAAQ,KAAK,CAAC,YAAY,EAAE;YACxB,8BAA0B,CAAC,CAAC;gBACxB,MAAM,aAAa,GAAqC,MAAM,IAAA,2CAAkC,EAC5F,KAAK,EACL,OAAO,EACP,CAAC,EACD,KAAK,CAAC,EAAE,CACX,CAAC;gBAEF,MAAM,cAAc,GAAqC,MAAM,IAAA,2CAAkC,EAC7F,KAAK,EACL,OAAO,EACP,CAAC,EACD,KAAK,CAAC,EAAE,CACX,CAAC;gBAEF,IAAI,aAAa,KAAK,SAAS,IAAI,cAAc,KAAK,SAAS,EAAE;oBAC7D,MAAM,GAAG,eAAI,CAAC,eAAe,CAAC;iBACjC;qBAAM,IAAI,aAAa,CAAC,IAAI,0BAAyB,IAAI,cAAc,CAAC,IAAI,0BAAyB,EAAE;oBACpG,iCAAiC;oBACjC,IAAI,aAAa,CAAC,UAAU,KAAK,IAAI,IAAI,cAAc,CAAC,UAAU,KAAK,IAAI,EAAE;wBACzE,MAAM,GAAG,eAAI,CAAC,YAAY,CAAC;qBAC9B;yBAAM;wBACH,MAAM,GAAG,eAAI,CAAC,YAAY,CAAC;qBAC9B;iBACJ;qBAAM,IAAI,aAAa,CAAC,IAAI,sBAAuB,IAAI,cAAc,CAAC,IAAI,sBAAuB,EAAE;oBAChG,MAAM,GAAG,eAAI,CAAC,YAAY,CAAC;iBAC9B;qBAAM,IAAI,aAAa,CAAC,IAAI,4BAA0B,IAAI,cAAc,CAAC,IAAI,4BAA0B,EAAE;oBACtG,MAAM,GAAG,eAAI,CAAC,eAAe,CAAC;iBACjC;qBAAM;oBACH,MAAM,GAAG,eAAI,CAAC,YAAY,CAAC;iBAC9B;gBAED,MAAM;aACT;YAED;gBACI,MAAM,GAAG,eAAI,CAAC,YAAY,CAAC;gBAC3B,MAAM;YAEV;gBACI,0BAAM,CAAC,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;SAC1C;QAED,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAE7E,OAAO,MAAM,CAAC;;CACjB;AAhED,gEAgEC"}

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

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

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

@@ -13,6 +13,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.inspectTypeRecord = void 0;
 const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
+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");
@@ -22,23 +23,34 @@ function inspectTypeRecord(state, xorNode, maybeCorrelationId) {
         const trace = state.traceManager.entry("Inspection.Type" /* InspectType */, inspectTypeRecord.name, maybeCorrelationId, __1.TraceUtils.createXorNodeDetails(xorNode));
         (_a = state.maybeCancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
         parser_1.XorNodeUtils.assertIsRecord(xorNode);
-        const fields = new Map();
-        for (const keyValuePair of parser_1.NodeIdMapIterator.iterRecord(state.nodeIdMapCollection, xorNode)) {
-            if (keyValuePair.maybeValue) {
-                // eslint-disable-next-line no-await-in-loop
-                fields.set(keyValuePair.keyLiteral, yield (0, common_1.inspectXor)(state, keyValuePair.maybeValue, trace.id));
-            }
-            else {
-                fields.set(keyValuePair.keyLiteral, language_1.Type.UnknownInstance);
+        let result;
+        switch (state.typeStrategy) {
+            case "Extended" /* Extended */: {
+                const fields = new Map();
+                for (const keyValuePair of parser_1.NodeIdMapIterator.iterRecord(state.nodeIdMapCollection, xorNode)) {
+                    if (keyValuePair.maybeValue) {
+                        // eslint-disable-next-line no-await-in-loop
+                        fields.set(keyValuePair.keyLiteral, yield (0, common_1.inspectXor)(state, keyValuePair.maybeValue, trace.id));
+                    }
+                    else {
+                        fields.set(keyValuePair.keyLiteral, language_1.Type.UnknownInstance);
+                    }
+                }
+                result = {
+                    kind: "Record" /* Record */,
+                    maybeExtendedKind: "DefinedRecord" /* DefinedRecord */,
+                    isNullable: false,
+                    fields,
+                    isOpen: false,
+                };
+                break;
             }
+            case "Primitive" /* Primitive */:
+                result = language_1.Type.RecordInstance;
+                break;
+            default:
+                throw powerquery_parser_1.Assert.isNever(state.typeStrategy);
         }
-        const result = {
-            kind: "Record" /* Record */,
-            maybeExtendedKind: "DefinedRecord" /* DefinedRecord */,
-            isNullable: false,
-            fields,
-            isOpen: false,
-        };
         trace.exit({ ["Result" /* Result */]: __1.TraceUtils.createTypeDetails(result) });
         return result;
     });

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

@@ -1 +1 @@
-{"version":3,"file":"inspectTypeRecord.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeRecord.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,sFAAsH;AAEtH,0FAAmF;AAEnF,gCAA+D;AAC/D,qCAAwD;AAExD,SAAsB,iBAAiB,CACnC,KAAuB,EACvB,OAAiB,EACjB,kBAAsC;;;QAEtC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,iBAAiB,CAAC,IAAI,EACtB,kBAAkB,EAClB,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,MAAA,KAAK,CAAC,sBAAsB,0CAAE,gBAAgB,EAAE,CAAC;QACjD,qBAAY,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QAErC,MAAM,MAAM,GAAsC,IAAI,GAAG,EAAE,CAAC;QAE5D,KAAK,MAAM,YAAY,IAAI,0BAAiB,CAAC,UAAU,CAAC,KAAK,CAAC,mBAAmB,EAAE,OAAO,CAAC,EAAE;YACzF,IAAI,YAAY,CAAC,UAAU,EAAE;gBACzB,4CAA4C;gBAC5C,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,UAAU,EAAE,MAAM,IAAA,mBAAU,EAAC,KAAK,EAAE,YAAY,CAAC,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;aACnG;iBAAM;gBACH,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,UAAU,EAAE,eAAI,CAAC,eAAe,CAAC,CAAC;aAC7D;SACJ;QAED,MAAM,MAAM,GAAyB;YACjC,IAAI,uBAAsB;YAC1B,iBAAiB,qCAAqC;YACtD,UAAU,EAAE,KAAK;YACjB,MAAM;YACN,MAAM,EAAE,KAAK;SAChB,CAAC;QAEF,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAE7E,OAAO,MAAM,CAAC;;CACjB;AArCD,8CAqCC"}
+{"version":3,"file":"inspectTypeRecord.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeRecord.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,sFAAsH;AAEtH,oEAAsD;AACtD,0FAAmF;AAEnF,gCAA+D;AAC/D,qCAAwD;AAGxD,SAAsB,iBAAiB,CACnC,KAAuB,EACvB,OAAiB,EACjB,kBAAsC;;;QAEtC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,iBAAiB,CAAC,IAAI,EACtB,kBAAkB,EAClB,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,MAAA,KAAK,CAAC,sBAAsB,0CAAE,gBAAgB,EAAE,CAAC;QACjD,qBAAY,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QACrC,IAAI,MAAwC,CAAC;QAE7C,QAAQ,KAAK,CAAC,YAAY,EAAE;YACxB,8BAA0B,CAAC,CAAC;gBACxB,MAAM,MAAM,GAAsC,IAAI,GAAG,EAAE,CAAC;gBAE5D,KAAK,MAAM,YAAY,IAAI,0BAAiB,CAAC,UAAU,CAAC,KAAK,CAAC,mBAAmB,EAAE,OAAO,CAAC,EAAE;oBACzF,IAAI,YAAY,CAAC,UAAU,EAAE;wBACzB,4CAA4C;wBAC5C,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,UAAU,EAAE,MAAM,IAAA,mBAAU,EAAC,KAAK,EAAE,YAAY,CAAC,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;qBACnG;yBAAM;wBACH,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,UAAU,EAAE,eAAI,CAAC,eAAe,CAAC,CAAC;qBAC7D;iBACJ;gBAED,MAAM,GAAG;oBACL,IAAI,uBAAsB;oBAC1B,iBAAiB,qCAAqC;oBACtD,UAAU,EAAE,KAAK;oBACjB,MAAM;oBACN,MAAM,EAAE,KAAK;iBAChB,CAAC;gBAEF,MAAM;aACT;YAED;gBACI,MAAM,GAAG,eAAI,CAAC,cAAc,CAAC;gBAC7B,MAAM;YAEV;gBACI,MAAM,0BAAM,CAAC,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;SAChD;QAED,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAE7E,OAAO,MAAM,CAAC;;CACjB;AAnDD,8CAmDC"}

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

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

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

@@ -14,6 +14,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.inspectTypeRecordType = 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 powerquery_parser_1 = require("@microsoft/powerquery-parser");
 const __1 = require("../../..");
 const examineFieldSpecificationList_1 = require("./examineFieldSpecificationList");
 function inspectTypeRecordType(state, xorNode, maybeCorrelationId) {
@@ -22,13 +23,23 @@ function inspectTypeRecordType(state, xorNode, maybeCorrelationId) {
         const trace = state.traceManager.entry("Inspection.Type" /* InspectType */, inspectTypeRecordType.name, maybeCorrelationId, __1.TraceUtils.createXorNodeDetails(xorNode));
         (_a = state.maybeCancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
         parser_1.XorNodeUtils.assertIsNodeKind(xorNode, "RecordType" /* RecordType */);
-        const maybeFields = parser_1.NodeIdMapUtils.maybeNthChildChecked(state.nodeIdMapCollection, xorNode.node.id, 0, "FieldSpecificationList" /* FieldSpecificationList */);
         let result;
-        if (maybeFields === undefined) {
-            result = language_1.Type.UnknownInstance;
-        }
-        else {
-            result = Object.assign({ kind: "Type" /* Type */, maybeExtendedKind: "RecordType" /* RecordType */, isNullable: false }, (yield (0, examineFieldSpecificationList_1.examineFieldSpecificationList)(state, maybeFields, trace.id)));
+        switch (state.typeStrategy) {
+            case "Extended" /* Extended */: {
+                const maybeFields = parser_1.NodeIdMapUtils.maybeNthChildChecked(state.nodeIdMapCollection, xorNode.node.id, 0, "FieldSpecificationList" /* FieldSpecificationList */);
+                if (maybeFields === undefined) {
+                    result = language_1.Type.UnknownInstance;
+                }
+                else {
+                    result = Object.assign({ kind: "Type" /* Type */, maybeExtendedKind: "RecordType" /* RecordType */, isNullable: false }, (yield (0, examineFieldSpecificationList_1.examineFieldSpecificationList)(state, maybeFields, trace.id)));
+                }
+                break;
+            }
+            case "Primitive" /* Primitive */:
+                result = language_1.Type.TypePrimitiveInstance;
+                break;
+            default:
+                powerquery_parser_1.Assert.isNever(state.typeStrategy);
         }
         trace.exit({ ["Result" /* Result */]: __1.TraceUtils.createTypeDetails(result) });
         return result;

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

@@ -1 +1 @@
-{"version":3,"file":"inspectTypeRecordType.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeRecordType.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,0FAAwF;AACxF,sFAAmH;AAGnH,gCAA+D;AAC/D,mFAAgF;AAGhF,SAAsB,qBAAqB,CACvC,KAAuB,EACvB,OAAiB,EACjB,kBAAsC;;;QAEtC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,qBAAqB,CAAC,IAAI,EAC1B,kBAAkB,EAClB,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,MAAA,KAAK,CAAC,sBAAsB,0CAAE,gBAAgB,EAAE,CAAC;QACjD,qBAAY,CAAC,gBAAgB,CAAiB,OAAO,gCAA0B,CAAC;QAEhF,MAAM,WAAW,GAAyB,uBAAc,CAAC,oBAAoB,CACzE,KAAK,CAAC,mBAAmB,EACzB,OAAO,CAAC,IAAI,CAAC,EAAE,EACf,CAAC,wDAEJ,CAAC;QAEF,IAAI,MAA4B,CAAC;QAEjC,IAAI,WAAW,KAAK,SAAS,EAAE;YAC3B,MAAM,GAAG,eAAI,CAAC,eAAe,CAAC;SACjC;aAAM;YACH,MAAM,mBACF,IAAI,qBACJ,iBAAiB,iCACjB,UAAU,EAAE,KAAK,IACd,CAAC,MAAM,IAAA,6DAA6B,EAAC,KAAK,EAAE,WAAW,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC,CACzE,CAAC;SACL;QAED,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAE7E,OAAO,MAAM,CAAC;;CACjB;AAtCD,sDAsCC"}
+{"version":3,"file":"inspectTypeRecordType.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeRecordType.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,0FAAwF;AACxF,sFAAmH;AAEnH,oEAAsD;AAEtD,gCAA+D;AAC/D,mFAAgF;AAIhF,SAAsB,qBAAqB,CACvC,KAAuB,EACvB,OAAiB,EACjB,kBAAsC;;;QAEtC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,qBAAqB,CAAC,IAAI,EAC1B,kBAAkB,EAClB,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,MAAA,KAAK,CAAC,sBAAsB,0CAAE,gBAAgB,EAAE,CAAC;QACjD,qBAAY,CAAC,gBAAgB,CAAiB,OAAO,gCAA0B,CAAC;QAEhF,IAAI,MAAkD,CAAC;QAEvD,QAAQ,KAAK,CAAC,YAAY,EAAE;YACxB,8BAA0B,CAAC,CAAC;gBACxB,MAAM,WAAW,GAAyB,uBAAc,CAAC,oBAAoB,CACzE,KAAK,CAAC,mBAAmB,EACzB,OAAO,CAAC,IAAI,CAAC,EAAE,EACf,CAAC,wDAEJ,CAAC;gBAEF,IAAI,WAAW,KAAK,SAAS,EAAE;oBAC3B,MAAM,GAAG,eAAI,CAAC,eAAe,CAAC;iBACjC;qBAAM;oBACH,MAAM,mBACF,IAAI,qBACJ,iBAAiB,iCACjB,UAAU,EAAE,KAAK,IACd,CAAC,MAAM,IAAA,6DAA6B,EAAC,KAAK,EAAE,WAAW,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC,CACzE,CAAC;iBACL;gBAED,MAAM;aACT;YAED;gBACI,MAAM,GAAG,eAAI,CAAC,qBAAqB,CAAC;gBACpC,MAAM;YAEV;gBACI,0BAAM,CAAC,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;SAC1C;QAED,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAE7E,OAAO,MAAM,CAAC;;CACjB;AAnDD,sDAmDC"}

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

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

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

@@ -14,6 +14,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.inspectTypeTableType = 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 powerquery_parser_1 = require("@microsoft/powerquery-parser");
 const __1 = require("../../..");
 const common_1 = require("./common");
 const examineFieldSpecificationList_1 = require("./examineFieldSpecificationList");
@@ -23,21 +24,31 @@ function inspectTypeTableType(state, xorNode, maybeCorrelationId) {
         const trace = state.traceManager.entry("Inspection.Type" /* InspectType */, inspectTypeTableType.name, maybeCorrelationId, __1.TraceUtils.createXorNodeDetails(xorNode));
         (_a = state.maybeCancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
         parser_1.XorNodeUtils.assertIsNodeKind(xorNode, "TableType" /* TableType */);
-        const maybeRowType = parser_1.NodeIdMapUtils.maybeNthChild(state.nodeIdMapCollection, xorNode.node.id, 1);
         let result;
-        if (maybeRowType === undefined) {
-            result = language_1.Type.UnknownInstance;
-        }
-        else if (maybeRowType.node.kind === "FieldSpecificationList" /* FieldSpecificationList */) {
-            result = Object.assign({ kind: "Type" /* Type */, maybeExtendedKind: "TableType" /* TableType */, isNullable: false }, (yield (0, examineFieldSpecificationList_1.examineFieldSpecificationList)(state, maybeRowType, trace.id)));
-        }
-        else {
-            result = {
-                kind: "Type" /* Type */,
-                maybeExtendedKind: "TableTypePrimaryExpression" /* TableTypePrimaryExpression */,
-                isNullable: false,
-                primaryExpression: yield (0, common_1.inspectXor)(state, maybeRowType, trace.id),
-            };
+        switch (state.typeStrategy) {
+            case "Extended" /* Extended */: {
+                const maybeRowType = parser_1.NodeIdMapUtils.maybeNthChild(state.nodeIdMapCollection, xorNode.node.id, 1);
+                if (maybeRowType === undefined) {
+                    result = language_1.Type.UnknownInstance;
+                }
+                else if (maybeRowType.node.kind === "FieldSpecificationList" /* FieldSpecificationList */) {
+                    result = Object.assign({ kind: "Type" /* Type */, maybeExtendedKind: "TableType" /* TableType */, isNullable: false }, (yield (0, examineFieldSpecificationList_1.examineFieldSpecificationList)(state, maybeRowType, trace.id)));
+                }
+                else {
+                    result = {
+                        kind: "Type" /* Type */,
+                        maybeExtendedKind: "TableTypePrimaryExpression" /* TableTypePrimaryExpression */,
+                        isNullable: false,
+                        primaryExpression: yield (0, common_1.inspectXor)(state, maybeRowType, trace.id),
+                    };
+                }
+                break;
+            }
+            case "Primitive" /* Primitive */:
+                result = language_1.Type.TypePrimitiveInstance;
+                break;
+            default:
+                powerquery_parser_1.Assert.isNever(state.typeStrategy);
         }
         trace.exit({ ["Result" /* Result */]: __1.TraceUtils.createTypeDetails(result) });
         return result;

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

@@ -1 +1 @@
-{"version":3,"file":"inspectTypeTableType.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeTableType.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,0FAAwF;AACxF,sFAAmH;AAGnH,gCAA+D;AAC/D,qCAAwD;AACxD,mFAAgF;AAEhF,SAAsB,oBAAoB,CACtC,KAAuB,EACvB,OAAiB,EACjB,kBAAsC;;;QAEtC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,oBAAoB,CAAC,IAAI,EACzB,kBAAkB,EAClB,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,MAAA,KAAK,CAAC,sBAAsB,0CAAE,gBAAgB,EAAE,CAAC;QACjD,qBAAY,CAAC,gBAAgB,CAAgB,OAAO,8BAAyB,CAAC;QAE9E,MAAM,YAAY,GAAyB,uBAAc,CAAC,aAAa,CACnE,KAAK,CAAC,mBAAmB,EACzB,OAAO,CAAC,IAAI,CAAC,EAAE,EACf,CAAC,CACJ,CAAC;QAEF,IAAI,MAA4B,CAAC;QAEjC,IAAI,YAAY,KAAK,SAAS,EAAE;YAC5B,MAAM,GAAG,eAAI,CAAC,eAAe,CAAC;SACjC;aAAM,IAAI,YAAY,CAAC,IAAI,CAAC,IAAI,0DAAwC,EAAE;YACvE,MAAM,mBACF,IAAI,qBACJ,iBAAiB,+BACjB,UAAU,EAAE,KAAK,IACd,CAAC,MAAM,IAAA,6DAA6B,EAAC,KAAK,EAAE,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC,CAC1E,CAAC;SACL;aAAM;YACH,MAAM,GAAG;gBACL,IAAI,mBAAoB;gBACxB,iBAAiB,+DAAkD;gBACnE,UAAU,EAAE,KAAK;gBACjB,iBAAiB,EAAE,MAAM,IAAA,mBAAU,EAAC,KAAK,EAAE,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC;aACrE,CAAC;SACL;QAED,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAE7E,OAAO,MAAM,CAAC;;CACjB;AA5CD,oDA4CC"}
+{"version":3,"file":"inspectTypeTableType.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeTableType.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,0FAAwF;AACxF,sFAAmH;AAEnH,oEAAsD;AAEtD,gCAA+D;AAC/D,qCAAwD;AACxD,mFAAgF;AAGhF,SAAsB,oBAAoB,CACtC,KAAuB,EACvB,OAAiB,EACjB,kBAAsC;;;QAEtC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,oBAAoB,CAAC,IAAI,EACzB,kBAAkB,EAClB,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,MAAA,KAAK,CAAC,sBAAsB,0CAAE,gBAAgB,EAAE,CAAC;QACjD,qBAAY,CAAC,gBAAgB,CAAgB,OAAO,8BAAyB,CAAC;QAE9E,IAAI,MAAmF,CAAC;QAExF,QAAQ,KAAK,CAAC,YAAY,EAAE;YACxB,8BAA0B,CAAC,CAAC;gBACxB,MAAM,YAAY,GAAyB,uBAAc,CAAC,aAAa,CACnE,KAAK,CAAC,mBAAmB,EACzB,OAAO,CAAC,IAAI,CAAC,EAAE,EACf,CAAC,CACJ,CAAC;gBAEF,IAAI,YAAY,KAAK,SAAS,EAAE;oBAC5B,MAAM,GAAG,eAAI,CAAC,eAAe,CAAC;iBACjC;qBAAM,IAAI,YAAY,CAAC,IAAI,CAAC,IAAI,0DAAwC,EAAE;oBACvE,MAAM,mBACF,IAAI,qBACJ,iBAAiB,+BACjB,UAAU,EAAE,KAAK,IACd,CAAC,MAAM,IAAA,6DAA6B,EAAC,KAAK,EAAE,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC,CAC1E,CAAC;iBACL;qBAAM;oBACH,MAAM,GAAG;wBACL,IAAI,mBAAoB;wBACxB,iBAAiB,+DAAkD;wBACnE,UAAU,EAAE,KAAK;wBACjB,iBAAiB,EAAE,MAAM,IAAA,mBAAU,EAAC,KAAK,EAAE,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC;qBACrE,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;AAzDD,oDAyDC"}

package/lib/powerquery-language-services/inspection/type/task.js

@@ -23,41 +23,20 @@ function tryScopeType(settings, nodeIdMapCollection, nodeId,
 typeCache = typeCache_1.TypeCacheUtils.createEmptyCache()) {
     return __awaiter(this, void 0, void 0, function* () {
         const trace = settings.traceManager.entry("Inspection.ScopeType" /* InspectScopeType */, tryScopeType.name, settings.maybeInitialCorrelationId);
-        const state = {
-            library: settings.library,
-            locale: settings.locale,
-            isWorkspaceCacheAllowed: settings.isWorkspaceCacheAllowed,
-            maybeCancellationToken: settings.maybeCancellationToken,
-            maybeEachScopeById: settings.maybeEachScopeById,
-            maybeInitialCorrelationId: trace.id,
-            traceManager: settings.traceManager,
-            givenTypeById: typeCache.typeById,
-            deltaTypeById: new Map(),
-            nodeIdMapCollection,
-            scopeById: typeCache.scopeById,
-        };
+        const state = createState(settings, nodeIdMapCollection, typeCache, trace.id);
         const result = powerquery_parser_1.ResultUtils.ensureResultAsync(() => inspectScopeType(state, nodeId, trace.id), settings.locale);
         trace.exit();
         return result;
     });
 }
 exports.tryScopeType = tryScopeType;
-function tryType(settings, nodeIdMapCollection, nodeId, typeCache = typeCache_1.TypeCacheUtils.createEmptyCache()) {
+function tryType(settings, nodeIdMapCollection, nodeId, 
+// If a TypeCache is given, then potentially add to its values and include it as part of the return,
+// Else create a new TypeCache and include it in the return.
+typeCache = typeCache_1.TypeCacheUtils.createEmptyCache()) {
     return __awaiter(this, void 0, void 0, function* () {
         const trace = settings.traceManager.entry("Inspection.Type" /* InspectType */, tryType.name, settings.maybeInitialCorrelationId);
-        const state = {
-            library: settings.library,
-            locale: settings.locale,
-            isWorkspaceCacheAllowed: settings.isWorkspaceCacheAllowed,
-            maybeCancellationToken: settings.maybeCancellationToken,
-            maybeEachScopeById: settings.maybeEachScopeById,
-            maybeInitialCorrelationId: trace.id,
-            traceManager: settings.traceManager,
-            givenTypeById: typeCache.typeById,
-            deltaTypeById: new Map(),
-            nodeIdMapCollection,
-            scopeById: typeCache.scopeById,
-        };
+        const state = createState(settings, nodeIdMapCollection, typeCache, trace.id);
         const result = yield powerquery_parser_1.ResultUtils.ensureResultAsync(() => (0, inspectType_1.inspectXor)(state, parser_1.NodeIdMapUtils.assertGetXor(nodeIdMapCollection, nodeId), trace.id), settings.locale);
         trace.exit({ ["IsError" /* IsError */]: result.kind });
         return result;
@@ -86,4 +65,20 @@ function inspectScopeType(state, nodeId, correlationId) {
         return result;
     });
 }
+function createState(settings, nodeIdMapCollection, typeCache, correlationId) {
+    return {
+        library: settings.library,
+        locale: settings.locale,
+        isWorkspaceCacheAllowed: settings.isWorkspaceCacheAllowed,
+        maybeCancellationToken: settings.maybeCancellationToken,
+        maybeEachScopeById: settings.maybeEachScopeById,
+        maybeInitialCorrelationId: correlationId,
+        traceManager: settings.traceManager,
+        typeStrategy: settings.typeStrategy,
+        givenTypeById: typeCache.typeById,
+        deltaTypeById: new Map(),
+        nodeIdMapCollection,
+        scopeById: typeCache.scopeById,
+    };
+}
 //# sourceMappingURL=task.js.map

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

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

package/lib/powerquery-language-services/inspectionSettings.d.ts

@@ -1,8 +1,13 @@
 import * as PQP from "@microsoft/powerquery-parser";
 import { Library } from "./library";
 import { TypeById } from "./inspection";
+export declare const enum TypeStrategy {
+    Extended = "Extended",
+    Primitive = "Primitive"
+}
 export interface InspectionSettings extends PQP.Settings {
     readonly isWorkspaceCacheAllowed: boolean;
     readonly library: Library.ILibrary;
     readonly maybeEachScopeById: TypeById | undefined;
+    readonly typeStrategy: TypeStrategy;
 }

package/lib/powerquery-language-services/inspectionUtils.d.ts

@@ -3,11 +3,9 @@ import { Ast, Type } from "@microsoft/powerquery-parser/lib/powerquery-parser/la
 import { DocumentSymbol, SignatureHelp, SymbolKind } from "vscode-languageserver-types";
 import { AutocompleteItemProviderContext, SignatureProviderContext } from "./providers/commonTypes";
 import { Inspection } from ".";
-import { TraceManager } from "@microsoft/powerquery-parser/lib/powerquery-parser/common/trace";
 import { InspectionSettings } from "./inspectionSettings";
-import { Library } from "./library";
-import { TypeById } from "./inspection";
-export declare function createInspectionSettings(settings: PQP.Settings, maybeEachScopeById: TypeById | undefined, maybeLibrary: Library.ILibrary | undefined, isWorkspaceCacheAllowed: boolean): InspectionSettings;
+import { TraceManager } from "@microsoft/powerquery-parser/lib/powerquery-parser/common/trace";
+export declare function createInspectionSettings(settings: PQP.Settings, overrides?: Partial<InspectionSettings>): InspectionSettings;
 export declare function getMaybeContextForSignatureProvider(inspected: Inspection.Inspected, traceManager: TraceManager, maybeCorrelationId: number | undefined): Promise<SignatureProviderContext | undefined>;
 export declare function getMaybeSignatureHelp(context: SignatureProviderContext, correlationId: number): SignatureHelp | null;
 export declare function getMaybeType(inspected: Inspection.Inspected, identifier: string): Promise<Type.TPowerQueryType | undefined>;

package/lib/powerquery-language-services/inspectionUtils.js

@@ -18,9 +18,9 @@ const vscode_languageserver_types_1 = require("vscode-languageserver-types");
 const _1 = require(".");
 const autocomplete_1 = require("./inspection/autocomplete");
 const library_1 = require("./library");
-function createInspectionSettings(settings, maybeEachScopeById, maybeLibrary, isWorkspaceCacheAllowed) {
-    return Object.assign(Object.assign({}, settings), { library: maybeLibrary !== null && maybeLibrary !== void 0 ? maybeLibrary : library_1.Library.NoOpLibrary, maybeEachScopeById,
-        isWorkspaceCacheAllowed });
+function createInspectionSettings(settings, overrides) {
+    var _a, _b, _c, _d;
+    return Object.assign(Object.assign({}, settings), { isWorkspaceCacheAllowed: (_a = overrides === null || overrides === void 0 ? void 0 : overrides.isWorkspaceCacheAllowed) !== null && _a !== void 0 ? _a : true, library: (_b = overrides === null || overrides === void 0 ? void 0 : overrides.library) !== null && _b !== void 0 ? _b : library_1.Library.NoOpLibrary, typeStrategy: (_c = overrides === null || overrides === void 0 ? void 0 : overrides.typeStrategy) !== null && _c !== void 0 ? _c : "Extended" /* Extended */, maybeEachScopeById: (_d = overrides === null || overrides === void 0 ? void 0 : overrides.maybeEachScopeById) !== null && _d !== void 0 ? _d : undefined });
 }
 exports.createInspectionSettings = createInspectionSettings;
 function getMaybeContextForSignatureProvider(inspected, traceManager, maybeCorrelationId) {

package/lib/powerquery-language-services/inspectionUtils.js.map

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