@contember/schema-utils 1.1.0-alpha.4 → 1.1.0-alpha.7

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 (75) hide show
  1. package/dist/src/acl/AllowAllPermissionFactory.d.ts.map +1 -1
  2. package/dist/src/acl/AllowAllPermissionFactory.js.map +1 -1
  3. package/dist/src/acl/index.js +5 -1
  4. package/dist/src/acl/index.js.map +1 -1
  5. package/dist/src/dataUtils.d.ts +2 -2
  6. package/dist/src/dataUtils.d.ts.map +1 -1
  7. package/dist/src/dataUtils.js +1 -1
  8. package/dist/src/dataUtils.js.map +1 -1
  9. package/dist/src/index.d.ts +2 -0
  10. package/dist/src/index.d.ts.map +1 -1
  11. package/dist/src/index.js +25 -2
  12. package/dist/src/index.js.map +1 -1
  13. package/dist/src/model/NamingHelper.d.ts +1 -1
  14. package/dist/src/model/NamingHelper.d.ts.map +1 -1
  15. package/dist/src/model/NamingHelper.js.map +1 -1
  16. package/dist/src/model/index.js +5 -1
  17. package/dist/src/model/index.js.map +1 -1
  18. package/dist/src/tsconfig.tsbuildinfo +1 -1
  19. package/dist/src/type-schema/acl.d.ts +8 -0
  20. package/dist/src/type-schema/acl.d.ts.map +1 -0
  21. package/dist/src/type-schema/acl.js +88 -0
  22. package/dist/src/type-schema/acl.js.map +1 -0
  23. package/dist/src/type-schema/index.d.ts +4 -0
  24. package/dist/src/type-schema/index.d.ts.map +1 -0
  25. package/dist/src/type-schema/index.js +20 -0
  26. package/dist/src/type-schema/index.js.map +1 -0
  27. package/dist/src/type-schema/model.d.ts +30 -0
  28. package/dist/src/type-schema/model.d.ts.map +1 -0
  29. package/dist/src/type-schema/model.js +148 -0
  30. package/dist/src/type-schema/model.js.map +1 -0
  31. package/dist/src/type-schema/validation.d.ts +15 -0
  32. package/dist/src/type-schema/validation.d.ts.map +1 -0
  33. package/dist/src/type-schema/validation.js +95 -0
  34. package/dist/src/type-schema/validation.js.map +1 -0
  35. package/dist/src/utils/index.js +5 -1
  36. package/dist/src/utils/index.js.map +1 -1
  37. package/dist/src/validation/AclValidator.d.ts +1 -2
  38. package/dist/src/validation/AclValidator.d.ts.map +1 -1
  39. package/dist/src/validation/AclValidator.js +22 -197
  40. package/dist/src/validation/AclValidator.js.map +1 -1
  41. package/dist/src/validation/ModelValidator.d.ts +1 -1
  42. package/dist/src/validation/ModelValidator.d.ts.map +1 -1
  43. package/dist/src/validation/ModelValidator.js +48 -219
  44. package/dist/src/validation/ModelValidator.js.map +1 -1
  45. package/dist/src/validation/SchemaValidator.d.ts.map +1 -1
  46. package/dist/src/validation/SchemaValidator.js +5 -19
  47. package/dist/src/validation/SchemaValidator.js.map +1 -1
  48. package/dist/src/validation/ValidationValidator.d.ts +1 -3
  49. package/dist/src/validation/ValidationValidator.d.ts.map +1 -1
  50. package/dist/src/validation/ValidationValidator.js +28 -201
  51. package/dist/src/validation/ValidationValidator.js.map +1 -1
  52. package/dist/src/validation/index.d.ts +2 -0
  53. package/dist/src/validation/index.d.ts.map +1 -1
  54. package/dist/src/validation/index.js +7 -1
  55. package/dist/src/validation/index.js.map +1 -1
  56. package/package.json +3 -2
  57. package/src/acl/AllowAllPermissionFactory.ts +2 -2
  58. package/src/dataUtils.ts +3 -3
  59. package/src/index.ts +8 -0
  60. package/src/model/NamingHelper.ts +1 -1
  61. package/src/tsconfig.json +3 -0
  62. package/src/type-schema/acl.ts +100 -0
  63. package/src/type-schema/index.ts +3 -0
  64. package/src/type-schema/model.ts +173 -0
  65. package/src/type-schema/validation.ts +100 -0
  66. package/src/validation/AclValidator.ts +42 -239
  67. package/src/validation/ModelValidator.ts +63 -263
  68. package/src/validation/SchemaValidator.ts +6 -21
  69. package/src/validation/ValidationValidator.ts +41 -222
  70. package/src/validation/index.ts +2 -0
  71. package/dist/src/validation/utils.d.ts +0 -18
  72. package/dist/src/validation/utils.d.ts.map +0 -1
  73. package/dist/src/validation/utils.js +0 -36
  74. package/dist/src/validation/utils.js.map +0 -1
  75. package/src/validation/utils.ts +0 -45
