zenstack 0.1.45 → 0.1.47

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (57) hide show
  1. package/out/cli/index.js +4 -1
  2. package/out/cli/index.js.map +1 -1
  3. package/out/generator/prisma/expression-writer.js +2 -2
  4. package/out/generator/prisma/expression-writer.js.map +1 -1
  5. package/out/generator/prisma/prisma-builder.js +2 -2
  6. package/out/generator/prisma/prisma-builder.js.map +1 -1
  7. package/out/generator/prisma/query-gard-generator.js +1 -1
  8. package/out/generator/prisma/query-gard-generator.js.map +1 -1
  9. package/out/generator/prisma/schema-generator.js +9 -17
  10. package/out/generator/prisma/schema-generator.js.map +1 -1
  11. package/out/generator/utils.js +1 -1
  12. package/out/generator/utils.js.map +1 -1
  13. package/out/langium-ext.js +3 -0
  14. package/out/langium-ext.js.map +1 -0
  15. package/out/language-server/constants.js +20 -0
  16. package/out/language-server/constants.js.map +1 -0
  17. package/out/language-server/generated/ast.js +7 -3
  18. package/out/language-server/generated/ast.js.map +1 -1
  19. package/out/language-server/generated/grammar.js +312 -113
  20. package/out/language-server/generated/grammar.js.map +1 -1
  21. package/out/language-server/generated/module.js +1 -1
  22. package/out/language-server/langium-ext.js +3 -0
  23. package/out/language-server/langium-ext.js.map +1 -0
  24. package/out/language-server/main.js +4 -3
  25. package/out/language-server/main.js.map +1 -1
  26. package/out/language-server/stdlib.zmodel +18 -17
  27. package/out/language-server/validator/attribute-validator copy.js +12 -0
  28. package/out/language-server/validator/attribute-validator copy.js.map +1 -0
  29. package/out/language-server/validator/attribute-validator.js +7 -0
  30. package/out/language-server/validator/attribute-validator.js.map +1 -0
  31. package/out/language-server/validator/datamodel-validator.js +199 -0
  32. package/out/language-server/validator/datamodel-validator.js.map +1 -0
  33. package/out/language-server/validator/datasource-validator copy.js +77 -0
  34. package/out/language-server/validator/datasource-validator copy.js.map +1 -0
  35. package/out/language-server/validator/datasource-validator.js +77 -0
  36. package/out/language-server/validator/datasource-validator.js.map +1 -0
  37. package/out/language-server/validator/enum-validator.js +10 -0
  38. package/out/language-server/validator/enum-validator.js.map +1 -0
  39. package/out/language-server/validator/model-validator.js +21 -0
  40. package/out/language-server/validator/model-validator.js.map +1 -0
  41. package/out/language-server/validator/schema-validator.js +21 -0
  42. package/out/language-server/validator/schema-validator.js.map +1 -0
  43. package/out/language-server/validator/utils.js +106 -0
  44. package/out/language-server/validator/utils.js.map +1 -0
  45. package/out/language-server/validator/zmodel-validator.js +52 -0
  46. package/out/language-server/validator/zmodel-validator.js.map +1 -0
  47. package/out/language-server/zmodel-index.js +0 -27
  48. package/out/language-server/zmodel-index.js.map +1 -1
  49. package/out/language-server/zmodel-linker.js +15 -7
  50. package/out/language-server/zmodel-linker.js.map +1 -1
  51. package/out/language-server/zmodel-module.js +1 -6
  52. package/out/language-server/zmodel-module.js.map +1 -1
  53. package/out/language-server/zmodel-scope.js +16 -5
  54. package/out/language-server/zmodel-scope.js.map +1 -1
  55. package/out/language-server/zmodel-validator.js +11 -1
  56. package/out/language-server/zmodel-validator.js.map +1 -1
  57. package/package.json +22 -19
