@microsoft/powerquery-language-services 0.6.11 → 0.9.2

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

@@ -1 +1 @@
-{"version":3,"file":"library.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/library/library.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAKlC,8CAA6C;AAM7C,IAAkB,qBAIjB;AAJD,WAAkB,qBAAqB;IACnC,8CAAqB,CAAA;IACrB,8CAAqB,CAAA;IACrB,sCAAa,CAAA;AACjB,CAAC,EAJiB,qBAAqB,GAArB,6BAAqB,KAArB,6BAAqB,QAItC;AAoCY,QAAA,WAAW,GAAa;IACjC,oBAAoB,EAAE,yBAAY,CAAC,wBAAwB;IAC3D,kBAAkB,EAAE,IAAI,GAAG,EAAE;CAChC,CAAC"}
+{"version":3,"file":"library.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/library/library.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAKlC,kDAA+C;AAM/C,IAAkB,qBAIjB;AAJD,WAAkB,qBAAqB;IACnC,8CAAqB,CAAA;IACrB,8CAAqB,CAAA;IACrB,sCAAa,CAAA;AACjB,CAAC,EAJiB,qBAAqB,GAArB,6BAAqB,KAArB,6BAAqB,QAItC;AAoCY,QAAA,WAAW,GAAa;IACjC,oBAAoB,EAAE,2BAAY,CAAC,wBAAwB;IAC3D,kBAAkB,EAAE,IAAI,GAAG,EAAE;CAChC,CAAC"}

package/lib/powerquery-language-services/library/librarySymbol.d.ts

@@ -0,0 +1,33 @@
+export interface LibrarySymbol {
+    readonly name: string;
+    readonly documentation: LibrarySymbolDocumentation | null | undefined;
+    readonly functionParameters: ReadonlyArray<LibrarySymbolFunctionParameter> | null | undefined;
+    readonly completionItemKind: number;
+    readonly isDataSource: boolean;
+    readonly type: string;
+}
+export interface LibrarySymbolDocumentation {
+    readonly description: string | null | undefined;
+    readonly longDescription: string | null | undefined;
+}
+export interface LibrarySymbolFunctionParameter {
+    readonly name: string;
+    readonly type: string;
+    readonly isRequired: boolean;
+    readonly isNullable: boolean;
+    readonly caption: string | null | undefined;
+    readonly description: string | null | undefined;
+    readonly sampleValues: ReadonlyArray<string | number> | null | undefined;
+    readonly allowedValues: ReadonlyArray<string | number> | null | undefined;
+    readonly defaultValue: string | number | null | undefined;
+    readonly fields: ReadonlyArray<LibrarySymbolRecordField> | null | undefined;
+    readonly enumNames: ReadonlyArray<string> | null | undefined;
+    readonly enumCaptions: ReadonlyArray<string | null> | null | undefined;
+}
+export interface LibrarySymbolRecordField {
+    readonly name: string;
+    readonly type: string;
+    readonly isRequired: boolean;
+    readonly caption: string | null | undefined;
+    readonly description: string | null | undefined;
+}

package/lib/powerquery-language-services/library/librarySymbol.js

@@ -0,0 +1,5 @@
+"use strict";
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=librarySymbol.js.map

package/lib/powerquery-language-services/library/librarySymbol.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"librarySymbol.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/library/librarySymbol.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC"}

package/lib/powerquery-language-services/library/librarySymbolUtils.d.ts

@@ -0,0 +1,15 @@
+import { PartialResult } from "@microsoft/powerquery-parser";
+import { ExternalType } from "../externalType";
+import { Library } from "../library";
+import { LibrarySymbol } from "./librarySymbol";
+export declare type IncompleteLibrary = {
+    readonly library: Library.ILibrary;
+    readonly invalidSymbols: ReadonlyArray<LibrarySymbol>;
+};
+export declare type IncompleteLibraryDefinitions = {
+    readonly libraryDefinitions: Library.LibraryDefinitions;
+    readonly invalidSymbols: ReadonlyArray<LibrarySymbol>;
+};
+export declare function createLibrary(librarySymbols: ReadonlyArray<LibrarySymbol>, externalTypeResolverFn: ExternalType.TExternalTypeResolverFn | undefined): PartialResult<Library.ILibrary, IncompleteLibrary, ReadonlyArray<LibrarySymbol>>;
+export declare function createLibraryDefinitions(librarySymbols: ReadonlyArray<LibrarySymbol>): PartialResult<Library.LibraryDefinitions, IncompleteLibraryDefinitions, ReadonlyArray<LibrarySymbol>>;
+export declare function librarySymbolToLibraryDefinition(librarySymbol: LibrarySymbol): Library.TLibraryDefinition | undefined;

package/lib/powerquery-language-services/library/librarySymbolUtils.js

