prostgles-server 4.2.343 → 4.2.345
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/Auth/AuthHandler.d.ts +3 -4
- package/dist/Auth/AuthHandler.d.ts.map +1 -1
- package/dist/Auth/AuthHandler.js +3 -11
- package/dist/Auth/AuthHandler.js.map +1 -1
- package/dist/Auth/AuthTypes.d.ts +8 -7
- package/dist/Auth/AuthTypes.d.ts.map +1 -1
- package/dist/Auth/AuthTypes.js.map +1 -1
- package/dist/Auth/endpoints/setCatchAllRequestHandler.d.ts +2 -2
- package/dist/Auth/endpoints/setCatchAllRequestHandler.d.ts.map +1 -1
- package/dist/Auth/endpoints/setCatchAllRequestHandler.js +4 -3
- package/dist/Auth/endpoints/setCatchAllRequestHandler.js.map +1 -1
- package/dist/Auth/endpoints/setLoginRequestHandler.d.ts +4 -3
- package/dist/Auth/endpoints/setLoginRequestHandler.d.ts.map +1 -1
- package/dist/Auth/endpoints/setLoginRequestHandler.js.map +1 -1
- package/dist/Auth/endpoints/setLogoutRequestHandler.d.ts +2 -2
- package/dist/Auth/endpoints/setLogoutRequestHandler.d.ts.map +1 -1
- package/dist/Auth/endpoints/setLogoutRequestHandler.js.map +1 -1
- package/dist/Auth/endpoints/setMagicLinkOrOTPRequestHandler.d.ts +3 -3
- package/dist/Auth/endpoints/setMagicLinkOrOTPRequestHandler.d.ts.map +1 -1
- package/dist/Auth/endpoints/setMagicLinkOrOTPRequestHandler.js.map +1 -1
- package/dist/Auth/endpoints/setOAuthRequestHandlers.d.ts +3 -3
- package/dist/Auth/endpoints/setOAuthRequestHandlers.d.ts.map +1 -1
- package/dist/Auth/endpoints/setOAuthRequestHandlers.js.map +1 -1
- package/dist/Auth/endpoints/setRegisterRequestHandler.d.ts +1 -1
- package/dist/Auth/endpoints/setRegisterRequestHandler.d.ts.map +1 -1
- package/dist/Auth/endpoints/setRegisterRequestHandler.js.map +1 -1
- package/dist/Auth/getClientAuth.d.ts +3 -3
- package/dist/Auth/getClientAuth.d.ts.map +1 -1
- package/dist/Auth/getClientAuth.js.map +1 -1
- package/dist/Auth/login.d.ts +4 -3
- package/dist/Auth/login.d.ts.map +1 -1
- package/dist/Auth/login.js.map +1 -1
- package/dist/Auth/sendEmail.d.ts +2 -2
- package/dist/Auth/sendEmail.d.ts.map +1 -1
- package/dist/Auth/setupAuthRoutes.d.ts +1 -1
- package/dist/Auth/setupAuthRoutes.d.ts.map +1 -1
- package/dist/Auth/setupAuthRoutes.js.map +1 -1
- package/dist/Auth/utils/getClientRequestIPsInfo.d.ts +2 -2
- package/dist/Auth/utils/getClientRequestIPsInfo.d.ts.map +1 -1
- package/dist/Auth/utils/getReturnUrl.d.ts +1 -1
- package/dist/Auth/utils/getReturnUrl.d.ts.map +1 -1
- package/dist/Auth/utils/getSidAndUserFromRequest.d.ts +2 -2
- package/dist/Auth/utils/getSidAndUserFromRequest.d.ts.map +1 -1
- package/dist/Auth/utils/handleGetUser.d.ts +1 -1
- package/dist/Auth/utils/handleGetUser.d.ts.map +1 -1
- package/dist/Auth/utils/handleGetUser.js.map +1 -1
- package/dist/Auth/utils/matchesRoute.d.ts +2 -0
- package/dist/Auth/utils/matchesRoute.d.ts.map +1 -0
- package/dist/Auth/utils/matchesRoute.js +13 -0
- package/dist/Auth/utils/matchesRoute.js.map +1 -0
- package/dist/Auth/utils/removeExpressRoute.d.ts +1 -1
- package/dist/Auth/utils/removeExpressRoute.d.ts.map +1 -1
- package/dist/Auth/utils/removeExpressRoute.js +2 -2
- package/dist/Auth/utils/removeExpressRoute.js.map +1 -1
- package/dist/Auth/utils/setCookieAndGoToReturnURLIFSet.d.ts.map +1 -1
- package/dist/Auth/utils/setCookieAndGoToReturnURLIFSet.js +2 -1
- package/dist/Auth/utils/setCookieAndGoToReturnURLIFSet.js.map +1 -1
- package/dist/Auth/utils/upsertNamedExpressMiddleware.d.ts +3 -1
- package/dist/Auth/utils/upsertNamedExpressMiddleware.d.ts.map +1 -1
- package/dist/Auth/utils/upsertNamedExpressMiddleware.js +14 -3
- package/dist/Auth/utils/upsertNamedExpressMiddleware.js.map +1 -1
- package/dist/DBEventsManager.d.ts +2 -2
- package/dist/DBEventsManager.d.ts.map +1 -1
- package/dist/DBEventsManager.js.map +1 -1
- package/dist/{DBSchemaBuilder.d.ts → DBSchemaBuilder/DBSchemaBuilder.d.ts} +9 -5
- package/dist/DBSchemaBuilder/DBSchemaBuilder.d.ts.map +1 -0
- package/dist/DBSchemaBuilder/DBSchemaBuilder.js +35 -0
- package/dist/DBSchemaBuilder/DBSchemaBuilder.js.map +1 -0
- package/dist/DBSchemaBuilder/DBSchemaBuilder.spec.d.ts +2 -0
- package/dist/DBSchemaBuilder/DBSchemaBuilder.spec.d.ts.map +1 -0
- package/dist/DBSchemaBuilder/DBSchemaBuilder.spec.js +98 -0
- package/dist/DBSchemaBuilder/DBSchemaBuilder.spec.js.map +1 -0
- package/dist/DBSchemaBuilder/getColumnTypescriptDefinition.d.ts +15 -0
- package/dist/DBSchemaBuilder/getColumnTypescriptDefinition.d.ts.map +1 -0
- package/dist/DBSchemaBuilder/getColumnTypescriptDefinition.js +79 -0
- package/dist/DBSchemaBuilder/getColumnTypescriptDefinition.js.map +1 -0
- package/dist/DboBuilder/DboBuilder.d.ts +9 -8
- package/dist/DboBuilder/DboBuilder.d.ts.map +1 -1
- package/dist/DboBuilder/DboBuilder.js +10 -6
- package/dist/DboBuilder/DboBuilder.js.map +1 -1
- package/dist/DboBuilder/DboBuilderTypes.d.ts +7 -7
- package/dist/DboBuilder/DboBuilderTypes.d.ts.map +1 -1
- package/dist/DboBuilder/QueryBuilder/Functions/COMPUTED_FIELDS.d.ts +3 -0
- package/dist/DboBuilder/QueryBuilder/Functions/COMPUTED_FIELDS.d.ts.map +1 -0
- package/dist/DboBuilder/QueryBuilder/Functions/COMPUTED_FIELDS.js +35 -0
- package/dist/DboBuilder/QueryBuilder/Functions/COMPUTED_FIELDS.js.map +1 -0
- package/dist/DboBuilder/QueryBuilder/{Functions.d.ts → Functions/Functions.d.ts} +1 -8
- package/dist/DboBuilder/QueryBuilder/Functions/Functions.d.ts.map +1 -0
- package/dist/DboBuilder/QueryBuilder/{Functions.js → Functions/Functions.js} +48 -123
- package/dist/DboBuilder/QueryBuilder/Functions/Functions.js.map +1 -0
- package/dist/DboBuilder/QueryBuilder/Functions/parseFunction.d.ts +8 -0
- package/dist/DboBuilder/QueryBuilder/Functions/parseFunction.d.ts.map +1 -0
- package/dist/DboBuilder/QueryBuilder/Functions/parseFunction.js +51 -0
- package/dist/DboBuilder/QueryBuilder/Functions/parseFunction.js.map +1 -0
- package/dist/DboBuilder/QueryBuilder/QueryBuilder.d.ts +5 -6
- package/dist/DboBuilder/QueryBuilder/QueryBuilder.d.ts.map +1 -1
- package/dist/DboBuilder/QueryBuilder/QueryBuilder.js +8 -14
- package/dist/DboBuilder/QueryBuilder/QueryBuilder.js.map +1 -1
- package/dist/DboBuilder/QueryBuilder/getJoinQuery.d.ts +3 -2
- package/dist/DboBuilder/QueryBuilder/getJoinQuery.d.ts.map +1 -1
- package/dist/DboBuilder/QueryBuilder/getJoinQuery.js +4 -4
- package/dist/DboBuilder/QueryBuilder/getJoinQuery.js.map +1 -1
- package/dist/DboBuilder/QueryBuilder/getNewQuery.d.ts +5 -5
- package/dist/DboBuilder/QueryBuilder/getNewQuery.d.ts.map +1 -1
- package/dist/DboBuilder/QueryBuilder/getNewQuery.js +3 -2
- package/dist/DboBuilder/QueryBuilder/getNewQuery.js.map +1 -1
- package/dist/DboBuilder/QueryBuilder/getSelectQuery.d.ts +2 -2
- package/dist/DboBuilder/QueryBuilder/getSelectQuery.d.ts.map +1 -1
- package/dist/DboBuilder/QueryStreamer.d.ts +6 -6
- package/dist/DboBuilder/QueryStreamer.d.ts.map +1 -1
- package/dist/DboBuilder/QueryStreamer.js.map +1 -1
- package/dist/DboBuilder/TableHandler/DataValidator.d.ts +5 -5
- package/dist/DboBuilder/TableHandler/DataValidator.d.ts.map +1 -1
- package/dist/DboBuilder/TableHandler/DataValidator.js.map +1 -1
- package/dist/DboBuilder/TableHandler/TableHandler.d.ts +8 -7
- package/dist/DboBuilder/TableHandler/TableHandler.d.ts.map +1 -1
- package/dist/DboBuilder/TableHandler/TableHandler.js +3 -2
- package/dist/DboBuilder/TableHandler/TableHandler.js.map +1 -1
- package/dist/DboBuilder/TableHandler/delete.d.ts +4 -4
- package/dist/DboBuilder/TableHandler/delete.d.ts.map +1 -1
- package/dist/DboBuilder/TableHandler/delete.js.map +1 -1
- package/dist/DboBuilder/TableHandler/insert/insert.d.ts +4 -4
- package/dist/DboBuilder/TableHandler/insert/insert.d.ts.map +1 -1
- package/dist/DboBuilder/TableHandler/insert/insert.js +0 -9
- package/dist/DboBuilder/TableHandler/insert/insert.js.map +1 -1
- package/dist/DboBuilder/TableHandler/insert/insertNestedRecords.d.ts +6 -5
- package/dist/DboBuilder/TableHandler/insert/insertNestedRecords.d.ts.map +1 -1
- package/dist/DboBuilder/TableHandler/insert/insertNestedRecords.js.map +1 -1
- package/dist/DboBuilder/TableHandler/insertTest.d.ts +4 -4
- 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 +3 -3
- package/dist/DboBuilder/TableHandler/onDeleteFromFileTable.d.ts.map +1 -1
- package/dist/DboBuilder/TableHandler/onDeleteFromFileTable.js.map +1 -1
- package/dist/DboBuilder/TableHandler/runInsertUpdateQuery.d.ts +4 -4
- package/dist/DboBuilder/TableHandler/runInsertUpdateQuery.d.ts.map +1 -1
- package/dist/DboBuilder/TableHandler/runInsertUpdateQuery.js.map +1 -1
- package/dist/DboBuilder/TableHandler/update.d.ts +4 -4
- package/dist/DboBuilder/TableHandler/update.d.ts.map +1 -1
- package/dist/DboBuilder/TableHandler/update.js.map +1 -1
- package/dist/DboBuilder/TableHandler/updateBatch.d.ts +4 -4
- package/dist/DboBuilder/TableHandler/updateBatch.d.ts.map +1 -1
- package/dist/DboBuilder/TableHandler/updateBatch.js.map +1 -1
- package/dist/DboBuilder/TableHandler/updateFile.d.ts +4 -4
- package/dist/DboBuilder/TableHandler/updateFile.d.ts.map +1 -1
- package/dist/DboBuilder/TableHandler/updateFile.js.map +1 -1
- package/dist/DboBuilder/TableHandler/upsert.d.ts +4 -4
- package/dist/DboBuilder/TableHandler/upsert.d.ts.map +1 -1
- package/dist/DboBuilder/TableRules/getValidatedRules.d.ts.map +1 -1
- package/dist/DboBuilder/TableRules/getValidatedRules.js +4 -4
- package/dist/DboBuilder/TableRules/getValidatedRules.js.map +1 -1
- package/dist/DboBuilder/ViewHandler/ViewHandler.d.ts +10 -10
- package/dist/DboBuilder/ViewHandler/ViewHandler.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler/ViewHandler.js +2 -1
- package/dist/DboBuilder/ViewHandler/ViewHandler.js.map +1 -1
- package/dist/DboBuilder/ViewHandler/count.d.ts +4 -4
- package/dist/DboBuilder/ViewHandler/count.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler/find.d.ts +6 -6
- package/dist/DboBuilder/ViewHandler/find.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler/find.js.map +1 -1
- package/dist/DboBuilder/ViewHandler/getExistsCondition.d.ts +2 -2
- package/dist/DboBuilder/ViewHandler/getExistsCondition.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler/getExistsCondition.js.map +1 -1
- package/dist/DboBuilder/ViewHandler/getExistsFilters.d.ts +2 -2
- package/dist/DboBuilder/ViewHandler/getExistsFilters.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler/getExistsFilters.js.map +1 -1
- package/dist/DboBuilder/ViewHandler/getInfo.d.ts +4 -4
- package/dist/DboBuilder/ViewHandler/getInfo.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler/getTableJoinQuery.d.ts +1 -1
- package/dist/DboBuilder/ViewHandler/getTableJoinQuery.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler/parseComplexFilter.d.ts +2 -2
- package/dist/DboBuilder/ViewHandler/parseComplexFilter.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler/parseComplexFilter.js +5 -3
- package/dist/DboBuilder/ViewHandler/parseComplexFilter.js.map +1 -1
- package/dist/DboBuilder/ViewHandler/parseFieldFilter.d.ts +1 -1
- package/dist/DboBuilder/ViewHandler/parseFieldFilter.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler/parseFieldFilter.js +10 -5
- package/dist/DboBuilder/ViewHandler/parseFieldFilter.js.map +1 -1
- package/dist/DboBuilder/ViewHandler/parseJoinPath.d.ts +2 -2
- package/dist/DboBuilder/ViewHandler/parseJoinPath.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler/parseJoinPath.js.map +1 -1
- package/dist/DboBuilder/ViewHandler/prepareSortItems.d.ts +3 -3
- package/dist/DboBuilder/ViewHandler/prepareSortItems.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler/prepareSortItems.js +2 -2
- package/dist/DboBuilder/ViewHandler/prepareSortItems.js.map +1 -1
- package/dist/DboBuilder/ViewHandler/prepareWhere.d.ts +4 -4
- package/dist/DboBuilder/ViewHandler/prepareWhere.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler/prepareWhere.js.map +1 -1
- package/dist/DboBuilder/ViewHandler/size.d.ts +4 -4
- package/dist/DboBuilder/ViewHandler/size.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler/subscribe.d.ts +4 -4
- package/dist/DboBuilder/ViewHandler/subscribe.d.ts.map +1 -1
- package/dist/DboBuilder/ViewHandler/subscribe.js.map +1 -1
- package/dist/DboBuilder/ViewHandler/validateViewRules.d.ts +3 -3
- package/dist/DboBuilder/ViewHandler/validateViewRules.d.ts.map +1 -1
- package/dist/DboBuilder/dboBuilderUtils.d.ts +6 -13
- package/dist/DboBuilder/dboBuilderUtils.d.ts.map +1 -1
- package/dist/DboBuilder/dboBuilderUtils.js +3 -33
- package/dist/DboBuilder/dboBuilderUtils.js.map +1 -1
- package/dist/DboBuilder/getColumns.d.ts +5 -5
- package/dist/DboBuilder/getColumns.d.ts.map +1 -1
- package/dist/DboBuilder/getColumns.js +1 -1
- package/dist/DboBuilder/getColumns.js.map +1 -1
- package/dist/DboBuilder/getCondition.d.ts +3 -3
- package/dist/DboBuilder/getCondition.d.ts.map +1 -1
- package/dist/DboBuilder/getCondition.js +1 -1
- package/dist/DboBuilder/getCondition.js.map +1 -1
- package/dist/DboBuilder/getSubscribeRelatedTables.d.ts +6 -6
- package/dist/DboBuilder/getSubscribeRelatedTables.d.ts.map +1 -1
- package/dist/DboBuilder/getSubscribeRelatedTables.js.map +1 -1
- package/dist/DboBuilder/parseUpdateRules.d.ts +5 -4
- package/dist/DboBuilder/parseUpdateRules.d.ts.map +1 -1
- package/dist/DboBuilder/parseUpdateRules.js.map +1 -1
- package/dist/DboBuilder/prepareShortestJoinPaths.d.ts +4 -4
- package/dist/DboBuilder/prepareShortestJoinPaths.d.ts.map +1 -1
- package/dist/DboBuilder/prepareShortestJoinPaths.js.map +1 -1
- package/dist/DboBuilder/runSQL.d.ts +5 -5
- package/dist/DboBuilder/runSQL.d.ts.map +1 -1
- package/dist/DboBuilder/runSQL.js +2 -1
- package/dist/DboBuilder/runSQL.js.map +1 -1
- package/dist/DboBuilder/schema/getMaterialViews.d.ts +2 -2
- package/dist/DboBuilder/schema/getMaterialViews.d.ts.map +1 -1
- package/dist/DboBuilder/schema/getTablesForSchemaPostgresSQL.d.ts +3 -3
- package/dist/DboBuilder/schema/getTablesForSchemaPostgresSQL.d.ts.map +1 -1
- package/dist/DboBuilder/schema/getTablesForSchemaPostgresSQL.js +1 -1
- package/dist/DboBuilder/schema/getTablesForSchemaPostgresSQL.js.map +1 -1
- package/dist/DboBuilder/uploadFile.d.ts +4 -4
- package/dist/DboBuilder/uploadFile.d.ts.map +1 -1
- package/dist/DboBuilder/uploadFile.js.map +1 -1
- package/dist/FileManager/FileManager.d.ts +3 -5
- package/dist/FileManager/FileManager.d.ts.map +1 -1
- package/dist/FileManager/FileManager.js +1 -13
- package/dist/FileManager/FileManager.js.map +1 -1
- package/dist/FileManager/getValidatedFileType.d.ts +2 -2
- package/dist/FileManager/getValidatedFileType.d.ts.map +1 -1
- package/dist/FileManager/getValidatedFileType.js.map +1 -1
- package/dist/FileManager/initFileManager.d.ts +2 -2
- package/dist/FileManager/initFileManager.d.ts.map +1 -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/uploadStream.d.ts +1 -1
- package/dist/FileManager/uploadStream.d.ts.map +1 -1
- package/dist/Filtering.d.ts +1 -1
- package/dist/Filtering.d.ts.map +1 -1
- package/dist/Filtering.js.map +1 -1
- package/dist/Logging.d.ts +3 -3
- package/dist/Logging.d.ts.map +1 -1
- package/dist/PostgresNotifListenManager.d.ts +3 -3
- package/dist/PostgresNotifListenManager.d.ts.map +1 -1
- package/dist/Prostgles.d.ts +7 -6
- package/dist/Prostgles.d.ts.map +1 -1
- package/dist/Prostgles.js.map +1 -1
- package/dist/ProstglesTypes.d.ts +17 -16
- package/dist/ProstglesTypes.d.ts.map +1 -1
- package/dist/ProstglesTypes.js.map +1 -1
- package/dist/PubSubManager/PubSubManager.d.ts +8 -7
- package/dist/PubSubManager/PubSubManager.d.ts.map +1 -1
- package/dist/PubSubManager/PubSubManager.js.map +1 -1
- package/dist/PubSubManager/PubSubManagerUtils.d.ts +1 -1
- package/dist/PubSubManager/PubSubManagerUtils.d.ts.map +1 -1
- package/dist/PubSubManager/addSub.d.ts +3 -3
- package/dist/PubSubManager/addSub.d.ts.map +1 -1
- package/dist/PubSubManager/addSync.d.ts +1 -1
- package/dist/PubSubManager/addSync.d.ts.map +1 -1
- package/dist/PubSubManager/addTrigger.d.ts +3 -2
- package/dist/PubSubManager/addTrigger.d.ts.map +1 -1
- package/dist/PubSubManager/addTrigger.js.map +1 -1
- package/dist/PubSubManager/deleteOrphanedTriggers.d.ts +1 -1
- package/dist/PubSubManager/deleteOrphanedTriggers.d.ts.map +1 -1
- package/dist/PubSubManager/getCreatePubSubManagerError.d.ts +1 -1
- package/dist/PubSubManager/getCreatePubSubManagerError.d.ts.map +1 -1
- package/dist/PubSubManager/init/getPubSubManagerInitQuery.d.ts +1 -1
- package/dist/PubSubManager/init/getPubSubManagerInitQuery.d.ts.map +1 -1
- package/dist/PubSubManager/notifListener.d.ts +1 -1
- package/dist/PubSubManager/notifListener.d.ts.map +1 -1
- package/dist/PubSubManager/pushSubData.d.ts +2 -1
- package/dist/PubSubManager/pushSubData.d.ts.map +1 -1
- package/dist/PubSubManager/pushSubData.js.map +1 -1
- package/dist/PublishParser/PublishParser.d.ts +6 -5
- package/dist/PublishParser/PublishParser.d.ts.map +1 -1
- package/dist/PublishParser/PublishParser.js.map +1 -1
- package/dist/PublishParser/getFileTableRules.d.ts +3 -3
- package/dist/PublishParser/getFileTableRules.d.ts.map +1 -1
- package/dist/PublishParser/getFileTableRules.js.map +1 -1
- package/dist/PublishParser/getSchemaFromPublish.d.ts +4 -3
- package/dist/PublishParser/getSchemaFromPublish.d.ts.map +1 -1
- package/dist/PublishParser/getSchemaFromPublish.js.map +1 -1
- package/dist/PublishParser/getTableRulesWithoutFileTable.d.ts +4 -3
- package/dist/PublishParser/getTableRulesWithoutFileTable.d.ts.map +1 -1
- package/dist/PublishParser/getTableRulesWithoutFileTable.js.map +1 -1
- package/dist/PublishParser/publishTypesAndUtils.d.ts +7 -7
- package/dist/PublishParser/publishTypesAndUtils.d.ts.map +1 -1
- package/dist/PublishParser/publishTypesAndUtils.js.map +1 -1
- package/dist/RestApi.d.ts +4 -4
- package/dist/RestApi.d.ts.map +1 -1
- package/dist/SchemaWatch/SchemaWatch.d.ts +1 -1
- package/dist/SchemaWatch/SchemaWatch.d.ts.map +1 -1
- package/dist/SchemaWatch/SchemaWatch.js.map +1 -1
- package/dist/SchemaWatch/getValidatedWatchSchemaType.d.ts +1 -1
- package/dist/SchemaWatch/getValidatedWatchSchemaType.d.ts.map +1 -1
- package/dist/SchemaWatch/getWatchSchemaTagList.d.ts +1 -1
- package/dist/SchemaWatch/getWatchSchemaTagList.d.ts.map +1 -1
- package/dist/SyncReplication.d.ts +2 -2
- package/dist/SyncReplication.d.ts.map +1 -1
- 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.map +1 -1
- package/dist/TableConfig/getColumnConfig.d.ts +3 -0
- package/dist/TableConfig/getColumnConfig.d.ts.map +1 -0
- package/dist/TableConfig/getColumnConfig.js +12 -0
- package/dist/TableConfig/getColumnConfig.js.map +1 -0
- package/dist/TableConfig/getColumnDefinitionQuery.d.ts +3 -3
- package/dist/TableConfig/getColumnDefinitionQuery.d.ts.map +1 -1
- package/dist/TableConfig/getConstraintDefinitionQueries.d.ts +3 -3
- package/dist/TableConfig/getConstraintDefinitionQueries.d.ts.map +1 -1
- package/dist/TableConfig/getFutureTableSchema.d.ts +3 -3
- package/dist/TableConfig/getFutureTableSchema.d.ts.map +1 -1
- package/dist/TableConfig/getFutureTableSchema.js.map +1 -1
- package/dist/TableConfig/getPGIndexes.d.ts +1 -1
- package/dist/TableConfig/getPGIndexes.d.ts.map +1 -1
- package/dist/TableConfig/getTableColumnQueries.d.ts +2 -2
- package/dist/TableConfig/getTableColumnQueries.d.ts.map +1 -1
- package/dist/TableConfig/getTableConfigSchemaQueries.d.ts +1 -1
- package/dist/TableConfig/getTableConfigSchemaQueries.d.ts.map +1 -1
- package/dist/TableConfig/initTableConfig.d.ts +1 -1
- package/dist/TableConfig/initTableConfig.d.ts.map +1 -1
- package/dist/WebsocketAPI/getClientHandlers.d.ts +1 -1
- package/dist/WebsocketAPI/getClientHandlers.d.ts.map +1 -1
- package/dist/WebsocketAPI/getClientSchema.d.ts +1 -1
- package/dist/WebsocketAPI/getClientSchema.d.ts.map +1 -1
- package/dist/WebsocketAPI/onSocketConnected.d.ts +2 -2
- package/dist/WebsocketAPI/onSocketConnected.d.ts.map +1 -1
- package/dist/WebsocketAPI/onSocketConnected.js.map +1 -1
- package/dist/WebsocketAPI/pushSocketSchema.d.ts +1 -1
- package/dist/WebsocketAPI/pushSocketSchema.d.ts.map +1 -1
- package/dist/index.d.ts +2 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/initProstgles.d.ts +6 -5
- package/dist/initProstgles.d.ts.map +1 -1
- package/dist/initProstgles.js +1 -1
- package/dist/initProstgles.js.map +1 -1
- package/dist/runClientRequest.d.ts +4 -3
- package/dist/runClientRequest.d.ts.map +1 -1
- package/dist/runClientRequest.js.map +1 -1
- package/dist/utils/asNameAlias.d.ts +2 -0
- package/dist/utils/asNameAlias.d.ts.map +1 -0
- package/dist/utils/asNameAlias.js +12 -0
- package/dist/utils/asNameAlias.js.map +1 -0
- package/dist/{utils.d.ts → utils/utils.d.ts} +1 -0
- package/dist/utils/utils.d.ts.map +1 -0
- package/dist/utils/utils.js +34 -0
- package/dist/utils/utils.js.map +1 -0
- package/eslint.config.mjs +1 -0
- package/lib/Auth/AuthHandler.ts +6 -11
- package/lib/Auth/AuthTypes.ts +8 -7
- package/lib/Auth/endpoints/setCatchAllRequestHandler.ts +8 -5
- package/lib/Auth/endpoints/setLoginRequestHandler.ts +7 -4
- package/lib/Auth/endpoints/setLogoutRequestHandler.ts +5 -3
- package/lib/Auth/endpoints/setMagicLinkOrOTPRequestHandler.ts +8 -6
- package/lib/Auth/endpoints/setOAuthRequestHandlers.ts +6 -5
- package/lib/Auth/endpoints/setRegisterRequestHandler.ts +3 -2
- package/lib/Auth/getClientAuth.ts +8 -5
- package/lib/Auth/login.ts +6 -4
- package/lib/Auth/sendEmail.ts +2 -2
- package/lib/Auth/setupAuthRoutes.ts +3 -2
- package/lib/Auth/utils/getClientRequestIPsInfo.ts +2 -2
- package/lib/Auth/utils/getReturnUrl.ts +1 -1
- package/lib/Auth/utils/getSidAndUserFromRequest.ts +2 -2
- package/lib/Auth/utils/handleGetUser.ts +3 -2
- package/lib/Auth/utils/matchesRoute.ts +6 -0
- package/lib/Auth/utils/removeExpressRoute.ts +2 -2
- package/lib/Auth/utils/setCookieAndGoToReturnURLIFSet.ts +2 -7
- package/lib/Auth/utils/upsertNamedExpressMiddleware.ts +13 -2
- package/lib/DBEventsManager.ts +4 -3
- package/lib/DBSchemaBuilder/DBSchemaBuilder.spec.ts +128 -0
- package/lib/DBSchemaBuilder/DBSchemaBuilder.ts +100 -0
- package/lib/DBSchemaBuilder/getColumnTypescriptDefinition.ts +117 -0
- package/lib/DboBuilder/DboBuilder.ts +20 -15
- package/lib/DboBuilder/DboBuilderTypes.ts +7 -7
- package/lib/DboBuilder/QueryBuilder/Functions/COMPUTED_FIELDS.ts +35 -0
- package/lib/DboBuilder/QueryBuilder/{Functions.ts → Functions/Functions.ts} +7 -103
- package/lib/DboBuilder/QueryBuilder/Functions/parseFunction.ts +65 -0
- package/lib/DboBuilder/QueryBuilder/QueryBuilder.ts +9 -15
- package/lib/DboBuilder/QueryBuilder/getJoinQuery.ts +6 -9
- package/lib/DboBuilder/QueryBuilder/getNewQuery.ts +10 -10
- package/lib/DboBuilder/QueryBuilder/getSelectQuery.ts +2 -2
- package/lib/DboBuilder/QueryStreamer.ts +10 -9
- package/lib/DboBuilder/TableHandler/DataValidator.ts +8 -6
- package/lib/DboBuilder/TableHandler/TableHandler.ts +12 -16
- package/lib/DboBuilder/TableHandler/delete.ts +7 -6
- package/lib/DboBuilder/TableHandler/insert/insert.ts +6 -14
- package/lib/DboBuilder/TableHandler/insert/insertNestedRecords.ts +7 -6
- package/lib/DboBuilder/TableHandler/insertTest.ts +6 -4
- package/lib/DboBuilder/TableHandler/onDeleteFromFileTable.ts +5 -3
- package/lib/DboBuilder/TableHandler/runInsertUpdateQuery.ts +7 -4
- package/lib/DboBuilder/TableHandler/update.ts +6 -5
- package/lib/DboBuilder/TableHandler/updateBatch.ts +6 -5
- package/lib/DboBuilder/TableHandler/updateFile.ts +5 -4
- package/lib/DboBuilder/TableHandler/upsert.ts +4 -4
- package/lib/DboBuilder/TableRules/getValidatedRules.ts +4 -3
- package/lib/DboBuilder/ViewHandler/ViewHandler.ts +14 -20
- package/lib/DboBuilder/ViewHandler/count.ts +4 -4
- package/lib/DboBuilder/ViewHandler/find.ts +9 -7
- package/lib/DboBuilder/ViewHandler/getExistsCondition.ts +6 -5
- package/lib/DboBuilder/ViewHandler/getExistsFilters.ts +4 -3
- package/lib/DboBuilder/ViewHandler/getInfo.ts +4 -4
- package/lib/DboBuilder/ViewHandler/getTableJoinQuery.ts +1 -1
- package/lib/DboBuilder/ViewHandler/parseComplexFilter.ts +7 -4
- package/lib/DboBuilder/ViewHandler/parseFieldFilter.ts +19 -6
- package/lib/DboBuilder/ViewHandler/parseJoinPath.ts +4 -3
- package/lib/DboBuilder/ViewHandler/prepareSortItems.ts +4 -3
- package/lib/DboBuilder/ViewHandler/prepareWhere.ts +5 -4
- package/lib/DboBuilder/ViewHandler/size.ts +4 -4
- package/lib/DboBuilder/ViewHandler/subscribe.ts +8 -7
- package/lib/DboBuilder/ViewHandler/validateViewRules.ts +3 -3
- package/lib/DboBuilder/dboBuilderUtils.ts +9 -46
- package/lib/DboBuilder/getColumns.ts +9 -12
- package/lib/DboBuilder/getCondition.ts +6 -5
- package/lib/DboBuilder/getSubscribeRelatedTables.ts +11 -9
- package/lib/DboBuilder/parseUpdateRules.ts +7 -5
- package/lib/DboBuilder/prepareShortestJoinPaths.ts +7 -5
- package/lib/DboBuilder/runSQL.ts +10 -6
- package/lib/DboBuilder/schema/getMaterialViews.ts +2 -2
- package/lib/DboBuilder/schema/getTablesForSchemaPostgresSQL.ts +5 -5
- package/lib/DboBuilder/uploadFile.ts +5 -4
- package/lib/FileManager/FileManager.ts +6 -22
- package/lib/FileManager/getValidatedFileType.ts +4 -2
- package/lib/FileManager/initFileManager.ts +4 -3
- package/lib/FileManager/upload.ts +1 -1
- package/lib/FileManager/uploadStream.ts +1 -1
- package/lib/Filtering.ts +3 -2
- package/lib/Logging.ts +3 -3
- package/lib/PostgresNotifListenManager.ts +3 -3
- package/lib/Prostgles.ts +8 -6
- package/lib/ProstglesTypes.ts +20 -19
- package/lib/PubSubManager/PubSubManager.ts +11 -9
- package/lib/PubSubManager/PubSubManagerUtils.ts +1 -1
- package/lib/PubSubManager/addSub.ts +3 -3
- package/lib/PubSubManager/addSync.ts +1 -1
- package/lib/PubSubManager/addTrigger.ts +3 -2
- package/lib/PubSubManager/deleteOrphanedTriggers.ts +1 -1
- package/lib/PubSubManager/getCreatePubSubManagerError.ts +1 -1
- package/lib/PubSubManager/init/getPubSubManagerInitQuery.ts +1 -1
- package/lib/PubSubManager/notifListener.ts +1 -1
- package/lib/PubSubManager/pushSubData.ts +3 -2
- package/lib/PublishParser/PublishParser.ts +10 -8
- package/lib/PublishParser/getFileTableRules.ts +5 -4
- package/lib/PublishParser/getSchemaFromPublish.ts +8 -6
- package/lib/PublishParser/getTableRulesWithoutFileTable.ts +9 -8
- package/lib/PublishParser/publishTypesAndUtils.ts +11 -11
- package/lib/RestApi.ts +4 -4
- package/lib/SchemaWatch/SchemaWatch.ts +2 -1
- package/lib/SchemaWatch/getValidatedWatchSchemaType.ts +1 -1
- package/lib/SchemaWatch/getWatchSchemaTagList.ts +1 -1
- package/lib/SyncReplication.ts +4 -3
- package/lib/TableConfig/TableConfig.ts +8 -7
- package/lib/TableConfig/getColumnConfig.ts +13 -0
- package/lib/TableConfig/getColumnDefinitionQuery.ts +3 -3
- package/lib/TableConfig/getConstraintDefinitionQueries.ts +3 -3
- package/lib/TableConfig/getFutureTableSchema.ts +5 -3
- package/lib/TableConfig/getPGIndexes.ts +1 -1
- package/lib/TableConfig/getTableColumnQueries.ts +2 -2
- package/lib/TableConfig/getTableConfigSchemaQueries.ts +1 -1
- package/lib/TableConfig/initTableConfig.ts +1 -1
- package/lib/WebsocketAPI/getClientHandlers.ts +1 -1
- package/lib/WebsocketAPI/getClientSchema.ts +1 -1
- package/lib/WebsocketAPI/onSocketConnected.ts +4 -3
- package/lib/WebsocketAPI/pushSocketSchema.ts +1 -1
- package/lib/index.ts +2 -2
- package/lib/initProstgles.ts +8 -6
- package/lib/runClientRequest.ts +9 -7
- package/lib/typeTests/dboTypeCheck.ts +4 -4
- package/lib/utils/asNameAlias.ts +7 -0
- package/lib/utils/utils.ts +27 -0
- package/package.json +5 -3
- package/dist/DBSchemaBuilder.d.ts.map +0 -1
- package/dist/DBSchemaBuilder.js +0 -170
- package/dist/DBSchemaBuilder.js.map +0 -1
- package/dist/DboBuilder/QueryBuilder/Functions.d.ts.map +0 -1
- package/dist/DboBuilder/QueryBuilder/Functions.js.map +0 -1
- package/dist/utils.d.ts.map +0 -1
- package/dist/utils.js +0 -19
- package/dist/utils.js.map +0 -1
- package/lib/DBSchemaBuilder.ts +0 -267
- package/lib/utils.ts +0 -14
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"matchesRoute.d.ts","sourceRoot":"","sources":["../../../lib/Auth/utils/matchesRoute.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,YAAY,cAAe,MAAM,aAAa,MAAM,YAKhE,CAAC"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.matchesRoute = void 0;
|
|
4
|
+
const matchesRoute = (baseRoute, fullRoute) => {
|
|
5
|
+
if (!baseRoute || !fullRoute)
|
|
6
|
+
return false;
|
|
7
|
+
if (baseRoute === fullRoute)
|
|
8
|
+
return true;
|
|
9
|
+
const nextChar = fullRoute[baseRoute.length] ?? "";
|
|
10
|
+
return fullRoute.startsWith(baseRoute) && ["/", "?", "#"].includes(nextChar);
|
|
11
|
+
};
|
|
12
|
+
exports.matchesRoute = matchesRoute;
|
|
13
|
+
//# sourceMappingURL=matchesRoute.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"matchesRoute.js","sourceRoot":"","sources":["../../../lib/Auth/utils/matchesRoute.ts"],"names":[],"mappings":";;;AAAO,MAAM,YAAY,GAAG,CAAC,SAAiB,EAAE,SAAiB,EAAE,EAAE;IACnE,IAAI,CAAC,SAAS,IAAI,CAAC,SAAS;QAAE,OAAO,KAAK,CAAC;IAC3C,IAAI,SAAS,KAAK,SAAS;QAAE,OAAO,IAAI,CAAC;IACzC,MAAM,QAAQ,GAAG,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;IACnD,OAAO,SAAS,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;AAC/E,CAAC,CAAC;AALW,QAAA,YAAY,gBAKvB"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { ExpressApp } from "../../RestApi";
|
|
2
|
-
import { Express } from "express";
|
|
2
|
+
import type { Express } from "express";
|
|
3
3
|
export declare const removeExpressRoute: (app: ExpressApp | Express | undefined, _routePaths: (string | undefined)[], method?: "get" | "post" | "put" | "delete") => void;
|
|
4
4
|
export declare const removeExpressRoutesTest: (app: ExpressApp | Express) => Promise<void>;
|
|
5
5
|
//# sourceMappingURL=removeExpressRoute.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"removeExpressRoute.d.ts","sourceRoot":"","sources":["../../../lib/Auth/utils/removeExpressRoute.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"removeExpressRoute.d.ts","sourceRoot":"","sources":["../../../lib/Auth/utils/removeExpressRoute.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAyBvC,eAAO,MAAM,kBAAkB,QACxB,UAAU,GAAG,OAAO,GAAG,SAAS,eACxB,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,WAC1B,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,QAAQ,SAe3C,CAAC;AAGF,eAAO,MAAM,uBAAuB,QAAe,UAAU,GAAG,OAAO,kBA2BtE,CAAC"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.removeExpressRoutesTest = exports.removeExpressRoute = void 0;
|
|
4
4
|
const prostgles_types_1 = require("prostgles-types");
|
|
5
|
-
const
|
|
5
|
+
const matchesRoute_1 = require("./matchesRoute");
|
|
6
6
|
const getRouter = (app) => {
|
|
7
7
|
const router = (app._router || app.router);
|
|
8
8
|
if (typeof router === "string") {
|
|
@@ -31,7 +31,7 @@ const removeExpressRoute = (app, _routePaths, method) => {
|
|
|
31
31
|
const newRoutes = getStack().filter((route) => {
|
|
32
32
|
const path = route.route?.path;
|
|
33
33
|
const matchesForRemoval = path &&
|
|
34
|
-
routePaths.some((routePath) => (0,
|
|
34
|
+
routePaths.some((routePath) => (0, matchesRoute_1.matchesRoute)(routePath, path)) &&
|
|
35
35
|
(!method || route.route?.methods?.[method]);
|
|
36
36
|
return !matchesForRemoval;
|
|
37
37
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"removeExpressRoute.js","sourceRoot":"","sources":["../../../lib/Auth/utils/removeExpressRoute.ts"],"names":[],"mappings":";;;AAAA,qDAA4C;
|
|
1
|
+
{"version":3,"file":"removeExpressRoute.js","sourceRoot":"","sources":["../../../lib/Auth/utils/removeExpressRoute.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setCookieAndGoToReturnURLIFSet.d.ts","sourceRoot":"","sources":["../../../lib/Auth/utils/setCookieAndGoToReturnURLIFSet.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"setCookieAndGoToReturnURLIFSet.d.ts","sourceRoot":"","sources":["../../../lib/Auth/utils/setCookieAndGoToReturnURLIFSet.ts"],"names":[],"mappings":"AAAA,OAAO,EAA2C,KAAK,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC3F,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAMhF,wBAAgB,2BAA2B,CACzC,IAAI,EAAE,WAAW,EACjB,MAAM,EAAE;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,EACxC,cAAc,EAAE;IAAE,GAAG,EAAE,UAAU,CAAC;IAAC,GAAG,EAAE,oBAAoB,CAAA;CAAE,QAY/D;AAED,wBAAgB,8BAA8B,CAC5C,IAAI,EAAE,WAAW,EACjB,MAAM,EAAE;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,EACxC,cAAc,EAAE;IAAE,GAAG,EAAE,UAAU,CAAC;IAAC,GAAG,EAAE,oBAAoB,CAAA;CAAE,QAkD/D"}
|
|
@@ -5,6 +5,7 @@ const AuthHandler_1 = require("../AuthHandler");
|
|
|
5
5
|
const login_1 = require("../login");
|
|
6
6
|
const getReturnUrl_1 = require("./getReturnUrl");
|
|
7
7
|
const getSafeReturnURL_1 = require("./getSafeReturnURL");
|
|
8
|
+
const matchesRoute_1 = require("./matchesRoute");
|
|
8
9
|
function validateSessionAndSetCookie(cookie, requestHandler) {
|
|
9
10
|
const sessionErrorCode = (0, login_1.getBasicSessionErrorCode)(cookie);
|
|
10
11
|
if (sessionErrorCode) {
|
|
@@ -52,7 +53,7 @@ function setCookieAndGoToReturnURLIFSet(cookie, requestHandler) {
|
|
|
52
53
|
}
|
|
53
54
|
const safeOriginalUrl = (0, getSafeReturnURL_1.getSafeReturnURL)(req.originalUrl, AuthHandler_1.AUTH_ROUTES_AND_PARAMS.returnUrlParamName);
|
|
54
55
|
if (safeOriginalUrl &&
|
|
55
|
-
![AuthHandler_1.AUTH_ROUTES_AND_PARAMS.magicLinks].some((authRoute) => (0,
|
|
56
|
+
![AuthHandler_1.AUTH_ROUTES_AND_PARAMS.magicLinks].some((authRoute) => (0, matchesRoute_1.matchesRoute)(authRoute, safeOriginalUrl))) {
|
|
56
57
|
return res.redirect(safeOriginalUrl);
|
|
57
58
|
}
|
|
58
59
|
return res.redirect("/");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setCookieAndGoToReturnURLIFSet.js","sourceRoot":"","sources":["../../../lib/Auth/utils/setCookieAndGoToReturnURLIFSet.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"setCookieAndGoToReturnURLIFSet.js","sourceRoot":"","sources":["../../../lib/Auth/utils/setCookieAndGoToReturnURLIFSet.ts"],"names":[],"mappings":";;;AAAA,gDAA2F;AAG3F,oCAAoD;AACpD,iDAA8C;AAC9C,yDAAsD;AACtD,iDAA8C;AAE9C,SAAgB,2BAA2B,CAEzC,MAAwC,EACxC,cAA8D;IAE9D,MAAM,gBAAgB,GAAG,IAAA,gCAAwB,EAAC,MAAM,CAAC,CAAC;IAC1D,IAAI,gBAAgB,EAAE,CAAC;QACrB,MAAM,EAAE,GAAG,EAAE,GAAG,cAAc,CAAC;QAC/B,GAAG,CAAC,MAAM,CAAC,6BAAe,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC;YAC5C,OAAO,EAAE,KAAK;YACd,IAAI,EAAE,gBAAgB;SACvB,CAAC,CAAC;QACH,OAAO;IACT,CAAC;IACD,OAAO,IAAI,CAAC,8BAA8B,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;AACrE,CAAC;AAfD,kEAeC;AAED,SAAgB,8BAA8B,CAE5C,MAAwC,EACxC,cAA8D;IAE9D,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;IAChC,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,cAAc,CAAC;IACpC,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,MAAM,QAAQ,CAAC;IACjB,CAAC;IAED,MAAM,YAAY,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC,YAAY;IAE/C,IAAI,cAAc,GAA4B;QAC5C,MAAM,EAAE,YAAY;KACrB,CAAC;IAEF,IAAI,OAAO,IAAI,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC;QACtE,cAAc,GAAG,EAAE,OAAO,EAAE,IAAI,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;QAChD,MAAM,IAAI,GAAG,CAAC,CAAC,cAAc,CAAC,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;QACvE,IAAI,IAAI,IAAI,GAAG,EAAE,CAAC;YAChB,OAAO,CAAC,IAAI,CAAC,8DAA8D,IAAI,MAAM,CAAC,CAAC;QACzF,CAAC;IACH,CAAC;IAED,MAAM,UAAU,GAAG;QACjB,GAAG,cAAc;QACjB,+CAA+C;QAC/C,QAAQ,EAAE,IAAI;QACd,cAAc;QACd,MAAM,EAAE,IAAI;QACZ,QAAQ,EAAE,QAAiB;QAC3B,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,aAAa,IAAI,EAAE,CAAC;KACtD,CAAC;IACF,MAAM,UAAU,GAAG,GAAG,CAAC;IACvB,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;IACpD,MAAM,aAAa,GAAG,IAAA,2BAAY,EAAC,GAAG,CAAC,CAAC;IACxC,IAAI,aAAa,EAAE,CAAC;QAClB,OAAO,GAAG,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;IACrC,CAAC;IACD,MAAM,eAAe,GAAG,IAAA,mCAAgB,EACtC,GAAG,CAAC,WAAW,EACf,oCAAsB,CAAC,kBAAkB,CAC1C,CAAC;IACF,IACE,eAAe;QACf,CAAC,CAAC,oCAAsB,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CACtD,IAAA,2BAAY,EAAC,SAAS,EAAE,eAAe,CAAC,CACzC,EACD,CAAC;QACD,OAAO,GAAG,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;IACvC,CAAC;IACD,OAAO,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;AAC3B,CAAC;AArDD,wEAqDC"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
/// <reference types="express-serve-static-core" />
|
|
2
2
|
/// <reference types="passport" />
|
|
3
3
|
import type e from "express";
|
|
4
|
-
import { RequestHandler } from "express";
|
|
4
|
+
import type { RequestHandler } from "express";
|
|
5
|
+
import type { ExpressApp } from "../../RestApi";
|
|
5
6
|
export declare const upsertNamedExpressMiddleware: (app: e.Express, handler: RequestHandler, name: string) => void;
|
|
7
|
+
export declare const removeExpressRouteByName: (app: ExpressApp | undefined, name: string) => void;
|
|
6
8
|
//# sourceMappingURL=upsertNamedExpressMiddleware.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upsertNamedExpressMiddleware.d.ts","sourceRoot":"","sources":["../../../lib/Auth/utils/upsertNamedExpressMiddleware.ts"],"names":[],"mappings":";;AAAA,OAAO,KAAK,CAAC,MAAM,SAAS,CAAC;AAC7B,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"upsertNamedExpressMiddleware.d.ts","sourceRoot":"","sources":["../../../lib/Auth/utils/upsertNamedExpressMiddleware.ts"],"names":[],"mappings":";;AAAA,OAAO,KAAK,CAAC,MAAM,SAAS,CAAC;AAC7B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAC9C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAEhD,eAAO,MAAM,4BAA4B,QAClC,SAAS,WACL,cAAc,QACjB,MAAM,SAMb,CAAC;AAEF,eAAO,MAAM,wBAAwB,QAAS,UAAU,GAAG,SAAS,QAAQ,MAAM,SAUjF,CAAC"}
|
|
@@ -1,12 +1,23 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.upsertNamedExpressMiddleware = void 0;
|
|
4
|
-
const FileManager_1 = require("../../FileManager/FileManager");
|
|
3
|
+
exports.removeExpressRouteByName = exports.upsertNamedExpressMiddleware = void 0;
|
|
5
4
|
const upsertNamedExpressMiddleware = (app, handler, name) => {
|
|
6
5
|
const funcName = name;
|
|
7
6
|
Object.defineProperty(handler, "name", { value: funcName });
|
|
8
|
-
(0,
|
|
7
|
+
(0, exports.removeExpressRouteByName)(app, name);
|
|
9
8
|
app.use(handler);
|
|
10
9
|
};
|
|
11
10
|
exports.upsertNamedExpressMiddleware = upsertNamedExpressMiddleware;
|
|
11
|
+
const removeExpressRouteByName = (app, name) => {
|
|
12
|
+
const routes = app?._router?.stack;
|
|
13
|
+
if (routes) {
|
|
14
|
+
app._router.stack = routes.filter((route) => {
|
|
15
|
+
if (route.name === name) {
|
|
16
|
+
return false;
|
|
17
|
+
}
|
|
18
|
+
return true;
|
|
19
|
+
});
|
|
20
|
+
}
|
|
21
|
+
};
|
|
22
|
+
exports.removeExpressRouteByName = removeExpressRouteByName;
|
|
12
23
|
//# sourceMappingURL=upsertNamedExpressMiddleware.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upsertNamedExpressMiddleware.js","sourceRoot":"","sources":["../../../lib/Auth/utils/upsertNamedExpressMiddleware.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"upsertNamedExpressMiddleware.js","sourceRoot":"","sources":["../../../lib/Auth/utils/upsertNamedExpressMiddleware.ts"],"names":[],"mappings":";;;AAIO,MAAM,4BAA4B,GAAG,CAC1C,GAAc,EACd,OAAuB,EACvB,IAAY,EACZ,EAAE;IACF,MAAM,QAAQ,GAAG,IAAI,CAAC;IACtB,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;IAC5D,IAAA,gCAAwB,EAAC,GAAiB,EAAE,IAAI,CAAC,CAAC;IAClD,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AACnB,CAAC,CAAC;AATW,QAAA,4BAA4B,gCASvC;AAEK,MAAM,wBAAwB,GAAG,CAAC,GAA2B,EAAE,IAAY,EAAE,EAAE;IACpF,MAAM,MAAM,GAAG,GAAG,EAAE,OAAO,EAAE,KAAK,CAAC;IACnC,IAAI,MAAM,EAAE,CAAC;QACX,GAAG,CAAC,OAAQ,CAAC,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE;YAC3C,IAAI,KAAK,CAAC,IAAI,KAAK,IAAI,EAAE,CAAC;gBACxB,OAAO,KAAK,CAAC;YACf,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;IACL,CAAC;AACH,CAAC,CAAC;AAVW,QAAA,wBAAwB,4BAUnC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { PostgresNotifListenManager } from "./PostgresNotifListenManager";
|
|
2
|
-
import { DB, PGP } from "./Prostgles";
|
|
3
|
-
import { PRGLIOSocket } from "./DboBuilder/DboBuilder";
|
|
2
|
+
import type { DB, PGP } from "./Prostgles";
|
|
3
|
+
import type { PRGLIOSocket } from "./DboBuilder/DboBuilder";
|
|
4
4
|
export declare class DBEventsManager {
|
|
5
5
|
notifies: {
|
|
6
6
|
[key: string]: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DBEventsManager.d.ts","sourceRoot":"","sources":["../lib/DBEventsManager.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"DBEventsManager.d.ts","sourceRoot":"","sources":["../lib/DBEventsManager.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AAC1E,OAAO,KAAK,EAAE,EAAE,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAE3C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAE5D,qBAAa,eAAe;IAC1B,QAAQ,EAAE;QACR,CAAC,GAAG,EAAE,MAAM,GAAG;YACb,aAAa,EAAE,MAAM,CAAC;YACtB,OAAO,EAAE,GAAG,EAAE,CAAC;YACf,UAAU,EAAE,CAAC,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC,EAAE,CAAC;YAC1C,QAAQ,EAAE,0BAA0B,CAAC;SACtC,CAAC;KACH,CAAM;IAEP,MAAM,EAAE;QACN,aAAa,EAAE,MAAM,CAAC;QACtB,kBAAkB,EAAE,MAAM,CAAC;QAC3B,OAAO,EAAE,GAAG,EAAE,CAAC;KAChB,CAIC;IAEF,YAAY,CAAC,EAAE,0BAA0B,CAAC;IAE1C,KAAK,EAAE,EAAE,CAAC;IACV,GAAG,EAAE,GAAG,CAAC;gBACG,KAAK,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG;IAK/B,OAAO,CAAC,OAAO,CAeb;IAEF,QAAQ,WAAY,GAAG,UAMrB;IAEF,mBAAmB,YAAmB,MAAM,kBAG1C;IAEI,SAAS,CACb,KAAK,EAAE,MAAM,EACb,MAAM,CAAC,EAAE,YAAY,EACrB,IAAI,CAAC,EAAE,GAAG,GACT,OAAO,CAAC;QACT,aAAa,EAAE,MAAM,CAAC;QACtB,kBAAkB,EAAE,MAAM,CAAC;QAC3B,YAAY,EAAE,MAAM,CAAC;QACrB,WAAW,CAAC,EAAE,MAAM,IAAI,CAAC;KAC1B,CAAC;IAsEF,YAAY,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,YAAY,EAAE,IAAI,CAAC,EAAE,GAAG;IAqBhE,SAAS,CAAC,MAAM,EAAE,YAAY;;;;IAiB9B,YAAY,CAAC,MAAM,EAAE,YAAY;CAIlC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DBEventsManager.js","sourceRoot":"","sources":["../lib/DBEventsManager.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"DBEventsManager.js","sourceRoot":"","sources":["../lib/DBEventsManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,12 @@
|
|
|
1
|
-
import { AnyObject, DbJoinMaker, DBSchema, SQLHandler, TableHandler, ViewHandler } from "prostgles-types";
|
|
2
|
-
import {
|
|
3
|
-
import { PublishAllOrNothing, PublishTableRule, PublishViewRule
|
|
4
|
-
import {
|
|
5
|
-
|
|
1
|
+
import type { AnyObject, DbJoinMaker, DBSchema, SQLHandler, TableHandler, TableSchema, ViewHandler } from "prostgles-types";
|
|
2
|
+
import type { TX } from "../DboBuilder/DboBuilderTypes";
|
|
3
|
+
import type { PublishAllOrNothing, PublishTableRule, PublishViewRule } from "../PublishParser/PublishParser";
|
|
4
|
+
import { type PublishObject } from "../PublishParser/PublishParser";
|
|
5
|
+
import type { TableConfig } from "../TableConfig/TableConfig";
|
|
6
|
+
export declare const getDBSchema: ({ tablesOrViews, config, }: {
|
|
7
|
+
tablesOrViews: TableSchema[];
|
|
8
|
+
config: TableConfig | undefined;
|
|
9
|
+
}) => string;
|
|
6
10
|
export type ServerViewHandler<T extends AnyObject = AnyObject, Schema extends DBSchema | void = void> = ViewHandler<T, Schema> & {
|
|
7
11
|
is_view: true;
|
|
8
12
|
};
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"DBSchemaBuilder.d.ts","sourceRoot":"","sources":["../../lib/DBSchemaBuilder/DBSchemaBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,SAAS,EACT,WAAW,EACX,QAAQ,EACR,UAAU,EACV,YAAY,EACZ,WAAW,EACX,WAAW,EACZ,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,+BAA+B,CAAC;AACxD,OAAO,KAAK,EACV,mBAAmB,EACnB,gBAAgB,EAChB,eAAe,EAChB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAI9D,eAAO,MAAM,WAAW;mBAIP,WAAW,EAAE;YACpB,WAAW,GAAG,SAAS;MAC7B,MA8BH,CAAC;AAEF,MAAM,MAAM,iBAAiB,CAC3B,CAAC,SAAS,SAAS,GAAG,SAAS,EAC/B,MAAM,SAAS,QAAQ,GAAG,IAAI,GAAG,IAAI,IACnC,WAAW,CAAC,CAAC,EAAE,MAAM,CAAC,GAAG;IAAE,OAAO,EAAE,IAAI,CAAA;CAAE,CAAC;AAC/C,MAAM,MAAM,kBAAkB,CAC5B,CAAC,SAAS,SAAS,GAAG,SAAS,EAC/B,MAAM,SAAS,QAAQ,GAAG,IAAI,GAAG,IAAI,IACnC,YAAY,CAAC,CAAC,EAAE,MAAM,CAAC,GAAG;IAAE,OAAO,EAAE,KAAK,CAAA;CAAE,CAAC;AAEjD,MAAM,MAAM,yBAAyB,CAAC,MAAM,GAAG,IAAI,IACjD,MAAM,SAAS,QAAQ,GACrB;KACG,QAAQ,IAAI,MAAM,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,SAAS,IAAI,GAClE,iBAAiB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,GACtD,kBAAkB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;CAC1D,GACD,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC;AAEhD,MAAM,MAAM,oBAAoB,CAC9B,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,kBAAkB,CAAC,CAAC,EAChD,gBAAgB,GAAG,IAAI,IACrB;IACF,GAAG,EAAE,UAAU,CAAC;CACjB,GAAG,OAAO,CAAC,WAAW,CAAC,GACtB,CAAC,gBAAgB,SAAS,IAAI,GAAG;IAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,CAAA;CAAE,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC;AAE3E,MAAM,MAAM,aAAa,CACvB,MAAM,GAAG,IAAI,EACb,gBAAgB,GAAG,IAAI,IACrB,yBAAyB,CAAC,MAAM,CAAC,GACnC,oBAAoB,CAAC,yBAAyB,CAAC,MAAM,CAAC,EAAE,gBAAgB,CAAC,CAAC;AAE5E,MAAM,MAAM,iBAAiB,CAAC,MAAM,GAAG,IAAI,IACzC,MAAM,SAAS,QAAQ,GACrB;KACG,QAAQ,IAAI,MAAM,OAAO,CAAC,MAAM,CAAC,GAC9B,mBAAmB,GACnB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,SAAS,IAAI,GACvC,eAAe,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,GACpD,gBAAgB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,CAAC;CAC7D,GACD,aAAa,CAAC"}
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getDBSchema = void 0;
|
|
4
|
+
const utils_1 = require("../utils/utils");
|
|
5
|
+
const getColumnTypescriptDefinition_1 = require("./getColumnTypescriptDefinition");
|
|
6
|
+
const getDBSchema = ({ tablesOrViews, config, }) => {
|
|
7
|
+
const tables = [];
|
|
8
|
+
/** Tables and columns are sorted to avoid infinite loops due to changing order */
|
|
9
|
+
tablesOrViews
|
|
10
|
+
.slice(0)
|
|
11
|
+
.sort((a, b) => a.name.localeCompare(b.name))
|
|
12
|
+
.forEach((tableOrView) => {
|
|
13
|
+
const { privileges, columns } = tableOrView;
|
|
14
|
+
const cols = columns.slice(0).sort((a, b) => a.name.localeCompare(b.name));
|
|
15
|
+
tables.push(`${(0, utils_1.escapeTSNames)(tableOrView.name)}: {
|
|
16
|
+
is_view: ${tableOrView.is_view};
|
|
17
|
+
select: ${privileges.select};
|
|
18
|
+
insert: ${privileges.insert};
|
|
19
|
+
update: ${privileges.update};
|
|
20
|
+
delete: ${privileges.delete};
|
|
21
|
+
columns: {${cols
|
|
22
|
+
.map((column) => `
|
|
23
|
+
${(0, getColumnTypescriptDefinition_1.getColumnTypescriptDefinition)({ tablesOrViews, config, tableOrView, column })}`)
|
|
24
|
+
.join("")}
|
|
25
|
+
};
|
|
26
|
+
};\n `);
|
|
27
|
+
});
|
|
28
|
+
return `
|
|
29
|
+
export type DBGeneratedSchema = {
|
|
30
|
+
${tables.join("")}
|
|
31
|
+
}
|
|
32
|
+
`;
|
|
33
|
+
};
|
|
34
|
+
exports.getDBSchema = getDBSchema;
|
|
35
|
+
//# sourceMappingURL=DBSchemaBuilder.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"DBSchemaBuilder.js","sourceRoot":"","sources":["../../lib/DBSchemaBuilder/DBSchemaBuilder.ts"],"names":[],"mappings":";;;AAiBA,0CAA+C;AAC/C,mFAAgF;AAEzE,MAAM,WAAW,GAAG,CAAC,EAC1B,aAAa,EACb,MAAM,GAIP,EAAU,EAAE;IACX,MAAM,MAAM,GAAa,EAAE,CAAC;IAE5B,kFAAkF;IAClF,aAAa;SACV,KAAK,CAAC,CAAC,CAAC;SACR,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;SAC5C,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE;QACvB,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,GAAG,WAAW,CAAC;QAC5C,MAAM,IAAI,GAAG,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;QAC3E,MAAM,CAAC,IAAI,CAAC,GAAG,IAAA,qBAAa,EAAC,WAAW,CAAC,IAAI,CAAC;eACrC,WAAW,CAAC,OAAO;cACpB,UAAU,CAAC,MAAM;cACjB,UAAU,CAAC,MAAM;cACjB,UAAU,CAAC,MAAM;cACjB,UAAU,CAAC,MAAM;gBACf,IAAI;aACb,GAAG,CACF,CAAC,MAAM,EAAE,EAAE,CAAC;QACZ,IAAA,6DAA6B,EAAC,EAAE,aAAa,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,CAAC,EAAE,CAChF;aACA,IAAI,CAAC,EAAE,CAAC;;SAEN,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IACL,OAAO;;IAEL,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;;CAElB,CAAC;AACF,CAAC,CAAC;AApCW,QAAA,WAAW,eAoCtB"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"DBSchemaBuilder.spec.d.ts","sourceRoot":"","sources":["../../lib/DBSchemaBuilder/DBSchemaBuilder.spec.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,98 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const node_test_1 = require("node:test");
|
|
4
|
+
const __1 = require("..");
|
|
5
|
+
void (0, node_test_1.describe)("DBSchemaBuilder type tests", async () => {
|
|
6
|
+
await (0, node_test_1.test)("Type checks", () => {
|
|
7
|
+
/** Type checks */
|
|
8
|
+
() => {
|
|
9
|
+
const ddb = {};
|
|
10
|
+
ddb.dwad?.insert;
|
|
11
|
+
ddb.dwad?.delete;
|
|
12
|
+
const d = {};
|
|
13
|
+
d.dwad?.insert;
|
|
14
|
+
d.dwad?.delete;
|
|
15
|
+
const p = {};
|
|
16
|
+
p.dbo.dwad?.insert;
|
|
17
|
+
ddb.dwad?.delete;
|
|
18
|
+
//@ts-ignore
|
|
19
|
+
void (0, __1.default)({
|
|
20
|
+
dbConnection: "",
|
|
21
|
+
publish: async (params) => {
|
|
22
|
+
const _rows = await params.dbo.dwadwa?.find?.({});
|
|
23
|
+
return "*";
|
|
24
|
+
},
|
|
25
|
+
transactions: true,
|
|
26
|
+
onReady: ({ dbo }) => {
|
|
27
|
+
void dbo.tdwa?.find();
|
|
28
|
+
void dbo.tx((t) => {
|
|
29
|
+
void t.dwa?.find();
|
|
30
|
+
});
|
|
31
|
+
},
|
|
32
|
+
});
|
|
33
|
+
const _auth = {
|
|
34
|
+
sidKeyName: "sid_token",
|
|
35
|
+
getUser: (sid, db, _db) => {
|
|
36
|
+
db.dwadaw?.find;
|
|
37
|
+
return {};
|
|
38
|
+
},
|
|
39
|
+
};
|
|
40
|
+
/** Test the created schema */
|
|
41
|
+
const c = {};
|
|
42
|
+
const _test = c;
|
|
43
|
+
const dbt = {};
|
|
44
|
+
void dbt.tx((t) => {
|
|
45
|
+
void t.tbl1.delete();
|
|
46
|
+
});
|
|
47
|
+
const db = {};
|
|
48
|
+
void db.tx((t) => {
|
|
49
|
+
void t.wadwa?.find();
|
|
50
|
+
});
|
|
51
|
+
const _publish = () => {
|
|
52
|
+
const r = {
|
|
53
|
+
tbl1: {
|
|
54
|
+
select: {
|
|
55
|
+
fields: "*",
|
|
56
|
+
forcedFilter: { col1: 32, col2: "" },
|
|
57
|
+
},
|
|
58
|
+
getColumns: true,
|
|
59
|
+
getInfo: true,
|
|
60
|
+
delete: {
|
|
61
|
+
filterFields: { col1: 1 },
|
|
62
|
+
},
|
|
63
|
+
},
|
|
64
|
+
tbl2: {
|
|
65
|
+
delete: {
|
|
66
|
+
filterFields: "*",
|
|
67
|
+
forcedFilter: { col1: 2 },
|
|
68
|
+
},
|
|
69
|
+
},
|
|
70
|
+
};
|
|
71
|
+
const res = {
|
|
72
|
+
tbl1: {
|
|
73
|
+
select: {
|
|
74
|
+
fields: "*",
|
|
75
|
+
forcedFilter: { col1: 32, col2: "" },
|
|
76
|
+
},
|
|
77
|
+
getColumns: true,
|
|
78
|
+
getInfo: true,
|
|
79
|
+
delete: {
|
|
80
|
+
filterFields: { col1: 1 },
|
|
81
|
+
},
|
|
82
|
+
},
|
|
83
|
+
tbl2: {
|
|
84
|
+
delete: {
|
|
85
|
+
filterFields: "*",
|
|
86
|
+
forcedFilter: { col1: 2 },
|
|
87
|
+
},
|
|
88
|
+
},
|
|
89
|
+
};
|
|
90
|
+
const _res1 = r;
|
|
91
|
+
const p = {};
|
|
92
|
+
void p.dbo.dwadaw?.find?.();
|
|
93
|
+
return res;
|
|
94
|
+
};
|
|
95
|
+
};
|
|
96
|
+
});
|
|
97
|
+
});
|
|
98
|
+
//# sourceMappingURL=DBSchemaBuilder.spec.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"DBSchemaBuilder.spec.js","sourceRoot":"","sources":["../../lib/DBSchemaBuilder/DBSchemaBuilder.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import { type TableSchema } from "prostgles-types";
|
|
2
|
+
import type { TableConfig } from "../TableConfig/TableConfig";
|
|
3
|
+
export declare const getColumnTypescriptDefinition: ({ config, tablesOrViews, tableOrView, column, }: {
|
|
4
|
+
config: TableConfig | undefined;
|
|
5
|
+
tablesOrViews: TableSchema[];
|
|
6
|
+
tableOrView: TableSchema;
|
|
7
|
+
column: TableSchema["columns"][number];
|
|
8
|
+
}) => string;
|
|
9
|
+
export declare const getDataType: ({ config, tablesOrViews, tableOrView, column, }: {
|
|
10
|
+
config: TableConfig | undefined;
|
|
11
|
+
tablesOrViews: TableSchema[];
|
|
12
|
+
tableOrView: TableSchema;
|
|
13
|
+
column: TableSchema["columns"][number];
|
|
14
|
+
}) => string;
|
|
15
|
+
//# sourceMappingURL=getColumnTypescriptDefinition.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"getColumnTypescriptDefinition.d.ts","sourceRoot":"","sources":["../../lib/DBSchemaBuilder/getColumnTypescriptDefinition.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,KAAK,WAAW,EACjB,MAAM,iBAAiB,CAAC;AAGzB,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAG9D,eAAO,MAAM,6BAA6B;YAMhC,WAAW,GAAG,SAAS;mBAChB,WAAW,EAAE;iBACf,WAAW;YAChB,WAAW,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC;YAgBvC,CAAC;AAEF,eAAO,MAAM,WAAW;YAMd,WAAW,GAAG,SAAS;mBAChB,WAAW,EAAE;iBACf,WAAW;YAChB,WAAW,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC;YAyDvC,CAAC"}
|
|
@@ -0,0 +1,79 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getDataType = exports.getColumnTypescriptDefinition = void 0;
|
|
4
|
+
const prostgles_types_1 = require("prostgles-types");
|
|
5
|
+
const utils_1 = require("../utils/utils");
|
|
6
|
+
const getColumnConfig_1 = require("../TableConfig/getColumnConfig");
|
|
7
|
+
const getColumnTypescriptDefinition = ({ config, tablesOrViews, tableOrView, column, }) => {
|
|
8
|
+
/**
|
|
9
|
+
* Columns that are nullable or have default values can be ommitted from an insert
|
|
10
|
+
* Non nullable columns with default values cannot containt null values in an insert so they must contain a valid value or be omitted
|
|
11
|
+
*/
|
|
12
|
+
const dataType = (0, exports.getDataType)({
|
|
13
|
+
config,
|
|
14
|
+
tablesOrViews,
|
|
15
|
+
tableOrView,
|
|
16
|
+
column,
|
|
17
|
+
});
|
|
18
|
+
const { name, is_nullable, has_default } = column;
|
|
19
|
+
return `${(0, utils_1.escapeTSNames)(name)}${is_nullable || has_default ? "?" : ""}: ${dataType}`;
|
|
20
|
+
};
|
|
21
|
+
exports.getColumnTypescriptDefinition = getColumnTypescriptDefinition;
|
|
22
|
+
const getDataType = ({ config, tablesOrViews, tableOrView, column, }) => {
|
|
23
|
+
const typeFromUdtName = (column.is_nullable ? "null | " : "") + getColTypeForDBSchema(column.udt_name) + ";";
|
|
24
|
+
const buildEnumTypeDefinition = (enumVals, nullable) => {
|
|
25
|
+
const types = enumVals.map((t) => (typeof t === "number" ? t : JSON.stringify(t)));
|
|
26
|
+
if (nullable) {
|
|
27
|
+
types.unshift("null");
|
|
28
|
+
}
|
|
29
|
+
return types.join(" | ");
|
|
30
|
+
};
|
|
31
|
+
const tableConfig = config && config[tableOrView.name];
|
|
32
|
+
if (tableConfig && "isLookupTable" in tableConfig && column.is_pkey) {
|
|
33
|
+
const enumValus = Object.keys(tableConfig.isLookupTable.values);
|
|
34
|
+
return buildEnumTypeDefinition(enumValus, !!column.is_nullable);
|
|
35
|
+
}
|
|
36
|
+
const colConf = config && (0, getColumnConfig_1.getColumnConfig)(config, tableOrView.name, column.name);
|
|
37
|
+
if (!colConf || !(0, prostgles_types_1.isObject)(colConf)) {
|
|
38
|
+
return typeFromUdtName;
|
|
39
|
+
}
|
|
40
|
+
if (colConf.jsonbSchema || colConf.jsonbSchemaType) {
|
|
41
|
+
const schema = colConf.jsonbSchema || {
|
|
42
|
+
...colConf,
|
|
43
|
+
type: colConf.jsonbSchemaType,
|
|
44
|
+
};
|
|
45
|
+
return (0, prostgles_types_1.getJSONBSchemaTSTypes)(schema, { nullable: colConf.nullable }, " ", tablesOrViews);
|
|
46
|
+
}
|
|
47
|
+
if ("enum" in colConf) {
|
|
48
|
+
if (!colConf.enum)
|
|
49
|
+
throw "colConf.enum missing";
|
|
50
|
+
return buildEnumTypeDefinition(colConf.enum, !!colConf.nullable);
|
|
51
|
+
}
|
|
52
|
+
/** When referencing a isLookupTable table we add the isLookupTable.values as enums */
|
|
53
|
+
if (("references" in colConf && colConf.references) || column.references?.length) {
|
|
54
|
+
const lookupTableConfig = colConf.references ?
|
|
55
|
+
config[colConf.references.tableName]
|
|
56
|
+
: column.references
|
|
57
|
+
?.map((ref) => {
|
|
58
|
+
const refTableConfig = config[ref.ftable];
|
|
59
|
+
if (refTableConfig && "isLookupTable" in refTableConfig) {
|
|
60
|
+
return refTableConfig;
|
|
61
|
+
}
|
|
62
|
+
})
|
|
63
|
+
.find(prostgles_types_1.isDefined);
|
|
64
|
+
if (lookupTableConfig && "isLookupTable" in lookupTableConfig) {
|
|
65
|
+
const enumValus = Object.keys(lookupTableConfig.isLookupTable.values);
|
|
66
|
+
return buildEnumTypeDefinition(enumValus, !!colConf.nullable);
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
return typeFromUdtName;
|
|
70
|
+
};
|
|
71
|
+
exports.getDataType = getDataType;
|
|
72
|
+
const getColTypeForDBSchema = (udt_name) => {
|
|
73
|
+
if (udt_name === "interval") {
|
|
74
|
+
const units = ["years", "months", "days", "hours", "minutes", "seconds", "milliseconds"];
|
|
75
|
+
return `{ ${units.map((u) => `${u}?: number;`).join(" ")} }`;
|
|
76
|
+
}
|
|
77
|
+
return (0, prostgles_types_1.postgresToTsType)(udt_name);
|
|
78
|
+
};
|
|
79
|
+
//# sourceMappingURL=getColumnTypescriptDefinition.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"getColumnTypescriptDefinition.js","sourceRoot":"","sources":["../../lib/DBSchemaBuilder/getColumnTypescriptDefinition.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,14 @@
|
|
|
1
|
-
import { PG_COLUMN_UDT_DATA_TYPE, SQLOptions } from "prostgles-types";
|
|
2
|
-
import { DB, Prostgles } from "../Prostgles";
|
|
3
|
-
import { Join } from "../ProstglesTypes";
|
|
1
|
+
import type { PG_COLUMN_UDT_DATA_TYPE, SQLOptions } from "prostgles-types";
|
|
2
|
+
import type { DB, Prostgles } from "../Prostgles";
|
|
3
|
+
import type { Join } from "../ProstglesTypes";
|
|
4
4
|
import { PubSubManager } from "../PubSubManager/PubSubManager";
|
|
5
|
-
import { DbTableInfo, PublishParser } from "../PublishParser/PublishParser";
|
|
6
|
-
import { Graph } from "../shortestPath";
|
|
7
|
-
import { DBHandlerServer, DbTxTableHandlers, LocalParams, TableSchema, TxCB } from "./DboBuilderTypes";
|
|
5
|
+
import type { DbTableInfo, PublishParser } from "../PublishParser/PublishParser";
|
|
6
|
+
import type { Graph } from "../shortestPath";
|
|
7
|
+
import type { DBHandlerServer, DbTxTableHandlers, LocalParams, TableSchema, TxCB } from "./DboBuilderTypes";
|
|
8
8
|
import { QueryStreamer } from "./QueryStreamer";
|
|
9
|
-
import { JoinPaths
|
|
10
|
-
import {
|
|
9
|
+
import type { JoinPaths } from "./ViewHandler/ViewHandler";
|
|
10
|
+
import { ViewHandler } from "./ViewHandler/ViewHandler";
|
|
11
|
+
import type { PGConstraint } from "./dboBuilderUtils";
|
|
11
12
|
export * from "./DboBuilderTypes";
|
|
12
13
|
export * from "./dboBuilderUtils";
|
|
13
14
|
type OidInfo = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DboBuilder.d.ts","sourceRoot":"","sources":["../../lib/DboBuilder/DboBuilder.ts"],"names":[],"mappings":"AAKA,OAAO,
|
|
1
|
+
{"version":3,"file":"DboBuilder.d.ts","sourceRoot":"","sources":["../../lib/DboBuilder/DboBuilder.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,12 +20,12 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
20
20
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
21
21
|
exports.DboBuilder = void 0;
|
|
22
22
|
const prostgles_types_1 = require("prostgles-types");
|
|
23
|
-
const DBSchemaBuilder_1 = require("../DBSchemaBuilder");
|
|
23
|
+
const DBSchemaBuilder_1 = require("../DBSchemaBuilder/DBSchemaBuilder");
|
|
24
24
|
const PubSubManager_1 = require("../PubSubManager/PubSubManager");
|
|
25
25
|
const getCreatePubSubManagerError_1 = require("../PubSubManager/getCreatePubSubManagerError");
|
|
26
26
|
const PublishParser_1 = require("../PublishParser/PublishParser");
|
|
27
27
|
const runSQLFile_1 = require("../TableConfig/runSQLFile");
|
|
28
|
-
const utils_1 = require("../utils");
|
|
28
|
+
const utils_1 = require("../utils/utils");
|
|
29
29
|
const QueryStreamer_1 = require("./QueryStreamer");
|
|
30
30
|
const TableHandler_1 = require("./TableHandler/TableHandler");
|
|
31
31
|
const ViewHandler_1 = require("./ViewHandler/ViewHandler");
|
|
@@ -172,7 +172,8 @@ class DboBuilder {
|
|
|
172
172
|
data: tablesOrViewsReq.durations,
|
|
173
173
|
duration: Date.now() - start,
|
|
174
174
|
});
|
|
175
|
-
|
|
175
|
+
const tablesOrViews = tablesOrViewsReq.result;
|
|
176
|
+
this.tablesOrViews = tablesOrViews;
|
|
176
177
|
this.constraints = await (0, dboBuilderUtils_1.getConstraints)(this.db, this.prostgles.opts.schemaFilter);
|
|
177
178
|
await this.prepareShortestJoinPaths();
|
|
178
179
|
this.dbo = {};
|
|
@@ -215,11 +216,11 @@ class DboBuilder {
|
|
|
215
216
|
const v2Methods = (0, PublishParser_1.getV2Methods)(this.prostgles.opts.publishMethods);
|
|
216
217
|
if (v2Methods) {
|
|
217
218
|
const methodDefinitions = (0, prostgles_types_1.getObjectEntries)(v2Methods).map(([name, method]) => {
|
|
218
|
-
const argumentTypes = (0, prostgles_types_1.getJSONBTSTypes)(
|
|
219
|
+
const argumentTypes = (0, prostgles_types_1.getJSONBTSTypes)(tablesOrViews, {
|
|
219
220
|
type: method.input,
|
|
220
221
|
});
|
|
221
222
|
const removeSemicolon = (v) => v.trim().endsWith(";") ? v.trim().slice(0, -1) : v.trim();
|
|
222
|
-
const returnType = !method.output ? "void" : ((0, prostgles_types_1.getJSONBTSTypes)(
|
|
223
|
+
const returnType = !method.output ? "void" : ((0, prostgles_types_1.getJSONBTSTypes)(tablesOrViews, {
|
|
223
224
|
type: method.output,
|
|
224
225
|
}));
|
|
225
226
|
return ` ${JSON.stringify(name)}: (args: ${removeSemicolon(argumentTypes)}, ctx: MethodContext<DBHandler, DB, User>) => Promise<${removeSemicolon(returnType)}>`;
|
|
@@ -237,7 +238,10 @@ class DboBuilder {
|
|
|
237
238
|
}
|
|
238
239
|
this.tsTypesDefinition = [
|
|
239
240
|
`/* Schema definition generated by prostgles-server */`,
|
|
240
|
-
(0, DBSchemaBuilder_1.getDBSchema)(
|
|
241
|
+
(0, DBSchemaBuilder_1.getDBSchema)({
|
|
242
|
+
config: this.prostgles.opts.tableConfig,
|
|
243
|
+
tablesOrViews,
|
|
244
|
+
}),
|
|
241
245
|
functionTypes,
|
|
242
246
|
].join("\n");
|
|
243
247
|
return this.dbo;
|