@@ -0,0 +1,106 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.assignableToAttributeParam = exports.mapBuiltinTypeToExpressionType = exports.typeAssignable = exports.getStringLiteral = exports.validateDuplicatedDeclarations = void 0;
4
+ const ast_1 = require("../generated/ast");
5
+ function validateDuplicatedDeclarations(decls, accept) {
6
+ const groupByName = decls.reduce((group, decl) => {
7
+ var _a;
8
+ group[decl.name] = (_a = group[decl.name]) !== null && _a !== void 0 ? _a : [];
9
+ group[decl.name].push(decl);
10
+ return group;
11
+ }, {});
12
+ for (const [name, decls] of Object.entries(groupByName)) {
13
+ if (decls.length > 1) {
14
+ accept('error', `Duplicated declaration name "${name}"`, {
15
+ node: decls[1],
16
+ });
17
+ }
18
+ }
19
+ }
20
+ exports.validateDuplicatedDeclarations = validateDuplicatedDeclarations;
21
+ function getStringLiteral(node) {
22
+ if ((0, ast_1.isLiteralExpr)(node) && typeof node.value === 'string') {
23
+ return node.value;
24
+ }
25
+ else {
26
+ return undefined;
27
+ }
28
+ }
29
+ exports.getStringLiteral = getStringLiteral;
30
+ function typeAssignable(destType, sourceType) {
31
+ switch (destType) {
32
+ case 'Any':
33
+ return true;
34
+ case 'Float':
35
+ return sourceType === 'Int' || sourceType === 'Float';
36
+ default:
37
+ return sourceType === destType;
38
+ }
39
+ }
40
+ exports.typeAssignable = typeAssignable;
41
+ function mapBuiltinTypeToExpressionType(type) {
42
+ switch (type) {
43
+ case 'Any':
44
+ case 'Boolean':
45
+ case 'String':
46
+ case 'DateTime':
47
+ case 'Int':
48
+ case 'Float':
49
+ case 'Null':
50
+ return type;
51
+ case 'BigInt':
52
+ return 'Int';
53
+ case 'Decimal':
54
+ return 'Float';
55
+ case 'Json':
56
+ case 'Bytes':
57
+ return 'Any';
58
+ }
59
+ }
60
+ exports.mapBuiltinTypeToExpressionType = mapBuiltinTypeToExpressionType;
61
+ function assignableToAttributeParam(arg, param, attr) {
62
+ var _a, _b;
63
+ const argResolvedType = arg.$resolvedType;
64
+ if (!argResolvedType) {
65
+ return false;
66
+ }
67
+ let dstType = param.type.type;
68
+ const dstIsArray = param.type.array;
69
+ const dstRef = param.type.reference;
70
+ if (dstType) {
71
+ if (typeof (argResolvedType === null || argResolvedType === void 0 ? void 0 : argResolvedType.decl) !== 'string') {
72
+ // destination type is not a reference, so argument type must be a plain expression
73
+ return false;
74
+ }
75
+ if (dstType === 'FieldReference') {
76
+ if (dstIsArray) {
77
+ return ((0, ast_1.isArrayExpr)(arg.value) &&
78
+ !arg.value.items.find((item) => !(0, ast_1.isReferenceExpr)(item) ||
79
+ !(0, ast_1.isDataModelField)(item.target.ref)));
80
+ }
81
+ else {
82
+ return ((0, ast_1.isReferenceExpr)(arg.value) &&
83
+ (0, ast_1.isDataModelField)(arg.value.target.ref));
84
+ }
85
+ }
86
+ else if (dstType === 'ContextType') {
87
+ if ((0, ast_1.isDataModelField)(attr.$container)) {
88
+ if (!((_b = (_a = attr.$container) === null || _a === void 0 ? void 0 : _a.type) === null || _b === void 0 ? void 0 : _b.type)) {
89
+ return false;
90
+ }
91
+ dstType = mapBuiltinTypeToExpressionType(attr.$container.type.type);
92
+ }
93
+ else {
94
+ dstType = 'Any';
95
+ }
96
+ }
97
+ return (typeAssignable(dstType, argResolvedType.decl) &&
98
+ dstIsArray === argResolvedType.array);
99
+ }
100
+ else {
101
+ return (dstRef.ref === argResolvedType.decl &&
102
+ dstIsArray === argResolvedType.array);
103
+ }
104
+ }
105
+ exports.assignableToAttributeParam = assignableToAttributeParam;
106
+ //# sourceMappingURL=utils.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/language-server/validator/utils.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,52 @@
1
+ "use strict";
2
+ var __importDefault = (this && this.__importDefault) || function (mod) {
3
+ return (mod && mod.__esModule) ? mod : { "default": mod };
4
+ };
5
+ Object.defineProperty(exports, "__esModule", { value: true });
6
+ exports.ZModelValidator = exports.ZModelValidationRegistry = void 0;
7
+ const langium_1 = require("langium");
8
+ const schema_validator_1 = __importDefault(require("./schema-validator"));
9
+ const datasource_validator_1 = __importDefault(require("./datasource-validator"));
10
+ const datamodel_validator_1 = __importDefault(require("./datamodel-validator"));
11
+ const attribute_validator_1 = __importDefault(require("./attribute-validator"));
12
+ const enum_validator_1 = __importDefault(require("./enum-validator"));
13
+ /**
14
+ * Registry for validation checks.
15
+ */
16
+ class ZModelValidationRegistry extends langium_1.ValidationRegistry {
17
+ constructor(services) {
18
+ super(services);
19
+ const validator = services.validation.ZModelValidator;
20
+ const checks = {
21
+ Model: validator.checkModel,
22
+ DataSource: validator.checkDataSource,
23
+ DataModel: validator.checkDataModel,
24
+ Enum: validator.checkEnum,
25
+ Attribute: validator.checkAttribute,
26
+ };
27
+ this.register(checks, validator);
28
+ }
29
+ }
30
+ exports.ZModelValidationRegistry = ZModelValidationRegistry;
31
+ /**
32
+ * Implementation of custom validations.
33
+ */
34
+ class ZModelValidator {
35
+ checkModel(node, accept) {
36
+ new schema_validator_1.default().validate(node, accept);
37
+ }
38
+ checkDataSource(node, accept) {
39
+ new datasource_validator_1.default().validate(node, accept);
40
+ }
41
+ checkDataModel(node, accept) {
42
+ new datamodel_validator_1.default().validate(node, accept);
43
+ }
44
+ checkEnum(node, accept) {
45
+ new enum_validator_1.default().validate(node, accept);
46
+ }
47
+ checkAttribute(node, accept) {
48
+ new attribute_validator_1.default().validate(node, accept);
49
+ }
50
+ }
51
+ exports.ZModelValidator = ZModelValidator;
52
+ //# sourceMappingURL=zmodel-validator.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"zmodel-validator.js","sourceRoot":"","sources":["../../../src/language-server/validator/zmodel-validator.ts"],"names":[],"mappings":";;;;;;AAAA,qCAIiB;AAUjB,0EAAiD;AACjD,kFAAyD;AACzD,gFAAuD;AACvD,gFAAuD;AACvD,sEAA6C;AAE7C;;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;YACnC,IAAI,EAAE,SAAS,CAAC,SAAS;YACzB,SAAS,EAAE,SAAS,CAAC,cAAc;SACtC,CAAC;QACF,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACrC,CAAC;CACJ;AAbD,4DAaC;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;IAED,SAAS,CAAC,IAAU,EAAE,MAA0B;QAC5C,IAAI,wBAAa,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAC/C,CAAC;IAED,cAAc,CAAC,IAAe,EAAE,MAA0B;QACtD,IAAI,6BAAkB,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACpD,CAAC;CACJ;AApBD,0CAoBC"}
@@ -1,38 +1,11 @@
1
1
  "use strict";