@@ -0,0 +1,237 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.librarySymbolToLibraryDefinition = exports.createLibraryDefinitions = exports.createLibrary = void 0;
+const powerquery_parser_1 = require("@microsoft/powerquery-parser");
+const language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
+const trace_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/common/trace");
+const externalType_1 = require("../externalType");
+const library_1 = require("../library");
+const commonTypes_1 = require("../commonTypes");
+function createLibrary(librarySymbols, externalTypeResolverFn) {
+    const libraryDefinitionsResult = createLibraryDefinitions(librarySymbols);
+    let libraryDefinitions;
+    let invalidSymbols;
+    if (powerquery_parser_1.PartialResultUtils.isOk(libraryDefinitionsResult)) {
+        libraryDefinitions = libraryDefinitionsResult.value;
+        invalidSymbols = [];
+    }
+    else if (powerquery_parser_1.PartialResultUtils.isIncomplete(libraryDefinitionsResult)) {
+        libraryDefinitions = libraryDefinitionsResult.partial.libraryDefinitions;
+        invalidSymbols = libraryDefinitionsResult.partial.invalidSymbols;
+    }
+    else if (powerquery_parser_1.PartialResultUtils.isError(libraryDefinitionsResult)) {
+        return powerquery_parser_1.PartialResultUtils.error(libraryDefinitionsResult.error);
+    }
+    else {
+        powerquery_parser_1.Assert.isNever(libraryDefinitionsResult);
+    }
+    const definitionResolverFn = library_1.LibraryUtils.externalTypeResolver(libraryDefinitions);
+    const library = {
+        libraryDefinitions,
+        externalTypeResolver: externalTypeResolverFn
+            ? externalType_1.ExternalTypeUtils.composeExternalTypeResolvers(externalTypeResolverFn, definitionResolverFn)
+            : definitionResolverFn,
+    };
+    if (invalidSymbols.length > 0) {
+        return powerquery_parser_1.PartialResultUtils.incomplete({
+            library,
+            invalidSymbols,
+        });
+    }
+    else {
+        return powerquery_parser_1.PartialResultUtils.ok(library);
+    }
+}
+exports.createLibrary = createLibrary;
+function createLibraryDefinitions(librarySymbols) {
+    const libraryDefinitions = new Map();
+    const invalidSymbols = [];
+    for (const librarySymbol of librarySymbols) {
+        const libraryDefinition = librarySymbolToLibraryDefinition(librarySymbol);
+        if (libraryDefinition === undefined) {
+            invalidSymbols.push(librarySymbol);
+        }
+        else {
+            libraryDefinitions.set(librarySymbol.name, libraryDefinition);
+        }
+    }
+    if (invalidSymbols.length === 0) {
+        return powerquery_parser_1.PartialResultUtils.ok(libraryDefinitions);
+    }
+    else if (libraryDefinitions.size > 0) {
+        return powerquery_parser_1.PartialResultUtils.incomplete({
+            libraryDefinitions,
+            invalidSymbols,
+        });
+    }
+    else {
+        return powerquery_parser_1.PartialResultUtils.error(invalidSymbols);
+    }
+}
+exports.createLibraryDefinitions = createLibraryDefinitions;
+function librarySymbolToLibraryDefinition(librarySymbol) {
+    var _a, _b;
+    const primitiveType = stringToPrimitiveType(librarySymbol.type);
+    const completionItemKind = numberToCompletionItemKind(librarySymbol.completionItemKind);
+    if (primitiveType === undefined || completionItemKind === undefined) {
+        return undefined;
+    }
+    const label = librarySymbol.name;
+    const description = (_b = (_a = librarySymbol.documentation) === null || _a === void 0 ? void 0 : _a.description) !== null && _b !== void 0 ? _b : "No description available";
+    if (primitiveType.kind === "Type" /* Type */) {
+        return {
+            kind: "Type" /* Type */,
+            label,
+            description,
+            asPowerQueryType: primitiveType,
+            completionItemKind,
+        };
+    }
+    else if (librarySymbol.functionParameters) {
+        const asPowerQueryType = librarySymbolFunctionSignatureToType(librarySymbol, primitiveType);
+        if (asPowerQueryType === undefined) {
+            return undefined;
+        }
+        const parameters = [];
+        for (const parameter of librarySymbol.functionParameters) {
+            const libraryParameter = librarySymbolFunctionParameterToLibraryParameter(parameter);
+            if (libraryParameter === undefined) {
+                return undefined;
+            }
+            parameters.push(libraryParameter);
+        }
+        return {
+            kind: "Function" /* Function */,
+            label: language_1.TypeUtils.nameOf(asPowerQueryType, trace_1.NoOpTraceManagerInstance, undefined),
+            description,
+            asPowerQueryType,
+            completionItemKind,
+            parameters,
+        };
+    }
+    else {
+        return {
+            kind: "Constant" /* Constant */,
+            label,
+            description,
+            asPowerQueryType: primitiveType,
+            completionItemKind,
+        };
+    }
+}
+exports.librarySymbolToLibraryDefinition = librarySymbolToLibraryDefinition;
+function librarySymbolFunctionSignatureToType(librarySymbol, returnType) {
+    var _a;
+    const parameters = [];
+    for (const parameter of (_a = librarySymbol.functionParameters) !== null && _a !== void 0 ? _a : []) {
+        const primitiveType = stringToPrimitiveType(parameter.type);
+        if (primitiveType === undefined) {
+            return undefined;
+        }
+        parameters.push({
+            isNullable: primitiveType.isNullable,
+            isOptional: !parameter.isRequired,
+            type: primitiveType.kind,
+            nameLiteral: parameter.name,
+        });
+    }
+    return language_1.TypeUtils.definedFunction(false, parameters, returnType);
+}
+function librarySymbolFunctionParameterToLibraryParameter(parameter) {
+    var _a;
+    const primitiveType = stringToPrimitiveType(parameter.type);
+    if (primitiveType === undefined) {
+        return undefined;
+    }
+    return {
+        isNullable: primitiveType.isNullable,
+        isOptional: false,
+        label: parameter.name,
+        documentation: (_a = parameter.description) !== null && _a !== void 0 ? _a : undefined,
+        typeKind: primitiveType.kind,
+    };
+}
+function numberToCompletionItemKind(variant) {
+    switch (variant) {
+        case commonTypes_1.CompletionItemKind.Constant:
+        case commonTypes_1.CompletionItemKind.Constructor:
+        case commonTypes_1.CompletionItemKind.Enum:
+        case commonTypes_1.CompletionItemKind.EnumMember:
+        case commonTypes_1.CompletionItemKind.Event:
+        case commonTypes_1.CompletionItemKind.Field:
+        case commonTypes_1.CompletionItemKind.File:
+        case commonTypes_1.CompletionItemKind.Folder:
+        case commonTypes_1.CompletionItemKind.Function:
+        case commonTypes_1.CompletionItemKind.Interface:
+        case commonTypes_1.CompletionItemKind.Keyword:
+        case commonTypes_1.CompletionItemKind.Method:
+        case commonTypes_1.CompletionItemKind.Module:
+        case commonTypes_1.CompletionItemKind.Operator:
+        case commonTypes_1.CompletionItemKind.Property:
+        case commonTypes_1.CompletionItemKind.Reference:
+        case commonTypes_1.CompletionItemKind.Snippet:
+        case commonTypes_1.CompletionItemKind.Struct:
+        case commonTypes_1.CompletionItemKind.Text:
+        case commonTypes_1.CompletionItemKind.TypeParameter:
+        case commonTypes_1.CompletionItemKind.Unit:
+        case commonTypes_1.CompletionItemKind.Value:
+        case commonTypes_1.CompletionItemKind.Variable:
+            return variant;
+        default:
+            return undefined;
+    }
+}
+// Depending on which path we took to generate the symbols parameters that are lists will have one of two forms:
+// 1. `list`
+// 2. `list {$typeKind}`
+// To make my life easier I'm going to allow both forms at this layer,
+// and then normalize both forms to `list`.
+function stringToPrimitiveType(text) {
+    const split = text.split(" ");
+    let isNullable;
+    let typeKind;
+    switch (split.length) {
+        case 0:
+            return undefined;
+        case 1: {
+            isNullable = false;
+            typeKind = stringToTypeKind(text);
+            break;
+        }
+        // Either `nullable $typeKind` or `list {$typeKind}`
+        case 2: {
+            const first = split[0];
+            if (first === "nullable" /* Nullable */) {
+                isNullable = true;
+                typeKind = stringToTypeKind(split[1]);
+                break;
+            }
+            else if (first === "list" /* List */) {
+                isNullable = false;
+                typeKind = "List" /* List */;
+                break;
+            }
+            else {
+                return undefined;
+            }
+        }
+        // `nullable list {$typeKind}`
+        case 3: {
+            if (split[0] !== "nullable" /* Nullable */ || split[1] !== "list" /* List */) {
+                return undefined;
+            }
+            isNullable = true;
+            typeKind = "List" /* List */;
+            break;
+        }
+        default:
+            return undefined;
+    }
+    return typeKind ? language_1.TypeUtils.primitiveType(isNullable, typeKind) : undefined;
+}
+function stringToTypeKind(text) {
+    return language_1.ConstantUtils.isPrimitiveTypeConstant(text)
+        ? language_1.TypeUtils.typeKindFromPrimitiveTypeConstantKind(text)
+        : undefined;
+}
+//# sourceMappingURL=librarySymbolUtils.js.map

