zenstack 0.1.46 → 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.
- package/out/generator/prisma/expression-writer.js +2 -2
- package/out/generator/prisma/expression-writer.js.map +1 -1
- package/out/generator/prisma/prisma-builder.js +2 -2
- package/out/generator/prisma/prisma-builder.js.map +1 -1
- package/out/generator/prisma/query-gard-generator.js +1 -1
- package/out/generator/prisma/query-gard-generator.js.map +1 -1
- package/out/generator/prisma/schema-generator.js +4 -16
- package/out/generator/prisma/schema-generator.js.map +1 -1
- package/out/generator/utils.js +1 -1
- package/out/generator/utils.js.map +1 -1
- package/out/langium-ext.js +3 -0
- package/out/langium-ext.js.map +1 -0
- package/out/language-server/generated/ast.js +4 -1
- package/out/language-server/generated/ast.js.map +1 -1
- package/out/language-server/generated/grammar.js +259 -76
- package/out/language-server/generated/grammar.js.map +1 -1
- package/out/language-server/langium-ext.js +3 -0
- package/out/language-server/langium-ext.js.map +1 -0
- package/out/language-server/stdlib.zmodel +17 -19
- package/out/language-server/validator/attribute-validator copy.js +12 -0
- package/out/language-server/validator/attribute-validator copy.js.map +1 -0
- package/out/language-server/validator/attribute-validator.js +7 -0
- package/out/language-server/validator/attribute-validator.js.map +1 -0
- package/out/language-server/validator/datamodel-validator.js +159 -1
- package/out/language-server/validator/datamodel-validator.js.map +1 -1
- package/out/language-server/validator/enum-validator.js +10 -0
- package/out/language-server/validator/enum-validator.js.map +1 -0
- package/out/language-server/validator/utils.js +77 -1
- package/out/language-server/validator/utils.js.map +1 -1
- package/out/language-server/validator/zmodel-validator.js +10 -0
- package/out/language-server/validator/zmodel-validator.js.map +1 -1
- package/out/language-server/zmodel-linker.js +15 -7
- package/out/language-server/zmodel-linker.js.map +1 -1
- package/out/language-server/zmodel-module.js +0 -4
- package/out/language-server/zmodel-module.js.map +1 -1
- package/package.json +4 -2
|
@@ -1,14 +1,20 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
6
|
const constants_1 = require("../constants");
|
|
7
|
+
const ast_1 = require("../generated/ast");
|
|
4
8
|
const utils_1 = require("./utils");
|
|
9
|
+
const pluralize_1 = __importDefault(require("pluralize"));
|
|
5
10
|
class DataModelValidator {
|
|
6
11
|
validate(dm, accept) {
|
|
7
12
|
(0, utils_1.validateDuplicatedDeclarations)(dm.fields, accept);
|
|
8
13
|
this.validateFields(dm, accept);
|
|
14
|
+
this.validateAttributes(dm, accept);
|
|
9
15
|
}
|
|
10
16
|
validateFields(dm, accept) {
|
|
11
|
-
const idFields = dm.fields.filter((f) => f.attributes.find((attr) => { var _a; return ((_a = attr.decl.ref) === null || _a === void 0 ? void 0 : _a.name) === 'id'; }));
|
|
17
|
+
const idFields = dm.fields.filter((f) => f.attributes.find((attr) => { var _a; return ((_a = attr.decl.ref) === null || _a === void 0 ? void 0 : _a.name) === '@id'; }));
|
|
12
18
|
if (idFields.length === 0) {
|
|
13
19
|
accept('error', 'Model must include a field with @id attribute', {
|
|
14
20
|
node: dm,
|
|
@@ -32,9 +38,161 @@ class DataModelValidator {
|
|
|
32
38
|
dm.fields.forEach((field) => this.validateField(field, accept));
|
|
33
39
|
}
|
|
34
40
|
validateField(field, accept) {
|
|
41
|
+
var _a;
|
|
35
42
|
if (field.type.array && field.type.optional) {
|
|
36
43
|
accept('error', 'Optional lists are not supported. Use either `Type[]` or `Type?`', { node: field.type });
|
|
37
44
|
}
|
|
45
|
+
field.attributes.forEach((attr) => this.validateAttributeApplication(attr, accept));
|
|
46
|
+
if ((0, ast_1.isDataModel)((_a = field.type.reference) === null || _a === void 0 ? void 0 : _a.ref)) {
|
|
47
|
+
this.validateRelationField(field, accept);
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
validateAttributes(dm, accept) {
|
|
51
|
+
dm.attributes.forEach((attr) => {
|
|
52
|
+
this.validateAttributeApplication(attr, accept);
|
|
53
|
+
});
|
|
54
|
+
}
|
|
55
|
+
validateAttributeApplication(attr, accept) {
|
|
56
|
+
const decl = attr.decl.ref;
|
|
57
|
+
if (!decl) {
|
|
58
|
+
throw new Error(`Reference unresolved: ${attr.decl.$refText}`);
|
|
59
|
+
}
|
|
60
|
+
const filledParams = new Set();
|
|
61
|
+
for (const arg of attr.args) {
|
|
62
|
+
let paramDecl;
|
|
63
|
+
if (!arg.name) {
|
|
64
|
+
paramDecl = decl.params.find((p) => p.default && !filledParams.has(p));
|
|
65
|
+
if (!paramDecl) {
|
|
66
|
+
accept('error', `Unexpected unnamed argument`, {
|
|
67
|
+
node: arg,
|
|
68
|
+
});
|
|
69
|
+
return false;
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
else {
|
|
73
|
+
paramDecl = decl.params.find((p) => p.name === arg.name);
|
|
74
|
+
if (!paramDecl) {
|
|
75
|
+
accept('error', `Attribute "${decl.name}" doesn't have a parameter named "${arg.name}"`, {
|
|
76
|
+
node: arg,
|
|
77
|
+
});
|
|
78
|
+
return false;
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
if (!(0, utils_1.assignableToAttributeParam)(arg, paramDecl, attr)) {
|
|
82
|
+
accept('error', `Value is not assignable to parameter`, {
|
|
83
|
+
node: arg,
|
|
84
|
+
});
|
|
85
|
+
return false;
|
|
86
|
+
}
|
|
87
|
+
if (filledParams.has(paramDecl)) {
|
|
88
|
+
accept('error', `Parameter "${paramDecl.name}" is already provided`, { node: arg });
|
|
89
|
+
return false;
|
|
90
|
+
}
|
|
91
|
+
filledParams.add(paramDecl);
|
|
92
|
+
}
|
|
93
|
+
const missingParams = decl.params.filter((p) => !p.type.optional && !filledParams.has(p));
|
|
94
|
+
if (missingParams.length > 0) {
|
|
95
|
+
accept('error', `Required ${(0, pluralize_1.default)('parameter', missingParams.length)} not provided: ${missingParams
|
|
96
|
+
.map((p) => p.name)
|
|
97
|
+
.join(', ')}`, { node: attr });
|
|
98
|
+
return false;
|
|
99
|
+
}
|
|
100
|
+
return true;
|
|
101
|
+
}
|
|
102
|
+
parseRelation(field, accept) {
|
|
103
|
+
const relAttr = field.attributes.find((attr) => { var _a; return ((_a = attr.decl.ref) === null || _a === void 0 ? void 0 : _a.name) === '@relation'; });
|
|
104
|
+
let name;
|
|
105
|
+
let fields;
|
|
106
|
+
let references;
|
|
107
|
+
let valid = true;
|
|
108
|
+
if (!relAttr) {
|
|
109
|
+
return { attr: relAttr, name, fields, references, valid: true };
|
|
110
|
+
}
|
|
111
|
+
for (const arg of relAttr.args) {
|
|
112
|
+
if (!arg.name || arg.name === 'name') {
|
|
113
|
+
if ((0, ast_1.isLiteralExpr)(arg.value)) {
|
|
114
|
+
name = arg.value.value;
|
|
115
|
+
}
|
|
116
|
+
}
|
|
117
|
+
else if (arg.name === 'fields') {
|
|
118
|
+
fields = arg.value.items;
|
|
119
|
+
if (fields.length === 0) {
|
|
120
|
+
if (accept) {
|
|
121
|
+
accept('error', `"fields" value cannot be emtpy`, {
|
|
122
|
+
node: arg,
|
|
123
|
+
});
|
|
124
|
+
}
|
|
125
|
+
valid = false;
|
|
126
|
+
}
|
|
127
|
+
}
|
|
128
|
+
else if (arg.name === 'references') {
|
|
129
|
+
references = arg.value.items;
|
|
130
|
+
if (references.length === 0) {
|
|
131
|
+
if (accept) {
|
|
132
|
+
accept('error', `"references" value cannot be emtpy`, {
|
|
133
|
+
node: arg,
|
|
134
|
+
});
|
|
135
|
+
}
|
|
136
|
+
valid = false;
|
|
137
|
+
}
|
|
138
|
+
}
|
|
139
|
+
}
|
|
140
|
+
return { attr: relAttr, name, fields, references, valid };
|
|
141
|
+
}
|
|
142
|
+
validateRelationField(field, accept) {
|
|
143
|
+
var _a, _b, _c, _d;
|
|
144
|
+
const thisRelation = this.parseRelation(field, accept);
|
|
145
|
+
if (!thisRelation.valid) {
|
|
146
|
+
return;
|
|
147
|
+
}
|
|
148
|
+
const oppositeModel = field.type.reference.ref;
|
|
149
|
+
let oppositeFields = oppositeModel.fields.filter((f) => { var _a; return ((_a = f.type.reference) === null || _a === void 0 ? void 0 : _a.ref) === field.$container; });
|
|
150
|
+
oppositeFields = oppositeFields.filter((f) => {
|
|
151
|
+
const fieldRel = this.parseRelation(f);
|
|
152
|
+
return fieldRel.valid && fieldRel.name === thisRelation.name;
|
|
153
|
+
});
|
|
154
|
+
if (oppositeFields.length === 0) {
|
|
155
|
+
accept('error', `The relation field "${field.name}" on model "${field.$container.name}" is missing an opposite relation field on model "${oppositeModel.name}"`, { node: field });
|
|
156
|
+
return;
|
|
157
|
+
}
|
|
158
|
+
else if (oppositeFields.length > 1) {
|
|
159
|
+
oppositeFields.forEach((f) => accept('error', `Fields ${oppositeFields
|
|
160
|
+
.map((f) => '"' + f.name + '"')
|
|
161
|
+
.join(', ')} on model ${oppositeModel.name} refer to the same relation to model "${field.$container.name}"`, { node: f }));
|
|
162
|
+
return;
|
|
163
|
+
}
|
|
164
|
+
const oppositeField = oppositeFields[0];
|
|
165
|
+
const oppositeRelation = this.parseRelation(oppositeField);
|
|
166
|
+
let relationOwner;
|
|
167
|
+
if (((_a = thisRelation === null || thisRelation === void 0 ? void 0 : thisRelation.references) === null || _a === void 0 ? void 0 : _a.length) && ((_b = thisRelation.fields) === null || _b === void 0 ? void 0 : _b.length)) {
|
|
168
|
+
if ((oppositeRelation === null || oppositeRelation === void 0 ? void 0 : oppositeRelation.references) || (oppositeRelation === null || oppositeRelation === void 0 ? void 0 : oppositeRelation.fields)) {
|
|
169
|
+
accept('error', '"fields" and "references" must be provided only on one side of relation field', { node: oppositeField });
|
|
170
|
+
return;
|
|
171
|
+
}
|
|
172
|
+
else {
|
|
173
|
+
relationOwner = oppositeField;
|
|
174
|
+
}
|
|
175
|
+
}
|
|
176
|
+
else if (((_c = oppositeRelation === null || oppositeRelation === void 0 ? void 0 : oppositeRelation.references) === null || _c === void 0 ? void 0 : _c.length) &&
|
|
177
|
+
((_d = oppositeRelation.fields) === null || _d === void 0 ? void 0 : _d.length)) {
|
|
178
|
+
if ((thisRelation === null || thisRelation === void 0 ? void 0 : thisRelation.references) || (thisRelation === null || thisRelation === void 0 ? void 0 : thisRelation.fields)) {
|
|
179
|
+
accept('error', '"fields" and "references" must be provided only on one side of relation field', { node: field });
|
|
180
|
+
return;
|
|
181
|
+
}
|
|
182
|
+
else {
|
|
183
|
+
relationOwner = field;
|
|
184
|
+
}
|
|
185
|
+
}
|
|
186
|
+
else {
|
|
187
|
+
[field, oppositeField].forEach((f) => accept('error', 'Field for one side of relation must carry @relation attribute with both "fields" and "references" fields', { node: f }));
|
|
188
|
+
return;
|
|
189
|
+
}
|
|
190
|
+
if (!relationOwner.type.array && !relationOwner.type.optional) {
|
|
191
|
+
accept('error', 'Relation field needs to be list or optional', {
|
|
192
|
+
node: relationOwner,
|
|
193
|
+
});
|
|
194
|
+
return;
|
|
195
|
+
}
|
|
38
196
|
}
|
|
39
197
|
}
|
|
40
198
|
exports.default = DataModelValidator;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"datamodel-validator.js","sourceRoot":"","sources":["../../../src/language-server/validator/datamodel-validator.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"datamodel-validator.js","sourceRoot":"","sources":["../../../src/language-server/validator/datamodel-validator.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const utils_1 = require("./utils");
|
|
4
|
+
class EnumValidator {
|
|
5
|
+
validate(_enum, accept) {
|
|
6
|
+
(0, utils_1.validateDuplicatedDeclarations)(_enum.fields, accept);
|
|
7
|
+
}
|
|
8
|
+
}
|
|
9
|
+
exports.default = EnumValidator;
|
|
10
|
+
//# sourceMappingURL=enum-validator.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"enum-validator.js","sourceRoot":"","sources":["../../../src/language-server/validator/enum-validator.ts"],"names":[],"mappings":";;AAGA,mCAAyD;AAEzD,MAAqB,aAAa;IAC9B,QAAQ,CAAC,KAAW,EAAE,MAA0B;QAC5C,IAAA,sCAA8B,EAAC,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACzD,CAAC;CACJ;AAJD,gCAIC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getStringLiteral = exports.validateDuplicatedDeclarations = void 0;
|
|
3
|
+
exports.assignableToAttributeParam = exports.mapBuiltinTypeToExpressionType = exports.typeAssignable = exports.getStringLiteral = exports.validateDuplicatedDeclarations = void 0;
|
|
4
4
|
const ast_1 = require("../generated/ast");
|
|
5
5
|
function validateDuplicatedDeclarations(decls, accept) {
|
|
6
6
|
const groupByName = decls.reduce((group, decl) => {
|
|
@@ -27,4 +27,80 @@ function getStringLiteral(node) {
|
|
|
27
27
|
}
|
|
28
28
|
}
|
|
29
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;
|
|
30
106
|
//# sourceMappingURL=utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/language-server/validator/utils.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/language-server/validator/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,8 @@ const langium_1 = require("langium");
|
|
|
8
8
|
const schema_validator_1 = __importDefault(require("./schema-validator"));
|
|
9
9
|
const datasource_validator_1 = __importDefault(require("./datasource-validator"));
|
|
10
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"));
|
|
11
13
|
/**
|
|
12
14
|
* Registry for validation checks.
|
|
13
15
|
*/
|
|
@@ -19,6 +21,8 @@ class ZModelValidationRegistry extends langium_1.ValidationRegistry {
|
|
|
19
21
|
Model: validator.checkModel,
|
|
20
22
|
DataSource: validator.checkDataSource,
|
|
21
23
|
DataModel: validator.checkDataModel,
|
|
24
|
+
Enum: validator.checkEnum,
|
|
25
|
+
Attribute: validator.checkAttribute,
|
|
22
26
|
};
|
|
23
27
|
this.register(checks, validator);
|
|
24
28
|
}
|
|
@@ -37,6 +41,12 @@ class ZModelValidator {
|
|
|
37
41
|
checkDataModel(node, accept) {
|
|
38
42
|
new datamodel_validator_1.default().validate(node, accept);
|
|
39
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
|
+
}
|
|
40
50
|
}
|
|
41
51
|
exports.ZModelValidator = ZModelValidator;
|
|
42
52
|
//# sourceMappingURL=zmodel-validator.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"zmodel-validator.js","sourceRoot":"","sources":["../../../src/language-server/validator/zmodel-validator.ts"],"names":[],"mappings":";;;;;;AAAA,qCAIiB;
|
|
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"}
|
|
@@ -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 =
|
|
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
|
-
|
|
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
|
-
|
|
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":";;;;;;;;;;;;AAAA,qCAaiB;AACjB,mDAAmD;AACnD,yCAoByB;
|
|
1
|
+
{"version":3,"file":"zmodel-linker.js","sourceRoot":"","sources":["../../src/language-server/zmodel-linker.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,6 @@ 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
8
|
const zmodel_validator_1 = require("./validator/zmodel-validator");
|
|
@@ -21,9 +20,6 @@ exports.ZModelModule = {
|
|
|
21
20
|
ValidationRegistry: (services) => new zmodel_validator_1.ZModelValidationRegistry(services),
|
|
22
21
|
ZModelValidator: () => new zmodel_validator_1.ZModelValidator(),
|
|
23
22
|
},
|
|
24
|
-
workspace: {
|
|
25
|
-
AstNodeDescriptionProvider: (services) => new zmodel_index_1.ZModelDescriptionProvider(services),
|
|
26
|
-
},
|
|
27
23
|
};
|
|
28
24
|
/**
|
|
29
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,
|
|
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"}
|
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.
|
|
5
|
+
"version": "0.1.47",
|
|
6
6
|
"engines": {
|
|
7
7
|
"vscode": "^1.56.0"
|
|
8
8
|
},
|
|
@@ -53,6 +53,7 @@
|
|
|
53
53
|
"colors": "^1.4.0",
|
|
54
54
|
"commander": "^8.3.0",
|
|
55
55
|
"langium": "^0.5.0",
|
|
56
|
+
"pluralize": "^8.0.0",
|
|
56
57
|
"prisma": "^4.5.0",
|
|
57
58
|
"promisify": "^0.0.3",
|
|
58
59
|
"ts-morph": "^16.0.0",
|
|
@@ -66,6 +67,7 @@
|
|
|
66
67
|
"@prisma/internals": "^4.5.0",
|
|
67
68
|
"@types/jest": "^29.2.0",
|
|
68
69
|
"@types/node": "^14.18.32",
|
|
70
|
+
"@types/pluralize": "^0.0.29",
|
|
69
71
|
"@types/tmp": "^0.2.3",
|
|
70
72
|
"@types/uuid": "^8.3.4",
|
|
71
73
|
"@types/vscode": "^1.72.0",
|
|
@@ -84,7 +86,7 @@
|
|
|
84
86
|
},
|
|
85
87
|
"scripts": {
|
|
86
88
|
"vscode:prepublish": "npm run build && npm run lint",
|
|
87
|
-
"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/",
|
|
88
90
|
"ts:watch": "tsc --watch",
|
|
89
91
|
"tsc-alias:watch": "tsc-alias --watch",
|
|
90
92
|
"lint": "eslint src --ext ts",
|