zenstack 0.1.45 → 0.1.46

package/out/language-server/validator/datasource-validator copy.js.map

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

package/out/language-server/validator/datasource-validator.js

@@ -0,0 +1,77 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const ast_1 = require("../generated/ast");
+const utils_1 = require("./utils");
+const constants_1 = require("../constants");
+const supportedFields = [
+    'provider',
+    'url',
+    'shadowDatabaseUrl',
+    'relationMode',
+];
+class DataSourceValidator {
+    validate(ds, accept) {
+        (0, utils_1.validateDuplicatedDeclarations)(ds.fields, accept);
+        this.validateFields(ds, accept);
+        this.validateProvider(ds, accept);
+        this.validateUrl(ds, accept);
+        this.validateRelationMode(ds, accept);
+    }
+    validateFields(ds, accept) {
+        ds.fields.forEach((f) => {
+            if (!supportedFields.includes(f.name)) {
+                accept('error', `Unexpected field "${f.name}"`, { node: f });
+            }
+        });
+    }
+    validateProvider(ds, accept) {
+        const provider = ds.fields.find((f) => f.name === 'provider');
+        if (!provider) {
+            accept('error', 'datasource must include a "provider" field', {
+                node: ds,
+            });
+            return;
+        }
+        const value = (0, utils_1.getStringLiteral)(provider.value);
+        if (!value) {
+            accept('error', '"provider" must be set to a string literal', {
+                node: provider.value,
+            });
+        }
+        else if (!constants_1.SUPPORTED_PROVIDERS.includes(value)) {
+            accept('error', `Provider "${value}" is not supported. Choose from ${constants_1.SUPPORTED_PROVIDERS.map((p) => '"' + p + '"').join(' | ')}.`, { node: provider.value });
+        }
+    }
+    validateUrl(ds, accept) {
+        var _a;
+        const url = ds.fields.find((f) => f.name === 'url');
+        if (!url) {
+            accept('error', 'datasource must include a "url" field', {
+                node: ds,
+            });
+        }
+        for (const fieldName of ['url', 'shadowDatabaseUrl']) {
+            const field = ds.fields.find((f) => f.name === fieldName);
+            if (!field) {
+                continue;
+            }
+            const value = (0, utils_1.getStringLiteral)(field.value);
+            if (!value &&
+                !((0, ast_1.isInvocationExpr)(field.value) &&
+                    ((_a = field.value.function.ref) === null || _a === void 0 ? void 0 : _a.name) === 'env')) {
+                accept('error', `"${fieldName}" must be set to a string literal or an invocation of "env" function`, { node: field.value });
+            }
+        }
+    }
+    validateRelationMode(ds, accept) {
+        const field = ds.fields.find((f) => f.name === 'relationMode');
+        if (field) {
+            const val = (0, utils_1.getStringLiteral)(field.value);
+            if (!val || !['foreignKeys', 'prisma'].includes(val)) {
+                accept('error', '"relationMode" must be set to "foreignKeys" or "prisma"', { node: field.value });
+            }
+        }
+    }
+}
+exports.default = DataSourceValidator;
+//# sourceMappingURL=datasource-validator.js.map

package/out/language-server/validator/datasource-validator.js.map

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

package/out/language-server/validator/model-validator.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const ast_1 = require("../generated/ast");
+const utils_1 = require("./utils");
+class ModelValidator {
+    validate(model, accept) {
+        (0, utils_1.validateDuplicatedDeclarations)(model.declarations, accept);
+        this.validateDataSources(model, accept);
+    }
+    validateDataSources(model, accept) {
+        const dataSources = model.declarations.filter((d) => (0, ast_1.isDataSource)(d));
+        if (dataSources.length === 0) {
+            accept('error', 'Model must define a datasource', { node: model });
+        }
+        else if (dataSources.length > 1) {
+            accept('error', 'Multiple datasource declarations are not allowed', { node: dataSources[1] });
+        }
+    }
+}
+exports.default = ModelValidator;
+//# sourceMappingURL=model-validator.js.map