package/lib/powerquery-language-services/library/librarySymbolUtils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"librarySymbolUtils.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/library/librarySymbolUtils.ts"],"names":[],"mappings":";;;AAAA,oEAAyF;AACzF,0FAAuH;AACvH,2FAA2G;AAE3G,kDAAkE;AAClE,wCAAmD;AAEnD,gDAAoD;AAYpD,SAAgB,aAAa,CACzB,cAA4C,EAC5C,sBAAwE;IAExE,MAAM,wBAAwB,GAI1B,wBAAwB,CAAC,cAAc,CAAC,CAAC;IAE7C,IAAI,kBAA8C,CAAC;IACnD,IAAI,cAA4C,CAAC;IAEjD,IAAI,sCAAkB,CAAC,IAAI,CAAC,wBAAwB,CAAC,EAAE;QACnD,kBAAkB,GAAG,wBAAwB,CAAC,KAAK,CAAC;QACpD,cAAc,GAAG,EAAE,CAAC;KACvB;SAAM,IAAI,sCAAkB,CAAC,YAAY,CAAC,wBAAwB,CAAC,EAAE;QAClE,kBAAkB,GAAG,wBAAwB,CAAC,OAAO,CAAC,kBAAkB,CAAC;QACzE,cAAc,GAAG,wBAAwB,CAAC,OAAO,CAAC,cAAc,CAAC;KACpE;SAAM,IAAI,sCAAkB,CAAC,OAAO,CAAC,wBAAwB,CAAC,EAAE;QAC7D,OAAO,sCAAkB,CAAC,KAAK,CAAC,wBAAwB,CAAC,KAAK,CAAC,CAAC;KACnE;SAAM;QACH,0BAAM,CAAC,OAAO,CAAC,wBAAwB,CAAC,CAAC;KAC5C;IAED,MAAM,oBAAoB,GACtB,sBAAY,CAAC,oBAAoB,CAAC,kBAAkB,CAAC,CAAC;IAE1D,MAAM,OAAO,GAAqB;QAC9B,kBAAkB;QAClB,oBAAoB,EAAE,sBAAsB;YACxC,CAAC,CAAC,gCAAiB,CAAC,4BAA4B,CAAC,sBAAsB,EAAE,oBAAoB,CAAC;YAC9F,CAAC,CAAC,oBAAoB;KAC7B,CAAC;IAEF,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE;QAC3B,OAAO,sCAAkB,CAAC,UAAU,CAAC;YACjC,OAAO;YACP,cAAc;SACjB,CAAC,CAAC;KACN;SAAM;QACH,OAAO,sCAAkB,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC;KACzC;AACL,CAAC;AA3CD,sCA2CC;AAED,SAAgB,wBAAwB,CACpC,cAA4C;IAE5C,MAAM,kBAAkB,GAA4C,IAAI,GAAG,EAAsC,CAAC;IAClH,MAAM,cAAc,GAAoB,EAAE,CAAC;IAE3C,KAAK,MAAM,aAAa,IAAI,cAAc,EAAE;QACxC,MAAM,iBAAiB,GACnB,gCAAgC,CAAC,aAAa,CAAC,CAAC;QAEpD,IAAI,iBAAiB,KAAK,SAAS,EAAE;YACjC,cAAc,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;SACtC;aAAM;YACH,kBAAkB,CAAC,GAAG,CAAC,aAAa,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;SACjE;KACJ;IAED,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE;QAC7B,OAAO,sCAAkB,CAAC,EAAE,CAAC,kBAAkB,CAAC,CAAC;KACpD;SAAM,IAAI,kBAAkB,CAAC,IAAI,GAAG,CAAC,EAAE;QACpC,OAAO,sCAAkB,CAAC,UAAU,CAAC;YACjC,kBAAkB;YAClB,cAAc;SACjB,CAAC,CAAC;KACN;SAAM;QACH,OAAO,sCAAkB,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;KACnD;AACL,CAAC;AA3BD,4DA2BC;AAED,SAAgB,gCAAgC,CAAC,aAA4B;;IACzE,MAAM,aAAa,GAAoC,qBAAqB,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IAEjG,MAAM,kBAAkB,GAAmC,0BAA0B,CACjF,aAAa,CAAC,kBAAkB,CACnC,CAAC;IAEF,IAAI,aAAa,KAAK,SAAS,IAAI,kBAAkB,KAAK,SAAS,EAAE;QACjE,OAAO,SAAS,CAAC;KACpB;IAED,MAAM,KAAK,GAAW,aAAa,CAAC,IAAI,CAAC;IACzC,MAAM,WAAW,GAAW,MAAA,MAAA,aAAa,CAAC,aAAa,0CAAE,WAAW,mCAAI,0BAA0B,CAAC;IAEnG,IAAI,aAAa,CAAC,IAAI,sBAAuB,EAAE;QAC3C,OAAO;YACH,IAAI,mBAAoC;YACxC,KAAK;YACL,WAAW;YACX,gBAAgB,EAAE,aAAa;YAC/B,kBAAkB;SACrB,CAAC;KACL;SAAM,IAAI,aAAa,CAAC,kBAAkB,EAAE;QACzC,MAAM,gBAAgB,GAAqC,oCAAoC,CAC3F,aAAa,EACb,aAAa,CAChB,CAAC;QAEF,IAAI,gBAAgB,KAAK,SAAS,EAAE;YAChC,OAAO,SAAS,CAAC;SACpB;QAED,MAAM,UAAU,GAA+B,EAAE,CAAC;QAElD,KAAK,MAAM,SAAS,IAAI,aAAa,CAAC,kBAAkB,EAAE;YACtD,MAAM,gBAAgB,GAClB,gDAAgD,CAAC,SAAS,CAAC,CAAC;YAEhE,IAAI,gBAAgB,KAAK,SAAS,EAAE;gBAChC,OAAO,SAAS,CAAC;aACpB;YAED,UAAU,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;SACrC;QAED,OAAO;YACH,IAAI,2BAAwC;YAC5C,KAAK,EAAE,oBAAS,CAAC,MAAM,CAAC,gBAAgB,EAAE,gCAAwB,EAAE,SAAS,CAAC;YAC9E,WAAW;YACX,gBAAgB;YAChB,kBAAkB;YAClB,UAAU;SACb,CAAC;KACL;SAAM;QACH,OAAO;YACH,IAAI,2BAAwC;YAC5C,KAAK;YACL,WAAW;YACX,gBAAgB,EAAE,aAAa;YAC/B,kBAAkB;SACrB,CAAC;KACL;AACL,CAAC;AA9DD,4EA8DC;AAED,SAAS,oCAAoC,CACzC,aAA4B,EAC5B,UAA+B;;IAE/B,MAAM,UAAU,GAA6B,EAAE,CAAC;IAEhD,KAAK,MAAM,SAAS,IAAI,MAAA,aAAa,CAAC,kBAAkB,mCAAI,EAAE,EAAE;QAC5D,MAAM,aAAa,GAAoC,qBAAqB,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAE7F,IAAI,aAAa,KAAK,SAAS,EAAE;YAC7B,OAAO,SAAS,CAAC;SACpB;QAED,UAAU,CAAC,IAAI,CAAC;YACZ,UAAU,EAAE,aAAa,CAAC,UAAU;YACpC,UAAU,EAAE,CAAC,SAAS,CAAC,UAAU;YACjC,IAAI,EAAE,aAAa,CAAC,IAAI;YACxB,WAAW,EAAE,SAAS,CAAC,IAAI;SAC9B,CAAC,CAAC;KACN;IAED,OAAO,oBAAS,CAAC,eAAe,CAAC,KAAK,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;AACpE,CAAC;AAED,SAAS,gDAAgD,CACrD,SAAyC;;IAEzC,MAAM,aAAa,GAAoC,qBAAqB,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAE7F,IAAI,aAAa,KAAK,SAAS,EAAE;QAC7B,OAAO,SAAS,CAAC;KACpB;IAED,OAAO;QACH,UAAU,EAAE,aAAa,CAAC,UAAU;QACpC,UAAU,EAAE,KAAK;QACjB,KAAK,EAAE,SAAS,CAAC,IAAI;QACrB,aAAa,EAAE,MAAA,SAAS,CAAC,WAAW,mCAAI,SAAS;QACjD,QAAQ,EAAE,aAAa,CAAC,IAAI;KAC/B,CAAC;AACN,CAAC;AAED,SAAS,0BAA0B,CAAC,OAAe;IAC/C,QAAQ,OAAO,EAAE;QACb,KAAK,gCAAkB,CAAC,QAAQ,CAAC;QACjC,KAAK,gCAAkB,CAAC,WAAW,CAAC;QACpC,KAAK,gCAAkB,CAAC,IAAI,CAAC;QAC7B,KAAK,gCAAkB,CAAC,UAAU,CAAC;QACnC,KAAK,gCAAkB,CAAC,KAAK,CAAC;QAC9B,KAAK,gCAAkB,CAAC,KAAK,CAAC;QAC9B,KAAK,gCAAkB,CAAC,IAAI,CAAC;QAC7B,KAAK,gCAAkB,CAAC,MAAM,CAAC;QAC/B,KAAK,gCAAkB,CAAC,QAAQ,CAAC;QACjC,KAAK,gCAAkB,CAAC,SAAS,CAAC;QAClC,KAAK,gCAAkB,CAAC,OAAO,CAAC;QAChC,KAAK,gCAAkB,CAAC,MAAM,CAAC;QAC/B,KAAK,gCAAkB,CAAC,MAAM,CAAC;QAC/B,KAAK,gCAAkB,CAAC,QAAQ,CAAC;QACjC,KAAK,gCAAkB,CAAC,QAAQ,CAAC;QACjC,KAAK,gCAAkB,CAAC,SAAS,CAAC;QAClC,KAAK,gCAAkB,CAAC,OAAO,CAAC;QAChC,KAAK,gCAAkB,CAAC,MAAM,CAAC;QAC/B,KAAK,gCAAkB,CAAC,IAAI,CAAC;QAC7B,KAAK,gCAAkB,CAAC,aAAa,CAAC;QACtC,KAAK,gCAAkB,CAAC,IAAI,CAAC;QAC7B,KAAK,gCAAkB,CAAC,KAAK,CAAC;QAC9B,KAAK,gCAAkB,CAAC,QAAQ;YAC5B,OAAO,OAAO,CAAC;QAEnB;YACI,OAAO,SAAS,CAAC;KACxB;AACL,CAAC;AAED,gHAAgH;AAChH,YAAY;AACZ,wBAAwB;AACxB,sEAAsE;AACtE,2CAA2C;AAC3C,SAAS,qBAAqB,CAAC,IAAY;IACvC,MAAM,KAAK,GAA0B,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAErD,IAAI,UAAmB,CAAC;IACxB,IAAI,QAAmC,CAAC;IAExC,QAAQ,KAAK,CAAC,MAAM,EAAE;QAClB,KAAK,CAAC;YACF,OAAO,SAAS,CAAC;QAErB,KAAK,CAAC,CAAC,CAAC;YACJ,UAAU,GAAG,KAAK,CAAC;YACnB,QAAQ,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC;YAClC,MAAM;SACT;QAED,oDAAoD;QACpD,KAAK,CAAC,CAAC,CAAC;YACJ,MAAM,KAAK,GAAW,KAAK,CAAC,CAAC,CAAC,CAAC;YAE/B,IAAI,KAAK,8BAAuC,EAAE;gBAC9C,UAAU,GAAG,IAAI,CAAC;gBAClB,QAAQ,GAAG,gBAAgB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;gBAEtC,MAAM;aACT;iBAAM,IAAI,KAAK,sBAAwC,EAAE;gBACtD,UAAU,GAAG,KAAK,CAAC;gBACnB,QAAQ,oBAAqB,CAAC;gBAE9B,MAAM;aACT;iBAAM;gBACH,OAAO,SAAS,CAAC;aACpB;SACJ;QAED,8BAA8B;QAC9B,KAAK,CAAC,CAAC,CAAC;YACJ,IAAI,KAAK,CAAC,CAAC,CAAC,8BAAuC,IAAI,KAAK,CAAC,CAAC,CAAC,sBAAwC,EAAE;gBACrG,OAAO,SAAS,CAAC;aACpB;YAED,UAAU,GAAG,IAAI,CAAC;YAClB,QAAQ,oBAAqB,CAAC;YAE9B,MAAM;SACT;QAED;YACI,OAAO,SAAS,CAAC;KACxB;IAED,OAAO,QAAQ,CAAC,CAAC,CAAC,oBAAS,CAAC,aAAa,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AAChF,CAAC;AAED,SAAS,gBAAgB,CAAC,IAAY;IAClC,OAAO,wBAAa,CAAC,uBAAuB,CAAC,IAAI,CAAC;QAC9C,CAAC,CAAC,oBAAS,CAAC,qCAAqC,CAAC,IAAI,CAAC;QACvD,CAAC,CAAC,SAAS,CAAC;AACpB,CAAC"}