2
- var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
- return new (P || (P = Promise))(function (resolve, reject) {
5
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
- step((generator = generator.apply(thisArg, _arguments || [])).next());
9
- });
10
- };
11
2
  Object.defineProperty(exports, "__esModule", { value: true });
12
3
  exports.ZModelDescriptionProvider = void 0;
13
4
  const langium_1 = require("langium");
14
- const vscode_languageserver_1 = require("vscode-languageserver");
15
- const ast_1 = require("./generated/ast");
16
5
  class ZModelDescriptionProvider extends langium_1.DefaultAstNodeDescriptionProvider {
17
6
  constructor(services) {
18
7
  super(services);
19
8
  }
20
- createDescriptions(document, cancelToken = vscode_languageserver_1.CancellationToken.None) {
21
- const _super = Object.create(null, {
22
- createDescriptions: { get: () => super.createDescriptions }
23
- });
24
- return __awaiter(this, void 0, void 0, function* () {
25
- const descr = yield _super.createDescriptions.call(this, document, cancelToken);
26
- // add enum fields so they can be globally resolved across modules
27
- for (const node of (0, langium_1.streamAllContents)(document.parseResult.value)) {
28
- yield (0, langium_1.interruptAndCheck)(cancelToken);
29
- if ((0, ast_1.isEnumField)(node)) {
30
- yield descr.push(this.createDescription(node, node.name, document));
31
- }
32
- }
33
- return descr;
34
- });
35
- }
36
9
  }
