prostgles-server 4.2.183 → 4.2.185
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/.github/workflows/main.yml +15 -15
- package/.prettierignore +2 -0
- package/README.md +1 -1
- package/dist/Auth/AuthHandler.d.ts +1 -1
- package/dist/Auth/AuthHandler.d.ts.map +1 -1
- package/dist/Auth/AuthHandler.js +64 -32
- package/dist/Auth/AuthHandler.js.map +1 -1
- package/dist/Auth/AuthTypes.d.ts +15 -1
- package/dist/Auth/AuthTypes.d.ts.map +1 -1
- package/dist/Auth/getSafeReturnURL.d.ts.map +1 -1
- package/dist/Auth/getSafeReturnURL.js.map +1 -1
- package/dist/Auth/sendEmail.d.ts.map +1 -1
- package/dist/Auth/sendEmail.js +6 -6
- package/dist/Auth/sendEmail.js.map +1 -1
- package/dist/Auth/setAuthProviders.d.ts +1 -1
- package/dist/Auth/setAuthProviders.d.ts.map +1 -1
- package/dist/Auth/setAuthProviders.js +15 -8
- package/dist/Auth/setAuthProviders.js.map +1 -1
- package/dist/Auth/setEmailProvider.d.ts.map +1 -1
- package/dist/Auth/setEmailProvider.js +23 -4
- package/dist/Auth/setEmailProvider.js.map +1 -1
- package/dist/Auth/setupAuthRoutes.d.ts.map +1 -1
- package/dist/Auth/setupAuthRoutes.js +27 -9
- package/dist/Auth/setupAuthRoutes.js.map +1 -1
- package/dist/DBEventsManager.d.ts.map +1 -1
- package/dist/DBEventsManager.js +24 -19
- package/dist/DBEventsManager.js.map +1 -1
- package/dist/DBSchemaBuilder.d.ts.map +1 -1
- package/dist/DBSchemaBuilder.js +18 -5
- package/dist/DBSchemaBuilder.js.map +1 -1
- package/dist/DboBuilder/DboBuilder.d.ts.map +1 -1
- package/dist/DboBuilder/DboBuilder.js +7 -2
- 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 +2 -2
- package/dist/DboBuilder/QueryBuilder/Functions.d.ts.map +1 -1
- package/dist/DboBuilder/QueryBuilder/Functions.js +293 -173
- package/dist/DboBuilder/QueryBuilder/Functions.js.map +1 -1
- package/dist/DboBuilder/QueryBuilder/QueryBuilder.d.ts +2 -2
- package/dist/DboBuilder/QueryBuilder/QueryBuilder.d.ts.map +1 -1
- package/dist/DboBuilder/QueryBuilder/QueryBuilder.js +52 -29
- package/dist/DboBuilder/QueryBuilder/QueryBuilder.js.map +1 -1
- package/dist/DboBuilder/QueryBuilder/getJoinQuery.d.ts.map +1 -1
- package/dist/DboBuilder/QueryBuilder/getJoinQuery.js +51 -32
- package/dist/DboBuilder/QueryBuilder/getJoinQuery.js.map +1 -1
- package/dist/DboBuilder/QueryBuilder/getNewQuery.d.ts.map +1 -1
- package/dist/DboBuilder/QueryBuilder/getNewQuery.js +48 -25
- 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 +32 -23
- package/dist/DboBuilder/QueryBuilder/getSelectQuery.js.map +1 -1
- package/dist/DboBuilder/QueryStreamer.d.ts +2 -2
- package/dist/DboBuilder/QueryStreamer.d.ts.map +1 -1
- package/dist/DboBuilder/QueryStreamer.js +68 -23
- 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 +79 -43
- 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 +39 -15
- 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 +44 -13
- 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 +81 -22
- package/dist/DboBuilder/TableHandler/insert.js.map +1 -1
- package/dist/DboBuilder/TableHandler/insertTest.d.ts.map +1 -1
- package/dist/DboBuilder/TableHandler/insertTest.js.map +1 -1
- package/dist/DboBuilder/TableHandler/onDeleteFromFileTable.d.ts +1 -1
- package/dist/DboBuilder/TableHandler/onDeleteFromFileTable.d.ts.map +1 -1
- package/dist/DboBuilder/TableHandler/onDeleteFromFileTable.js +7 -4
- package/dist/DboBuilder/TableHandler/onDeleteFromFileTable.js.map +1 -1
- package/dist/DboBuilder/TableHandler/runInsertUpdateQuery.d.ts.map +1 -1
- package/dist/DboBuilder/TableHandler/runInsertUpdateQuery.js +24 -5
- 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 +16 -4
- package/dist/DboBuilder/TableHandler/update.js.map +1 -1
- package/dist/DboBuilder/TableHandler/updateBatch.d.ts.map +1 -1
- package/dist/DboBuilder/TableHandler/updateBatch.js +33 -10
- package/dist/DboBuilder/TableHandler/updateBatch.js.map +1 -1
- package/dist/DboBuilder/TableHandler/updateFile.d.ts.map +1 -1
- package/dist/DboBuilder/TableHandler/updateFile.js +24 -6
- 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 +22 -6
- package/dist/DboBuilder/TableHandler/upsert.js.map +1 -1
- package/dist/DboBuilder/ViewHandler/ViewHandler.d.ts +5 -5
- package/dist/DboBuilder/ViewHandler/ViewHandler.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler/ViewHandler.js +64 -36
- package/dist/DboBuilder/ViewHandler/ViewHandler.js.map +1 -1
- package/dist/DboBuilder/ViewHandler/count.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler/count.js +21 -7
- 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 +76 -22
- 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 +19 -10
- package/dist/DboBuilder/ViewHandler/getExistsCondition.js.map +1 -1
- package/dist/DboBuilder/ViewHandler/getExistsFilters.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler/getExistsFilters.js +12 -5
- package/dist/DboBuilder/ViewHandler/getExistsFilters.js.map +1 -1
- package/dist/DboBuilder/ViewHandler/getInfo.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler/getInfo.js +27 -9
- package/dist/DboBuilder/ViewHandler/getInfo.js.map +1 -1
- package/dist/DboBuilder/ViewHandler/getTableJoinQuery.d.ts +2 -2
- package/dist/DboBuilder/ViewHandler/getTableJoinQuery.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler/getTableJoinQuery.js +42 -23
- package/dist/DboBuilder/ViewHandler/getTableJoinQuery.js.map +1 -1
- package/dist/DboBuilder/ViewHandler/parseComplexFilter.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler/parseComplexFilter.js +22 -9
- package/dist/DboBuilder/ViewHandler/parseComplexFilter.js.map +1 -1
- package/dist/DboBuilder/ViewHandler/parseFieldFilter.d.ts +4 -4
- package/dist/DboBuilder/ViewHandler/parseFieldFilter.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler/parseFieldFilter.js +13 -11
- package/dist/DboBuilder/ViewHandler/parseFieldFilter.js.map +1 -1
- package/dist/DboBuilder/ViewHandler/parseJoinPath.d.ts +1 -1
- package/dist/DboBuilder/ViewHandler/parseJoinPath.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler/parseJoinPath.js +44 -29
- 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 +36 -27
- 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 +16 -12
- package/dist/DboBuilder/ViewHandler/prepareWhere.js.map +1 -1
- package/dist/DboBuilder/ViewHandler/size.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler/size.js +24 -7
- package/dist/DboBuilder/ViewHandler/size.js.map +1 -1
- package/dist/DboBuilder/ViewHandler/subscribe.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler/subscribe.js +40 -12
- package/dist/DboBuilder/ViewHandler/subscribe.js.map +1 -1
- package/dist/DboBuilder/ViewHandler/validateViewRules.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler/validateViewRules.js +20 -5
- package/dist/DboBuilder/ViewHandler/validateViewRules.js.map +1 -1
- package/dist/DboBuilder/dboBuilderUtils.d.ts.map +1 -1
- package/dist/DboBuilder/dboBuilderUtils.js +18 -7
- package/dist/DboBuilder/dboBuilderUtils.js.map +1 -1
- package/dist/DboBuilder/getColumns.d.ts.map +1 -1
- package/dist/DboBuilder/getColumns.js +22 -7
- package/dist/DboBuilder/getColumns.js.map +1 -1
- package/dist/DboBuilder/getCondition.d.ts.map +1 -1
- package/dist/DboBuilder/getCondition.js +43 -30
- package/dist/DboBuilder/getCondition.js.map +1 -1
- package/dist/DboBuilder/getSubscribeRelatedTables.d.ts.map +1 -1
- package/dist/DboBuilder/getSubscribeRelatedTables.js +38 -27
- package/dist/DboBuilder/getSubscribeRelatedTables.js.map +1 -1
- package/dist/DboBuilder/getTablesForSchemaPostgresSQL.d.ts.map +1 -1
- package/dist/DboBuilder/getTablesForSchemaPostgresSQL.js +9 -9
- package/dist/DboBuilder/getTablesForSchemaPostgresSQL.js.map +1 -1
- package/dist/DboBuilder/insertNestedRecords.d.ts +3 -3
- package/dist/DboBuilder/insertNestedRecords.d.ts.map +1 -1
- package/dist/DboBuilder/insertNestedRecords.js +79 -44
- package/dist/DboBuilder/insertNestedRecords.js.map +1 -1
- package/dist/DboBuilder/parseUpdateRules.d.ts.map +1 -1
- package/dist/DboBuilder/parseUpdateRules.js +38 -14
- package/dist/DboBuilder/parseUpdateRules.js.map +1 -1
- package/dist/DboBuilder/prepareShortestJoinPaths.d.ts.map +1 -1
- package/dist/DboBuilder/prepareShortestJoinPaths.js +56 -31
- package/dist/DboBuilder/prepareShortestJoinPaths.js.map +1 -1
- package/dist/DboBuilder/runSQL.d.ts.map +1 -1
- package/dist/DboBuilder/runSQL.js +41 -21
- package/dist/DboBuilder/runSQL.js.map +1 -1
- package/dist/DboBuilder/runTransaction.d.ts +1 -1
- package/dist/DboBuilder/runTransaction.d.ts.map +1 -1
- package/dist/DboBuilder/runTransaction.js +2 -2
- package/dist/DboBuilder/runTransaction.js.map +1 -1
- package/dist/DboBuilder/sqlErrCodeToMsg.d.ts.map +1 -1
- package/dist/DboBuilder/sqlErrCodeToMsg.js +297 -38
- package/dist/DboBuilder/sqlErrCodeToMsg.js.map +1 -1
- package/dist/DboBuilder/uploadFile.d.ts.map +1 -1
- package/dist/DboBuilder/uploadFile.js +33 -9
- package/dist/DboBuilder/uploadFile.js.map +1 -1
- package/dist/Event_Trigger_Tags.d.ts +1 -1
- package/dist/Event_Trigger_Tags.d.ts.map +1 -1
- package/dist/Event_Trigger_Tags.js +1 -1
- package/dist/Event_Trigger_Tags.js.map +1 -1
- package/dist/FileManager/FileManager.d.ts.map +1 -1
- package/dist/FileManager/FileManager.js +6 -3
- package/dist/FileManager/FileManager.js.map +1 -1
- package/dist/FileManager/getValidatedFileType.d.ts.map +1 -1
- package/dist/FileManager/getValidatedFileType.js +18 -16
- package/dist/FileManager/getValidatedFileType.js.map +1 -1
- package/dist/FileManager/initFileManager.d.ts.map +1 -1
- package/dist/FileManager/initFileManager.js +7 -1
- package/dist/FileManager/initFileManager.js.map +1 -1
- package/dist/FileManager/upload.d.ts +1 -1
- package/dist/FileManager/upload.d.ts.map +1 -1
- package/dist/FileManager/upload.js +3 -3
- package/dist/FileManager/upload.js.map +1 -1
- package/dist/FileManager/uploadStream.d.ts +1 -1
- package/dist/FileManager/uploadStream.d.ts.map +1 -1
- package/dist/FileManager/uploadStream.js +6 -7
- package/dist/FileManager/uploadStream.js.map +1 -1
- package/dist/Filtering.d.ts +3 -3
- package/dist/Filtering.d.ts.map +1 -1
- package/dist/Filtering.js +70 -37
- package/dist/Filtering.js.map +1 -1
- package/dist/JSONBValidation/validate_jsonb_schema_sql.d.ts.map +1 -1
- package/dist/JSONBValidation/validate_jsonb_schema_sql.js +1 -4
- package/dist/JSONBValidation/validate_jsonb_schema_sql.js.map +1 -1
- package/dist/JSONBValidation/validation.d.ts.map +1 -1
- package/dist/JSONBValidation/validation.js +46 -24
- package/dist/JSONBValidation/validation.js.map +1 -1
- package/dist/Logging.d.ts +2 -2
- package/dist/Logging.d.ts.map +1 -1
- package/dist/PostgresNotifListenManager.d.ts.map +1 -1
- package/dist/PostgresNotifListenManager.js +20 -22
- 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 +37 -11
- package/dist/Prostgles.js.map +1 -1
- package/dist/ProstglesTypes.d.ts.map +1 -1
- package/dist/ProstglesTypes.js +6 -1
- package/dist/ProstglesTypes.js.map +1 -1
- package/dist/PubSubManager/PubSubManager.d.ts.map +1 -1
- package/dist/PubSubManager/PubSubManager.js +10 -5
- package/dist/PubSubManager/PubSubManager.js.map +1 -1
- package/dist/PubSubManager/addSub.d.ts.map +1 -1
- package/dist/PubSubManager/addSub.js +4 -6
- package/dist/PubSubManager/addSub.js.map +1 -1
- package/dist/PubSubManager/addSync.d.ts.map +1 -1
- package/dist/PubSubManager/addSync.js +10 -6
- package/dist/PubSubManager/addSync.js.map +1 -1
- package/dist/PubSubManager/getCreatePubSubManagerError.d.ts.map +1 -1
- package/dist/PubSubManager/getCreatePubSubManagerError.js +3 -1
- package/dist/PubSubManager/getCreatePubSubManagerError.js.map +1 -1
- package/dist/PubSubManager/getPubSubManagerInitQuery.d.ts.map +1 -1
- package/dist/PubSubManager/getPubSubManagerInitQuery.js +8 -8
- package/dist/PubSubManager/getPubSubManagerInitQuery.js.map +1 -1
- package/dist/PubSubManager/initPubSubManager.d.ts.map +1 -1
- package/dist/PubSubManager/initPubSubManager.js +7 -9
- package/dist/PubSubManager/initPubSubManager.js.map +1 -1
- package/dist/PubSubManager/notifListener.d.ts.map +1 -1
- package/dist/PubSubManager/notifListener.js +23 -12
- package/dist/PubSubManager/notifListener.js.map +1 -1
- package/dist/PubSubManager/orphanTriggerCheck.d.ts.map +1 -1
- package/dist/PubSubManager/orphanTriggerCheck.js.map +1 -1
- package/dist/PubSubManager/pushSubData.d.ts.map +1 -1
- package/dist/PubSubManager/pushSubData.js +1 -1
- package/dist/PubSubManager/pushSubData.js.map +1 -1
- package/dist/PublishParser/PublishParser.d.ts +1 -1
- package/dist/PublishParser/PublishParser.d.ts.map +1 -1
- package/dist/PublishParser/PublishParser.js +25 -14
- package/dist/PublishParser/PublishParser.js.map +1 -1
- package/dist/PublishParser/getFileTableRules.d.ts.map +1 -1
- package/dist/PublishParser/getFileTableRules.js +23 -16
- package/dist/PublishParser/getFileTableRules.js.map +1 -1
- package/dist/PublishParser/getSchemaFromPublish.d.ts.map +1 -1
- package/dist/PublishParser/getSchemaFromPublish.js +39 -16
- package/dist/PublishParser/getSchemaFromPublish.js.map +1 -1
- package/dist/PublishParser/getTableRulesWithoutFileTable.d.ts.map +1 -1
- package/dist/PublishParser/getTableRulesWithoutFileTable.js +42 -22
- package/dist/PublishParser/getTableRulesWithoutFileTable.js.map +1 -1
- package/dist/PublishParser/publishTypesAndUtils.d.ts.map +1 -1
- package/dist/PublishParser/publishTypesAndUtils.js +5 -1
- package/dist/PublishParser/publishTypesAndUtils.js.map +1 -1
- package/dist/RestApi.d.ts +1 -1
- package/dist/RestApi.d.ts.map +1 -1
- package/dist/RestApi.js +1 -1
- package/dist/RestApi.js.map +1 -1
- package/dist/SchemaWatch/SchemaWatch.d.ts +2 -2
- package/dist/SchemaWatch/SchemaWatch.d.ts.map +1 -1
- package/dist/SchemaWatch/SchemaWatch.js +11 -9
- package/dist/SchemaWatch/SchemaWatch.js.map +1 -1
- package/dist/SchemaWatch/getValidatedWatchSchemaType.d.ts.map +1 -1
- package/dist/SchemaWatch/getValidatedWatchSchemaType.js +3 -3
- package/dist/SchemaWatch/getValidatedWatchSchemaType.js.map +1 -1
- package/dist/SchemaWatch/getWatchSchemaTagList.d.ts.map +1 -1
- package/dist/SchemaWatch/getWatchSchemaTagList.js +12 -6
- package/dist/SchemaWatch/getWatchSchemaTagList.js.map +1 -1
- package/dist/SyncReplication.d.ts.map +1 -1
- package/dist/SyncReplication.js +84 -42
- package/dist/SyncReplication.js.map +1 -1
- package/dist/TableConfig/TableConfig.d.ts +5 -5
- package/dist/TableConfig/TableConfig.d.ts.map +1 -1
- package/dist/TableConfig/TableConfig.js +18 -5
- package/dist/TableConfig/TableConfig.js.map +1 -1
- package/dist/TableConfig/getColumnDefinitionQuery.d.ts +2 -2
- package/dist/TableConfig/getColumnDefinitionQuery.d.ts.map +1 -1
- package/dist/TableConfig/getColumnDefinitionQuery.js +20 -9
- package/dist/TableConfig/getColumnDefinitionQuery.js.map +1 -1
- package/dist/TableConfig/getConstraintDefinitionQueries.d.ts +3 -3
- package/dist/TableConfig/getConstraintDefinitionQueries.d.ts.map +1 -1
- package/dist/TableConfig/getConstraintDefinitionQueries.js +12 -7
- package/dist/TableConfig/getConstraintDefinitionQueries.js.map +1 -1
- package/dist/TableConfig/getFutureTableSchema.d.ts +1 -1
- package/dist/TableConfig/getFutureTableSchema.d.ts.map +1 -1
- package/dist/TableConfig/getFutureTableSchema.js +6 -4
- package/dist/TableConfig/getFutureTableSchema.js.map +1 -1
- package/dist/TableConfig/getPGIndexes.d.ts.map +1 -1
- package/dist/TableConfig/getPGIndexes.js.map +1 -1
- package/dist/TableConfig/getTableColumnQueries.d.ts +1 -1
- package/dist/TableConfig/getTableColumnQueries.d.ts.map +1 -1
- package/dist/TableConfig/getTableColumnQueries.js +38 -19
- package/dist/TableConfig/getTableColumnQueries.js.map +1 -1
- package/dist/TableConfig/initTableConfig.d.ts.map +1 -1
- package/dist/TableConfig/initTableConfig.js +91 -43
- package/dist/TableConfig/initTableConfig.js.map +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js.map +1 -1
- package/dist/initProstgles.d.ts.map +1 -1
- package/dist/initProstgles.js +14 -10
- package/dist/initProstgles.js.map +1 -1
- package/dist/onSocketConnected.d.ts.map +1 -1
- package/dist/onSocketConnected.js +38 -16
- package/dist/onSocketConnected.js.map +1 -1
- package/dist/runClientRequest.d.ts.map +1 -1
- package/dist/runClientRequest.js +33 -14
- package/dist/runClientRequest.js.map +1 -1
- package/dist/shortestPath.d.ts.map +1 -1
- package/dist/shortestPath.js +1 -1
- package/dist/shortestPath.js.map +1 -1
- package/dist/typeTests/dboTypeCheck.js.map +1 -1
- package/examples/full-example-typescript/DBoGenerated.d.ts +112 -54
- package/examples/full-example-typescript/DBoGenerated.js +3 -3
- package/examples/full-example-typescript/home.html +28 -26
- package/examples/full-example-typescript/index.d.ts +1 -1
- package/examples/full-example-typescript/index.js +80 -53
- package/examples/full-example-vanilla/home.html +151 -125
- package/examples/server/javascript/index.js +17 -19
- package/lib/Auth/AuthHandler.ts +234 -155
- package/lib/Auth/AuthTypes.ts +27 -4
- package/lib/Auth/getSafeReturnURL.ts +35 -21
- package/lib/Auth/sendEmail.ts +34 -31
- package/lib/Auth/setAuthProviders.ts +94 -71
- package/lib/Auth/setEmailProvider.ts +45 -27
- package/lib/Auth/setupAuthRoutes.ts +164 -100
- package/lib/DBEventsManager.ts +87 -65
- package/lib/DBSchemaBuilder.ts +62 -28
- package/lib/DboBuilder/DboBuilder.ts +45 -21
- package/lib/DboBuilder/DboBuilderTypes.ts +99 -95
- package/lib/DboBuilder/QueryBuilder/Functions.ts +862 -580
- package/lib/DboBuilder/QueryBuilder/QueryBuilder.ts +202 -141
- package/lib/DboBuilder/QueryBuilder/getJoinQuery.ts +199 -124
- package/lib/DboBuilder/QueryBuilder/getNewQuery.ts +209 -148
- package/lib/DboBuilder/QueryBuilder/getSelectQuery.ts +101 -75
- package/lib/DboBuilder/QueryBuilder/prepareHaving.ts +10 -5
- package/lib/DboBuilder/QueryStreamer.ts +207 -100
- package/lib/DboBuilder/TableHandler/DataValidator.ts +253 -148
- package/lib/DboBuilder/TableHandler/TableHandler.ts +155 -60
- package/lib/DboBuilder/TableHandler/delete.ts +82 -29
- package/lib/DboBuilder/TableHandler/insert.ts +177 -81
- package/lib/DboBuilder/TableHandler/insertTest.ts +13 -7
- package/lib/DboBuilder/TableHandler/onDeleteFromFileTable.ts +35 -21
- package/lib/DboBuilder/TableHandler/runInsertUpdateQuery.ts +95 -45
- package/lib/DboBuilder/TableHandler/update.ts +54 -14
- package/lib/DboBuilder/TableHandler/updateBatch.ts +59 -21
- package/lib/DboBuilder/TableHandler/updateFile.ts +57 -26
- package/lib/DboBuilder/TableHandler/upsert.ts +58 -13
- package/lib/DboBuilder/ViewHandler/ViewHandler.ts +264 -121
- package/lib/DboBuilder/ViewHandler/count.ts +56 -25
- package/lib/DboBuilder/ViewHandler/find.ts +153 -68
- package/lib/DboBuilder/ViewHandler/getExistsCondition.ts +59 -32
- package/lib/DboBuilder/ViewHandler/getExistsFilters.ts +31 -19
- package/lib/DboBuilder/ViewHandler/getInfo.ts +47 -16
- package/lib/DboBuilder/ViewHandler/getTableJoinQuery.ts +91 -57
- package/lib/DboBuilder/ViewHandler/parseComplexFilter.ts +51 -29
- package/lib/DboBuilder/ViewHandler/parseFieldFilter.ts +35 -29
- package/lib/DboBuilder/ViewHandler/parseJoinPath.ts +130 -76
- package/lib/DboBuilder/ViewHandler/prepareSortItems.ts +140 -92
- package/lib/DboBuilder/ViewHandler/prepareWhere.ts +66 -26
- package/lib/DboBuilder/ViewHandler/size.ts +56 -22
- package/lib/DboBuilder/ViewHandler/subscribe.ts +122 -46
- package/lib/DboBuilder/ViewHandler/validateViewRules.ts +39 -14
- package/lib/DboBuilder/dboBuilderUtils.ts +41 -18
- package/lib/DboBuilder/getColumns.ts +44 -12
- package/lib/DboBuilder/getCondition.ts +120 -79
- package/lib/DboBuilder/getSubscribeRelatedTables.ts +144 -83
- package/lib/DboBuilder/getTablesForSchemaPostgresSQL.ts +61 -44
- package/lib/DboBuilder/insertNestedRecords.ts +370 -235
- package/lib/DboBuilder/parseUpdateRules.ts +117 -61
- package/lib/DboBuilder/prepareShortestJoinPaths.ts +115 -56
- package/lib/DboBuilder/runSQL.ts +135 -74
- package/lib/DboBuilder/runTransaction.ts +27 -16
- package/lib/DboBuilder/sqlErrCodeToMsg.ts +502 -244
- package/lib/DboBuilder/uploadFile.ts +67 -31
- package/lib/Event_Trigger_Tags.ts +6 -4
- package/lib/FileManager/FileManager.ts +53 -21
- package/lib/FileManager/getValidatedFileType.ts +79 -35
- package/lib/FileManager/initFileManager.ts +21 -9
- package/lib/FileManager/upload.ts +21 -19
- package/lib/FileManager/uploadStream.ts +33 -34
- package/lib/Filtering.ts +249 -197
- package/lib/JSONBValidation/validate_jsonb_schema_sql.ts +2 -7
- package/lib/JSONBValidation/validation.ts +147 -82
- package/lib/Logging.ts +107 -97
- package/lib/PostgresNotifListenManager.ts +96 -63
- package/lib/Prostgles.ts +106 -35
- package/lib/ProstglesTypes.ts +31 -9
- package/lib/PubSubManager/PubSubManager.ts +62 -27
- package/lib/PubSubManager/addSub.ts +56 -37
- package/lib/PubSubManager/addSync.ts +50 -33
- package/lib/PubSubManager/getCreatePubSubManagerError.ts +29 -21
- package/lib/PubSubManager/getPubSubManagerInitQuery.ts +45 -27
- package/lib/PubSubManager/initPubSubManager.ts +27 -18
- package/lib/PubSubManager/notifListener.ts +77 -59
- package/lib/PubSubManager/orphanTriggerCheck.ts +5 -4
- package/lib/PubSubManager/pushSubData.ts +11 -9
- package/lib/PublishParser/PublishParser.ts +102 -44
- package/lib/PublishParser/getFileTableRules.ts +97 -54
- package/lib/PublishParser/getSchemaFromPublish.ts +146 -74
- package/lib/PublishParser/getTableRulesWithoutFileTable.ts +101 -51
- package/lib/PublishParser/publishTypesAndUtils.ts +74 -23
- package/lib/RestApi.ts +10 -2
- package/lib/SchemaWatch/SchemaWatch.ts +52 -34
- package/lib/SchemaWatch/createSchemaWatchEventTrigger.ts +1 -1
- package/lib/SchemaWatch/getValidatedWatchSchemaType.ts +32 -22
- package/lib/SchemaWatch/getWatchSchemaTagList.ts +24 -16
- package/lib/SyncReplication.ts +376 -190
- package/lib/TableConfig/TableConfig.ts +200 -136
- package/lib/TableConfig/getColumnDefinitionQuery.ts +65 -44
- package/lib/TableConfig/getConstraintDefinitionQueries.ts +41 -25
- package/lib/TableConfig/getFutureTableSchema.ts +31 -21
- package/lib/TableConfig/getPGIndexes.ts +7 -4
- package/lib/TableConfig/getTableColumnQueries.ts +101 -54
- package/lib/TableConfig/initTableConfig.ts +192 -101
- package/lib/index.ts +6 -5
- package/lib/initProstgles.ts +57 -51
- package/lib/onSocketConnected.ts +75 -40
- package/lib/runClientRequest.ts +148 -79
- package/lib/shortestPath.ts +80 -76
- package/lib/typeTests/DBoGenerated.d.ts +5 -1
- package/lib/typeTests/dboTypeCheck.ts +8 -8
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"updateBatch.js","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/updateBatch.ts"],"names":[],"mappings":";;;AAEA,
|
|
1
|
+
{"version":3,"file":"updateBatch.js","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/updateBatch.ts"],"names":[],"mappings":"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"}
|
|
@@ -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,WAAW,EAAS,MAAM,eAAe,CAAC;AACnD,OAAO,
|
|
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,WAAW,EAAS,MAAM,eAAe,CAAC;AACnD,OAAO,EACL,SAAS,EAGV,MAAM,mCAAmC,CAAC;AAG3C,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAG9C,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;EAyD9B,CAAC"}
|
|
@@ -12,26 +12,44 @@ const updateFile = async function ({ filter, newData, tableRules, localParams })
|
|
|
12
12
|
if (localParams?.testRule) {
|
|
13
13
|
return { newData: {} };
|
|
14
14
|
}
|
|
15
|
-
const existingMediaId = !(!filter ||
|
|
15
|
+
const existingMediaId = !(!filter ||
|
|
16
|
+
!(0, prostgles_types_1.isObject)(filter) ||
|
|
17
|
+
(0, prostgles_types_1.getKeys)(filter).join() !== "id" ||
|
|
18
|
+
typeof filter.id !== "string")
|
|
19
|
+
? filter.id
|
|
20
|
+
: undefined;
|
|
16
21
|
if (!existingMediaId) {
|
|
17
22
|
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" } `);
|
|
18
23
|
}
|
|
19
24
|
if (!(0, uploadFile_1.isFile)(newData)) {
|
|
20
|
-
throw new Error("Expecting { data: Buffer, name: string } but received " +
|
|
25
|
+
throw new Error("Expecting { data: Buffer, name: string } but received " +
|
|
26
|
+
JSON.stringify(newData));
|
|
21
27
|
}
|
|
22
28
|
const fileManager = this.dboBuilder.prostgles.fileManager;
|
|
23
29
|
if (!fileManager)
|
|
24
30
|
throw new Error("fileManager missing");
|
|
25
31
|
if (rule?.validate && !localParams)
|
|
26
32
|
throw new Error("localParams missing");
|
|
27
|
-
const validate = rule?.validate
|
|
28
|
-
|
|
29
|
-
|
|
33
|
+
const validate = rule?.validate
|
|
34
|
+
? async (row) => {
|
|
35
|
+
return rule.validate({
|
|
36
|
+
update: row,
|
|
37
|
+
filter,
|
|
38
|
+
dbx: (this.tx?.dbTX || this.dboBuilder.dbo),
|
|
39
|
+
localParams: localParams,
|
|
40
|
+
});
|
|
41
|
+
}
|
|
42
|
+
: undefined;
|
|
30
43
|
const existingFile = await (localParams?.tx?.dbTX?.[this.name] || this).findOne({ id: existingMediaId });
|
|
31
44
|
if (!existingFile?.name)
|
|
32
45
|
throw new Error("Existing file record not found");
|
|
33
46
|
await fileManager.deleteFile(existingFile.name);
|
|
34
|
-
const newFile = await uploadFile_1.uploadFile.bind(this)({
|
|
47
|
+
const newFile = await uploadFile_1.uploadFile.bind(this)({
|
|
48
|
+
row: newData,
|
|
49
|
+
validate,
|
|
50
|
+
localParams,
|
|
51
|
+
mediaId: existingFile.id,
|
|
52
|
+
});
|
|
35
53
|
return { newData: (0, PubSubManager_1.omitKeys)(newFile, ["id"]) };
|
|
36
54
|
};
|
|
37
55
|
exports.updateFile = updateFile;
|
|
@@ -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;AAO/D,qEAA6D;AAC7D,8CAAmD;AAU5C,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,GAAW,CAAC,CAC/B,CAAC,MAAM;QACP,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;QACC,CAAC,CAAE,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;YACtD,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAC1B,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,GAAiC,IAAI,EAAE,QAAQ;QAC3D,CAAC,CAAC,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,EAAE,CAAC,IAAI,CAAC,IAAI,CAAkB,IAAI,IAAI,CAC7D,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;AA5DW,QAAA,UAAU,cA4DrB"}
|
|
@@ -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;AAKzD,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,CA6Db,CAAC"}
|
|
@@ -6,8 +6,9 @@ const upsert = async function (filter, newData, params, table_rules, localParams
|
|
|
6
6
|
const start = Date.now();
|
|
7
7
|
try {
|
|
8
8
|
const _upsert = async function (tblH) {
|
|
9
|
-
return tblH
|
|
10
|
-
.
|
|
9
|
+
return tblH
|
|
10
|
+
.find(filter, { select: "", limit: 1 }, undefined, table_rules, localParams)
|
|
11
|
+
.then((exists) => {
|
|
11
12
|
if (exists && exists.length) {
|
|
12
13
|
return tblH.update(filter, newData, params, table_rules, localParams);
|
|
13
14
|
}
|
|
@@ -18,15 +19,30 @@ const upsert = async function (filter, newData, params, table_rules, localParams
|
|
|
18
19
|
};
|
|
19
20
|
/* Do it within a transaction to ensure consisency */
|
|
20
21
|
if (!this.tx) {
|
|
21
|
-
return this.dboBuilder.getTX(dbTX => _upsert(dbTX[this.name]));
|
|
22
|
+
return this.dboBuilder.getTX((dbTX) => _upsert(dbTX[this.name]));
|
|
22
23
|
}
|
|
23
24
|
const result = await _upsert(this);
|
|
24
|
-
await this._log({
|
|
25
|
+
await this._log({
|
|
26
|
+
command: "upsert",
|
|
27
|
+
localParams,
|
|
28
|
+
data: { filter, newData, params },
|
|
29
|
+
duration: Date.now() - start,
|
|
30
|
+
});
|
|
25
31
|
return result;
|
|
26
32
|
}
|
|
27
33
|
catch (e) {
|
|
28
|
-
await this._log({
|
|
29
|
-
|
|
34
|
+
await this._log({
|
|
35
|
+
command: "upsert",
|
|
36
|
+
localParams,
|
|
37
|
+
data: { filter, newData, params },
|
|
38
|
+
duration: Date.now() - start,
|
|
39
|
+
error: (0, dboBuilderUtils_1.getErrorAsObject)(e),
|
|
40
|
+
});
|
|
41
|
+
throw (0, dboBuilderUtils_1.getSerializedClientErrorFromPGError)(e, {
|
|
42
|
+
type: "tableMethod",
|
|
43
|
+
localParams,
|
|
44
|
+
view: this,
|
|
45
|
+
});
|
|
30
46
|
}
|
|
31
47
|
};
|
|
32
48
|
exports.upsert = upsert;
|
|
@@ -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,wDAG4B;AAGrB,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,CACH,MAAM,EACN,EAAE,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,EACxB,SAAS,EACT,WAAW,EACX,WAAW,CACZ;iBACA,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;gBACf,IAAI,MAAM,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;oBAC5B,OAAO,IAAI,CAAC,MAAM,CAChB,MAAM,EACN,OAAO,EACP,MAAM,EACN,WAAW,EACX,WAAW,CACZ,CAAC;gBACJ,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,CACpC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAiB,CAAC,CACzC,CAAC;QACJ,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;AApEW,QAAA,MAAM,UAoEjB"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import * as pgPromise from
|
|
1
|
+
import * as pgPromise from "pg-promise";
|
|
2
2
|
import { AnyObject, ColumnInfo, FieldFilter, SelectParams, SubscribeParams } from "prostgles-types";
|
|
3
3
|
import { TableEvent } from "../../Logging";
|
|
4
4
|
import { DB } from "../../Prostgles";
|
|
@@ -6,7 +6,7 @@ import { Join } from "../../ProstglesTypes";
|
|
|
6
6
|
import { TableRule } from "../../PublishParser/PublishParser";
|
|
7
7
|
import { Graph } from "../../shortestPath";
|
|
8
8
|
import { DboBuilder, Filter, LocalParams, TableHandlers, ValidatedTableRules } from "../DboBuilder";
|
|
9
|
-
import { TableSchema } from
|
|
9
|
+
import { TableSchema } from "../DboBuilderTypes";
|
|
10
10
|
import { LocalFuncs } from "./subscribe";
|
|
11
11
|
export type JoinPaths = {
|
|
12
12
|
t1: string;
|
|
@@ -38,7 +38,7 @@ export declare class ViewHandler {
|
|
|
38
38
|
t: pgPromise.ITask<{}>;
|
|
39
39
|
dbTX: TableHandlers;
|
|
40
40
|
}, joinPaths?: JoinPaths);
|
|
41
|
-
_log: ({ command, data, localParams, duration, error }: Pick<import("../../Logging").EventTypes.Table, "command" | "localParams" | "data"> & {
|
|
41
|
+
_log: ({ command, data, localParams, duration, error, }: Pick<import("../../Logging").EventTypes.Table, "command" | "localParams" | "data"> & {
|
|
42
42
|
duration: number;
|
|
43
43
|
error?: any;
|
|
44
44
|
}) => Promise<void> | undefined;
|
|
@@ -91,7 +91,7 @@ export declare class ViewHandler {
|
|
|
91
91
|
parseFieldFilter(fieldParams?: FieldFilter, allow_empty?: boolean, allowed_cols?: string[]): string[];
|
|
92
92
|
}
|
|
93
93
|
/**
|
|
94
|
-
* Throw error if illegal keys found in object
|
|
95
|
-
*/
|
|
94
|
+
* Throw error if illegal keys found in object
|
|
95
|
+
*/
|
|
96
96
|
export declare const validateObj: <T extends Record<string, any>>(obj: T, allowedKeys: string[]) => T;
|
|
97
97
|
//# sourceMappingURL=ViewHandler.d.ts.map
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"ViewHandler.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/ViewHandler.ts"],"names":[],"mappings":"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"}
|
|
@@ -45,15 +45,17 @@ class ViewHandler {
|
|
|
45
45
|
this.escapedName = tableOrViewInfo.escaped_identifier;
|
|
46
46
|
this.columns = tableOrViewInfo.columns;
|
|
47
47
|
/* cols are sorted by name to reduce .d.ts schema rewrites */
|
|
48
|
-
this.columnsForTypes = tableOrViewInfo.columns
|
|
49
|
-
|
|
48
|
+
this.columnsForTypes = tableOrViewInfo.columns
|
|
49
|
+
.slice(0)
|
|
50
|
+
.sort((a, b) => a.name.localeCompare(b.name));
|
|
51
|
+
this.column_names = tableOrViewInfo.columns.map((c) => c.name);
|
|
50
52
|
this.dboBuilder = dboBuilder;
|
|
51
53
|
this.joins = this.dboBuilder.joins ?? [];
|
|
52
54
|
this.columnsForTypes.map(({ name, udt_name, is_nullable }) => {
|
|
53
55
|
this.tsColumnDefs.push(`${(0, DboBuilder_1.escapeTSNames)(name)}?: ${(0, DboBuilder_1.postgresToTsType)(udt_name)} ${is_nullable ? " | null " : ""};`);
|
|
54
56
|
});
|
|
55
57
|
}
|
|
56
|
-
_log = ({ command, data, localParams, duration, error }) => {
|
|
58
|
+
_log = ({ command, data, localParams, duration, error, }) => {
|
|
57
59
|
if (localParams?.noLog) {
|
|
58
60
|
if (localParams?.socket || localParams.httpReq) {
|
|
59
61
|
throw new Error("noLog option is not allowed from a remote client");
|
|
@@ -78,33 +80,40 @@ class ViewHandler {
|
|
|
78
80
|
let allowed_cols = this.column_names;
|
|
79
81
|
if (allowedFields)
|
|
80
82
|
allowed_cols = this.parseFieldFilter(allowedFields);
|
|
81
|
-
return "md5(" +
|
|
83
|
+
return ("md5(" +
|
|
82
84
|
allowed_cols
|
|
83
85
|
/* CTID not available in AFTER trigger */
|
|
84
86
|
// .concat(this.is_view? [] : ["ctid"])
|
|
85
87
|
.sort()
|
|
86
|
-
.map(f => (tableAlias ? (
|
|
87
|
-
.map(f => `md5(coalesce(${f}::text, 'dd'))`)
|
|
88
|
+
.map((f) => (tableAlias ? (0, prostgles_types_1.asName)(tableAlias) + "." : "") + (0, prostgles_types_1.asName)(f))
|
|
89
|
+
.map((f) => `md5(coalesce(${f}::text, 'dd'))`)
|
|
88
90
|
.join(" || ") +
|
|
89
|
-
`)` +
|
|
91
|
+
`)` +
|
|
92
|
+
(alias ? ` as ${(0, prostgles_types_1.asName)(alias)}` : ""));
|
|
90
93
|
}
|
|
91
94
|
validateViewRules = validateViewRules_1.validateViewRules.bind(this);
|
|
92
95
|
getShortestJoin(table1, table2, startAlias, isInner = false) {
|
|
93
96
|
const getJoinCondition = (on, leftTable, rightTable) => {
|
|
94
|
-
return on
|
|
97
|
+
return on
|
|
98
|
+
.map((cond) => Object.keys(cond)
|
|
99
|
+
.map((lKey) => `${leftTable}.${lKey} = ${rightTable}.${cond[lKey]}`)
|
|
100
|
+
.join("\nAND "))
|
|
101
|
+
.join(" OR ");
|
|
95
102
|
};
|
|
96
103
|
// let toOne = true;
|
|
97
|
-
const query = this.joins
|
|
104
|
+
const query = this.joins
|
|
105
|
+
.map(({ tables, on, type }, i) => {
|
|
98
106
|
if (type.split("-")[1] === "many") {
|
|
99
107
|
// toOne = false;
|
|
100
108
|
}
|
|
101
109
|
const tl = `tl${startAlias + i}`, tr = `tr${startAlias + i}`;
|
|
102
110
|
return `FROM ${tables[0]} ${tl} ${isInner ? "INNER" : "LEFT"} JOIN ${tables[1]} ${tr} ON ${getJoinCondition(on, tl, tr)}`;
|
|
103
|
-
})
|
|
111
|
+
})
|
|
112
|
+
.join("\n");
|
|
104
113
|
return { query, toOne: false };
|
|
105
114
|
}
|
|
106
115
|
checkFilter(filter) {
|
|
107
|
-
if (filter === null || filter && !(0, prostgles_types_1.isObject)(filter))
|
|
116
|
+
if (filter === null || (filter && !(0, prostgles_types_1.isObject)(filter)))
|
|
108
117
|
throw `invalid filter -> ${JSON.stringify(filter)} \nExpecting: undefined | {} | { field_name: "value" } | { field: { $gt: 22 } } ... `;
|
|
109
118
|
}
|
|
110
119
|
getInfo = getInfo_1.getInfo.bind(this);
|
|
@@ -114,12 +123,15 @@ class ViewHandler {
|
|
|
114
123
|
throw "INTERNAL ERROR: Unexpected case -> localParams && !tableRules";
|
|
115
124
|
}
|
|
116
125
|
/* Computed fields are allowed only if select is allowed */
|
|
117
|
-
const allColumns = this.column_names
|
|
126
|
+
const allColumns = this.column_names
|
|
127
|
+
.slice(0)
|
|
128
|
+
.map((fieldName) => ({
|
|
118
129
|
type: "column",
|
|
119
130
|
name: fieldName,
|
|
120
131
|
getQuery: ({ tableAlias }) => (0, QueryBuilder_1.asNameAlias)(fieldName, tableAlias),
|
|
121
|
-
selected: false
|
|
122
|
-
}))
|
|
132
|
+
selected: false,
|
|
133
|
+
}))
|
|
134
|
+
.concat(Functions_1.COMPUTED_FIELDS.map((c) => ({
|
|
123
135
|
type: c.type,
|
|
124
136
|
name: c.name,
|
|
125
137
|
getQuery: ({ tableAlias, allowedFields }) => c.getQuery({
|
|
@@ -128,9 +140,9 @@ class ViewHandler {
|
|
|
128
140
|
allColumns: this.columns,
|
|
129
141
|
/* CTID not available in AFTER trigger */
|
|
130
142
|
// ctidField: this.is_view? undefined : "ctid",
|
|
131
|
-
tableAlias
|
|
143
|
+
tableAlias,
|
|
132
144
|
}),
|
|
133
|
-
selected: false
|
|
145
|
+
selected: false,
|
|
134
146
|
})));
|
|
135
147
|
if (tableRules) {
|
|
136
148
|
if ((0, prostgles_types_1.isEmpty)(tableRules))
|
|
@@ -138,7 +150,7 @@ class ViewHandler {
|
|
|
138
150
|
const throwFieldsErr = (command, fieldType = "fields") => {
|
|
139
151
|
throw `Invalid publish.${this.name}.${command} rule -> ${fieldType} setting is missing.\nPlease specify allowed ${fieldType} in this format: "*" | { col_name: false } | { col1: true, col2: true }`;
|
|
140
152
|
}, getFirstSpecified = (...fieldParams) => {
|
|
141
|
-
const firstValid = fieldParams.find(fp => fp !== undefined);
|
|
153
|
+
const firstValid = fieldParams.find((fp) => fp !== undefined);
|
|
142
154
|
return this.parseFieldFilter(firstValid);
|
|
143
155
|
};
|
|
144
156
|
const res = {
|
|
@@ -150,19 +162,24 @@ class ViewHandler {
|
|
|
150
162
|
if (!tableRules.select.fields)
|
|
151
163
|
return throwFieldsErr("select");
|
|
152
164
|
let maxLimit = null;
|
|
153
|
-
if (!localParams?.bypassLimit &&
|
|
165
|
+
if (!localParams?.bypassLimit &&
|
|
166
|
+
tableRules.select.maxLimit !== undefined &&
|
|
167
|
+
tableRules.select.maxLimit !== maxLimit) {
|
|
154
168
|
const ml = tableRules.select.maxLimit;
|
|
155
169
|
if (ml !== null && (!Number.isInteger(ml) || ml < 0))
|
|
156
|
-
throw ` Invalid publish.${this.name}.select.maxLimit -> expecting a positive integer OR null but got ` +
|
|
170
|
+
throw (` Invalid publish.${this.name}.select.maxLimit -> expecting a positive integer OR null but got ` +
|
|
171
|
+
ml);
|
|
157
172
|
maxLimit = ml;
|
|
158
173
|
}
|
|
159
174
|
const fields = this.parseFieldFilter(tableRules.select.fields);
|
|
160
175
|
res.select = {
|
|
161
176
|
fields,
|
|
162
|
-
orderByFields: tableRules.select.orderByFields ?
|
|
177
|
+
orderByFields: tableRules.select.orderByFields ?
|
|
178
|
+
this.parseFieldFilter(tableRules.select.orderByFields)
|
|
179
|
+
: fields,
|
|
163
180
|
forcedFilter: { ...tableRules.select.forcedFilter },
|
|
164
181
|
filterFields: this.parseFieldFilter(tableRules.select.filterFields),
|
|
165
|
-
maxLimit
|
|
182
|
+
maxLimit,
|
|
166
183
|
};
|
|
167
184
|
}
|
|
168
185
|
if (tableRules.update) {
|
|
@@ -173,7 +190,7 @@ class ViewHandler {
|
|
|
173
190
|
forcedData: { ...tableRules.update.forcedData },
|
|
174
191
|
forcedFilter: { ...tableRules.update.forcedFilter },
|
|
175
192
|
returningFields: getFirstSpecified(tableRules.update?.returningFields, tableRules?.select?.fields, tableRules.update.fields),
|
|
176
|
-
filterFields: this.parseFieldFilter(tableRules.update.filterFields)
|
|
193
|
+
filterFields: this.parseFieldFilter(tableRules.update.filterFields),
|
|
177
194
|
};
|
|
178
195
|
}
|
|
179
196
|
if (tableRules.insert) {
|
|
@@ -182,7 +199,7 @@ class ViewHandler {
|
|
|
182
199
|
res.insert = {
|
|
183
200
|
fields: this.parseFieldFilter(tableRules.insert.fields),
|
|
184
201
|
forcedData: { ...tableRules.insert.forcedData },
|
|
185
|
-
returningFields: getFirstSpecified(tableRules.insert.returningFields, tableRules?.select?.fields, tableRules.insert.fields)
|
|
202
|
+
returningFields: getFirstSpecified(tableRules.insert.returningFields, tableRules?.select?.fields, tableRules.insert.fields),
|
|
186
203
|
};
|
|
187
204
|
}
|
|
188
205
|
if (tableRules.delete) {
|
|
@@ -191,7 +208,7 @@ class ViewHandler {
|
|
|
191
208
|
res.delete = {
|
|
192
209
|
forcedFilter: { ...tableRules.delete.forcedFilter },
|
|
193
210
|
filterFields: this.parseFieldFilter(tableRules.delete.filterFields),
|
|
194
|
-
returningFields: getFirstSpecified(tableRules.delete.returningFields, tableRules?.select?.fields, tableRules.delete.filterFields)
|
|
211
|
+
returningFields: getFirstSpecified(tableRules.delete.returningFields, tableRules?.select?.fields, tableRules.delete.filterFields),
|
|
195
212
|
};
|
|
196
213
|
}
|
|
197
214
|
if (!tableRules.select && !tableRules.update && !tableRules.delete && !tableRules.insert) {
|
|
@@ -220,18 +237,18 @@ class ViewHandler {
|
|
|
220
237
|
filterFields: allCols,
|
|
221
238
|
forcedFilter: {},
|
|
222
239
|
forcedData: {},
|
|
223
|
-
returningFields: allCols
|
|
240
|
+
returningFields: allCols,
|
|
224
241
|
},
|
|
225
242
|
insert: {
|
|
226
243
|
fields: allCols,
|
|
227
244
|
forcedData: {},
|
|
228
|
-
returningFields: allCols
|
|
245
|
+
returningFields: allCols,
|
|
229
246
|
},
|
|
230
247
|
delete: {
|
|
231
248
|
filterFields: allCols,
|
|
232
249
|
forcedFilter: {},
|
|
233
|
-
returningFields: allCols
|
|
234
|
-
}
|
|
250
|
+
returningFields: allCols,
|
|
251
|
+
},
|
|
235
252
|
};
|
|
236
253
|
}
|
|
237
254
|
}
|
|
@@ -244,16 +261,27 @@ class ViewHandler {
|
|
|
244
261
|
}
|
|
245
262
|
const start = Date.now();
|
|
246
263
|
const result = await this.find(filter, { ...params, limit: 1, returnType: "row" }, undefined, table_rules, localParams);
|
|
247
|
-
await this._log({
|
|
264
|
+
await this._log({
|
|
265
|
+
command: "find",
|
|
266
|
+
localParams,
|
|
267
|
+
data: { filter, selectParams },
|
|
268
|
+
duration: Date.now() - start,
|
|
269
|
+
});
|
|
248
270
|
return result;
|
|
249
271
|
}
|
|
250
272
|
catch (e) {
|
|
251
|
-
throw (0, DboBuilder_1.getSerializedClientErrorFromPGError)(e, {
|
|
273
|
+
throw (0, DboBuilder_1.getSerializedClientErrorFromPGError)(e, {
|
|
274
|
+
type: "tableMethod",
|
|
275
|
+
localParams,
|
|
276
|
+
view: this,
|
|
277
|
+
});
|
|
252
278
|
}
|
|
253
279
|
}
|
|
254
280
|
async subscribe(filter, params, localFuncs, table_rules, localParams) {
|
|
255
281
|
//@ts-ignore
|
|
256
|
-
return subscribe_1.subscribe.bind(this)(filter, params,
|
|
282
|
+
return subscribe_1.subscribe.bind(this)(filter, params,
|
|
283
|
+
//@ts-ignore
|
|
284
|
+
localFuncs, table_rules, localParams);
|
|
257
285
|
}
|
|
258
286
|
subscribeOne(filter, params = {}, localFunc, table_rules, localParams) {
|
|
259
287
|
//@ts-ignore
|
|
@@ -272,7 +300,7 @@ class ViewHandler {
|
|
|
272
300
|
if (allowed_cols) {
|
|
273
301
|
allowedFields = this.parseFieldFilter(allowed_cols, allow_empty);
|
|
274
302
|
}
|
|
275
|
-
let col_names = (resultFields || []).filter(f => !allowedFields || allowedFields.includes(f));
|
|
303
|
+
let col_names = (resultFields || []).filter((f) => !allowedFields || allowedFields.includes(f));
|
|
276
304
|
/* Maintain allowed cols order */
|
|
277
305
|
if (selectParams === "*" && allowedFields && allowedFields.length) {
|
|
278
306
|
col_names = allowedFields;
|
|
@@ -293,7 +321,7 @@ class ViewHandler {
|
|
|
293
321
|
if (!removeDisallowedFields) {
|
|
294
322
|
throw `dissallowed/invalid field found for ${this.name}: `;
|
|
295
323
|
}
|
|
296
|
-
result = result.filter(key => !_dissalowed.includes(key));
|
|
324
|
+
result = result.filter((key) => !_dissalowed.includes(key));
|
|
297
325
|
}
|
|
298
326
|
return result;
|
|
299
327
|
}
|
|
@@ -303,11 +331,11 @@ class ViewHandler {
|
|
|
303
331
|
}
|
|
304
332
|
exports.ViewHandler = ViewHandler;
|
|
305
333
|
/**
|
|
306
|
-
* Throw error if illegal keys found in object
|
|
307
|
-
*/
|
|
334
|
+
* Throw error if illegal keys found in object
|
|
335
|
+
*/
|
|
308
336
|
const validateObj = (obj, allowedKeys) => {
|
|
309
337
|
if (obj && Object.keys(obj).length) {
|
|
310
|
-
const invalid_keys = Object.keys(obj).filter(k => !allowedKeys.includes(k));
|
|
338
|
+
const invalid_keys = Object.keys(obj).filter((k) => !allowedKeys.includes(k));
|
|
311
339
|
if (invalid_keys.length) {
|
|
312
340
|
throw "Invalid/Illegal fields found: " + invalid_keys.join(", ");
|
|
313
341
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ViewHandler.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/ViewHandler.ts"],"names":[],"mappings":";;;AACA,qDAOyB;AAMzB,8CAQuB;AAEvB,yDAAuE;AACvE,+DAA2D;AAC3D,8CAA2C;AAC3C,mCAAgC;AAChC,iCAA8B;AAC9B,uCAAoC;AACpC,yDAAsD;AACtD,iDAA8C;AAC9C,iCAA8B;AAC9B,2CAAoD;AACpD,2DAAwD;AAQxD,MAAa,WAAW;IACtB,EAAE,CAAK;IACP,IAAI,CAAS;IACb,WAAW,CAAS;IACpB,OAAO,CAAyB;IAChC,eAAe,CAAe;IAC9B,YAAY,CAAW;IACvB,eAAe,CAAc;IAC7B,YAAY,GAAa,EAAE,CAAC;IAC5B,KAAK,CAAS;IACd,SAAS,CAAS;IAClB,SAAS,CAAa;IACtB,UAAU,CAAa;IAEvB,EAAE,CAGD;IACD,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC,EAAE,CAAC;IAC/B,CAAC;IAED,OAAO,GAAG,IAAI,CAAC;IACf,SAAS,GAAG,EAAE,CAAC;IACf,QAAQ,GAAG,KAAK,CAAC;IACjB,YAAY,EAAM,EAAE,eAA4B,EAAE,UAAsB,EAAE,EAAoD,EAAE,SAAqB;QACnJ,IAAI,CAAC,EAAE,IAAI,CAAC,eAAe;YAAE,MAAM,EAAE,CAAC;QAEtC,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;QACvC,IAAI,CAAC,IAAI,GAAG,eAAe,CAAC,kBAAkB,CAAC;QAC/C,IAAI,CAAC,WAAW,GAAG,eAAe,CAAC,kBAAkB,CAAC;QACtD,IAAI,CAAC,OAAO,GAAG,eAAe,CAAC,OAAO,CAAC;QACvC,6DAA6D;QAC7D,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;QAErG,IAAI,CAAC,YAAY,GAAG,eAAe,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QAE7D,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,IAAI,EAAE,CAAC;QACzC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,EAAE,EAAE;YAC3D,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,IAAA,0BAAa,EAAC,IAAI,CAAC,MAAM,IAAA,6BAAgB,EAAC,QAAQ,CAAW,IAAI,WAAW,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;QAC/H,CAAC,CAAC,CAAC;IACL,CAAC;IAED,IAAI,GAAG,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,KAAK,EAA6F,EAAE,EAAE;QACpJ,IAAG,WAAW,EAAE,KAAK,EAAC,CAAC;YACrB,IAAG,WAAW,EAAE,MAAM,IAAI,WAAW,CAAC,OAAO,EAAE,CAAC;gBAC9C,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;YACtE,CAAC;YACD,OAAO;QACT,CAAC;QACD,MAAM,GAAG,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,WAAW,EAAE,aAAa,CAAC,WAAW,CAAC,CAAC;QAC9E,OAAO,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;YAC5C,IAAI,EAAE,OAAO;YACb,OAAO;YACP,QAAQ;YACR,KAAK;YACL,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG;YACtB,GAAG;YACH,QAAQ,EAAE,WAAW,EAAE,MAAM,EAAE,EAAE;YACjC,SAAS,EAAE,IAAI,CAAC,IAAI;YACpB,IAAI;YACJ,WAAW;SACZ,CAAC,CAAC;IACL,CAAC,CAAA;IAED,gBAAgB,CAAC,aAA0B,EAAE,KAAc,EAAE,UAAmB;QAC9E,IAAI,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC;QACrC,IAAI,aAAa;YAAE,YAAY,GAAG,IAAI,CAAC,gBAAgB,CAAC,aAAa,CAAC,CAAC;QACvE,OAAO,MAAM;YACX,YAAY;gBACV,yCAAyC;gBACzC,uCAAuC;iBACtC,IAAI,EAAE;iBACN,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAA,wBAAM,EAAC,UAAU,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,IAAA,wBAAM,EAAC,CAAC,CAAC,CAAC;iBACpE,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,gBAAgB,CAAC,gBAAgB,CAAC;iBAC3C,IAAI,CAAC,MAAM,CAAC;YACf,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,IAAA,wBAAM,EAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IAChD,CAAC;IAED,iBAAiB,GAAG,qCAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAEjD,eAAe,CAAC,MAAc,EAAE,MAAc,EAAE,UAAkB,EAAE,OAAO,GAAG,KAAK;QACjF,MAAM,gBAAgB,GAAG,CAAC,EAA4B,EAAE,SAAiB,EAAE,UAAkB,EAAE,EAAE;YAC/F,OAAO,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,SAAS,IAAI,IAAI,MAAM,UAAU,IAAI,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QACxI,CAAC,CAAA;QAED,oBAAoB;QACpB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,EAAE,EAAE;YACrD,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,MAAM,EAAE,CAAC;gBAClC,iBAAiB;YACnB,CAAC;YACD,MAAM,EAAE,GAAG,KAAK,UAAU,GAAG,CAAC,EAAE,EAC9B,EAAE,GAAG,KAAK,UAAU,GAAG,CAAC,EAAE,CAAC;YAC7B,OAAO,QAAQ,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,IAAI,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,SAAS,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,OAAO,gBAAgB,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC;QAC5H,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAChB,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,CAAA;IAChC,CAAC;IAED,WAAW,CAAC,MAAW;QACrB,IAAI,MAAM,KAAK,IAAI,IAAI,MAAM,IAAI,CAAC,IAAA,0BAAQ,EAAC,MAAM,CAAC;YAAE,MAAM,qBAAqB,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,yFAAyF,CAAC;IACjM,CAAC;IAED,OAAO,GAAG,iBAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAE5B,UAAU,GAAG,uBAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAEnC,iBAAiB,CAAC,UAAsB,EAAE,WAAyB;QAEjE,IAAI,WAAW,EAAE,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;YACvC,MAAM,+DAA+D,CAAC;QACxE,CAAC;QAED,2DAA2D;QAC3D,MAAM,UAAU,GAAgB,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;YAC3E,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,SAAS;YACf,QAAQ,EAAE,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,IAAA,0BAAW,EAAC,SAAS,EAAE,UAAU,CAAC;YAChE,QAAQ,EAAE,KAAK;SACF,CAAA,CAAC,CAAC,MAAM,CAAC,2BAAe,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YAChD,IAAI,EAAE,CAAC,CAAC,IAAI;YACZ,IAAI,EAAE,CAAC,CAAC,IAAI;YACZ,QAAQ,EAAE,CAAC,EAAE,UAAU,EAAE,aAAa,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC;gBACtD,aAAa;gBACb,SAAS,EAAE,SAAS;gBACpB,UAAU,EAAE,IAAI,CAAC,OAAO;gBAExB,yCAAyC;gBACzC,+CAA+C;gBAC/C,UAAU;aACX,CAAC;YACF,QAAQ,EAAE,KAAK;SAChB,CAAC,CAAC,CAAC,CAAC;QAEL,IAAI,UAAU,EAAE,CAAC;YACf,IAAI,IAAA,yBAAO,EAAC,UAAU,CAAC;gBAAE,MAAM,2DAA2D,GAAG,IAAI,CAAC,IAAI,CAAC;YACvG,MAAM,cAAc,GAAG,CAAC,OAAkD,EAAE,SAAS,GAAG,QAAQ,EAAE,EAAE;gBAClG,MAAM,mBAAmB,IAAI,CAAC,IAAI,IAAI,OAAO,YAAY,SAAS,gDAAgD,SAAS,yEAAyE,CAAC;YACvM,CAAC,EACC,iBAAiB,GAAG,CAAC,GAAG,WAAwC,EAAY,EAAE;gBAC5E,MAAM,UAAU,GAAG,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,SAAS,CAAC,CAAC;gBAC5D,OAAO,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAA;YAC1C,CAAC,CAAC;YAEJ,MAAM,GAAG,GAAwB;gBAC/B,UAAU;gBACV,UAAU,EAAE,UAAU,EAAE,UAAU,IAAI,IAAI;gBAC1C,OAAO,EAAE,UAAU,EAAE,UAAU,IAAI,IAAI;aACjB,CAAC;YAEzB,IAAI,UAAU,CAAC,MAAM,EAAE,CAAC;gBACtB,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM;oBAAE,OAAO,cAAc,CAAC,QAAQ,CAAC,CAAC;gBAE/D,IAAI,QAAQ,GAAkB,IAAI,CAAC;gBACnC,IAAI,CAAC,WAAW,EAAE,WAAW,IAAI,UAAU,CAAC,MAAM,CAAC,QAAQ,KAAK,SAAS,IAAI,UAAU,CAAC,MAAM,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;oBACrH,MAAM,EAAE,GAAG,UAAU,CAAC,MAAM,CAAC,QAAQ,CAAC;oBACtC,IAAI,EAAE,KAAK,IAAI,IAAI,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;wBAAE,MAAM,oBAAoB,IAAI,CAAC,IAAI,wEAAwE,GAAG,EAAE,CAAC;oBACvK,QAAQ,GAAG,EAAE,CAAC;gBAChB,CAAC;gBAED,MAAM,MAAM,GAAG,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;gBAC9D,GAAG,CAAC,MAAM,GAAG;oBACX,MAAM;oBACN,aAAa,EAAE,UAAU,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,MAAM;oBAChH,YAAY,EAAE,EAAE,GAAG,UAAU,CAAC,MAAM,CAAC,YAAY,EAAE;oBACnD,YAAY,EAAE,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,MAAM,CAAC,YAAY,CAAC;oBACnE,QAAQ;iBACT,CAAC;YACJ,CAAC;YAED,IAAI,UAAU,CAAC,MAAM,EAAE,CAAC;gBACtB,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM;oBAAE,OAAO,cAAc,CAAC,QAAQ,CAAC,CAAC;gBAE/D,GAAG,CAAC,MAAM,GAAG;oBACX,MAAM,EAAE,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC;oBACvD,UAAU,EAAE,EAAE,GAAG,UAAU,CAAC,MAAM,CAAC,UAAU,EAAE;oBAC/C,YAAY,EAAE,EAAE,GAAG,UAAU,CAAC,MAAM,CAAC,YAAY,EAAE;oBACnD,eAAe,EAAE,iBAAiB,CAAC,UAAU,CAAC,MAAM,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC;oBAC5H,YAAY,EAAE,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,MAAM,CAAC,YAAY,CAAC;iBACpE,CAAA;YACH,CAAC;YAED,IAAI,UAAU,CAAC,MAAM,EAAE,CAAC;gBACtB,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM;oBAAE,OAAO,cAAc,CAAC,QAAQ,CAAC,CAAC;gBAE/D,GAAG,CAAC,MAAM,GAAG;oBACX,MAAM,EAAE,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC;oBACvD,UAAU,EAAE,EAAE,GAAG,UAAU,CAAC,MAAM,CAAC,UAAU,EAAE;oBAC/C,eAAe,EAAE,iBAAiB,CAAC,UAAU,CAAC,MAAM,CAAC,eAAe,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC;iBAC5H,CAAA;YACH,CAAC;YAED,IAAI,UAAU,CAAC,MAAM,EAAE,CAAC;gBACtB,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,YAAY;oBAAE,OAAO,cAAc,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;gBAErF,GAAG,CAAC,MAAM,GAAG;oBACX,YAAY,EAAE,EAAE,GAAG,UAAU,CAAC,MAAM,CAAC,YAAY,EAAE;oBACnD,YAAY,EAAE,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,MAAM,CAAC,YAAY,CAAC;oBACnE,eAAe,EAAE,iBAAiB,CAAC,UAAU,CAAC,MAAM,CAAC,eAAe,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,MAAM,CAAC,YAAY,CAAC;iBAClI,CAAA;YACH,CAAC;YAED,IAAI,CAAC,UAAU,CAAC,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC;gBACzF,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,OAAc,CAAC;oBAAE,GAAG,CAAC,OAAO,GAAG,KAAK,CAAC;gBAC3E,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,UAAiB,CAAC;oBAAE,GAAG,CAAC,UAAU,GAAG,KAAK,CAAC;YACnF,CAAC;YAED,OAAO,GAAG,CAAC;QACb,CAAC;aAAM,CAAC;YACN,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAC3C,OAAO;gBACL,UAAU;gBACV,UAAU,EAAE,IAAI;gBAChB,OAAO,EAAE,IAAI;gBACb,MAAM,EAAE;oBACN,MAAM,EAAE,OAAO;oBACf,YAAY,EAAE,OAAO;oBACrB,aAAa,EAAE,OAAO;oBACtB,YAAY,EAAE,EAAE;oBAChB,QAAQ,EAAE,IAAI;iBACf;gBACD,MAAM,EAAE;oBACN,MAAM,EAAE,OAAO;oBACf,YAAY,EAAE,OAAO;oBACrB,YAAY,EAAE,EAAE;oBAChB,UAAU,EAAE,EAAE;oBACd,eAAe,EAAE,OAAO;iBACzB;gBACD,MAAM,EAAE;oBACN,MAAM,EAAE,OAAO;oBACf,UAAU,EAAE,EAAE;oBACd,eAAe,EAAE,OAAO;iBACzB;gBACD,MAAM,EAAE;oBACN,YAAY,EAAE,OAAO;oBACrB,YAAY,EAAE,EAAE;oBAChB,eAAe,EAAE,OAAO;iBACzB;aACF,CAAC;QAEJ,CAAC;IAEH,CAAC;IACD,IAAI,GAAG,WAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAEvB,KAAK,CAAC,OAAO,CAAC,MAAe,EAAE,YAA2B,EAAE,cAA0B,EAAE,WAAuB,EAAE,WAAyB;QAExI,IAAI,CAAC;YACH,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,EAAE,GAAG,YAAY,IAAI,EAAE,CAAC;YAChD,IAAI,KAAK,EAAE,CAAC;gBACV,MAAM,gCAAgC,CAAC;YACzC,CAAC;YACD,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YACzB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,GAAG,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,UAAU,EAAE,KAAK,EAAE,EAAE,SAAS,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;YACxH,MAAM,IAAI,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,EAAE,MAAM,EAAE,YAAY,EAAE,EAAE,QAAQ,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,EAAE,CAAC,CAAC;YAChH,OAAO,MAAM,CAAC;QAChB,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,MAAM,IAAA,gDAAmC,EAAC,CAAC,EAAE,EAAE,IAAI,EAAE,aAAa,EAAE,WAAW,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;QACjG,CAAC;IACH,CAAC;IAID,KAAK,CAAC,SAAS,CAAC,MAAc,EAAE,MAAuB,EAAE,UAAuB,EAAE,WAAuB,EAAE,WAAyB;QAEhI,YAAY;QACZ,OAAO,qBAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;IACtF,CAAC;IAKD,YAAY,CAAC,MAAc,EAAE,SAA0B,EAAE,EAAE,SAAoC,EAAE,WAAuB,EAAE,WAAyB;QAG/I,YAAY;QACZ,MAAM,IAAI,GAAG,WAAW,CAAA,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAiB,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QAChF,YAAY;QACZ,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,EAAE,GAAG,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;IAC3F,CAAC;IAED,KAAK,GAAG,aAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACzB,IAAI,GAAG,WAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAEvB,sBAAsB,CAAC,eAA4B,GAAG,EAAE,YAAyB,EAAE,WAAW,GAAG,IAAI;QACnG,MAAM,WAAW,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAC/C,IAAI,aAAa,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,EACtC,YAAY,GAAa,EAAE,CAAC;QAE9B,IAAI,YAAY,EAAE,CAAC;YACjB,YAAY,GAAG,IAAI,CAAC,gBAAgB,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;QAClE,CAAC;QACD,IAAI,YAAY,EAAE,CAAC;YACjB,aAAa,GAAG,IAAI,CAAC,gBAAgB,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;QACnE,CAAC;QACD,IAAI,SAAS,GAAG,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,aAAa,IAAI,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;QAE9F,iCAAiC;QACjC,IAAI,YAAY,KAAK,GAAG,IAAI,aAAa,IAAI,aAAa,CAAC,MAAM,EAAC,CAAC;YACjE,SAAS,GAAG,aAAa,CAAC;QAC5B,CAAC;QAED,OAAO,SAAS,CAAC;IACnB,CAAC;IAED;;OAEG;IACH,YAAY,GAAG,2BAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAEvC,gBAAgB,CAAC,aAA0B,EAAE,iBAA8B,EAAE,sBAAsB,GAAG,KAAK;QACzG,IAAI,MAAM,GAAa,EAAE,CAAC;QAC1B,IAAI,aAAa,EAAE,CAAC;YAClB,MAAM,GAAG,IAAI,CAAC,gBAAgB,CAAC,aAAa,CAAC,CAAC;QAChD,CAAC;QACD,IAAI,iBAAiB,EAAE,CAAC;YACtB,MAAM,WAAW,GAAG,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,CAAC;YAE7D,IAAI,CAAC,sBAAsB,EAAE,CAAC;gBAE5B,MAAM,uCAAuC,IAAI,CAAC,IAAI,IAAI,CAAA;YAC5D,CAAC;YACD,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;QAC5D,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,gBAAgB,CAAC,cAA2B,GAAG,EAAE,WAAW,GAAG,IAAI,EAAE,YAAuB;QAC1F,OAAO,IAAA,mCAAgB,EAAC,WAAW,EAAE,WAAW,EAAE,YAAY,IAAI,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;IAC/F,CAAC;CAEF;AA/UD,kCA+UC;AAGD;;EAEE;AACK,MAAM,WAAW,GAAG,CAAgC,GAAM,EAAE,WAAqB,EAAK,EAAE;IAC7F,IAAI,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC;QACnC,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;QAC5E,IAAI,YAAY,CAAC,MAAM,EAAE,CAAC;YACxB,MAAM,gCAAgC,GAAG,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACnE,CAAC;IACH,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC,CAAA;AATY,QAAA,WAAW,eASvB"}
|
|
1
|
+
{"version":3,"file":"ViewHandler.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/ViewHandler.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"count.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/count.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,0CAA0C,CAAC;AACrE,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"count.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/count.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,0CAA0C,CAAC;AACrE,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAMpD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,wBAAsB,KAAK,CACzB,IAAI,EAAE,WAAW,EACjB,OAAO,CAAC,EAAE,MAAM,EAChB,YAAY,CAAC,EAAE,YAAY,EAC3B,cAAc,CAAC,EAAE,SAAS,EAC1B,WAAW,CAAC,EAAE,SAAS,EACvB,WAAW,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,MAAM,CAAC,CAmDjB"}
|
|
@@ -7,25 +7,39 @@ 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?.select ?? "", limit: 0 }, undefined, table_rules, localParams)
|
|
11
|
-
|
|
12
|
-
const findQuery = await this.find(filter, selectParamsWithoutLimit, undefined, table_rules, { ...localParams, returnQuery: "noRLS", bypassLimit: true });
|
|
10
|
+
const result = await this.find(filter, { select: selectParamsWithoutLimit?.select ?? "", limit: 0 }, undefined, table_rules, localParams).then(async (_allowed) => {
|
|
11
|
+
const findQuery = (await this.find(filter, selectParamsWithoutLimit, undefined, table_rules, { ...localParams, returnQuery: "noRLS", bypassLimit: true }));
|
|
13
12
|
const query = [
|
|
14
13
|
(0, dboBuilderUtils_1.withUserRLS)(localParams, ""),
|
|
15
14
|
"SELECT COUNT(*)",
|
|
16
15
|
"FROM (",
|
|
17
16
|
findQuery,
|
|
18
|
-
") t"
|
|
17
|
+
") t",
|
|
19
18
|
].join("\n");
|
|
20
19
|
const handler = this.tx?.t ?? this.db;
|
|
21
20
|
return handler.one(query).then(({ count }) => +count);
|
|
22
21
|
});
|
|
23
|
-
await this._log({
|
|
22
|
+
await this._log({
|
|
23
|
+
command: "count",
|
|
24
|
+
localParams,
|
|
25
|
+
data: { filter },
|
|
26
|
+
duration: Date.now() - start,
|
|
27
|
+
});
|
|
24
28
|
return result;
|
|
25
29
|
}
|
|
26
30
|
catch (e) {
|
|
27
|
-
await this._log({
|
|
28
|
-
|
|
31
|
+
await this._log({
|
|
32
|
+
command: "count",
|
|
33
|
+
localParams,
|
|
34
|
+
data: { filter },
|
|
35
|
+
duration: Date.now() - start,
|
|
36
|
+
error: (0, dboBuilderUtils_1.getErrorAsObject)(e),
|
|
37
|
+
});
|
|
38
|
+
throw (0, dboBuilderUtils_1.getSerializedClientErrorFromPGError)(e, {
|
|
39
|
+
type: "tableMethod",
|
|
40
|
+
localParams,
|
|
41
|
+
view: this,
|
|
42
|
+
});
|
|
29
43
|
}
|
|
30
44
|
}
|
|
31
45
|
exports.count = count;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"count.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/count.ts"],"names":[],"mappings":";;;AAGA,
|
|
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,EAAE,MAAM,IAAI,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,EAC5D,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":"
|
|
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,CAiJf,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,iBAkDxB,CAAC"}
|