package/lib/powerquery-language-services/library/libraryUtils.d.ts

@@ -1,17 +1,19 @@
 import { CompletionItemKind, ParameterInformation, SignatureInformation } from "vscode-languageserver-types";
 import { Type } from "@microsoft/powerquery-parser/lib/powerquery-parser/language";
-import { LibraryConstant, LibraryDefinitionKind, LibraryFunction, LibraryParameter, LibraryType, TLibraryDefinition } from "./library";
+import { LibraryConstant, LibraryDefinitionKind, LibraryDefinitions, LibraryFunction, LibraryParameter, LibraryType, TLibraryDefinition } from "./library";
+import { ExternalType } from "../externalType";
 export declare function assertAsConstant(definition: TLibraryDefinition | undefined): LibraryConstant;
 export declare function assertAsFunction(definition: TLibraryDefinition | undefined): LibraryFunction;
 export declare function assertAsType(definition: TLibraryDefinition | undefined): LibraryType;
 export declare function assertIsConstant(definition: TLibraryDefinition | undefined): asserts definition is LibraryConstant;
 export declare function assertIsFunction(definition: TLibraryDefinition | undefined): asserts definition is LibraryFunction;
 export declare function assertIsType(definition: TLibraryDefinition | undefined): asserts definition is LibraryType;
