zenstack 1.0.0 → 1.0.16

package/language-server/zmodel-linker.js

@@ -0,0 +1,366 @@
+"use strict";
+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.ZModelLinker = void 0;
+const ast_1 = require("@zenstackhq/language/ast");
+const langium_1 = require("langium");
+const vscode_jsonrpc_1 = require("vscode-jsonrpc");
+const utils_1 = require("./utils");
+const utils_2 = require("./validator/utils");
+/**
+ * Langium linker implementation which links references and resolves expression types
+ */
+class ZModelLinker extends langium_1.DefaultLinker {
+    constructor(services) {
+        super(services);
+        this.descriptions = services.workspace.AstNodeDescriptionProvider;
+    }
+    //#region Reference linking
+    link(document, cancelToken = vscode_jsonrpc_1.CancellationToken.None) {
+        var _a, _b;
+        return __awaiter(this, void 0, void 0, function* () {
+            if (((_a = document.parseResult.lexerErrors) === null || _a === void 0 ? void 0 : _a.length) > 0 || ((_b = document.parseResult.parserErrors) === null || _b === void 0 ? void 0 : _b.length) > 0) {
+                return;
+            }
+            for (const node of (0, langium_1.streamContents)(document.parseResult.value)) {
+                yield (0, langium_1.interruptAndCheck)(cancelToken);
+                this.resolve(node, document);
+            }
+            document.state = langium_1.DocumentState.Linked;
+        });
+    }
+    linkReference(container, property, document, extraScopes) {
+        if (!this.resolveFromScopeProviders(container, property, document, extraScopes)) {
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            const reference = container[property];
+            this.doLink({ reference, container, property }, document);
+        }
+    }
+    //#endregion
+    //#region Expression type resolving
+    resolveFromScopeProviders(node, property, document, providers) {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        const reference = node[property];
+        for (const provider of providers) {
+            const target = provider(reference.$refText);
+            if (target) {
+                reference._ref = target;
+                reference._nodeDescription = this.descriptions.createDescription(target, target.name, document);
+                return target;
+            }
+        }
+        return null;
+    }
+    resolve(node, document, extraScopes = []) {
+        switch (node.$type) {
+            case ast_1.LiteralExpr:
+                this.resolveLiteral(node);
+                break;
+            case ast_1.InvocationExpr:
+                this.resolveInvocation(node, document, extraScopes);
+                break;
+            case ast_1.ArrayExpr:
+                this.resolveArray(node, document, extraScopes);
+                break;
+            case ast_1.ReferenceExpr:
+                this.resolveReference(node, document, extraScopes);
+                break;
+            case ast_1.MemberAccessExpr:
+                this.resolveMemberAccess(node, document, extraScopes);
+                break;
+            case ast_1.UnaryExpr:
+                this.resolveUnary(node, document, extraScopes);
+                break;
+            case ast_1.BinaryExpr:
+                this.resolveBinary(node, document, extraScopes);
+                break;
+            case ast_1.ThisExpr:
+                this.resolveThis(node, document, extraScopes);
+                break;
+            case ast_1.NullExpr:
+                this.resolveNull(node, document, extraScopes);
+                break;
+            case ast_1.AttributeArg:
+                this.resolveAttributeArg(node, document, extraScopes);
+                break;
+            default:
+                this.resolveDefault(node, document, extraScopes);
+                break;
+        }
+    }
+    resolveBinary(node, document, extraScopes) {
+        switch (node.operator) {
+            // TODO: support arithmetics?
+            // case '+':
+            // case '-':
+            // case '*':
+            // case '/':
+            //     this.resolve(node.left, document, extraScopes);
+            //     this.resolve(node.right, document, extraScopes);
+            //     this.resolveToBuiltinTypeOrDecl(node, 'Int');
+            //     break;
+            case '>':
+            case '>=':
+            case '<':
+            case '<=':
+            case '==':
+            case '!=':
+            case '&&':
+            case '||':
+                this.resolve(node.left, document, extraScopes);
+                this.resolve(node.right, document, extraScopes);
+                this.resolveToBuiltinTypeOrDecl(node, 'Boolean');
+                break;
+            case '?':
+            case '!':
+            case '^':
+                this.resolveCollectionPredicate(node, document, extraScopes);
+                break;
+            default:
+                throw Error(`Unsupported binary operator: ${node.operator}`);
+        }
+    }
+    resolveUnary(node, document, extraScopes) {
+        this.resolve(node.operand, document, extraScopes);
+        node.$resolvedType = node.operand.$resolvedType;
+    }
+    resolveReference(node, document, extraScopes) {
+        this.linkReference(node, 'target', document, extraScopes);
+        node.args.forEach((arg) => this.resolve(arg, document, extraScopes));
+        if (node.target.ref) {
+            // resolve type
+            if (node.target.ref.$type === ast_1.EnumField) {
+                this.resolveToBuiltinTypeOrDecl(node, node.target.ref.$container);
+            }
+            else {
+                this.resolveToDeclaredType(node, node.target.ref.type);
+            }
+        }
+    }
+    resolveArray(node, document, extraScopes) {
+        node.items.forEach((item) => this.resolve(item, document, extraScopes));
+        if (node.items.length > 0) {
+            const itemType = node.items[0].$resolvedType;
+            if (itemType === null || itemType === void 0 ? void 0 : itemType.decl) {
+                this.resolveToBuiltinTypeOrDecl(node, itemType.decl, true);
+            }
+        }
+        else {
+            this.resolveToBuiltinTypeOrDecl(node, 'Any', true);
+        }
+    }
+    resolveInvocation(node, document, extraScopes) {
+        this.linkReference(node, 'function', document, extraScopes);
+        node.args.forEach((arg) => this.resolve(arg, document, extraScopes));
+        if (node.function.ref) {
+            // eslint-disable-next-line @typescript-eslint/ban-types
+            const funcDecl = node.function.ref;
+            if (funcDecl.name === 'auth' && (0, utils_1.isFromStdlib)(funcDecl)) {
+                // auth() function is resolved to User model in the current document
+                const model = (0, utils_1.getContainingModel)(node);
+                const userModel = model === null || model === void 0 ? void 0 : model.declarations.find((d) => (0, ast_1.isDataModel)(d) && d.name === 'User');
+                if (userModel) {
+                    node.$resolvedType = { decl: userModel };
+                }
+            }
+            else if (funcDecl.name === 'future' && (0, utils_1.isFromStdlib)(funcDecl)) {
+                // future() function is resolved to current model
+                node.$resolvedType = { decl: this.getContainingDataModel(node) };
+            }
+            else {
+                this.resolveToDeclaredType(node, funcDecl.returnType);
+            }
+        }
+    }
+    getContainingDataModel(node) {
+        let curr = node.$container;
+        while (curr) {
+            if ((0, ast_1.isDataModel)(curr)) {
+                return curr;
+            }
+            curr = curr.$container;
+        }
+        return undefined;
+    }
+    resolveLiteral(node) {
+        const type = typeof node.value === 'string'
+            ? 'String'
+            : typeof node.value === 'boolean'
+                ? 'Boolean'
+                : typeof node.value === 'number'
+                    ? 'Int'
+                    : undefined;
+        if (type) {
+            this.resolveToBuiltinTypeOrDecl(node, type);
+        }
+    }
+    resolveMemberAccess(node, document, extraScopes) {
+        this.resolve(node.operand, document, extraScopes);
+        const operandResolved = node.operand.$resolvedType;
+        if (operandResolved && !operandResolved.array && (0, ast_1.isDataModel)(operandResolved.decl)) {
+            const modelDecl = operandResolved.decl;
+            const provider = (name) => modelDecl.fields.find((f) => f.name === name);
+            extraScopes = [provider, ...extraScopes];
+        }
+        this.linkReference(node, 'member', document, extraScopes);
+        if (node.member.ref) {
+            this.resolveToDeclaredType(node, node.member.ref.type);
+        }
+    }
+    resolveCollectionPredicate(node, document, extraScopes) {
+        this.resolve(node.left, document, extraScopes);
+        const resolvedType = node.left.$resolvedType;
+        if (resolvedType && (0, ast_1.isDataModel)(resolvedType.decl) && resolvedType.array) {
+            const dataModelDecl = resolvedType.decl;
+            const provider = (name) => dataModelDecl.fields.find((f) => f.name === name);
+            extraScopes = [provider, ...extraScopes];
+            this.resolve(node.right, document, extraScopes);
+            this.resolveToBuiltinTypeOrDecl(node, 'Boolean');
+        }
+        else {
+            // error is reported in validation pass
+        }
+    }
+    resolveThis(node, 
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    document, 
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    extraScopes) {
+        let decl = node.$container;
+        while (decl && !(0, ast_1.isDataModel)(decl)) {
+            decl = decl.$container;
+        }
+        if (decl) {
+            this.resolveToBuiltinTypeOrDecl(node, decl);
+        }
+    }
+    resolveNull(node, 
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    document, 
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    extraScopes) {
+        // TODO: how to really resolve null?
+        this.resolveToBuiltinTypeOrDecl(node, 'Null');
+    }
+    resolveAttributeArg(node, document, extraScopes) {
+        var _a, _b, _c;
+        const attrParam = this.findAttrParamForArg(node);
+        const attrAppliedOn = node.$container.$container;
+        if ((attrParam === null || attrParam === void 0 ? void 0 : attrParam.type.type) === 'TransitiveFieldReference' && (0, ast_1.isDataModelField)(attrAppliedOn)) {
+            // "TransitiveFieldReference" is resolved in the context of the containing model of the field
+            // where the attribute is applied
+            //
+            // E.g.:
+            //
+            // model A {
+            //   myId @id String
+            // }
+            //
+            // model B {
+            //   id @id String
+            //   a A @relation(fields: [id], references: [myId])
+            // }
+            //
+            // In model B, the attribute argument "myId" is resolved to the field "myId" in model A
+            const transtiveDataModel = (_a = attrAppliedOn.type.reference) === null || _a === void 0 ? void 0 : _a.ref;
+            if (transtiveDataModel) {
+                // resolve references in the context of the transitive data model
+                const scopeProvider = (name) => transtiveDataModel.fields.find((f) => f.name === name);
+                if ((0, ast_1.isArrayExpr)(node.value)) {
+                    node.value.items.forEach((item) => {
+                        if ((0, ast_1.isReferenceExpr)(item)) {
+                            const resolved = this.resolveFromScopeProviders(item, 'target', document, [scopeProvider]);
+                            if (resolved) {
+                                this.resolveToDeclaredType(item, resolved.type);
+                            }
+                            else {
+                                // need to clear linked reference, because it's resolved in default scope by default
+                                const ref = item.target;
+                                ref._ref = this.createLinkingError({
+                                    reference: ref,
+                                    container: item,
+                                    property: 'target',
+                                });
+                            }
+                        }
+                    });
+                    if ((_c = (_b = node.value.items[0]) === null || _b === void 0 ? void 0 : _b.$resolvedType) === null || _c === void 0 ? void 0 : _c.decl) {
+                        this.resolveToBuiltinTypeOrDecl(node.value, node.value.items[0].$resolvedType.decl, true);
+                    }
+                }
+                else if ((0, ast_1.isReferenceExpr)(node.value)) {
+                    const resolved = this.resolveFromScopeProviders(node.value, 'target', document, [scopeProvider]);
+                    if (resolved) {
+                        this.resolveToDeclaredType(node.value, resolved.type);
+                    }
+                    else {
+                        // need to clear linked reference, because it's resolved in default scope by default
+                        const ref = node.value.target;
+                        ref._ref = this.createLinkingError({
+                            reference: ref,
+                            container: node.value,
+                            property: 'target',
+                        });
+                    }
+                }
+            }
+        }
+        else {
+            this.resolve(node.value, document, extraScopes);
+        }
+        node.$resolvedType = node.value.$resolvedType;
+    }
+    findAttrParamForArg(arg) {
+        var _a;
+        const attr = arg.$container.decl.ref;
+        if (!attr) {
+            return undefined;
+        }
+        if (arg.name) {
+            return (_a = attr.params) === null || _a === void 0 ? void 0 : _a.find((p) => p.name === arg.name);
+        }
+        else {
+            const index = arg.$container.args.findIndex((a) => a === arg);
+            return attr.params[index];
+        }
+    }
+    resolveDefault(node, document, extraScopes) {
+        for (const [property, value] of Object.entries(node)) {
+            if (!property.startsWith('$')) {
+                if ((0, langium_1.isReference)(value)) {
+                    this.linkReference(node, property, document, extraScopes);
+                }
+            }
+        }
+        for (const child of (0, langium_1.streamContents)(node)) {
+            this.resolve(child, document, extraScopes);
+        }
+    }
+    //#endregion
+    //#region Utils
+    resolveToDeclaredType(node, type) {
+        if (type.type) {
+            const mappedType = (0, utils_2.mapBuiltinTypeToExpressionType)(type.type);
+            node.$resolvedType = { decl: mappedType, array: type.array };
+        }
+        else if (type.reference) {
+            node.$resolvedType = {
+                decl: type.reference.ref,
+                array: type.array,
+            };
+        }
+    }
+    resolveToBuiltinTypeOrDecl(node, type, array = false) {
+        node.$resolvedType = { decl: type, array };
+    }
+}
+exports.ZModelLinker = ZModelLinker;
+//# sourceMappingURL=zmodel-linker.js.map

