prostgles-server 4.2.187 → 4.2.189
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 +20 -11
- package/dist/Auth/AuthHandler.d.ts.map +1 -1
- package/dist/Auth/AuthHandler.js +98 -120
- package/dist/Auth/AuthHandler.js.map +1 -1
- package/dist/Auth/AuthTypes.d.ts +69 -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 +77 -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 +114 -135
- package/lib/Auth/AuthTypes.ts +96 -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 +88 -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
|
@@ -70,19 +70,21 @@ class TableHandler extends ViewHandler_1.ViewHandler {
|
|
|
70
70
|
if (!this.dboBuilder.canSubscribe) {
|
|
71
71
|
throw "Cannot subscribe. PubSubManager not initiated";
|
|
72
72
|
}
|
|
73
|
+
// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
|
|
73
74
|
if (!localParams)
|
|
74
75
|
throw "Sync not allowed within the server code";
|
|
75
76
|
const { socket } = localParams;
|
|
76
77
|
if (!socket)
|
|
77
78
|
throw "socket missing";
|
|
79
|
+
// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
|
|
78
80
|
if (!table_rules || !table_rules.sync || !table_rules.select)
|
|
79
81
|
throw "sync or select table rules missing";
|
|
80
82
|
if (this.tx)
|
|
81
83
|
throw "Sync not allowed within transactions";
|
|
82
84
|
const ALLOWED_PARAMS = ["select"];
|
|
83
|
-
const invalidParams = Object.keys(params
|
|
85
|
+
const invalidParams = Object.keys(params).filter((k) => !ALLOWED_PARAMS.includes(k));
|
|
84
86
|
if (invalidParams.length)
|
|
85
|
-
throw
|
|
87
|
+
throw "Invalid or dissallowed params found: " + invalidParams.join(", ");
|
|
86
88
|
const { synced_field, allow_delete } = table_rules.sync;
|
|
87
89
|
if (!table_rules.sync.id_fields.length || !synced_field) {
|
|
88
90
|
const err = "INTERNAL ERROR: id_fields OR synced_field missing from publish";
|
|
@@ -91,11 +93,11 @@ class TableHandler extends ViewHandler_1.ViewHandler {
|
|
|
91
93
|
}
|
|
92
94
|
const id_fields = this.parseFieldFilter(table_rules.sync.id_fields, false);
|
|
93
95
|
const syncFields = [...id_fields, synced_field];
|
|
94
|
-
const allowedSelect = this.parseFieldFilter(table_rules
|
|
96
|
+
const allowedSelect = this.parseFieldFilter(table_rules.select.fields);
|
|
95
97
|
if (syncFields.find((f) => !allowedSelect.includes(f))) {
|
|
96
98
|
throw `INTERNAL ERROR: sync field missing from publish.${this.name}.select.fields`;
|
|
97
99
|
}
|
|
98
|
-
const select = this.getAllowedSelectFields(params
|
|
100
|
+
const select = this.getAllowedSelectFields(params.select ?? "*", allowedSelect, false);
|
|
99
101
|
if (!select.length)
|
|
100
102
|
throw "Empty select not allowed";
|
|
101
103
|
/* Add sync fields if missing */
|
|
@@ -105,7 +107,7 @@ class TableHandler extends ViewHandler_1.ViewHandler {
|
|
|
105
107
|
});
|
|
106
108
|
/* Step 1: parse command and params */
|
|
107
109
|
const result = await this.find(filter, { select, limit: 0 }, undefined, table_rules, localParams).then(async (_isValid) => {
|
|
108
|
-
const { filterFields, forcedFilter } = table_rules
|
|
110
|
+
const { filterFields, forcedFilter } = table_rules.select || {};
|
|
109
111
|
const condition = (await this.prepareWhere({
|
|
110
112
|
select: undefined,
|
|
111
113
|
filter,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TableHandler.js","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/TableHandler.ts"],"names":[],"mappings":";;;AACA,qDAQyB;AAIzB,8CAOuB;AAEvB,0DAAuD;AACvD,yDAAuE;AACvE,+DAA6E;AAC7E,4DAAoE;AACpE,mDAAgD;AAChD,qCAAmC;AACnC,qCAAkC;AAClC,qCAAkC;AAClC,+CAA4C;AAC5C,qCAAkC;AAYlC,MAAa,YAAa,SAAQ,yBAAW;IAC3C,aAAa,CAAgB;IAC7B,YACE,EAAM,EACN,eAA4B,EAC5B,UAAsB,EACtB,EAAoD,EACpD,SAAqB;QAErB,KAAK,CAAC,EAAE,EAAE,eAAe,EAAE,UAAU,EAAE,EAAE,EAAE,SAAS,CAAC,CAAC;QAEtD,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAE1B,IAAI,CAAC,aAAa,GAAG,IAAI,6BAAa,CAAC,IAAI,CAAC,CAAC;QAC7C,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;QACrB,IAAI,CAAC,QAAQ,GAAG,UAAU,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC1D,CAAC;IAED,YAAY,GAAG,CAAC,WAAoC,EAAE,EAAE;QACtD,OAAO,WAAW,EAAE,EAAE,EAAE,IAAI,IAAI,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC;IAChD,CAAC,CAAC;IACF,WAAW,GAAG,CAAC,WAAoC,EAAE,EAAE;QACrD,OAAO,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;IAC/D,CAAC,CAAC;IAEF,gBAAgB,GAAG,mCAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAE/C,MAAM,GAAG,eAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC3B,WAAW,GAAG,yBAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAErC,KAAK,CAAC,MAAM,CACV,SAAkC,EAClC,MAAqB,EACrB,aAAyB,EACzB,UAAsB,EACtB,YAA0B;QAE1B,OAAO,eAAM,CAAC,IAAI,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"TableHandler.js","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/TableHandler.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"delete.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/delete.ts"],"names":[],"mappings":"AACA,OAAO,EAAa,YAAY,EAAe,MAAM,iBAAiB,CAAC;AACvE,OAAO,EAAc,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EACL,MAAM,EACN,WAAW,EAIZ,MAAM,eAAe,CAAC;AAEvB,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAG9C,wBAAsB,OAAO,CAC3B,IAAI,EAAE,YAAY,EAClB,MAAM,CAAC,EAAE,MAAM,EACf,MAAM,CAAC,EAAE,YAAY,EACrB,aAAa,CAAC,EAAE,SAAS,EACzB,UAAU,CAAC,EAAE,SAAS,EACtB,WAAW,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"delete.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/delete.ts"],"names":[],"mappings":"AACA,OAAO,EAAa,YAAY,EAAe,MAAM,iBAAiB,CAAC;AACvE,OAAO,EAAc,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EACL,MAAM,EACN,WAAW,EAIZ,MAAM,eAAe,CAAC;AAEvB,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAG9C,wBAAsB,OAAO,CAC3B,IAAI,EAAE,YAAY,EAClB,MAAM,CAAC,EAAE,MAAM,EACf,MAAM,CAAC,EAAE,YAAY,EACrB,aAAa,CAAC,EAAE,SAAS,EACzB,UAAU,CAAC,EAAE,SAAS,EACtB,WAAW,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,GAAG,CAAC,CAyId"}
|
|
@@ -20,9 +20,9 @@ async function _delete(filter, params, param3_unused, tableRules, localParams) {
|
|
|
20
20
|
returningFields = tableRules.delete.returningFields;
|
|
21
21
|
validate = tableRules.delete.validate;
|
|
22
22
|
if (!returningFields)
|
|
23
|
-
returningFields = tableRules
|
|
23
|
+
returningFields = tableRules.select?.fields;
|
|
24
24
|
if (!returningFields)
|
|
25
|
-
returningFields = tableRules
|
|
25
|
+
returningFields = tableRules.delete.filterFields;
|
|
26
26
|
if (!filterFields)
|
|
27
27
|
throw ` Invalid delete rule for ${this.name}. filterFields missing `;
|
|
28
28
|
/* Safely test publish rules */
|
|
@@ -43,11 +43,8 @@ async function _delete(filter, params, param3_unused, tableRules, localParams) {
|
|
|
43
43
|
};
|
|
44
44
|
const good_params = Object.keys(good_paramsObj);
|
|
45
45
|
const bad_params = Object.keys(params).filter((k) => !good_params.includes(k));
|
|
46
|
-
if (bad_params
|
|
47
|
-
throw ("Invalid params: " +
|
|
48
|
-
bad_params.join(", ") +
|
|
49
|
-
" \n Expecting: " +
|
|
50
|
-
good_params.join(", "));
|
|
46
|
+
if (bad_params.length)
|
|
47
|
+
throw ("Invalid params: " + bad_params.join(", ") + " \n Expecting: " + good_params.join(", "));
|
|
51
48
|
}
|
|
52
49
|
let queryType = "none";
|
|
53
50
|
let queryWithoutRLS = `DELETE FROM ${this.escapedName} `;
|
|
@@ -90,7 +87,7 @@ async function _delete(filter, params, param3_unused, tableRules, localParams) {
|
|
|
90
87
|
const result = await onDeleteFromFileTable_1.onDeleteFromFileTable.bind(this)({
|
|
91
88
|
localParams,
|
|
92
89
|
queryType,
|
|
93
|
-
returningQuery:
|
|
90
|
+
returningQuery: undefined,
|
|
94
91
|
filterOpts,
|
|
95
92
|
});
|
|
96
93
|
await this._log({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"delete.js","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/delete.ts"],"names":[],"mappings":";;;AAGA,8CAMuB;AACvB,8CAAyD;AAEzD,mEAAgE;AAEzD,KAAK,UAAU,OAAO,CAE3B,MAAe,EACf,MAAqB,EACrB,aAAyB,EACzB,UAAsB,EACtB,WAAyB;IAEzB,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACzB,IAAI,CAAC;QACH,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,IAAI,EAAE,CAAC;QACnC,MAAM,GAAG,MAAM,IAAI,EAAE,CAAC;QACtB,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QAEzB,IAAI,YAAY,GAA0B,EAAE,EAC1C,YAAY,GAA4B,GAAG,EAC3C,eAAe,GAA4B,GAAG,EAC9C,QAAgC,CAAC;QAEnC,MAAM,EAAE,QAAQ,GAAG,KAAK,EAAE,WAAW,GAAG,KAAK,EAAE,GAAG,WAAW,IAAI,EAAE,CAAC;QACpE,IAAI,UAAU,EAAE,CAAC;YACf,IAAI,CAAC,UAAU,CAAC,MAAM;gBAAE,MAAM,sBAAsB,CAAC;YACrD,YAAY,GAAG,UAAU,CAAC,MAAM,CAAC,YAAY,CAAC;YAC9C,YAAY,GAAG,UAAU,CAAC,MAAM,CAAC,YAAY,CAAC;YAC9C,eAAe,GAAG,UAAU,CAAC,MAAM,CAAC,eAAe,CAAC;YACpD,QAAQ,GAAG,UAAU,CAAC,MAAM,CAAC,QAAQ,CAAC;YAEtC,IAAI,CAAC,eAAe;gBAAE,eAAe,GAAG,UAAU,
|
|
1
|
+
{"version":3,"file":"delete.js","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/delete.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"insert.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/insert.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,YAAY,EAAoB,MAAM,iBAAiB,CAAC;AAC5E,OAAO,EAAE,SAAS,EAAoB,MAAM,mCAAmC,CAAC;AAChF,OAAO,EACL,WAAW,EAIZ,MAAM,eAAe,CAAC;AAGvB,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAI9C,wBAAsB,MAAM,CAC1B,IAAI,EAAE,YAAY,EAClB,SAAS,GAAE,SAAS,GAAG,SAAS,EAAO,EACvC,YAAY,CAAC,EAAE,YAAY,EAC3B,aAAa,CAAC,EAAE,SAAS,EACzB,UAAU,CAAC,EAAE,SAAS,EACtB,WAAW,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,GAAG,GAAG,GAAG,EAAE,GAAG,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"insert.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/insert.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,YAAY,EAAoB,MAAM,iBAAiB,CAAC;AAC5E,OAAO,EAAE,SAAS,EAAoB,MAAM,mCAAmC,CAAC;AAChF,OAAO,EACL,WAAW,EAIZ,MAAM,eAAe,CAAC;AAGvB,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAI9C,wBAAsB,MAAM,CAC1B,IAAI,EAAE,YAAY,EAClB,SAAS,GAAE,SAAS,GAAG,SAAS,EAAO,EACvC,YAAY,CAAC,EAAE,YAAY,EAC3B,aAAa,CAAC,EAAE,SAAS,EACzB,UAAU,CAAC,EAAE,SAAS,EACtB,WAAW,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,GAAG,GAAG,GAAG,EAAE,GAAG,OAAO,CAAC,CAuMhC"}
|
|
@@ -22,14 +22,16 @@ async function insert(rowOrRows = {}, insertParams, param3_unused, tableRules, l
|
|
|
22
22
|
return this.dboBuilder.getTX((_dbtx) => _dbtx[this.name]?.[ACTION]?.(rowOrRows, insertParams, param3_unused, tableRules, localParams));
|
|
23
23
|
}
|
|
24
24
|
}
|
|
25
|
-
const { testOnly, fields, forcedData, returningFields } = await insertTest_1.insertTest.bind(this)({
|
|
25
|
+
const { testOnly, fields, forcedData, returningFields } = await insertTest_1.insertTest.bind(this)({
|
|
26
|
+
tableRules,
|
|
27
|
+
localParams,
|
|
28
|
+
});
|
|
26
29
|
if (testOnly) {
|
|
27
30
|
return true;
|
|
28
31
|
}
|
|
29
32
|
if (allowedNestedInserts) {
|
|
30
33
|
if (!nestedInsert ||
|
|
31
|
-
!allowedNestedInserts.some((ai) => ai.table === nestedInsert
|
|
32
|
-
ai.column === nestedInsert.referencingColumn)) {
|
|
34
|
+
!allowedNestedInserts.some((ai) => ai.table === nestedInsert.previousTable && ai.column === nestedInsert.referencingColumn)) {
|
|
33
35
|
throw `Direct inserts not allowed. Only nested inserts from these tables: ${JSON.stringify(allowedNestedInserts)} `;
|
|
34
36
|
}
|
|
35
37
|
}
|
|
@@ -57,9 +59,7 @@ async function insert(rowOrRows = {}, insertParams, param3_unused, tableRules, l
|
|
|
57
59
|
}
|
|
58
60
|
return row;
|
|
59
61
|
}));
|
|
60
|
-
const preValidatedrowOrRows = isMultiInsert
|
|
61
|
-
? preValidatedRows
|
|
62
|
-
: preValidatedRows[0];
|
|
62
|
+
const preValidatedrowOrRows = isMultiInsert ? preValidatedRows : preValidatedRows[0];
|
|
63
63
|
/**
|
|
64
64
|
* If media it will: upload file and continue insert
|
|
65
65
|
* If nested insert it will: make separate inserts and not continue main insert
|
|
@@ -117,9 +117,7 @@ async function insert(rowOrRows = {}, insertParams, param3_unused, tableRules, l
|
|
|
117
117
|
if (!pkeyNames.length) {
|
|
118
118
|
throw "Cannot do DoUpdate on a table without a primary key";
|
|
119
119
|
}
|
|
120
|
-
const nonPkeyCols = allowedCols
|
|
121
|
-
.filter((c) => !pkeyNames.includes(c))
|
|
122
|
-
.map((v) => (0, prostgles_types_1.asName)(v));
|
|
120
|
+
const nonPkeyCols = allowedCols.filter((c) => !pkeyNames.includes(c)).map((v) => (0, prostgles_types_1.asName)(v));
|
|
123
121
|
if (!nonPkeyCols.length) {
|
|
124
122
|
throw "Cannot on conflict DoUpdate on a table with only primary key columns";
|
|
125
123
|
}
|
|
@@ -142,7 +140,7 @@ async function insert(rowOrRows = {}, insertParams, param3_unused, tableRules, l
|
|
|
142
140
|
if (returnQuery)
|
|
143
141
|
return queryWithRLS;
|
|
144
142
|
if (this.dboBuilder.prostgles.opts.DEBUG_MODE) {
|
|
145
|
-
console.log(this.tx?.t.ctx
|
|
143
|
+
console.log(this.tx?.t.ctx.start, "insert in " + this.name, data);
|
|
146
144
|
}
|
|
147
145
|
const result = await (0, runInsertUpdateQuery_1.runInsertUpdateQuery)({
|
|
148
146
|
rule,
|
|
@@ -207,11 +205,8 @@ const validateInsertParams = (params) => {
|
|
|
207
205
|
};
|
|
208
206
|
const good_params = Object.keys(good_paramsObj);
|
|
209
207
|
const bad_params = Object.keys(params).filter((k) => !good_params.includes(k));
|
|
210
|
-
if (bad_params
|
|
211
|
-
throw
|
|
212
|
-
bad_params.join(", ") +
|
|
213
|
-
" \n Expecting: " +
|
|
214
|
-
good_params.join(", "));
|
|
208
|
+
if (bad_params.length)
|
|
209
|
+
throw "Invalid params: " + bad_params.join(", ") + " \n Expecting: " + good_params.join(", ");
|
|
215
210
|
}
|
|
216
211
|
};
|
|
217
212
|
// const removeBuffers = (o: any) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"insert.js","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/insert.ts"],"names":[],"mappings":";;;AAAA,qDAA4E;AAE5E,8CAKuB;AACvB,gEAA6D;AAC7D,mDAAiD;AAEjD,6CAA0C;AAC1C,iEAA8D;AAEvD,KAAK,UAAU,MAAM,CAE1B,YAAqC,EAAE,EACvC,YAA2B,EAC3B,aAAyB,EACzB,UAAsB,EACtB,WAAyB;IAEzB,MAAM,MAAM,GAAG,QAAQ,CAAC;IACxB,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACzB,IAAI,CAAC;QACH,MAAM,EAAE,sBAAsB,GAAG,KAAK,EAAE,GAAG,YAAY,IAAI,EAAE,CAAC;QAC9D,MAAM,EAAE,WAAW,GAAG,KAAK,EAAE,YAAY,EAAE,GAAG,WAAW,IAAI,EAAE,CAAC;QAEhE,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;QACjD,MAAM,IAAI,GAAG,UAAU,EAAE,CAAC,MAAM,CAAC,CAAC;QAClC,MAAM,EAAE,YAAY,EAAE,WAAW,EAAE,QAAQ,EAAE,oBAAoB,EAAE,
|
|
1
|
+
{"version":3,"file":"insert.js","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/insert.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,7 +21,7 @@ async function insertTest({ localParams, tableRules }) {
|
|
|
21
21
|
fields = tableRules[ACTION].fields;
|
|
22
22
|
/* If no returning fields specified then take select fields as returning or the allowed insert fields */
|
|
23
23
|
if (!returningFields)
|
|
24
|
-
returningFields = tableRules
|
|
24
|
+
returningFields = tableRules.select?.fields || tableRules.insert.fields;
|
|
25
25
|
if (!fields)
|
|
26
26
|
throw ` invalid insert rule for ${this.name} -> fields missing `;
|
|
27
27
|
/* Safely test publish rules */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"insertTest.js","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/insertTest.ts"],"names":[],"mappings":";;;AAAA,qDAA6E;AAC7E,8CAAiD;AAEjD,qEAA4D;AAOrD,KAAK,UAAU,UAAU,CAE9B,EAAE,WAAW,EAAE,UAAU,EAAkB;IAE3C,MAAM,EAAE,QAAQ,EAAE,GAAG,WAAW,IAAI,EAAE,CAAC;IAEvC,MAAM,MAAM,GAAG,QAAQ,CAAC;IAExB,IAAI,eAAwC,CAAC;IAC7C,IAAI,UAAiC,CAAC;IACtC,IAAI,MAA+B,CAAC;IACpC,IAAI,WAAoD,CAAC;IACzD,IAAI,QAAQ,GAAG,KAAK,CAAC;IAErB,IAAI,UAAU,EAAE,CAAC;QACf,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC;YAAE,MAAM,GAAG,MAAM,sBAAsB,IAAI,CAAC,IAAI,EAAE,CAAC;QAC1E,eAAe,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,eAAe,CAAC;QACrD,UAAU,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,UAAU,CAAC;QAC3C,WAAW,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,WAAW,CAAC;QAC7C,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC;QAEnC,wGAAwG;QACxG,IAAI,CAAC,eAAe;YAClB,eAAe,GAAG,UAAU,
|
|
1
|
+
{"version":3,"file":"insertTest.js","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/insertTest.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runInsertUpdateQuery.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/runInsertUpdateQuery.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"runInsertUpdateQuery.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/runInsertUpdateQuery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAU,WAAW,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC7F,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAC;AAC3E,OAAO,EAA6B,WAAW,EAAe,MAAM,eAAe,CAAC;AACpF,OAAO,EAAsB,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAElE,KAAK,wBAAwB,GAAG;IAC9B,YAAY,EAAE,YAAY,CAAC;IAC3B,mBAAmB,EAAE,MAAM,CAAC;IAC5B,WAAW,EAAE,WAAW,GAAG,SAAS,CAAC;IACrC,MAAM,EAAE,WAAW,GAAG,SAAS,CAAC;IAChC,eAAe,EAAE,WAAW,GAAG,SAAS,CAAC;CAC1C,GAAG,CACA;IACE,IAAI,EAAE,QAAQ,CAAC;IACf,MAAM,EAAE,YAAY,GAAG,SAAS,CAAC;IACjC,IAAI,EAAE,UAAU,GAAG,SAAS,CAAC;IAC7B,IAAI,EAAE,SAAS,GAAG,SAAS,EAAE,CAAC;IAC9B,aAAa,EAAE,OAAO,CAAC;IACvB,uBAAuB,CAAC,EAAE,SAAS,CAAC;CACrC,GACD;IACE,IAAI,EAAE,QAAQ,CAAC;IACf,uBAAuB,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC7C,MAAM,EAAE,YAAY,GAAG,SAAS,CAAC;IACjC,IAAI,EAAE,UAAU,GAAG,SAAS,CAAC;IAC7B,IAAI,EAAE,SAAS,CAAC;CACjB,CACJ,CAAC;AAEF,eAAO,MAAM,oBAAoB,SAAgB,wBAAwB;;;;gBA+IxE,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runInsertUpdateQuery.js","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/runInsertUpdateQuery.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"runInsertUpdateQuery.js","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/runInsertUpdateQuery.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/update.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAC9D,OAAO,EACL,MAAM,EACN,WAAW,EAIZ,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/update.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAC9D,OAAO,EACL,MAAM,EACN,WAAW,EAIZ,MAAM,eAAe,CAAC;AAIvB,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAG9C,wBAAsB,MAAM,CAC1B,IAAI,EAAE,YAAY,EAClB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,SAAS,EACnB,MAAM,CAAC,EAAE,YAAY,EACrB,UAAU,CAAC,EAAE,SAAS,EACtB,WAAW,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,CA4K3B"}
|
|
@@ -30,10 +30,11 @@ async function update(filter, _newData, params, tableRules, localParams) {
|
|
|
30
30
|
if (localParams?.testRule) {
|
|
31
31
|
return parsedRules;
|
|
32
32
|
}
|
|
33
|
+
// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
|
|
33
34
|
if (!newData || !Object.keys(newData).length) {
|
|
34
35
|
throw "no update data provided\nEXPECTING db.table.update(filter, updateData, options)";
|
|
35
36
|
}
|
|
36
|
-
const { fields, validateRow, forcedData, returningFields, forcedFilter, filterFields
|
|
37
|
+
const { fields, validateRow, forcedData, returningFields, forcedFilter, filterFields } = parsedRules;
|
|
37
38
|
const { removeDisallowedFields = false } = params || {};
|
|
38
39
|
const { returnQuery = false } = localParams ?? {};
|
|
39
40
|
if (params) {
|
|
@@ -45,11 +46,8 @@ async function update(filter, _newData, params, tableRules, localParams) {
|
|
|
45
46
|
};
|
|
46
47
|
const good_params = Object.keys(good_paramsObj);
|
|
47
48
|
const bad_params = Object.keys(params).filter((k) => !good_params.includes(k));
|
|
48
|
-
if (bad_params
|
|
49
|
-
throw ("Invalid params: " +
|
|
50
|
-
bad_params.join(", ") +
|
|
51
|
-
" \n Expecting: " +
|
|
52
|
-
good_params.join(", "));
|
|
49
|
+
if (bad_params.length)
|
|
50
|
+
throw ("Invalid params: " + bad_params.join(", ") + " \n Expecting: " + good_params.join(", "));
|
|
53
51
|
}
|
|
54
52
|
const { data, allowedCols } = await (0, DataValidator_1.prepareNewData)({
|
|
55
53
|
row: newData,
|
|
@@ -86,9 +84,7 @@ async function update(filter, _newData, params, tableRules, localParams) {
|
|
|
86
84
|
const nesedTableHandler = finalDBtx[nestedInsert.tableName];
|
|
87
85
|
if (!nesedTableHandler)
|
|
88
86
|
throw `nestedInsert Tablehandler not found for ${nestedInsert.tableName}`;
|
|
89
|
-
const refTableRules = !localParams
|
|
90
|
-
? undefined
|
|
91
|
-
: await (0, insertNestedRecords_1.getInsertTableRules)(this, nestedInsert.tableName, localParams);
|
|
87
|
+
const refTableRules = !localParams ? undefined : (await (0, insertNestedRecords_1.getInsertTableRules)(this, nestedInsert.tableName, localParams));
|
|
92
88
|
const nestedLocalParams = {
|
|
93
89
|
...localParams,
|
|
94
90
|
nestedInsert: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/update.ts"],"names":[],"mappings":";;;AAEA,8CAMuB;AACvB,
|
|
1
|
+
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/update.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { AnyObject } from "prostgles-types";
|
|
2
|
-
import { LocalParams } from "../DboBuilder";
|
|
3
2
|
import { TableRule } from "../../PublishParser/PublishParser";
|
|
3
|
+
import { LocalParams } from "../DboBuilder";
|
|
4
4
|
import { TableHandler } from "./TableHandler";
|
|
5
5
|
type Args = {
|
|
6
6
|
newData: AnyObject;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"updateFile.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/updateFile.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAqB,MAAM,iBAAiB,CAAC;AAC/D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"updateFile.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/updateFile.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAqB,MAAM,iBAAiB,CAAC;AAC/D,OAAO,EAAE,SAAS,EAAoB,MAAM,mCAAmC,CAAC;AAEhF,OAAO,EAAE,WAAW,EAAS,MAAM,eAAe,CAAC;AAEnD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,KAAK,IAAI,GAAG;IACV,OAAO,EAAE,SAAS,CAAC;IACnB,MAAM,EAAE,SAAS,CAAC;IAClB,UAAU,EAAE,SAAS,GAAG,SAAS,CAAC;IAClC,WAAW,EAAE,WAAW,GAAG,SAAS,CAAC;CACtC,CAAC;AACF,eAAO,MAAM,UAAU,SACf,YAAY,gDAC4B,IAAI;aAC9B,SAAS;EA2D9B,CAAC"}
|
|
@@ -12,26 +12,24 @@ const updateFile = async function ({ filter, newData, tableRules, localParams })
|
|
|
12
12
|
if (localParams?.testRule) {
|
|
13
13
|
return { newData: {} };
|
|
14
14
|
}
|
|
15
|
-
const existingMediaId = !(!filter ||
|
|
16
|
-
!(0, prostgles_types_1.isObject)(filter) ||
|
|
15
|
+
const existingMediaId = (!(!(0, prostgles_types_1.isObject)(filter) ||
|
|
17
16
|
(0, prostgles_types_1.getKeys)(filter).join() !== "id" ||
|
|
18
|
-
typeof filter.id !== "string")
|
|
19
|
-
|
|
17
|
+
typeof filter.id !== "string")) ?
|
|
18
|
+
filter.id
|
|
20
19
|
: undefined;
|
|
21
20
|
if (!existingMediaId) {
|
|
22
21
|
throw new Error(`Updating the file table with file data can only be done by providing a single id filter. E.g. { id: "9ea4e23c-2b1a-4e33-8ec0-c15919bb45ec" } `);
|
|
23
22
|
}
|
|
24
23
|
if (!(0, uploadFile_1.isFile)(newData)) {
|
|
25
|
-
throw new Error("Expecting { data: Buffer, name: string } but received " +
|
|
26
|
-
JSON.stringify(newData));
|
|
24
|
+
throw new Error("Expecting { data: Buffer, name: string } but received " + JSON.stringify(newData));
|
|
27
25
|
}
|
|
28
26
|
const fileManager = this.dboBuilder.prostgles.fileManager;
|
|
29
27
|
if (!fileManager)
|
|
30
28
|
throw new Error("fileManager missing");
|
|
31
29
|
if (rule?.validate && !localParams)
|
|
32
30
|
throw new Error("localParams missing");
|
|
33
|
-
const validate = rule?.validate
|
|
34
|
-
|
|
31
|
+
const validate = rule?.validate ?
|
|
32
|
+
async (row) => {
|
|
35
33
|
return rule.validate({
|
|
36
34
|
update: row,
|
|
37
35
|
filter,
|
|
@@ -40,7 +38,7 @@ const updateFile = async function ({ filter, newData, tableRules, localParams })
|
|
|
40
38
|
});
|
|
41
39
|
}
|
|
42
40
|
: undefined;
|
|
43
|
-
const existingFile = await (localParams?.tx?.dbTX
|
|
41
|
+
const existingFile = await (localParams?.tx?.dbTX[this.name] || this).findOne({ id: existingMediaId });
|
|
44
42
|
if (!existingFile?.name)
|
|
45
43
|
throw new Error("Existing file record not found");
|
|
46
44
|
await fileManager.deleteFile(existingFile.name);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"updateFile.js","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/updateFile.ts"],"names":[],"mappings":";;;AAAA,qDAA+D;
|
|
1
|
+
{"version":3,"file":"updateFile.js","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/updateFile.ts"],"names":[],"mappings":";;;AAAA,qDAA+D;AAE/D,qEAA6D;AAE7D,8CAAmD;AAS5C,MAAM,UAAU,GAAG,KAAK,WAE7B,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,WAAW,EAAQ;IAElD,MAAM,IAAI,GAAG,UAAU,EAAE,MAAM,CAAC;IAEhC,IAAI,UAAU,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC;QACrC,MAAM,aAAa,CAAC;IACtB,CAAC;IACD,IAAI,WAAW,EAAE,QAAQ,EAAE,CAAC;QAC1B,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;IACzB,CAAC;IACD,MAAM,eAAe,GACnB,CACE,CAAC,CACC,CAAC,IAAA,0BAAQ,EAAC,MAAM,CAAC;QACjB,IAAA,yBAAO,EAAC,MAAM,CAAC,CAAC,IAAI,EAAE,KAAK,IAAI;QAC/B,OAAQ,MAAc,CAAC,EAAE,KAAK,QAAQ,CACvC,CACF,CAAC,CAAC;QACA,MAAc,CAAC,EAAE;QACpB,CAAC,CAAC,SAAS,CAAC;IACd,IAAI,CAAC,eAAe,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CACb,+IAA+I,CAChJ,CAAC;IACJ,CAAC;IACD,IAAI,CAAC,IAAA,mBAAM,EAAC,OAAO,CAAC,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CACb,wDAAwD,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CACnF,CAAC;IACJ,CAAC;IAED,MAAM,WAAW,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,WAAW,CAAC;IAC1D,IAAI,CAAC,WAAW;QAAE,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;IACzD,IAAI,IAAI,EAAE,QAAQ,IAAI,CAAC,WAAW;QAAE,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;IAC3E,MAAM,QAAQ,GACZ,IAAI,EAAE,QAAQ,CAAC,CAAC;QACd,KAAK,EAAE,GAAG,EAAE,EAAE;YACZ,OAAO,IAAI,CAAC,QAAS,CAAC;gBACpB,MAAM,EAAE,GAAG;gBACX,MAAM;gBACN,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAQ;gBAClD,WAAW,EAAE,WAAY;aAC1B,CAAC,CAAC;QACL,CAAC;QACH,CAAC,CAAC,SAAS,CAAC;IAEd,MAAM,YAAY,GAAsB,MAAM,CAC3C,WAAW,EAAE,EAAE,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAA8B,IAAI,IAAI,CACvE,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,eAAe,EAAE,CAAC,CAAC;IAEnC,IAAI,CAAC,YAAY,EAAE,IAAI;QAAE,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;IAE3E,MAAM,WAAW,CAAC,UAAU,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IAChD,MAAM,OAAO,GAAG,MAAM,uBAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC1C,GAAG,EAAE,OAAO;QACZ,QAAQ;QACR,WAAW;QACX,OAAO,EAAE,YAAY,CAAC,EAAE;KACzB,CAAC,CAAC;IACH,OAAO,EAAE,OAAO,EAAE,IAAA,wBAAQ,EAAC,OAAO,EAAE,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;AAChD,CAAC,CAAC;AA9DW,QAAA,UAAU,cA8DrB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upsert.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/upsert.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,MAAM,0CAA0C,CAAC;AACrE,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"upsert.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/upsert.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,MAAM,0CAA0C,CAAC;AACrE,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEzD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,eAAO,MAAM,MAAM,SACX,YAAY,UACV,MAAM,WACL,SAAS,WACT,YAAY,gBACP,SAAS,gBACT,WAAW,KACxB,QAAQ,GAAG,CA+Cb,CAAC"}
|
|
@@ -9,7 +9,7 @@ const upsert = async function (filter, newData, params, table_rules, localParams
|
|
|
9
9
|
return tblH
|
|
10
10
|
.find(filter, { select: "", limit: 1 }, undefined, table_rules, localParams)
|
|
11
11
|
.then((exists) => {
|
|
12
|
-
if (exists
|
|
12
|
+
if (exists.length) {
|
|
13
13
|
return tblH.update(filter, newData, params, table_rules, localParams);
|
|
14
14
|
}
|
|
15
15
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upsert.js","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/upsert.ts"],"names":[],"mappings":";;;AAGA,
|
|
1
|
+
{"version":3,"file":"upsert.js","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/upsert.ts"],"names":[],"mappings":";;;AAGA,wDAA2F;AAGpF,MAAM,MAAM,GAAG,KAAK,WAEzB,MAAc,EACd,OAAkB,EAClB,MAAqB,EACrB,WAAuB,EACvB,WAAyB;IAEzB,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACzB,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,KAAK,WAAW,IAAkB;YAChD,OAAO,IAAI;iBACR,IAAI,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,SAAS,EAAE,WAAW,EAAE,WAAW,CAAC;iBAC3E,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;gBACf,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;oBAClB,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;gBACxE,CAAC;qBAAM,CAAC;oBACN,OAAO,IAAI,CAAC,MAAM,CAChB,EAAE,GAAG,OAAO,EAAE,GAAG,MAAM,EAAE,EACzB,MAAM,EACN,SAAS,EACT,WAAW,EACX,WAAW,CACZ,CAAC;gBACJ,CAAC;YACH,CAAC,CAAC,CAAC;QACP,CAAC,CAAC;QAEF,qDAAqD;QACrD,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC;YACb,OAAO,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAiB,CAAC,CAAC,CAAC;QACnF,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;QACnC,MAAM,IAAI,CAAC,IAAI,CAAC;YACd,OAAO,EAAE,QAAQ;YACjB,WAAW;YACX,IAAI,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE;YACjC,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,QAAQ;YACjB,WAAW;YACX,IAAI,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE;YACjC,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,CAAC;AAtDW,QAAA,MAAM,UAsDjB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ViewHandler.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/ViewHandler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,YAAY,CAAC;AACxC,OAAO,EACL,SAAS,EACT,UAAU,EACV,WAAW,EACX,YAAY,EACZ,eAAe,EAIhB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,EAAE,EAAE,MAAM,iBAAiB,CAAC;AACrC,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAC9D,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EACL,UAAU,EACV,MAAM,EACN,WAAW,EACX,aAAa,EACb,mBAAmB,EAIpB,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAUjD,OAAO,EAAE,UAAU,EAAa,MAAM,aAAa,CAAC;AAGpD,MAAM,MAAM,SAAS,GAAG;IACtB,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,EAAE,CAAC;CAChB,EAAE,CAAC;AAEJ,qBAAa,WAAW;IACtB,EAAE,EAAE,EAAE,CAAC;IACP,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;IAChC,eAAe,EAAE,UAAU,EAAE,CAAC;IAC9B,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,eAAe,EAAE,WAAW,CAAC;IAC7B,YAAY,EAAE,MAAM,EAAE,CAAM;IAC5B,KAAK,EAAE,IAAI,EAAE,CAAC;IACd,SAAS,CAAC,EAAE,KAAK,CAAC;IAClB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,UAAU,EAAE,UAAU,CAAC;IAEvB,EAAE,CAAC,EAAE;QACH,CAAC,EAAE,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QACvB,IAAI,EAAE,aAAa,CAAC;KACrB,CAAC;IACF,IAAI,SAAS,6BAEZ;IAED,OAAO,UAAQ;IACf,SAAS,SAAM;IACf,QAAQ,UAAS;gBAEf,EAAE,EAAE,EAAE,EACN,eAAe,EAAE,WAAW,EAC5B,UAAU,EAAE,UAAU,EACtB,EAAE,CAAC,EAAE;QAAE,CAAC,EAAE,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAAC,IAAI,EAAE,aAAa,CAAA;KAAE,EACpD,SAAS,CAAC,EAAE,SAAS;
|
|
1
|
+
{"version":3,"file":"ViewHandler.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/ViewHandler.ts"],"names":[],"mappings":"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"}
|
|
@@ -35,8 +35,6 @@ class ViewHandler {
|
|
|
35
35
|
filterDef = "";
|
|
36
36
|
is_media = false;
|
|
37
37
|
constructor(db, tableOrViewInfo, dboBuilder, tx, joinPaths) {
|
|
38
|
-
if (!db || !tableOrViewInfo)
|
|
39
|
-
throw "";
|
|
40
38
|
this.db = db;
|
|
41
39
|
this.tx = tx;
|
|
42
40
|
this.joinPaths = joinPaths;
|
|
@@ -50,14 +48,14 @@ class ViewHandler {
|
|
|
50
48
|
.sort((a, b) => a.name.localeCompare(b.name));
|
|
51
49
|
this.column_names = tableOrViewInfo.columns.map((c) => c.name);
|
|
52
50
|
this.dboBuilder = dboBuilder;
|
|
53
|
-
this.joins = this.dboBuilder.joins
|
|
51
|
+
this.joins = this.dboBuilder.joins;
|
|
54
52
|
this.columnsForTypes.map(({ name, udt_name, is_nullable }) => {
|
|
55
53
|
this.tsColumnDefs.push(`${(0, DboBuilder_1.escapeTSNames)(name)}?: ${(0, DboBuilder_1.postgresToTsType)(udt_name)} ${is_nullable ? " | null " : ""};`);
|
|
56
54
|
});
|
|
57
55
|
}
|
|
58
56
|
_log = ({ command, data, localParams, duration, error, }) => {
|
|
59
57
|
if (localParams?.noLog) {
|
|
60
|
-
if (localParams
|
|
58
|
+
if (localParams.socket || localParams.httpReq) {
|
|
61
59
|
throw new Error("noLog option is not allowed from a remote client");
|
|
62
60
|
}
|
|
63
61
|
return;
|
|
@@ -155,8 +153,8 @@ class ViewHandler {
|
|
|
155
153
|
};
|
|
156
154
|
const res = {
|
|
157
155
|
allColumns,
|
|
158
|
-
getColumns: tableRules
|
|
159
|
-
getInfo: tableRules
|
|
156
|
+
getColumns: tableRules.getColumns ?? true,
|
|
157
|
+
getInfo: tableRules.getColumns ?? true,
|
|
160
158
|
};
|
|
161
159
|
if (tableRules.select) {
|
|
162
160
|
if (!tableRules.select.fields)
|
|
@@ -166,7 +164,7 @@ class ViewHandler {
|
|
|
166
164
|
tableRules.select.maxLimit !== undefined &&
|
|
167
165
|
tableRules.select.maxLimit !== maxLimit) {
|
|
168
166
|
const ml = tableRules.select.maxLimit;
|
|
169
|
-
if (
|
|
167
|
+
if (!Number.isInteger(ml) || ml < 0)
|
|
170
168
|
throw (` Invalid publish.${this.name}.select.maxLimit -> expecting a positive integer OR null but got ` +
|
|
171
169
|
ml);
|
|
172
170
|
maxLimit = ml;
|
|
@@ -189,7 +187,7 @@ class ViewHandler {
|
|
|
189
187
|
fields: this.parseFieldFilter(tableRules.update.fields),
|
|
190
188
|
forcedData: { ...tableRules.update.forcedData },
|
|
191
189
|
forcedFilter: { ...tableRules.update.forcedFilter },
|
|
192
|
-
returningFields: getFirstSpecified(tableRules.update
|
|
190
|
+
returningFields: getFirstSpecified(tableRules.update.returningFields, tableRules.select?.fields, tableRules.update.fields),
|
|
193
191
|
filterFields: this.parseFieldFilter(tableRules.update.filterFields),
|
|
194
192
|
};
|
|
195
193
|
}
|
|
@@ -199,7 +197,7 @@ class ViewHandler {
|
|
|
199
197
|
res.insert = {
|
|
200
198
|
fields: this.parseFieldFilter(tableRules.insert.fields),
|
|
201
199
|
forcedData: { ...tableRules.insert.forcedData },
|
|
202
|
-
returningFields: getFirstSpecified(tableRules.insert.returningFields, tableRules
|
|
200
|
+
returningFields: getFirstSpecified(tableRules.insert.returningFields, tableRules.select?.fields, tableRules.insert.fields),
|
|
203
201
|
};
|
|
204
202
|
}
|
|
205
203
|
if (tableRules.delete) {
|
|
@@ -208,7 +206,7 @@ class ViewHandler {
|
|
|
208
206
|
res.delete = {
|
|
209
207
|
forcedFilter: { ...tableRules.delete.forcedFilter },
|
|
210
208
|
filterFields: this.parseFieldFilter(tableRules.delete.filterFields),
|
|
211
|
-
returningFields: getFirstSpecified(tableRules.delete.returningFields, tableRules
|
|
209
|
+
returningFields: getFirstSpecified(tableRules.delete.returningFields, tableRules.select?.fields, tableRules.delete.filterFields),
|
|
212
210
|
};
|
|
213
211
|
}
|
|
214
212
|
if (!tableRules.select && !tableRules.update && !tableRules.delete && !tableRules.insert) {
|
|
@@ -300,9 +298,9 @@ class ViewHandler {
|
|
|
300
298
|
if (allowed_cols) {
|
|
301
299
|
allowedFields = this.parseFieldFilter(allowed_cols, allow_empty);
|
|
302
300
|
}
|
|
303
|
-
let col_names =
|
|
301
|
+
let col_names = resultFields.filter((f) => allowedFields.includes(f));
|
|
304
302
|
/* Maintain allowed cols order */
|
|
305
|
-
if (selectParams === "*" && allowedFields
|
|
303
|
+
if (selectParams === "*" && allowedFields.length) {
|
|
306
304
|
col_names = allowedFields;
|
|
307
305
|
}
|
|
308
306
|
return col_names;
|
|
@@ -334,7 +332,7 @@ exports.ViewHandler = ViewHandler;
|
|
|
334
332
|
* Throw error if illegal keys found in object
|
|
335
333
|
*/
|
|
336
334
|
const validateObj = (obj, allowedKeys) => {
|
|
337
|
-
if (
|
|
335
|
+
if (Object.keys(obj).length) {
|
|
338
336
|
const invalid_keys = Object.keys(obj).filter((k) => !allowedKeys.includes(k));
|
|
339
337
|
if (invalid_keys.length) {
|
|
340
338
|
throw "Invalid/Illegal fields found: " + invalid_keys.join(", ");
|