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":"FileManager.js","sourceRoot":"","sources":["../../lib/FileManager/FileManager.ts"],"names":[],"mappings":";;;AAAA,yBAAyB;AAGzB,kCAAkC;AAClC,uDAA8C;AAG9C,qDAOyB;AAEzB,6BAA6B;AAC7B,uDAAoD;AACpD,iEAA8D;AAC9D,qCAAkC;AAClC,iDAA8C;AAGjC,QAAA,IAAI,GAAG,IAAI,GAAG,IAAI,CAAC;AAEzB,MAAM,eAAe,GAAG,KAAK,
|
|
1
|
+
{"version":3,"file":"FileManager.js","sourceRoot":"","sources":["../../lib/FileManager/FileManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getValidatedFileType.d.ts","sourceRoot":"","sources":["../../lib/FileManager/getValidatedFileType.ts"],"names":[],"mappings":";;AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"getValidatedFileType.d.ts","sourceRoot":"","sources":["../../lib/FileManager/getValidatedFileType.ts"],"names":[],"mappings":";;AAAA,OAAO,EACL,oBAAoB,EACpB,iBAAiB,EAIlB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EACL,WAAW,EAGZ,MAAM,eAAe,CAAC;AAEvB,KAAK,IAAI,GAAG;IACV,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AACF,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,WAAW,EACjB,IAAI,EAAE,IAAI,GACT,OAAO,CAAC;IACT,IAAI,EAAE,MAAM,GAAG,oBAAoB,CAAC;IACpC,GAAG,EAAE,MAAM,GAAG,iBAAiB,CAAC;CAIjC,CAAC,CAmFD"}
|
|
@@ -9,43 +9,45 @@ async function getValidatedFileType(args) {
|
|
|
9
9
|
const config = this.prostgles?.opts.fileTable;
|
|
10
10
|
if (!config)
|
|
11
11
|
throw new Error("File table config missing");
|
|
12
|
-
const buffer = typeof file === "string" ? Buffer.from(file,
|
|
12
|
+
const buffer = typeof file === "string" ? Buffer.from(file, "utf8") : file;
|
|
13
13
|
const result = await (0, FileManager_1.getFileTypeFromFilename)(fileName);
|
|
14
14
|
if (tableName && colName) {
|
|
15
15
|
const tableConfig = config.referencedTables?.[tableName];
|
|
16
|
-
if (tableConfig &&
|
|
16
|
+
if (tableConfig &&
|
|
17
|
+
(0, prostgles_types_1.isObject)(tableConfig) &&
|
|
18
|
+
tableConfig.referenceColumns[colName]) {
|
|
17
19
|
const colConfig = tableConfig.referenceColumns[colName];
|
|
18
20
|
if (colConfig.maxFileSizeMB) {
|
|
19
21
|
const actualBufferSize = Buffer.byteLength(buffer);
|
|
20
|
-
if (
|
|
22
|
+
if (actualBufferSize / 1e6 > colConfig.maxFileSizeMB) {
|
|
21
23
|
throw new Error(`Provided file is larger than the ${colConfig.maxFileSizeMB}MB limit`);
|
|
22
24
|
}
|
|
23
25
|
}
|
|
24
|
-
if ("acceptedContent" in colConfig &&
|
|
26
|
+
if ("acceptedContent" in colConfig &&
|
|
27
|
+
colConfig.acceptedContent &&
|
|
28
|
+
colConfig.acceptedContent !== "*") {
|
|
25
29
|
const mime = await (0, FileManager_1.getFileType)(buffer, fileName);
|
|
26
|
-
const CONTENTS = [
|
|
27
|
-
"image",
|
|
28
|
-
"audio",
|
|
29
|
-
"video",
|
|
30
|
-
"text",
|
|
31
|
-
"application",
|
|
32
|
-
];
|
|
30
|
+
const CONTENTS = ["image", "audio", "video", "text", "application"];
|
|
33
31
|
const allowedContent = (0, parseFieldFilter_1.parseFieldFilter)(colConfig.acceptedContent, false, CONTENTS);
|
|
34
|
-
if (!allowedContent.some(c => mime.mime.startsWith(c))) {
|
|
32
|
+
if (!allowedContent.some((c) => mime.mime.startsWith(c))) {
|
|
35
33
|
throw new Error(`Dissallowed content type provided: ${mime.mime.split("/")[0]}. Allowed content types: ${allowedContent} `);
|
|
36
34
|
}
|
|
37
35
|
}
|
|
38
|
-
else if ("acceptedContentType" in colConfig &&
|
|
36
|
+
else if ("acceptedContentType" in colConfig &&
|
|
37
|
+
colConfig.acceptedContentType &&
|
|
38
|
+
colConfig.acceptedContentType !== "*") {
|
|
39
39
|
const mime = await (0, FileManager_1.getFileType)(buffer, fileName);
|
|
40
40
|
const allowedContentTypes = (0, parseFieldFilter_1.parseFieldFilter)(colConfig.acceptedContentType, false, (0, prostgles_types_1.getKeys)(prostgles_types_1.CONTENT_TYPE_TO_EXT));
|
|
41
|
-
if (!allowedContentTypes.some(c => c === mime.mime)) {
|
|
41
|
+
if (!allowedContentTypes.some((c) => c === mime.mime)) {
|
|
42
42
|
throw new Error(`Dissallowed MIME provided: ${mime.mime}. Allowed MIME values: ${allowedContentTypes} `);
|
|
43
43
|
}
|
|
44
44
|
}
|
|
45
|
-
else if ("acceptedFileTypes" in colConfig &&
|
|
45
|
+
else if ("acceptedFileTypes" in colConfig &&
|
|
46
|
+
colConfig.acceptedFileTypes &&
|
|
47
|
+
colConfig.acceptedFileTypes !== "*") {
|
|
46
48
|
const mime = await (0, FileManager_1.getFileType)(buffer, fileName);
|
|
47
49
|
const allowedExtensions = (0, parseFieldFilter_1.parseFieldFilter)(colConfig.acceptedFileTypes, false, Object.values(prostgles_types_1.CONTENT_TYPE_TO_EXT).flat());
|
|
48
|
-
if (!allowedExtensions.some(c => c === mime.ext)) {
|
|
50
|
+
if (!allowedExtensions.some((c) => c === mime.ext)) {
|
|
49
51
|
throw new Error(`Dissallowed extension provided: ${mime.ext}. Allowed extension values: ${allowedExtensions} `);
|
|
50
52
|
}
|
|
51
53
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getValidatedFileType.js","sourceRoot":"","sources":["../../lib/FileManager/getValidatedFileType.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"getValidatedFileType.js","sourceRoot":"","sources":["../../lib/FileManager/getValidatedFileType.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"initFileManager.d.ts","sourceRoot":"","sources":["../../lib/FileManager/initFileManager.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,WAAW,EAAqB,MAAM,eAAe,CAAC;AAI/D,wBAAsB,eAAe,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,SAAS,
|
|
1
|
+
{"version":3,"file":"initFileManager.d.ts","sourceRoot":"","sources":["../../lib/FileManager/initFileManager.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,WAAW,EAAqB,MAAM,eAAe,CAAC;AAI/D,wBAAsB,eAAe,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,SAAS,iBAyMtE"}
|
|
@@ -135,7 +135,13 @@ async function initFileManager(prg) {
|
|
|
135
135
|
}
|
|
136
136
|
const id = name.slice(0, 36);
|
|
137
137
|
const selectParams = {
|
|
138
|
-
select: {
|
|
138
|
+
select: {
|
|
139
|
+
id: 1,
|
|
140
|
+
name: 1,
|
|
141
|
+
signed_url: 1,
|
|
142
|
+
signed_url_expires: 1,
|
|
143
|
+
content_type: 1,
|
|
144
|
+
},
|
|
139
145
|
};
|
|
140
146
|
const media = await runClientRequest_1.runClientRequest.bind(this.prostgles)({
|
|
141
147
|
type: "http",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"initFileManager.js","sourceRoot":"","sources":["../../lib/FileManager/initFileManager.ts"],"names":[],"mappings":";;;AAAA,yBAAyB;AACzB,qDAAmD;AAEnD,iDAAuD;AAEvD,+CAA+D;AAC/D,0DAAuD;AACvD,qDAAgD;AAEzC,KAAK,UAAU,eAAe,CAAoB,GAAc;IACrE,IAAI,CAAC,SAAS,GAAG,GAAG,CAAC;IAErB,MAAM,EAAE,SAAS,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC;IAC/B,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,MAAM,mBAAmB,CAAC;IAC5B,CAAC;IACD,MAAM,EAAE,SAAS,GAAG,OAAO,EAAE,gBAAgB,GAAG,EAAE,EAAE,GAAG,SAAS,CAAC;IACjE,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAE3B,MAAM,WAAW,
|
|
1
|
+
{"version":3,"file":"initFileManager.js","sourceRoot":"","sources":["../../lib/FileManager/initFileManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,6 @@
|
|
|
2
2
|
/// <reference types="node" />
|
|
3
3
|
/// <reference types="node" />
|
|
4
4
|
import { FileManager, OnProgress, UploadedItem } from "./FileManager";
|
|
5
|
-
import * as stream from
|
|
5
|
+
import * as stream from "stream";
|
|
6
6
|
export declare function upload(this: FileManager, file: Buffer | string | stream.PassThrough, name: string, mime: string, onProgress?: OnProgress): Promise<UploadedItem>;
|
|
7
7
|
//# sourceMappingURL=upload.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upload.d.ts","sourceRoot":"","sources":["../../lib/FileManager/upload.ts"],"names":[],"mappings":";;;AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"upload.d.ts","sourceRoot":"","sources":["../../lib/FileManager/upload.ts"],"names":[],"mappings":";;;AAAA,OAAO,EACL,WAAW,EAEX,UAAU,EACV,YAAY,EACb,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AAGjC,wBAAsB,MAAM,CAC1B,IAAI,EAAE,WAAW,EACjB,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC,WAAW,EAC1C,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,UAAU,CAAC,EAAE,UAAU,GACtB,OAAO,CAAC,YAAY,CAAC,CAgDvB"}
|
|
@@ -24,7 +24,7 @@ async function upload(file, name, mime, onProgress) {
|
|
|
24
24
|
resolve({
|
|
25
25
|
url,
|
|
26
26
|
etag: `none`,
|
|
27
|
-
content_length: fs.statSync(filePath).size
|
|
27
|
+
content_length: fs.statSync(filePath).size,
|
|
28
28
|
});
|
|
29
29
|
}
|
|
30
30
|
catch (err) {
|
|
@@ -46,10 +46,10 @@ async function upload(file, name, mime, onProgress) {
|
|
|
46
46
|
resolve({ ...uploaded, url });
|
|
47
47
|
}
|
|
48
48
|
},
|
|
49
|
-
onProgress: loaded => {
|
|
49
|
+
onProgress: (loaded) => {
|
|
50
50
|
content_length = loaded;
|
|
51
51
|
onProgress?.({ loaded, total: content_length });
|
|
52
|
-
}
|
|
52
|
+
},
|
|
53
53
|
});
|
|
54
54
|
}
|
|
55
55
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../lib/FileManager/upload.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../lib/FileManager/upload.ts"],"names":[],"mappings":";;;AAMA,iCAAiC;AACjC,yBAAyB;AAElB,KAAK,UAAU,MAAM,CAE1B,IAA0C,EAC1C,IAAY,EACZ,IAAY,EACZ,UAAuB;IAEvB,OAAO,IAAI,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;QAC3C,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,MAAM,0DAA0D,CAAC;QACnE,CAAC;QACD,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,MAAM,iCAAiC,CAAC;QAC1C,CAAC;QAED,MAAM,GAAG,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QACvC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YACtB,IAAI,IAAI,YAAY,MAAM,CAAC,WAAW,EAAE,CAAC;gBACvC,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;YACtE,CAAC;YACD,MAAM,MAAM,GAAG,IAAI,CAAC,MAAqB,CAAC;YAC1C,IAAI,CAAC;gBACH,MAAM,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,eAAe,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;gBACrE,MAAM,QAAQ,GAAG,GAAG,MAAM,CAAC,eAAe,IAAI,IAAI,EAAE,CAAC;gBACrD,EAAE,CAAC,aAAa,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;gBACjC,OAAO,CAAC;oBACN,GAAG;oBACH,IAAI,EAAE,MAAM;oBACZ,cAAc,EAAE,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,IAAI;iBAC3C,CAAC,CAAC;YACL,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,OAAO,CAAC,KAAK,CAAC,2BAA2B,EAAE,GAAG,CAAC,CAAC;gBAChD,MAAM,CAAC,gBAAgB,CAAC,CAAC;YAC3B,CAAC;QACH,CAAC;aAAM,CAAC;YACN,IAAI,cAAc,GAAG,CAAC,CAAC;YACvB,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC;gBACtB,QAAQ,EAAE,IAAI;gBACd,WAAW,EAAE,IAAI;gBACjB,IAAI;gBACJ,QAAQ,EAAE,CAAC,GAAG,EAAE,QAAQ,EAAE,EAAE;oBAC1B,IAAI,GAAG,EAAE,CAAC;wBACR,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;oBACzB,CAAC;yBAAM,CAAC;wBACN,OAAO,CAAC,EAAE,GAAG,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;oBAChC,CAAC;gBACH,CAAC;gBACD,UAAU,EAAE,CAAC,MAAM,EAAE,EAAE;oBACrB,cAAc,GAAG,MAAM,CAAC;oBACxB,UAAU,EAAE,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,cAAc,EAAE,CAAC,CAAC;gBAClD,CAAC;aACF,CAAC,CAAC;QACL,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAtDD,wBAsDC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import { FileManager, OnProgress, UploadedItem } from "./FileManager";
|
|
3
|
-
import * as stream from
|
|
3
|
+
import * as stream from "stream";
|
|
4
4
|
export declare function uploadStream(this: FileManager, name: string, mime: string, onProgress?: OnProgress, onError?: (error: any) => void, onEnd?: (item: UploadedItem) => void, expectedSizeBytes?: number): stream.PassThrough;
|
|
5
5
|
//# sourceMappingURL=uploadStream.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"uploadStream.d.ts","sourceRoot":"","sources":["../../lib/FileManager/uploadStream.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAEtE,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AAGjC,wBAAgB,YAAY,CAC1B,IAAI,EAAE,WAAW,EACjB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,UAAU,CAAC,EAAE,UAAU,EACvB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,
|
|
1
|
+
{"version":3,"file":"uploadStream.d.ts","sourceRoot":"","sources":["../../lib/FileManager/uploadStream.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAEtE,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AAGjC,wBAAgB,YAAY,CAC1B,IAAI,EAAE,WAAW,EACjB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,UAAU,CAAC,EAAE,UAAU,EACvB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,IAAI,EAC9B,KAAK,CAAC,EAAE,CAAC,IAAI,EAAE,YAAY,KAAK,IAAI,EACpC,iBAAiB,CAAC,EAAE,MAAM,sBAiE3B"}
|
|
@@ -8,7 +8,7 @@ function uploadStream(name, mime, onProgress, onError, onEnd, expectedSizeBytes)
|
|
|
8
8
|
const passThrough = new stream.PassThrough();
|
|
9
9
|
if (!this.cloudClient && "localFolderPath" in this.config) {
|
|
10
10
|
try {
|
|
11
|
-
this.checkFreeSpace(this.config.localFolderPath, expectedSizeBytes).catch(err => {
|
|
11
|
+
this.checkFreeSpace(this.config.localFolderPath, expectedSizeBytes).catch((err) => {
|
|
12
12
|
onError?.(err);
|
|
13
13
|
passThrough.end();
|
|
14
14
|
});
|
|
@@ -18,14 +18,14 @@ function uploadStream(name, mime, onProgress, onError, onEnd, expectedSizeBytes)
|
|
|
18
18
|
const writeStream = fs.createWriteStream(filePath);
|
|
19
19
|
let errored = false;
|
|
20
20
|
let loaded = 0;
|
|
21
|
-
writeStream.on(
|
|
21
|
+
writeStream.on("error", (err) => {
|
|
22
22
|
errored = true;
|
|
23
23
|
onError?.(err);
|
|
24
24
|
});
|
|
25
25
|
let lastProgress = Date.now();
|
|
26
26
|
const throttle = 1000;
|
|
27
27
|
if (onProgress) {
|
|
28
|
-
passThrough.on(
|
|
28
|
+
passThrough.on("data", function (chunk) {
|
|
29
29
|
loaded += chunk.length;
|
|
30
30
|
const now = Date.now();
|
|
31
31
|
if (now - lastProgress > throttle) {
|
|
@@ -35,7 +35,7 @@ function uploadStream(name, mime, onProgress, onError, onEnd, expectedSizeBytes)
|
|
|
35
35
|
});
|
|
36
36
|
}
|
|
37
37
|
if (onEnd) {
|
|
38
|
-
writeStream.on(
|
|
38
|
+
writeStream.on("finish", () => {
|
|
39
39
|
if (errored)
|
|
40
40
|
return;
|
|
41
41
|
let content_length = 0;
|
|
@@ -45,7 +45,7 @@ function uploadStream(name, mime, onProgress, onError, onEnd, expectedSizeBytes)
|
|
|
45
45
|
url,
|
|
46
46
|
filePath,
|
|
47
47
|
etag: `none`,
|
|
48
|
-
content_length
|
|
48
|
+
content_length,
|
|
49
49
|
});
|
|
50
50
|
}
|
|
51
51
|
catch (err) {
|
|
@@ -60,8 +60,7 @@ function uploadStream(name, mime, onProgress, onError, onEnd, expectedSizeBytes)
|
|
|
60
60
|
}
|
|
61
61
|
}
|
|
62
62
|
else {
|
|
63
|
-
this.upload(passThrough, name, mime, onProgress).then(onEnd)
|
|
64
|
-
.catch(onError);
|
|
63
|
+
this.upload(passThrough, name, mime, onProgress).then(onEnd).catch(onError);
|
|
65
64
|
}
|
|
66
65
|
return passThrough;
|
|
67
66
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"uploadStream.js","sourceRoot":"","sources":["../../lib/FileManager/uploadStream.ts"],"names":[],"mappings":";;;AACA,yBAAyB;AACzB,iCAAiC;AACjC,6BAA6B;AAE7B,SAAgB,YAAY,CAE1B,IAAY,EACZ,IAAY,EACZ,UAAuB,EACvB,
|
|
1
|
+
{"version":3,"file":"uploadStream.js","sourceRoot":"","sources":["../../lib/FileManager/uploadStream.ts"],"names":[],"mappings":"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"}
|
package/dist/Filtering.d.ts
CHANGED
|
@@ -3,9 +3,9 @@ import { SelectItem } from "./DboBuilder/QueryBuilder/QueryBuilder";
|
|
|
3
3
|
export declare const FILTER_OPERANDS: readonly ["$ilike", "$like", "$nilike", "$nlike", ...("@@" | "@>" | "<@" | "?" | "?|" | "?&" | "||" | "-" | "#-" | "@?")[], "=", "$eq", "<>", ">", "<", ">=", "<=", "$eq", "$ne", "$gt", "$gte", "$lt", "$lte", "$isDistinctFrom", "$isNotDistinctFrom", "$between", "$notBetween", "$in", "$nin"];
|
|
4
4
|
export declare const FILTER_OPERAND_TO_SQL_OPERAND: Record<"=" | "$eq" | "<>" | ">" | "<" | ">=" | "<=" | "$ne" | "$gt" | "$gte" | "$lt" | "$lte" | "$isDistinctFrom" | "$isNotDistinctFrom" | "$in" | "$nin" | "$ilike" | "$like" | "$nilike" | "$nlike" | "@@" | "@>" | "<@" | "?" | "?|" | "?&" | "||" | "-" | "#-" | "@?" | "$between" | "$notBetween", string>;
|
|
5
5
|
/**
|
|
6
|
-
* Parse a single filter
|
|
7
|
-
* Ensure only single key objects reach this point
|
|
8
|
-
*/
|
|
6
|
+
* Parse a single filter
|
|
7
|
+
* Ensure only single key objects reach this point
|
|
8
|
+
*/
|
|
9
9
|
type ParseFilterItemArgs = {
|
|
10
10
|
filter: FullFilter<void, void>;
|
|
11
11
|
select: SelectItem[] | undefined;
|
package/dist/Filtering.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Filtering.d.ts","sourceRoot":"","sources":["../lib/Filtering.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Filtering.d.ts","sourceRoot":"","sources":["../lib/Filtering.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,UAAU,EASX,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,UAAU,EAAE,MAAM,wCAAwC,CAAC;AAGpE,eAAO,MAAM,eAAe,oSAMlB,CAAC;AAEX,eAAO,MAAM,6BAA6B,iTAuBW,CAAC;AAEtD;;;GAGG;AACH,KAAK,mBAAmB,GAAG;IACzB,MAAM,EAAE,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC/B,MAAM,EAAE,UAAU,EAAE,GAAG,SAAS,CAAC;IACjC,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,kBAAkB,EAAE,MAAM,EAAE,CAAC;CAC9B,CAAC;AAEF,eAAO,MAAM,eAAe,SAAU,mBAAmB,KAAG,MAkZ3D,CAAC;AAEF,KAAK,iBAAiB,GAAG;IACvB,MAAM,CAAC,EAAE,KAAK,GAAG,OAAO,GAAG,MAAM,GAAG,OAAO,CAAC;IAC5C,UAAU,EAAE,UAAU,GAAG,SAAS,CAAC;CACpC,CAAC;AACF,eAAO,MAAM,qBAAqB,QAC3B,GAAG,0BACgB,iBAAiB,WAiB1C,CAAC"}
|
package/dist/Filtering.js
CHANGED
|
@@ -8,9 +8,9 @@ exports.FILTER_OPERANDS = [
|
|
|
8
8
|
...prostgles_types_1.JsonbFilterKeys,
|
|
9
9
|
...prostgles_types_1.CompareFilterKeys,
|
|
10
10
|
...prostgles_types_1.BetweenFilterKeys,
|
|
11
|
-
...prostgles_types_1.CompareInFilterKeys
|
|
11
|
+
...prostgles_types_1.CompareInFilterKeys,
|
|
12
12
|
];
|
|
13
|
-
exports.FILTER_OPERAND_TO_SQL_OPERAND = Object.fromEntries(exports.FILTER_OPERANDS.map(filterOperand => {
|
|
13
|
+
exports.FILTER_OPERAND_TO_SQL_OPERAND = Object.fromEntries(exports.FILTER_OPERANDS.map((filterOperand) => {
|
|
14
14
|
let sqlOperand = filterOperand;
|
|
15
15
|
if (filterOperand === "$eq")
|
|
16
16
|
sqlOperand = "=";
|
|
@@ -62,7 +62,8 @@ const parseFilterItem = (args) => {
|
|
|
62
62
|
*/
|
|
63
63
|
}
|
|
64
64
|
else if (fKeys.length > 1) {
|
|
65
|
-
return fKeys
|
|
65
|
+
return fKeys
|
|
66
|
+
.map((fk) => (0, exports.parseFilterItem)({
|
|
66
67
|
filter: { [fk]: _f[fk] },
|
|
67
68
|
select,
|
|
68
69
|
tableAlias,
|
|
@@ -74,13 +75,13 @@ const parseFilterItem = (args) => {
|
|
|
74
75
|
const fKey = fKeys[0];
|
|
75
76
|
let selItem;
|
|
76
77
|
if (select) {
|
|
77
|
-
selItem = select.find(s => fKey === s.alias);
|
|
78
|
+
selItem = select.find((s) => fKey === s.alias);
|
|
78
79
|
}
|
|
79
80
|
let rightF = _f[fKey];
|
|
80
81
|
const validateSelectedItemFilter = (selectedItem) => {
|
|
81
82
|
const fields = selectedItem?.getFields();
|
|
82
83
|
if (Array.isArray(fields) && fields.length > 1) {
|
|
83
|
-
const dissallowedFields = fields.filter(fname => !allowedColumnNames.includes(fname));
|
|
84
|
+
const dissallowedFields = fields.filter((fname) => !allowedColumnNames.includes(fname));
|
|
84
85
|
if (dissallowedFields.length) {
|
|
85
86
|
throw new Error(`Invalid/disallowed columns found in filter: ${dissallowedFields}`);
|
|
86
87
|
}
|
|
@@ -93,8 +94,8 @@ const parseFilterItem = (args) => {
|
|
|
93
94
|
return selItm.getQuery(tableAlias);
|
|
94
95
|
};
|
|
95
96
|
/**
|
|
96
|
-
|
|
97
|
-
|
|
97
|
+
* Parsed left side of the query
|
|
98
|
+
*/
|
|
98
99
|
let leftQ; // = asName(selItem.alias);
|
|
99
100
|
/*
|
|
100
101
|
Select item not found.
|
|
@@ -104,17 +105,18 @@ const parseFilterItem = (args) => {
|
|
|
104
105
|
if (!selItem) {
|
|
105
106
|
/* See if dot notation. Pick the best matching starting string */
|
|
106
107
|
if (select) {
|
|
107
|
-
selItem = select.find(s => dot_notation_delims.find(delimiter => fKey.startsWith(s.alias + delimiter)));
|
|
108
|
+
selItem = select.find((s) => dot_notation_delims.find((delimiter) => fKey.startsWith(s.alias + delimiter)));
|
|
108
109
|
validateSelectedItemFilter(selItem);
|
|
109
110
|
}
|
|
110
111
|
if (!selItem) {
|
|
111
|
-
return mErr("Bad filter. Could not match to a column or alias or dot notation" +
|
|
112
|
+
return mErr("Bad filter. Could not match to a column or alias or dot notation" +
|
|
113
|
+
select?.map((s) => s.alias));
|
|
112
114
|
}
|
|
113
115
|
let remainingStr = fKey.slice(selItem.alias.length);
|
|
114
116
|
/* Is json path spec */
|
|
115
117
|
if (remainingStr.startsWith("->")) {
|
|
116
118
|
/** Has shorthand operand 'col->>key.<>' */
|
|
117
|
-
const matchingOperand = prostgles_types_1.CompareFilterKeys.find(operand => remainingStr.endsWith(`.${operand}`));
|
|
119
|
+
const matchingOperand = prostgles_types_1.CompareFilterKeys.find((operand) => remainingStr.endsWith(`.${operand}`));
|
|
118
120
|
if (matchingOperand) {
|
|
119
121
|
remainingStr = remainingStr.slice(0, -matchingOperand.length - 1);
|
|
120
122
|
rightF = { [matchingOperand]: rightF };
|
|
@@ -145,13 +147,15 @@ const parseFilterItem = (args) => {
|
|
|
145
147
|
nextIdx = remainingStr.length;
|
|
146
148
|
nextSep = undefined;
|
|
147
149
|
}
|
|
148
|
-
leftQ +=
|
|
150
|
+
leftQ +=
|
|
151
|
+
currSep.sep +
|
|
152
|
+
asValue(remainingStr.slice(currSep.idx + currSep.sep.length, nextIdx));
|
|
149
153
|
currSep = nextSep;
|
|
150
154
|
}
|
|
151
155
|
/*
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
156
|
+
Is collapsed filter spec e.g. { "col.$ilike": 'text' }
|
|
157
|
+
will transform into { col: { $ilike: ['text'] } }
|
|
158
|
+
*/
|
|
155
159
|
}
|
|
156
160
|
else if (remainingStr.startsWith(".")) {
|
|
157
161
|
leftQ = getLeftQ(selItem);
|
|
@@ -202,20 +206,29 @@ const parseFilterItem = (args) => {
|
|
|
202
206
|
const filterKeys = Object.keys(rightF);
|
|
203
207
|
let filterOperand = filterKeys[0];
|
|
204
208
|
/** JSON cannot be compared so we'll cast it to TEXT */
|
|
205
|
-
if (selItem?.column_udt_type === "json" ||
|
|
209
|
+
if (selItem?.column_udt_type === "json" ||
|
|
210
|
+
prostgles_types_1.TextFilterKeys.includes(filterOperand)) {
|
|
206
211
|
leftQ += "::TEXT ";
|
|
207
212
|
}
|
|
208
213
|
/** It's an object key which means it's an equality comparison against a json object */
|
|
209
|
-
if (selItem?.column_udt_type?.startsWith("json") &&
|
|
214
|
+
if (selItem?.column_udt_type?.startsWith("json") &&
|
|
215
|
+
!exports.FILTER_OPERANDS.includes(filterOperand)) {
|
|
210
216
|
return leftQ + " = " + parseRightVal(rightF);
|
|
211
217
|
}
|
|
212
218
|
let filterValue = rightF[filterOperand];
|
|
213
|
-
const ALLOWED_FUNCS = [
|
|
219
|
+
const ALLOWED_FUNCS = [
|
|
220
|
+
...prostgles_types_1.GeomFilter_Funcs,
|
|
221
|
+
...prostgles_types_1.TextFilter_FullTextSearchFilterKeys,
|
|
222
|
+
];
|
|
214
223
|
let funcName;
|
|
215
224
|
let funcArgs;
|
|
216
|
-
if (selItem.column_udt_type === "interval" &&
|
|
225
|
+
if (selItem.column_udt_type === "interval" &&
|
|
226
|
+
(0, prostgles_types_1.isObject)(rightF) &&
|
|
227
|
+
Object.values(rightF).every((v) => Number.isFinite(v))) {
|
|
217
228
|
filterOperand = "=";
|
|
218
|
-
filterValue = Object.entries(rightF)
|
|
229
|
+
filterValue = Object.entries(rightF)
|
|
230
|
+
.map(([k, v]) => `${v}${k}`)
|
|
231
|
+
.join(" ");
|
|
219
232
|
}
|
|
220
233
|
else if (filterKeys.length !== 1 && selItem.column_udt_type !== "jsonb") {
|
|
221
234
|
return mErr("Bad filter. Expecting one key only");
|
|
@@ -235,13 +248,15 @@ const parseFilterItem = (args) => {
|
|
|
235
248
|
}
|
|
236
249
|
}
|
|
237
250
|
/** st_makeenvelope */
|
|
238
|
-
if (prostgles_types_1.GeomFilterKeys.includes(filterOperand) &&
|
|
251
|
+
if (prostgles_types_1.GeomFilterKeys.includes(filterOperand) &&
|
|
252
|
+
funcName &&
|
|
253
|
+
prostgles_types_1.GeomFilter_Funcs.includes(funcName)) {
|
|
239
254
|
/**
|
|
240
255
|
* If leftQ is geography then:
|
|
241
256
|
* - err can happen: 'Antipodal (180 degrees long) edge detected!'
|
|
242
257
|
* - inacurrate results at large envelopes due to the curvature of the earth
|
|
243
258
|
* https://gis.stackexchange.com/questions/78816/maximum-size-on-the-bounding-box-with-st-makeenvelope-and-and-geography-colum
|
|
244
|
-
|
|
259
|
+
*/
|
|
245
260
|
if (funcName.toLowerCase() === "st_makeenvelope") {
|
|
246
261
|
leftQ += "::geometry";
|
|
247
262
|
}
|
|
@@ -281,7 +296,7 @@ const parseFilterItem = (args) => {
|
|
|
281
296
|
if (filterValue.includes(null)) {
|
|
282
297
|
c2 = ` ${leftQ} IS NULL `;
|
|
283
298
|
}
|
|
284
|
-
return [c1, c2].filter(c => c).join(" OR ");
|
|
299
|
+
return [c1, c2].filter((c) => c).join(" OR ");
|
|
285
300
|
}
|
|
286
301
|
else if (["$nin"].includes(filterOperand)) {
|
|
287
302
|
if (!filterValue?.length) {
|
|
@@ -293,13 +308,17 @@ const parseFilterItem = (args) => {
|
|
|
293
308
|
c1 = leftQ + " NOT IN " + parseRightVal(nonNullFilterValues, "csv");
|
|
294
309
|
if (filterValue.includes(null))
|
|
295
310
|
c2 = ` ${leftQ} IS NOT NULL `;
|
|
296
|
-
return [c1, c2].filter(c => c).join(" AND ");
|
|
311
|
+
return [c1, c2].filter((c) => c).join(" AND ");
|
|
297
312
|
}
|
|
298
313
|
else if (["$between"].includes(filterOperand)) {
|
|
299
314
|
if (!Array.isArray(filterValue) || filterValue.length !== 2) {
|
|
300
315
|
return mErr("Between filter expects an array of two values");
|
|
301
316
|
}
|
|
302
|
-
return leftQ +
|
|
317
|
+
return (leftQ +
|
|
318
|
+
" BETWEEN " +
|
|
319
|
+
asValue(filterValue[0]) +
|
|
320
|
+
" AND " +
|
|
321
|
+
asValue(filterValue[1]));
|
|
303
322
|
}
|
|
304
323
|
else if (["$ilike"].includes(filterOperand)) {
|
|
305
324
|
return leftQ + " ILIKE " + asValue(filterValue);
|
|
@@ -313,22 +332,35 @@ const parseFilterItem = (args) => {
|
|
|
313
332
|
else if (["$nlike"].includes(filterOperand)) {
|
|
314
333
|
return leftQ + " NOT LIKE " + asValue(filterValue);
|
|
315
334
|
}
|
|
316
|
-
else if (filterOperand === "$isDistinctFrom" ||
|
|
335
|
+
else if (filterOperand === "$isDistinctFrom" ||
|
|
336
|
+
filterOperand === "$isNotDistinctFrom") {
|
|
317
337
|
const operator = exports.FILTER_OPERAND_TO_SQL_OPERAND[filterOperand];
|
|
318
338
|
return leftQ + ` ${operator} ` + asValue(filterValue);
|
|
319
339
|
/* MAYBE TEXT OR MAYBE ARRAY */
|
|
320
340
|
}
|
|
321
|
-
else if ([
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
|
|
325
|
-
|
|
341
|
+
else if ([
|
|
342
|
+
"@>",
|
|
343
|
+
"<@",
|
|
344
|
+
"$contains",
|
|
345
|
+
"$containedBy",
|
|
346
|
+
"$overlaps",
|
|
347
|
+
"&&",
|
|
348
|
+
"@@",
|
|
349
|
+
].includes(filterOperand)) {
|
|
350
|
+
const operand = filterOperand === "@@"
|
|
351
|
+
? "@@"
|
|
352
|
+
: ["@>", "$contains"].includes(filterOperand)
|
|
353
|
+
? "@>"
|
|
354
|
+
: ["&&", "$overlaps"].includes(filterOperand)
|
|
355
|
+
? "&&"
|
|
356
|
+
: "<@";
|
|
326
357
|
/* Array for sure */
|
|
327
358
|
if (Array.isArray(filterValue)) {
|
|
328
359
|
return leftQ + operand + parseRightVal(filterValue, "array");
|
|
329
360
|
/* FTSQuery */
|
|
330
361
|
}
|
|
331
|
-
else if (["@@"].includes(filterOperand) &&
|
|
362
|
+
else if (["@@"].includes(filterOperand) &&
|
|
363
|
+
prostgles_types_1.TextFilter_FullTextSearchFilterKeys.includes(funcName)) {
|
|
332
364
|
let lq = `to_tsvector(${leftQ}::text)`;
|
|
333
365
|
if (selItem && selItem.columnPGDataType === "tsvector")
|
|
334
366
|
lq = leftQ;
|
|
@@ -353,7 +385,8 @@ const parseFilterItem = (args) => {
|
|
|
353
385
|
* Ensure that when comparing an array to a json column, the array is cast to json
|
|
354
386
|
*/
|
|
355
387
|
let valueStr = asValue(rightF);
|
|
356
|
-
if (selItem?.column_udt_type?.startsWith("json") &&
|
|
388
|
+
if (selItem?.column_udt_type?.startsWith("json") &&
|
|
389
|
+
Array.isArray(rightF)) {
|
|
357
390
|
valueStr = DboBuilderTypes_1.pgp.as.format(`$1::jsonb`, [JSON.stringify(rightF)]);
|
|
358
391
|
}
|
|
359
392
|
return `${leftQ} = ${valueStr}`;
|
|
@@ -382,20 +415,20 @@ exports.parseFilterRightValue = parseFilterRightValue;
|
|
|
382
415
|
// ensure pgp is not NULL!!!
|
|
383
416
|
// const asValue = v => v;// pgp.as.value;
|
|
384
417
|
// const filters: FilterSpec[] = [
|
|
385
|
-
// ...(["ilike", "like"].map(op => ({
|
|
418
|
+
// ...(["ilike", "like"].map(op => ({
|
|
386
419
|
// operands: ["$" + op],
|
|
387
420
|
// tsDataTypes: ["any"] as TSDataType[],
|
|
388
421
|
// tsDefinition: ` { $${op}: string } `,
|
|
389
|
-
// // data_types:
|
|
422
|
+
// // data_types:
|
|
390
423
|
// getQuery: (leftQuery: string, rightVal: any) => {
|
|
391
|
-
// return `${leftQuery}::text ${op.toUpperCase()} ${asValue(rightVal)}::text`
|
|
424
|
+
// return `${leftQuery}::text ${op.toUpperCase()} ${asValue(rightVal)}::text`
|
|
392
425
|
// }
|
|
393
426
|
// }))),
|
|
394
|
-
// {
|
|
427
|
+
// {
|
|
395
428
|
// operands: ["", "="],
|
|
396
429
|
// tsDataTypes: ["any"],
|
|
397
430
|
// tsDefinition: ` { "=": any } | any `,
|
|
398
|
-
// // data_types:
|
|
431
|
+
// // data_types:
|
|
399
432
|
// getQuery: (leftQuery: string, rightVal: any) => {
|
|
400
433
|
// if(rightVal === null) return`${leftQuery} IS NULL `;
|
|
401
434
|
// return `${leftQuery} = ${asValue(rightVal)}`;
|