package/language-server/zmodel-linker.js.map

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

package/language-server/zmodel-module.d.ts

@@ -0,0 +1,41 @@
+import { DefaultSharedModuleContext, LangiumDefaultSharedServices, LangiumServices, LangiumSharedServices, Module, PartialLangiumServices } from 'langium';
+import { ZModelValidator } from './validator/zmodel-validator';
+/**
+ * Declaration of custom services - add your own service classes here.
+ */
+export declare type ZModelAddedServices = {
+    validation: {
+        ZModelValidator: ZModelValidator;
+    };
+};
+/**
+ * Union of Langium default services and your custom services - use this as constructor parameter
+ * of custom service classes.
+ */
+export declare type ZModelServices = LangiumServices & ZModelAddedServices;
+/**
+ * Dependency injection module that overrides Langium default services and contributes the
+ * declared custom services. The Langium defaults can be partially specified to override only
+ * selected services, while the custom services must be fully specified.
+ */
+export declare const ZModelModule: Module<ZModelServices, PartialLangiumServices & ZModelAddedServices>;
+export declare function createSharedModule(context: DefaultSharedModuleContext): Module<LangiumSharedServices, LangiumDefaultSharedServices>;
+/**
+ * Create the full set of services required by Langium.
+ *
+ * First inject the shared services by merging two modules:
+ *  - Langium default shared services
+ *  - Services generated by langium-cli
+ *
+ * Then inject the language-specific services by merging three modules:
+ *  - Langium default language-specific services
+ *  - Services generated by langium-cli
+ *  - Services specified in this file
+ *
+ * @param context Optional module context with the LSP connection
+ * @returns An object wrapping the shared services and the language-specific services
+ */
+export declare function createZModelServices(context: DefaultSharedModuleContext): {
+    shared: LangiumSharedServices;
+    ZModel: ZModelServices;
+};

