prostgles-server 4.2.187 → 4.2.188
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/.eslintignore +2 -1
- package/.eslintrc.json +2 -0
- package/dist/Auth/AuthHandler.d.ts +18 -11
- package/dist/Auth/AuthHandler.d.ts.map +1 -1
- package/dist/Auth/AuthHandler.js +94 -120
- package/dist/Auth/AuthHandler.js.map +1 -1
- package/dist/Auth/AuthTypes.d.ts +78 -71
- package/dist/Auth/AuthTypes.d.ts.map +1 -1
- package/dist/Auth/{setEmailProvider.d.ts → authProviders/setEmailProvider.d.ts} +1 -1
- package/dist/Auth/authProviders/setEmailProvider.d.ts.map +1 -0
- package/dist/Auth/authProviders/setEmailProvider.js +27 -0
- package/dist/Auth/authProviders/setEmailProvider.js.map +1 -0
- package/dist/Auth/authProviders/setOAuthProviders.d.ts +5 -0
- package/dist/Auth/authProviders/setOAuthProviders.d.ts.map +1 -0
- package/dist/Auth/authProviders/setOAuthProviders.js +78 -0
- package/dist/Auth/authProviders/setOAuthProviders.js.map +1 -0
- package/dist/Auth/endpoints/getConfirmEmailRequestHandler.d.ts +7 -0
- package/dist/Auth/endpoints/getConfirmEmailRequestHandler.d.ts.map +1 -0
- package/dist/Auth/endpoints/getConfirmEmailRequestHandler.js +29 -0
- package/dist/Auth/endpoints/getConfirmEmailRequestHandler.js.map +1 -0
- package/dist/Auth/endpoints/getRegisterRequestHandler.d.ts +7 -0
- package/dist/Auth/endpoints/getRegisterRequestHandler.d.ts.map +1 -0
- package/dist/Auth/endpoints/getRegisterRequestHandler.js +74 -0
- package/dist/Auth/endpoints/getRegisterRequestHandler.js.map +1 -0
- package/dist/Auth/setAuthProviders.d.ts.map +1 -1
- package/dist/Auth/setAuthProviders.js +4 -74
- package/dist/Auth/setAuthProviders.js.map +1 -1
- package/dist/Auth/setupAuthRoutes.d.ts.map +1 -1
- package/dist/Auth/setupAuthRoutes.js +23 -33
- package/dist/Auth/setupAuthRoutes.js.map +1 -1
- package/dist/Auth/utils/checkDmarc.d.ts +2 -0
- package/dist/Auth/utils/checkDmarc.d.ts.map +1 -0
- package/dist/Auth/utils/checkDmarc.js +22 -0
- package/dist/Auth/utils/checkDmarc.js.map +1 -0
- package/dist/Auth/utils/getClientRequestIPsInfo.d.ts +3 -0
- package/dist/Auth/utils/getClientRequestIPsInfo.d.ts.map +1 -0
- package/dist/Auth/utils/getClientRequestIPsInfo.js +29 -0
- package/dist/Auth/utils/getClientRequestIPsInfo.js.map +1 -0
- package/dist/Auth/utils/getReturnUrl.d.ts +3 -0
- package/dist/Auth/utils/getReturnUrl.d.ts.map +1 -0
- package/dist/Auth/utils/getReturnUrl.js +15 -0
- package/dist/Auth/utils/getReturnUrl.js.map +1 -0
- package/dist/Auth/utils/getSafeReturnURL.d.ts.map +1 -0
- package/dist/Auth/utils/getSafeReturnURL.js.map +1 -0
- package/dist/DBEventsManager.d.ts.map +1 -1
- package/dist/DBEventsManager.js +4 -5
- package/dist/DBEventsManager.js.map +1 -1
- package/dist/DBSchemaBuilder.js +1 -1
- package/dist/DBSchemaBuilder.js.map +1 -1
- package/dist/DboBuilder/DboBuilder.d.ts +0 -1
- package/dist/DboBuilder/DboBuilder.d.ts.map +1 -1
- package/dist/DboBuilder/DboBuilder.js +3 -12
- package/dist/DboBuilder/DboBuilder.js.map +1 -1
- package/dist/DboBuilder/DboBuilderTypes.d.ts +4 -4
- package/dist/DboBuilder/DboBuilderTypes.d.ts.map +1 -1
- package/dist/DboBuilder/DboBuilderTypes.js.map +1 -1
- package/dist/DboBuilder/QueryBuilder/Functions.d.ts.map +1 -1
- package/dist/DboBuilder/QueryBuilder/Functions.js +38 -76
- package/dist/DboBuilder/QueryBuilder/Functions.js.map +1 -1
- package/dist/DboBuilder/QueryBuilder/QueryBuilder.d.ts.map +1 -1
- package/dist/DboBuilder/QueryBuilder/QueryBuilder.js +4 -12
- package/dist/DboBuilder/QueryBuilder/QueryBuilder.js.map +1 -1
- package/dist/DboBuilder/QueryBuilder/getNewQuery.d.ts.map +1 -1
- package/dist/DboBuilder/QueryBuilder/getNewQuery.js +23 -33
- package/dist/DboBuilder/QueryBuilder/getNewQuery.js.map +1 -1
- package/dist/DboBuilder/QueryBuilder/getSelectQuery.d.ts +1 -1
- package/dist/DboBuilder/QueryBuilder/getSelectQuery.d.ts.map +1 -1
- package/dist/DboBuilder/QueryBuilder/getSelectQuery.js +6 -6
- package/dist/DboBuilder/QueryBuilder/getSelectQuery.js.map +1 -1
- package/dist/DboBuilder/QueryStreamer.d.ts.map +1 -1
- package/dist/DboBuilder/QueryStreamer.js +13 -19
- package/dist/DboBuilder/QueryStreamer.js.map +1 -1
- package/dist/DboBuilder/TableHandler/DataValidator.d.ts +1 -1
- package/dist/DboBuilder/TableHandler/DataValidator.d.ts.map +1 -1
- package/dist/DboBuilder/TableHandler/DataValidator.js +7 -16
- package/dist/DboBuilder/TableHandler/DataValidator.js.map +1 -1
- package/dist/DboBuilder/TableHandler/TableHandler.d.ts.map +1 -1
- package/dist/DboBuilder/TableHandler/TableHandler.js +7 -5
- package/dist/DboBuilder/TableHandler/TableHandler.js.map +1 -1
- package/dist/DboBuilder/TableHandler/delete.d.ts.map +1 -1
- package/dist/DboBuilder/TableHandler/delete.js +5 -8
- package/dist/DboBuilder/TableHandler/delete.js.map +1 -1
- package/dist/DboBuilder/TableHandler/insert.d.ts.map +1 -1
- package/dist/DboBuilder/TableHandler/insert.js +10 -15
- package/dist/DboBuilder/TableHandler/insert.js.map +1 -1
- package/dist/DboBuilder/TableHandler/insertTest.js +1 -1
- package/dist/DboBuilder/TableHandler/insertTest.js.map +1 -1
- package/dist/DboBuilder/TableHandler/runInsertUpdateQuery.d.ts.map +1 -1
- package/dist/DboBuilder/TableHandler/runInsertUpdateQuery.js +1 -1
- package/dist/DboBuilder/TableHandler/runInsertUpdateQuery.js.map +1 -1
- package/dist/DboBuilder/TableHandler/update.d.ts.map +1 -1
- package/dist/DboBuilder/TableHandler/update.js +5 -9
- package/dist/DboBuilder/TableHandler/update.js.map +1 -1
- package/dist/DboBuilder/TableHandler/updateFile.d.ts +1 -1
- package/dist/DboBuilder/TableHandler/updateFile.d.ts.map +1 -1
- package/dist/DboBuilder/TableHandler/updateFile.js +7 -9
- package/dist/DboBuilder/TableHandler/updateFile.js.map +1 -1
- package/dist/DboBuilder/TableHandler/upsert.d.ts.map +1 -1
- package/dist/DboBuilder/TableHandler/upsert.js +1 -1
- package/dist/DboBuilder/TableHandler/upsert.js.map +1 -1
- package/dist/DboBuilder/ViewHandler/ViewHandler.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler/ViewHandler.js +11 -13
- package/dist/DboBuilder/ViewHandler/ViewHandler.js.map +1 -1
- package/dist/DboBuilder/ViewHandler/count.js +1 -1
- package/dist/DboBuilder/ViewHandler/count.js.map +1 -1
- package/dist/DboBuilder/ViewHandler/find.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler/find.js +20 -27
- package/dist/DboBuilder/ViewHandler/find.js.map +1 -1
- package/dist/DboBuilder/ViewHandler/getExistsCondition.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler/getExistsCondition.js +4 -10
- package/dist/DboBuilder/ViewHandler/getExistsCondition.js.map +1 -1
- package/dist/DboBuilder/ViewHandler/getInfo.js +2 -2
- package/dist/DboBuilder/ViewHandler/getInfo.js.map +1 -1
- package/dist/DboBuilder/ViewHandler/getTableJoinQuery.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler/getTableJoinQuery.js +6 -22
- package/dist/DboBuilder/ViewHandler/getTableJoinQuery.js.map +1 -1
- package/dist/DboBuilder/ViewHandler/parseFieldFilter.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler/parseFieldFilter.js +6 -10
- package/dist/DboBuilder/ViewHandler/parseFieldFilter.js.map +1 -1
- package/dist/DboBuilder/ViewHandler/parseJoinPath.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler/parseJoinPath.js +8 -11
- package/dist/DboBuilder/ViewHandler/parseJoinPath.js.map +1 -1
- package/dist/DboBuilder/ViewHandler/prepareSortItems.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler/prepareSortItems.js +7 -12
- package/dist/DboBuilder/ViewHandler/prepareSortItems.js.map +1 -1
- package/dist/DboBuilder/ViewHandler/prepareWhere.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler/prepareWhere.js +6 -10
- package/dist/DboBuilder/ViewHandler/prepareWhere.js.map +1 -1
- package/dist/DboBuilder/dboBuilderUtils.d.ts.map +1 -1
- package/dist/DboBuilder/dboBuilderUtils.js +8 -23
- package/dist/DboBuilder/dboBuilderUtils.js.map +1 -1
- package/dist/DboBuilder/getColumns.d.ts.map +1 -1
- package/dist/DboBuilder/getColumns.js +19 -26
- package/dist/DboBuilder/getColumns.js.map +1 -1
- package/dist/DboBuilder/getCondition.d.ts.map +1 -1
- package/dist/DboBuilder/getCondition.js +7 -9
- package/dist/DboBuilder/getCondition.js.map +1 -1
- package/dist/DboBuilder/getSubscribeRelatedTables.js +2 -2
- package/dist/DboBuilder/getSubscribeRelatedTables.js.map +1 -1
- package/dist/DboBuilder/getTablesForSchemaPostgresSQL.d.ts.map +1 -1
- package/dist/DboBuilder/getTablesForSchemaPostgresSQL.js +14 -15
- package/dist/DboBuilder/getTablesForSchemaPostgresSQL.js.map +1 -1
- package/dist/DboBuilder/insertNestedRecords.d.ts.map +1 -1
- package/dist/DboBuilder/insertNestedRecords.js +26 -40
- package/dist/DboBuilder/insertNestedRecords.js.map +1 -1
- package/dist/DboBuilder/parseUpdateRules.js +1 -1
- package/dist/DboBuilder/parseUpdateRules.js.map +1 -1
- package/dist/DboBuilder/prepareShortestJoinPaths.d.ts.map +1 -1
- package/dist/DboBuilder/prepareShortestJoinPaths.js +12 -18
- package/dist/DboBuilder/prepareShortestJoinPaths.js.map +1 -1
- package/dist/DboBuilder/runSQL.d.ts +1 -1
- package/dist/DboBuilder/runSQL.d.ts.map +1 -1
- package/dist/DboBuilder/runSQL.js +14 -27
- package/dist/DboBuilder/runSQL.js.map +1 -1
- package/dist/DboBuilder/uploadFile.d.ts +1 -1
- package/dist/DboBuilder/uploadFile.d.ts.map +1 -1
- package/dist/DboBuilder/uploadFile.js +4 -11
- package/dist/DboBuilder/uploadFile.js.map +1 -1
- package/dist/FileManager/FileManager.d.ts.map +1 -1
- package/dist/FileManager/FileManager.js +11 -13
- package/dist/FileManager/FileManager.js.map +1 -1
- package/dist/FileManager/initFileManager.d.ts.map +1 -1
- package/dist/FileManager/initFileManager.js +60 -62
- package/dist/FileManager/initFileManager.js.map +1 -1
- package/dist/FileManager/uploadStream.js +2 -2
- package/dist/FileManager/uploadStream.js.map +1 -1
- package/dist/Filtering.d.ts +1 -1
- package/dist/Filtering.d.ts.map +1 -1
- package/dist/Filtering.js +12 -35
- package/dist/Filtering.js.map +1 -1
- package/dist/JSONBValidation/validation.d.ts.map +1 -1
- package/dist/JSONBValidation/validation.js +20 -26
- package/dist/JSONBValidation/validation.js.map +1 -1
- package/dist/Logging.d.ts +1 -0
- package/dist/Logging.d.ts.map +1 -1
- package/dist/PostgresNotifListenManager.d.ts.map +1 -1
- package/dist/PostgresNotifListenManager.js +1 -5
- package/dist/PostgresNotifListenManager.js.map +1 -1
- package/dist/Prostgles.d.ts +1 -1
- package/dist/Prostgles.d.ts.map +1 -1
- package/dist/Prostgles.js +18 -33
- package/dist/Prostgles.js.map +1 -1
- package/dist/PubSubManager/PubSubManager.d.ts.map +1 -1
- package/dist/PubSubManager/PubSubManager.js +8 -13
- package/dist/PubSubManager/PubSubManager.js.map +1 -1
- package/dist/PubSubManager/addSub.d.ts.map +1 -1
- package/dist/PubSubManager/addSub.js +1 -1
- package/dist/PubSubManager/addSub.js.map +1 -1
- package/dist/PubSubManager/addSync.d.ts.map +1 -1
- package/dist/PubSubManager/addSync.js +4 -7
- package/dist/PubSubManager/addSync.js.map +1 -1
- package/dist/PubSubManager/getCreatePubSubManagerError.js +6 -6
- package/dist/PubSubManager/getCreatePubSubManagerError.js.map +1 -1
- package/dist/PubSubManager/initPubSubManager.d.ts.map +1 -1
- package/dist/PubSubManager/initPubSubManager.js +2 -3
- package/dist/PubSubManager/initPubSubManager.js.map +1 -1
- package/dist/PubSubManager/pushSubData.d.ts.map +1 -1
- package/dist/PubSubManager/pushSubData.js +0 -2
- package/dist/PubSubManager/pushSubData.js.map +1 -1
- package/dist/PublishParser/PublishParser.d.ts.map +1 -1
- package/dist/PublishParser/PublishParser.js +8 -13
- package/dist/PublishParser/PublishParser.js.map +1 -1
- package/dist/PublishParser/getFileTableRules.js +1 -1
- package/dist/PublishParser/getFileTableRules.js.map +1 -1
- package/dist/PublishParser/getSchemaFromPublish.d.ts.map +1 -1
- package/dist/PublishParser/getSchemaFromPublish.js +6 -13
- package/dist/PublishParser/getSchemaFromPublish.js.map +1 -1
- package/dist/PublishParser/getTableRulesWithoutFileTable.d.ts.map +1 -1
- package/dist/PublishParser/getTableRulesWithoutFileTable.js +14 -19
- package/dist/PublishParser/getTableRulesWithoutFileTable.js.map +1 -1
- package/dist/RestApi.d.ts +1 -1
- package/dist/RestApi.d.ts.map +1 -1
- package/dist/RestApi.js +2 -2
- package/dist/RestApi.js.map +1 -1
- package/dist/SchemaWatch/SchemaWatch.d.ts.map +1 -1
- package/dist/SchemaWatch/SchemaWatch.js +2 -2
- package/dist/SchemaWatch/SchemaWatch.js.map +1 -1
- package/dist/SyncReplication.d.ts.map +1 -1
- package/dist/SyncReplication.js +31 -41
- package/dist/SyncReplication.js.map +1 -1
- package/dist/TableConfig/TableConfig.d.ts.map +1 -1
- package/dist/TableConfig/TableConfig.js +7 -9
- package/dist/TableConfig/TableConfig.js.map +1 -1
- package/dist/TableConfig/getConstraintDefinitionQueries.d.ts.map +1 -1
- package/dist/TableConfig/getConstraintDefinitionQueries.js +1 -6
- package/dist/TableConfig/getConstraintDefinitionQueries.js.map +1 -1
- package/dist/TableConfig/getFutureTableSchema.d.ts.map +1 -1
- package/dist/TableConfig/getFutureTableSchema.js +16 -28
- package/dist/TableConfig/getFutureTableSchema.js.map +1 -1
- package/dist/TableConfig/getTableColumnQueries.d.ts.map +1 -1
- package/dist/TableConfig/getTableColumnQueries.js +5 -9
- package/dist/TableConfig/getTableColumnQueries.js.map +1 -1
- package/dist/TableConfig/initTableConfig.d.ts.map +1 -1
- package/dist/TableConfig/initTableConfig.js +22 -25
- package/dist/TableConfig/initTableConfig.js.map +1 -1
- package/dist/initProstgles.js +1 -1
- package/dist/initProstgles.js.map +1 -1
- package/dist/onSocketConnected.d.ts.map +1 -1
- package/dist/onSocketConnected.js +2 -4
- package/dist/onSocketConnected.js.map +1 -1
- package/dist/runClientRequest.d.ts.map +1 -1
- package/dist/runClientRequest.js +14 -13
- package/dist/runClientRequest.js.map +1 -1
- package/lib/Auth/AuthHandler.ts +117 -137
- package/lib/Auth/AuthTypes.ts +97 -81
- package/lib/Auth/authProviders/setEmailProvider.ts +29 -0
- package/lib/Auth/authProviders/setOAuthProviders.ts +97 -0
- package/lib/Auth/endpoints/getConfirmEmailRequestHandler.ts +39 -0
- package/lib/Auth/endpoints/getRegisterRequestHandler.ts +83 -0
- package/lib/Auth/setAuthProviders.ts +8 -111
- package/lib/Auth/setupAuthRoutes.ts +105 -148
- package/lib/Auth/utils/checkDmarc.ts +19 -0
- package/lib/Auth/utils/getClientRequestIPsInfo.ts +25 -0
- package/lib/Auth/utils/getReturnUrl.ts +13 -0
- package/lib/DBEventsManager.ts +12 -26
- package/lib/DBSchemaBuilder.ts +1 -1
- package/lib/DboBuilder/DboBuilder.ts +23 -52
- package/lib/DboBuilder/DboBuilderTypes.ts +9 -23
- package/lib/DboBuilder/QueryBuilder/Functions.ts +86 -188
- package/lib/DboBuilder/QueryBuilder/QueryBuilder.ts +11 -36
- package/lib/DboBuilder/QueryBuilder/getNewQuery.ts +102 -129
- package/lib/DboBuilder/QueryBuilder/getSelectQuery.ts +14 -27
- package/lib/DboBuilder/QueryStreamer.ts +26 -57
- package/lib/DboBuilder/TableHandler/DataValidator.ts +58 -90
- package/lib/DboBuilder/TableHandler/TableHandler.ts +19 -45
- package/lib/DboBuilder/TableHandler/delete.ts +9 -18
- package/lib/DboBuilder/TableHandler/insert.ts +18 -31
- package/lib/DboBuilder/TableHandler/insertTest.ts +1 -1
- package/lib/DboBuilder/TableHandler/runInsertUpdateQuery.ts +8 -19
- package/lib/DboBuilder/TableHandler/update.ts +17 -46
- package/lib/DboBuilder/TableHandler/updateFile.ts +18 -21
- package/lib/DboBuilder/TableHandler/upsert.ts +7 -24
- package/lib/DboBuilder/ViewHandler/ViewHandler.ts +13 -15
- package/lib/DboBuilder/ViewHandler/count.ts +1 -1
- package/lib/DboBuilder/ViewHandler/find.ts +28 -35
- package/lib/DboBuilder/ViewHandler/getExistsCondition.ts +8 -30
- package/lib/DboBuilder/ViewHandler/getInfo.ts +2 -2
- package/lib/DboBuilder/ViewHandler/getTableJoinQuery.ts +16 -32
- package/lib/DboBuilder/ViewHandler/parseFieldFilter.ts +9 -16
- package/lib/DboBuilder/ViewHandler/parseJoinPath.ts +26 -44
- package/lib/DboBuilder/ViewHandler/prepareSortItems.ts +58 -82
- package/lib/DboBuilder/ViewHandler/prepareWhere.ts +14 -27
- package/lib/DboBuilder/dboBuilderUtils.ts +19 -46
- package/lib/DboBuilder/getColumns.ts +24 -46
- package/lib/DboBuilder/getCondition.ts +18 -30
- package/lib/DboBuilder/getSubscribeRelatedTables.ts +2 -2
- package/lib/DboBuilder/getTablesForSchemaPostgresSQL.ts +44 -62
- package/lib/DboBuilder/insertNestedRecords.ts +67 -135
- package/lib/DboBuilder/parseUpdateRules.ts +1 -1
- package/lib/DboBuilder/prepareShortestJoinPaths.ts +23 -58
- package/lib/DboBuilder/runSQL.ts +41 -76
- package/lib/DboBuilder/uploadFile.ts +26 -37
- package/lib/FileManager/FileManager.ts +27 -58
- package/lib/FileManager/initFileManager.ts +68 -76
- package/lib/FileManager/uploadStream.ts +2 -2
- package/lib/Filtering.ts +30 -87
- package/lib/JSONBValidation/validation.ts +36 -75
- package/lib/Logging.ts +1 -1
- package/lib/PostgresNotifListenManager.ts +11 -35
- package/lib/Prostgles.ts +42 -100
- package/lib/PubSubManager/PubSubManager.ts +30 -66
- package/lib/PubSubManager/addSub.ts +11 -18
- package/lib/PubSubManager/addSync.ts +5 -12
- package/lib/PubSubManager/getCreatePubSubManagerError.ts +9 -9
- package/lib/PubSubManager/initPubSubManager.ts +7 -13
- package/lib/PubSubManager/pushSubData.ts +1 -7
- package/lib/PublishParser/PublishParser.ts +8 -12
- package/lib/PublishParser/getFileTableRules.ts +1 -1
- package/lib/PublishParser/getSchemaFromPublish.ts +26 -42
- package/lib/PublishParser/getTableRulesWithoutFileTable.ts +22 -37
- package/lib/RestApi.ts +4 -12
- package/lib/SchemaWatch/SchemaWatch.ts +11 -24
- package/lib/SyncReplication.ts +96 -190
- package/lib/TableConfig/TableConfig.ts +16 -38
- package/lib/TableConfig/getConstraintDefinitionQueries.ts +2 -8
- package/lib/TableConfig/getFutureTableSchema.ts +20 -34
- package/lib/TableConfig/getTableColumnQueries.ts +13 -35
- package/lib/TableConfig/initTableConfig.ts +40 -64
- package/lib/initProstgles.ts +1 -1
- package/lib/onSocketConnected.ts +8 -12
- package/lib/runClientRequest.ts +31 -54
- package/package.json +2 -2
- package/dist/Auth/getSafeReturnURL.d.ts.map +0 -1
- package/dist/Auth/getSafeReturnURL.js.map +0 -1
- package/dist/Auth/setEmailProvider.d.ts.map +0 -1
- package/dist/Auth/setEmailProvider.js +0 -133
- package/dist/Auth/setEmailProvider.js.map +0 -1
- package/dist/DboBuilder/runTransaction.d.ts +0 -9
- package/dist/DboBuilder/runTransaction.d.ts.map +0 -1
- package/dist/DboBuilder/runTransaction.js +0 -49
- package/dist/DboBuilder/runTransaction.js.map +0 -1
- package/lib/Auth/setEmailProvider.ts +0 -132
- package/lib/DboBuilder/QueryBuilder/prepareHaving.ts +0 -27
- package/lib/DboBuilder/runTransaction.ts +0 -61
- package/lib/SchemaWatch/createSchemaWatchEventTrigger.ts +0 -3
- /package/dist/Auth/{getSafeReturnURL.d.ts → utils/getSafeReturnURL.d.ts} +0 -0
- /package/dist/Auth/{getSafeReturnURL.js → utils/getSafeReturnURL.js} +0 -0
- /package/lib/Auth/{getSafeReturnURL.ts → utils/getSafeReturnURL.ts} +0 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ViewHandler.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/ViewHandler.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ViewHandler.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/ViewHandler.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@ async function count(_filter, selectParams, _param3_unused, table_rules, localPa
|
|
|
7
7
|
const { limit: _limit, ...selectParamsWithoutLimit } = selectParams ?? {};
|
|
8
8
|
const start = Date.now();
|
|
9
9
|
try {
|
|
10
|
-
const result = await this.find(filter, { select: selectParamsWithoutLimit
|
|
10
|
+
const result = await this.find(filter, { select: selectParamsWithoutLimit.select ?? "", limit: 0 }, undefined, table_rules, localParams).then(async (_allowed) => {
|
|
11
11
|
const findQuery = (await this.find(filter, selectParamsWithoutLimit, undefined, table_rules, { ...localParams, returnQuery: "noRLS", bypassLimit: true }));
|
|
12
12
|
const query = [
|
|
13
13
|
(0, dboBuilderUtils_1.withUserRLS)(localParams, ""),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"count.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/count.ts"],"names":[],"mappings":";;;AAGA,wDAI4B;AAGrB,KAAK,UAAU,KAAK,CAEzB,OAAgB,EAChB,YAA2B,EAC3B,cAA0B,EAC1B,WAAuB,EACvB,WAAyB;IAEzB,MAAM,MAAM,GAAG,OAAO,IAAI,EAAE,CAAC;IAC7B,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,wBAAwB,EAAE,GAAG,YAAY,IAAI,EAAE,CAAC;IAC1E,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACzB,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAC5B,MAAM,EACN,EAAE,MAAM,EAAE,wBAAwB,
|
|
1
|
+
{"version":3,"file":"count.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/count.ts"],"names":[],"mappings":";;;AAGA,wDAI4B;AAGrB,KAAK,UAAU,KAAK,CAEzB,OAAgB,EAChB,YAA2B,EAC3B,cAA0B,EAC1B,WAAuB,EACvB,WAAyB;IAEzB,MAAM,MAAM,GAAG,OAAO,IAAI,EAAE,CAAC;IAC7B,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,wBAAwB,EAAE,GAAG,YAAY,IAAI,EAAE,CAAC;IAC1E,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACzB,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAC5B,MAAM,EACN,EAAE,MAAM,EAAE,wBAAwB,CAAC,MAAM,IAAI,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,EAC3D,SAAS,EACT,WAAW,EACX,WAAW,CACZ,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE;YACxB,MAAM,SAAS,GAAG,CAAC,MAAM,IAAI,CAAC,IAAI,CAChC,MAAM,EACN,wBAAwB,EACxB,SAAS,EACT,WAAW,EACX,EAAE,GAAG,WAAW,EAAE,WAAW,EAAE,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,CAC5D,CAAsB,CAAC;YACxB,MAAM,KAAK,GAAG;gBACZ,IAAA,6BAAW,EAAC,WAAW,EAAE,EAAE,CAAC;gBAC5B,iBAAiB;gBACjB,QAAQ;gBACR,SAAS;gBACT,KAAK;aACN,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACb,MAAM,OAAO,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC,EAAE,CAAC;YACtC,OAAO,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC;QACxD,CAAC,CAAC,CAAC;QAEH,MAAM,IAAI,CAAC,IAAI,CAAC;YACd,OAAO,EAAE,OAAO;YAChB,WAAW;YACX,IAAI,EAAE,EAAE,MAAM,EAAE;YAChB,QAAQ,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK;SAC7B,CAAC,CAAC;QACH,OAAO,MAAM,CAAC;IAChB,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,IAAI,CAAC,IAAI,CAAC;YACd,OAAO,EAAE,OAAO;YAChB,WAAW;YACX,IAAI,EAAE,EAAE,MAAM,EAAE;YAChB,QAAQ,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK;YAC5B,KAAK,EAAE,IAAA,kCAAgB,EAAC,CAAC,CAAC;SAC3B,CAAC,CAAC;QACH,MAAM,IAAA,qDAAmC,EAAC,CAAC,EAAE;YAC3C,IAAI,EAAE,aAAa;YACnB,WAAW;YACX,IAAI,EAAE,IAAI;SACX,CAAC,CAAC;IACL,CAAC;AACH,CAAC;AA1DD,sBA0DC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"find.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/find.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAY,MAAM,iBAAiB,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAC9D,OAAO,EACL,MAAM,EACN,WAAW,EAKZ,MAAM,eAAe,CAAC;AAGvB,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAExD,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,eAAO,MAAM,IAAI,SACT,WAAW,WACR,MAAM,iBACA,YAAY,MACvB,SAAS,eACA,SAAS,gBACR,WAAW,KACxB,QAAQ,GAAG,EAAE,
|
|
1
|
+
{"version":3,"file":"find.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/find.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAY,MAAM,iBAAiB,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAC9D,OAAO,EACL,MAAM,EACN,WAAW,EAKZ,MAAM,eAAe,CAAC;AAGvB,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAExD,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,eAAO,MAAM,IAAI,SACT,WAAW,WACR,MAAM,iBACA,YAAY,MACvB,SAAS,eACA,SAAS,gBACR,WAAW,KACxB,QAAQ,GAAG,EAAE,CA+If,CAAC;AAEF,KAAK,sBAAsB,GAAG;IAC5B,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,EAAE,YAAY,CAAC,YAAY,CAAC,CAAC;IACvC,OAAO,EAAE,WAAW,GAAG,YAAY,CAAC;IACpC,WAAW,EAAE,WAAW,GAAG,SAAS,CAAC;IACrC,QAAQ,EAAE,QAAQ,GAAG,SAAS,CAAC;CAChC,CAAC;AAEF,eAAO,MAAM,kBAAkB,mFAO5B,sBAAsB,iBA6CxB,CAAC"}
|
|
@@ -8,9 +8,7 @@ const getSelectQuery_1 = require("../QueryBuilder/getSelectQuery");
|
|
|
8
8
|
const runSQL_1 = require("../runSQL");
|
|
9
9
|
const find = async function (filter, selectParams, _, tableRules, localParams) {
|
|
10
10
|
const start = Date.now();
|
|
11
|
-
const command = selectParams?.limit === 1 && selectParams
|
|
12
|
-
? "findOne"
|
|
13
|
-
: "find";
|
|
11
|
+
const command = selectParams?.limit === 1 && selectParams.returnType === "row" ? "findOne" : "find";
|
|
14
12
|
try {
|
|
15
13
|
filter = filter || {};
|
|
16
14
|
const allowedReturnTypes = Object.keys({
|
|
@@ -39,7 +37,7 @@ const find = async function (filter, selectParams, _, tableRules, localParams) {
|
|
|
39
37
|
having: 1,
|
|
40
38
|
});
|
|
41
39
|
const invalidParams = Object.keys(selectParams).filter((k) => !validParamNames.includes(k));
|
|
42
|
-
if (invalidParams
|
|
40
|
+
if (invalidParams.length)
|
|
43
41
|
throw ("Invalid params: " +
|
|
44
42
|
invalidParams.join(", ") +
|
|
45
43
|
" \n Expecting: " +
|
|
@@ -60,36 +58,35 @@ const find = async function (filter, selectParams, _, tableRules, localParams) {
|
|
|
60
58
|
throw ` invalid ${this.name}.select rule -> fields (required) setting missing.\nExpecting any of: "*" | { col_name: false } | { col1: true, col2: true }`;
|
|
61
59
|
}
|
|
62
60
|
if (maxLimit && !Number.isInteger(maxLimit)) {
|
|
63
|
-
throw (` invalid publish.${this.name}.select.maxLimit -> expecting integer but got ` +
|
|
64
|
-
maxLimit);
|
|
61
|
+
throw (` invalid publish.${this.name}.select.maxLimit -> expecting integer but got ` + maxLimit);
|
|
65
62
|
}
|
|
66
63
|
}
|
|
67
64
|
const _selectParams = selectParams ?? {};
|
|
68
|
-
const selectParamsLimitCheck = localParams?.bypassLimit && !Number.isFinite(_selectParams.limit)
|
|
69
|
-
|
|
65
|
+
const selectParamsLimitCheck = localParams?.bypassLimit && !Number.isFinite(_selectParams.limit) ?
|
|
66
|
+
{ ..._selectParams, limit: null }
|
|
70
67
|
: { limit: 1000, ..._selectParams };
|
|
71
68
|
const newQuery = await (0, getNewQuery_1.getNewQuery)(this, filter, selectParamsLimitCheck, _, tableRules, localParams);
|
|
72
|
-
const queryWithoutRLS = (0, getSelectQuery_1.getSelectQuery)(this, newQuery, undefined, !!selectParamsLimitCheck
|
|
69
|
+
const queryWithoutRLS = (0, getSelectQuery_1.getSelectQuery)(this, newQuery, undefined, !!selectParamsLimitCheck.groupBy);
|
|
73
70
|
const queryWithRLS = (0, DboBuilder_1.withUserRLS)(localParams, queryWithoutRLS);
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
}
|
|
71
|
+
// THIS HANGS TESTS
|
|
72
|
+
// if (testRule) {
|
|
73
|
+
// try {
|
|
74
|
+
// await this.db.any(withUserRLS(localParams, "EXPLAIN " + queryWithRLS));
|
|
75
|
+
// return [];
|
|
76
|
+
// } catch (e) {
|
|
77
|
+
// console.error(e);
|
|
78
|
+
// throw `Internal error: publish config is not valid for publish.${this.name}.select `;
|
|
79
|
+
// }
|
|
80
|
+
// }
|
|
84
81
|
/** Used for subscribe */
|
|
85
82
|
if (localParams?.returnNewQuery)
|
|
86
83
|
return newQuery;
|
|
87
84
|
if (localParams?.returnQuery) {
|
|
88
|
-
if (localParams
|
|
85
|
+
if (localParams.returnQuery === "where-condition") {
|
|
89
86
|
return newQuery.whereOpts.condition;
|
|
90
87
|
}
|
|
91
|
-
return (localParams
|
|
92
|
-
|
|
88
|
+
return (localParams.returnQuery === "noRLS" ?
|
|
89
|
+
queryWithoutRLS
|
|
93
90
|
: queryWithRLS);
|
|
94
91
|
}
|
|
95
92
|
const result = await (0, exports.runQueryReturnType)({
|
|
@@ -126,11 +123,7 @@ const find = async function (filter, selectParams, _, tableRules, localParams) {
|
|
|
126
123
|
exports.find = find;
|
|
127
124
|
const runQueryReturnType = async ({ newQuery, handler, localParams, queryWithRLS, queryWithoutRLS, returnType, }) => {
|
|
128
125
|
const query = queryWithRLS;
|
|
129
|
-
const sqlTypes = [
|
|
130
|
-
"statement",
|
|
131
|
-
"statement-no-rls",
|
|
132
|
-
"statement-where",
|
|
133
|
-
];
|
|
126
|
+
const sqlTypes = ["statement", "statement-no-rls", "statement-where"];
|
|
134
127
|
if (!returnType || returnType === "values") {
|
|
135
128
|
return handler.dbHandler
|
|
136
129
|
.any(query)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"find.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/find.ts"],"names":[],"mappings":";;;AAAA,qDAAyD;AAEzD,8CAOuB;AACvB,6DAA0D;AAC1D,mEAAgE;AAEhE,sCAAsC;AAI/B,MAAM,IAAI,GAAG,KAAK,WAEvB,MAAe,EACf,YAA2B,EAC3B,CAAa,EACb,UAAsB,EACtB,WAAyB;IAEzB,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACzB,MAAM,OAAO,GACX,YAAY,EAAE,KAAK,KAAK,CAAC,IAAI,YAAY,
|
|
1
|
+
{"version":3,"file":"find.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/find.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getExistsCondition.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/getExistsCondition.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"getExistsCondition.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/getExistsCondition.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAK5C,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,WAAW,EACjB,OAAO,EAAE,kBAAkB,EAC3B,WAAW,EAAE,WAAW,GAAG,SAAS,GACnC,OAAO,CAAC,MAAM,CAAC,CAkEjB"}
|
|
@@ -8,8 +8,7 @@ async function getExistsCondition(eConfig, localParams) {
|
|
|
8
8
|
const isNotExists = ["$notExists", "$notExistsJoined"].includes(eConfig.existType);
|
|
9
9
|
const { targetTableFilter } = eConfig;
|
|
10
10
|
/* Nested $exists is not allowed */
|
|
11
|
-
if (targetTableFilter
|
|
12
|
-
Object.keys(targetTableFilter).find((fk) => prostgles_types_1.EXISTS_KEYS.includes(fk))) {
|
|
11
|
+
if (Object.keys(targetTableFilter).find((fk) => prostgles_types_1.EXISTS_KEYS.includes(fk))) {
|
|
13
12
|
throw {
|
|
14
13
|
stack: ["prepareExistCondition()"],
|
|
15
14
|
message: "Nested exists dissallowed",
|
|
@@ -17,16 +16,11 @@ async function getExistsCondition(eConfig, localParams) {
|
|
|
17
16
|
}
|
|
18
17
|
let t2Rules = undefined, forcedFilter, filterFields, tableAlias;
|
|
19
18
|
/* Check if allowed to view data - forcedFilters will bypass this check through isForcedFilterBypass */
|
|
20
|
-
if (localParams?.isRemoteRequest &&
|
|
21
|
-
!localParams?.socket &&
|
|
22
|
-
!localParams?.httpReq) {
|
|
19
|
+
if (localParams?.isRemoteRequest && !localParams.socket && !localParams.httpReq) {
|
|
23
20
|
throw "Unexpected: localParams isRemoteRequest and missing socket/httpReq: ";
|
|
24
21
|
}
|
|
25
|
-
const targetTable = eConfig.isJoined
|
|
26
|
-
|
|
27
|
-
: eConfig.targetTable;
|
|
28
|
-
if ((localParams?.socket || localParams?.httpReq) &&
|
|
29
|
-
this.dboBuilder.publishParser) {
|
|
22
|
+
const targetTable = eConfig.isJoined ? eConfig.parsedPath.at(-1).table : eConfig.targetTable;
|
|
23
|
+
if ((localParams?.socket || localParams?.httpReq) && this.dboBuilder.publishParser) {
|
|
30
24
|
t2Rules = (await this.dboBuilder.publishParser.getValidatedRequestRuleWusr({
|
|
31
25
|
tableName: targetTable,
|
|
32
26
|
command: "find",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getExistsCondition.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/getExistsCondition.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"getExistsCondition.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/getExistsCondition.ts"],"names":[],"mappings":";;;AAAA,qDAA0F;AAK1F,2DAAwD;AAEjD,KAAK,UAAU,kBAAkB,CAEtC,OAA2B,EAC3B,WAAoC;IAEpC,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC;IAC5B,MAAM,WAAW,GAAG,CAAC,YAAY,EAAE,kBAAkB,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAEnF,MAAM,EAAE,iBAAiB,EAAE,GAAG,OAAO,CAAC;IAEtC,mCAAmC;IACnC,IAAI,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,6BAAW,CAAC,QAAQ,CAAC,EAAgB,CAAC,CAAC,EAAE,CAAC;QACxF,MAAM;YACJ,KAAK,EAAE,CAAC,yBAAyB,CAAC;YAClC,OAAO,EAAE,2BAA2B;SACrC,CAAC;IACJ,CAAC;IAED,IAAI,OAAO,GAA0B,SAAS,EAC5C,YAAmC,EACnC,YAAqC,EACrC,UAAU,CAAC;IAEb,uGAAuG;IACvG,IAAI,WAAW,EAAE,eAAe,IAAI,CAAC,WAAW,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;QAChF,MAAM,sEAAsE,CAAC;IAC/E,CAAC;IACD,MAAM,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,CAAE,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC;IAC9F,IAAI,CAAC,WAAW,EAAE,MAAM,IAAI,WAAW,EAAE,OAAO,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,aAAa,EAAE,CAAC;QACnF,OAAO,GAAG,CAAC,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,2BAA2B,CAAC;YACzE,SAAS,EAAE,WAAW;YACtB,OAAO,EAAE,MAAM;YACf,WAAW;SACZ,CAAC,CAA0B,CAAC;QAE7B,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM;YAAE,MAAM,aAAa,CAAC;QACrD,CAAC,EAAE,YAAY,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACpD,CAAC;IAED,MAAM,YAAY,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,WAAW,CAAiB,CAAC;IACtE,MAAM,UAAU,GAAG,CACjB,MAAM,YAAY,CAAC,YAAY,CAAC;QAC9B,MAAM,EAAE,SAAS;QACjB,MAAM,EAAE,iBAAiB;QACzB,YAAY;QACZ,YAAY;QACZ,QAAQ,EAAE,KAAK;QACf,UAAU;QACV,WAAW;QACX,SAAS,EAAE,OAAO;KACnB,CAAC,CACH,CAAC,KAAK,CAAC;IAER,IAAI,UAAU,GAAG;QACf,UAAU;QACV,QAAQ,IAAA,wBAAM,EAAC,WAAW,CAAC,EAAE;QAC7B,GAAG,UAAU,CAAC,CAAC,CAAC,SAAS,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE;KAC7C,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAEb,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;QACrB,MAAM,EAAE,KAAK,EAAE,GAAG,IAAA,qCAAiB,EAAC;YAClC,IAAI,EAAE,OAAO,CAAC,UAAU;YACxB,cAAc,EAAE,SAAS;YACzB,IAAI,EAAE,QAAQ;YACd,UAAU;SACX,CAAC,CAAC;QACH,UAAU,GAAG,KAAK,CAAC;IACrB,CAAC;IAED,OAAO,GAAG,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,eAAe,UAAU,OAAO,CAAC;AACxE,CAAC;AAtED,gDAsEC"}
|
|
@@ -13,7 +13,7 @@ async function getInfo(lang, param2, param3, tableRules, localParams) {
|
|
|
13
13
|
});
|
|
14
14
|
throw "Not allowed";
|
|
15
15
|
}
|
|
16
|
-
const fileTableName = this.dboBuilder.prostgles
|
|
16
|
+
const fileTableName = this.dboBuilder.prostgles.opts.fileTable?.tableName;
|
|
17
17
|
await this._log({
|
|
18
18
|
command: "getInfo",
|
|
19
19
|
localParams,
|
|
@@ -24,7 +24,7 @@ async function getInfo(lang, param2, param3, tableRules, localParams) {
|
|
|
24
24
|
return {
|
|
25
25
|
oid: this.tableOrViewInfo.oid,
|
|
26
26
|
comment: this.tableOrViewInfo.comment,
|
|
27
|
-
info: this.dboBuilder.prostgles
|
|
27
|
+
info: this.dboBuilder.prostgles.tableConfigurator?.getTableInfo({
|
|
28
28
|
tableName: this.name,
|
|
29
29
|
lang,
|
|
30
30
|
}),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getInfo.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/getInfo.ts"],"names":[],"mappings":";;;AAKO,KAAK,UAAU,OAAO,CAE3B,IAAa,EACb,MAAY,EACZ,MAAY,EACZ,UAAsB,EACtB,WAAyB;IAEzB,MAAM,CAAC,GAAG,IAAI,CAAC,iBAAiB,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;IAC1D,IAAI,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;QACf,MAAM,IAAI,CAAC,IAAI,CAAC;YACd,OAAO,EAAE,SAAS;YAClB,WAAW;YACX,IAAI,EAAE,EAAE,IAAI,EAAE;YACd,QAAQ,EAAE,CAAC;YACX,KAAK,EAAE,aAAa;SACrB,CAAC,CAAC;QACH,MAAM,aAAa,CAAC;IACtB,CAAC;IAED,MAAM,aAAa,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,
|
|
1
|
+
{"version":3,"file":"getInfo.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/getInfo.ts"],"names":[],"mappings":";;;AAKO,KAAK,UAAU,OAAO,CAE3B,IAAa,EACb,MAAY,EACZ,MAAY,EACZ,UAAsB,EACtB,WAAyB;IAEzB,MAAM,CAAC,GAAG,IAAI,CAAC,iBAAiB,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;IAC1D,IAAI,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;QACf,MAAM,IAAI,CAAC,IAAI,CAAC;YACd,OAAO,EAAE,SAAS;YAClB,WAAW;YACX,IAAI,EAAE,EAAE,IAAI,EAAE;YACd,QAAQ,EAAE,CAAC;YACX,KAAK,EAAE,aAAa;SACrB,CAAC,CAAC;QACH,MAAM,aAAa,CAAC;IACtB,CAAC;IAED,MAAM,aAAa,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC;IAE1E,MAAM,IAAI,CAAC,IAAI,CAAC;QACd,OAAO,EAAE,SAAS;QAClB,WAAW;QACX,IAAI,EAAE,EAAE,IAAI,EAAE;QACd,QAAQ,EAAE,CAAC;KACZ,CAAC,CAAC;IACH,MAAM,qBAAqB,GAAG,IAAI,CAAC,gBAAgB,CACjD,UAAU,EAAE,MAAM,EAAE,MAAM,CAC3B,CAAC;IACF,OAAO;QACL,GAAG,EAAE,IAAI,CAAC,eAAe,CAAC,GAAG;QAC7B,OAAO,EAAE,IAAI,CAAC,eAAe,CAAC,OAAO;QACrC,IAAI,EAAE,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,iBAAiB,EAAE,YAAY,CAAC;YAC9D,SAAS,EAAE,IAAI,CAAC,IAAI;YACpB,IAAI;SACL,CAAC;QACF,WAAW,EAAE,CAAC,IAAI,CAAC,QAAQ;YACzB,CAAC,CAAC,SAAS;YACX,CAAC,CAAC;gBACE,oBAAoB,EAAE,UAAU,EAAE,MAAM,EAAE,oBAAoB;aAC/D;QACL,MAAM,EAAE,IAAI,CAAC,OAAO;QACpB,QAAQ,EAAE,OAAO,CACf,CAAC,IAAI,CAAC,QAAQ;YACZ,aAAa;YACb,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CACtB,CAAC,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,aAAa,CAAC,CACtD,CACJ;QACD,aAAa;QACb,YAAY,EAAE;YACZ,MAAM,EAAE,OAAO,CAAC,UAAU,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,CAAC;SAC3D;QACD;;WAEG;QACH,kBAAkB,EAAE,IAAI,CAAC,eAAe,CAAC,kBAAkB,EAAE,MAAM,CACjE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,WAAW,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CACzE;KACF,CAAC;AACJ,CAAC;AA9DD,0BA8DC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getTableJoinQuery.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/getTableJoinQuery.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEjD,KAAK,iBAAiB,GAAG;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,OAAO,GAAG,MAAM,GAAG,QAAQ,CAAC;IAClC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,cAAc,EAAE,CAAC;CACxB,CAAC;AACF,eAAO,MAAM,iBAAiB,gDAK3B,iBAAiB;iBAAkB,MAAM;WAAS,MAAM;
|
|
1
|
+
{"version":3,"file":"getTableJoinQuery.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/getTableJoinQuery.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEjD,KAAK,iBAAiB,GAAG;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,OAAO,GAAG,MAAM,GAAG,QAAQ,CAAC;IAClC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,cAAc,EAAE,CAAC;CACxB,CAAC;AACF,eAAO,MAAM,iBAAiB,gDAK3B,iBAAiB;iBAAkB,MAAM;WAAS,MAAM;CA8D1D,CAAC;AAEF,KAAK,sBAAsB,GAAG;IAC5B,EAAE,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,CAAC;IACzC,eAAe,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,CAAC;CAC3C,CAAC;AACF,eAAO,MAAM,kBAAkB,oEAM5B,sBAAsB,WAUxB,CAAC"}
|
|
@@ -11,8 +11,6 @@ const getTableJoinQuery = ({ path, type, rootTableAlias, finalWhere, }) => {
|
|
|
11
11
|
const getTableAlias = (table, pathIndex) => (0, prostgles_types_1.asName)(`${aliasSufix}_${pathIndex}_${table}`);
|
|
12
12
|
const query = path
|
|
13
13
|
.map(({ table, on }, i) => {
|
|
14
|
-
if (!on)
|
|
15
|
-
throw "on missing";
|
|
16
14
|
const tableName = table;
|
|
17
15
|
const tableAlias = getTableAlias(table, i);
|
|
18
16
|
const prevTableAlias = i === 0 ? rootTableAlias : getTableAlias(path[i - 1].table, i - 1);
|
|
@@ -30,38 +28,24 @@ const getTableJoinQuery = ({ path, type, rootTableAlias, finalWhere, }) => {
|
|
|
30
28
|
* rootTable joins to first path
|
|
31
29
|
* first path joins to target table through inner joins
|
|
32
30
|
*/
|
|
33
|
-
const whereJoinCondition = isLast && isExists
|
|
34
|
-
|
|
31
|
+
const whereJoinCondition = isLast && isExists ?
|
|
32
|
+
`WHERE (${(0, exports.getJoinOnCondition)({
|
|
35
33
|
on: firstPath.on,
|
|
36
34
|
leftAlias: rootTableAlias,
|
|
37
35
|
rightAlias: getTableAlias(firstPath.table, 0),
|
|
38
36
|
})})`
|
|
39
37
|
: "";
|
|
40
|
-
const tableSelect = isExists && isLast
|
|
41
|
-
?
|
|
42
|
-
`(`,
|
|
43
|
-
` SELECT *`,
|
|
44
|
-
` FROM ${tableName}`,
|
|
45
|
-
finalWhere ? ` WHERE ${finalWhere}` : "",
|
|
46
|
-
`)`,
|
|
47
|
-
]
|
|
38
|
+
const tableSelect = isExists && isLast ?
|
|
39
|
+
[`(`, ` SELECT *`, ` FROM ${tableName}`, finalWhere ? ` WHERE ${finalWhere}` : "", `)`]
|
|
48
40
|
.filter((v) => v)
|
|
49
41
|
.join("\n")
|
|
50
42
|
: tableName;
|
|
51
43
|
if (isExists && isFirst) {
|
|
52
|
-
return [
|
|
53
|
-
`SELECT 1`,
|
|
54
|
-
`FROM ${tableSelect} ${tableAlias}`,
|
|
55
|
-
whereJoinCondition,
|
|
56
|
-
]
|
|
44
|
+
return [`SELECT 1`, `FROM ${tableSelect} ${tableAlias}`, whereJoinCondition]
|
|
57
45
|
.filter((v) => v)
|
|
58
46
|
.join("\n");
|
|
59
47
|
}
|
|
60
|
-
return [
|
|
61
|
-
`${keyword} ${tableSelect} ${tableAlias}`,
|
|
62
|
-
` ON ${onCondition}`,
|
|
63
|
-
whereJoinCondition,
|
|
64
|
-
]
|
|
48
|
+
return [`${keyword} ${tableSelect} ${tableAlias}`, ` ON ${onCondition}`, whereJoinCondition]
|
|
65
49
|
.filter((v) => v)
|
|
66
50
|
.join("\n");
|
|
67
51
|
})
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getTableJoinQuery.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/getTableJoinQuery.ts"],"names":[],"mappings":";;;AAAA,qDAAyC;AASlC,MAAM,iBAAiB,GAAG,CAAC,EAChC,IAAI,EACJ,IAAI,EACJ,cAAc,EACd,UAAU,GACQ,EAA0C,EAAE;IAC9D,MAAM,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC;IACzB,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,MAAM,yCAAyC,CAAC;IAClD,CAAC;IACD,MAAM,UAAU,GAAG,IAAI,CAAC;IACxB,MAAM,aAAa,GAAG,CAAC,KAAa,EAAE,SAAiB,EAAE,EAAE,CACzD,IAAA,wBAAM,EAAC,GAAG,UAAU,IAAI,SAAS,IAAI,KAAK,EAAE,CAAC,CAAC;IAEhD,MAAM,KAAK,GAAG,IAAI;SACf,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE;QACxB,
|
|
1
|
+
{"version":3,"file":"getTableJoinQuery.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/getTableJoinQuery.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parseFieldFilter.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/parseFieldFilter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAW,MAAM,iBAAiB,CAAC;AAGvD;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,
|
|
1
|
+
{"version":3,"file":"parseFieldFilter.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/parseFieldFilter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAW,MAAM,iBAAiB,CAAC;AAGvD;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,uLA+F5B,CAAC"}
|
|
@@ -9,9 +9,6 @@ const DboBuilder_1 = require("../DboBuilder");
|
|
|
9
9
|
* @param {boolean} allow_empty - allow empty select. defaults to true
|
|
10
10
|
*/
|
|
11
11
|
const parseFieldFilter = (fieldParams = "*", allow_empty = true, all_cols) => {
|
|
12
|
-
if (!all_cols)
|
|
13
|
-
throw "all_cols missing";
|
|
14
|
-
const all_fields = all_cols; // || this.column_names.slice(0);
|
|
15
12
|
let colNames = [];
|
|
16
13
|
const initialParams = JSON.stringify(fieldParams);
|
|
17
14
|
if (fieldParams) {
|
|
@@ -22,13 +19,12 @@ const parseFieldFilter = (fieldParams = "*", allow_empty = true, all_cols) => {
|
|
|
22
19
|
fieldParams = fieldParams.split(",").map((k) => k.trim());
|
|
23
20
|
}
|
|
24
21
|
/* string[] */
|
|
25
|
-
if (Array.isArray(fieldParams) &&
|
|
26
|
-
!fieldParams.find((f) => typeof f !== "string")) {
|
|
22
|
+
if (Array.isArray(fieldParams) && !fieldParams.find((f) => typeof f !== "string")) {
|
|
27
23
|
/*
|
|
28
24
|
["*"]
|
|
29
25
|
*/
|
|
30
26
|
if (fieldParams[0] === "*") {
|
|
31
|
-
return
|
|
27
|
+
return all_cols.slice(0);
|
|
32
28
|
/*
|
|
33
29
|
[""]
|
|
34
30
|
*/
|
|
@@ -72,8 +68,8 @@ const parseFieldFilter = (fieldParams = "*", allow_empty = true, all_cols) => {
|
|
|
72
68
|
throw `Invalid field selection value for: { ${key}: ${fieldParams[key]} }. \n Allowed values: ${allowedVals.join(" OR ")}`;
|
|
73
69
|
});
|
|
74
70
|
const allowed = keys.filter((key) => fieldParams[key]), disallowed = keys.filter((key) => !fieldParams[key]);
|
|
75
|
-
if (disallowed
|
|
76
|
-
return
|
|
71
|
+
if (disallowed.length) {
|
|
72
|
+
return all_cols.filter((col) => !disallowed.includes(col));
|
|
77
73
|
}
|
|
78
74
|
else {
|
|
79
75
|
return [...allowed];
|
|
@@ -87,8 +83,8 @@ const parseFieldFilter = (fieldParams = "*", allow_empty = true, all_cols) => {
|
|
|
87
83
|
}
|
|
88
84
|
return colNames;
|
|
89
85
|
function validate(cols) {
|
|
90
|
-
const bad_keys = cols.filter((col) => !
|
|
91
|
-
if (bad_keys
|
|
86
|
+
const bad_keys = cols.filter((col) => !all_cols.includes(col));
|
|
87
|
+
if (bad_keys.length) {
|
|
92
88
|
throw "\nUnrecognised or illegal fields: " + bad_keys.join(", ");
|
|
93
89
|
}
|
|
94
90
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parseFieldFilter.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/parseFieldFilter.ts"],"names":[],"mappings":";;;AAAA,qDAAuD;AACvD,8CAA8C;AAE9C;;;;GAIG;AACI,MAAM,gBAAgB,GAAG,CAC9B,cAA6D,GAAG,EAChE,WAAW,GAAG,IAAI,EAClB,QAAqB,EACD,EAAE;IACtB,IAAI,
|
|
1
|
+
{"version":3,"file":"parseFieldFilter.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/parseFieldFilter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parseJoinPath.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/parseJoinPath.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,WAAW,EAAiB,MAAM,iBAAiB,CAAC;AACvE,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,KAAK,iBAAiB,GAAG;IACvB,OAAO,EAAE,WAAW,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,WAAW,CAAC;IACzB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,wBAAwB,CAAC,EAAE,OAAO,CAAC;CACpC,CAAC;AACF,MAAM,MAAM,cAAc,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAA;CAAE,CAAC;AAE7E;;GAEG;AACH,eAAO,MAAM,aAAa,qFAMvB,iBAAiB,KAAG,cAAc,
|
|
1
|
+
{"version":3,"file":"parseJoinPath.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/parseJoinPath.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,WAAW,EAAiB,MAAM,iBAAiB,CAAC;AACvE,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,KAAK,iBAAiB,GAAG;IACvB,OAAO,EAAE,WAAW,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,WAAW,CAAC;IACzB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,wBAAwB,CAAC,EAAE,OAAO,CAAC;CACpC,CAAC;AACF,MAAM,MAAM,cAAc,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAA;CAAE,CAAC;AAE7E;;GAEG;AACH,eAAO,MAAM,aAAa,qFAMvB,iBAAiB,KAAG,cAAc,EAgDpC,CAAC"}
|
|
@@ -103,21 +103,20 @@ function getJoins(viewHandler, source, path, { allowMultiOrJoin = true, getShort
|
|
|
103
103
|
};
|
|
104
104
|
}
|
|
105
105
|
/* Find the join path between tables */
|
|
106
|
-
const tableConfigJoinInfo = viewHandler.dboBuilder
|
|
106
|
+
const tableConfigJoinInfo = viewHandler.dboBuilder.prostgles.tableConfigurator?.getJoinInfo(source, target);
|
|
107
107
|
if (tableConfigJoinInfo)
|
|
108
108
|
return tableConfigJoinInfo;
|
|
109
|
-
const actualPath = getShortestJoin
|
|
110
|
-
|
|
109
|
+
const actualPath = getShortestJoin ?
|
|
110
|
+
viewHandler.joinPaths
|
|
111
111
|
.find((j) => {
|
|
112
112
|
return j.t1 === source && j.t2 === target;
|
|
113
113
|
})
|
|
114
114
|
?.path.map((table) => ({ table, on: undefined }))
|
|
115
115
|
.slice(1)
|
|
116
|
-
: viewHandler.joinPaths.find((j) => {
|
|
117
|
-
return
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
? path
|
|
116
|
+
: (viewHandler.joinPaths.find((j) => {
|
|
117
|
+
return j.path.join() === [{ table: source }, ...path].map((p) => p.table).join();
|
|
118
|
+
})) ?
|
|
119
|
+
path
|
|
121
120
|
: undefined;
|
|
122
121
|
if (getShortestJoin && actualPath?.length && lastItem.on?.length) {
|
|
123
122
|
actualPath[actualPath.length - 1].on = lastItem.on;
|
|
@@ -130,7 +129,6 @@ function getJoins(viewHandler, source, path, { allowMultiOrJoin = true, getShort
|
|
|
130
129
|
actualPath.forEach((tablePath, i, arr) => {
|
|
131
130
|
const prevTable = arr[i - 1];
|
|
132
131
|
const t1 = i === 0 ? source : prevTable.table;
|
|
133
|
-
viewHandler.joins ??= viewHandler.dboBuilder.joins;
|
|
134
132
|
/* Get join options */
|
|
135
133
|
const join = viewHandler.joins.find((j) => j.tables.includes(t1) && j.tables.includes(tablePath.table));
|
|
136
134
|
if (!join) {
|
|
@@ -184,7 +182,6 @@ const getValidOn = (requested, possible) => {
|
|
|
184
182
|
const conditionsMatch = (c1, c2) => {
|
|
185
183
|
const keys1 = Object.keys(c1);
|
|
186
184
|
const keys2 = Object.keys(c2);
|
|
187
|
-
return
|
|
188
|
-
keys1.every((key) => c1[key] === c2[key]));
|
|
185
|
+
return keys1.sort().join() === keys2.sort().join() && keys1.every((key) => c1[key] === c2[key]);
|
|
189
186
|
};
|
|
190
187
|
//# sourceMappingURL=parseJoinPath.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parseJoinPath.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/parseJoinPath.ts"],"names":[],"mappings":";;;AAAA,qDAAuE;AAYvE;;GAEG;AACI,MAAM,aAAa,GAAG,CAAC,EAC5B,OAAO,EACP,SAAS,EACT,WAAW,EACX,gBAAgB,GAAG,KAAK,EACxB,wBAAwB,GACN,EAAoB,EAAE;IACxC,MAAM,MAAM,GAAqB,EAAE,CAAC;IACpC,IAAI,SAAS,GAAG,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;IAC7E,IAAI,wBAAwB,IAAI,SAAS,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;QACtD,SAAS,GAAG,CAAC,IAAI,EAAE,GAAG,SAAS,CAAC,CAAC;IACnC,CAAC;IACD,SAAS,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE;QAC5B,MAAM,SAAS,GAAG,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,IAAI,SAAS,CAAC;QACpD,IAAI,CAAC,SAAS;YAAE,MAAM,mBAAmB,CAAC;QAE1C,MAAM,YAAY,GAAG,CAAC,UAAoB,EAAE,EAAE;YAC5C,MAAM,eAAe,GAAG,CAAC,KAAK,CAAC,IAAI,SAAS,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC;YACzD,MAAM,QAAQ,GAAG,QAAQ,CAAC,WAAW,EAAE,SAAS,EAAE,CAAC,UAAU,CAAC,EAAE;gBAC9D,gBAAgB;gBAChB,eAAe;aAChB,CAAC,CAAC;YAEH,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;gBAC9B,qCAAqC;gBACrC,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;oBAC5C,MAAM;wBACJ,KAAK,EAAE,CAAC,yBAAyB,CAAC;wBAClC,OAAO,EAAE,8CAA8C,IAAI,CAAC,KAAK,EAAE;qBACpE,CAAC;gBACJ,CAAC;gBACD,MAAM,CAAC,IAAI,CAAC;oBACV,KAAK,EAAE,IAAI,CAAC,KAAK;oBACjB,EAAE,EAAE,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;iBAChE,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;QACL,CAAC,CAAC;QAEF,oBAAoB;QACpB,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;QACpB,CAAC;aAAM,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;YACpC,MAAM,KAAK,GAAG,IAAI,CAAC;YACnB,YAAY,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;QAC1B,CAAC;aAAM,CAAC;YACN,YAAY,CAAC,IAAI,CAAC,CAAC;QACrB,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,
|
|
1
|
+
{"version":3,"file":"parseJoinPath.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/parseJoinPath.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prepareSortItems.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/prepareSortItems.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"prepareSortItems.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/prepareSortItems.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAwC,MAAM,sBAAsB,CAAC;AACrF,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,mBAAmB,EAAe,MAAM,8BAA8B,CAAC;AAG9F,eAAO,MAAM,gBAAgB,eACf,OAAO,GAAG,SAAS,gBACjB,MAAM,EAAE,cACV,MAAM,GAAG,SAAS,UACtB,mBAAmB,EAAE,eAChB,YAAY,EAAE,KAC1B,QAAQ,EAoHV,CAAC"}
|
|
@@ -18,7 +18,7 @@ const prepareSortItems = (rawOrderBy, allowed_cols, tableAlias, select, joinQuer
|
|
|
18
18
|
else if (Array.isArray(rawOrderBy)) {
|
|
19
19
|
/* Order by is formed of a list of ascending field names */
|
|
20
20
|
const _orderBy = rawOrderBy;
|
|
21
|
-
if (
|
|
21
|
+
if (!_orderBy.find((v) => typeof v !== "string")) {
|
|
22
22
|
/* [string] */
|
|
23
23
|
orderBy = _orderBy.map((key) => ({ key, asc: true }));
|
|
24
24
|
}
|
|
@@ -30,7 +30,7 @@ const prepareSortItems = (rawOrderBy, allowed_cols, tableAlias, select, joinQuer
|
|
|
30
30
|
}
|
|
31
31
|
else
|
|
32
32
|
return throwErr(rawOrderBy);
|
|
33
|
-
if (!orderBy
|
|
33
|
+
if (!orderBy.length)
|
|
34
34
|
return [];
|
|
35
35
|
const validatedAggAliases = select
|
|
36
36
|
.filter((s) => s.type !== "joinedColumn" &&
|
|
@@ -56,9 +56,7 @@ const prepareSortItems = (rawOrderBy, allowed_cols, tableAlias, select, joinQuer
|
|
|
56
56
|
const nestedField = sortableNestedColumns.find((f) => f.key === key);
|
|
57
57
|
if (nestedField) {
|
|
58
58
|
const { table, selectItem, joinAlias } = nestedField;
|
|
59
|
-
const comparableDataTypeCast = ["uuid", "xml"].includes(selectItem.column_udt_type ?? "")
|
|
60
|
-
? "::TEXT"
|
|
61
|
-
: "";
|
|
59
|
+
const comparableDataTypeCast = ["uuid", "xml"].includes(selectItem.column_udt_type ?? "") ? "::TEXT" : "";
|
|
62
60
|
const sortItemAlias = (0, dist_1.asName)(`prostgles_nested_sort_${selectItem.alias}`);
|
|
63
61
|
return {
|
|
64
62
|
key,
|
|
@@ -77,12 +75,10 @@ const prepareSortItems = (rawOrderBy, allowed_cols, tableAlias, select, joinQuer
|
|
|
77
75
|
};
|
|
78
76
|
}
|
|
79
77
|
/* Order by column index when possible to bypass name collision when ordering by a computed column.
|
|
80
|
-
|
|
81
|
-
|
|
78
|
+
(Postgres will sort by existing columns wheundefined possible)
|
|
79
|
+
*/
|
|
82
80
|
const index = selectedAliases.indexOf(key) + 1;
|
|
83
|
-
let colKey = index > 0 && !nullEmpty
|
|
84
|
-
? index
|
|
85
|
-
: [tableAlias, key].filter(dist_1.isDefined).map(dist_1.asName).join(".");
|
|
81
|
+
let colKey = index > 0 && !nullEmpty ? index : [tableAlias, key].filter(dist_1.isDefined).map(dist_1.asName).join(".");
|
|
86
82
|
if (nullEmpty) {
|
|
87
83
|
colKey = `nullif(trim(${colKey}::text), '')`;
|
|
88
84
|
}
|
|
@@ -121,8 +117,7 @@ const parseOrderObj = (orderBy, expectOne = false) => {
|
|
|
121
117
|
if (!(0, dist_1.isObject)(orderBy))
|
|
122
118
|
return throwErr(orderBy);
|
|
123
119
|
const keys = Object.keys(orderBy);
|
|
124
|
-
if (keys.length &&
|
|
125
|
-
keys.find((k) => ["key", "asc", "nulls", "nullEmpty"].includes(k))) {
|
|
120
|
+
if (keys.length && keys.find((k) => ["key", "asc", "nulls", "nullEmpty"].includes(k))) {
|
|
126
121
|
const { key, asc, nulls, nullEmpty = false } = orderBy;
|
|
127
122
|
if (!["string"].includes(typeof key) ||
|
|
128
123
|
!["boolean"].includes(typeof asc) ||
|