package/out/language-server/validator/model-validator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"model-validator.js","sourceRoot":"","sources":["../../../src/language-server/validator/model-validator.ts"],"names":[],"mappings":";;AAAA,6CAA0D;AAG1D,mCAAyD;AAEzD,MAAqB,cAAc;IAC/B,QAAQ,CAAC,KAAY,EAAE,MAA0B;QAC7C,IAAA,sCAA8B,EAAC,KAAK,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;QAC3D,IAAI,CAAC,mBAAmB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAC5C,CAAC;IAEO,mBAAmB,CAAC,KAAY,EAAE,MAA0B;QAChE,MAAM,WAAW,GAAG,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,kBAAY,EAAC,CAAC,CAAC,CAAC,CAAC;QACtE,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE;YAC1B,MAAM,CAAC,OAAO,EAAE,gCAAgC,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;SACtE;aAAM,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE;YAC/B,MAAM,CACF,OAAO,EACP,kDAAkD,EAClD,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE,CAC3B,CAAC;SACL;IACL,CAAC;CACJ;AAlBD,iCAkBC"}

package/out/language-server/validator/schema-validator.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const ast_1 = require("../generated/ast");
+const utils_1 = require("./utils");
+class SchemaValidator {
+    validate(model, accept) {
+        (0, utils_1.validateDuplicatedDeclarations)(model.declarations, accept);
+        this.validateDataSources(model, accept);
+    }
+    validateDataSources(model, accept) {
+        const dataSources = model.declarations.filter((d) => (0, ast_1.isDataSource)(d));
+        if (dataSources.length === 0) {
+            accept('error', 'Model must define a datasource', { node: model });
+        }
+        else if (dataSources.length > 1) {
+            accept('error', 'Multiple datasource declarations are not allowed', { node: dataSources[1] });
+        }
+    }
+}
+exports.default = SchemaValidator;
+//# sourceMappingURL=schema-validator.js.map

package/out/language-server/validator/schema-validator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"schema-validator.js","sourceRoot":"","sources":["../../../src/language-server/validator/schema-validator.ts"],"names":[],"mappings":";;AAAA,6CAA0D;AAG1D,mCAAyD;AAEzD,MAAqB,eAAe;IAChC,QAAQ,CAAC,KAAY,EAAE,MAA0B;QAC7C,IAAA,sCAA8B,EAAC,KAAK,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;QAC3D,IAAI,CAAC,mBAAmB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAC5C,CAAC;IAEO,mBAAmB,CAAC,KAAY,EAAE,MAA0B;QAChE,MAAM,WAAW,GAAG,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,kBAAY,EAAC,CAAC,CAAC,CAAC,CAAC;QACtE,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE;YAC1B,MAAM,CAAC,OAAO,EAAE,gCAAgC,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;SACtE;aAAM,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE;YAC/B,MAAM,CACF,OAAO,EACP,kDAAkD,EAClD,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE,CAC3B,CAAC;SACL;IACL,CAAC;CACJ;AAlBD,kCAkBC"}

package/out/language-server/validator/utils.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getStringLiteral = exports.validateDuplicatedDeclarations = void 0;
+const ast_1 = require("../generated/ast");
+function validateDuplicatedDeclarations(decls, accept) {
+    const groupByName = decls.reduce((group, decl) => {
+        var _a;
+        group[decl.name] = (_a = group[decl.name]) !== null && _a !== void 0 ? _a : [];
+        group[decl.name].push(decl);
+        return group;
+    }, {});
+    for (const [name, decls] of Object.entries(groupByName)) {
+        if (decls.length > 1) {
+            accept('error', `Duplicated declaration name "${name}"`, {
+                node: decls[1],
+            });
+        }
+    }
+}
+exports.validateDuplicatedDeclarations = validateDuplicatedDeclarations;
+function getStringLiteral(node) {
+    if ((0, ast_1.isLiteralExpr)(node) && typeof node.value === 'string') {
+        return node.value;
+    }
+    else {
+        return undefined;
+    }
+}
+exports.getStringLiteral = getStringLiteral;
+//# sourceMappingURL=utils.js.map