package/language-server/zmodel-module.js

@@ -0,0 +1,80 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createZModelServices = exports.createSharedModule = exports.ZModelModule = void 0;
+const module_1 = require("@zenstackhq/language/module");
+const langium_1 = require("langium");
+const vscode_languageserver_1 = require("vscode-languageserver");
+const vscode_languageserver_textdocument_1 = require("vscode-languageserver-textdocument");
+const zmodel_validator_1 = require("./validator/zmodel-validator");
+const zmodel_code_action_1 = require("./zmodel-code-action");
+const zmodel_formatter_1 = require("./zmodel-formatter");
+const zmodel_linker_1 = require("./zmodel-linker");
+const zmodel_scope_1 = require("./zmodel-scope");
+const zmodel_workspace_manager_1 = __importDefault(require("./zmodel-workspace-manager"));
+/**
+ * Dependency injection module that overrides Langium default services and contributes the
+ * declared custom services. The Langium defaults can be partially specified to override only
+ * selected services, while the custom services must be fully specified.
+ */
+exports.ZModelModule = {
+    references: {
+        ScopeComputation: (services) => new zmodel_scope_1.ZModelScopeComputation(services),
+        Linker: (services) => new zmodel_linker_1.ZModelLinker(services),
+    },
+    validation: {
+        ValidationRegistry: (services) => new zmodel_validator_1.ZModelValidationRegistry(services),
+        ZModelValidator: () => new zmodel_validator_1.ZModelValidator(),
+    },
+    lsp: {
+        Formatter: () => new zmodel_formatter_1.ZModelFormatter(),
+        CodeActionProvider: (services) => new zmodel_code_action_1.ZModelCodeActionProvider(services),
+    },
+};
+// this duplicates createDefaultSharedModule except that a custom WorkspaceManager is used
+function createSharedModule(context) {
+    return {
+        ServiceRegistry: () => new langium_1.DefaultServiceRegistry(),
+        lsp: {
+            Connection: () => context.connection,
+            LanguageServer: (services) => new langium_1.DefaultLanguageServer(services),
+        },
+        workspace: {
+            LangiumDocuments: (services) => new langium_1.DefaultLangiumDocuments(services),
+            LangiumDocumentFactory: (services) => new langium_1.DefaultLangiumDocumentFactory(services),
+            DocumentBuilder: (services) => new langium_1.DefaultDocumentBuilder(services),
+            TextDocuments: () => new vscode_languageserver_1.TextDocuments(vscode_languageserver_textdocument_1.TextDocument),
+            IndexManager: (services) => new langium_1.DefaultIndexManager(services),
+            WorkspaceManager: (services) => new zmodel_workspace_manager_1.default(services),
+            FileSystemProvider: (services) => context.fileSystemProvider(services),
+            MutexLock: () => new langium_1.MutexLock(),
+            ConfigurationProvider: (services) => new langium_1.DefaultConfigurationProvider(services),
+        },
+    };
+}
+exports.createSharedModule = createSharedModule;
+/**
+ * Create the full set of services required by Langium.
+ *
+ * First inject the shared services by merging two modules:
+ *  - Langium default shared services
+ *  - Services generated by langium-cli
+ *
+ * Then inject the language-specific services by merging three modules:
+ *  - Langium default language-specific services
+ *  - Services generated by langium-cli
+ *  - Services specified in this file
+ *
+ * @param context Optional module context with the LSP connection
+ * @returns An object wrapping the shared services and the language-specific services
+ */
+function createZModelServices(context) {
+    const shared = (0, langium_1.inject)(createSharedModule(context), module_1.ZModelGeneratedSharedModule);
+    const ZModel = (0, langium_1.inject)((0, langium_1.createDefaultModule)({ shared }), module_1.ZModelGeneratedModule, exports.ZModelModule);
+    shared.ServiceRegistry.register(ZModel);
+    return { shared, ZModel };
+}
+exports.createZModelServices = createZModelServices;
+//# sourceMappingURL=zmodel-module.js.map