-export declare function createConstantDefinition(label: string, description: string, asType: Type.TPowerQueryType, completionItemKind: CompletionItemKind): LibraryConstant;
-export declare function createFunctionDefinition(label: string, description: string, asType: Type.TPowerQueryType, completionItemKind: CompletionItemKind, parameters: ReadonlyArray<LibraryParameter>): LibraryFunction;
+export declare function constantDefinition(label: string, description: string, asType: Type.TPowerQueryType, completionItemKind: CompletionItemKind): LibraryConstant;
+export declare function externalTypeResolver(libraryDefinitions: LibraryDefinitions): ExternalType.TExternalTypeResolverFn;
+export declare function functionDefinition(label: string, description: string, asType: Type.TPowerQueryType, completionItemKind: CompletionItemKind, parameters: ReadonlyArray<LibraryParameter>): LibraryFunction;
 export declare function isConstant(definition: TLibraryDefinition | undefined): definition is LibraryConstant;
 export declare function isFunction(definition: TLibraryDefinition | undefined): definition is LibraryFunction;
 export declare function isType(definition: TLibraryDefinition | undefined): definition is LibraryType;
-export declare function createSignatureInformation(libraryFunctionSignature: LibraryFunction): SignatureInformation;
-export declare function createParameterInformation(libraryParameter: LibraryParameter): ParameterInformation;
+export declare function signatureInformation(libraryFunctionSignature: LibraryFunction): SignatureInformation;
+export declare function parameterInformation(libraryParameter: LibraryParameter): ParameterInformation;
 export declare function nameOf(kind: LibraryDefinitionKind): string;

