@microsoft/powerquery-language-services 0.2.19 → 0.3.3

package/lib/powerquery-language-services/workspaceCache/workspaceCacheUtils.d.ts

@@ -1,14 +1,13 @@
 import * as PQP from "@microsoft/powerquery-parser";
-import { TextDocument, TextDocumentContentChangeEvent } from "vscode-languageserver-textdocument";
+import type { TextDocument, TextDocumentContentChangeEvent } from "vscode-languageserver-textdocument";
 import type { Position } from "vscode-languageserver-types";
-import type { CacheItem, InspectionCacheItem, InspectionTask, LexCacheItem, ParseCacheItem } from "./workspaceCache";
+import { CacheCollection } from "./workspaceCache";
 import { Inspection } from "..";
 import { InspectionSettings } from "../inspectionSettings";
-export declare function assertIsInspectionTask(cacheItem: CacheItem): asserts cacheItem is InspectionTask;
-export declare function getOrCreateTypeCache(textDocument: TextDocument): Inspection.TypeCache;
-export declare function getOrCreateLex(textDocument: TextDocument, lexSettings: PQP.LexSettings): LexCacheItem;
-export declare function getOrCreateParse(textDocument: TextDocument, lexSettings: PQP.LexSettings & PQP.ParseSettings): ParseCacheItem;
-export declare function getOrCreateInspection(textDocument: TextDocument, inspectionSettings: InspectionSettings, position: Position): InspectionCacheItem;
 export declare function close(textDocument: TextDocument): void;
+export declare function getTypeCache(textDocument: TextDocument): Inspection.TypeCache;
+export declare function getOrCreateCacheCollection(textDocument: TextDocument): CacheCollection;
+export declare function getOrCreateLexPromise(textDocument: TextDocument, lexSettings: PQP.LexSettings): Promise<PQP.Task.TriedLexTask>;
+export declare function getOrCreateParsePromise(textDocument: TextDocument, lexAndParseSettings: PQP.LexSettings & PQP.ParseSettings): Promise<PQP.Task.TriedParseTask | undefined>;
+export declare function getOrCreateInspectedPromise(textDocument: TextDocument, inspectionSettings: InspectionSettings, position: Position): Promise<Inspection.Inspected | undefined>;
 export declare function update(textDocument: TextDocument, _changes: ReadonlyArray<TextDocumentContentChangeEvent>, _version: number): void;
-export declare function isInspectionTask(cacheItem: CacheItem): cacheItem is InspectionTask;

package/lib/powerquery-language-services/workspaceCache/workspaceCacheUtils.js