37
10
  exports.ZModelDescriptionProvider = ZModelDescriptionProvider;
38
11
  //# sourceMappingURL=zmodel-index.js.map
@@ -1 +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"}
1
+ {"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"}
@@ -13,6 +13,7 @@ exports.ZModelLinker = void 0;
13
13
  const langium_1 = require("langium");
14
14
  const vscode_jsonrpc_1 = require("vscode-jsonrpc");
15
15
  const ast_1 = require("./generated/ast");
16
+ const utils_1 = require("./validator/utils");
16
17
  class ZModelLinker extends langium_1.DefaultLinker {
17
18
  constructor(services) {
18
19
  super(services);
@@ -52,6 +53,9 @@ class ZModelLinker extends langium_1.DefaultLinker {
52
53
  return null;
53
54
  }
54
55
  resolve(node, document, extraScopes = []) {
56
+ if (node.$resolvedType) {
57
+ return;
58
+ }
55
59
  switch (node.$type) {
56
60
  case ast_1.LiteralExpr:
57
61
  this.resolveLiteral(node);
@@ -80,6 +84,9 @@ class ZModelLinker extends langium_1.DefaultLinker {
80
84
  case ast_1.NullExpr:
81
85
  this.resolveNull(node, document, extraScopes);
82
86
  break;
87
+ case ast_1.AttributeArg:
88
+ this.resolveAttributeArg(node, document, extraScopes);
89
+ break;
83
90
  default:
84
91
  this.resolveDefault(node, document, extraScopes);
85
92
  break;
@@ -176,7 +183,7 @@ class ZModelLinker extends langium_1.DefaultLinker {
176
183
  }
177
184
  resolveCollectionPredicate(node, document, extraScopes) {
178
185
  this.resolve(node.left, document, extraScopes);
179
- const resolvedType = this.getResolvedType(node.left);
186
+ const resolvedType = node.left.$resolvedType;
180
187
  if (resolvedType &&
181
188
  (0, ast_1.isDataModel)(resolvedType.decl) &&
182
189
  resolvedType.array) {
@@ -204,6 +211,10 @@ class ZModelLinker extends langium_1.DefaultLinker {
204
211
  // TODO: how to really resolve null?
205
212
  this.resolveToBuiltinTypeOrDecl(node, 'Null');
206
213
  }
214
+ resolveAttributeArg(node, document, extraScopes) {
215
+ this.resolve(node.value, document, extraScopes);
216
+ node.$resolvedType = node.value.$resolvedType;
217
+ }
207
218
  resolveDefault(node, document, extraScopes) {
208
219
  for (const property of Object.keys(node)) {
209
220
  if (!property.startsWith('$')) {
@@ -218,16 +229,13 @@ class ZModelLinker extends langium_1.DefaultLinker {
218
229
  }
219
230
  }
220
231
  // utils
221
- getResolvedType(node) {
222
- return node.$resolvedType;
223
- }
224
232
  resolveToDeclaredType(node, type) {
225
- const _node = node;
226
233
  if (type.type) {
227
- _node.$resolvedType = { decl: type.type, array: type.array };
234
+ const mappedType = (0, utils_1.mapBuiltinTypeToExpressionType)(type.type);
235
+ node.$resolvedType = { decl: mappedType, array: type.array };
228
236
  }
229
237
  else if (type.reference) {
230
- _node.$resolvedType = {
238
+ node.$resolvedType = {
231
239
  decl: type.reference.ref,
232
240
  array: type.array,
233
241
  };
@@ -1 +1 @@
1
- {"version":3,"file":"zmodel-linker.js","sourceRoot":"","sources":["../../src/language-server/zmodel-linker.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"zmodel-linker.js","sourceRoot":"","sources":["../../src/language-server/zmodel-linker.ts"],"names":[],"mappings":"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"}
@@ -3,10 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.createZModelServices = exports.ZModelModule = void 0;
4
4
  const langium_1 = require("langium");
5
5
  const module_1 = require("./generated/module");
6
- const zmodel_index_1 = require("./zmodel-index");
7
6
  const zmodel_linker_1 = require("./zmodel-linker");
8
7
  const zmodel_scope_1 = require("./zmodel-scope");
9
- const zmodel_validator_1 = require("./zmodel-validator");
8
+ const zmodel_validator_1 = require("./validator/zmodel-validator");
10
9
  /**
11
10
  * Dependency injection module that overrides Langium default services and contributes the
12
11
  * declared custom services. The Langium defaults can be partially specified to override only
@@ -16,15 +15,11 @@ exports.ZModelModule = {
16
15
  references: {
17
16
  ScopeComputation: (services) => new zmodel_scope_1.ZModelScopeComputation(services),
18
17
  Linker: (services) => new zmodel_linker_1.ZModelLinker(services),
19
- // NameProvider: () => new ZModelNameProvider(),
20
18
  },
21
19
  validation: {
22
20
  ValidationRegistry: (services) => new zmodel_validator_1.ZModelValidationRegistry(services),
23
21
  ZModelValidator: () => new zmodel_validator_1.ZModelValidator(),
24
22
  },
25
- workspace: {
26
- AstNodeDescriptionProvider: (services) => new zmodel_index_1.ZModelDescriptionProvider(services),
27
- },
28
23
  };
29
24
  /**
30
25
  * Create the full set of services required by Langium.
@@ -1 +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"}
1
+ {"version":3,"file":"zmodel-module.js","sourceRoot":"","sources":["../../src/language-server/zmodel-module.ts"],"names":[],"mappings":";;;AAAA,qCASiB;AACjB,+CAG4B;AAC5B,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;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"}
@@ -11,18 +11,29 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
11
11
  Object.defineProperty(exports, "__esModule", { value: true });
12
12
  exports.ZModelScopeComputation = void 0;
13
13
  const langium_1 = require("langium");
14
- const vscode_jsonrpc_1 = require("vscode-jsonrpc");
14
+ const ast_1 = require("./generated/ast");
15
15
  class ZModelScopeComputation extends langium_1.DefaultScopeComputation {
16
16
  constructor(services) {
17
17
  super(services);
18
+ this.services = services;
18
19
  }
19
- computeScope(document, cancelToken = vscode_jsonrpc_1.CancellationToken.None) {
20
+ computeExports(document, cancelToken) {
20
21
  const _super = Object.create(null, {
21
- computeScope: { get: () => super.computeScope }
22
+ computeExports: { get: () => super.computeExports }
22
23
  });
23
24
  return __awaiter(this, void 0, void 0, function* () {
24
- // Dummy for now
25
- return _super.computeScope.call(this, document, cancelToken);
25
+ const result = yield _super.computeExports.call(this, document, cancelToken);
26
+ // add enum fields so they can be globally resolved across modules
27
+ for (const node of (0, langium_1.streamAllContents)(document.parseResult.value)) {
28
+ if (cancelToken) {
29
+ yield (0, langium_1.interruptAndCheck)(cancelToken);
30
+ }
31
+ if ((0, ast_1.isEnumField)(node)) {
32
+ const desc = this.services.workspace.AstNodeDescriptionProvider.createDescription(node, node.name, document);
33
+ result.push(desc);
34
+ }
35
+ }
36
+ return result;
26
37
  });
27
38
  }
28
39
  }
@@ -1 +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"}
1
+ {"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"}
@@ -2,6 +2,7 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.ZModelValidator = exports.ZModelValidationRegistry = void 0;
4
4
  const langium_1 = require("langium");
5
+ const ast_1 = require("./generated/ast");
5
6
  /**
6
7
  * Registry for validation checks.
7
8
  */
@@ -10,7 +11,7 @@ class ZModelValidationRegistry extends langium_1.ValidationRegistry {
10
11
  super(services);
11
12
  const validator = services.validation.ZModelValidator;
12
13
  const checks = {
13
- // Person: validator.checkPersonStartsWithCapital
14
+ Model: validator.checkModel,
14
15
  };
15
16
  this.register(checks, validator);
16
17
  }
@@ -20,6 +21,15 @@ exports.ZModelValidationRegistry = ZModelValidationRegistry;
20
21
  * Implementation of custom validations.
21
22
  */
22
23
  class ZModelValidator {
24
+ checkModel(model, accept) {
25
+ const dataSources = model.declarations.filter((d) => (0, ast_1.isDataSource)(d));
26
+ if (dataSources.length === 0) {
27
+ accept('error', 'Model must define a datasource', { node: model });
28
+ }
29
+ else if (dataSources.length > 1) {
30
+ accept('error', 'Multiple datasource declarations are not allowed', { node: dataSources[1] });
31
+ }
32
+ }
23
33
  }
24
34
  exports.ZModelValidator = ZModelValidator;
25
35
  //# sourceMappingURL=zmodel-validator.js.map
@@ -1 +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"}
1
+ {"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 CHANGED
@@ -2,7 +2,7 @@
2
2
  "name": "zenstack",
3
3
  "displayName": "ZenStack CLI and Language Tools",
4
4
  "description": "ZenStack CLI and Language Tools",
5
- "version": "0.1.45",
5
+ "version": "0.1.47",
6
6
  "engines": {
7
7
  "vscode": "^1.56.0"
8
8
  },
@@ -51,39 +51,42 @@
51
51
  "change-case": "^4.1.2",
52
52
  "chevrotain": "^9.1.0",
53
53
  "colors": "^1.4.0",
54
- "commander": "^8.0.0",
55
- "langium": "^0.4.0",
56
- "prisma": "^4.4.0",
54
+ "commander": "^8.3.0",
55
+ "langium": "^0.5.0",
56
+ "pluralize": "^8.0.0",
57
+ "prisma": "^4.5.0",
57
58
  "promisify": "^0.0.3",
58
59
  "ts-morph": "^16.0.0",
60
+ "uuid": "^9.0.0",
59
61
  "vscode-jsonrpc": "^8.0.2",
60
- "vscode-languageclient": "^7.0.0",
61
- "vscode-languageserver": "^7.0.0",
62
- "vscode-uri": "^3.0.2"
62
+ "vscode-languageclient": "^8.0.2",
63
+ "vscode-languageserver": "^8.0.2",
64
+ "vscode-uri": "^3.0.6"
63
65
  },
64
66
  "devDependencies": {
65
- "@prisma/internals": "^4.4.0",
66
- "@types/jest": "^29.0.3",
67
- "@types/node": "^14.18.29",
67
+ "@prisma/internals": "^4.5.0",
68
+ "@types/jest": "^29.2.0",
69
+ "@types/node": "^14.18.32",
70
+ "@types/pluralize": "^0.0.29",
68
71
  "@types/tmp": "^0.2.3",
69
72
  "@types/uuid": "^8.3.4",
70
- "@types/vscode": "^1.56.0",
71
- "@typescript-eslint/eslint-plugin": "^4.14.1",
72
- "@typescript-eslint/parser": "^4.14.1",
73
+ "@types/vscode": "^1.72.0",
74
+ "@typescript-eslint/eslint-plugin": "^4.33.0",
75
+ "@typescript-eslint/parser": "^4.33.0",
73
76
  "concurrently": "^7.4.0",
74
- "eslint": "^7.19.0",
75
- "jest": "^29.0.3",
76
- "langium-cli": "^0.4.0",
77
+ "eslint": "^7.32.0",
78
+ "jest": "^29.2.1",
79
+ "langium-cli": "^0.5.0",
77
80
  "tmp": "^0.2.1",
78
- "ts-jest": "^29.0.1",
81
+ "ts-jest": "^29.0.3",
79
82
  "ts-node": "^10.9.1",
80
83
  "tsc-alias": "^1.7.0",
81
84
  "tsconfig-paths-jest": "^0.0.1",
82
- "typescript": "^4.6.2"
85
+ "typescript": "^4.8.4"
83
86
  },
84
87
  "scripts": {
85
88
  "vscode:prepublish": "npm run build && npm run lint",
86
- "build": "tsc && tsc-alias && cp src/language-server/stdlib.zmodel ./out/language-server/ && cp src/generator/*.template.json ./out/generator/",
89
+ "build": "npm run langium:generate && tsc && tsc-alias && cp src/language-server/stdlib.zmodel ./out/language-server/ && cp src/generator/*.template.json ./out/generator/",
87
90
  "ts:watch": "tsc --watch",
88
91
  "tsc-alias:watch": "tsc-alias --watch",
89
92
  "lint": "eslint src --ext ts",