@effect-app/infra 4.0.0-beta.25 → 4.0.0-beta.250
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/CHANGELOG.md +1892 -0
- package/_check.sh +1 -1
- package/dist/CUPS.d.ts +30 -11
- package/dist/CUPS.d.ts.map +1 -1
- package/dist/CUPS.js +35 -14
- package/dist/ContextProvider.d.ts +34 -0
- package/dist/ContextProvider.d.ts.map +1 -0
- package/dist/ContextProvider.js +40 -0
- package/dist/Emailer/Sendgrid.d.ts +111 -147
- package/dist/Emailer/Sendgrid.d.ts.map +1 -1
- package/dist/Emailer/Sendgrid.js +24 -19
- package/dist/Emailer/fake.d.ts +2 -2
- package/dist/Emailer/fake.d.ts.map +1 -1
- package/dist/Emailer/fake.js +4 -4
- package/dist/MainFiberSet.d.ts +12 -9
- package/dist/MainFiberSet.d.ts.map +1 -1
- package/dist/MainFiberSet.js +10 -6
- package/dist/QueueMaker/SQLQueue.d.ts +8 -9
- package/dist/QueueMaker/SQLQueue.d.ts.map +1 -1
- package/dist/QueueMaker/SQLQueue.js +138 -120
- package/dist/QueueMaker/errors.d.ts +5 -3
- package/dist/QueueMaker/errors.d.ts.map +1 -1
- package/dist/QueueMaker/errors.js +4 -2
- package/dist/QueueMaker/memQueue.d.ts +10 -6
- package/dist/QueueMaker/memQueue.d.ts.map +1 -1
- package/dist/QueueMaker/memQueue.js +84 -68
- package/dist/QueueMaker/sbqueue.d.ts +9 -5
- package/dist/QueueMaker/sbqueue.d.ts.map +1 -1
- package/dist/QueueMaker/sbqueue.js +60 -58
- package/dist/RequestFiberSet.d.ts +10 -7
- package/dist/RequestFiberSet.d.ts.map +1 -1
- package/dist/RequestFiberSet.js +13 -8
- package/dist/SQL/Model.d.ts +468 -0
- package/dist/SQL/Model.d.ts.map +1 -0
- package/dist/SQL/Model.js +469 -0
- package/dist/SQL.d.ts +2 -0
- package/dist/SQL.d.ts.map +1 -0
- package/dist/{adapters/SQL.js → SQL.js} +1 -1
- package/dist/ServiceBus.d.ts +61 -0
- package/dist/ServiceBus.d.ts.map +1 -0
- package/dist/ServiceBus.js +108 -0
- package/dist/Store/Cosmos/query.d.ts +15 -4
- package/dist/Store/Cosmos/query.d.ts.map +1 -1
- package/dist/Store/Cosmos/query.js +179 -41
- package/dist/Store/Cosmos.d.ts +3 -3
- package/dist/Store/Cosmos.d.ts.map +1 -1
- package/dist/Store/Cosmos.js +345 -246
- package/dist/Store/Disk.d.ts +5 -5
- package/dist/Store/Disk.d.ts.map +1 -1
- package/dist/Store/Disk.js +77 -37
- package/dist/Store/Memory.d.ts +9 -6
- package/dist/Store/Memory.d.ts.map +1 -1
- package/dist/Store/Memory.js +328 -63
- package/dist/Store/SQL/Pg.d.ts +4 -0
- package/dist/Store/SQL/Pg.d.ts.map +1 -0
- package/dist/Store/SQL/Pg.js +233 -0
- package/dist/Store/SQL/query.d.ts +49 -0
- package/dist/Store/SQL/query.d.ts.map +1 -0
- package/dist/Store/SQL/query.js +527 -0
- package/dist/Store/SQL.d.ts +21 -0
- package/dist/Store/SQL.d.ts.map +1 -0
- package/dist/Store/SQL.js +450 -0
- package/dist/Store/codeFilter.d.ts +5 -5
- package/dist/Store/codeFilter.d.ts.map +1 -1
- package/dist/Store/codeFilter.js +6 -3
- package/dist/Store/index.d.ts +7 -5
- package/dist/Store/index.d.ts.map +1 -1
- package/dist/Store/index.js +18 -5
- package/dist/Store/utils.d.ts +4 -3
- package/dist/Store/utils.d.ts.map +1 -1
- package/dist/Store/utils.js +5 -5
- package/dist/arbs.d.ts +2 -2
- package/dist/arbs.d.ts.map +1 -1
- package/dist/arbs.js +5 -3
- package/dist/codec.d.ts +5 -0
- package/dist/codec.d.ts.map +1 -0
- package/dist/codec.js +5 -0
- package/dist/cosmos-client.d.ts +16 -0
- package/dist/cosmos-client.d.ts.map +1 -0
- package/dist/cosmos-client.js +11 -0
- package/dist/errorReporter.d.ts +7 -5
- package/dist/errorReporter.d.ts.map +1 -1
- package/dist/errorReporter.js +23 -27
- package/dist/errors.d.ts +1 -1
- package/dist/fileUtil.d.ts +2 -2
- package/dist/fileUtil.d.ts.map +1 -1
- package/dist/fileUtil.js +2 -2
- package/dist/index.d.ts +3 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +3 -2
- package/dist/internal/RequestContextMiddleware.d.ts +5 -0
- package/dist/internal/RequestContextMiddleware.d.ts.map +1 -0
- package/dist/internal/RequestContextMiddleware.js +46 -0
- package/dist/internal/auth.d.ts +53 -0
- package/dist/internal/auth.d.ts.map +1 -0
- package/dist/internal/auth.js +180 -0
- package/dist/internal/events.d.ts +11 -0
- package/dist/internal/events.d.ts.map +1 -0
- package/dist/internal/events.js +49 -0
- package/dist/internal/health.d.ts +3 -0
- package/dist/internal/health.d.ts.map +1 -0
- package/dist/internal/health.js +5 -0
- package/dist/layerUtils.d.ts +32 -0
- package/dist/layerUtils.d.ts.map +1 -0
- package/dist/layerUtils.js +17 -0
- package/dist/logger/jsonLogger.d.ts +2 -2
- package/dist/logger/jsonLogger.d.ts.map +1 -1
- package/dist/logger/jsonLogger.js +5 -3
- package/dist/logger/logFmtLogger.d.ts +2 -2
- package/dist/logger/logFmtLogger.d.ts.map +1 -1
- package/dist/logger/logFmtLogger.js +3 -3
- package/dist/logger/shared.d.ts +3 -3
- package/dist/logger/shared.d.ts.map +1 -1
- package/dist/logger/shared.js +4 -4
- package/dist/logger.d.ts +1 -1
- package/dist/logger.d.ts.map +1 -1
- package/dist/memQueue.d.ts +15 -0
- package/dist/memQueue.d.ts.map +1 -0
- package/dist/memQueue.js +21 -0
- package/dist/middlewares.d.ts +10 -0
- package/dist/middlewares.d.ts.map +1 -0
- package/dist/{api/middlewares.js → middlewares.js} +1 -1
- package/dist/mongo-client.d.ts +11 -0
- package/dist/mongo-client.d.ts.map +1 -0
- package/dist/mongo-client.js +15 -0
- package/dist/otel.d.ts +75 -0
- package/dist/otel.d.ts.map +1 -0
- package/dist/otel.js +65 -0
- package/dist/rateLimit.d.ts +12 -4
- package/dist/rateLimit.d.ts.map +1 -1
- package/dist/rateLimit.js +7 -12
- package/dist/redis-client.d.ts +42 -0
- package/dist/redis-client.d.ts.map +1 -0
- package/dist/redis-client.js +98 -0
- package/dist/reportError.d.ts +4 -0
- package/dist/reportError.d.ts.map +1 -0
- package/dist/reportError.js +28 -0
- package/dist/routing/middleware/RouterMiddleware.d.ts +16 -0
- package/dist/routing/middleware/RouterMiddleware.d.ts.map +1 -0
- package/dist/{api/routing → routing}/middleware/RouterMiddleware.js +1 -1
- package/dist/routing/middleware/middleware.d.ts +48 -0
- package/dist/routing/middleware/middleware.d.ts.map +1 -0
- package/dist/routing/middleware/middleware.js +128 -0
- package/dist/routing/middleware.d.ts +3 -0
- package/dist/routing/middleware.d.ts.map +1 -0
- package/dist/{api/routing → routing}/middleware.js +1 -2
- package/dist/routing/schema/jwt.d.ts +4 -0
- package/dist/routing/schema/jwt.d.ts.map +1 -0
- package/dist/routing/schema/jwt.js +13 -0
- package/dist/routing/tsort.d.ts +8 -0
- package/dist/routing/tsort.d.ts.map +1 -0
- package/dist/routing/tsort.js +51 -0
- package/dist/routing/utils.d.ts +19 -0
- package/dist/routing/utils.d.ts.map +1 -0
- package/dist/routing/utils.js +45 -0
- package/dist/routing.d.ts +184 -0
- package/dist/routing.d.ts.map +1 -0
- package/dist/routing.js +236 -0
- package/dist/setupRequest.d.ts +19 -0
- package/dist/setupRequest.d.ts.map +1 -0
- package/dist/setupRequest.js +70 -0
- package/dist/test.d.ts +3 -3
- package/dist/test.d.ts.map +1 -1
- package/dist/test.js +2 -2
- package/dist/util.d.ts +3 -0
- package/dist/util.d.ts.map +1 -0
- package/dist/util.js +14 -0
- package/dist/vitest.d.ts +1 -1
- package/examples/query.ts +47 -39
- package/package.json +123 -234
- package/src/CUPS.ts +52 -13
- package/src/{api/ContextProvider.ts → ContextProvider.ts} +19 -16
- package/src/Emailer/Sendgrid.ts +82 -59
- package/src/Emailer/fake.ts +3 -3
- package/src/MainFiberSet.ts +12 -10
- package/src/QueueMaker/SQLQueue.ts +153 -156
- package/src/QueueMaker/errors.ts +3 -1
- package/src/QueueMaker/memQueue.ts +113 -107
- package/src/QueueMaker/sbqueue.ts +78 -90
- package/src/RequestFiberSet.ts +13 -8
- package/src/{adapters/SQL → SQL}/Model.ts +42 -41
- package/src/ServiceBus.ts +219 -0
- package/src/Store/Cosmos/query.ts +216 -52
- package/src/Store/Cosmos.ts +494 -353
- package/src/Store/Disk.ts +108 -68
- package/src/Store/Memory.ts +367 -93
- package/src/Store/SQL/Pg.ts +364 -0
- package/src/Store/SQL/query.ts +603 -0
- package/src/Store/SQL.ts +736 -0
- package/src/Store/codeFilter.ts +8 -5
- package/src/Store/index.ts +21 -6
- package/src/Store/utils.ts +26 -24
- package/src/arbs.ts +5 -3
- package/src/{adapters/cosmos-client.ts → cosmos-client.ts} +5 -3
- package/src/errorReporter.ts +66 -76
- package/src/fileUtil.ts +1 -1
- package/src/index.ts +2 -1
- package/src/internal/RequestContextMiddleware.ts +60 -0
- package/src/internal/auth.ts +272 -0
- package/src/{api/internal → internal}/events.ts +22 -13
- package/src/{api/layerUtils.ts → layerUtils.ts} +14 -10
- package/src/logger/jsonLogger.ts +4 -2
- package/src/logger/logFmtLogger.ts +2 -2
- package/src/logger/shared.ts +4 -3
- package/src/{adapters/memQueue.ts → memQueue.ts} +5 -4
- package/src/{adapters/mongo-client.ts → mongo-client.ts} +4 -2
- package/src/otel.ts +152 -0
- package/src/rateLimit.ts +34 -23
- package/src/{adapters/redis-client.ts → redis-client.ts} +7 -3
- package/src/{api/reportError.ts → reportError.ts} +3 -2
- package/src/{api/routing → routing}/middleware/RouterMiddleware.ts +5 -4
- package/src/{api/routing → routing}/middleware/middleware.ts +62 -17
- package/src/routing/middleware.ts +4 -0
- package/src/{api/routing → routing}/schema/jwt.ts +2 -1
- package/src/{api/routing → routing}/utils.ts +2 -1
- package/src/routing.ts +768 -0
- package/src/setupRequest.ts +135 -0
- package/src/test.ts +2 -2
- package/test/auth.test.ts +101 -0
- package/test/contextProvider.test.ts +15 -12
- package/test/controller.test.ts +28 -32
- package/test/cosmos-query.test.ts +159 -0
- package/test/dist/auth.test.d.ts.map +1 -0
- package/test/dist/contextProvider.test.d.ts.map +1 -1
- package/test/dist/controller.test.d.ts.map +1 -1
- package/test/dist/cosmos-query.test.d.ts.map +1 -0
- package/test/dist/date-query.test.d.ts.map +1 -0
- package/test/dist/fixtures.d.ts +30 -12
- package/test/dist/fixtures.d.ts.map +1 -1
- package/test/dist/fixtures.js +17 -10
- package/test/dist/query.test.d.ts.map +1 -1
- package/test/dist/rawQuery.test.d.ts.map +1 -1
- package/test/dist/repository-ext.test.d.ts.map +1 -0
- package/test/dist/requires.test.d.ts.map +1 -1
- package/test/dist/router-generator.test.d.ts.map +1 -0
- package/test/dist/routing-interruptibility.test.d.ts.map +1 -0
- package/test/dist/rpc-context-map-streaming.test.d.ts.map +1 -0
- package/test/dist/rpc-e2e-invalidation.test.d.ts.map +1 -0
- package/test/dist/rpc-multi-middleware.test.d.ts.map +1 -1
- package/test/dist/rpc-stream-fullstack.test.d.ts.map +1 -0
- package/test/dist/sql-store.test.d.ts.map +1 -0
- package/test/fixtures.ts +16 -9
- package/test/layerUtils.test.ts +2 -2
- package/test/query.test.ts +903 -40
- package/test/rawQuery.test.ts +340 -22
- package/test/repository-ext.test.ts +62 -0
- package/test/requires.test.ts +10 -5
- package/test/router-generator.test.ts +187 -0
- package/test/routing-interruptibility.test.ts +66 -0
- package/test/rpc-context-map-streaming.test.ts +262 -0
- package/test/rpc-e2e-invalidation.test.ts +256 -0
- package/test/rpc-multi-middleware.test.ts +85 -10
- package/test/rpc-stream-fullstack.test.ts +304 -0
- package/test/sql-store.test.ts +1711 -0
- package/test/validateSample.test.ts +19 -14
- package/tsconfig.examples.json +1 -1
- package/tsconfig.json +2 -1
- package/tsconfig.json.bak +2 -2
- package/tsconfig.src.json +35 -35
- package/tsconfig.test.json +2 -2
- package/dist/Emailer/service.d.ts +0 -55
- package/dist/Emailer/service.d.ts.map +0 -1
- package/dist/Emailer/service.js +0 -6
- package/dist/Emailer.d.ts +0 -2
- package/dist/Emailer.d.ts.map +0 -1
- package/dist/Emailer.js +0 -2
- package/dist/Model/Repository/ext.d.ts +0 -41
- package/dist/Model/Repository/ext.d.ts.map +0 -1
- package/dist/Model/Repository/ext.js +0 -65
- package/dist/Model/Repository/internal/internal.d.ts +0 -59
- package/dist/Model/Repository/internal/internal.d.ts.map +0 -1
- package/dist/Model/Repository/internal/internal.js +0 -316
- package/dist/Model/Repository/legacy.d.ts +0 -19
- package/dist/Model/Repository/legacy.d.ts.map +0 -1
- package/dist/Model/Repository/legacy.js +0 -2
- package/dist/Model/Repository/makeRepo.d.ts +0 -49
- package/dist/Model/Repository/makeRepo.d.ts.map +0 -1
- package/dist/Model/Repository/makeRepo.js +0 -24
- package/dist/Model/Repository/service.d.ts +0 -89
- package/dist/Model/Repository/service.d.ts.map +0 -1
- package/dist/Model/Repository/service.js +0 -2
- package/dist/Model/Repository/validation.d.ts +0 -42
- package/dist/Model/Repository/validation.d.ts.map +0 -1
- package/dist/Model/Repository/validation.js +0 -32
- package/dist/Model/Repository.d.ts +0 -6
- package/dist/Model/Repository.d.ts.map +0 -1
- package/dist/Model/Repository.js +0 -6
- package/dist/Model/dsl.d.ts +0 -32
- package/dist/Model/dsl.d.ts.map +0 -1
- package/dist/Model/dsl.js +0 -44
- package/dist/Model/filter/filterApi.d.ts +0 -30
- package/dist/Model/filter/filterApi.d.ts.map +0 -1
- package/dist/Model/filter/filterApi.js +0 -2
- package/dist/Model/filter/types/errors.d.ts +0 -29
- package/dist/Model/filter/types/errors.d.ts.map +0 -1
- package/dist/Model/filter/types/errors.js +0 -2
- package/dist/Model/filter/types/fields.d.ts +0 -15
- package/dist/Model/filter/types/fields.d.ts.map +0 -1
- package/dist/Model/filter/types/fields.js +0 -2
- package/dist/Model/filter/types/path/common.d.ts +0 -316
- package/dist/Model/filter/types/path/common.d.ts.map +0 -1
- package/dist/Model/filter/types/path/common.js +0 -2
- package/dist/Model/filter/types/path/eager.d.ts +0 -95
- package/dist/Model/filter/types/path/eager.d.ts.map +0 -1
- package/dist/Model/filter/types/path/eager.js +0 -31
- package/dist/Model/filter/types/path/index.d.ts +0 -4
- package/dist/Model/filter/types/path/index.d.ts.map +0 -1
- package/dist/Model/filter/types/path/index.js +0 -3
- package/dist/Model/filter/types/utils.d.ts +0 -79
- package/dist/Model/filter/types/utils.d.ts.map +0 -1
- package/dist/Model/filter/types/utils.js +0 -2
- package/dist/Model/filter/types/validator.d.ts +0 -30
- package/dist/Model/filter/types/validator.d.ts.map +0 -1
- package/dist/Model/filter/types/validator.js +0 -2
- package/dist/Model/filter/types.d.ts +0 -5
- package/dist/Model/filter/types.d.ts.map +0 -1
- package/dist/Model/filter/types.js +0 -7
- package/dist/Model/query/dsl.d.ts +0 -248
- package/dist/Model/query/dsl.d.ts.map +0 -1
- package/dist/Model/query/dsl.js +0 -104
- package/dist/Model/query/new-kid-interpreter.d.ts +0 -28
- package/dist/Model/query/new-kid-interpreter.d.ts.map +0 -1
- package/dist/Model/query/new-kid-interpreter.js +0 -165
- package/dist/Model/query.d.ts +0 -15
- package/dist/Model/query.d.ts.map +0 -1
- package/dist/Model/query.js +0 -3
- package/dist/Model.d.ts +0 -4
- package/dist/Model.d.ts.map +0 -1
- package/dist/Model.js +0 -4
- package/dist/Operations.d.ts +0 -55
- package/dist/Operations.d.ts.map +0 -1
- package/dist/Operations.js +0 -102
- package/dist/OperationsRepo.d.ts +0 -41
- package/dist/OperationsRepo.d.ts.map +0 -1
- package/dist/OperationsRepo.js +0 -14
- package/dist/QueueMaker/service.d.ts +0 -11
- package/dist/QueueMaker/service.d.ts.map +0 -1
- package/dist/QueueMaker/service.js +0 -4
- package/dist/RequestContext.d.ts +0 -63
- package/dist/RequestContext.d.ts.map +0 -1
- package/dist/RequestContext.js +0 -49
- package/dist/Store/ContextMapContainer.d.ts +0 -14
- package/dist/Store/ContextMapContainer.d.ts.map +0 -1
- package/dist/Store/ContextMapContainer.js +0 -16
- package/dist/Store/service.d.ts +0 -108
- package/dist/Store/service.d.ts.map +0 -1
- package/dist/Store/service.js +0 -71
- package/dist/Store.d.ts +0 -2
- package/dist/Store.d.ts.map +0 -1
- package/dist/Store.js +0 -2
- package/dist/adapters/SQL/Model.d.ts +0 -479
- package/dist/adapters/SQL/Model.d.ts.map +0 -1
- package/dist/adapters/SQL/Model.js +0 -478
- package/dist/adapters/SQL.d.ts +0 -2
- package/dist/adapters/SQL.d.ts.map +0 -1
- package/dist/adapters/ServiceBus.d.ts +0 -58
- package/dist/adapters/ServiceBus.d.ts.map +0 -1
- package/dist/adapters/ServiceBus.js +0 -99
- package/dist/adapters/cosmos-client.d.ts +0 -14
- package/dist/adapters/cosmos-client.d.ts.map +0 -1
- package/dist/adapters/cosmos-client.js +0 -9
- package/dist/adapters/index.d.ts +0 -2
- package/dist/adapters/index.d.ts.map +0 -1
- package/dist/adapters/index.js +0 -2
- package/dist/adapters/logger.d.ts +0 -9
- package/dist/adapters/logger.d.ts.map +0 -1
- package/dist/adapters/logger.js +0 -3
- package/dist/adapters/memQueue.d.ts +0 -13
- package/dist/adapters/memQueue.d.ts.map +0 -1
- package/dist/adapters/memQueue.js +0 -20
- package/dist/adapters/mongo-client.d.ts +0 -10
- package/dist/adapters/mongo-client.d.ts.map +0 -1
- package/dist/adapters/mongo-client.js +0 -13
- package/dist/adapters/redis-client.d.ts +0 -39
- package/dist/adapters/redis-client.d.ts.map +0 -1
- package/dist/adapters/redis-client.js +0 -94
- package/dist/api/ContextProvider.d.ts +0 -31
- package/dist/api/ContextProvider.d.ts.map +0 -1
- package/dist/api/ContextProvider.js +0 -38
- package/dist/api/codec.d.ts +0 -5
- package/dist/api/codec.d.ts.map +0 -1
- package/dist/api/codec.js +0 -5
- package/dist/api/internal/RequestContextMiddleware.d.ts +0 -5
- package/dist/api/internal/RequestContextMiddleware.d.ts.map +0 -1
- package/dist/api/internal/RequestContextMiddleware.js +0 -35
- package/dist/api/internal/auth.d.ts +0 -15
- package/dist/api/internal/auth.d.ts.map +0 -1
- package/dist/api/internal/auth.js +0 -47
- package/dist/api/internal/events.d.ts +0 -9
- package/dist/api/internal/events.d.ts.map +0 -1
- package/dist/api/internal/events.js +0 -42
- package/dist/api/internal/health.d.ts +0 -3
- package/dist/api/internal/health.d.ts.map +0 -1
- package/dist/api/internal/health.js +0 -5
- package/dist/api/layerUtils.d.ts +0 -24
- package/dist/api/layerUtils.d.ts.map +0 -1
- package/dist/api/layerUtils.js +0 -16
- package/dist/api/middlewares.d.ts +0 -10
- package/dist/api/middlewares.d.ts.map +0 -1
- package/dist/api/reportError.d.ts +0 -4
- package/dist/api/reportError.d.ts.map +0 -1
- package/dist/api/reportError.js +0 -27
- package/dist/api/routing/middleware/RouterMiddleware.d.ts +0 -15
- package/dist/api/routing/middleware/RouterMiddleware.d.ts.map +0 -1
- package/dist/api/routing/middleware/middleware.d.ts +0 -9
- package/dist/api/routing/middleware/middleware.d.ts.map +0 -1
- package/dist/api/routing/middleware/middleware.js +0 -92
- package/dist/api/routing/middleware.d.ts +0 -4
- package/dist/api/routing/middleware.d.ts.map +0 -1
- package/dist/api/routing/schema/jwt.d.ts +0 -4
- package/dist/api/routing/schema/jwt.d.ts.map +0 -1
- package/dist/api/routing/schema/jwt.js +0 -12
- package/dist/api/routing/tsort.d.ts +0 -8
- package/dist/api/routing/tsort.d.ts.map +0 -1
- package/dist/api/routing/tsort.js +0 -51
- package/dist/api/routing/utils.d.ts +0 -19
- package/dist/api/routing/utils.d.ts.map +0 -1
- package/dist/api/routing/utils.js +0 -44
- package/dist/api/routing.d.ts +0 -138
- package/dist/api/routing.d.ts.map +0 -1
- package/dist/api/routing.js +0 -166
- package/dist/api/setupRequest.d.ts +0 -12
- package/dist/api/setupRequest.d.ts.map +0 -1
- package/dist/api/setupRequest.js +0 -44
- package/dist/api/util.d.ts +0 -3
- package/dist/api/util.d.ts.map +0 -1
- package/dist/api/util.js +0 -14
- package/eslint.config.mjs +0 -24
- package/src/Emailer/service.ts +0 -52
- package/src/Emailer.ts +0 -1
- package/src/Model/Repository/ext.ts +0 -283
- package/src/Model/Repository/internal/internal.ts +0 -577
- package/src/Model/Repository/legacy.ts +0 -27
- package/src/Model/Repository/makeRepo.ts +0 -139
- package/src/Model/Repository/service.ts +0 -627
- package/src/Model/Repository/validation.ts +0 -31
- package/src/Model/Repository.ts +0 -5
- package/src/Model/dsl.ts +0 -128
- package/src/Model/filter/filterApi.ts +0 -60
- package/src/Model/filter/types/errors.ts +0 -47
- package/src/Model/filter/types/fields.ts +0 -50
- package/src/Model/filter/types/path/common.ts +0 -404
- package/src/Model/filter/types/path/eager.ts +0 -298
- package/src/Model/filter/types/path/index.ts +0 -4
- package/src/Model/filter/types/utils.ts +0 -128
- package/src/Model/filter/types/validator.ts +0 -46
- package/src/Model/filter/types.ts +0 -6
- package/src/Model/query/dsl.ts +0 -2110
- package/src/Model/query/new-kid-interpreter.ts +0 -210
- package/src/Model/query.ts +0 -13
- package/src/Model.ts +0 -3
- package/src/Operations.ts +0 -235
- package/src/OperationsRepo.ts +0 -16
- package/src/QueueMaker/service.ts +0 -17
- package/src/RequestContext.ts +0 -63
- package/src/Store/ContextMapContainer.ts +0 -20
- package/src/Store/service.ts +0 -184
- package/src/Store.ts +0 -1
- package/src/adapters/ServiceBus.ts +0 -209
- package/src/adapters/index.ts +0 -0
- package/src/adapters/logger.ts +0 -3
- package/src/api/internal/RequestContextMiddleware.ts +0 -42
- package/src/api/internal/auth.ts +0 -68
- package/src/api/routing/middleware.ts +0 -6
- package/src/api/routing.ts +0 -598
- package/src/api/setupRequest.ts +0 -84
- /package/src/{adapters/SQL.ts → SQL.ts} +0 -0
- /package/src/{api/codec.ts → codec.ts} +0 -0
- /package/src/{api/internal → internal}/health.ts +0 -0
- /package/src/{api/middlewares.ts → middlewares.ts} +0 -0
- /package/src/{api/routing → routing}/tsort.ts +0 -0
- /package/src/{api/util.ts → util.ts} +0 -0
|
@@ -0,0 +1,233 @@
|
|
|
1
|
+
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
2
|
+
import { toNonEmptyArray } from "effect-app/Array";
|
|
3
|
+
import * as Effect from "effect-app/Effect";
|
|
4
|
+
import * as Option from "effect-app/Option";
|
|
5
|
+
import { StoreMaker } from "effect-app/Store";
|
|
6
|
+
import * as Struct from "effect/Struct";
|
|
7
|
+
import { SqlClient } from "effect/unstable/sql";
|
|
8
|
+
import { OptimisticConcurrencyException } from "../../errors.js";
|
|
9
|
+
import { InfraLogger } from "../../logger.js";
|
|
10
|
+
import { annotateDb } from "../../otel.js";
|
|
11
|
+
import { storeId } from "../Memory.js";
|
|
12
|
+
import { makeETag } from "../utils.js";
|
|
13
|
+
import { buildWhereSQLQuery, logQuery, pgDialect } from "./query.js";
|
|
14
|
+
const parseRow = (row, idKey, defaultValues) => {
|
|
15
|
+
const data = (typeof row.data === "string" ? JSON.parse(row.data) : row.data);
|
|
16
|
+
return { ...defaultValues, ...data, [idKey]: row.id, _etag: row._etag ?? undefined };
|
|
17
|
+
};
|
|
18
|
+
const parseSelectRow = (row, idKey, defaultValues) => {
|
|
19
|
+
const result = { ...defaultValues };
|
|
20
|
+
for (const [key, value] of Object.entries(row)) {
|
|
21
|
+
if (key === "id") {
|
|
22
|
+
result[idKey] = value;
|
|
23
|
+
result["id"] = value;
|
|
24
|
+
}
|
|
25
|
+
else {
|
|
26
|
+
result[key] = value;
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
return result;
|
|
30
|
+
};
|
|
31
|
+
const makePgStore = Effect.fnUntraced(function* ({ prefix }) {
|
|
32
|
+
const sql = yield* SqlClient.SqlClient;
|
|
33
|
+
return {
|
|
34
|
+
make: Effect.fnUntraced(function* (name, idKey, seed, config) {
|
|
35
|
+
const tableName = `${prefix}${name}`;
|
|
36
|
+
const defaultValues = config?.defaultValues ?? {};
|
|
37
|
+
const resolveNamespace = !config?.allowNamespace
|
|
38
|
+
? Effect.succeed("primary")
|
|
39
|
+
: storeId.pipe(Effect.map((namespace) => {
|
|
40
|
+
if (namespace !== "primary" && !config.allowNamespace(namespace)) {
|
|
41
|
+
throw new Error(`Namespace ${namespace} not allowed!`);
|
|
42
|
+
}
|
|
43
|
+
return namespace;
|
|
44
|
+
}));
|
|
45
|
+
const ensureTable = sql
|
|
46
|
+
.unsafe(`CREATE TABLE IF NOT EXISTS "${tableName}" (id TEXT NOT NULL, _namespace TEXT NOT NULL DEFAULT 'primary', _etag TEXT, data JSONB NOT NULL, PRIMARY KEY (id, _namespace))`)
|
|
47
|
+
.pipe(Effect.andThen(sql.unsafe(`CREATE TABLE IF NOT EXISTS "_migrations" (id TEXT NOT NULL, version TEXT NOT NULL, PRIMARY KEY (id, version))`)), Effect.orDie, Effect.asVoid);
|
|
48
|
+
const toRow = (e) => {
|
|
49
|
+
const newE = makeETag(e);
|
|
50
|
+
const id = newE[idKey];
|
|
51
|
+
const { _etag, [idKey]: _id, ...rest } = newE;
|
|
52
|
+
const data = JSON.stringify(rest);
|
|
53
|
+
return { id, _etag: newE._etag, data, item: newE };
|
|
54
|
+
};
|
|
55
|
+
const exec = (query, params) => sql.unsafe(query, params).pipe(Effect.orDie);
|
|
56
|
+
const setInternal = Effect.fnUntraced(function* (e, ns) {
|
|
57
|
+
const row = toRow(e);
|
|
58
|
+
if (e._etag) {
|
|
59
|
+
yield* exec(`UPDATE "${tableName}" SET _etag = $1, data = $2 WHERE id = $3 AND _etag = $4 AND _namespace = $5`, [row._etag, row.data, row.id, e._etag, ns]);
|
|
60
|
+
const existing = yield* exec(`SELECT _etag FROM "${tableName}" WHERE id = $1 AND _namespace = $2`, [row.id, ns]);
|
|
61
|
+
const current = existing[0];
|
|
62
|
+
if (!current || current._etag !== row._etag) {
|
|
63
|
+
if (current) {
|
|
64
|
+
return yield* new OptimisticConcurrencyException({
|
|
65
|
+
type: name,
|
|
66
|
+
id: row.id,
|
|
67
|
+
current: current._etag,
|
|
68
|
+
found: e._etag,
|
|
69
|
+
code: 412
|
|
70
|
+
});
|
|
71
|
+
}
|
|
72
|
+
return yield* new OptimisticConcurrencyException({
|
|
73
|
+
type: name,
|
|
74
|
+
id: row.id,
|
|
75
|
+
current: "",
|
|
76
|
+
found: e._etag,
|
|
77
|
+
code: 404
|
|
78
|
+
});
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
else {
|
|
82
|
+
yield* exec(`INSERT INTO "${tableName}" (id, _namespace, _etag, data) VALUES ($1, $2, $3, $4)`, [row.id, ns, row._etag, row.data]);
|
|
83
|
+
}
|
|
84
|
+
return row.item;
|
|
85
|
+
});
|
|
86
|
+
const bulkSetInternal = (items, ns) => sql
|
|
87
|
+
.withTransaction(Effect.forEach(items, (e) => setInternal(e, ns)))
|
|
88
|
+
.pipe(Effect.orDie, Effect.map((_) => _));
|
|
89
|
+
const ctx = yield* Effect.context();
|
|
90
|
+
const seedCache = new Map();
|
|
91
|
+
const makeSeedEffect = Effect.fnUntraced(function* (ns) {
|
|
92
|
+
yield* ensureTable;
|
|
93
|
+
if (!seed)
|
|
94
|
+
return;
|
|
95
|
+
const existing = yield* exec(`SELECT id FROM "_migrations" WHERE id = $1 AND version = $2`, [`${tableName}::${ns}`, tableName]);
|
|
96
|
+
if (existing.length > 0)
|
|
97
|
+
return;
|
|
98
|
+
yield* InfraLogger.logInfo(`Seeding data for ${name} (namespace: ${ns})`);
|
|
99
|
+
const items = yield* seed.pipe(Effect.provide(ctx), Effect.orDie);
|
|
100
|
+
const ne = toNonEmptyArray([...items]);
|
|
101
|
+
if (Option.isSome(ne))
|
|
102
|
+
yield* bulkSetInternal(ne.value, ns);
|
|
103
|
+
yield* exec(`INSERT INTO "_migrations" (id, version) VALUES ($1, $2)`, [`${tableName}::${ns}`, tableName]);
|
|
104
|
+
});
|
|
105
|
+
const seedNamespace = (ns) => {
|
|
106
|
+
let cached = seedCache.get(ns);
|
|
107
|
+
if (!cached) {
|
|
108
|
+
cached = Effect.cached(Effect.uninterruptible(makeSeedEffect(ns))).pipe(Effect.runSync);
|
|
109
|
+
seedCache.set(ns, cached);
|
|
110
|
+
}
|
|
111
|
+
return cached;
|
|
112
|
+
};
|
|
113
|
+
const s = {
|
|
114
|
+
seedNamespace: (ns) => seedNamespace(ns),
|
|
115
|
+
all: resolveNamespace.pipe(Effect.flatMap((ns) => {
|
|
116
|
+
const sqlText = `SELECT id, _etag, data FROM "${tableName}" WHERE _namespace = $1`;
|
|
117
|
+
return exec(sqlText, [ns])
|
|
118
|
+
.pipe(Effect.map((rows) => rows.map((r) => parseRow(r, idKey, defaultValues))), annotateDb({
|
|
119
|
+
operation: "all",
|
|
120
|
+
system: "postgresql",
|
|
121
|
+
collection: tableName,
|
|
122
|
+
namespace: ns,
|
|
123
|
+
entity: name,
|
|
124
|
+
query: sqlText
|
|
125
|
+
}));
|
|
126
|
+
})),
|
|
127
|
+
find: (id) => resolveNamespace.pipe(Effect
|
|
128
|
+
.flatMap((ns) => {
|
|
129
|
+
const sqlText = `SELECT id, _etag, data FROM "${tableName}" WHERE id = $1 AND _namespace = $2`;
|
|
130
|
+
return exec(sqlText, [id, ns])
|
|
131
|
+
.pipe(Effect.map((rows) => {
|
|
132
|
+
const row = rows[0];
|
|
133
|
+
return row
|
|
134
|
+
? Option.some(parseRow(row, idKey, defaultValues))
|
|
135
|
+
: Option.none();
|
|
136
|
+
}), annotateDb({
|
|
137
|
+
operation: "find",
|
|
138
|
+
system: "postgresql",
|
|
139
|
+
collection: tableName,
|
|
140
|
+
namespace: ns,
|
|
141
|
+
entity: name,
|
|
142
|
+
query: sqlText,
|
|
143
|
+
extra: { "app.entity.id": id }
|
|
144
|
+
}));
|
|
145
|
+
})),
|
|
146
|
+
filter: (f) => {
|
|
147
|
+
const filter = f
|
|
148
|
+
.filter;
|
|
149
|
+
return resolveNamespace.pipe(Effect.flatMap((ns) => Effect
|
|
150
|
+
.sync(() => {
|
|
151
|
+
const q = buildWhereSQLQuery(pgDialect, idKey, filter ? [{ t: "where-scope", result: filter, relation: "some" }] : [], tableName, defaultValues, f.select, f.order, f.skip, f.limit);
|
|
152
|
+
const nsPlaceholder = pgDialect.placeholder(q.params.length + 1);
|
|
153
|
+
const hasWhere = q.sql.includes("WHERE");
|
|
154
|
+
const nsSql = hasWhere
|
|
155
|
+
? q.sql.replace("WHERE", `WHERE _namespace = ${nsPlaceholder} AND`)
|
|
156
|
+
: q.sql.replace(`FROM "${tableName}"`, `FROM "${tableName}" WHERE _namespace = ${nsPlaceholder}`);
|
|
157
|
+
return { sql: nsSql, params: [...q.params, ns] };
|
|
158
|
+
})
|
|
159
|
+
.pipe(Effect.tap((q) => logQuery(q)), Effect.tap((q) => Effect.annotateCurrentSpan({ "db.query.text": q.sql })), Effect.flatMap((q) => exec(q.sql, q.params).pipe(Effect.map((rows) => {
|
|
160
|
+
if (f.select) {
|
|
161
|
+
return rows.map((r) => {
|
|
162
|
+
const selected = parseSelectRow(r, idKey, {});
|
|
163
|
+
return {
|
|
164
|
+
...Struct.pick(defaultValues, f.select.filter((_) => typeof _ === "string")),
|
|
165
|
+
...selected
|
|
166
|
+
};
|
|
167
|
+
});
|
|
168
|
+
}
|
|
169
|
+
return rows.map((r) => parseRow(r, idKey, defaultValues));
|
|
170
|
+
}))), annotateDb({
|
|
171
|
+
operation: "filter",
|
|
172
|
+
system: "postgresql",
|
|
173
|
+
collection: tableName,
|
|
174
|
+
namespace: ns,
|
|
175
|
+
entity: name
|
|
176
|
+
}))));
|
|
177
|
+
},
|
|
178
|
+
set: (e) => resolveNamespace.pipe(Effect.flatMap((ns) => setInternal(e, ns).pipe(annotateDb({
|
|
179
|
+
operation: "set",
|
|
180
|
+
system: "postgresql",
|
|
181
|
+
collection: tableName,
|
|
182
|
+
namespace: ns,
|
|
183
|
+
entity: name,
|
|
184
|
+
extra: { "app.entity.id": e[idKey] }
|
|
185
|
+
})))),
|
|
186
|
+
batchSet: (items) => resolveNamespace.pipe(Effect.flatMap((ns) => bulkSetInternal(items, ns).pipe(annotateDb({
|
|
187
|
+
operation: "batchSet",
|
|
188
|
+
system: "postgresql",
|
|
189
|
+
collection: tableName,
|
|
190
|
+
namespace: ns,
|
|
191
|
+
entity: name
|
|
192
|
+
})))),
|
|
193
|
+
bulkSet: (items) => resolveNamespace.pipe(Effect.flatMap((ns) => bulkSetInternal(items, ns).pipe(annotateDb({
|
|
194
|
+
operation: "bulkSet",
|
|
195
|
+
system: "postgresql",
|
|
196
|
+
collection: tableName,
|
|
197
|
+
namespace: ns,
|
|
198
|
+
entity: name
|
|
199
|
+
})))),
|
|
200
|
+
batchRemove: (ids) => {
|
|
201
|
+
const placeholders = ids.map((_, i) => `$${i + 1}`).join(", ");
|
|
202
|
+
const nsPlaceholder = `$${ids.length + 1}`;
|
|
203
|
+
return resolveNamespace.pipe(Effect.flatMap((ns) => {
|
|
204
|
+
const sqlText = `DELETE FROM "${tableName}" WHERE id IN (${placeholders}) AND _namespace = ${nsPlaceholder}`;
|
|
205
|
+
return exec(sqlText, [...ids, ns])
|
|
206
|
+
.pipe(Effect.asVoid, annotateDb({
|
|
207
|
+
operation: "batchRemove",
|
|
208
|
+
system: "postgresql",
|
|
209
|
+
collection: tableName,
|
|
210
|
+
namespace: ns,
|
|
211
|
+
entity: name,
|
|
212
|
+
query: sqlText
|
|
213
|
+
}));
|
|
214
|
+
}));
|
|
215
|
+
},
|
|
216
|
+
queryRaw: (query) => s.all.pipe(Effect.map(query.memory), annotateDb({
|
|
217
|
+
operation: "queryRaw",
|
|
218
|
+
system: "postgresql",
|
|
219
|
+
collection: tableName,
|
|
220
|
+
entity: name
|
|
221
|
+
}))
|
|
222
|
+
};
|
|
223
|
+
// Eagerly seed primary namespace on initialization
|
|
224
|
+
yield* seedNamespace("primary");
|
|
225
|
+
return s;
|
|
226
|
+
})
|
|
227
|
+
};
|
|
228
|
+
});
|
|
229
|
+
export function PgStoreLayer(cfg) {
|
|
230
|
+
return StoreMaker
|
|
231
|
+
.toLayer(makePgStore(cfg));
|
|
232
|
+
}
|
|
233
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Pg.js","sourceRoot":"","sources":["../../../src/Store/SQL/Pg.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,49 @@
|
|
|
1
|
+
import type { NonEmptyReadonlyArray } from "effect-app/Array";
|
|
2
|
+
import * as Effect from "effect-app/Effect";
|
|
3
|
+
import type { FilterResult } from "effect-app/Model/filter/filterApi";
|
|
4
|
+
import type { AggregateIrExpression, ComputedProjectionIrExpression } from "effect-app/Model/query";
|
|
5
|
+
export interface SQLDialect {
|
|
6
|
+
readonly jsonExtract: (path: string) => string;
|
|
7
|
+
readonly jsonExtractJson: (path: string) => string;
|
|
8
|
+
readonly placeholder: (index: number) => string;
|
|
9
|
+
readonly jsonArrayContains: (arrPath: string, valPlaceholder: string) => string;
|
|
10
|
+
readonly jsonArrayNotContains: (arrPath: string, valPlaceholder: string) => string;
|
|
11
|
+
readonly jsonArrayContainsAny: (arrPath: string, valPlaceholders: readonly string[]) => string;
|
|
12
|
+
readonly jsonArrayNotContainsAny: (arrPath: string, valPlaceholders: readonly string[]) => string;
|
|
13
|
+
readonly jsonArrayContainsAll: (arrPath: string, valPlaceholders: readonly string[]) => string;
|
|
14
|
+
readonly jsonArrayNotContainsAll: (arrPath: string, valPlaceholders: readonly string[]) => string;
|
|
15
|
+
readonly caseInsensitiveLike: (expr: string, valPlaceholder: string) => string;
|
|
16
|
+
readonly caseInsensitiveNotLike: (expr: string, valPlaceholder: string) => string;
|
|
17
|
+
readonly jsonColumnType: "JSON" | "JSONB";
|
|
18
|
+
readonly arrayLength: (path: string) => string;
|
|
19
|
+
readonly jsonEachFrom: (arrPath: string, alias: string) => string;
|
|
20
|
+
readonly jsonExtractElement: (alias: string, subPath: string) => string;
|
|
21
|
+
readonly serializeJsonValue: (v: unknown) => unknown;
|
|
22
|
+
readonly serializeScalar: (v: unknown) => unknown;
|
|
23
|
+
}
|
|
24
|
+
export declare const sqliteDialect: SQLDialect;
|
|
25
|
+
export declare const pgDialect: SQLDialect;
|
|
26
|
+
export declare function logQuery(q: {
|
|
27
|
+
sql: string;
|
|
28
|
+
params: unknown[];
|
|
29
|
+
}): Effect.Effect<void, never, never>;
|
|
30
|
+
export declare function buildWhereSQLQuery(dialect: SQLDialect, idKey: PropertyKey, filter: readonly FilterResult[], tableName: string, defaultValues: Record<string, unknown>, select?: NonEmptyReadonlyArray<string | {
|
|
31
|
+
key: string;
|
|
32
|
+
subKeys: readonly string[];
|
|
33
|
+
} | {
|
|
34
|
+
key: string;
|
|
35
|
+
computed: ComputedProjectionIrExpression;
|
|
36
|
+
} | {
|
|
37
|
+
key: string;
|
|
38
|
+
path: string;
|
|
39
|
+
} | {
|
|
40
|
+
key: string;
|
|
41
|
+
aggregate: AggregateIrExpression;
|
|
42
|
+
}>, order?: NonEmptyReadonlyArray<{
|
|
43
|
+
key: string;
|
|
44
|
+
direction: "ASC" | "DESC";
|
|
45
|
+
}>, skip?: number, limit?: number, namespace?: string): {
|
|
46
|
+
sql: string;
|
|
47
|
+
params: unknown[];
|
|
48
|
+
};
|
|
49
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicXVlcnkuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9TdG9yZS9TUUwvcXVlcnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxLQUFLLEVBQUUscUJBQXFCLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQTtBQUM3RCxPQUFPLEtBQUssTUFBTSxNQUFNLG1CQUFtQixDQUFBO0FBQzNDLE9BQU8sS0FBSyxFQUFXLFlBQVksRUFBRSxNQUFNLG1DQUFtQyxDQUFBO0FBQzlFLE9BQU8sS0FBSyxFQUFFLHFCQUFxQixFQUFFLDhCQUE4QixFQUFzQyxNQUFNLHdCQUF3QixDQUFBO0FBS3ZJLE1BQU0sV0FBVyxVQUFVO0lBQ3pCLFFBQVEsQ0FBQyxXQUFXLEVBQUUsQ0FBQyxJQUFJLEVBQUUsTUFBTSxLQUFLLE1BQU0sQ0FBQTtJQUM5QyxRQUFRLENBQUMsZUFBZSxFQUFFLENBQUMsSUFBSSxFQUFFLE1BQU0sS0FBSyxNQUFNLENBQUE7SUFDbEQsUUFBUSxDQUFDLFdBQVcsRUFBRSxDQUFDLEtBQUssRUFBRSxNQUFNLEtBQUssTUFBTSxDQUFBO0lBQy9DLFFBQVEsQ0FBQyxpQkFBaUIsRUFBRSxDQUFDLE9BQU8sRUFBRSxNQUFNLEVBQUUsY0FBYyxFQUFFLE1BQU0sS0FBSyxNQUFNLENBQUE7SUFDL0UsUUFBUSxDQUFDLG9CQUFvQixFQUFFLENBQUMsT0FBTyxFQUFFLE1BQU0sRUFBRSxjQUFjLEVBQUUsTUFBTSxLQUFLLE1BQU0sQ0FBQTtJQUNsRixRQUFRLENBQUMsb0JBQW9CLEVBQUUsQ0FBQyxPQUFPLEVBQUUsTUFBTSxFQUFFLGVBQWUsRUFBRSxTQUFTLE1BQU0sRUFBRSxLQUFLLE1BQU0sQ0FBQTtJQUM5RixRQUFRLENBQUMsdUJBQXVCLEVBQUUsQ0FBQyxPQUFPLEVBQUUsTUFBTSxFQUFFLGVBQWUsRUFBRSxTQUFTLE1BQU0sRUFBRSxLQUFLLE1BQU0sQ0FBQTtJQUNqRyxRQUFRLENBQUMsb0JBQW9CLEVBQUUs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
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../../../src/Store/SQL/query.ts"],"names":[],"mappings":"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"}
|