package/out/language-server/validator/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/language-server/validator/utils.ts"],"names":[],"mappings":";;;AAAA,6CAAoD;AAGpD,SAAgB,8BAA8B,CAC1C,KAAwC,EACxC,MAA0B;IAE1B,MAAM,WAAW,GAAG,KAAK,CAAC,MAAM,CAAM,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;;QAClD,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,MAAA,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,mCAAI,EAAE,CAAC;QAC1C,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC5B,OAAO,KAAK,CAAC;IACjB,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAY,WAAW,CAAC,EAAE;QAChE,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;YAClB,MAAM,CAAC,OAAO,EAAE,gCAAgC,IAAI,GAAG,EAAE;gBACrD,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC;aACjB,CAAC,CAAC;SACN;KACJ;AACL,CAAC;AAjBD,wEAiBC;AAED,SAAgB,gBAAgB,CAAC,IAAa;IAC1C,IAAI,IAAA,mBAAa,EAAC,IAAI,CAAC,IAAI,OAAO,IAAI,CAAC,KAAK,KAAK,QAAQ,EAAE;QACvD,OAAO,IAAI,CAAC,KAAK,CAAC;KACrB;SAAM;QACH,OAAO,SAAS,CAAC;KACpB;AACL,CAAC;AAND,4CAMC"}

package/out/language-server/validator/zmodel-validator.js

@@ -0,0 +1,42 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ZModelValidator = exports.ZModelValidationRegistry = void 0;
+const langium_1 = require("langium");
+const schema_validator_1 = __importDefault(require("./schema-validator"));
+const datasource_validator_1 = __importDefault(require("./datasource-validator"));
+const datamodel_validator_1 = __importDefault(require("./datamodel-validator"));
+/**
+ * Registry for validation checks.
+ */
+class ZModelValidationRegistry extends langium_1.ValidationRegistry {
+    constructor(services) {
+        super(services);
+        const validator = services.validation.ZModelValidator;
+        const checks = {
+            Model: validator.checkModel,
+            DataSource: validator.checkDataSource,
+            DataModel: validator.checkDataModel,
+        };
+        this.register(checks, validator);
+    }
+}
+exports.ZModelValidationRegistry = ZModelValidationRegistry;
+/**
+ * Implementation of custom validations.
+ */
+class ZModelValidator {
+    checkModel(node, accept) {
+        new schema_validator_1.default().validate(node, accept);
+    }
+    checkDataSource(node, accept) {
+        new datasource_validator_1.default().validate(node, accept);
+    }
+    checkDataModel(node, accept) {
+        new datamodel_validator_1.default().validate(node, accept);
+    }
+}
+exports.ZModelValidator = ZModelValidator;
+//# sourceMappingURL=zmodel-validator.js.map

package/out/language-server/validator/zmodel-validator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"zmodel-validator.js","sourceRoot":"","sources":["../../../src/language-server/validator/zmodel-validator.ts"],"names":[],"mappings":";;;;;;AAAA,qCAIiB;AAGjB,0EAAiD;AACjD,kFAAyD;AACzD,gFAAuD;AAEvD;;GAEG;AACH,MAAa,wBAAyB,SAAQ,4BAAkB;IAC5D,YAAY,QAAwB;QAChC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAChB,MAAM,SAAS,GAAG,QAAQ,CAAC,UAAU,CAAC,eAAe,CAAC;QACtD,MAAM,MAAM,GAAoC;YAC5C,KAAK,EAAE,SAAS,CAAC,UAAU;YAC3B,UAAU,EAAE,SAAS,CAAC,eAAe;YACrC,SAAS,EAAE,SAAS,CAAC,cAAc;SACtC,CAAC;QACF,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACrC,CAAC;CACJ;AAXD,4DAWC;AAED;;GAEG;AACH,MAAa,eAAe;IACxB,UAAU,CAAC,IAAW,EAAE,MAA0B;QAC9C,IAAI,0BAAe,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACjD,CAAC;IAED,eAAe,CAAC,IAAgB,EAAE,MAA0B;QACxD,IAAI,8BAAmB,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACrD,CAAC;IAED,cAAc,CAAC,IAAe,EAAE,MAA0B;QACtD,IAAI,6BAAkB,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACpD,CAAC;CACJ;AAZD,0CAYC"}

