@forestadmin/datasource-customizer 1.52.1 → 1.53.0
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/dist/collection-customizer.js +2 -2
- package/dist/decorators/binary/collection.js +4 -4
- package/dist/decorators/computed/collection.js +2 -2
- package/dist/decorators/computed/helpers/rewrite-projection.js +2 -2
- package/dist/decorators/operators-emulate/collection.js +4 -6
- package/dist/decorators/override/collection.js +2 -1
- package/dist/decorators/publication/collection.js +3 -6
- package/dist/decorators/relation/collection.js +7 -10
- package/dist/decorators/rename-field/collection.js +5 -7
- package/dist/decorators/sort-emulate/collection.js +3 -3
- package/dist/decorators/validation/collection.js +3 -3
- package/dist/decorators/write/create-relations/collection.js +7 -6
- package/dist/decorators/write/update-relations/collection.js +10 -7
- package/dist/decorators/write/write-replace/collection.js +3 -4
- package/dist/plugins/import-field.js +2 -5
- package/package.json +2 -2
|
@@ -359,7 +359,7 @@ class CollectionCustomizer {
|
|
|
359
359
|
emulateFieldFiltering(name) {
|
|
360
360
|
return this.pushCustomization(async () => {
|
|
361
361
|
const collection = this.stack.lateOpEmulate.getCollection(this.name);
|
|
362
|
-
const field = collection.schema.
|
|
362
|
+
const field = datasource_toolkit_1.SchemaUtils.getColumn(collection.schema, name, collection.name);
|
|
363
363
|
if (typeof field.columnType === 'string') {
|
|
364
364
|
const operators = datasource_toolkit_1.allowedOperatorsForColumnType[field.columnType];
|
|
365
365
|
for (const operator of operators) {
|
|
@@ -526,4 +526,4 @@ class CollectionCustomizer {
|
|
|
526
526
|
}
|
|
527
527
|
}
|
|
528
528
|
exports.default = CollectionCustomizer;
|
|
529
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"collection-customizer.js","sourceRoot":"","sources":["../src/collection-customizer.ts"],"names":[],"mappings":"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"}
|
|
529
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"collection-customizer.js","sourceRoot":"","sources":["../src/collection-customizer.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,7 +20,7 @@ class BinaryCollectionDecorator extends datasource_toolkit_1.CollectionDecorator
|
|
|
20
20
|
this.useHexConversion = new Map();
|
|
21
21
|
}
|
|
22
22
|
setBinaryMode(name, type) {
|
|
23
|
-
const field = this.childCollection.schema.
|
|
23
|
+
const field = datasource_toolkit_1.SchemaUtils.getField(this.childCollection.schema, name, this.childCollection.name);
|
|
24
24
|
if (type !== 'datauri' && type !== 'hex') {
|
|
25
25
|
throw new Error('Invalid binary mode');
|
|
26
26
|
}
|
|
@@ -96,7 +96,7 @@ class BinaryCollectionDecorator extends datasource_toolkit_1.CollectionDecorator
|
|
|
96
96
|
}
|
|
97
97
|
async convertConditionTreeLeaf(leaf) {
|
|
98
98
|
const [prefix, suffix] = leaf.field.split(/:(.*)/);
|
|
99
|
-
const schema = this.childCollection.schema.
|
|
99
|
+
const schema = datasource_toolkit_1.SchemaUtils.getField(this.childCollection.schema, prefix, this.childCollection.name);
|
|
100
100
|
if (schema.type !== 'Column') {
|
|
101
101
|
const conditionTree = await this.dataSource
|
|
102
102
|
.getCollection(schema.foreignCollection)
|
|
@@ -116,7 +116,7 @@ class BinaryCollectionDecorator extends datasource_toolkit_1.CollectionDecorator
|
|
|
116
116
|
}
|
|
117
117
|
async convertValue(toBackend, path, value) {
|
|
118
118
|
const [prefix, suffix] = path.split(/:(.*)/);
|
|
119
|
-
const schema = this.childCollection.schema.
|
|
119
|
+
const schema = datasource_toolkit_1.SchemaUtils.getField(this.childCollection.schema, prefix, this.childCollection.name);
|
|
120
120
|
if (schema.type !== 'Column') {
|
|
121
121
|
const foreignCollection = this.dataSource.getCollection(schema.foreignCollection);
|
|
122
122
|
return suffix
|
|
@@ -200,4 +200,4 @@ BinaryCollectionDecorator.operatorsWithValueReplacement = [
|
|
|
200
200
|
...['After', 'Before', 'Contains', 'EndsWith', 'Equal', 'GreaterThan', 'IContains', 'NotIn'],
|
|
201
201
|
...['IEndsWith', 'IStartsWith', 'LessThan', 'NotContains', 'NotEqual', 'StartsWith', 'In'],
|
|
202
202
|
];
|
|
203
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"collection.js","sourceRoot":"","sources":["../../../src/decorators/binary/collection.ts"],"names":[],"mappings":"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"}
|
|
203
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"collection.js","sourceRoot":"","sources":["../../../src/decorators/binary/collection.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,7 +18,7 @@ class ComputedCollection extends datasource_toolkit_1.CollectionDecorator {
|
|
|
18
18
|
const index = path.indexOf(':');
|
|
19
19
|
if (index === -1)
|
|
20
20
|
return this.computeds[path];
|
|
21
|
-
const { foreignCollection } = this.schema
|
|
21
|
+
const { foreignCollection } = datasource_toolkit_1.SchemaUtils.getRelation(this.schema, path.substring(0, index), this.name);
|
|
22
22
|
const association = this.dataSource.getCollection(foreignCollection);
|
|
23
23
|
return association.getComputed(path.substring(index + 1));
|
|
24
24
|
}
|
|
@@ -68,4 +68,4 @@ class ComputedCollection extends datasource_toolkit_1.CollectionDecorator {
|
|
|
68
68
|
}
|
|
69
69
|
}
|
|
70
70
|
exports.default = ComputedCollection;
|
|
71
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
71
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29sbGVjdGlvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9kZWNvcmF0b3JzL2NvbXB1dGVkL2NvbGxlY3Rpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSx3RUFheUM7QUFFekMsOEVBQTBEO0FBQzFELHNGQUF3RDtBQUV4RCwwRkFBOEU7QUFFOUUsd0NBQXdDO0FBQ3hDLE1BQXFCLGtCQUFtQixTQUFRLHdDQUFtQjtJQUFuRTs7UUFFWSxjQUFTLEdBQXVDLEVBQUUsQ0FBQztJQW9GL0QsQ0FBQztJQWxGQyxnQkFBZ0I7SUFDaEIsV0FBVyxDQUFDLElBQVk7UUFDdEIsTUFBTSxLQUFLLEdBQUcsSUFBSSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUNoQyxJQUFJLEtBQUssS0FBSyxDQUFDLENBQUM7WUFBRSxPQUFPLElBQUksQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLENBQUM7UUFFOUMsTUFBTSxFQUFFLGlCQUFpQixFQUFFLEdBQUcsZ0NBQVcsQ0FBQyxXQUFXLENBQ25ELElBQUksQ0FBQyxNQUFNLEVBQ1gsSUFBSSxDQUFDLFNBQVMsQ0FBQyxDQUFDLEVBQUUsS0FBSyxDQUFDLEVBQ3hCLElBQUksQ0FBQyxJQUFJLENBQ1YsQ0FBQztRQUNGLE1BQU0sV0FBVyxHQUFHLElBQUksQ0FBQyxVQUFVLENBQUMsYUFBYSxDQUFDLGlCQUFpQixDQUFDLENBQUM7UUFFckUsT0FBTyxXQUFXLENBQUMsV0FBVyxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsS0FBSyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDNUQsQ0FBQztJQUVELGdCQUFnQixDQUFDLElBQVksRUFBRSxRQUE0QjtRQUN6RCxtQ0FBYyxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsSUFBSSxFQUFFLElBQUksQ0FBQyxDQUFDO1FBRTdDLG9EQUFvRDtRQUNwRCxLQUFLLE1BQU0sS0FBSyxJQUFJLFFBQVEsQ0FBQyxZQUFZ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
|
|
@@ -5,7 +5,7 @@ function rewriteField(collection, path) {
|
|
|
5
5
|
// Projection is targeting a field on another collection => recurse.
|
|
6
6
|
if (path.includes(':')) {
|
|
7
7
|
const [prefix] = path.split(':');
|
|
8
|
-
const schema = collection.schema.
|
|
8
|
+
const schema = datasource_toolkit_1.SchemaUtils.getRelation(collection.schema, prefix, collection.name);
|
|
9
9
|
const association = collection.dataSource.getCollection(schema.foreignCollection);
|
|
10
10
|
return new datasource_toolkit_1.Projection(path)
|
|
11
11
|
.unnest()
|
|
@@ -19,4 +19,4 @@ function rewriteField(collection, path) {
|
|
|
19
19
|
: new datasource_toolkit_1.Projection(path);
|
|
20
20
|
}
|
|
21
21
|
exports.default = rewriteField;
|
|
22
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
22
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmV3cml0ZS1wcm9qZWN0aW9uLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL2RlY29yYXRvcnMvY29tcHV0ZWQvaGVscGVycy9yZXdyaXRlLXByb2plY3Rpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSx3RUFBMEU7QUFJMUUsU0FBd0IsWUFBWSxDQUFDLFVBQThCLEVBQUUsSUFBWTtJQUMvRSxvRUFBb0U7SUFDcEUsSUFBSSxJQUFJLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBQyxFQUFFO1FBQ3RCLE1BQU0sQ0FBQyxNQUFNLENBQUMsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQ2pDLE1BQU0sTUFBTSxHQUFHLGdDQUFXLENBQUMsV0FBVyxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsTUFBTSxFQUFFLFVBQVUsQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUNuRixNQUFNLFdBQVcsR0FBRyxVQUFVLENBQUMsVUFBVSxDQUFDLGFBQWEsQ0FBQyxNQUFNLENBQUMsaUJBQWlCLENBQUMsQ0FBQztRQUVsRixPQUFPLElBQUksK0JBQVUsQ0FBQyxJQUFJLENBQUM7YUFDeEIsTUFBTSxFQUFFO2FBQ1IsT0FBTyxDQUFDLE9BQU8sQ0FBQyxFQUFFLENBQUMsWUFBWSxDQUFDLFdBQVcsRUFBRSxPQUFPLENBQUMsQ0FBQzthQUN0RCxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUM7S0FDakI7SUFFRCxrRUFBa0U7SUFDbEUsTUFBTSxRQUFRLEdBQUcsVUFBVSxDQUFDLFdBQVcsQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUU5QyxPQUFPLFFBQVE7UUFDYixDQUFDLENBQUMsSUFBSSwrQkFBVSxDQUFDLEdBQUcsUUFBUSxDQUFDLFlBQVksQ0FBQyxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsRUFBRSxDQUFDLFlBQVksQ0FBQyxVQUFVLEVBQUUsT0FBTyxDQUFDLENBQUM7UUFDaEcsQ0FBQyxDQUFDLElBQUksK0JBQVUsQ0FBQyxJQUFJLENBQUMsQ0FBQztBQUMzQixDQUFDO0FBbkJELCtCQW1CQyJ9
|
|
@@ -22,7 +22,7 @@ class OperatorsEmulateCollectionDecorator extends datasource_toolkit_1.Collectio
|
|
|
22
22
|
// Check that the collection can actually support our rewriting
|
|
23
23
|
const pks = datasource_toolkit_1.SchemaUtils.getPrimaryKeys(this.childCollection.schema);
|
|
24
24
|
pks.forEach(pk => {
|
|
25
|
-
const schema = this.childCollection.schema.
|
|
25
|
+
const schema = datasource_toolkit_1.SchemaUtils.getField(this.childCollection.schema, pk, this.childCollection.name);
|
|
26
26
|
const operators = schema.filterOperators;
|
|
27
27
|
if (!operators?.has('Equal') || !operators?.has('In')) {
|
|
28
28
|
throw new Error(`Cannot override operators on collection '${this.name}': ` +
|
|
@@ -30,10 +30,8 @@ class OperatorsEmulateCollectionDecorator extends datasource_toolkit_1.Collectio
|
|
|
30
30
|
}
|
|
31
31
|
});
|
|
32
32
|
// Check that targeted field is valid
|
|
33
|
-
|
|
33
|
+
datasource_toolkit_1.SchemaUtils.throwIfMissingField(this.childCollection.schema, name, this.childCollection.name);
|
|
34
34
|
datasource_toolkit_1.FieldValidator.validate(this, name);
|
|
35
|
-
if (!field)
|
|
36
|
-
throw new Error('Cannot replace operator for relation');
|
|
37
35
|
// Mark the field operator as replaced.
|
|
38
36
|
if (!this.fields.has(name))
|
|
39
37
|
this.fields.set(name, new Map());
|
|
@@ -68,7 +66,7 @@ class OperatorsEmulateCollectionDecorator extends datasource_toolkit_1.Collectio
|
|
|
68
66
|
// ConditionTree is targeting a field on another collection => recurse.
|
|
69
67
|
if (leaf.field.includes(':')) {
|
|
70
68
|
const [prefix] = leaf.field.split(':');
|
|
71
|
-
const schema = this.schema.
|
|
69
|
+
const schema = datasource_toolkit_1.SchemaUtils.getRelation(this.schema, prefix, this.name);
|
|
72
70
|
const association = this.dataSource.getCollection(schema.foreignCollection);
|
|
73
71
|
const associationLeaf = await leaf
|
|
74
72
|
.unnest()
|
|
@@ -100,4 +98,4 @@ class OperatorsEmulateCollectionDecorator extends datasource_toolkit_1.Collectio
|
|
|
100
98
|
}
|
|
101
99
|
}
|
|
102
100
|
exports.default = OperatorsEmulateCollectionDecorator;
|
|
103
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
101
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29sbGVjdGlvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9kZWNvcmF0b3JzL29wZXJhdG9ycy1lbXVsYXRlL2NvbGxlY3Rpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSx3RUFleUM7QUFHekMsMEZBQThFO0FBRTlFLE1BQXFCLG1DQUFvQyxTQUFRLHdDQUFtQjtJQUFwRjs7UUFFbUIsV0FBTSxHQUEwRCxJQUFJLEdBQUcsRUFBRSxDQUFDO0lBMkk3RixDQUFDO0lBeklDLG9CQUFvQixDQUFDLElBQVksRUFBRSxRQUFrQjtRQUNuRCxJQUFJLENBQUMsNkJBQTZCLENBQUMsSUFBSSxFQUFFLFFBQVEsRUFBRSxJQUFJLENBQUMsQ0FBQztJQUMzRCxDQUFDO0lBRUQsb0JBQW9CLENBQUMsSUFBWSxFQUFFLFFBQWtCLEVBQUUsU0FBNkI7UUFDbEYsSUFBSSxDQUFDLFNBQVM7WUFBRSxNQUFNLElBQUksS0FBSyxDQUFDLCtCQUErQixDQUFDLENBQUM7UUFDakUsSUFBSSxDQUFDLDZCQUE2QixDQUFDLElBQUksRUFBRSxRQUFRLEVBQUUsU0FBUyxDQUFDLENBQUM7SUFDaEUsQ0FBQztJQUVPLDZCQUE2QixDQUNuQyxJQUFZLEVBQ1osUUFBa0IsRUFDbEIsU0FBb0M7UUFFcEMsK0RBQStEO1FBQy9ELE1BQU0sR0FBRyxHQUFHLGdDQUFXLENBQUMsY0FBYyxDQUFDLElBQUksQ0FBQyxlQUFlLENBQUMsTUFBTSxDQUFDLENBQUM7UUFDcEUsR0FBRyxDQUFDLE9BQU8sQ0FBQyxFQUFFLENBQUMsRUFBRTtZQUNmLE1BQU0sTUFBTSxHQUFHLGdDQUFXLENBQUMsUUFBUSxDQUNqQyxJQUFJLENBQUMsZUFBZSxDQUFDLE1BQU0sRUFDM0IsRUFBRSxFQUNGLElBQUksQ0FBQyxlQUFlLENBQUMsSUFBSSxDQUNWLENBQUM7WUFDbEIsTUFBTSxTQUFTLEdBQUcsTUFBTSxDQUFDLGVBQWUsQ0FBQztZQUV6QyxJQUFJLENB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
|
|
@@ -43,6 +43,7 @@ class OverrideCollectionDecorator extends datasource_toolkit_1.CollectionDecorat
|
|
|
43
43
|
records.forEach(result => {
|
|
44
44
|
let hasPrimaryKey = false;
|
|
45
45
|
Object.keys(result).forEach(key => {
|
|
46
|
+
// don't use SchemaUtils.getField util because if the field does not exist, we remove it.
|
|
46
47
|
const field = this.schema.fields[key];
|
|
47
48
|
if (!field || field.type !== 'Column') {
|
|
48
49
|
delete result[key];
|
|
@@ -58,4 +59,4 @@ class OverrideCollectionDecorator extends datasource_toolkit_1.CollectionDecorat
|
|
|
58
59
|
}
|
|
59
60
|
}
|
|
60
61
|
exports.default = OverrideCollectionDecorator;
|
|
61
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
62
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29sbGVjdGlvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9kZWNvcmF0b3JzL292ZXJyaWRlL2NvbGxlY3Rpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSx3RUFPeUM7QUFFekMsdUNBSW1CO0FBR25CLE1BQXFCLDJCQUE0QixTQUFRLHdDQUFtQjtJQUtqRSxLQUFLLENBQUMsTUFBTSxDQUFDLE1BQWMsRUFBRSxJQUFrQjtRQUN0RCxJQUFJLElBQUksQ0FBQyxhQUFhLEVBQUU7WUFDdEIsTUFBTSxPQUFPLEdBQUcsSUFBSSw0Q0FBa0MsQ0FBQyxJQUFJLENBQUMsZUFBZSxFQUFFLE1BQU0sRUFBRSxJQUFJLENBQUMsQ0FBQztZQUUzRixNQUFNLE9BQU8sR0FBRyxNQUFNLElBQUksQ0FBQyxhQUFhLENBQUMsT0FBTyxDQUFDLENBQUM7WUFDbEQsSUFBSSxDQUFDLG1CQUFtQixDQUFDLE9BQU8sQ0FBQyxDQUFDO1lBRWxDLE9BQU8sT0FBTyxDQUFDO1NBQ2hCO1FBRUQsT0FBTyxLQUFLLENBQUMsTUFBTSxDQUFDLE1BQU0sRUFBRSxJQUFJLENBQUMsQ0FBQztJQUNwQyxDQUFDO0lBRUQsZ0JBQWdCLENBQUMsT0FBOEI7UUFDN0MsSUFBSSxDQUFDLGFBQWEsR0FBRyxPQUFPLENBQUM7SUFDL0IsQ0FBQztJQUVRLEtBQUssQ0FBQyxNQUFNLENBQUMsTUFBYyxFQUFFLE1BQWMsRUFBRSxLQUFpQjtRQUNyRSxJQUFJLElBQUksQ0FBQyxhQUFhLEVBQUU7WUFDdEIsTUFBTSxPQUFPLEdBQUcsSUFBSSw0Q0FBa0MsQ0FDcEQsSUFBSSxDQUFDLGVBQWUsRUFDcEIsTUFBTSxFQUNOLE1BQU0sRUFDTixLQUFLLENBQ04sQ0FBQztZQUVGLE9BQU8sSUFBSSxDQUFDLGFBQWEsQ0FBQyxPQUFPLENBQUMsQ0FBQztTQUNwQztRQUVELE9BQU8sS0FBSyxDQUFDLE1BQU0sQ0FBQyxNQUFNLEVBQUUsTUFBTSxFQUFFLEtBQUssQ0FBQyxDQUFDO0lBQzdDLENBQUM7SUFFRCxnQkFBZ0IsQ0FBQyxPQUE4QjtRQUM3QyxJQUFJLENBQUMsYUFBYSxHQUFHLE9BQU8sQ0FBQztJQUMvQixDQUFDO0lBRVEsS0FBSyxDQUFDLE1BQU0sQ0FBQyxNQUFjLEVBQUUsTUFBYztRQUNsRCxJQUFJLElBQUksQ0FBQyxhQUFhLEVBQUU7WUFDdEIsTUFBTSxPQUFPLEdBQUcsSUFBSSw0Q0FBa0MsQ0FBQyxJQUFJLENBQUMsZUFBZSxFQUFFLE1BQU0sRUFBRSxNQUFNLENBQUMsQ0FBQztZQUU3RixPQUFPLElBQUksQ0FBQyxhQUFhLENBQUMsT0FBTyxDQUFDLENBQUM7U0FDcEM7UUFFRCxPQUFPLEtBQUssQ0FBQyxNQUFNLENBQUMsTUFBTSxFQUFFLE1BQU0sQ0FBQyxDQUFDO0lBQ3RDLENBQUM7SUFFRCxnQkFBZ0IsQ0FBQyxPQUE4QjtRQUM3QyxJQUFJLENBQUMsYUFBYSxHQUFHLE9BQU8sQ0FBQztJQUMvQixDQUFDO0lBRUQsdUZBQXVGO0lBQy9FLG1CQUFtQixDQUFDLE9BQXNCO1FBQ2hELElBQUksQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxFQUFFO1lBQzNCLE1BQU0sSUFBSSxvQ0FBZSxDQUFDLHlDQUF5QyxDQUFDLENBQUM7U0FDdEU7UUFFRCxPQUFPLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxFQUFFO1lBQ3ZCLElBQUksYUFBYSxHQUFHLEtBQUssQ0FBQztZQUMxQixNQUFNLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsRUFBRTtnQkFDaEMseUZBQXlGO2dCQUN6RixNQUFNLEtBQUssR0FBRyxJQUFJLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQztnQkFFdEMsSUFBSSxDQUFDLEtBQUssSUFBSSxLQUFLLENBQUMsSUFBSSxLQUFLLFFBQVEsRUFBRTtvQkFDckMsT0FBTyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUM7aUJBQ3BCO3FCQUFNLElBQUksZ0NBQVcsQ0FBQyxZQUFZLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxHQUFHLENBQUMsRUFBRTtvQkFDckQsYUFBYSxHQUFHLElBQUksQ0FBQztpQkFDdEI7WUFDSCxDQUFDLENBQUMsQ0FBQztZQUVILElBQUksQ0FBQyxhQUFhLEVBQUU7Z0JBQ2xCLE1BQU0sSUFBSSxvQ0FBZSxDQUFDLG1EQUFtRCxDQUFDLENBQUM7YUFDaEY7UUFDSCxDQUFDLENBQUMsQ0FBQztJQUNMLENBQUM7Q0FDRjtBQS9FRCw4Q0ErRUMifQ==
|
|
@@ -9,10 +9,7 @@ class PublicationCollectionDecorator extends datasource_toolkit_1.CollectionDeco
|
|
|
9
9
|
}
|
|
10
10
|
/** Show/hide fields from the schema */
|
|
11
11
|
changeFieldVisibility(name, visible) {
|
|
12
|
-
|
|
13
|
-
if (!field) {
|
|
14
|
-
throw new datasource_toolkit_1.MissingFieldError(name, this.childCollection.name);
|
|
15
|
-
}
|
|
12
|
+
datasource_toolkit_1.SchemaUtils.throwIfMissingField(this.childCollection.schema, name, this.childCollection.name);
|
|
16
13
|
if (datasource_toolkit_1.SchemaUtils.isPrimaryKey(this.childCollection.schema, name)) {
|
|
17
14
|
throw new Error(`Cannot hide primary key`);
|
|
18
15
|
}
|
|
@@ -47,7 +44,7 @@ class PublicationCollectionDecorator extends datasource_toolkit_1.CollectionDeco
|
|
|
47
44
|
if (this.blacklist.has(name))
|
|
48
45
|
return false;
|
|
49
46
|
// Implicitly hidden
|
|
50
|
-
const field = this.childCollection.schema.
|
|
47
|
+
const field = datasource_toolkit_1.SchemaUtils.getField(this.childCollection.schema, name, this.childCollection.name);
|
|
51
48
|
if (field.type === 'ManyToOne') {
|
|
52
49
|
return (this.dataSource.isPublished(field.foreignCollection) &&
|
|
53
50
|
this.isPublished(field.foreignKey) &&
|
|
@@ -73,4 +70,4 @@ class PublicationCollectionDecorator extends datasource_toolkit_1.CollectionDeco
|
|
|
73
70
|
}
|
|
74
71
|
}
|
|
75
72
|
exports.default = PublicationCollectionDecorator;
|
|
76
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
73
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29sbGVjdGlvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9kZWNvcmF0b3JzL3B1YmxpY2F0aW9uL2NvbGxlY3Rpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSx3RUFPeUM7QUFJekMsMENBQTBDO0FBQzFDLE1BQXFCLDhCQUErQixTQUFRLHdDQUFtQjtJQUEvRTs7UUFFbUIsY0FBUyxHQUFnQixJQUFJLEdBQUcsRUFBRSxDQUFDO0lBcUZ0RCxDQUFDO0lBbkZDLHVDQUF1QztJQUN2QyxxQkFBcUIsQ0FBQyxJQUFZLEVBQUUsT0FBZ0I7UUFDbEQsZ0NBQVcsQ0FBQyxtQkFBbUIsQ0FBQyxJQUFJLENBQUMsZUFBZSxDQUFDLE1BQU0sRUFBRSxJQUFJLEVBQUUsSUFBSSxDQUFDLGVBQWUsQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUU5RixJQUFJLGdDQUFXLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxlQUFlLENBQUMsTUFBTSxFQUFFLElBQUksQ0FBQyxFQUFFO1lBQy9ELE1BQU0sSUFBSSxLQUFLLENBQUMseUJBQXlCLENBQUMsQ0FBQztTQUM1QztRQUVELElBQUksQ0FBQyxPQUFPO1lBQUUsSUFBSSxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLENBQUM7O1lBQ2xDLElBQUksQ0FBQyxTQUFTLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ2pDLElBQUksQ0FBQyxpQkFBaUIsRUFBRSxDQUFDO0lBQzNCLENBQUM7SUFFUSxLQUFLLENBQUMsTUFBTSxDQUFDLE1BQWMsRUFBRSxJQUFrQjtRQUN0RCxNQUFNLE9BQU8sR0FBRyxNQUFNLEtBQUssQ0FBQyxNQUFNLENBQUMsTUFBTSxFQUFFLElBQUksQ0FBQyxDQUFDO1FBRWpELE9BQU8sT0FBTyxDQUFDLEdBQUcsQ0FBQyxXQUFXLENBQUMsRUFBRTtZQUMvQixNQUFNLE1BQU0sR0FBRyxFQUFFLENBQUM7WUFFbEIsS0FBSyxNQUFN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
|
|
@@ -86,25 +86,22 @@ class RelationCollectionDecorator extends datasource_toolkit_1.CollectionDecorat
|
|
|
86
86
|
static checkKeys(owner, targetOwner, keyName, targetName) {
|
|
87
87
|
RelationCollectionDecorator.checkColumn(owner, keyName);
|
|
88
88
|
RelationCollectionDecorator.checkColumn(targetOwner, targetName);
|
|
89
|
-
const key = owner.schema.
|
|
90
|
-
const target = targetOwner.schema.
|
|
89
|
+
const key = datasource_toolkit_1.SchemaUtils.getColumn(owner.schema, keyName, owner.name);
|
|
90
|
+
const target = datasource_toolkit_1.SchemaUtils.getColumn(targetOwner.schema, targetName, targetOwner.name);
|
|
91
91
|
if (key.columnType !== target.columnType) {
|
|
92
92
|
throw new Error(`Types from '${owner.name}.${keyName}' and ` +
|
|
93
93
|
`'${targetOwner.name}.${targetName}' do not match.`);
|
|
94
94
|
}
|
|
95
95
|
}
|
|
96
96
|
static checkColumn(owner, name) {
|
|
97
|
-
const column = owner.schema.
|
|
98
|
-
if (!column || column.type !== 'Column') {
|
|
99
|
-
throw new datasource_toolkit_1.MissingFieldError(name, owner.name);
|
|
100
|
-
}
|
|
97
|
+
const column = datasource_toolkit_1.SchemaUtils.getColumn(owner.schema, name, owner.name);
|
|
101
98
|
if (!column.filterOperators?.has('In')) {
|
|
102
99
|
throw new Error(`Column does not support the In operator: '${owner.name}.${name}'`);
|
|
103
100
|
}
|
|
104
101
|
}
|
|
105
102
|
rewriteField(field) {
|
|
106
103
|
const prefix = field.split(':').shift();
|
|
107
|
-
const schema = this.schema.
|
|
104
|
+
const schema = datasource_toolkit_1.SchemaUtils.getField(this.schema, prefix, this.name);
|
|
108
105
|
if (schema.type === 'Column')
|
|
109
106
|
return [field];
|
|
110
107
|
const relation = this.dataSource.getCollection(schema.foreignCollection);
|
|
@@ -126,7 +123,7 @@ class RelationCollectionDecorator extends datasource_toolkit_1.CollectionDecorat
|
|
|
126
123
|
}
|
|
127
124
|
async rewriteLeaf(caller, leaf) {
|
|
128
125
|
const prefix = leaf.field.split(':').shift();
|
|
129
|
-
const schema = this.schema.
|
|
126
|
+
const schema = datasource_toolkit_1.SchemaUtils.getField(this.schema, prefix, this.name);
|
|
130
127
|
if (schema.type === 'Column')
|
|
131
128
|
return leaf;
|
|
132
129
|
const relation = this.dataSource.getCollection(schema.foreignCollection);
|
|
@@ -171,7 +168,7 @@ class RelationCollectionDecorator extends datasource_toolkit_1.CollectionDecorat
|
|
|
171
168
|
await Promise.all(promises);
|
|
172
169
|
}
|
|
173
170
|
async reprojectRelationInPlace(caller, records, name, projection) {
|
|
174
|
-
const schema = this.schema.
|
|
171
|
+
const schema = datasource_toolkit_1.SchemaUtils.getRelation(this.schema, name, this.name);
|
|
175
172
|
const association = this.dataSource.getCollection(schema.foreignCollection);
|
|
176
173
|
if (!this.relations[name]) {
|
|
177
174
|
await association.reprojectInPlace(caller, records.map(r => r[name]).filter(Boolean), projection);
|
|
@@ -199,4 +196,4 @@ class RelationCollectionDecorator extends datasource_toolkit_1.CollectionDecorat
|
|
|
199
196
|
}
|
|
200
197
|
}
|
|
201
198
|
exports.default = RelationCollectionDecorator;
|
|
202
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"collection.js","sourceRoot":"","sources":["../../../src/decorators/relation/collection.ts"],"names":[],"mappings":"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"}
|
|
199
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"collection.js","sourceRoot":"","sources":["../../../src/decorators/relation/collection.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,9 +16,7 @@ class RenameFieldCollectionDecorator extends datasource_toolkit_1.CollectionDeco
|
|
|
16
16
|
}
|
|
17
17
|
/** Rename a field from the collection */
|
|
18
18
|
renameField(currentName, newName) {
|
|
19
|
-
|
|
20
|
-
throw new datasource_toolkit_1.MissingFieldError(currentName);
|
|
21
|
-
}
|
|
19
|
+
datasource_toolkit_1.SchemaUtils.throwIfMissingField(this.schema, currentName, this.name);
|
|
22
20
|
let initialName = currentName;
|
|
23
21
|
datasource_toolkit_1.FieldValidator.validateName(this.name, newName);
|
|
24
22
|
// Revert previous renaming (avoids conflicts and need to recurse on this.toSubCollection).
|
|
@@ -97,7 +95,7 @@ class RenameFieldCollectionDecorator extends datasource_toolkit_1.CollectionDeco
|
|
|
97
95
|
const dotIndex = childPath.indexOf(':');
|
|
98
96
|
const childField = childPath.substring(0, dotIndex);
|
|
99
97
|
const thisField = this.fromChildCollection[childField] ?? childField;
|
|
100
|
-
const schema = this.schema.
|
|
98
|
+
const schema = datasource_toolkit_1.SchemaUtils.getRelation(this.schema, thisField, this.name);
|
|
101
99
|
const relation = this.dataSource.getCollection(schema.foreignCollection);
|
|
102
100
|
return `${thisField}:${relation.pathFromChildCollection(childPath.substring(dotIndex + 1))}`;
|
|
103
101
|
}
|
|
@@ -108,7 +106,7 @@ class RenameFieldCollectionDecorator extends datasource_toolkit_1.CollectionDeco
|
|
|
108
106
|
if (thisPath.includes(':')) {
|
|
109
107
|
const dotIndex = thisPath.indexOf(':');
|
|
110
108
|
const thisField = thisPath.substring(0, dotIndex);
|
|
111
|
-
const schema = this.schema.
|
|
109
|
+
const schema = datasource_toolkit_1.SchemaUtils.getRelation(this.schema, thisField, this.name);
|
|
112
110
|
const relation = this.dataSource.getCollection(schema.foreignCollection);
|
|
113
111
|
const childField = this.toChildCollection[thisField] ?? thisField;
|
|
114
112
|
return `${childField}:${relation.pathToChildCollection(thisPath.substring(dotIndex + 1))}`;
|
|
@@ -129,7 +127,7 @@ class RenameFieldCollectionDecorator extends datasource_toolkit_1.CollectionDeco
|
|
|
129
127
|
const thisRecord = {};
|
|
130
128
|
for (const [childField, value] of Object.entries(childRecord)) {
|
|
131
129
|
const thisField = this.fromChildCollection[childField] ?? childField;
|
|
132
|
-
const fieldSchema = schema.
|
|
130
|
+
const fieldSchema = datasource_toolkit_1.SchemaUtils.getField(schema, thisField, this.name);
|
|
133
131
|
// Perform the mapping, recurse for relations.
|
|
134
132
|
if (fieldSchema.type === 'Column') {
|
|
135
133
|
thisRecord[thisField] = value;
|
|
@@ -146,4 +144,4 @@ class RenameFieldCollectionDecorator extends datasource_toolkit_1.CollectionDeco
|
|
|
146
144
|
}
|
|
147
145
|
}
|
|
148
146
|
exports.default = RenameFieldCollectionDecorator;
|
|
149
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
147
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"collection.js","sourceRoot":"","sources":["../../../src/decorators/rename-field/collection.ts"],"names":[],"mappings":"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"}
|
|
@@ -92,7 +92,7 @@ class SortEmulate extends datasource_toolkit_1.CollectionDecorator {
|
|
|
92
92
|
// Order by is targeting a field on another collection => recurse.
|
|
93
93
|
if (clause.field.includes(':')) {
|
|
94
94
|
const [prefix] = clause.field.split(':');
|
|
95
|
-
const schema = this.schema.
|
|
95
|
+
const schema = datasource_toolkit_1.SchemaUtils.getRelation(this.schema, prefix, this.name);
|
|
96
96
|
const association = this.dataSource.getCollection(schema.foreignCollection);
|
|
97
97
|
return new datasource_toolkit_1.Sort(clause)
|
|
98
98
|
.unnest()
|
|
@@ -112,10 +112,10 @@ class SortEmulate extends datasource_toolkit_1.CollectionDecorator {
|
|
|
112
112
|
const index = path.indexOf(':');
|
|
113
113
|
if (index === -1)
|
|
114
114
|
return this.sorts.has(path);
|
|
115
|
-
const { foreignCollection } = this.schema
|
|
115
|
+
const { foreignCollection } = datasource_toolkit_1.SchemaUtils.getRelation(this.schema, path.substring(0, index), this.name);
|
|
116
116
|
const association = this.dataSource.getCollection(foreignCollection);
|
|
117
117
|
return association.isEmulated(path.substring(index + 1));
|
|
118
118
|
}
|
|
119
119
|
}
|
|
120
120
|
exports.default = SortEmulate;
|
|
121
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
121
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29sbGVjdGlvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9kZWNvcmF0b3JzL3NvcnQtZW11bGF0ZS9jb2xsZWN0aW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsd0VBZ0J5QztBQUV6QyxNQUFxQixXQUFZLFNBQVEsd0NBQW1CO0lBQTVEOztRQUVtQixVQUFLLEdBQXNCLElBQUksR0FBRyxFQUFFLENBQUM7UUFDckMsa0JBQWEsR0FBZ0IsSUFBSSxHQUFHLEVBQUUsQ0FBQztJQW9KMUQsQ0FBQztJQWxKQyxtQkFBbUIsQ0FBQyxJQUFZO1FBQzlCLElBQUksQ0FBQyw0QkFBNEIsQ0FBQyxJQUFJLEVBQUUsSUFBSSxDQUFDLENBQUM7SUFDaEQsQ0FBQztJQUVEOzs7OztPQUtHO0lBQ0gsbUJBQW1CLENBQUMsSUFBWTtRQUM5QixtQ0FBYyxDQUFDLFFBQVEsQ0FBQyxJQUFJLEVBQUUsSUFBSSxDQUFDLENBQUM7UUFFcEMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDN0IsSUFBSSxDQUFDLGlCQUFpQixFQUFFLENBQUM7SUFDM0IsQ0FBQztJQUVELG1CQUFtQixDQUFDLElBQVksRUFBRSxjQUFpQztRQUNqRSxJQUFJLENBQUMsY0FBYyxFQUFFO1lBQ25CLE1BQU0sSUFBSSxLQUFLLENBQUMsa0VBQWtFLENBQUMsQ0FBQztTQUNyRjtRQUVELElBQUksQ0FBQyw0QkFBNEIsQ0FBQyxJQUFJLEVBQUUsY0FBYyxDQUFDLENBQUM7SUFDMUQsQ0FBQztJQUVPLDRCQUE0QixDQUFDLElBQVksRUFBRSxjQUFpQztRQUNsRixtQ0FBYyxDQUFDLFFBQVEsQ0FBQyxJQUFJLEVBQUUsSUFBSSxDQUFDLENBQUM7UUFFcEMsSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsSUFBSSxFQUFFLGNBQWMsQ0FBQyxDQUFDLENBQUMsSUFBSSx5QkFBSSxDQUFDLEdBQUcsY0FBYyxDQUFD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
|
|
@@ -9,7 +9,7 @@ class ValidationDecorator extends datasource_toolkit_1.CollectionDecorator {
|
|
|
9
9
|
addValidation(name, validation) {
|
|
10
10
|
var _a;
|
|
11
11
|
datasource_toolkit_1.FieldValidator.validate(this, name);
|
|
12
|
-
const field = this.
|
|
12
|
+
const field = datasource_toolkit_1.SchemaUtils.getColumn(this.schema, name, this.name);
|
|
13
13
|
if (field?.type !== 'Column') {
|
|
14
14
|
throw new Error('Cannot add validators on a relation, use the foreign key instead');
|
|
15
15
|
}
|
|
@@ -31,7 +31,7 @@ class ValidationDecorator extends datasource_toolkit_1.CollectionDecorator {
|
|
|
31
31
|
refineSchema(subSchema) {
|
|
32
32
|
const schema = { ...subSchema, fields: { ...subSchema.fields } };
|
|
33
33
|
for (const [name, rules] of Object.entries(this.validation)) {
|
|
34
|
-
const field = { ...schema
|
|
34
|
+
const field = { ...datasource_toolkit_1.SchemaUtils.getColumn(schema, name) };
|
|
35
35
|
field.validation = [...(field.validation ?? []), ...rules];
|
|
36
36
|
schema.fields[name] = field;
|
|
37
37
|
}
|
|
@@ -58,4 +58,4 @@ class ValidationDecorator extends datasource_toolkit_1.CollectionDecorator {
|
|
|
58
58
|
}
|
|
59
59
|
}
|
|
60
60
|
exports.default = ValidationDecorator;
|
|
61
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
61
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29sbGVjdGlvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9kZWNvcmF0b3JzL3ZhbGlkYXRpb24vY29sbGVjdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLHdFQWF5QztBQUl6QyxNQUFxQixtQkFBb0IsU0FBUSx3Q0FBbUI7SUFBcEU7O1FBQ1UsZUFBVSxHQUErQyxFQUFFLENBQUM7SUFrRXRFLENBQUM7SUFoRUMsYUFBYSxDQUFDLElBQVksRUFBRSxVQUEwQjs7UUFDcEQsbUNBQWMsQ0FBQyxRQUFRLENBQUMsSUFBSSxFQUFFLElBQUksQ0FBQyxDQUFDO1FBRXBDLE1BQU0sS0FBSyxHQUFHLGdDQUFXLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxNQUFNLEVBQUUsSUFBSSxFQUFFLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUVsRSxJQUFJLEtBQUssRUFBRSxJQUFJLEtBQUssUUFBUSxFQUFFO1lBQzVCLE1BQU0sSUFBSSxLQUFLLENBQUMsa0VBQWtFLENBQUMsQ0FBQztTQUNyRjtRQUVELElBQUksS0FBSyxDQUFDLFVBQVU7WUFBRSxNQUFNLElBQUksS0FBSyxDQUFDLDJDQUEyQyxDQUFDLENBQUM7UUFFbkYsTUFBQSxJQUFJLENBQUMsVUFBVSxFQUFDLElBQUksU0FBSixJQUFJLElBQU0sRUFBRSxFQUFDO1FBQzdCLElBQUksQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxDQUFDO1FBQ3ZDLElBQUksQ0FBQyxpQkFBaUIsRUFBRSxDQUFDO0lBQzNCLENBQUM7SUFFUSxLQUFLLENBQUMsTUFBTSxDQUFDLE1BQWMsRUFBRSxJQUFrQjtRQUN0RCxLQUFLLE1BQU0sTUFBTSxJQUFJLElBQUk7WUFBRSxJQUFJLENBQUMsUUFBUSxDQUFDLE1BQU0sRUFBRSxNQUFNLENBQUMsUUFBUSxFQUFFLElBQUksQ0FBQyxDQUFDO1FBRXhFLE9BQU8sS0FBSyxDQUFD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
|
|
@@ -8,14 +8,14 @@ class CreateRelationsCollectionDecorator extends datasource_toolkit_1.Collection
|
|
|
8
8
|
const recordsByRelation = this.extractRelations(records);
|
|
9
9
|
// Step 2: Create the many-to-one relations, and put the foreign keys in the records
|
|
10
10
|
await Promise.all(Object.entries(recordsByRelation)
|
|
11
|
-
.filter(([key]) => this.schema
|
|
11
|
+
.filter(([key]) => datasource_toolkit_1.SchemaUtils.getField(this.schema, key, this.name).type === 'ManyToOne')
|
|
12
12
|
.map(([key, entries]) => this.createManyToOneRelation(caller, records, key, entries)));
|
|
13
13
|
// Step 3: Create the records
|
|
14
14
|
const recordsWithPk = await this.childCollection.create(caller, records);
|
|
15
15
|
// Step 4: Create the one-to-one relations
|
|
16
16
|
// Note: the createOneToOneRelation method modifies the recordsWithPk array in place!
|
|
17
17
|
await Promise.all(Object.entries(recordsByRelation)
|
|
18
|
-
.filter(([key]) => this.schema
|
|
18
|
+
.filter(([key]) => datasource_toolkit_1.SchemaUtils.getField(this.schema, key, this.name).type === 'OneToOne')
|
|
19
19
|
.map(([key, entries]) => this.createOneToOneRelation(caller, recordsWithPk, key, entries)));
|
|
20
20
|
return recordsWithPk;
|
|
21
21
|
}
|
|
@@ -23,7 +23,8 @@ class CreateRelationsCollectionDecorator extends datasource_toolkit_1.Collection
|
|
|
23
23
|
const recordsByRelation = {};
|
|
24
24
|
for (const [index, record] of records.entries()) {
|
|
25
25
|
for (const [key, subRecord] of Object.entries(record)) {
|
|
26
|
-
|
|
26
|
+
const field = datasource_toolkit_1.SchemaUtils.getField(this.schema, key, this.name);
|
|
27
|
+
if (field.type !== 'Column') {
|
|
27
28
|
recordsByRelation[key] ?? (recordsByRelation[key] = []);
|
|
28
29
|
recordsByRelation[key].push({ subRecord, index });
|
|
29
30
|
delete record[key];
|
|
@@ -33,7 +34,7 @@ class CreateRelationsCollectionDecorator extends datasource_toolkit_1.Collection
|
|
|
33
34
|
return recordsByRelation;
|
|
34
35
|
}
|
|
35
36
|
async createManyToOneRelation(caller, records, key, entries) {
|
|
36
|
-
const schema = this.schema.
|
|
37
|
+
const schema = datasource_toolkit_1.SchemaUtils.getRelation(this.schema, key, this.name);
|
|
37
38
|
const relation = this.dataSource.getCollection(schema.foreignCollection);
|
|
38
39
|
const creations = entries.filter(({ index }) => !records[index][schema.foreignKey]);
|
|
39
40
|
const updates = entries.filter(({ index }) => records[index][schema.foreignKey]);
|
|
@@ -56,7 +57,7 @@ class CreateRelationsCollectionDecorator extends datasource_toolkit_1.Collection
|
|
|
56
57
|
}));
|
|
57
58
|
}
|
|
58
59
|
async createOneToOneRelation(caller, records, key, entries) {
|
|
59
|
-
const schema = this.schema.
|
|
60
|
+
const schema = datasource_toolkit_1.SchemaUtils.getRelation(this.schema, key, this.name);
|
|
60
61
|
const relation = this.dataSource.getCollection(schema.foreignCollection);
|
|
61
62
|
// Set origin key in the related record
|
|
62
63
|
const subRecords = entries.map(({ index, subRecord }) => ({
|
|
@@ -67,4 +68,4 @@ class CreateRelationsCollectionDecorator extends datasource_toolkit_1.Collection
|
|
|
67
68
|
}
|
|
68
69
|
}
|
|
69
70
|
exports.default = CreateRelationsCollectionDecorator;
|
|
70
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
71
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29sbGVjdGlvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9kZWNvcmF0b3JzL3dyaXRlL2NyZWF0ZS1yZWxhdGlvbnMvY29sbGVjdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLHdFQVN5QztBQUl6QyxNQUFxQixrQ0FBbUMsU0FBUSx3Q0FBbUI7SUFDeEUsS0FBSyxDQUFDLE1BQU0sQ0FBQyxNQUFjLEVBQUUsT0FBcUI7UUFDekQscUVBQXFFO1FBQ3JFLHlFQUF5RTtRQUN6RSxNQUFNLGlCQUFpQixHQUFHLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxPQUFPLENBQUMsQ0FBQztRQUV6RCxvRkFBb0Y7UUFDcEYsTUFBTSxPQUFPLENBQUMsR0FBRyxDQUNmLE1BQU0sQ0FBQyxPQUFPLENBQUMsaUJBQWlCLENBQUM7YUFDOUIsTUFBTSxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsRUFBRSxFQUFFLENBQUMsZ0NBQVcsQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxHQUFHLEVBQUUsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDLElBQUksS0FBSyxXQUFXLENBQUM7YUFDekYsR0FBRyxDQUFDLENBQUMsQ0FBQyxHQUFHLEVBQUUsT0FBTyxDQUFDLEVBQUUsRUFBRSxDQUFDLElBQUksQ0FBQyx1QkFBdUIsQ0FBQyxNQUFNLEVBQUUsT0FBTyxFQUFFLEdBQUcsRUFBRSxPQUFPLENBQUMsQ0FBQyxDQUN4RixDQUFDO1FBRUYsNkJBQTZCO1FBQzdCLE1BQU0sYUFBYSxHQUFHLE1BQU0sSUFBSSxDQUFDLGVBQWUsQ0FBQyxNQUFNLENBQUMsTUFBTSxFQUFFLE9BQU8sQ0FBQyxDQUFDO1FBRXpFLDBDQUEwQztRQUMxQyxxRkFBcUY7UUFDckYsTUFBTSxPQUFPLENBQUMsR0FBRyxDQUNmLE1BQU0sQ0FBQyxPQUFPLENBQUMsaUJBQWlCLENBQUM7YUFDOUIsTUFBTSxDQUFDLENBQUMsQ0FBQyxHQUFH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
|
|
@@ -4,20 +4,23 @@ const datasource_toolkit_1 = require("@forestadmin/datasource-toolkit");
|
|
|
4
4
|
class UpdateRelationCollectionDecorator extends datasource_toolkit_1.CollectionDecorator {
|
|
5
5
|
async update(caller, filter, patch) {
|
|
6
6
|
// Step 1: Perform the normal update
|
|
7
|
-
|
|
7
|
+
const patches = Object.keys(patch);
|
|
8
|
+
if (patches.some(key => datasource_toolkit_1.SchemaUtils.getField(this.schema, key, this.name).type === 'Column')) {
|
|
8
9
|
const patchWithoutRelations = Object.keys(patch).reduce((memo, key) => {
|
|
9
|
-
return this.schema
|
|
10
|
+
return datasource_toolkit_1.SchemaUtils.getField(this.schema, key, this.name).type === 'Column'
|
|
11
|
+
? { ...memo, [key]: patch[key] }
|
|
12
|
+
: memo;
|
|
10
13
|
}, {});
|
|
11
14
|
await this.childCollection.update(caller, filter, patchWithoutRelations);
|
|
12
15
|
}
|
|
13
16
|
// Step 2: Perform additional updates for relations
|
|
14
|
-
if (
|
|
17
|
+
if (patches.some(key => datasource_toolkit_1.SchemaUtils.getField(this.schema, key, this.name).type !== 'Column')) {
|
|
15
18
|
// Fetch the records that will be updated, to know which relations need to be created/updated
|
|
16
19
|
const projection = this.buildProjection(patch);
|
|
17
20
|
const records = await this.list(caller, filter, projection);
|
|
18
21
|
// Perform the updates for each relation
|
|
19
22
|
await Promise.all(Object.keys(patch)
|
|
20
|
-
.filter(key => this.schema
|
|
23
|
+
.filter(key => datasource_toolkit_1.SchemaUtils.getField(this.schema, key, this.name).type !== 'Column')
|
|
21
24
|
.map(key => this.createOrUpdateRelation(caller, records, key, patch[key])));
|
|
22
25
|
}
|
|
23
26
|
}
|
|
@@ -30,7 +33,7 @@ class UpdateRelationCollectionDecorator extends datasource_toolkit_1.CollectionD
|
|
|
30
33
|
buildProjection(patch) {
|
|
31
34
|
let projection = new datasource_toolkit_1.Projection().withPks(this);
|
|
32
35
|
for (const key of Object.keys(patch)) {
|
|
33
|
-
const schema = this.schema.
|
|
36
|
+
const schema = datasource_toolkit_1.SchemaUtils.getField(this.schema, key, this.name);
|
|
34
37
|
if (schema.type !== 'Column') {
|
|
35
38
|
const relation = this.dataSource.getCollection(schema.foreignCollection);
|
|
36
39
|
projection = projection.union(new datasource_toolkit_1.Projection().withPks(relation).nest(key));
|
|
@@ -48,7 +51,7 @@ class UpdateRelationCollectionDecorator extends datasource_toolkit_1.CollectionD
|
|
|
48
51
|
* Create or update the relation provided in the key parameter according to the patch.
|
|
49
52
|
*/
|
|
50
53
|
async createOrUpdateRelation(caller, records, key, patch) {
|
|
51
|
-
const schema = this.schema.
|
|
54
|
+
const schema = datasource_toolkit_1.SchemaUtils.getRelation(this.schema, key, this.name);
|
|
52
55
|
const relation = this.dataSource.getCollection(schema.foreignCollection);
|
|
53
56
|
const creates = records.filter(r => r[key] === null);
|
|
54
57
|
const updates = records.filter(r => r[key] !== null);
|
|
@@ -75,4 +78,4 @@ class UpdateRelationCollectionDecorator extends datasource_toolkit_1.CollectionD
|
|
|
75
78
|
}
|
|
76
79
|
}
|
|
77
80
|
exports.default = UpdateRelationCollectionDecorator;
|
|
78
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
81
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29sbGVjdGlvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9kZWNvcmF0b3JzL3dyaXRlL3VwZGF0ZS1yZWxhdGlvbnMvY29sbGVjdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLHdFQVV5QztBQUV6QyxNQUFxQixpQ0FBa0MsU0FBUSx3Q0FBbUI7SUFDdkUsS0FBSyxDQUFDLE1BQU0sQ0FBQyxNQUFjLEVBQUUsTUFBYyxFQUFFLEtBQWlCO1FBQ3JFLG9DQUFvQztRQUNwQyxNQUFNLE9BQU8sR0FBRyxNQUFNLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBRW5DLElBQUksT0FBTyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLGdDQUFXLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxNQUFNLEVBQUUsR0FBRyxFQUFFLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQyxJQUFJLEtBQUssUUFBUSxDQUFDLEVBQUU7WUFDNUYsTUFBTSxxQkFBcUIsR0FBRyxNQUFNLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDLE1BQU0sQ0FBQyxDQUFDLElBQUksRUFBRSxHQUFHLEVBQUUsRUFBRTtnQkFDcEUsT0FBTyxnQ0FBVyxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsTUFBTSxFQUFFLEdBQUcsRUFBRSxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUMsSUFBSSxLQUFLLFFBQVE7b0JBQ3hFLENBQUMsQ0FBQyxFQUFFLEdBQUcsSUFBSSxFQUFFLENBQUMsR0FBRyxDQUFDLEVBQUUsS0FBSyxDQUFDLEdBQUcsQ0FBQyxFQUFFO29CQUNoQyxDQUFDLENBQUMsSUFBSSxDQUFDO1lBQ1gsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDO1lBRVAsTUFBTSxJQUFJLENBQUMsZUFBZSxDQUFDLE1BQU0sQ0FBQyxNQUFNLEVBQUUsTUFBTSxFQUFFLHFCQUFxQixDQUFDLENBQUM7U0FDMUU7UUFFRCxt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
|
|
@@ -22,7 +22,7 @@ class WriteReplacerCollectionDecorator extends datasource_toolkit_1.CollectionDe
|
|
|
22
22
|
const schema = { ...childSchema, fields: { ...childSchema.fields } };
|
|
23
23
|
for (const [fieldName, handler] of Object.entries(this.handlers)) {
|
|
24
24
|
schema.fields[fieldName] = {
|
|
25
|
-
...schema
|
|
25
|
+
...datasource_toolkit_1.SchemaUtils.getColumn(schema, fieldName, this.name),
|
|
26
26
|
isReadOnly: handler === null,
|
|
27
27
|
};
|
|
28
28
|
}
|
|
@@ -56,7 +56,7 @@ class WriteReplacerCollectionDecorator extends datasource_toolkit_1.CollectionDe
|
|
|
56
56
|
if (used.includes(key))
|
|
57
57
|
throw new Error(`Cycle detected: ${used.join(' -> ')}.`);
|
|
58
58
|
const { record, action, caller } = context;
|
|
59
|
-
const schema = this.schema.
|
|
59
|
+
const schema = datasource_toolkit_1.SchemaUtils.getField(this.schema, key, this.name);
|
|
60
60
|
// Handle Column fields.
|
|
61
61
|
if (schema?.type === 'Column') {
|
|
62
62
|
// We either call the customer handler or a default one that does nothing.
|
|
@@ -77,7 +77,6 @@ class WriteReplacerCollectionDecorator extends datasource_toolkit_1.CollectionDe
|
|
|
77
77
|
const relation = this.dataSource.getCollection(schema.foreignCollection);
|
|
78
78
|
return { [key]: await relation.rewritePatch(caller, action, record[key]) };
|
|
79
79
|
}
|
|
80
|
-
throw new Error(`Unknown field: "${key}"`);
|
|
81
80
|
}
|
|
82
81
|
/**
|
|
83
82
|
* Recursively merge patches into a single one ensuring that there is no conflict.
|
|
@@ -103,4 +102,4 @@ class WriteReplacerCollectionDecorator extends datasource_toolkit_1.CollectionDe
|
|
|
103
102
|
}
|
|
104
103
|
}
|
|
105
104
|
exports.default = WriteReplacerCollectionDecorator;
|
|
106
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
105
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29sbGVjdGlvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9kZWNvcmF0b3JzL3dyaXRlL3dyaXRlLXJlcGxhY2UvY29sbGVjdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLHdFQVV5QztBQUV6Qyx3REFBa0Q7QUFHbEQsTUFBcUIsZ0NBQWlDLFNBQVEsd0NBQW1CO0lBQWpGOztRQUNVLGFBQVEsR0FBb0MsRUFBRSxDQUFDO0lBNEh6RCxDQUFDO0lBekhDLG1CQUFtQixDQUFDLFNBQWlCLEVBQUUsVUFBMkI7UUFDaEUsSUFBSSxDQUFDLFVBQVUsRUFBRTtZQUNmLE1BQU0sSUFBSSxLQUFLLENBQUMsa0VBQWtFLENBQUMsQ0FBQztTQUNyRjtRQUVELG1DQUFjLENBQUMsUUFBUSxDQUFDLElBQUksRUFBRSxTQUFTLENBQUMsQ0FBQztRQUN6QyxJQUFJLENBQUMsUUFBUSxDQUFDLFNBQVMsQ0FBQyxHQUFHLFVBQVUsQ0FBQztRQUN0QyxJQUFJLENBQUMsaUJBQWlCLEVBQUUsQ0FBQztJQUMzQixDQUFDO0lBRWtCLFlBQVksQ0FBQyxXQUE2QjtRQUMzRCxNQUFNLE1BQU0sR0FBRyxFQUFFLEdBQUcsV0FBVyxFQUFFLE1BQU0sRUFBRSxFQUFFLEdBQUcsV0FBVyxDQUFDLE1BQU0sRUFBRSxFQUFFLENBQUM7UUFFckUsS0FBSyxNQUFNLENBQUMsU0FBUyxFQUFFLE9BQU8sQ0FBQyxJQUFJLE1BQU0sQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxFQUFFO1lBQ2hFLE1BQU0sQ0FBQyxNQUFNLENBQUMsU0FBUyxDQUFDLEdBQUc7Z0JBQ3pCLEdBQUcsZ0NBQVcsQ0FBQyxTQUFTLENBQUMsTUFBTSxFQUFFLFNBQVMsRUFBRSxJQUFJLENBQUMsSUFBSSxDQUFDO2dCQUN0RCxVQUFVLEVBQUUsT0FBTyxLQUFLLElBQUk7YUFDN0IsQ0FBQztTQUNIO1FBRUQsT0FBTyxNQUFNLENBQUM7SUFDaEIsQ0FBQztJQUVRLEtBQUssQ0FBQyxNQUFNLENBQUMsTUFBYyxFQUFFLE9BQXFCO1FBQ3pELE1BQU0sUUFBUSxHQUFHLE9BQU8sQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxJQUFJLENBQUMsWUFBWSxDQUFDLE1BQU0sRUFBRSxRQUFRLEVBQUUsTUFBTSxDQUFDLENBQUMsQ0FBQztRQUNwRixNQUFNLFVBQVUsR0FBRyxNQUFNLE9BQU8sQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDLENBQUM7UUFFL0MsT0FBTyxJQUFJLENBQUMsZUFBZSxDQUFDLE1BQU0sQ0FBQyxNQUFNLEVBQUUsVUFBVSxDQUFDLENBQUM7SUFDekQsQ0FBQztJQUVRLEtBQUssQ0FBQyxNQUFNLENBQUMsTUFBYyxFQUFFLE1BQWMsRUFBRSxLQUFpQjtRQUNyRSxNQUFNLFFBQVEsR0FBRyxNQUFNLElBQUksQ0FBQyxZQUFZLENBQUMsTUFBTSxFQUFFLFFBQVEsRUFBRSxLQUFLLEVBQUUsRUFBRSxFQUFFLE1BQU0sQ0FBQyxDQUFDO1FBRTlFLE9BQU8sSUFBSSxDQUFDLGVBQWUsQ0FBQyxNQUFNLENBQUMsTUFBTSxFQUFFLE1BQU0sRUFBRSxRQUFRLENBQUMsQ0FBQztJQUMvRCxDQUFDO0lBRUQ7O09BRUc7SUFDSyxLQUFLLENBQUMsWUFBWSxDQUN4QixNQUFjLEVBQ2QsTUFBMkIsRUFDM0IsS0FBaUIsRUFDakIsZUFBeUIsRUFBRSxFQUMzQixNQUFlO1FBRWYsK0RBQStEO1FBQy9ELE1BQU0sT0FBTyxHQUFHLElBQUksaUJBQXlCLENBQUMsSUFBSSxFQUFFLE1BQU0sRUFBRSxNQUFNLEVBQUUsS0FBSyxFQUFFLE1BQU0sQ0FBQyxDQUFDO1FBQ25GLE1BQU0sT0FBTyxHQUFHLE1BQU0sT0FBTyxDQUFDLEdBQUcsQ0FDL0IsTUFBTSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLE9BQU8sRUFBRSxHQUFHLEVBQUUsWUFBWSxDQUFDLENBQUMsQ0FDM0UsQ0FBQztRQUVGLG1FQUFtRTtRQUNuRSxNQUFNLFFBQVEsR0FBRyxJQUFJLENBQUMsU0FBUyxDQUFDLEdBQUcsT0FBTyxDQUFDLENBQUM7UUFFNUMsbUVBQW1FO1FBQ25FLElBQUksTUFBTSxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsQ0FBQyxNQUFNLEdBQUcsQ0FBQztZQUFFLG9DQUFlLENBQUMsUUFBUSxDQUFDLElBQUksRUFBRSxRQUFRLENBQUMsQ0FBQztRQUUvRSxPQUFPLFFBQVEsQ0FBQztJQUNsQixDQUFDO0lBRU8sS0FBSyxDQUFDLFVBQVUsQ0FDdEIsT0FBa0MsRUFDbEMsR0FBVyxFQUNYLElBQWM7UUFFZCxvQ0FBb0M7UUFDcEMsSUFBSSxJQUFJLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBQztZQUFFLE1BQU0sSUFBSSxLQUFLLENBQUMsbUJBQW1CLElBQUksQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBRWpGLE1BQU0sRUFBRSxNQUFNLEVBQUUsTUFBTSxFQUFFLE1BQU0sRUFBRSxHQUFHLE9BQU8sQ0FBQztRQUMzQyxNQUFNLE1BQU0sR0FBRyxnQ0FBVyxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsTUFBTSxFQUFFLEdBQUcsRUFBRSxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7UUFFakUsd0JBQXdCO1FBQ3hCLElBQUksTUFBTSxFQUFFLElBQUksS0FBSyxRQUFRLEVBQUU7WUFDN0IsMEVBQTBFO1lBQzFFLE1BQU0sT0FBTyxHQUFHLElBQUksQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsRUFBRSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQztZQUM1RCxNQUFNLFVBQVUsR0FBRyxDQUFDLENBQUMsTUFBTSxPQUFPLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxFQUFFLE9BQU8sQ0FBQyxDQUFDLElBQUksRUFBRSxDQUFlLENBQUM7WUFFL0UsSUFBSSxVQUFVLElBQUksQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLFVBQVUsQ0FBQyxFQUFFO2dCQUM1QyxNQUFNLElBQUksS0FBSyxDQUFDLHdCQUF3QixHQUFHLHNDQUFzQyxDQUFDLENBQUM7YUFDcEY7WUFFRCx1RkFBdUY7WUFDdkYsOEJBQThCO1lBQzlCLE1BQU0sRUFBRSxDQUFDLEdBQUcsQ0FBQyxFQUFFLEtBQUssRUFBRSxHQUFHLGNBQWMsRUFBRSxHQUFHLFVBQVUsQ0FBQztZQUN2RCxNQUFNLFFBQVEsR0FBRyxNQUFNLElBQUksQ0FBQyxZQUFZLENBQUMsTUFBTSxFQUFFLE1BQU0sRUFBRSxjQUFjLEVBQUUsQ0FBQyxHQUFHLElBQUksRUFBRSxHQUFHLENBQUMsQ0FBQyxDQUFDO1lBRXpGLE9BQU8sS0FBSyxLQUFLLFNBQVMsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxFQUFFLENBQUMsR0FBRyxDQUFDLEVBQUUsS0FBSyxFQUFFLEVBQUUsUUFBUSxDQUFDLENBQUMsQ0FBQyxDQUFDLFFBQVEsQ0FBQztTQUNwRjtRQUVELDBCQUEwQjtRQUMxQixJQUFJLE1BQU0sRUFBRSxJQUFJLEtBQUssV0FBVyxJQUFJLE1BQU0sRUFBRSxJQUFJLEtBQUssVUFBVSxFQUFFO1lBQy9ELG9EQUFvRDtZQUNwRCxNQUFNLFFBQVEsR0FBRyxJQUFJLENBQUMsVUFBVSxDQUFDLGFBQWEsQ0FBQyxNQUFNLENBQUMsaUJBQWlCLENBQUMsQ0FBQztZQUV6RSxPQUFPLEVBQUUsQ0FBQyxHQUFHLENBQUMsRUFBRSxNQUFNLFFBQVEsQ0FBQyxZQUFZLENBQUMsTUFBTSxFQUFFLE1BQU0sRUFBRSxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUMsRUFBRSxDQUFDO1NBQzVFO0lBQ0gsQ0FBQztJQUVEOztPQUVHO0lBQ0ssU0FBUyxDQUFDLEdBQUcsT0FBcUI7UUFDeEMsTUFBTSxHQUFHLEdBQUcsRUFBRSxDQUFDO1FBRWYsS0FBSyxNQUFNLEtBQUssSUFBSSxPQUFPLEVBQUU7WUFDM0IsS0FBSyxNQUFNLENBQUMsR0FBRyxFQUFFLEtBQUssQ0FBQyxJQUFJLE1BQU0sQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLEVBQUU7Z0JBQ2hELHVGQUF1RjtnQkFDdkYsa0RBQWtEO2dCQUNsRCxJQUFJLEdBQUcsQ0FBQyxHQUFHLENBQUMsS0FBSyxTQUFTO29CQUFFLEdBQUcsQ0FBQyxHQUFHLENBQUMsR0FBRyxLQUFLLENBQUM7cUJBQ3hDLElBQUksSUFBSSxDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQUM7b0JBQUUsR0FBRyxDQUFDLEdBQUcsQ0FBQyxHQUFHLElBQUksQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxFQUFFLEtBQUssQ0FBQyxDQUFDOztvQkFDckUsTUFBTSxJQUFJLEtBQUssQ0FBQyxnQ0FBZ0MsR0FBRyxnQ0FBZ0MsQ0FBQyxDQUFDO2FBQzNGO1NBQ0Y7UUFFRCxPQUFPLEdBQUcsQ0FBQztJQUNiLENBQUM7SUFFTyxRQUFRLENBQUMsS0FBYztRQUM3QixPQUFPLEtBQUssSUFBSSxPQUFPLEtBQUssS0FBSyxRQUFRLElBQUksTUFBTSxDQUFDLGNBQWMsQ0FBQyxLQUFLLENBQUMsS0FBSyxNQUFNLENBQUMsU0FBUyxDQUFDO0lBQ2pHLENBQUM7Q0FDRjtBQTdIRCxtREE2SEMifQ==
|
|
@@ -5,10 +5,7 @@ async function importField(dataSourceCustomizer, collectionCustomizer, options)
|
|
|
5
5
|
const name = options.name;
|
|
6
6
|
const { schema } = options.path.split(':').reduce((memo, field) => {
|
|
7
7
|
const collection = dataSourceCustomizer.getCollection(memo.collection);
|
|
8
|
-
const fieldSchema = collection.schema.
|
|
9
|
-
if (fieldSchema === undefined) {
|
|
10
|
-
throw new datasource_toolkit_1.MissingFieldError(field, memo.collection);
|
|
11
|
-
}
|
|
8
|
+
const fieldSchema = datasource_toolkit_1.SchemaUtils.getField(collection.schema, field, memo.collection);
|
|
12
9
|
if (fieldSchema.type === 'Column')
|
|
13
10
|
return { schema: fieldSchema };
|
|
14
11
|
if (fieldSchema.type === 'ManyToOne' || fieldSchema.type === 'OneToOne') {
|
|
@@ -46,4 +43,4 @@ async function importField(dataSourceCustomizer, collectionCustomizer, options)
|
|
|
46
43
|
}
|
|
47
44
|
}
|
|
48
45
|
exports.default = importField;
|
|
49
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
46
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW1wb3J0LWZpZWxkLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3BsdWdpbnMvaW1wb3J0LWZpZWxkLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsd0VBQXlGO0FBTzFFLEtBQUssVUFBVSxXQUFXLENBSXZDLG9CQUE2QyxFQUM3QyxvQkFBZ0QsRUFDaEQsT0FBcUU7SUFFckUsTUFBTSxJQUFJLEdBQUcsT0FBTyxDQUFDLElBQXlCLENBQUM7SUFDL0MsTUFBTSxFQUFFLE1BQU0sRUFBRSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDLE1BQU0sQ0FDL0MsQ0FBQyxJQUFJLEVBQUUsS0FBSyxFQUFFLEVBQUU7UUFDZCxNQUFNLFVBQVUsR0FBRyxvQkFBb0IsQ0FBQyxhQUFhLENBQUMsSUFBSSxDQUFDLFVBQWdDLENBQUMsQ0FBQztRQUM3RixNQUFNLFdBQVcsR0FBRyxnQ0FBVyxDQUFDLFFBQVEsQ0FBQyxVQUFVLENBQUMsTUFBTSxFQUFFLEtBQUssRUFBRSxJQUFJLENBQUMsVUFBVSxDQUFDLENBQUM7UUFFcEYsSUFBSSxXQUFXLENBQUMsSUFBSSxLQUFLLFFBQVE7WUFBRSxPQUFPLEVBQUUsTUFBTSxFQUFFLFdBQVcsRUFBRSxDQUFDO1FBRWxFLElBQUksV0FBVyxDQUFDLElBQUksS0FBSyxXQUFXLElBQUksV0FBVyxDQUFDLElBQUksS0FBSyxVQUFVLEVBQUU7WUFDdkUsT0FBTyxFQUFFLFVBQVUsRUFBRSxXQUFXLENBQUMsaUJBQWlCLEVBQUUsQ0FBQztTQUN0RDtRQUVELE1BQU0sSUFBSSxLQUFLLENBQUMsc0JBQXNCLENBQUMsQ0FBQztJQUMxQyxDQUFDLEVBQ0QsRUFBRSxVQUFVLEVBQUUsb0JBQW9CLENBQUMsSUFBSSxFQUFFLENBQzFDLENBQUM7SUFFRixvQkFBb0IsQ0FBQyxRQUFRLENBQUMsSUFBSSxFQUFFO1FBQ2xDLFVBQVUsRUFBRSxNQUFNLENBQUMsVUFBVTtRQUM3QixZQUFZLEVBQUUsTUFBTSxDQUFDLFlBQVk7UUFDakMsWUFBWSxFQUFFLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQztRQUM1QixTQUFTLEVBQUUsT0FBTyxDQUFDLEVBQUUsQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsZ0NBQVcsQ0FBQyxhQUFhLENBQUMsQ0FBQyxFQUFFLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUNsRixVQUFVLEVBQUUsTUFBTSxDQUFDLFVBQVU7S0FDOUIsQ0FBQyxDQUFDO0lBRUgsSUFBSSxDQUFDLE1BQU0sQ0FBQyxVQUFVLElBQUksQ0FBQyxPQUFPLENBQUMsUUFBUSxFQUFFO1FBQzNDLG9CQUFvQixDQUFDLG1CQUFtQixDQUFDLElBQUksRUFBRSxLQUFLLENBQUMsRUFBRTtZQUNyRCxNQUFNLElBQUksR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQztZQUNyQyxNQUFNLFdBQVcsR0FBRyxFQUFFLENBQUM7WUFFdkIsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDLFVBQVUsRUFBRSxXQUFXLEVBQUUsS0FBSyxFQUFFLEVBQUU7Z0JBQzdDLFVBQVUsQ0FBQyxXQUFXLENBQUMsR0FBRyxLQUFLLEtBQUssSUFBSSxDQUFDLE1BQU0sR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDO2dCQUVqRSxPQUFPLFVBQVUsQ0FBQyxXQUFXLENBQUMsQ0FBQztZQUNqQyxDQUFDLEVBQUUsV0FBVyxDQUFDLENBQUM7WUFFaEIsT0FBTyxXQUFXLENBQUM7UUFDckIsQ0FBQyxDQUFDLENBQUM7S0FDSjtJQUVELElBQUksTUFBTSxDQUFDLFVBQVUsSUFBSSxPQUFPLENBQUMsUUFBUSxLQUFLLEtBQUssRUFBRTtRQUNuRCxNQUFNLElBQUksS0FBSyxDQUNiLDBEQUEwRCxPQUFPLENBQUMsSUFBSSxtQkFBbUIsQ0FDMUYsQ0FBQztLQUNIO0lBRUQsS0FBSyxNQUFNLFFBQVEsSUFBSSxNQUFNLENBQUMsZUFBZSxFQUFFO1FBQzdDLE1BQU0sT0FBTyxHQUFHLEtBQUssQ0FBQyxFQUFFLENBQUMsQ0FBQyxFQUFFLEtBQUssRUFBRSxPQUFPLENBQUMsSUFBSSxFQUFFLFFBQVEsRUFBRSxLQUFLLEVBQUUsQ0FBQyxDQUFDO1FBQ3BFLG9CQUFvQixDQUFDLG9CQUFvQixDQUFDLElBQUksRUFBRSxRQUFRLEVBQUUsT0FBbUMsQ0FBQyxDQUFDO0tBQ2hHO0lBRUQsSUFBSSxNQUFNLENBQUMsVUFBVSxFQUFFO1FBQ3JCLG9CQUFvQixDQUFDLG1CQUFtQixDQUFDLElBQUksRUFBRSxDQUFDLEVBQUUsS0FBSyxFQUFFLE9BQU8sQ0FBQyxJQUFJLEVBQUUsU0FBUyxFQUFFLElBQUksRUFBRSxDQUFDLENBQUMsQ0FBQztLQUM1RjtBQUNILENBQUM7QUE5REQsOEJBOERDIn0=
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@forestadmin/datasource-customizer",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.53.0",
|
|
4
4
|
"main": "dist/index.js",
|
|
5
5
|
"license": "GPL-3.0",
|
|
6
6
|
"publishConfig": {
|
|
@@ -29,7 +29,7 @@
|
|
|
29
29
|
"@types/uuid": "^9.0.0"
|
|
30
30
|
},
|
|
31
31
|
"dependencies": {
|
|
32
|
-
"@forestadmin/datasource-toolkit": "1.
|
|
32
|
+
"@forestadmin/datasource-toolkit": "1.41.0",
|
|
33
33
|
"antlr4": "^4.13.1-patch-1",
|
|
34
34
|
"file-type": "^16.5.4",
|
|
35
35
|
"luxon": "^3.2.1",
|