Skip to content

Commit 79bd84f

Browse files
authored
convert OnNestedQueryListener.beforeExecuteAsync to async function (#249)
* convert OnNestedQueryListener.beforeExecuteAsync to async function * validate test syntax * 2.6.102
1 parent b6b11aa commit 79bd84f

4 files changed

Lines changed: 13 additions & 15 deletions

File tree

OnNestedQueryListener.js

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,32 +33,32 @@ class OnNestedQueryListener {
3333
});
3434
}
3535

36-
beforeExecuteAsync(event) {
36+
async beforeExecuteAsync(event) {
3737
const query = event.emitter && event.emitter.query;
3838
const context = event.model.context;
3939
if (query == null) {
40-
return Promise.resolve();
40+
return;
4141
}
4242
// handle only select statements
4343
if (query.$select == null) {
44-
return Promise.resolve();
44+
return;
4545
}
4646
// if queryable is silent
4747
if (event.emitter.$silent) {
4848
// exit
49-
return Promise.resolve();
49+
return;
5050
}
5151
// validate emitter.$view
5252
const view = event.emitter && event.emitter.$view;
5353
if (view && view.privileges && view.privileges.length) {
5454
// DataEventPermissionListener will validate view privileges itself
5555
// so, do nothing and exit
56-
return Promise.resolve();
56+
return;
5757
}
5858
if (Object.prototype.hasOwnProperty.call(query, '$expand')) {
5959
// exit if expand is null or undefined
6060
if (query.$expand == null) {
61-
return Promise.resolve();
61+
return;
6262
}
6363
/**
6464
* @type {Array<{ $entity:{ model:string }}>}
@@ -156,10 +156,9 @@ class OnNestedQueryListener {
156156
return Promise.resolve();
157157
}
158158
});
159-
return Promise.sequence(sources);
159+
await Promise.sequence(sources);
160160
}
161161
}
162-
return Promise.resolve();
163162
}
164163

165164
}

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@themost/data",
3-
"version": "2.6.101",
3+
"version": "2.6.102",
44
"description": "MOST Web Framework Codename Blueshift - Data module",
55
"main": "index.js",
66
"types": "index.d.ts",

spec/DataExpandResolver.spec.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,12 @@ describe('DataExpandResolver', () => {
77
name: 'orders'
88
}]);
99
});
10-
it('should parse `orders,address()`', () => {
10+
it('should parse `orders,address`', () => {
1111
const resolver = new DataExpandResolver();
12-
expect(resolver.test('orders,address()')).toEqual([{
12+
expect(resolver.test('orders,address')).toEqual([{
1313
name: 'orders'
1414
},{
15-
name: 'address',
16-
options: {}
15+
name: 'address'
1716
}]);
1817
});
1918
it('should parse `orders($select=id,orderDate,orderedItem)`', () => {

0 commit comments

Comments
 (0)