prostgles-server 2.0.195 → 2.0.198
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/DboBuilder.d.ts +4 -6
- package/dist/DboBuilder.d.ts.map +1 -1
- package/dist/DboBuilder.js +72 -26
- package/dist/DboBuilder.js.map +1 -1
- package/dist/FileManager.d.ts +4 -0
- package/dist/FileManager.d.ts.map +1 -1
- package/dist/FileManager.js +55 -6
- package/dist/FileManager.js.map +1 -1
- package/dist/Prostgles.d.ts +15 -0
- package/dist/Prostgles.d.ts.map +1 -1
- package/dist/Prostgles.js.map +1 -1
- package/dist/QueryBuilder.d.ts.map +1 -1
- package/dist/QueryBuilder.js +2 -1
- package/dist/QueryBuilder.js.map +1 -1
- package/lib/DboBuilder.d.ts +4 -6
- package/lib/DboBuilder.d.ts.map +1 -1
- package/lib/DboBuilder.js +72 -26
- package/lib/DboBuilder.ts +81 -28
- package/lib/FileManager.d.ts +4 -0
- package/lib/FileManager.d.ts.map +1 -1
- package/lib/FileManager.js +58 -6
- package/lib/FileManager.ts +59 -13
- package/lib/Prostgles.d.ts +15 -0
- package/lib/Prostgles.d.ts.map +1 -1
- package/lib/Prostgles.ts +16 -0
- package/lib/QueryBuilder.d.ts.map +1 -1
- package/lib/QueryBuilder.js +2 -1
- package/lib/QueryBuilder.ts +2 -1
- package/package.json +5 -5
- package/tests/client/PID.txt +1 -1
- package/tests/client/package-lock.json +15 -15
- package/tests/client/package.json +1 -1
- package/tests/server/index.js +0 -1
- package/tests/server/index.ts +0 -1
- package/tests/server/package-lock.json +9 -9
package/lib/QueryBuilder.ts
CHANGED
|
@@ -1326,7 +1326,7 @@ export async function getNewQuery(
|
|
|
1326
1326
|
// .filter(s => s.type !== "joinedColumn")
|
|
1327
1327
|
// .map(s => s.alias);
|
|
1328
1328
|
|
|
1329
|
-
const
|
|
1329
|
+
const filterOpts = await _this.prepareWhere({
|
|
1330
1330
|
filter,
|
|
1331
1331
|
select,
|
|
1332
1332
|
forcedFilter: get(tableRules, "select.forcedFilter"),
|
|
@@ -1335,6 +1335,7 @@ export async function getNewQuery(
|
|
|
1335
1335
|
localParams,
|
|
1336
1336
|
tableRule: tableRules
|
|
1337
1337
|
});
|
|
1338
|
+
const where = filterOpts.where;
|
|
1338
1339
|
const p = _this.getValidatedRules(tableRules, localParams);
|
|
1339
1340
|
|
|
1340
1341
|
let resQuery: NewQuery = {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "prostgles-server",
|
|
3
|
-
"version": "2.0.
|
|
3
|
+
"version": "2.0.198",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -24,8 +24,8 @@
|
|
|
24
24
|
},
|
|
25
25
|
"homepage": "https://github.com/prostgles/prostgles-server-js#readme",
|
|
26
26
|
"dependencies": {
|
|
27
|
-
"@aws-sdk/client-s3": "^3.
|
|
28
|
-
"aws-sdk": "^2.
|
|
27
|
+
"@aws-sdk/client-s3": "^3.121.0",
|
|
28
|
+
"aws-sdk": "^2.1168.0",
|
|
29
29
|
"bluebird": "^3.7.2",
|
|
30
30
|
"file-type": "^17.1.2",
|
|
31
31
|
"pg-promise": "^10.11.1",
|
|
@@ -33,9 +33,9 @@
|
|
|
33
33
|
"sharp": "^0.30.7"
|
|
34
34
|
},
|
|
35
35
|
"devDependencies": {
|
|
36
|
-
"@aws-sdk/types": "^3.
|
|
36
|
+
"@aws-sdk/types": "^3.110.0",
|
|
37
37
|
"@types/bluebird": "^3.5.36",
|
|
38
|
-
"@types/node": "^
|
|
38
|
+
"@types/node": "^18.0.3",
|
|
39
39
|
"@types/sharp": "^0.30.4",
|
|
40
40
|
"typescript": "^4.7.4"
|
|
41
41
|
}
|
package/tests/client/PID.txt
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
|
|
1
|
+
10879
|
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
"license": "ISC",
|
|
11
11
|
"dependencies": {
|
|
12
12
|
"@types/node": "^14.14.16",
|
|
13
|
-
"prostgles-client": "^1.5.
|
|
13
|
+
"prostgles-client": "^1.5.166",
|
|
14
14
|
"prostgles-types": "^1.5.68",
|
|
15
15
|
"socket.io-client": "^4.5.1"
|
|
16
16
|
}
|
|
@@ -67,17 +67,17 @@
|
|
|
67
67
|
"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
|
|
68
68
|
},
|
|
69
69
|
"node_modules/prostgles-client": {
|
|
70
|
-
"version": "1.5.
|
|
71
|
-
"resolved": "https://registry.npmjs.org/prostgles-client/-/prostgles-client-1.5.
|
|
72
|
-
"integrity": "sha512
|
|
70
|
+
"version": "1.5.166",
|
|
71
|
+
"resolved": "https://registry.npmjs.org/prostgles-client/-/prostgles-client-1.5.166.tgz",
|
|
72
|
+
"integrity": "sha512-O/oKyXIbhtRW10KyR2pHlU5hExdw0vKOQXlgHmTKQ11zQkNr/aFPQyhctCB9J0n/SrSNtcxuZbMkZp9v1YjC/A==",
|
|
73
73
|
"dependencies": {
|
|
74
|
-
"prostgles-types": "^1.5.
|
|
74
|
+
"prostgles-types": "^1.5.162"
|
|
75
75
|
}
|
|
76
76
|
},
|
|
77
77
|
"node_modules/prostgles-types": {
|
|
78
|
-
"version": "1.5.
|
|
79
|
-
"resolved": "https://registry.npmjs.org/prostgles-types/-/prostgles-types-1.5.
|
|
80
|
-
"integrity": "sha512-
|
|
78
|
+
"version": "1.5.163",
|
|
79
|
+
"resolved": "https://registry.npmjs.org/prostgles-types/-/prostgles-types-1.5.163.tgz",
|
|
80
|
+
"integrity": "sha512-KlswBzWW17VLDv2oUybimUIUDgXaH+RvAdVUpVinlmOpWXNBfAWSEyVtmq8qnMKOzf8XAbalXETlJUUdCJfBzQ=="
|
|
81
81
|
},
|
|
82
82
|
"node_modules/socket.io-client": {
|
|
83
83
|
"version": "4.5.1",
|
|
@@ -176,17 +176,17 @@
|
|
|
176
176
|
"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
|
|
177
177
|
},
|
|
178
178
|
"prostgles-client": {
|
|
179
|
-
"version": "1.5.
|
|
180
|
-
"resolved": "https://registry.npmjs.org/prostgles-client/-/prostgles-client-1.5.
|
|
181
|
-
"integrity": "sha512
|
|
179
|
+
"version": "1.5.166",
|
|
180
|
+
"resolved": "https://registry.npmjs.org/prostgles-client/-/prostgles-client-1.5.166.tgz",
|
|
181
|
+
"integrity": "sha512-O/oKyXIbhtRW10KyR2pHlU5hExdw0vKOQXlgHmTKQ11zQkNr/aFPQyhctCB9J0n/SrSNtcxuZbMkZp9v1YjC/A==",
|
|
182
182
|
"requires": {
|
|
183
|
-
"prostgles-types": "^1.5.
|
|
183
|
+
"prostgles-types": "^1.5.162"
|
|
184
184
|
}
|
|
185
185
|
},
|
|
186
186
|
"prostgles-types": {
|
|
187
|
-
"version": "1.5.
|
|
188
|
-
"resolved": "https://registry.npmjs.org/prostgles-types/-/prostgles-types-1.5.
|
|
189
|
-
"integrity": "sha512-
|
|
187
|
+
"version": "1.5.163",
|
|
188
|
+
"resolved": "https://registry.npmjs.org/prostgles-types/-/prostgles-types-1.5.163.tgz",
|
|
189
|
+
"integrity": "sha512-KlswBzWW17VLDv2oUybimUIUDgXaH+RvAdVUpVinlmOpWXNBfAWSEyVtmq8qnMKOzf8XAbalXETlJUUdCJfBzQ=="
|
|
190
190
|
},
|
|
191
191
|
"socket.io-client": {
|
|
192
192
|
"version": "4.5.1",
|
package/tests/server/index.js
CHANGED
package/tests/server/index.ts
CHANGED
|
@@ -21,11 +21,11 @@
|
|
|
21
21
|
},
|
|
22
22
|
"../..": {
|
|
23
23
|
"name": "prostgles-server",
|
|
24
|
-
"version": "2.0.
|
|
24
|
+
"version": "2.0.197",
|
|
25
25
|
"license": "MIT",
|
|
26
26
|
"dependencies": {
|
|
27
|
-
"@aws-sdk/client-s3": "^3.
|
|
28
|
-
"aws-sdk": "^2.
|
|
27
|
+
"@aws-sdk/client-s3": "^3.121.0",
|
|
28
|
+
"aws-sdk": "^2.1168.0",
|
|
29
29
|
"bluebird": "^3.7.2",
|
|
30
30
|
"file-type": "^17.1.2",
|
|
31
31
|
"pg-promise": "^10.11.1",
|
|
@@ -33,9 +33,9 @@
|
|
|
33
33
|
"sharp": "^0.30.7"
|
|
34
34
|
},
|
|
35
35
|
"devDependencies": {
|
|
36
|
-
"@aws-sdk/types": "^3.
|
|
36
|
+
"@aws-sdk/types": "^3.110.0",
|
|
37
37
|
"@types/bluebird": "^3.5.36",
|
|
38
|
-
"@types/node": "^
|
|
38
|
+
"@types/node": "^18.0.3",
|
|
39
39
|
"@types/sharp": "^0.30.4",
|
|
40
40
|
"typescript": "^4.7.4"
|
|
41
41
|
}
|
|
@@ -1362,12 +1362,12 @@
|
|
|
1362
1362
|
"prostgles-server": {
|
|
1363
1363
|
"version": "file:../..",
|
|
1364
1364
|
"requires": {
|
|
1365
|
-
"@aws-sdk/client-s3": "^3.
|
|
1366
|
-
"@aws-sdk/types": "^3.
|
|
1365
|
+
"@aws-sdk/client-s3": "^3.121.0",
|
|
1366
|
+
"@aws-sdk/types": "^3.110.0",
|
|
1367
1367
|
"@types/bluebird": "^3.5.36",
|
|
1368
|
-
"@types/node": "^
|
|
1368
|
+
"@types/node": "^18.0.3",
|
|
1369
1369
|
"@types/sharp": "^0.30.4",
|
|
1370
|
-
"aws-sdk": "^2.
|
|
1370
|
+
"aws-sdk": "^2.1168.0",
|
|
1371
1371
|
"bluebird": "^3.7.2",
|
|
1372
1372
|
"file-type": "^17.1.2",
|
|
1373
1373
|
"pg-promise": "^10.11.1",
|