@forestadmin/agent 1.0.0-beta.35 → 1.0.0-beta.38
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/CHANGELOG.md +27 -0
- package/dist/agent/routes/system/error-handling.js +18 -4
- package/dist/agent/types.d.ts +2 -1
- package/dist/agent/types.js +2 -1
- package/dist/builder/collection.d.ts +22 -11
- package/dist/builder/collection.js +24 -13
- package/dist/builder/decorators-stack.d.ts +2 -2
- package/dist/builder/decorators-stack.js +2 -2
- package/dist/builder/utils/typing-generator.js +4 -4
- package/package.json +2 -2
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,30 @@
|
|
|
1
|
+
# @forestadmin/agent [1.0.0-beta.38](https://github.com/ForestAdmin/agent-nodejs/compare/@forestadmin/agent@1.0.0-beta.37...@forestadmin/agent@1.0.0-beta.38) (2022-06-14)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
|
|
5
|
+
|
|
6
|
+
|
|
7
|
+
### Dependencies
|
|
8
|
+
|
|
9
|
+
* **@forestadmin/datasource-toolkit:** upgraded to 1.0.0-beta.23
|
|
10
|
+
|
|
11
|
+
# @forestadmin/agent [1.0.0-beta.37](https://github.com/ForestAdmin/agent-nodejs/compare/@forestadmin/agent@1.0.0-beta.36...@forestadmin/agent@1.0.0-beta.37) (2022-06-09)
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
### Bug Fixes
|
|
15
|
+
|
|
16
|
+
* **typing-generator:** add simple quote arround the collection and fiel name to be compatible with ts ([#336](https://github.com/ForestAdmin/agent-nodejs/issues/336)) ([138b593](https://github.com/ForestAdmin/agent-nodejs/commit/138b593bff7d6dadbb5779d503e30c722f7978cf))
|
|
17
|
+
|
|
18
|
+
# @forestadmin/agent [1.0.0-beta.36](https://github.com/ForestAdmin/agent-nodejs/compare/@forestadmin/agent@1.0.0-beta.35...@forestadmin/agent@1.0.0-beta.36) (2022-06-09)
|
|
19
|
+
|
|
20
|
+
|
|
21
|
+
|
|
22
|
+
|
|
23
|
+
|
|
24
|
+
### Dependencies
|
|
25
|
+
|
|
26
|
+
* **@forestadmin/datasource-toolkit:** upgraded to 1.0.0-beta.22
|
|
27
|
+
|
|
1
28
|
# @forestadmin/agent [1.0.0-beta.35](https://github.com/ForestAdmin/agent-nodejs/compare/@forestadmin/agent@1.0.0-beta.34...@forestadmin/agent@1.0.0-beta.35) (2022-06-01)
|
|
2
29
|
|
|
3
30
|
|
|
@@ -20,11 +20,25 @@ class ErrorHandling extends base_route_1.default {
|
|
|
20
20
|
await next();
|
|
21
21
|
}
|
|
22
22
|
catch (e) {
|
|
23
|
-
let status = types_1.HttpCode.InternalServerError;
|
|
23
|
+
let status = e.status || types_1.HttpCode.InternalServerError;
|
|
24
24
|
let message = 'Unexpected error';
|
|
25
|
-
if (e instanceof koa_1.HttpError ||
|
|
26
|
-
|
|
25
|
+
if (e instanceof koa_1.HttpError ||
|
|
26
|
+
e instanceof datasource_toolkit_1.ValidationError ||
|
|
27
|
+
e instanceof datasource_toolkit_1.UnprocessableError ||
|
|
28
|
+
e instanceof datasource_toolkit_1.ForbiddenError) {
|
|
27
29
|
message = e.message;
|
|
30
|
+
switch (true) {
|
|
31
|
+
case e instanceof datasource_toolkit_1.ValidationError:
|
|
32
|
+
status = types_1.HttpCode.BadRequest;
|
|
33
|
+
break;
|
|
34
|
+
case e instanceof datasource_toolkit_1.ForbiddenError:
|
|
35
|
+
status = types_1.HttpCode.Forbidden;
|
|
36
|
+
break;
|
|
37
|
+
case e instanceof datasource_toolkit_1.UnprocessableError:
|
|
38
|
+
status = types_1.HttpCode.Unprocessable;
|
|
39
|
+
break;
|
|
40
|
+
default:
|
|
41
|
+
}
|
|
28
42
|
}
|
|
29
43
|
context.response.status = status;
|
|
30
44
|
context.response.body = { errors: [{ detail: message }] };
|
|
@@ -53,4 +67,4 @@ class ErrorHandling extends base_route_1.default {
|
|
|
53
67
|
}
|
|
54
68
|
}
|
|
55
69
|
exports.default = ErrorHandling;
|
|
56
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
70
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXJyb3ItaGFuZGxpbmcuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvYWdlbnQvcm91dGVzL3N5c3RlbS9lcnJvci1oYW5kbGluZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLDZCQUErQztBQUMvQyx3RUFJeUM7QUFHekMsdUNBQWtEO0FBQ2xELCtEQUFzQztBQUV0QyxNQUFxQixhQUFjLFNBQVEsb0JBQVM7SUFBcEQ7O1FBQ0UsU0FBSSxHQUFHLGlCQUFTLENBQUMsWUFBWSxDQUFDO0lBaUVoQyxDQUFDO0lBL0RDLFdBQVcsQ0FBQyxNQUFjO1FBQ3hCLE1BQU0sQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQztJQUMzQyxDQUFDO0lBRU8sS0FBSyxDQUFDLFlBQVksQ0FBQyxPQUFnQixFQUFFLElBQVU7UUFDckQsSUFBSTtZQUNGLE1BQU0sSUFBSSxFQUFFLENBQUM7U0FDZDtRQUFDLE9BQU8sQ0FBQyxFQUFFO1lBQ1YsSUFBSSxNQUFNLEdBQUcsQ0FBQyxDQUFDLE1BQU0sSUFBSSxnQkFBUSxDQUFDLG1CQUFtQixDQUFDO1lBQ3RELElBQUksT0FBTyxHQUFHLGtCQUFrQixDQUFDO1lBRWpDLElBQ0UsQ0FBQyxZQUFZLGVBQVM7Z0JBQ3RCLENBQUMsWUFBWSxvQ0FBZTtnQkFDNUIsQ0FBQyxZQUFZLHVDQUFrQjtnQkFDL0IsQ0FBQyxZQUFZLG1DQUFjLEVBQzNCO2dCQUNBLE9BQU8sR0FBRyxDQUFDLENBQUMsT0FBTyxDQUFDO2dCQUVwQixRQUFRLElBQUksRUFBRTtvQkFDWixLQUFLLENBQUMsWUFBWSxvQ0FBZTt3QkFDL0IsTUFBTSxHQUFHLGdCQUFRLENBQUMsVUFBVSxDQUFDO3dCQUM3QixNQUFNO29CQUNSLEtBQUssQ0FBQyxZQUFZLG1DQUFjO3dCQUM5QixNQUFNLEdBQUcsZ0JBQVEsQ0FBQyxTQUFTLENBQUM7d0JBQzVCLE1BQU07b0JBQ1IsS0FBSyxDQUFDLFlBQVksdUNBQWtCO3dCQUNsQyxNQUFNLEdBQUcsZ0JBQVEsQ0FBQyxhQUFhLENBQUM7d0JBQ2hDLE1BQU07b0JBQ1IsUUFBUTtpQkFDVDthQUNGO1lBRUQsT0FBTyxDQUFDLFFBQVEsQ0FBQyxNQUFNLEdBQUcsTUFBTSxDQUFDO1lBQ2pDLE9BQU8sQ0FBQyxRQUFRLENBQUMsSUFBSSxHQUFHLEVBQUUsTUFBTSxFQUFFLENBQUMsRUFBRSxNQUFNLEVBQUUsT0FBTyxFQUFFLENBQUMsRUFBRSxDQUFDO1lBRTFELElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLFlBQVksRUFBRTtnQkFDOUIsT0FBTyxDQUFDLFFBQVEsQ0FBQyxHQUFHLEVBQUUsQ0FBQyxJQUFJLENBQUMsYUFBYSxDQUFDLE9BQU8sRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDO2FBQ3hEO1NBQ0Y7SUFDSCxDQUFDO0lBRU8sYUFBYSxDQUFDLE9BQWdCLEVBQUUsS0FBWTtRQUNsRCxNQUFNLEVBQUUsT0FBTyxFQUFFLEdBQUcsT0FBTyxDQUFDO1FBRTVCLE1BQU0sS0FBSyxHQUFHLElBQUksQ0FBQyxTQUFTLENBQUMsT0FBTyxDQUFDLEtBQUssRUFBRSxJQUFJLEVBQUUsR0FBRyxDQUFDLEVBQUUsT0FBTyxDQUFDLElBQUksRUFBRSxFQUFFLENBQUMsQ0FBQztRQUMxRSxPQUFPLENBQUMsS0FBSyxDQUFDLEVBQUUsQ0FBQyxDQUFDO1FBQ2xCLE9BQU8sQ0FBQyxLQUFLLENBQUMsb0RBQW9ELENBQUMsQ0FBQztRQUNwRSxPQUFPLENBQUMsS0FBSyxDQUFDLEdBQUcsT0FBTyxDQUFDLE1BQU0sWUFBWSxPQUFPLENBQUMsSUFBSSxZQUFZLEtBQUssU0FBUyxDQUFDLENBQUM7UUFFbkYsSUFBSSxPQUFPLENBQUMsTUFBTSxLQUFLLE1BQU0sSUFBSSxPQUFPLENBQUMsTUFBTSxLQUFLLEtBQUssSUFBSSxPQUFPLENBQUMsTUFBTSxLQUFLLE9BQU8sRUFBRTtZQUN2RixNQUFNLElBQUksR0FBRyxJQUFJLENBQUMsU0FBUyxDQUFDLE9BQU8sQ0FBQyxJQUFJLEVBQUUsSUFBSSxFQUFFLEdBQUcsQ0FBQyxFQUFFLE9BQU8sQ0FBQyxJQUFJLEVBQUUsRUFBRSxDQUFDLENBQUM7WUFDeEUsT0FBTyxDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUMsQ0FBQztZQUNsQixPQUFPLENBQUMsS0FBSyxDQUFDLGdCQUFnQixJQUFJLFNBQVMsQ0FBQyxDQUFDO1NBQzlDO1FBRUQsT0FBTyxDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUMsQ0FBQztRQUNsQixPQUFPLENBQUMsS0FBSyxDQUFDLFVBQVUsRUFBRSxLQUFLLENBQUMsT0FBTyxFQUFFLFNBQVMsQ0FBQyxDQUFDO1FBQ3BELE9BQU8sQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDLENBQUM7UUFDbEIsT0FBTyxDQUFDLEtBQUssQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLENBQUM7UUFDM0IsT0FBTyxDQUFDLEtBQUssQ0FBQyxvREFBb0QsQ0FBQyxDQUFDO1FBQ3BFLE9BQU8sQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDLENBQUM7SUFDcEIsQ0FBQztDQUNGO0FBbEVELGdDQWtFQyJ9
|
package/dist/agent/types.d.ts
CHANGED
package/dist/agent/types.js
CHANGED
|
@@ -9,6 +9,7 @@ var HttpCode;
|
|
|
9
9
|
HttpCode[HttpCode["NoContent"] = 204] = "NoContent";
|
|
10
10
|
HttpCode[HttpCode["NotFound"] = 404] = "NotFound";
|
|
11
11
|
HttpCode[HttpCode["Ok"] = 200] = "Ok";
|
|
12
|
+
HttpCode[HttpCode["Unprocessable"] = 422] = "Unprocessable";
|
|
12
13
|
})(HttpCode = exports.HttpCode || (exports.HttpCode = {}));
|
|
13
14
|
var RouteType;
|
|
14
15
|
(function (RouteType) {
|
|
@@ -19,4 +20,4 @@ var RouteType;
|
|
|
19
20
|
RouteType[RouteType["Authentication"] = 3] = "Authentication";
|
|
20
21
|
RouteType[RouteType["PrivateRoute"] = 4] = "PrivateRoute";
|
|
21
22
|
})(RouteType = exports.RouteType || (exports.RouteType = {}));
|
|
22
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
23
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYWdlbnQvdHlwZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBSUEsSUFBWSxRQVFYO0FBUkQsV0FBWSxRQUFRO0lBQ2xCLHFEQUFnQixDQUFBO0lBQ2hCLG1EQUFlLENBQUE7SUFDZix1RUFBeUIsQ0FBQTtJQUN6QixtREFBZSxDQUFBO0lBQ2YsaURBQWMsQ0FBQTtJQUNkLHFDQUFRLENBQUE7SUFDUiwyREFBbUIsQ0FBQTtBQUNyQixDQUFDLEVBUlcsUUFBUSxHQUFSLGdCQUFRLEtBQVIsZ0JBQVEsUUFRbkI7QUFFRCxJQUFZLFNBT1g7QUFQRCxXQUFZLFNBQVM7SUFDbkIsaUdBQWlHO0lBQ2pHLDZDQUFVLENBQUE7SUFDVix5REFBZ0IsQ0FBQTtJQUNoQix1REFBZSxDQUFBO0lBQ2YsNkRBQWtCLENBQUE7SUFDbEIseURBQWdCLENBQUE7QUFDbEIsQ0FBQyxFQVBXLFNBQVMsR0FBVCxpQkFBUyxLQUFULGlCQUFTLFFBT3BCIn0=
|
|
@@ -36,7 +36,7 @@ export default class CollectionBuilder<S extends TSchema = TSchema, N extends TC
|
|
|
36
36
|
* Remove field by setting its visibility to false.
|
|
37
37
|
* @param names the fields to remove
|
|
38
38
|
* @example
|
|
39
|
-
* .removeField('aFieldToRemove', '
|
|
39
|
+
* .removeField('aFieldToRemove', 'anotherFieldToRemove');
|
|
40
40
|
*/
|
|
41
41
|
removeField(...names: TColumnName<S, N>[]): this;
|
|
42
42
|
/**
|
|
@@ -70,7 +70,7 @@ export default class CollectionBuilder<S extends TSchema = TSchema, N extends TC
|
|
|
70
70
|
* @param foreignCollection name of the targeted collection
|
|
71
71
|
* @param options extra information about the relation
|
|
72
72
|
* @example
|
|
73
|
-
* books.addManyToOneRelation('myAuthor', 'persons', { foreignKey: '
|
|
73
|
+
* books.addManyToOneRelation('myAuthor', 'persons', { foreignKey: 'authorId' })
|
|
74
74
|
*/
|
|
75
75
|
addManyToOneRelation<T extends TCollectionName<S>>(name: string, foreignCollection: T, options: {
|
|
76
76
|
foreignKey: TColumnName<S, N>;
|
|
@@ -82,7 +82,7 @@ export default class CollectionBuilder<S extends TSchema = TSchema, N extends TC
|
|
|
82
82
|
* @param foreignCollection name of the targeted collection
|
|
83
83
|
* @param options extra information about the relation
|
|
84
84
|
* @example
|
|
85
|
-
* persons.addOneToManyRelation('writtenBooks', 'books', { originKey: '
|
|
85
|
+
* persons.addOneToManyRelation('writtenBooks', 'books', { originKey: 'authorId' })
|
|
86
86
|
*/
|
|
87
87
|
addOneToManyRelation<T extends TCollectionName<S>>(name: string, foreignCollection: T, options: {
|
|
88
88
|
originKey: TColumnName<S, T>;
|
|
@@ -94,7 +94,7 @@ export default class CollectionBuilder<S extends TSchema = TSchema, N extends TC
|
|
|
94
94
|
* @param foreignCollection name of the targeted collection
|
|
95
95
|
* @param options extra information about the relation
|
|
96
96
|
* @example
|
|
97
|
-
* persons.addOneToOneRelation('bestFriend', 'persons', { originKey: '
|
|
97
|
+
* persons.addOneToOneRelation('bestFriend', 'persons', { originKey: 'bestFriendId' })
|
|
98
98
|
*/
|
|
99
99
|
addOneToOneRelation<T extends TCollectionName<S>>(name: string, foreignCollection: T, options: {
|
|
100
100
|
originKey: TColumnName<S, T>;
|
|
@@ -107,9 +107,9 @@ export default class CollectionBuilder<S extends TSchema = TSchema, N extends TC
|
|
|
107
107
|
* @param throughCollection name of the intermediary collection
|
|
108
108
|
* @param options extra information about the relation
|
|
109
109
|
* @example
|
|
110
|
-
* dvds.addManyToManyRelation('rentalsOfThisDvd', 'rentals', '
|
|
111
|
-
* originKey: '
|
|
112
|
-
* foreignKey: '
|
|
110
|
+
* dvds.addManyToManyRelation('rentalsOfThisDvd', 'rentals', 'dvdRentals', {
|
|
111
|
+
* originKey: 'dvdId',
|
|
112
|
+
* foreignKey: 'rentalId'
|
|
113
113
|
* })
|
|
114
114
|
*/
|
|
115
115
|
addManyToManyRelation<Foreign extends TCollectionName<S>, Through extends TCollectionName<S>>(name: string, foreignCollection: Foreign, throughCollection: Through, options: {
|
|
@@ -142,7 +142,7 @@ export default class CollectionBuilder<S extends TSchema = TSchema, N extends TC
|
|
|
142
142
|
* @example
|
|
143
143
|
* .addSegment(
|
|
144
144
|
* 'Wrote more than 2 books',
|
|
145
|
-
* {field: 'booksCount', operator: 'GreaterThan', value: 2}
|
|
145
|
+
* { field: 'booksCount', operator: 'GreaterThan', value: 2 }
|
|
146
146
|
* );
|
|
147
147
|
*/
|
|
148
148
|
addSegment(name: string, definition: SegmentDefinition<S, N>): this;
|
|
@@ -193,9 +193,20 @@ export default class CollectionBuilder<S extends TSchema = TSchema, N extends TC
|
|
|
193
193
|
* @param operator the operator to replace
|
|
194
194
|
* @param replacer the proposed implementation
|
|
195
195
|
* @example
|
|
196
|
-
* .replaceFieldOperator('
|
|
197
|
-
*
|
|
198
|
-
*
|
|
196
|
+
* .replaceFieldOperator('fullName', 'Contains', (value) => {
|
|
197
|
+
* return {
|
|
198
|
+
* aggregator: 'Or',
|
|
199
|
+
* conditions: [{
|
|
200
|
+
* field: 'firstName',
|
|
201
|
+
* operator: 'Contains',
|
|
202
|
+
* value
|
|
203
|
+
* }, {
|
|
204
|
+
* field: 'lastName',
|
|
205
|
+
* operator: 'Contains',
|
|
206
|
+
* value
|
|
207
|
+
* }]
|
|
208
|
+
* }
|
|
209
|
+
* });
|
|
199
210
|
*/
|
|
200
211
|
replaceFieldOperator<C extends TColumnName<S, N>>(name: C, operator: Operator, replacer: OperatorDefinition<S, N, C>): this;
|
|
201
212
|
/**
|
|
@@ -58,14 +58,14 @@ class CollectionBuilder {
|
|
|
58
58
|
* .renameField('theCurrentNameOfTheField', 'theNewNameOfTheField');
|
|
59
59
|
*/
|
|
60
60
|
renameField(oldName, newName) {
|
|
61
|
-
this.stack.
|
|
61
|
+
this.stack.renameField.getCollection(this.name).renameField(oldName, newName);
|
|
62
62
|
return this;
|
|
63
63
|
}
|
|
64
64
|
/**
|
|
65
65
|
* Remove field by setting its visibility to false.
|
|
66
66
|
* @param names the fields to remove
|
|
67
67
|
* @example
|
|
68
|
-
* .removeField('aFieldToRemove', '
|
|
68
|
+
* .removeField('aFieldToRemove', 'anotherFieldToRemove');
|
|
69
69
|
*/
|
|
70
70
|
removeField(...names) {
|
|
71
71
|
const collection = this.stack.publication.getCollection(this.name);
|
|
@@ -117,7 +117,7 @@ class CollectionBuilder {
|
|
|
117
117
|
* @param foreignCollection name of the targeted collection
|
|
118
118
|
* @param options extra information about the relation
|
|
119
119
|
* @example
|
|
120
|
-
* books.addManyToOneRelation('myAuthor', 'persons', { foreignKey: '
|
|
120
|
+
* books.addManyToOneRelation('myAuthor', 'persons', { foreignKey: 'authorId' })
|
|
121
121
|
*/
|
|
122
122
|
addManyToOneRelation(name, foreignCollection, options) {
|
|
123
123
|
this.addRelation(name, {
|
|
@@ -134,7 +134,7 @@ class CollectionBuilder {
|
|
|
134
134
|
* @param foreignCollection name of the targeted collection
|
|
135
135
|
* @param options extra information about the relation
|
|
136
136
|
* @example
|
|
137
|
-
* persons.addOneToManyRelation('writtenBooks', 'books', { originKey: '
|
|
137
|
+
* persons.addOneToManyRelation('writtenBooks', 'books', { originKey: 'authorId' })
|
|
138
138
|
*/
|
|
139
139
|
addOneToManyRelation(name, foreignCollection, options) {
|
|
140
140
|
this.addRelation(name, {
|
|
@@ -151,7 +151,7 @@ class CollectionBuilder {
|
|
|
151
151
|
* @param foreignCollection name of the targeted collection
|
|
152
152
|
* @param options extra information about the relation
|
|
153
153
|
* @example
|
|
154
|
-
* persons.addOneToOneRelation('bestFriend', 'persons', { originKey: '
|
|
154
|
+
* persons.addOneToOneRelation('bestFriend', 'persons', { originKey: 'bestFriendId' })
|
|
155
155
|
*/
|
|
156
156
|
addOneToOneRelation(name, foreignCollection, options) {
|
|
157
157
|
this.addRelation(name, {
|
|
@@ -169,9 +169,9 @@ class CollectionBuilder {
|
|
|
169
169
|
* @param throughCollection name of the intermediary collection
|
|
170
170
|
* @param options extra information about the relation
|
|
171
171
|
* @example
|
|
172
|
-
* dvds.addManyToManyRelation('rentalsOfThisDvd', 'rentals', '
|
|
173
|
-
* originKey: '
|
|
174
|
-
* foreignKey: '
|
|
172
|
+
* dvds.addManyToManyRelation('rentalsOfThisDvd', 'rentals', 'dvdRentals', {
|
|
173
|
+
* originKey: 'dvdId',
|
|
174
|
+
* foreignKey: 'rentalId'
|
|
175
175
|
* })
|
|
176
176
|
*/
|
|
177
177
|
addManyToManyRelation(name, foreignCollection, throughCollection, options) {
|
|
@@ -218,7 +218,7 @@ class CollectionBuilder {
|
|
|
218
218
|
* @example
|
|
219
219
|
* .addSegment(
|
|
220
220
|
* 'Wrote more than 2 books',
|
|
221
|
-
* {field: 'booksCount', operator: 'GreaterThan', value: 2}
|
|
221
|
+
* { field: 'booksCount', operator: 'GreaterThan', value: 2 }
|
|
222
222
|
* );
|
|
223
223
|
*/
|
|
224
224
|
addSegment(name, definition) {
|
|
@@ -295,9 +295,20 @@ class CollectionBuilder {
|
|
|
295
295
|
* @param operator the operator to replace
|
|
296
296
|
* @param replacer the proposed implementation
|
|
297
297
|
* @example
|
|
298
|
-
* .replaceFieldOperator('
|
|
299
|
-
*
|
|
300
|
-
*
|
|
298
|
+
* .replaceFieldOperator('fullName', 'Contains', (value) => {
|
|
299
|
+
* return {
|
|
300
|
+
* aggregator: 'Or',
|
|
301
|
+
* conditions: [{
|
|
302
|
+
* field: 'firstName',
|
|
303
|
+
* operator: 'Contains',
|
|
304
|
+
* value
|
|
305
|
+
* }, {
|
|
306
|
+
* field: 'lastName',
|
|
307
|
+
* operator: 'Contains',
|
|
308
|
+
* value
|
|
309
|
+
* }]
|
|
310
|
+
* }
|
|
311
|
+
* });
|
|
301
312
|
*/
|
|
302
313
|
replaceFieldOperator(name, operator, replacer) {
|
|
303
314
|
const collection = this.stack.earlyOpEmulate.getCollection(this.name).schema.fields[name]
|
|
@@ -352,4 +363,4 @@ class CollectionBuilder {
|
|
|
352
363
|
}
|
|
353
364
|
}
|
|
354
365
|
exports.default = CollectionBuilder;
|
|
355
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
366
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"collection.js","sourceRoot":"","sources":["../../src/builder/collection.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ActionCollectionDecorator, ChartDataSourceDecorator, ComputedCollectionDecorator, DataSource, DataSourceDecorator, EmptyCollectionDecorator, OperatorsEmulateCollectionDecorator, OperatorsReplaceCollectionDecorator, PublicationCollectionDecorator, RelationCollectionDecorator,
|
|
1
|
+
import { ActionCollectionDecorator, ChartDataSourceDecorator, ComputedCollectionDecorator, DataSource, DataSourceDecorator, EmptyCollectionDecorator, OperatorsEmulateCollectionDecorator, OperatorsReplaceCollectionDecorator, PublicationCollectionDecorator, RelationCollectionDecorator, RenameFieldCollectionDecorator, SchemaCollectionDecorator, SearchCollectionDecorator, SegmentCollectionDecorator, SortEmulateCollectionDecorator, WriteCollectionDecorator } from '@forestadmin/datasource-toolkit';
|
|
2
2
|
export default class DecoratorsStack {
|
|
3
3
|
action: DataSourceDecorator<ActionCollectionDecorator>;
|
|
4
4
|
chart: ChartDataSourceDecorator;
|
|
@@ -11,7 +11,7 @@ export default class DecoratorsStack {
|
|
|
11
11
|
lateOpEmulate: DataSourceDecorator<OperatorsEmulateCollectionDecorator>;
|
|
12
12
|
lateOpReplace: DataSourceDecorator<OperatorsReplaceCollectionDecorator>;
|
|
13
13
|
publication: DataSourceDecorator<PublicationCollectionDecorator>;
|
|
14
|
-
|
|
14
|
+
renameField: DataSourceDecorator<RenameFieldCollectionDecorator>;
|
|
15
15
|
schema: DataSourceDecorator<SchemaCollectionDecorator>;
|
|
16
16
|
search: DataSourceDecorator<SearchCollectionDecorator>;
|
|
17
17
|
segment: DataSourceDecorator<SegmentCollectionDecorator>;
|
|
@@ -29,10 +29,10 @@ class DecoratorsStack {
|
|
|
29
29
|
// Step 4: Renaming must be either the very first or very last so that naming in customer code
|
|
30
30
|
// is consistent.
|
|
31
31
|
last = this.publication = new datasource_toolkit_1.DataSourceDecorator(last, datasource_toolkit_1.PublicationCollectionDecorator);
|
|
32
|
-
last = this.
|
|
32
|
+
last = this.renameField = new datasource_toolkit_1.DataSourceDecorator(last, datasource_toolkit_1.RenameFieldCollectionDecorator);
|
|
33
33
|
/* eslint-enable no-multi-assign */
|
|
34
34
|
this.dataSource = last;
|
|
35
35
|
}
|
|
36
36
|
}
|
|
37
37
|
exports.default = DecoratorsStack;
|
|
38
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
38
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVjb3JhdG9ycy1zdGFjay5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9idWlsZGVyL2RlY29yYXRvcnMtc3RhY2sudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSx3RUFpQnlDO0FBRXpDLE1BQXFCLGVBQWU7SUFvQmxDLFlBQVksVUFBc0I7UUFDaEMsSUFBSSxJQUFJLEdBQWUsVUFBVSxDQUFDO1FBRWxDLG9DQUFvQztRQUNwQyxtRkFBbUY7UUFDbkYsSUFBSSxHQUFHLElBQUksQ0FBQyxLQUFLLEdBQUcsSUFBSSx3Q0FBbUIsQ0FBQyxJQUFJLEVBQUUsNkNBQXdCLENBQUMsQ0FBQztRQUU1RSw2RkFBNkY7UUFDN0Ysc0VBQXNFO1FBQ3RFLDJGQUEyRjtRQUMzRixJQUFJLEdBQUcsSUFBSSxDQUFDLGFBQWEsR0FBRyxJQUFJLHdDQUFtQixDQUFDLElBQUksRUFBRSxnREFBMkIsQ0FBQyxDQUFDO1FBQ3ZGLElBQUksR0FBRyxJQUFJLENBQUMsY0FBYyxHQUFHLElBQUksd0NBQW1CLENBQUMsSUFBSSxFQUFFLHdEQUFtQyxDQUFDLENBQUM7UUFDaEcsSUFBSSxHQUFHLElBQUksQ0FBQyxjQUFjLEdBQUcsSUFBSSx3Q0FBbUIsQ0FBQyxJQUFJLEVBQUUsd0RBQW1DLENBQUMsQ0FBQztRQUNoRyxJQUFJLEdBQUcsSUFBSSxDQUFDLFFBQVEsR0FBRyxJQUFJLHdDQUFtQixDQUFDLElBQUksRUFBRSxnREFBMkIsQ0FBQyxDQUFDO1FBQ2xGLElBQUksR0FBRyxJQUFJLENBQUMsWUFBWSxHQUFHLElBQUksd0NBQW1CLENBQUMsSUFBSSxFQUFFLGdEQUEyQixDQUFDLENBQUM7UUFDdEYsSUFBSSxHQUFHLElBQUksQ0FBQyxhQUFhLEdBQUcsSUFBSSx3Q0FBbUIsQ0FBQyxJQUFJLEVBQUUsd0RBQW1DLENBQUMsQ0FBQztRQUMvRixJQUFJLEdBQUcsSUFBSSxDQUFDLGFBQWEsR0FBRyxJQUFJLHdDQUFtQixDQUFDLElBQUksRUFBRSx3REFBbUMsQ0FBQyxDQUFDO1FBRS9GLDRFQUE0RTtRQUM1RSxJQUFJLEdBQUcsSUFBSSxDQUFDLEtBQUssR0FBRyxJQUFJLDZDQUF3QixDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ3ZELElBQUksR0FBRyxJQUFJLENBQUMsTUFBTSxHQUFHLElBQUksd0NBQW1CLENBQUMsSUFBSSxFQUFFLDhDQUF5QixDQUFDLENBQUM7UUFDOUUsSUFBSSxHQUFHLElBQUksQ0FBQyxPQUFPLEdBQUcsSUFBSSx3Q0FBbUIsQ0FBQyxJQUFJLEVBQUUsK0NBQTBCLENBQUMsQ0FBQztRQUNoRixJQUFJLEdBQUcsSUFBSSxDQUFDLFdBQVcsR0FBRyxJQUFJLHdDQUFtQixDQUFDLElBQUksRUFBRSxtREFBOEIsQ0FBQyxDQUFDO1FBQ3hGLElBQUksR0FBRyxJQUFJLENBQUMsS0FBSyxHQUFHLElBQUksd0NBQW1CLENBQUMsSUFBSSxFQUFFLDZDQUF3QixDQUFDLENBQUM7UUFFNUUseURBQXlEO1FBQ3pELElBQUksR0FBRyxJQUFJLENBQUMsTUFBTSxHQUFHLElBQUksd0NBQW1CLENBQUMsSUFBSSxFQUFFLDhDQUF5QixDQUFDLENBQUM7UUFDOUUsSUFBSSxHQUFHLElBQUksQ0FBQyxNQUFNLEdBQUcsSUFBSSx3Q0FBbUIsQ0FBQyxJQUFJLEVBQUUsOENBQXlCLENBQUMsQ0FBQztRQUU5RSw4RkFBOEY7UUFDOUYsaUJBQWlCO1FBQ2pCLElBQUksR0FBRyxJQUFJLENBQUMsV0FBVyxHQUFHLElBQUksd0NBQW1CLENBQUMsSUFBSSxFQUFFLG1EQUE4QixDQUFDLENBQUM7UUFDeEYsSUFBSSxHQUFHLElBQUksQ0FBQyxXQUFXLEdBQUcsSUFBSSx3Q0FBbUIsQ0FBQyxJQUFJLEVBQUUsbURBQThCLENBQUMsQ0FBQztRQUN4RixtQ0FBbUM7UUFFbkMsSUFBSSxDQUFDLFVBQVUsR0FBRyxJQUFJLENBQUM7SUFDekIsQ0FBQztDQUNGO0FBekRELGtDQXlEQyJ9
|
|
@@ -8,7 +8,7 @@ class TypingGenerator {
|
|
|
8
8
|
`/* eslint-disable */`,
|
|
9
9
|
'export type Schema = {',
|
|
10
10
|
...collections.map(collection => [
|
|
11
|
-
` ${collection.name}: {`,
|
|
11
|
+
` '${collection.name}': {`,
|
|
12
12
|
this.getRow(collection),
|
|
13
13
|
this.getRelations(collection),
|
|
14
14
|
this.getFlatRelations(collection, maxDepth),
|
|
@@ -19,7 +19,7 @@ class TypingGenerator {
|
|
|
19
19
|
}
|
|
20
20
|
static getRow(collection) {
|
|
21
21
|
const content = Object.entries(collection.schema.fields).reduce((memo, [name, field]) => {
|
|
22
|
-
return field.type === 'Column' ? [...memo, ` ${name}: ${this.getType(field)};`] : memo;
|
|
22
|
+
return field.type === 'Column' ? [...memo, ` '${name}': ${this.getType(field)};`] : memo;
|
|
23
23
|
}, []);
|
|
24
24
|
return ` plain: {\n${content.join('\n')}\n };`;
|
|
25
25
|
}
|
|
@@ -29,7 +29,7 @@ class TypingGenerator {
|
|
|
29
29
|
const relation = field.foreignCollection;
|
|
30
30
|
return [
|
|
31
31
|
...memo,
|
|
32
|
-
` ${name}: Schema['${relation}']['plain'] & Schema['${relation}']['nested'];`,
|
|
32
|
+
` '${name}': Schema['${relation}']['plain'] & Schema['${relation}']['nested'];`,
|
|
33
33
|
];
|
|
34
34
|
}
|
|
35
35
|
return memo;
|
|
@@ -95,4 +95,4 @@ class TypingGenerator {
|
|
|
95
95
|
}
|
|
96
96
|
}
|
|
97
97
|
exports.default = TypingGenerator;
|
|
98
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
98
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwaW5nLWdlbmVyYXRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9idWlsZGVyL3V0aWxzL3R5cGluZy1nZW5lcmF0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSx3RUFNeUM7QUFFekMsTUFBcUIsZUFBZTtJQUNsQyxNQUFNLENBQUMsYUFBYSxDQUFDLFVBQXNCLEVBQUUsUUFBZ0I7UUFDM0QsTUFBTSxXQUFXLEdBQUcsQ0FBQyxHQUFHLFVBQVUsQ0FBQyxXQUFXLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQztRQUU3RixPQUFPO1lBQ0wsc0JBQXNCO1lBQ3RCLHdCQUF3QjtZQUN4QixHQUFHLFdBQVcsQ0FBQyxHQUFHLENBQUMsVUFBVSxDQUFDLEVBQUUsQ0FDOUI7Z0JBQ0UsTUFBTSxVQUFVLENBQUMsSUFBSSxNQUFNO2dCQUMzQixJQUFJLENBQUMsTUFBTSxDQUFDLFVBQVUsQ0FBQztnQkFDdkIsSUFBSSxDQUFDLFlBQVksQ0FBQyxVQUFVLENBQUM7Z0JBQzdCLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxVQUFVLEVBQUUsUUFBUSxDQUFDO2dCQUMzQyxNQUFNO2FBQ1AsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQ2I7WUFDRCxNQUFNO1NBQ1AsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDZixDQUFDO0lBRU8sTUFBTSxDQUFDLE1BQU0sQ0FBQyxVQUFzQjtRQUMxQyxNQUFNLE9BQU8sR0FBRyxNQUFNLENBQUMsT0FBTyxDQUFDLFVBQVUsQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLENBQUMsTUFBTSxDQUFDLENBQUMsSUFBSSxFQUFFLENBQUMsSUFBSSxFQUFFLEtBQUssQ0FBQyxFQUFFLEVBQUU7WUFDdEYsT0FBTyxL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
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@forestadmin/agent",
|
|
3
|
-
"version": "1.0.0-beta.
|
|
3
|
+
"version": "1.0.0-beta.38",
|
|
4
4
|
"main": "dist/index.js",
|
|
5
5
|
"license": "GPL-3.0",
|
|
6
6
|
"publishConfig": {
|
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
"dependencies": {
|
|
15
15
|
"@fast-csv/format": "^4.3.5",
|
|
16
16
|
"@fastify/express": "^1.1.0",
|
|
17
|
-
"@forestadmin/datasource-toolkit": "1.0.0-beta.
|
|
17
|
+
"@forestadmin/datasource-toolkit": "1.0.0-beta.23",
|
|
18
18
|
"@koa/cors": "^3.3.0",
|
|
19
19
|
"@koa/router": "^10.1.1",
|
|
20
20
|
"forest-ip-utils": "^1.0.1",
|