package/language-server/zmodel-module.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"zmodel-module.js","sourceRoot":"","sources":["../../src/language-server/zmodel-module.ts"],"names":[],"mappings":";;;;;;AAAA,wDAAiG;AACjG,qCAiBiB;AACjB,iEAAsD;AACtD,2FAAkE;AAClE,mEAAyF;AACzF,6DAAgE;AAChE,yDAAqD;AACrD,mDAA+C;AAC/C,iDAAwD;AACxD,0FAAgE;AAiBhE;;;;GAIG;AACU,QAAA,YAAY,GAAyE;IAC9F,UAAU,EAAE;QACR,gBAAgB,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,qCAAsB,CAAC,QAAQ,CAAC;QACpE,MAAM,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,4BAAY,CAAC,QAAQ,CAAC;KACnD;IACD,UAAU,EAAE;QACR,kBAAkB,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,2CAAwB,CAAC,QAAQ,CAAC;QACxE,eAAe,EAAE,GAAG,EAAE,CAAC,IAAI,kCAAe,EAAE;KAC/C;IACD,GAAG,EAAE;QACD,SAAS,EAAE,GAAG,EAAE,CAAC,IAAI,kCAAe,EAAE;QACtC,kBAAkB,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,6CAAwB,CAAC,QAAQ,CAAC;KAC3E;CACJ,CAAC;AAEF,0FAA0F;AAC1F,SAAgB,kBAAkB,CAC9B,OAAmC;IAEnC,OAAO;QACH,eAAe,EAAE,GAAG,EAAE,CAAC,IAAI,gCAAsB,EAAE;QACnD,GAAG,EAAE;YACD,UAAU,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,UAAU;YACpC,cAAc,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,+BAAqB,CAAC,QAAQ,CAAC;SACpE;QACD,SAAS,EAAE;YACP,gBAAgB,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,iCAAuB,CAAC,QAAQ,CAAC;YACrE,sBAAsB,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,uCAA6B,CAAC,QAAQ,CAAC;YACjF,eAAe,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,gCAAsB,CAAC,QAAQ,CAAC;YACnE,aAAa,EAAE,GAAG,EAAE,CAAC,IAAI,qCAAa,CAAC,iDAAY,CAAC;YACpD,YAAY,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,6BAAmB,CAAC,QAAQ,CAAC;YAC7D,gBAAgB,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,kCAAsB,CAAC,QAAQ,CAAC;YACpE,kBAAkB,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,OAAO,CAAC,kBAAkB,CAAC,QAAQ,CAAC;YACtE,SAAS,EAAE,GAAG,EAAE,CAAC,IAAI,mBAAS,EAAE;YAChC,qBAAqB,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,sCAA4B,CAAC,QAAQ,CAAC;SAClF;KACJ,CAAC;AACN,CAAC;AArBD,gDAqBC;AAED;;;;;;;;;;;;;;GAcG;AACH,SAAgB,oBAAoB,CAAC,OAAmC;IAIpE,MAAM,MAAM,GAAG,IAAA,gBAAM,EAAC,kBAAkB,CAAC,OAAO,CAAC,EAAE,oCAA2B,CAAC,CAAC;IAEhF,MAAM,MAAM,GAAG,IAAA,gBAAM,EAAC,IAAA,6BAAmB,EAAC,EAAE,MAAM,EAAE,CAAC,EAAE,8BAAqB,EAAE,oBAAY,CAAC,CAAC;IAC5F,MAAM,CAAC,eAAe,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IACxC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;AAC9B,CAAC;AATD,oDASC"}