@@ -1 +1 @@
1
- {"version":3,"file":"AclValidator.js","sourceRoot":"","sources":["../../../src/validation/AclValidator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"AclValidator.js","sourceRoot":"","sources":["../../../src/validation/AclValidator.ts"],"names":[],"mappings":"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"}
@@ -3,7 +3,7 @@ import { ValidationError } from './errors';
3
3
  export declare class ModelValidator {
4
4
  private readonly model;
5
5
  constructor(model: Model.Schema);
6
- validate(): [Model.Schema, ValidationError[]];
6
+ validate(): ValidationError[];
7
7
  private validateEnums;
8
8
  private validateEntities;
9
9
  private validateEntity;
@@ -1 +1 @@
1
- {"version":3,"file":"ModelValidator.d.ts","sourceRoot":"","sources":["../../../src/validation/ModelValidator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AACzC,OAAO,EAAgB,eAAe,EAAE,MAAM,UAAU,CAAA;AAOxD,qBAAa,cAAc;IACd,OAAO,CAAC,QAAQ,CAAC,KAAK;gBAAL,KAAK,EAAE,KAAK,CAAC,MAAM;IAEzC,QAAQ,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,eAAe,EAAE,CAAC;IAgBpD,OAAO,CAAC,aAAa;IA6BrB,OAAO,CAAC,gBAAgB;IA0BxB,OAAO,CAAC,cAAc;IAmFtB,OAAO,CAAC,yBAAyB;IA0CjC,OAAO,CAAC,aAAa;IAsBrB,OAAO,CAAC,gBAAgB;IAwJxB,OAAO,CAAC,kBAAkB;IAY1B,OAAO,CAAC,kBAAkB;CAsD1B"}
1
+ {"version":3,"file":"ModelValidator.d.ts","sourceRoot":"","sources":["../../../src/validation/ModelValidator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AACzC,OAAO,EAAgB,eAAe,EAAE,MAAM,UAAU,CAAA;AAOxD,qBAAa,cAAc;IACd,OAAO,CAAC,QAAQ,CAAC,KAAK;gBAAL,KAAK,EAAE,KAAK,CAAC,MAAM;IAEzC,QAAQ,IAAI,eAAe,EAAE;IAQpC,OAAO,CAAC,aAAa;IASrB,OAAO,CAAC,gBAAgB;IAUxB,OAAO,CAAC,cAAc;IAiBtB,OAAO,CAAC,yBAAyB;IAejC,OAAO,CAAC,aAAa;IAOrB,OAAO,CAAC,gBAAgB;IAgHxB,OAAO,CAAC,kBAAkB;IAS1B,OAAO,CAAC,kBAAkB;CAiD1B"}
@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.ModelValidator = void 0;
4
4
  const schema_1 = require("@contember/schema");
5
5
  const errors_1 = require("./errors");
6
- const utils_1 = require("./utils");
7
6
  const model_1 = require("../model");
8
7
  const IDENTIFIER_PATTERN = /^[_a-zA-Z][_a-zA-Z0-9]*$/;
9
8
  const RESERVED_WORDS = ['and', 'or', 'not'];
@@ -12,211 +11,67 @@ class ModelValidator {
12
11
  this.model = model;
13
12
  }
14
13
  validate() {
15
- const model = this.model;
16
14
  const errorBuilder = new errors_1.ErrorBuilder([], []);
17
- let validModel;
18
- if (!(0, utils_1.isObject)(model)) {
19
- errorBuilder.add('Must be an object');
20
- validModel = { entities: {}, enums: {} };
21
- }
22
- else {
23
- const enums = this.validateEnums(model.enums, errorBuilder.for('enums'));
24
- const entities = this.validateEntities(model.entities, errorBuilder.for('entities'));
25
- validModel = { enums, entities };
26
- }
27
- this.validateCollisions(Object.values(validModel.entities), errorBuilder.for('entities'));
28
- return [validModel, errorBuilder.errors];
15
+ this.validateEnums(this.model.enums, errorBuilder.for('enums'));
16
+ this.validateEntities(this.model.entities, errorBuilder.for('entities'));
17
+ this.validateCollisions(Object.values(this.model.entities), errorBuilder.for('entities'));
18
+ return errorBuilder.errors;
29
19
  }
30
20
  validateEnums(enums, errors) {
31
- if (!enums) {
32
- errors.add('Enums definitions are missing');
33
- return {};
34
- }
35
- if (!(0, utils_1.isObject)(enums)) {
36
- errors.add('Enums must be an object');
37
- return {};
38
- }
39
- const validEnums = {};
40
- enums: for (const [enumName, enumValues] of Object.entries(enums)) {
41
- if (!Array.isArray(enumValues) || !(0, utils_1.everyIs)(enumValues, (it) => typeof it === 'string')) {
42
- errors.for(enumName).add('Enum values must be an array of strings');
43
- continue;
44
- }
45
- if (enumValues.length === 0) {
46
- errors.for(enumName).add('Enum must have at least one value');
47
- }
21
+ for (const [enumName, enumValues] of Object.entries(enums)) {
48
22
  for (const value of enumValues) {
49
- const valueErrors = errors.for(value);
50
- if (!this.validateIdentifier(value, valueErrors)) {
51
- continue enums;
52
- }
23
+ const valueErrors = errors.for(enumName, value);
24
+ this.validateIdentifier(value, valueErrors);
53
25
  }
54
- validEnums[enumName] = enumValues;
55
26
  }
56
- return validEnums;
57
27
  }
58
28
  validateEntities(entities, errors) {
59
- if (!entities) {
60
- errors.add('Entities definitions are missing');
61
- return {};
62
- }
63
- if (!(0, utils_1.isObject)(entities)) {
64
- errors.add('Entities must be an object');
65
- return {};
66
- }
67
- const validEntities = {};
68
29
  for (const [entityName, entity] of Object.entries(entities)) {
69
30
  const entityErrors = errors.for(entityName);
70
- const validEntity = this.validateEntity(entity, entityErrors);
71
- if (!validEntity) {
72
- continue;
31
+ if (entity.name !== entityName) {
32
+ entityErrors.add(`Entity name "${entity.name}" does not match the name in a map "${entityName}"`);
73
33
  }
74
- if (validEntity.name !== entityName) {
75
- entityErrors.add(`Entity name "${validEntity.name}" does not match the name in a map "${entityName}"`);
76
- continue;
77
- }
78
- validEntities[entityName] = validEntity;
34
+ this.validateEntity(entity, entityErrors);
79
35
  }
80
- return validEntities;
81
36
  }
82
37
  validateEntity(entity, errors) {
83
- if (!(0, utils_1.isObject)(entity)) {
84
- errors.add('Entity must be an object');
85
- return undefined;
86
- }
87
- if (typeof entity.name !== 'string') {
88
- errors.for('name').add('Entity name must be a string');
89
- return undefined;
90
- }
91
- if (!this.validateIdentifier(entity.name, errors)) {
92
- return undefined;
93
- }
94
- if (typeof entity.primary !== 'string') {
95
- errors.for('primary').add('Primary must be a string');
96
- return undefined;
97
- }
98
- if (typeof entity.primaryColumn !== 'string') {
99
- errors.for('primaryColumn').add('Primary column must be a string');
100
- return undefined;
101
- }
102
- if (typeof entity.tableName !== 'string') {
103
- errors.for('tableName').add('Table name must be a string');
104
- return undefined;
105
- }
106
- const fields = entity.fields;
107
- if (!(0, utils_1.isObject)(fields)) {
108
- errors.add('Fields must be an object');
109
- return undefined;
110
- }
111
- const partialEntity = {
112
- name: entity.name,
113
- primary: entity.primary,
114
- primaryColumn: entity.primaryColumn,
115
- tableName: entity.tableName,
116
- fields: {},
117
- unique: {},
118
- };
119
- if (entity.view) {
120
- const viewTmp = entity.view;
121
- if (!(0, utils_1.isObject)(viewTmp)) {
122
- errors.for('view').add('View must be an object');
123
- return undefined;
124
- }
125
- if (typeof viewTmp.sql !== 'string') {
126
- errors.for('view', 'sql').add('View SQL must be a string');
127
- return undefined;
128
- }
129
- partialEntity.view = entity.view;
130
- }
131
- const validFields = {};
132
- for (const [fieldName, field] of Object.entries(fields)) {
38
+ this.validateIdentifier(entity.name, errors);
39
+ for (const [fieldName, field] of Object.entries(entity.fields)) {
133
40
  const fieldErrors = errors.for(fieldName);
134
- const validField = this.validateField(partialEntity, field, fieldErrors);
135
- if (!validField) {
136
- continue;
41
+ this.validateField(entity, field, fieldErrors);
42
+ if (field.name !== fieldName) {
43
+ fieldErrors.add(`Field name "${field.name}" does not match the name in a map "${fieldName}"`);
137
44
  }
138
- if (validField.name !== fieldName) {
139
- fieldErrors.add(`Field name "${validField.name}" does not match the name in a map "${fieldName}"`);
140
- continue;
141
- }
142
- validFields[fieldName] = validField;
143
- }
144
- const uniqueConstraints = entity.unique;
145
- if (!(0, utils_1.isObject)(uniqueConstraints)) {
146
- errors.add('Unique constraints must be an object');
147
- return undefined;
148
45
  }
149
- const validUniqueConstraints = this.validateUniqueConstraints(uniqueConstraints, new Set(Object.keys(validFields)), errors.for('unique'));
150
- return {
151
- ...partialEntity,
152
- fields: validFields,
153
- unique: validUniqueConstraints,
154
- };
46
+ this.validateUniqueConstraints(entity.unique, new Set(Object.keys(entity.fields)), errors.for('unique'));
155
47
  }
156
48
  validateUniqueConstraints(uniqueConstraints, fields, errors) {
157
- if (!(0, utils_1.isObject)(uniqueConstraints)) {
158
- errors.add('Unique constraints must be an object');
159
- return {};
160
- }
161
- const validUniqueConstraints = {};
162
- constraint: for (const [constraintName, constraint] of Object.entries(uniqueConstraints)) {
49
+ for (const [constraintName, constraint] of Object.entries(uniqueConstraints)) {
163
50
  const uniqueErrors = errors.for(constraintName);
164
- if (!(0, utils_1.isObject)(constraint)) {
165
- uniqueErrors.add('Unique constraint must be an object');
166
- continue;
167
- }
168
- if (typeof constraint.name !== 'string') {
169
- uniqueErrors.add('Constraint name is not defined');
170
- continue;
171
- }
172
51
  if (constraint.name !== constraintName) {
173
52
  uniqueErrors.add(`Constraint name ${constraint.name} does not match the name in a map "${constraintName}"`);
174
53
  continue;
175
54
  }
176
- if (!Array.isArray(constraint.fields) ||
177
- !(0, utils_1.everyIs)(constraint.fields, (it) => typeof it === 'string')) {
178
- uniqueErrors.add('Every field must be a string');
179
- continue;
180
- }
181
55
  for (const field of constraint.fields) {
182
56
  if (!fields.has(field)) {
183
57
  uniqueErrors.add(`Referenced field ${field} in a constraint does not exists`);
184
- continue constraint;
185
58
  }
186
59
  }
187
- validUniqueConstraints[constraintName] = { name: constraint.name, fields: constraint.fields };
188
60
  }
189
- return validUniqueConstraints;
190
61
  }
191
62
  validateField(partialEntity, field, errors) {
192
- if (!(0, utils_1.isObject)(field)) {
193
- errors.add('Field must be an object');
194
- return undefined;
195
- }
196
- if (typeof field.type !== 'string') {
197
- errors.add('Field type must be a string');
198
- return undefined;
199
- }
200
- if (typeof field.name !== 'string') {
201
- errors.for('name').add('Field name must be a string');
202
- return undefined;
203
- }
204
- if (!this.validateIdentifier(field.name, errors)) {
205
- return undefined;
206
- }
63
+ this.validateIdentifier(field.name, errors);
207
64
  if (isRelation(field)) {
208
- return this.validateRelation(partialEntity, field, errors);
65
+ this.validateRelation(partialEntity, field, errors);
209
66
  }
210
- return field;
211
67
  }
212
68
  validateRelation(partialEntity, field, errors) {
213
69
  var _a;
214
70
  const entityName = partialEntity.name;
215
- const targetEntityName = field.target; // todo
71
+ const targetEntityName = field.target;
216
72
  const targetEntity = this.model.entities[targetEntityName] || undefined;
217
73
  if (!targetEntity) {
218
- errors.add(`Target entity ${targetEntityName} not found`);
219
- return undefined;
74
+ return errors.add(`Target entity ${targetEntityName} not found`);
220
75
  }
221
76
  if (((it) => 'orderBy' in it)(field)) {
222
77
  (_a = field.orderBy) === null || _a === void 0 ? void 0 : _a.forEach(it => {
@@ -240,119 +95,92 @@ class ModelValidator {
240
95
  });
241
96
  }
242
97
  if (partialEntity.view) {
243
- const type = field.type;
244
- if (type === schema_1.Model.RelationType.ManyHasMany ||
245
- type === schema_1.Model.RelationType.OneHasMany ||
246
- (type === schema_1.Model.RelationType.OneHasOne && !('joiningColumn' in field))) {
247
- errors.add('This relation type is not allowed on a view entity. Only one-has-one owning and many-has one are allowed.');
98
+ if (field.type === schema_1.Model.RelationType.ManyHasMany ||
99
+ field.type === schema_1.Model.RelationType.OneHasMany ||
100
+ (field.type === schema_1.Model.RelationType.OneHasOne && !('joiningColumn' in field))) {
101
+ return errors.add('This relation type is not allowed on a view entity. Only one-has-one owning and many-has one are allowed.');
248
102
  }
249
103
  }
250
104
  if ((0, model_1.isInverseRelation)(field)) {
251
- // todo
252
105
  const ownedBy = field.ownedBy;
253
- if (typeof ownedBy !== 'string') {
254
- errors.add('Owned by is not defined');
255
- return undefined;
256
- }
257
106
  const targetField = targetEntity.fields[ownedBy];
258
107
  const relationDescription = `Target relation ${targetEntityName}::${ownedBy}:`;
259
108
  if (!targetField) {
260
- errors.add(`${relationDescription} not exists`);
261
- return undefined;
109
+ return errors.add(`${relationDescription} not exists`);
262
110
  }
263
111
  if (!isRelation(targetField)) {
264
- errors.add(`${relationDescription} not a relation`);
265
- return undefined;
112
+ return errors.add(`${relationDescription} not a relation`);
266
113
  }
267
114
  if (targetField.target !== entityName) {
268
- errors.add(`${relationDescription} back reference to entity ${entityName} expected, but ${targetField.target} given`);
269
- return undefined;
115
+ return errors.add(`${relationDescription} back reference to entity ${entityName} expected, but ${targetField.target} given`);
270
116
  }
271
117
  if (!(0, model_1.isOwningRelation)(targetField)) {
272
118
  errors.add(`${relationDescription} not an owning relation`);
273
- return undefined;
119
+ return;
274
120
  }
275
121
  if (!targetField.inversedBy) {
276
- errors.add(`${relationDescription} inverse relation is not set`);
277
- return undefined;
122
+ return errors.add(`${relationDescription} inverse relation is not set`);
278
123
  }
279
124
  if (targetField.inversedBy !== field.name) {
280
- errors.add(`${relationDescription} back reference ${entityName}::${field.name} exepcted, ${targetField.target}::${targetField.inversedBy} given`);
281
- return undefined;
125
+ return errors.add(`${relationDescription} back reference ${entityName}::${field.name} exepcted, ${targetField.target}::${targetField.inversedBy} given`);
282
126
  }
283
127
  if (field.type === schema_1.Model.RelationType.OneHasOne && targetField.type !== schema_1.Model.RelationType.OneHasOne) {
284
- errors.add(`${relationDescription} "OneHasOne" type expected, "${targetField.type}" given`);
285
- return undefined;
128
+ return errors.add(`${relationDescription} "OneHasOne" type expected, "${targetField.type}" given`);
286
129
  }
287
130
  if (field.type === schema_1.Model.RelationType.OneHasMany && targetField.type !== schema_1.Model.RelationType.ManyHasOne) {
288
- errors.add(`${relationDescription} "ManyHasOne" type expected, "${targetField.type}" given`);
289
- return undefined;
131
+ return errors.add(`${relationDescription} "ManyHasOne" type expected, "${targetField.type}" given`);
290
132
  }
291
133
  if (field.type === schema_1.Model.RelationType.ManyHasMany && targetField.type !== schema_1.Model.RelationType.ManyHasMany) {
292
- errors.add(`${relationDescription} "ManyHasMany" type expected, "${targetField.type}" given`);
293
- return undefined;
134
+ return errors.add(`${relationDescription} "ManyHasMany" type expected, "${targetField.type}" given`);
294
135
  }
295
136
  }
296
137
  else {
297
- const inversedBy = field.inversedBy; // todo
138
+ const inversedBy = field.inversedBy;
298
139
  if (targetEntity.view) {
299
140
  if ('joiningColumn' in field) {
300
- errors.add(`View entity ${targetEntity.name} cannot be referenced from an owning relation. Try switching the owning side.`);
141
+ return errors.add(`View entity ${targetEntity.name} cannot be referenced from an owning relation. Try switching the owning side.`);
301
142
  }
302
143
  }
303
144
  if (inversedBy) {
304
145
  const targetField = targetEntity.fields[inversedBy];
305
146
  const relationDescription = `Target relation ${targetEntityName}::${inversedBy}:`;
306
147
  if (!targetField) {
307
- errors.add(`${relationDescription} not exists`);
308
- return undefined;
148
+ return errors.add(`${relationDescription} not exists`);
309
149
  }
310
150
  if (!isRelation(targetField)) {
311
- errors.add(`${relationDescription} not a relation`);
312
- return undefined;
151
+ return errors.add(`${relationDescription} not a relation`);
313
152
  }
314
153
  if (targetField.target !== entityName) {
315
- errors.add(`${relationDescription} back reference to entity ${entityName} expected, but ${targetField.target} given`);
316
- return undefined;
154
+ return errors.add(`${relationDescription} back reference to entity ${entityName} expected, but ${targetField.target} given`);
317
155
  }
318
156
  if (!(0, model_1.isInverseRelation)(targetField)) {
319
- errors.add(`${relationDescription} not an inverse relation`);
320
- return undefined;
157
+ return errors.add(`${relationDescription} not an inverse relation`);
321
158
  }
322
159
  if (!targetField.ownedBy) {
323
- errors.add(`${relationDescription} owning relation is not set`);
324
- return undefined;
160
+ return errors.add(`${relationDescription} owning relation is not set`);
325
161
  }
326
162
  if (targetField.ownedBy !== field.name) {
327
- errors.add(`${relationDescription} back reference ${entityName}::${field.name} exepcted, ${targetField.target}::${targetField.ownedBy} given`);
328
- return undefined;
163
+ return errors.add(`${relationDescription} back reference ${entityName}::${field.name} exepcted, ${targetField.target}::${targetField.ownedBy} given`);
329
164
  }
330
165
  if (field.type === schema_1.Model.RelationType.OneHasOne && targetField.type !== schema_1.Model.RelationType.OneHasOne) {
331
- errors.add(`${relationDescription} "OneHasOne" type expected, "${targetField.type}" given`);
332
- return undefined;
166
+ return errors.add(`${relationDescription} "OneHasOne" type expected, "${targetField.type}" given`);
333
167
  }
334
168
  if (field.type === schema_1.Model.RelationType.ManyHasOne && targetField.type !== schema_1.Model.RelationType.OneHasMany) {
335
- errors.add(`${relationDescription} "ManyHasOne" type expected, "${targetField.type}" given`);
336
- return undefined;
169
+ return errors.add(`${relationDescription} "ManyHasOne" type expected, "${targetField.type}" given`);
337
170
  }
338
171
  if (field.type === schema_1.Model.RelationType.ManyHasMany && targetField.type !== schema_1.Model.RelationType.ManyHasMany) {
339
- errors.add(`${relationDescription} "ManyHasMany" type expected, "${targetField.type}" given`);
340
- return undefined;
172
+ return errors.add(`${relationDescription} "ManyHasMany" type expected, "${targetField.type}" given`);
341
173
  }
342
174
  }
343
175
  }
344
- return field; // todo
345
176
  }
346
177
  validateIdentifier(value, errorBuilder) {
347
178
  if (!value.match(IDENTIFIER_PATTERN)) {
348
- errorBuilder.add(`${value} must match pattern ${IDENTIFIER_PATTERN.source}`);
349
- return false;
179
+ return errorBuilder.add(`${value} must match pattern ${IDENTIFIER_PATTERN.source}`);
350
180
  }
351
181
  if (RESERVED_WORDS.includes(value)) {
352
182
  errorBuilder.add(`${value} is reserved word`);
353
- return false;
354
183
  }
355
- return true;
356
184
  }
357
185
  validateCollisions(entities, errorBuilder) {
358
186
  const tableNames = {};
@@ -377,7 +205,8 @@ class ModelValidator {
377
205
  if (tableNames[joiningTable.tableName]) {
378
206
  entityErrorBuilder
379
207
  .for(relation.name)
380
- .add(`Joining table name ${joiningTable.tableName} of ${description} collides with a table name of ${tableNames[joiningTable.tableName]}. Consider using plural for a relation name or change the joining table name using .joiningTable(...) in schema definition.`);
208
+ .add(`Joining table name ${joiningTable.tableName} of ${description} collides with a table name of ${tableNames[joiningTable.tableName]}.` +
209
+ 'Consider using plural for a relation name or change the joining table name using .joiningTable(...) in schema definition.');
381
210
  }
382
211
  else {
383
212
  tableNames[joiningTable.tableName] = description;
@@ -1 +1 @@
1
- {"version":3,"file":"ModelValidator.js","sourceRoot":"","sources":["../../../src/validation/ModelValidator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ModelValidator.js","sourceRoot":"","sources":["../../../src/validation/ModelValidator.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"SchemaValidator.d.ts","sourceRoot":"","sources":["../../../src/validation/SchemaValidator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAC1C,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAO1C,qBAAa,eAAe;WACb,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,eAAe,EAAE;CA0BzD"}
1
+ {"version":3,"file":"SchemaValidator.d.ts","sourceRoot":"","sources":["../../../src/validation/SchemaValidator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAC1C,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAK1C,qBAAa,eAAe;WACb,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,eAAe,EAAE;CAazD"}
@@ -4,29 +4,15 @@ exports.SchemaValidator = void 0;
4
4
  const AclValidator_1 = require("./AclValidator");
5
5
  const ModelValidator_1 = require("./ModelValidator");
6
6
  const ValidationValidator_1 = require("./ValidationValidator");
7
- const utils_1 = require("../utils");
8
7
  class SchemaValidator {
9
8
  static validate(schema) {
10
- const aclValidator = new AclValidator_1.AclValidator(schema.model);
11
- const [acl, aclErrors] = aclValidator.validate(schema.acl);
12
9
  const modelValidator = new ModelValidator_1.ModelValidator(schema.model);
13
- const [model, modelErrors] = modelValidator.validate();
10
+ const modelErrors = modelValidator.validate();
11
+ const aclValidator = new AclValidator_1.AclValidator(schema.model);
12
+ const aclErrors = aclValidator.validate(schema.acl);
14
13
  const validationValidator = new ValidationValidator_1.ValidationValidator(schema.model);
15
- const [validation, validationErrors] = validationValidator.validate(schema.validation);
16
- const validSchema = { ...schema, acl, model, validation };
17
- const errors = [...aclErrors, ...modelErrors, ...validationErrors];
18
- if (errors.length === 0) {
19
- const errors = (0, utils_1.deepCompare)(validSchema, schema, []);
20
- if (errors.length) {
21
- let message = 'There is something wrong with a schema validator:';
22
- for (const err of errors) {
23
- message += '\n\t' + err.path.join('.') + ': ' + err.message;
24
- }
25
- message += '\n\nPlease fill a bug report';
26
- throw new Error(message);
27
- }
28
- }
29
- return errors;
14
+ const validationErrors = validationValidator.validate(schema.validation);
15
+ return [...aclErrors, ...modelErrors, ...validationErrors];
30
16
  }
31
17
  }
32
18
  exports.SchemaValidator = SchemaValidator;
@@ -1 +1 @@
1
- {"version":3,"file":"SchemaValidator.js","sourceRoot":"","sources":["../../../src/validation/SchemaValidator.ts"],"names":[],"mappings":";;;AAEA,iDAA6C;AAC7C,qDAAiD;AAEjD,+DAA2D;AAC3D,oCAAsC;AAEtC,MAAa,eAAe;IACpB,MAAM,CAAC,QAAQ,CAAC,MAAc;QACpC,MAAM,YAAY,GAAG,IAAI,2BAAY,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QACnD,MAAM,CAAC,GAAG,EAAE,SAAS,CAAC,GAAG,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;QAE1D,MAAM,cAAc,GAAG,IAAI,+BAAc,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QACvD,MAAM,CAAC,KAAK,EAAE,WAAW,CAAC,GAAG,cAAc,CAAC,QAAQ,EAAE,CAAA;QAEtD,MAAM,mBAAmB,GAAG,IAAI,yCAAmB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QACjE,MAAM,CAAC,UAAU,EAAE,gBAAgB,CAAC,GAAG,mBAAmB,CAAC,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;QAEtF,MAAM,WAAW,GAAG,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,UAAU,EAAE,CAAA;QAEzD,MAAM,MAAM,GAAG,CAAC,GAAG,SAAS,EAAE,GAAG,WAAW,EAAE,GAAG,gBAAgB,CAAC,CAAA;QAClE,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;YACxB,MAAM,MAAM,GAAG,IAAA,mBAAW,EAAC,WAAW,EAAE,MAAM,EAAE,EAAE,CAAC,CAAA;YACnD,IAAI,MAAM,CAAC,MAAM,EAAE;gBAClB,IAAI,OAAO,GAAG,mDAAmD,CAAA;gBACjE,KAAK,MAAM,GAAG,IAAI,MAAM,EAAE;oBACzB,OAAO,IAAI,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,GAAG,GAAG,CAAC,OAAO,CAAA;iBAC3D;gBACD,OAAO,IAAI,8BAA8B,CAAA;gBACzC,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAA;aACxB;SACD;QACD,OAAO,MAAM,CAAA;IACd,CAAC;CACD;AA3BD,0CA2BC"}
1
+ {"version":3,"file":"SchemaValidator.js","sourceRoot":"","sources":["../../../src/validation/SchemaValidator.ts"],"names":[],"mappings":";;;AAEA,iDAA6C;AAC7C,qDAAiD;AACjD,+DAA2D;AAE3D,MAAa,eAAe;IACpB,MAAM,CAAC,QAAQ,CAAC,MAAc;QACpC,MAAM,cAAc,GAAG,IAAI,+BAAc,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QACvD,MAAM,WAAW,GAAG,cAAc,CAAC,QAAQ,EAAE,CAAA;QAE7C,MAAM,YAAY,GAAG,IAAI,2BAAY,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QACnD,MAAM,SAAS,GAAG,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;QAGnD,MAAM,mBAAmB,GAAG,IAAI,yCAAmB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QACjE,MAAM,gBAAgB,GAAG,mBAAmB,CAAC,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;QAExE,OAAO,CAAC,GAAG,SAAS,EAAE,GAAG,WAAW,EAAE,GAAG,gBAAgB,CAAC,CAAA;IAC3D,CAAC;CACD;AAdD,0CAcC"}
@@ -3,14 +3,12 @@ import { ValidationError } from './errors';
3
3
  export declare class ValidationValidator {
4
4
  private readonly model;
5
5
  constructor(model: Model.Schema);
6
- validate(schema: unknown): [Validation.Schema, ValidationError[]];
6
+ validate(schema: Validation.Schema): ValidationError[];
7
7
  private validateEntityRules;
8
8
  private validateFieldRules;
9
9
  private validateFieldRule;
10
- private validateFieldRuleMessage;
11
10
  private validateValidator;
12
11
  private validateValidatorArgument;
13
- private validateLiteralArgument;
14
12
  private validatePathArgument;
15
13
  }
16
14
  //# sourceMappingURL=ValidationValidator.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"ValidationValidator.d.ts","sourceRoot":"","sources":["../../../src/validation/ValidationValidator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AACrD,OAAO,EAAgB,eAAe,EAAE,MAAM,UAAU,CAAA;AAIxD,qBAAa,mBAAmB;IACnB,OAAO,CAAC,QAAQ,CAAC,KAAK;gBAAL,KAAK,EAAE,KAAK,CAAC,MAAM;IAEzC,QAAQ,CAAC,MAAM,EAAE,OAAO,GAAG,CAAC,UAAU,CAAC,MAAM,EAAE,eAAe,EAAE,CAAC;IAqBxE,OAAO,CAAC,mBAAmB;IAsB3B,OAAO,CAAC,kBAAkB;IAoB1B,OAAO,CAAC,iBAAiB;IAiCzB,OAAO,CAAC,wBAAwB;IAqBhC,OAAO,CAAC,iBAAiB;IA0IzB,OAAO,CAAC,yBAAyB;IAqBjC,OAAO,CAAC,uBAAuB;IAmB/B,OAAO,CAAC,oBAAoB;CA+B5B"}
1
+ {"version":3,"file":"ValidationValidator.d.ts","sourceRoot":"","sources":["../../../src/validation/ValidationValidator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AACrD,OAAO,EAAgB,eAAe,EAAE,MAAM,UAAU,CAAA;AAGxD,qBAAa,mBAAmB;IACnB,OAAO,CAAC,QAAQ,CAAC,KAAK;gBAAL,KAAK,EAAE,KAAK,CAAC,MAAM;IAEzC,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC,MAAM,GAAG,eAAe,EAAE;IAc7D,OAAO,CAAC,mBAAmB;IAgB3B,OAAO,CAAC,kBAAkB;IAW1B,OAAO,CAAC,iBAAiB;IAoBzB,OAAO,CAAC,iBAAiB;IA4DzB,OAAO,CAAC,yBAAyB;IAUjC,OAAO,CAAC,oBAAoB;CAe5B"}