package/out/language-server/zmodel-index.js

@@ -1,38 +1,11 @@
 "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.ZModelDescriptionProvider = void 0;
 const langium_1 = require("langium");
-const vscode_languageserver_1 = require("vscode-languageserver");
-const ast_1 = require("./generated/ast");
 class ZModelDescriptionProvider extends langium_1.DefaultAstNodeDescriptionProvider {
     constructor(services) {
         super(services);
     }
-    createDescriptions(document, cancelToken = vscode_languageserver_1.CancellationToken.None) {
-        const _super = Object.create(null, {
-            createDescriptions: { get: () => super.createDescriptions }
-        });
-        return __awaiter(this, void 0, void 0, function* () {
-            const descr = yield _super.createDescriptions.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)) {
-                yield (0, langium_1.interruptAndCheck)(cancelToken);
-                if ((0, ast_1.isEnumField)(node)) {
-                    yield descr.push(this.createDescription(node, node.name, document));
-                }
-            }
-            return descr;
-        });
-    }
 }
 exports.ZModelDescriptionProvider = ZModelDescriptionProvider;
 //# sourceMappingURL=zmodel-index.js.map

package/out/language-server/zmodel-index.js.map

@@ -1 +1 @@
-{"version":3,"file":"zmodel-index.js","sourceRoot":"","sources":["../../src/language-server/zmodel-index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAOiB;AACjB,iEAA0D;AAC1D,yCAA8C;AAE9C,MAAa,yBAA0B,SAAQ,2CAAiC;IAC5E,YAAY,QAAyB;QACjC,KAAK,CAAC,QAAQ,CAAC,CAAC;IACpB,CAAC;IAEK,kBAAkB,CACpB,QAAyB,EACzB,WAAW,GAAG,yCAAiB,CAAC,IAAI;;;;;YAEpC,MAAM,KAAK,GAAG,MAAM,OAAM,kBAAkB,YAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;YACpE,kEAAkE;YAClE,KAAK,MAAM,IAAI,IAAI,IAAA,2BAAiB,EAAC,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE;gBAC9D,MAAM,IAAA,2BAAiB,EAAC,WAAW,CAAC,CAAC;gBACrC,IAAI,IAAA,iBAAW,EAAC,IAAI,CAAC,EAAE;oBACnB,MAAM,KAAK,CAAC,IAAI,CACZ,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CACpD,CAAC;iBACL;aACJ;YACD,OAAO,KAAK,CAAC;QACjB,CAAC;KAAA;CACJ;AArBD,8DAqBC"}
+{"version":3,"file":"zmodel-index.js","sourceRoot":"","sources":["../../src/language-server/zmodel-index.ts"],"names":[],"mappings":";;;AAAA,qCAA6E;AAE7E,MAAa,yBAA0B,SAAQ,2CAAiC;IAC5E,YAAY,QAAyB;QACjC,KAAK,CAAC,QAAQ,CAAC,CAAC;IACpB,CAAC;CAkBJ;AArBD,8DAqBC"}

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

@@ -6,7 +6,7 @@ const module_1 = require("./generated/module");
 const zmodel_index_1 = require("./zmodel-index");
 const zmodel_linker_1 = require("./zmodel-linker");
 const zmodel_scope_1 = require("./zmodel-scope");
-const zmodel_validator_1 = require("./zmodel-validator");
+const zmodel_validator_1 = require("./validator/zmodel-validator");
 /**
  * Dependency injection module that overrides Langium default services and contributes the
  * declared custom services. The Langium defaults can be partially specified to override only
@@ -16,7 +16,6 @@ exports.ZModelModule = {
     references: {
         ScopeComputation: (services) => new zmodel_scope_1.ZModelScopeComputation(services),
         Linker: (services) => new zmodel_linker_1.ZModelLinker(services),
-        // NameProvider: () => new ZModelNameProvider(),
     },
     validation: {
         ValidationRegistry: (services) => new zmodel_validator_1.ZModelValidationRegistry(services),

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

@@ -1 +1 @@
-{"version":3,"file":"zmodel-module.js","sourceRoot":"","sources":["../../src/language-server/zmodel-module.ts"],"names":[],"mappings":";;;AAAA,qCASiB;AACjB,+CAG4B;AAC5B,iDAA2D;AAC3D,mDAA+C;AAC/C,iDAAwD;AACxD,yDAA+E;AAiB/E;;;;GAIG;AACU,QAAA,YAAY,GAGrB;IACA,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;QAChD,gDAAgD;KACnD;IACD,UAAU,EAAE;QACR,kBAAkB,EAAE,CAAC,QAAQ,EAAE,EAAE,CAC7B,IAAI,2CAAwB,CAAC,QAAQ,CAAC;QAC1C,eAAe,EAAE,GAAG,EAAE,CAAC,IAAI,kCAAe,EAAE;KAC/C;IACD,SAAS,EAAE;QACP,0BAA0B,EAAE,CAAC,QAAQ,EAAE,EAAE,CACrC,IAAI,wCAAyB,CAAC,QAAQ,CAAC;KAC9C;CACJ,CAAC;AAEF;;;;;;;;;;;;;;GAcG;AACH,SAAgB,oBAAoB,CAAC,OAAoC;IAIrE,MAAM,MAAM,GAAG,IAAA,gBAAM,EACjB,IAAA,mCAAyB,EAAC,OAAO,CAAC,EAClC,oCAA2B,CAC9B,CAAC;IACF,MAAM,MAAM,GAAG,IAAA,gBAAM,EACjB,IAAA,6BAAmB,EAAC,EAAE,MAAM,EAAE,CAAC,EAC/B,8BAAqB,EACrB,oBAAY,CACf,CAAC;IACF,MAAM,CAAC,eAAe,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IACxC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;AAC9B,CAAC;AAfD,oDAeC"}
+{"version":3,"file":"zmodel-module.js","sourceRoot":"","sources":["../../src/language-server/zmodel-module.ts"],"names":[],"mappings":";;;AAAA,qCASiB;AACjB,+CAG4B;AAC5B,iDAA2D;AAC3D,mDAA+C;AAC/C,iDAAwD;AACxD,mEAGsC;AAiBtC;;;;GAIG;AACU,QAAA,YAAY,GAGrB;IACA,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,CAC7B,IAAI,2CAAwB,CAAC,QAAQ,CAAC;QAC1C,eAAe,EAAE,GAAG,EAAE,CAAC,IAAI,kCAAe,EAAE;KAC/C;IACD,SAAS,EAAE;QACP,0BAA0B,EAAE,CAAC,QAAQ,EAAE,EAAE,CACrC,IAAI,wCAAyB,CAAC,QAAQ,CAAC;KAC9C;CACJ,CAAC;AAEF;;;;;;;;;;;;;;GAcG;AACH,SAAgB,oBAAoB,CAAC,OAAmC;IAIpE,MAAM,MAAM,GAAG,IAAA,gBAAM,EACjB,IAAA,mCAAyB,EAAC,OAAO,CAAC,EAClC,oCAA2B,CAC9B,CAAC;IACF,MAAM,MAAM,GAAG,IAAA,gBAAM,EACjB,IAAA,6BAAmB,EAAC,EAAE,MAAM,EAAE,CAAC,EAC/B,8BAAqB,EACrB,oBAAY,CACf,CAAC;IACF,MAAM,CAAC,eAAe,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IACxC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;AAC9B,CAAC;AAfD,oDAeC"}

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

@@ -11,18 +11,29 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZModelScopeComputation = void 0;
 const langium_1 = require("langium");
-const vscode_jsonrpc_1 = require("vscode-jsonrpc");
+const ast_1 = require("./generated/ast");
 class ZModelScopeComputation extends langium_1.DefaultScopeComputation {
     constructor(services) {
         super(services);
+        this.services = services;
     }
-    computeScope(document, cancelToken = vscode_jsonrpc_1.CancellationToken.None) {
+    computeExports(document, cancelToken) {
         const _super = Object.create(null, {
-            computeScope: { get: () => super.computeScope }
+            computeExports: { get: () => super.computeExports }
         });
         return __awaiter(this, void 0, void 0, function* () {
-            // Dummy for now
-            return _super.computeScope.call(this, document, cancelToken);
+            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;
         });
     }
 }

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

@@ -1 +1 @@
-{"version":3,"file":"zmodel-scope.js","sourceRoot":"","sources":["../../src/language-server/zmodel-scope.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAKiB;AACjB,mDAAmD;AAEnD,MAAa,sBAAuB,SAAQ,iCAAuB;IAC/D,YAAY,QAAyB;QACjC,KAAK,CAAC,QAAQ,CAAC,CAAC;IACpB,CAAC;IAEK,YAAY,CACd,QAAyB,EACzB,WAAW,GAAG,kCAAiB,CAAC,IAAI;;;;;YAEpC,gBAAgB;YAChB,OAAO,OAAM,YAAY,YAAC,QAAQ,EAAE,WAAW,EAAE;QACrD,CAAC;KAAA;CACJ;AAZD,wDAYC"}
+{"version":3,"file":"zmodel-scope.js","sourceRoot":"","sources":["../../src/language-server/zmodel-scope.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAOiB;AAEjB,yCAA8C;AAE9C,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,GACN,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,0BAA0B,CAAC,iBAAiB,CAChE,IAAI,EACJ,IAAI,CAAC,IAAI,EACT,QAAQ,CACX,CAAC;oBACN,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;iBACrB;aACJ;YAED,OAAO,MAAM,CAAC;QAClB,CAAC;KAAA;CACJ;AA7BD,wDA6BC"}

package/out/language-server/zmodel-validator.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZModelValidator = exports.ZModelValidationRegistry = void 0;
 const langium_1 = require("langium");
+const ast_1 = require("./generated/ast");
 /**
  * Registry for validation checks.
  */
@@ -10,7 +11,7 @@ class ZModelValidationRegistry extends langium_1.ValidationRegistry {
         super(services);
         const validator = services.validation.ZModelValidator;
         const checks = {
-        // Person: validator.checkPersonStartsWithCapital
+            Model: validator.checkModel,
         };
         this.register(checks, validator);
     }
@@ -20,6 +21,15 @@ exports.ZModelValidationRegistry = ZModelValidationRegistry;
  * Implementation of custom validations.
  */
 class ZModelValidator {
+    checkModel(model, accept) {
+        const dataSources = model.declarations.filter((d) => (0, ast_1.isDataSource)(d));
+        if (dataSources.length === 0) {
+            accept('error', 'Model must define a datasource', { node: model });
+        }
+        else if (dataSources.length > 1) {
+            accept('error', 'Multiple datasource declarations are not allowed', { node: dataSources[1] });
+        }
+    }
 }
 exports.ZModelValidator = ZModelValidator;
 //# sourceMappingURL=zmodel-validator.js.map

package/out/language-server/zmodel-validator.js.map

@@ -1 +1 @@
-{"version":3,"file":"zmodel-validator.js","sourceRoot":"","sources":["../../src/language-server/zmodel-validator.ts"],"names":[],"mappings":";;;AAAA,qCAIiB;AAIjB;;GAEG;AACH,MAAa,wBAAyB,SAAQ,4BAAkB;IAC5D,YAAY,QAAwB;QAChC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAChB,MAAM,SAAS,GAAG,QAAQ,CAAC,UAAU,CAAC,eAAe,CAAC;QACtD,MAAM,MAAM,GAAoC;QAC5C,iDAAiD;SACpD,CAAC;QACF,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACrC,CAAC;CACJ;AATD,4DASC;AAED;;GAEG;AACH,MAAa,eAAe;CAS3B;AATD,0CASC"}
+{"version":3,"file":"zmodel-validator.js","sourceRoot":"","sources":["../../src/language-server/zmodel-validator.ts"],"names":[],"mappings":";;;AAAA,qCAKiB;AACjB,yCAAqE;AAGrE;;GAEG;AACH,MAAa,wBAAyB,SAAQ,4BAAkB;IAC5D,YAAY,QAAwB;QAChC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAChB,MAAM,SAAS,GAAG,QAAQ,CAAC,UAAU,CAAC,eAAe,CAAC;QACtD,MAAM,MAAM,GAAoC;YAC5C,KAAK,EAAE,SAAS,CAAC,UAAU;SAC9B,CAAC;QACF,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACrC,CAAC;CACJ;AATD,4DASC;AAED;;GAEG;AACH,MAAa,eAAe;IACxB,UAAU,CAAC,KAAY,EAAE,MAA0B;QAC/C,MAAM,WAAW,GAAG,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,kBAAY,EAAC,CAAC,CAAC,CAAC,CAAC;QACtE,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE;YAC1B,MAAM,CAAC,OAAO,EAAE,gCAAgC,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;SACtE;aAAM,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE;YAC/B,MAAM,CACF,OAAO,EACP,kDAAkD,EAClD,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE,CAC3B,CAAC;SACL;IACL,CAAC;CACJ;AAbD,0CAaC"}

package/package.json

@@ -2,7 +2,7 @@
   "name": "zenstack",
   "displayName": "ZenStack CLI and Language Tools",
   "description": "ZenStack CLI and Language Tools",
-  "version": "0.1.45",
+  "version": "0.1.46",
   "engines": {
     "vscode": "^1.56.0"
   },
@@ -51,35 +51,36 @@
     "change-case": "^4.1.2",
     "chevrotain": "^9.1.0",
     "colors": "^1.4.0",
-    "commander": "^8.0.0",
-    "langium": "^0.4.0",
-    "prisma": "^4.4.0",
+    "commander": "^8.3.0",
+    "langium": "^0.5.0",
+    "prisma": "^4.5.0",
     "promisify": "^0.0.3",
     "ts-morph": "^16.0.0",
+    "uuid": "^9.0.0",
     "vscode-jsonrpc": "^8.0.2",
-    "vscode-languageclient": "^7.0.0",
-    "vscode-languageserver": "^7.0.0",
-    "vscode-uri": "^3.0.2"
+    "vscode-languageclient": "^8.0.2",
+    "vscode-languageserver": "^8.0.2",
+    "vscode-uri": "^3.0.6"
   },
   "devDependencies": {
-    "@prisma/internals": "^4.4.0",
-    "@types/jest": "^29.0.3",
-    "@types/node": "^14.18.29",
+    "@prisma/internals": "^4.5.0",
+    "@types/jest": "^29.2.0",
+    "@types/node": "^14.18.32",
     "@types/tmp": "^0.2.3",
     "@types/uuid": "^8.3.4",
-    "@types/vscode": "^1.56.0",
-    "@typescript-eslint/eslint-plugin": "^4.14.1",
-    "@typescript-eslint/parser": "^4.14.1",
+    "@types/vscode": "^1.72.0",
+    "@typescript-eslint/eslint-plugin": "^4.33.0",
+    "@typescript-eslint/parser": "^4.33.0",
     "concurrently": "^7.4.0",
-    "eslint": "^7.19.0",
-    "jest": "^29.0.3",
-    "langium-cli": "^0.4.0",
+    "eslint": "^7.32.0",
+    "jest": "^29.2.1",
+    "langium-cli": "^0.5.0",
     "tmp": "^0.2.1",
-    "ts-jest": "^29.0.1",
+    "ts-jest": "^29.0.3",
     "ts-node": "^10.9.1",
     "tsc-alias": "^1.7.0",
     "tsconfig-paths-jest": "^0.0.1",
-    "typescript": "^4.6.2"
+    "typescript": "^4.8.4"
   },
   "scripts": {
     "vscode:prepublish": "npm run build && npm run lint",