package/language-server/zmodel-scope.d.ts

@@ -0,0 +1,10 @@
+import { AstNode, AstNodeDescription, DefaultScopeComputation, LangiumDocument, LangiumServices } from 'langium';
+import { CancellationToken } from 'vscode-jsonrpc';
+/**
+ * Custom Langium ScopeComputation implementation which adds enum fields into global scope
+ */
+export declare class ZModelScopeComputation extends DefaultScopeComputation {
+    private readonly services;
+    constructor(services: LangiumServices);
+    computeExports(document: LangiumDocument<AstNode>, cancelToken?: CancellationToken | undefined): Promise<AstNodeDescription[]>;
+}

package/language-server/zmodel-scope.js

@@ -0,0 +1,44 @@
+"use strict";
+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.ZModelScopeComputation = void 0;
+const ast_1 = require("@zenstackhq/language/ast");
+const langium_1 = require("langium");
+/**
+ * Custom Langium ScopeComputation implementation which adds enum fields into global scope
+ */
+class ZModelScopeComputation extends langium_1.DefaultScopeComputation {
+    constructor(services) {
+        super(services);
+        this.services = services;
+    }
+    computeExports(document, cancelToken) {
+        const _super = Object.create(null, {
+            computeExports: { get: () => super.computeExports }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            const result = yield _super.computeExports.call(this, document, cancelToken);
+            // add enum fields so they can be globally resolved across modules
+            for (const node of (0, langium_1.streamAllContents)(document.parseResult.value)) {
+                if (cancelToken) {
+                    yield (0, langium_1.interruptAndCheck)(cancelToken);
+                }
+                if ((0, ast_1.isEnumField)(node)) {
+                    const desc = this.services.workspace.AstNodeDescriptionProvider.createDescription(node, node.name, document);
+                    result.push(desc);
+                }
+            }
+            return result;
+        });
+    }
+}
+exports.ZModelScopeComputation = ZModelScopeComputation;
+//# sourceMappingURL=zmodel-scope.js.map