@@ -1,174 +1,120 @@
 "use strict";
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-var __read = (this && this.__read) || function (o, n) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator];
-    if (!m) return o;
-    var i = m.call(o), r, ar = [], e;
-    try {
-        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-    }
-    catch (error) { e = { error: error }; }
-    finally {
-        try {
-            if (r && !r.done && (m = i["return"])) m.call(i);
-        }
-        finally { if (e) throw e.error; }
-    }
-    return ar;
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isInspectionTask = exports.update = exports.close = exports.getOrCreateInspection = exports.getOrCreateParse = exports.getOrCreateLex = exports.getOrCreateTypeCache = exports.assertIsInspectionTask = void 0;
-var PQP = require("@microsoft/powerquery-parser");
-var __1 = require("..");
-var inspection_1 = require("../inspection");
-function assertIsInspectionTask(cacheItem) {
-    if (!isInspectionTask(cacheItem)) {
-        throw new PQP.CommonError.InvariantError("expected cacheItem to be an InspectionCacheItem", {
-            expectedStage: "Inspection",
-            actualStage: cacheItem === null || cacheItem === void 0 ? void 0 : cacheItem.stage,
-        });
-    }
-}
-exports.assertIsInspectionTask = assertIsInspectionTask;
-function getOrCreateTypeCache(textDocument) {
-    var cacheKey = createCacheKey(textDocument);
-    var cacheVersion = textDocument.version;
-    var cacheCollection = getOrCreateCacheCollection(cacheKey, cacheVersion);
-    return cacheCollection.typeCache;
-}
-exports.getOrCreateTypeCache = getOrCreateTypeCache;
-function getOrCreateLex(textDocument, lexSettings) {
-    var cacheKey = createCacheKey(textDocument);
-    var cacheVersion = textDocument.version;
-    var cacheCollection = getOrCreateCacheCollection(cacheKey, cacheVersion);
-    var _a = __read(getOrCreateLexCacheItem(cacheCollection, textDocument, lexSettings), 2), updatedCacheCollection = _a[0], lexCacheItem = _a[1];
-    CacheCollectionByCacheKey.set(cacheKey, updatedCacheCollection);
-    return lexCacheItem;
-}
-exports.getOrCreateLex = getOrCreateLex;
-function getOrCreateParse(textDocument, lexSettings) {
-    var cacheKey = createCacheKey(textDocument);
-    var cacheVersion = textDocument.version;
-    var cacheCollection = getOrCreateCacheCollection(cacheKey, cacheVersion);
-    var _a = __read(getOrCreateParseCacheItem(cacheCollection, textDocument, lexSettings), 2), updatedCacheCollection = _a[0], parseCacheItem = _a[1];
-    CacheCollectionByCacheKey.set(cacheKey, updatedCacheCollection);
-    return parseCacheItem;
-}
-exports.getOrCreateParse = getOrCreateParse;
-function getOrCreateInspection(textDocument, inspectionSettings, position) {
-    var cacheKey = createCacheKey(textDocument);
-    var cacheVersion = textDocument.version;
-    var cacheCollection = getOrCreateCacheCollection(cacheKey, cacheVersion);
-    var _a = __read(getOrCreateInspectionCacheItem(cacheCollection, textDocument, inspectionSettings, position), 2), updatedCacheCollection = _a[0], inspectionCacheItem = _a[1];
-    CacheCollectionByCacheKey.set(cacheKey, updatedCacheCollection);
-    return inspectionCacheItem;
-}
-exports.getOrCreateInspection = getOrCreateInspection;
-// TODO: is the position key valid for a single intellisense operation,
-// or would it be the same for multiple invocations?
+exports.update = exports.getOrCreateInspectedPromise = exports.getOrCreateParsePromise = exports.getOrCreateLexPromise = exports.getOrCreateCacheCollection = exports.getTypeCache = exports.close = void 0;
+const PQP = require("@microsoft/powerquery-parser");
+const __1 = require("..");
+const inspection_1 = require("../inspection");
+const CacheCollectionByCacheKey = new Map();
 function close(textDocument) {
-    var cacheKey = createCacheKey(textDocument);
-    CacheCollectionByCacheKey.delete(cacheKey);
+    const collectionCacheKey = createCollectionCacheKey(textDocument);
+    CacheCollectionByCacheKey.delete(collectionCacheKey);
 }
 exports.close = close;