package/lib/powerquery-language-services/library/libraryUtils.js

@@ -2,7 +2,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.nameOf = exports.createParameterInformation = exports.createSignatureInformation = exports.isType = exports.isFunction = exports.isConstant = exports.createFunctionDefinition = exports.createConstantDefinition = exports.assertIsType = exports.assertIsFunction = exports.assertIsConstant = exports.assertAsType = exports.assertAsFunction = exports.assertAsConstant = void 0;
+exports.nameOf = exports.parameterInformation = exports.signatureInformation = exports.isType = exports.isFunction = exports.isConstant = exports.functionDefinition = exports.externalTypeResolver = exports.constantDefinition = exports.assertIsType = exports.assertIsFunction = exports.assertIsConstant = exports.assertAsType = exports.assertAsFunction = exports.assertAsConstant = void 0;
 const powerquery_parser_1 = require("@microsoft/powerquery-parser");
 function assertAsConstant(definition) {
     assertIsConstant(definition);
@@ -37,7 +37,7 @@ function assertIsType(definition) {
     }
 }
 exports.assertIsType = assertIsType;
-function createConstantDefinition(label, description, asType, completionItemKind) {
+function constantDefinition(label, description, asType, completionItemKind) {
     return {
         kind: "Constant" /* Constant */,
         asPowerQueryType: asType,
@@ -46,8 +46,12 @@ function createConstantDefinition(label, description, asType, completionItemKind
         label,
     };
 }
-exports.createConstantDefinition = createConstantDefinition;
-function createFunctionDefinition(label, description, asType, completionItemKind, parameters) {
+exports.constantDefinition = constantDefinition;
+function externalTypeResolver(libraryDefinitions) {
+    return (request) => { var _a; return (_a = libraryDefinitions.get(request.identifierLiteral)) === null || _a === void 0 ? void 0 : _a.asPowerQueryType; };
+}
+exports.externalTypeResolver = externalTypeResolver;
+function functionDefinition(label, description, asType, completionItemKind, parameters) {
     return {
         kind: "Function" /* Function */,
         asPowerQueryType: asType,
@@ -57,7 +61,7 @@ function createFunctionDefinition(label, description, asType, completionItemKind
         parameters,
     };
 }
-exports.createFunctionDefinition = createFunctionDefinition;
+exports.functionDefinition = functionDefinition;
 function isConstant(definition) {
     return (definition === null || definition === void 0 ? void 0 : definition.kind) === "Constant" /* Constant */;
 }
@@ -70,21 +74,21 @@ function isType(definition) {
     return (definition === null || definition === void 0 ? void 0 : definition.kind) === "Type" /* Type */;
 }
 exports.isType = isType;
-function createSignatureInformation(libraryFunctionSignature) {
+function signatureInformation(libraryFunctionSignature) {
     return {
         label: libraryFunctionSignature.label,
         documentation: libraryFunctionSignature.description,
-        parameters: libraryFunctionSignature.parameters.map(createParameterInformation),
+        parameters: libraryFunctionSignature.parameters.map(parameterInformation),
     };
 }
-exports.createSignatureInformation = createSignatureInformation;
-function createParameterInformation(libraryParameter) {
+exports.signatureInformation = signatureInformation;
+function parameterInformation(libraryParameter) {
     return {
         label: libraryParameter.label,
         documentation: undefined,
     };
 }
-exports.createParameterInformation = createParameterInformation;
+exports.parameterInformation = parameterInformation;
 function nameOf(kind) {
     switch (kind) {
         case "Function" /* Function */:

package/lib/powerquery-language-services/library/libraryUtils.js.map

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

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

@@ -2,10 +2,12 @@ import * as PQP from "@microsoft/powerquery-parser";
 import { NodeIdMap, TXorNode } from "@microsoft/powerquery-parser/lib/powerquery-parser/parser";
 import type { Position, Range } from "vscode-languageserver-types";
 import { Ast } from "@microsoft/powerquery-parser/lib/powerquery-parser/language";
-export declare function createPositionFromTokenPosition(tokenPosition: PQP.Language.Token.TokenPosition): Position;
-export declare function createRangeFromXorNode(nodeIdMapCollection: NodeIdMap.Collection, xorNode: TXorNode): Promise<Range | undefined>;
-export declare function createRangeFromTokenPositions(startTokenPosition: PQP.Language.Token.TokenPosition | undefined, endTokenPosition: PQP.Language.Token.TokenPosition | undefined): Range | undefined;
-export declare function createRangeFromTokenRange(tokenRange: PQP.Language.Token.TokenRange): Range;
+import { TokenPositionComparison } from "./tokenPositionComparison";
+export declare function compareTokenPosition(position: Position, tokenPosition: PQP.Language.Token.TokenPosition): TokenPositionComparison;
+export declare function positionFromTokenPosition(tokenPosition: PQP.Language.Token.TokenPosition): Position;
+export declare function rangeFromXorNode(nodeIdMapCollection: NodeIdMap.Collection, xorNode: TXorNode): Promise<Range | undefined>;
+export declare function rangeFromTokenPositions(startTokenPosition: PQP.Language.Token.TokenPosition | undefined, endTokenPosition: PQP.Language.Token.TokenPosition | undefined): Range | undefined;
+export declare function rangeFromTokenRange(tokenRange: PQP.Language.Token.TokenRange): Range;
 export declare function isBeforeXor(position: Position, xorNode: TXorNode, isBoundIncluded: boolean): boolean;
 export declare function isInXor(nodeIdMapCollection: NodeIdMap.Collection, position: Position, xorNode: TXorNode, isLowerBoundIncluded: boolean, isUpperBoundIncluded: boolean): boolean;
 export declare function isOnXorStart(position: Position, xorNode: TXorNode): boolean;
@@ -21,6 +23,8 @@ export declare function isInAst(position: Position, astNode: Ast.TNode, isLowerB
 export declare function isOnAstStart(position: Position, astNode: Ast.TNode): boolean;
 export declare function isOnAstEnd(position: Position, astNode: Ast.TNode): boolean;
 export declare function isAfterAst(position: Position, astNode: Ast.TNode, isBoundIncluded: boolean): boolean;
+export declare function isOnTokenStart(position: Position, token: PQP.Language.Token.Token): boolean;
+export declare function isOnTokenEnd(position: Position, token: PQP.Language.Token.Token): boolean;
 export declare function isInToken(position: Position, token: PQP.Language.Token.Token, isLowerBoundIncluded: boolean, isHigherBoundIncluded: boolean): boolean;
 export declare function isBeforeTokenPosition(position: Position, tokenPosition: PQP.Language.Token.TokenPosition, isBoundIncluded: boolean): boolean;
 export declare function isOnTokenPosition(position: Position, tokenPosition: PQP.Language.Token.TokenPosition): boolean;

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

@@ -11,43 +11,62 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isAfterTokenPosition = exports.isOnTokenPosition = exports.isBeforeTokenPosition = exports.isInToken = exports.isAfterAst = exports.isOnAstEnd = exports.isOnAstStart = exports.isInAst = exports.isBeforeAst = exports.isAfterContext = exports.isOnContextEnd = exports.isOnContextStart = exports.isInContext = exports.isBeforeContext = exports.isAfterXor = exports.isOnXorEnd = exports.isOnXorStart = exports.isInXor = exports.isBeforeXor = exports.createRangeFromTokenRange = exports.createRangeFromTokenPositions = exports.createRangeFromXorNode = exports.createPositionFromTokenPosition = void 0;
+exports.isAfterTokenPosition = exports.isOnTokenPosition = exports.isBeforeTokenPosition = exports.isInToken = exports.isOnTokenEnd = exports.isOnTokenStart = exports.isAfterAst = exports.isOnAstEnd = exports.isOnAstStart = exports.isInAst = exports.isBeforeAst = exports.isAfterContext = exports.isOnContextEnd = exports.isOnContextStart = exports.isInContext = exports.isBeforeContext = exports.isAfterXor = exports.isOnXorEnd = exports.isOnXorStart = exports.isInXor = exports.isBeforeXor = exports.rangeFromTokenRange = exports.rangeFromTokenPositions = exports.rangeFromXorNode = exports.positionFromTokenPosition = exports.compareTokenPosition = void 0;
+const PQP = require("@microsoft/powerquery-parser");
 const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
 const powerquery_parser_1 = require("@microsoft/powerquery-parser");
-function createPositionFromTokenPosition(tokenPosition) {
+function compareTokenPosition(position, tokenPosition) {
+    if (isOnTokenPosition(position, tokenPosition)) {
+        return "OnToken" /* OnToken */;
+    }
+    else if (isAfterTokenPosition(position, tokenPosition, false)) {
+        return "RightOfToken" /* RightOfToken */;
+    }
+    else if (isBeforeTokenPosition(position, tokenPosition, false)) {
+        return "LeftOfToken" /* LeftOfToken */;
+    }
+    else {
+        throw new PQP.CommonError.InvariantError("position is not on, after, or before tokenPosition", {
+            position,
+            tokenPosition,
+        });
+    }
+}
+exports.compareTokenPosition = compareTokenPosition;
+function positionFromTokenPosition(tokenPosition) {
     return {
         line: tokenPosition.lineNumber,
         character: tokenPosition.lineCodeUnit,
     };
 }
-exports.createPositionFromTokenPosition = createPositionFromTokenPosition;
+exports.positionFromTokenPosition = positionFromTokenPosition;
 // Attempts to turn a TXorNode into a Range.
 // Returns undefined if there are no leafs nodes.
-function createRangeFromXorNode(nodeIdMapCollection, xorNode) {
+function rangeFromXorNode(nodeIdMapCollection, xorNode) {
     return __awaiter(this, void 0, void 0, function* () {
         const nodeId = xorNode.node.id;
         const leftMostLeaf = parser_1.NodeIdMapUtils.leftMostLeaf(nodeIdMapCollection, nodeId);
         const rightMostLeaf = yield parser_1.NodeIdMapUtils.rightMostLeaf(nodeIdMapCollection, nodeId);
         return Promise.resolve(leftMostLeaf === undefined || rightMostLeaf === undefined
             ? undefined
-            : createRangeFromTokenPositions(leftMostLeaf.tokenRange.positionStart, rightMostLeaf.tokenRange.positionEnd));
+            : rangeFromTokenPositions(leftMostLeaf.tokenRange.positionStart, rightMostLeaf.tokenRange.positionEnd));
     });
 }
-exports.createRangeFromXorNode = createRangeFromXorNode;
-function createRangeFromTokenPositions(startTokenPosition, endTokenPosition) {
+exports.rangeFromXorNode = rangeFromXorNode;
+function rangeFromTokenPositions(startTokenPosition, endTokenPosition) {
     if (startTokenPosition && endTokenPosition) {
         return {
-            start: createPositionFromTokenPosition(startTokenPosition),
-            end: createPositionFromTokenPosition(endTokenPosition),
+            start: positionFromTokenPosition(startTokenPosition),
+            end: positionFromTokenPosition(endTokenPosition),
         };
     }
     return undefined;
 }
-exports.createRangeFromTokenPositions = createRangeFromTokenPositions;
-function createRangeFromTokenRange(tokenRange) {
-    return createRangeFromTokenPositions(tokenRange.positionStart, tokenRange.positionEnd);
+exports.rangeFromTokenPositions = rangeFromTokenPositions;
+function rangeFromTokenRange(tokenRange) {
+    return rangeFromTokenPositions(tokenRange.positionStart, tokenRange.positionEnd);
 }
-exports.createRangeFromTokenRange = createRangeFromTokenRange;
+exports.rangeFromTokenRange = rangeFromTokenRange;
 function isBeforeXor(position, xorNode, isBoundIncluded) {
     switch (xorNode.kind) {
         case "Ast" /* Ast */:
@@ -169,6 +188,14 @@ function isAfterAst(position, astNode, isBoundIncluded) {
     return isAfterTokenPosition(position, astNode.tokenRange.positionEnd, isBoundIncluded);
 }
 exports.isAfterAst = isAfterAst;
+function isOnTokenStart(position, token) {
+    return position.line === token.positionStart.lineNumber && position.character === token.positionStart.lineCodeUnit;
+}
+exports.isOnTokenStart = isOnTokenStart;
+function isOnTokenEnd(position, token) {
+    return position.line === token.positionEnd.lineNumber && position.character === token.positionEnd.lineCodeUnit;
+}
+exports.isOnTokenEnd = isOnTokenEnd;
 function isInToken(position, token, isLowerBoundIncluded, isHigherBoundIncluded) {
     return (!isBeforeTokenPosition(position, token.positionStart, isLowerBoundIncluded) &&
         !isAfterTokenPosition(position, token.positionEnd, isHigherBoundIncluded));

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

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

package/lib/powerquery-language-services/providers/libraryProvider.d.ts

@@ -1,11 +1,11 @@
 import { CommonError, Result } from "@microsoft/powerquery-parser";
 import { Hover, SignatureHelp, SignatureInformation } from "vscode-languageserver-types";
 import { AutocompleteItemProviderContext, HoverProviderContext, ILibraryProvider, SignatureProviderContext } from "./commonTypes";
+import { ExternalType, Inspection } from "..";
 import { Library } from "../library";
-import { Inspection } from "..";
 export declare class LibraryProvider implements ILibraryProvider {
     protected readonly locale: string;
-    readonly externalTypeResolver: Inspection.ExternalType.TExternalTypeResolverFn;
+    readonly externalTypeResolver: ExternalType.TExternalTypeResolverFn;
     readonly libraryDefinitions: Library.LibraryDefinitions;
     protected readonly signatureInformationByLabel: Map<string, SignatureInformation>;
     constructor(library: Library.ILibrary, locale: string);

package/lib/powerquery-language-services/providers/libraryProvider.js

@@ -38,7 +38,7 @@ class LibraryProvider {
                 const autocompleteItems = [];
                 const contextText = context.text;
                 for (const [label, definition] of this.libraryDefinitions.entries()) {
-                    autocompleteItems.push(inspection_1.AutocompleteItemUtils.createFromLibraryDefinition(label, definition, contextText));
+                    autocompleteItems.push(inspection_1.AutocompleteItemUtils.fromLibraryDefinition(label, definition, contextText));
                 }
                 trace.exit();
                 return autocompleteItems;
@@ -120,7 +120,7 @@ class LibraryProvider {
     getOrCreateSignatureInformation(key) {
         if (!this.signatureInformationByLabel.has(key)) {
             const definition = library_1.LibraryUtils.assertAsFunction(this.libraryDefinitions.get(key));
-            this.signatureInformationByLabel.set(key, library_1.LibraryUtils.createSignatureInformation(definition));
+            this.signatureInformationByLabel.set(key, library_1.LibraryUtils.signatureInformation(definition));
         }
         return powerquery_parser_1.Assert.asDefined(this.signatureInformationByLabel.get(key));
     }