package/language-server/zmodel-scope.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"zmodel-scope.js","sourceRoot":"","sources":["../../src/language-server/zmodel-scope.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,kDAAuD;AACvD,qCAQiB;AAGjB;;GAEG;AACH,MAAa,sBAAuB,SAAQ,iCAAuB;IAC/D,YAA6B,QAAyB;QAClD,KAAK,CAAC,QAAQ,CAAC,CAAC;QADS,aAAQ,GAAR,QAAQ,CAAiB;IAEtD,CAAC;IAEK,cAAc,CAChB,QAAkC,EAClC,WAA2C;;;;;YAE3C,MAAM,MAAM,GAAG,MAAM,OAAM,cAAc,YAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;YAEjE,kEAAkE;YAClE,KAAK,MAAM,IAAI,IAAI,IAAA,2BAAiB,EAAC,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE;gBAC9D,IAAI,WAAW,EAAE;oBACb,MAAM,IAAA,2BAAiB,EAAC,WAAW,CAAC,CAAC;iBACxC;gBACD,IAAI,IAAA,iBAAW,EAAC,IAAI,CAAC,EAAE;oBACnB,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,0BAA0B,CAAC,iBAAiB,CAC7E,IAAI,EACJ,IAAI,CAAC,IAAI,EACT,QAAQ,CACX,CAAC;oBACF,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;iBACrB;aACJ;YAED,OAAO,MAAM,CAAC;QAClB,CAAC;KAAA;CACJ;AA5BD,wDA4BC"}