-function update(textDocument, _changes, _version) {
-    // TODO: support incremental lexing
-    // TODO: premptively prepare cache on background thread?
-    // TODO: use document version
-    close(textDocument);
-}
-exports.update = update;
-function isInspectionTask(cacheItem) {
-    return (cacheItem === null || cacheItem === void 0 ? void 0 : cacheItem.stage) === "Inspection";
+function getTypeCache(textDocument) {
+    const cacheCollection = getOrCreateCacheCollection(textDocument);
+    return cacheCollection.typeCache;
 }
-exports.isInspectionTask = isInspectionTask;
-var CacheCollectionByCacheKey = new Map();
-function getOrCreateCacheCollection(cacheKey, cacheVersion) {
-    var maybeCollection = CacheCollectionByCacheKey.get(cacheKey);
-    if (maybeCollection !== undefined && maybeCollection.version === cacheVersion) {
-        return maybeCollection;
-    }
-    else {
-        var cacheCollection = createEmptyCollection(cacheVersion);
-        CacheCollectionByCacheKey.set(cacheKey, cacheCollection);
-        return cacheCollection;
+exports.getTypeCache = getTypeCache;
+function getOrCreateCacheCollection(textDocument) {
+    const cacheKey = createCollectionCacheKey(textDocument);
+    const maybeCollection = CacheCollectionByCacheKey.get(cacheKey);
+    if (maybeCollection !== undefined) {
+        if (textDocument.version === maybeCollection.version) {
+            return maybeCollection;
+        }
+        else {
+            close(textDocument);
+        }
     }
+    const cacheCollection = createEmptyCollection(textDocument.version);
+    CacheCollectionByCacheKey.set(cacheKey, cacheCollection);
+    return cacheCollection;
 }
-function getOrCreateLexCacheItem(cacheCollection, textDocument, lexSettings) {
+exports.getOrCreateCacheCollection = getOrCreateCacheCollection;
+function getOrCreateLexPromise(textDocument, lexSettings) {
+    const cacheCollection = getOrCreateCacheCollection(textDocument);
     if (cacheCollection.maybeLex) {
-        return [cacheCollection, cacheCollection.maybeLex];
+        return cacheCollection.maybeLex;
     }
-    var lexCacheItem = PQP.TaskUtils.tryLex(lexSettings, textDocument.getText());
-    var updatedCacheCollection = __assign(__assign({}, cacheCollection), { maybeLex: lexCacheItem });
-    return [updatedCacheCollection, lexCacheItem];
+    const lexPromise = Promise.resolve(PQP.TaskUtils.tryLex(lexSettings, textDocument.getText()));
+    cacheCollection.maybeLex = lexPromise;
+    return lexPromise;
 }
-function getOrCreateParseCacheItem(cacheCollection, textDocument, lexAndParseSettings) {
-    if (cacheCollection.maybeParse) {
-        return [cacheCollection, cacheCollection.maybeParse];
-    }
-    var _a = __read(getOrCreateLexCacheItem(cacheCollection, textDocument, lexAndParseSettings), 2), updatedCacheCollection = _a[0], lexCacheItem = _a[1];
-    if (!PQP.TaskUtils.isLexStageOk(lexCacheItem)) {
-        return [updateCacheCollectionAttribute(updatedCacheCollection, "maybeParse", lexCacheItem), lexCacheItem];
-    }
-    var parseCacheItem = PQP.TaskUtils.tryParse(lexAndParseSettings, lexCacheItem.lexerSnapshot);
-    return [updateCacheCollectionAttribute(updatedCacheCollection, "maybeParse", parseCacheItem), parseCacheItem];
+exports.getOrCreateLexPromise = getOrCreateLexPromise;
+function getOrCreateParsePromise(textDocument, lexAndParseSettings) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const cacheCollection = getOrCreateCacheCollection(textDocument);
+        if (cacheCollection.maybeParse) {
+            return cacheCollection.maybeParse;
+        }
+        const maybeTriedLexPromise = getOrCreateLexPromise(textDocument, lexAndParseSettings);
+        const maybeTriedLex = yield maybeTriedLexPromise;
+        if (PQP.TaskUtils.isError(maybeTriedLex)) {
+            cacheCollection.maybeParse = Promise.resolve(undefined);
+            return undefined;
+        }
+        cacheCollection.maybeParse = PQP.TaskUtils.tryParse(lexAndParseSettings, maybeTriedLex.lexerSnapshot);
+        return cacheCollection.maybeParse;
+    });
 }
-function getOrCreateInspectionCacheItem(cacheCollection, textDocument, inspectionSettings, position) {
-    var _a;
-    if (cacheCollection.maybeInspectionByPosition) {
-        var maybeInspectionByPosition = cacheCollection.maybeInspectionByPosition;
-        var maybeInspection = maybeInspectionByPosition.get(position);
-        if (maybeInspection) {
-            return [cacheCollection, maybeInspection];
+exports.getOrCreateParsePromise = getOrCreateParsePromise;
+function getOrCreateInspectedPromise(textDocument, inspectionSettings, position) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const cacheCollection = getOrCreateCacheCollection(textDocument);
+        const positionMapKey = createInspectionByPositionKey(position);
+        if (cacheCollection.inspectionByPosition.has(positionMapKey)) {
+            return cacheCollection.inspectionByPosition.get(positionMapKey);
         }
-    }
-    var _b = __read(getOrCreateParseCacheItem(cacheCollection, textDocument, inspectionSettings), 2), parseCacheCollection = _b[0], parseCacheItem = _b[1];
-    var parseState;
-    if (!PQP.TaskUtils.isParseStage(parseCacheItem) || PQP.TaskUtils.isParseStageCommonError(parseCacheItem)) {
-        return [parseCacheCollection, parseCacheItem];
-    }
-    else if (PQP.TaskUtils.isParseStageOk(parseCacheItem)) {
-        parseState = parseCacheItem.parseState;
-    }
-    else if (PQP.TaskUtils.isParseStageParseError(parseCacheItem)) {
-        parseState = parseCacheItem.parseState;
-    }
-    else {
-        throw new PQP.CommonError.InvariantError("this should never be reached, but 'never' doesn't catch it.");
-    }
-    var inspection = __1.Inspection.inspection(inspectionSettings, parseState, PQP.TaskUtils.isParseStageParseError(parseCacheItem) ? parseCacheItem.error : undefined, position, cacheCollection.typeCache);
-    var inspectionCacheItem = __assign(__assign({}, inspection), { stage: "Inspection", version: textDocument.version, parseState: parseState });
-    var updatedByPosition = new Map((_a = parseCacheCollection.maybeInspectionByPosition) !== null && _a !== void 0 ? _a : []);
-    updatedByPosition.set(position, inspectionCacheItem);
-    var updatedCacheCollection = updateCacheCollectionAttribute(parseCacheCollection, "maybeInspectionByPosition", updatedByPosition);
-    return [updatedCacheCollection, inspectionCacheItem];
+        const maybeTriedParsePromise = getOrCreateParsePromise(textDocument, inspectionSettings);
+        const maybeTriedParse = yield maybeTriedParsePromise;
+        if (maybeTriedParse === undefined ||
+            !PQP.TaskUtils.isParseStage(maybeTriedParse) ||
+            PQP.TaskUtils.isParseStageCommonError(maybeTriedParse)) {
+            cacheCollection.inspectionByPosition.set(positionMapKey, undefined);
+            return undefined;
+        }
+        let parseState;
+        if (PQP.TaskUtils.isParseStageOk(maybeTriedParse)) {
+            parseState = maybeTriedParse.parseState;
+        }
+        else if (PQP.TaskUtils.isParseStageParseError(maybeTriedParse)) {
+            parseState = maybeTriedParse.parseState;
+        }
+        else {
+            throw PQP.Assert.isNever(maybeTriedParse);
+        }
+        return __1.Inspection.inspect(inspectionSettings, parseState, PQP.TaskUtils.isParseStageParseError(maybeTriedParse) ? maybeTriedParse.error : undefined, position, cacheCollection.typeCache);
+    });
 }
-function updateCacheCollectionAttribute(cacheCollection, key, value) {
-    var _a;
-    return __assign(__assign({}, cacheCollection), (_a = {}, _a[key] = value, _a));
+exports.getOrCreateInspectedPromise = getOrCreateInspectedPromise;
+function update(textDocument, _changes, _version) {
+    close(textDocument);
+}
+exports.update = update;
+function createCollectionCacheKey(textDocument) {
+    return `${textDocument.uri}`;
 }
 function createEmptyCollection(version) {
     return {
-        version: version,
         maybeLex: undefined,
         maybeParse: undefined,
-        maybeInspectionByPosition: undefined,
+        inspectionByPosition: new Map(),
         typeCache: inspection_1.TypeCacheUtils.createEmptyCache(),
+        version,
     };
 }
-function createCacheKey(textDocument) {
-    return textDocument.uri;
+function createInspectionByPositionKey(position) {
+    return `${position.character};${position.line}`;
 }
 //# sourceMappingURL=workspaceCacheUtils.js.map

package/lib/powerquery-language-services/workspaceCache/workspaceCacheUtils.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@microsoft/powerquery-language-services",
-    "version": "0.2.19",
+    "version": "0.3.3",
     "author": "Microsoft",
     "license": "MIT",
     "scripts": {
@@ -37,7 +37,7 @@
         "eslint-plugin-prettier": "4.0.0",
         "eslint-plugin-promise": "6.0.0",
         "eslint-plugin-security": "1.4.0",
-        "mocha": "9.1.3",
+        "mocha": "^9.2.0",
         "mocha-junit-reporter": "2.0.2",
         "mocha-multi-reporters": "1.5.1",
         "prettier": "2.5.1",
@@ -46,8 +46,8 @@
         "typescript": "4.5.4"
     },
     "dependencies": {
-        "@microsoft/powerquery-formatter": "0.0.44",
-        "@microsoft/powerquery-parser": "0.5.22",
+        "@microsoft/powerquery-formatter": "0.0.46",
+        "@microsoft/powerquery-parser": "0.6.4",
         "vscode-languageserver-textdocument": "1.0.3",
         "vscode-languageserver-types": "3.16.0"
     },

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

@@ -1,126 +0,0 @@
-"use strict";
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-var __read = (this && this.__read) || function (o, n) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator];
-    if (!m) return o;
-    var i = m.call(o), r, ar = [], e;
-    try {
-        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-    }
-    catch (error) { e = { error: error }; }
-    finally {
-        try {
-            if (r && !r.done && (m = i["return"])) m.call(i);
-        }
-        finally { if (e) throw e.error; }
-    }
-    return ar;
-};
-var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.inspectTypeFieldProjection = void 0;
-var PQP = require("@microsoft/powerquery-parser");
-var language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
-var parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
-var common_1 = require("./common");
-var __1 = require("../../..");
-function inspectTypeFieldProjection(state, xorNode) {
-    var _a;
-    var _b;
-    var trace = state.traceManager.entry("Type" /* Type */, inspectTypeFieldProjection.name, __1.TraceUtils.createXorNodeDetails(xorNode));
-    (_b = state.maybeCancellationToken) === null || _b === void 0 ? void 0 : _b.throwIfCancelled();
-    parser_1.XorNodeUtils.assertIsNodeKind(xorNode, "FieldProjection" /* FieldProjection */);
-    var projectedFieldNames = parser_1.NodeIdMapIterator.iterFieldProjectionNames(state.nodeIdMapCollection, xorNode);
-    var previousSibling = parser_1.NodeIdMapUtils.assertGetRecursiveExpressionPreviousSibling(state.nodeIdMapCollection, xorNode.node.id);
-    var previousSiblingType = (0, common_1.inspectXor)(state, previousSibling);
-    var isOptional = parser_1.NodeIdMapUtils.maybeUnboxNthChildIfAstChecked(state.nodeIdMapCollection, xorNode.node.id, 3, "Constant" /* Constant */) !== undefined;
-    var result = inspectFieldProjectionHelper(previousSiblingType, projectedFieldNames, isOptional);
-    trace.exit((_a = {}, _a["Result" /* Result */] = __1.TraceUtils.createTypeDetails(result), _a));
-    return result;
-}
-exports.inspectTypeFieldProjection = inspectTypeFieldProjection;
-function inspectFieldProjectionHelper(previousSiblingType, projectedFieldNames, isOptional) {
-    switch (previousSiblingType.kind) {
-        case "Any" /* Any */: {
-            var projectedFields = new Map(projectedFieldNames.map(function (fieldName) { return [fieldName, language_1.Type.AnyInstance]; }));
-            return {
-                kind: "Any" /* Any */,
-                maybeExtendedKind: "AnyUnion" /* AnyUnion */,
-                isNullable: previousSiblingType.isNullable,
-                unionedTypePairs: [
-                    {
-                        kind: "Record" /* Record */,
-                        maybeExtendedKind: "DefinedRecord" /* DefinedRecord */,
-                        isNullable: previousSiblingType.isNullable,
-                        fields: projectedFields,
-                        isOpen: false,
-                    },
-                    {
-                        kind: "Table" /* Table */,
-                        maybeExtendedKind: "DefinedTable" /* DefinedTable */,
-                        isNullable: previousSiblingType.isNullable,
-                        fields: new PQP.OrderedMap(__spreadArray([], __read(projectedFields), false)),
-                        isOpen: false,
-                    },
-                ],
-            };
-        }
-        case "Record" /* Record */:
-        case "Table" /* Table */:
-            return inspectRecordOrTableProjection(previousSiblingType, projectedFieldNames, isOptional);
-        default:
-            return language_1.Type.NoneInstance;
-    }
-}
-function inspectRecordOrTableProjection(previousSiblingType, projectedFieldNames, isOptional) {
-    // All we know is previousSibling was a Record/Table.
-    // Create a DefinedRecord/DefinedTable with the projected fields.
-    if (language_1.TypeUtils.isDefinedRecord(previousSiblingType)) {
-        return reducedFieldsToKeys(previousSiblingType, projectedFieldNames, isOptional, reducedRecordFields);
-    }
-    else if (language_1.TypeUtils.isDefinedTable(previousSiblingType)) {
-        return reducedFieldsToKeys(previousSiblingType, projectedFieldNames, isOptional, reducedTableFields);
-    }
-    else {
-        var newFields = new Map(projectedFieldNames.map(function (fieldName) { return [fieldName, language_1.Type.AnyInstance]; }));
-        return previousSiblingType.kind === "Record" /* Record */
-            ? language_1.TypeUtils.createDefinedRecord(false, newFields, false)
-            : language_1.TypeUtils.createDefinedTable(false, new PQP.OrderedMap(__spreadArray([], __read(newFields), false)), false);
-    }
-}
-// Returns a subset of `current` using `keys`.
-// If a mismatch is found it either returns Null if isOptional, else None.
-function reducedFieldsToKeys(current, keys, isOptional, createFieldsFn) {
-    var currentFieldNames = __spreadArray([], __read(current.fields.keys()), false);
-    if (!current.isOpen && !PQP.ArrayUtils.isSubset(currentFieldNames, keys)) {
-        return isOptional ? language_1.Type.NullInstance : language_1.Type.NoneInstance;
-    }
-    return __assign(__assign({}, current), { fields: createFieldsFn(current, keys), isOpen: false });
-}
-function reducedRecordFields(current, keys) {
-    return PQP.MapUtils.pick(current.fields, keys);
-}
-function reducedTableFields(current, keys) {
-    return new PQP.OrderedMap(__spreadArray([], __read(PQP.MapUtils.pick(current.fields, keys).entries()), false));
-}
-//# sourceMappingURL=inspectTypeFieldProjection.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"inspectTypeFieldProjection.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeFieldProjection.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAElC,kDAAoD;AACpD,wFAAmG;AACnG,oFAKmE;AAGnE,mCAAwD;AACxD,8BAAoE;AAEpE,SAAgB,0BAA0B,CAAC,KAAuB,EAAE,OAAiB;;;IACjF,IAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,oBAEzC,0BAA0B,CAAC,IAAI,EAC/B,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;IAEF,MAAA,KAAK,CAAC,sBAAsB,0CAAE,gBAAgB,EAAE,CAAC;IACjD,qBAAY,CAAC,gBAAgB,CAAsB,OAAO,0CAA+B,CAAC;IAE1F,IAAM,mBAAmB,GAA0B,0BAAiB,CAAC,wBAAwB,CACzF,KAAK,CAAC,mBAAmB,EACzB,OAAO,CACV,CAAC;IAEF,IAAM,eAAe,GAAa,uBAAc,CAAC,2CAA2C,CACxF,KAAK,CAAC,mBAAmB,EACzB,OAAO,CAAC,IAAI,CAAC,EAAE,CAClB,CAAC;IAEF,IAAM,mBAAmB,GAAyB,IAAA,mBAAU,EAAC,KAAK,EAAE,eAAe,CAAC,CAAC;IAErF,IAAM,UAAU,GACZ,uBAAc,CAAC,8BAA8B,CACzC,KAAK,CAAC,mBAAmB,EACzB,OAAO,CAAC,IAAI,CAAC,EAAE,EACf,CAAC,4BAEJ,KAAK,SAAS,CAAC;IAEpB,IAAM,MAAM,GAAyB,4BAA4B,CAC7D,mBAAmB,EACnB,mBAAmB,EACnB,UAAU,CACb,CAAC;IAEF,KAAK,CAAC,IAAI,WAAG,4BAAwB,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,MAAG,CAAC;IAE7E,OAAO,MAAM,CAAC;AAClB,CAAC;AAvCD,gEAuCC;AAED,SAAS,4BAA4B,CACjC,mBAAyC,EACzC,mBAA0C,EAC1C,UAAmB;IAEnB,QAAQ,mBAAmB,CAAC,IAAI,EAAE;QAC9B,oBAAsB,CAAC,CAAC;YACpB,IAAM,eAAe,GAAyB,IAAI,GAAG,CACjD,mBAAmB,CAAC,GAAG,CAAC,UAAC,SAAiB,IAAK,OAAA,CAAC,SAAS,EAAE,eAAI,CAAC,WAAW,CAAC,EAA7B,CAA6B,CAAC,CAChF,CAAC;YAEF,OAAO;gBACH,IAAI,iBAAmB;gBACvB,iBAAiB,2BAAgC;gBACjD,UAAU,EAAE,mBAAmB,CAAC,UAAU;gBAC1C,gBAAgB,EAAE;oBACd;wBACI,IAAI,uBAAsB;wBAC1B,iBAAiB,qCAAqC;wBACtD,UAAU,EAAE,mBAAmB,CAAC,UAAU;wBAC1C,MAAM,EAAE,eAAe;wBACvB,MAAM,EAAE,KAAK;qBAChB;oBACD;wBACI,IAAI,qBAAqB;wBACzB,iBAAiB,mCAAoC;wBACrD,UAAU,EAAE,mBAAmB,CAAC,UAAU;wBAC1C,MAAM,EAAE,IAAI,GAAG,CAAC,UAAU,0BAAK,eAAe,UAAE;wBAChD,MAAM,EAAE,KAAK;qBAChB;iBACJ;aACJ,CAAC;SACL;QAED,2BAA0B;QAC1B;YACI,OAAO,8BAA8B,CAAC,mBAAmB,EAAE,mBAAmB,EAAE,UAAU,CAAC,CAAC;QAEhG;YACI,OAAO,eAAI,CAAC,YAAY,CAAC;KAChC;AACL,CAAC;AAED,SAAS,8BAA8B,CACnC,mBAA+C,EAC/C,mBAA0C,EAC1C,UAAmB;IAEnB,qDAAqD;IACrD,iEAAiE;IACjE,IAAI,oBAAS,CAAC,eAAe,CAAC,mBAAmB,CAAC,EAAE;QAChD,OAAO,mBAAmB,CAAC,mBAAmB,EAAE,mBAAmB,EAAE,UAAU,EAAE,mBAAmB,CAAC,CAAC;KACzG;SAAM,IAAI,oBAAS,CAAC,cAAc,CAAC,mBAAmB,CAAC,EAAE;QACtD,OAAO,mBAAmB,CAAC,mBAAmB,EAAE,mBAAmB,EAAE,UAAU,EAAE,kBAAkB,CAAC,CAAC;KACxG;SAAM;QACH,IAAM,SAAS,GAAsC,IAAI,GAAG,CACxD,mBAAmB,CAAC,GAAG,CAAC,UAAC,SAAiB,IAAK,OAAA,CAAC,SAAS,EAAE,eAAI,CAAC,WAAW,CAAC,EAA7B,CAA6B,CAAC,CAChF,CAAC;QAEF,OAAO,mBAAmB,CAAC,IAAI,0BAAyB;YACpD,CAAC,CAAC,oBAAS,CAAC,mBAAmB,CAAC,KAAK,EAAE,SAAS,EAAE,KAAK,CAAC;YACxD,CAAC,CAAC,oBAAS,CAAC,kBAAkB,CAAC,KAAK,EAAE,IAAI,GAAG,CAAC,UAAU,0BAAK,SAAS,UAAE,EAAE,KAAK,CAAC,CAAC;KACxF;AACL,CAAC;AAED,8CAA8C;AAC9C,0EAA0E;AAC1E,SAAS,mBAAmB,CACxB,OAAU,EACV,IAA2B,EAC3B,UAAmB,EACnB,cAG6E;IAE7E,IAAM,iBAAiB,4BAA8B,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,SAAC,CAAC;IAE5E,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,iBAAiB,EAAE,IAAI,CAAC,EAAE;QACtE,OAAO,UAAU,CAAC,CAAC,CAAC,eAAI,CAAC,YAAY,CAAC,CAAC,CAAC,eAAI,CAAC,YAAY,CAAC;KAC7D;IAED,6BACO,OAAO,KACV,MAAM,EAAE,cAAc,CAAC,OAAO,EAAE,IAAI,CAAC,EACrC,MAAM,EAAE,KAAK,IACf;AACN,CAAC;AAED,SAAS,mBAAmB,CAAC,OAA2B,EAAE,IAA2B;IACjF,OAAO,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;AACnD,CAAC;AAED,SAAS,kBAAkB,CAAC,OAA0B,EAAE,IAA2B;IAC/E,OAAO,IAAI,GAAG,CAAC,UAAU,0BAAK,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,OAAO,EAAE,UAAE,CAAC;AACtF,CAAC"}

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

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

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

@@ -1 +0,0 @@
-{"version":3,"file":"inspectTypeFieldSelector.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeFieldSelector.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wFAAwF;AACxF,oFAAmH;AAEnH,kEAAsD;AAEtD,mCAAwD;AACxD,8BAAoE;AAEpE,SAAgB,wBAAwB,CAAC,KAAuB,EAAE,OAAiB;;;IAC/E,IAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,oBAEzC,wBAAwB,CAAC,IAAI,EAC7B,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;IAEF,MAAA,KAAK,CAAC,sBAAsB,0CAAE,gBAAgB,EAAE,CAAC;IACjD,qBAAY,CAAC,gBAAgB,CAAoB,OAAO,sCAA6B,CAAC;IAEtF,IAAM,cAAc,GAA0C,uBAAc,CAAC,oCAAoC,CAC7G,KAAK,CAAC,mBAAmB,EACzB,OAAO,CAAC,IAAI,CAAC,EAAE,sDAElB,CAAC;IAEF,IAAI,cAAc,KAAK,SAAS,EAAE;QAC9B,KAAK,CAAC,IAAI,WAAG,4BAAwB,cAAU,CAAC,iBAAiB,CAAC,eAAI,CAAC,eAAe,CAAC,MAAG,CAAC;QAE3F,OAAO,eAAI,CAAC,eAAe,CAAC;KAC/B;IAED,IAAM,SAAS,GAAW,cAAc,CAAC,OAAO,CAAC;IAEjD,IAAM,eAAe,GAAa,uBAAc,CAAC,2CAA2C,CACxF,KAAK,CAAC,mBAAmB,EACzB,OAAO,CAAC,IAAI,CAAC,EAAE,CAClB,CAAC;IAEF,IAAM,mBAAmB,GAAyB,IAAA,mBAAU,EAAC,KAAK,EAAE,eAAe,CAAC,CAAC;IAErF,IAAM,UAAU,GACZ,uBAAc,CAAC,8BAA8B,CACzC,KAAK,CAAC,mBAAmB,EACzB,OAAO,CAAC,IAAI,CAAC,EAAE,EACf,CAAC,4BAEJ,KAAK,SAAS,CAAC;IAEpB,IAAI,MAA4B,CAAC;IAEjC,QAAQ,mBAAmB,CAAC,IAAI,EAAE;QAC9B;YACI,MAAM,GAAG,eAAI,CAAC,WAAW,CAAC;YAC1B,MAAM;QAEV;YACI,MAAM,GAAG,eAAI,CAAC,eAAe,CAAC;YAC9B,MAAM;QAEV,2BAA0B;QAC1B;YACI,QAAQ,mBAAmB,CAAC,iBAAiB,EAAE;gBAC3C,KAAK,SAAS;oBACV,MAAM,GAAG,eAAI,CAAC,WAAW,CAAC;oBAC1B,MAAM;gBAEV,yCAAyC;gBACzC;oBACI,OAAO,kCAAkC,CAAC,mBAAmB,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;gBAE1F;oBACI,MAAM,0BAAM,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC;aACjD;YAED,MAAM;QAEV;YACI,MAAM,GAAG,eAAI,CAAC,YAAY,CAAC;YAC3B,MAAM;KACb;IAED,KAAK,CAAC,IAAI,WAAG,4BAAwB,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,MAAG,CAAC;IAE7E,OAAO,MAAM,CAAC;AAClB,CAAC;AA3ED,4DA2EC;AAED,SAAS,kCAAkC,CACvC,mBAA2D,EAC3D,SAAiB,EACjB,UAAmB;IAEnB,IAAM,eAAe,GAAqC,mBAAmB,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAEpG,IAAI,eAAe,KAAK,SAAS,EAAE;QAC/B,OAAO,eAAe,CAAC;KAC1B;SAAM,IAAI,mBAAmB,CAAC,MAAM,EAAE;QACnC,OAAO,eAAI,CAAC,WAAW,CAAC;KAC3B;SAAM;QACH,OAAO,UAAU,CAAC,CAAC,CAAC,eAAI,CAAC,YAAY,CAAC,CAAC,CAAC,eAAI,CAAC,YAAY,CAAC;KAC7D;AACL,CAAC"}