package/language-server/zmodel-workspace-manager.d.ts

@@ -0,0 +1,8 @@
+import { DefaultWorkspaceManager, LangiumDocument } from 'langium';
+import { WorkspaceFolder } from 'vscode-languageserver';
+/**
+ * Custom Langium WorkspaceManager implementation which automatically loads stdlib.zmodel
+ */
+export default class ZModelWorkspaceManager extends DefaultWorkspaceManager {
+    protected loadAdditionalDocuments(_folders: WorkspaceFolder[], _collector: (document: LangiumDocument) => void): Promise<void>;
+}

package/language-server/zmodel-workspace-manager.js

@@ -0,0 +1,37 @@
+"use strict";
+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());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const langium_1 = require("langium");
+const path_1 = __importDefault(require("path"));
+const vscode_uri_1 = require("vscode-uri");
+const constants_1 = require("./constants");
+/**
+ * Custom Langium WorkspaceManager implementation which automatically loads stdlib.zmodel
+ */
+class ZModelWorkspaceManager extends langium_1.DefaultWorkspaceManager {
+    loadAdditionalDocuments(_folders, _collector) {
+        const _super = Object.create(null, {
+            loadAdditionalDocuments: { get: () => super.loadAdditionalDocuments }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            yield _super.loadAdditionalDocuments.call(this, _folders, _collector);
+            const stdLibUri = vscode_uri_1.URI.file(path_1.default.join(__dirname, '../res', constants_1.STD_LIB_MODULE_NAME));
+            console.log(`Adding stdlib document from ${stdLibUri}`);
+            const stdlib = this.langiumDocuments.getOrCreateDocument(stdLibUri);
+            _collector(stdlib);
+        });
+    }
+}
+exports.default = ZModelWorkspaceManager;
+//# sourceMappingURL=zmodel-workspace-manager.js.map

package/language-server/zmodel-workspace-manager.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"zmodel-workspace-manager.js","sourceRoot":"","sources":["../../src/language-server/zmodel-workspace-manager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,qCAAmE;AACnE,gDAAwB;AAExB,2CAAiC;AACjC,2CAAkD;AAElD;;GAEG;AACH,MAAqB,sBAAuB,SAAQ,iCAAuB;IACvD,uBAAuB,CACnC,QAA2B,EAC3B,UAA+C;;;;;YAE/C,MAAM,OAAM,uBAAuB,YAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;YAC1D,MAAM,SAAS,GAAG,gBAAG,CAAC,IAAI,CAAC,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,EAAE,+BAAmB,CAAC,CAAC,CAAC;YAChF,OAAO,CAAC,GAAG,CAAC,+BAA+B,SAAS,EAAE,CAAC,CAAC;YACxD,MAAM,MAAM,GAAG,IAAI,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC;YACpE,UAAU,CAAC,MAAM,CAAC,CAAC;QACvB,CAAC;KAAA;CACJ;AAXD,yCAWC"}