@effect-app/infra 0.198.2 → 0.199.2
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 +32 -0
- package/_cjs/RequestContext.cjs +14 -9
- package/_cjs/RequestContext.cjs.map +1 -1
- package/_cjs/_ext/Array.cjs +3 -7
- package/_cjs/_ext/Array.cjs.map +1 -1
- package/_cjs/api/reportError.cjs +3 -6
- package/_cjs/api/reportError.cjs.map +1 -1
- package/_cjs/api/routing/base.cjs +27 -61
- package/_cjs/api/routing/base.cjs.map +1 -1
- package/_cjs/api/routing/defaultErrorHandler.cjs +14 -21
- package/_cjs/api/routing/defaultErrorHandler.cjs.map +1 -1
- package/_cjs/api/routing/makeRequestHandler.cjs +44 -51
- package/_cjs/api/routing/makeRequestHandler.cjs.map +1 -1
- package/_cjs/api/routing/match.cjs +6 -13
- package/_cjs/api/routing/match.cjs.map +1 -1
- package/_cjs/api/{express → routing}/schema/jwt.cjs +3 -4
- package/_cjs/api/routing/schema/jwt.cjs.map +1 -0
- package/_cjs/api/routing/schema/routing.cjs +136 -0
- package/_cjs/api/routing/schema/routing.cjs.map +1 -0
- package/_cjs/api/setupRequest.cjs +16 -22
- package/_cjs/api/setupRequest.cjs.map +1 -1
- package/_cjs/errorReporter.cjs +16 -17
- package/_cjs/errorReporter.cjs.map +1 -1
- package/_cjs/errors.cjs +2 -4
- package/_cjs/errors.cjs.map +1 -1
- package/_cjs/filter/types/path/index.cjs +0 -2
- package/_cjs/filter/types/path/index.cjs.map +1 -1
- package/_cjs/filter.cjs +35 -0
- package/_cjs/filter.cjs.map +1 -1
- package/_cjs/logger/jsonLogger.cjs +9 -15
- package/_cjs/logger/jsonLogger.cjs.map +1 -1
- package/_cjs/logger/logFmtLogger.cjs +7 -11
- package/_cjs/logger/logFmtLogger.cjs.map +1 -1
- package/_cjs/logger/shared.cjs +6 -8
- package/_cjs/logger/shared.cjs.map +1 -1
- package/_cjs/rateLimit.cjs +9 -12
- package/_cjs/rateLimit.cjs.map +1 -1
- package/_cjs/services/Emailer/Sendgrid.cjs +9 -16
- package/_cjs/services/Emailer/Sendgrid.cjs.map +1 -1
- package/_cjs/services/Emailer/fake.cjs +5 -8
- package/_cjs/services/Emailer/fake.cjs.map +1 -1
- package/_cjs/services/Emailer/service.cjs +2 -4
- package/_cjs/services/Emailer/service.cjs.map +1 -1
- package/_cjs/services/Operations/live.cjs +29 -42
- package/_cjs/services/Operations/live.cjs.map +1 -1
- package/_cjs/services/Operations/service.cjs +15 -15
- package/_cjs/services/Operations/service.cjs.map +1 -1
- package/_cjs/services/QueueMaker/errors.cjs +8 -12
- package/_cjs/services/QueueMaker/errors.cjs.map +1 -1
- package/_cjs/services/QueueMaker/memQueue.cjs +27 -33
- package/_cjs/services/QueueMaker/memQueue.cjs.map +1 -1
- package/_cjs/services/QueueMaker/sbqueue.cjs +31 -40
- package/_cjs/services/QueueMaker/sbqueue.cjs.map +1 -1
- package/_cjs/services/QueueMaker/service.cjs +7 -9
- package/_cjs/services/QueueMaker/service.cjs.map +1 -1
- package/_cjs/services/Repository/dsl.cjs +11 -14
- package/_cjs/services/Repository/dsl.cjs.map +1 -1
- package/_cjs/services/Repository/ext.cjs +62 -71
- package/_cjs/services/Repository/ext.cjs.map +1 -1
- package/_cjs/services/RepositoryBase.cjs +212 -197
- package/_cjs/services/RepositoryBase.cjs.map +1 -1
- package/_cjs/services/RequestContextContainer.cjs +17 -23
- package/_cjs/services/RequestContextContainer.cjs.map +1 -1
- package/_cjs/services/Store/ContextMapContainer.cjs +10 -16
- package/_cjs/services/Store/ContextMapContainer.cjs.map +1 -1
- package/_cjs/services/Store/Cosmos/query.cjs +5 -9
- package/_cjs/services/Store/Cosmos/query.cjs.map +1 -1
- package/_cjs/services/Store/Cosmos.cjs +58 -68
- package/_cjs/services/Store/Cosmos.cjs.map +1 -1
- package/_cjs/services/Store/Disk.cjs +34 -36
- package/_cjs/services/Store/Disk.cjs.map +1 -1
- package/_cjs/services/Store/Memory.cjs +55 -65
- package/_cjs/services/Store/Memory.cjs.map +1 -1
- package/_cjs/services/Store/codeFilter.cjs +2 -4
- package/_cjs/services/Store/codeFilter.cjs.map +1 -1
- package/_cjs/services/Store/codeFilter.test.cjs +13 -12
- package/_cjs/services/Store/codeFilter.test.cjs.map +1 -1
- package/_cjs/services/Store/filterApi/query.cjs +2 -4
- package/_cjs/services/Store/filterApi/query.cjs.map +1 -1
- package/_cjs/services/Store/index.cjs +6 -9
- package/_cjs/services/Store/index.cjs.map +1 -1
- package/_cjs/services/Store/service.cjs +5 -7
- package/_cjs/services/Store/service.cjs.map +1 -1
- package/_cjs/services/Store/utils.cjs +16 -20
- package/_cjs/services/Store/utils.cjs.map +1 -1
- package/_cjs/services/query.cjs +4 -1
- package/_cjs/services/query.cjs.map +1 -1
- package/_cjs/test.arbs.cjs +3 -4
- package/_cjs/test.arbs.cjs.map +1 -1
- package/dist/RequestContext.d.ts +20 -20
- package/dist/RequestContext.d.ts.map +1 -1
- package/dist/RequestContext.js +15 -8
- package/dist/_ext/Array.d.ts +2 -3
- package/dist/_ext/Array.d.ts.map +1 -1
- package/dist/_ext/Array.js +5 -5
- package/dist/api/reportError.d.ts +5 -5
- package/dist/api/reportError.d.ts.map +1 -1
- package/dist/api/reportError.js +6 -6
- package/dist/api/routing/base.d.ts +11 -15
- package/dist/api/routing/base.d.ts.map +1 -1
- package/dist/api/routing/base.js +48 -67
- package/dist/api/routing/defaultErrorHandler.d.ts +4 -6
- package/dist/api/routing/defaultErrorHandler.d.ts.map +1 -1
- package/dist/api/routing/defaultErrorHandler.js +26 -28
- package/dist/api/routing/makeRequestHandler.d.ts +6 -7
- package/dist/api/routing/makeRequestHandler.d.ts.map +1 -1
- package/dist/api/routing/makeRequestHandler.js +69 -59
- package/dist/api/routing/match.d.ts +7 -8
- package/dist/api/routing/match.d.ts.map +1 -1
- package/dist/api/routing/match.js +7 -11
- package/dist/api/routing/schema/jwt.d.ts +4 -0
- package/dist/api/routing/schema/jwt.d.ts.map +1 -0
- package/dist/api/routing/schema/jwt.js +11 -0
- package/dist/api/{express → routing}/schema/routing.d.ts +2 -2
- package/dist/api/routing/schema/routing.d.ts.map +1 -0
- package/dist/api/routing/schema/routing.js +123 -0
- package/dist/api/routing.js +3 -1
- package/dist/api/setupRequest.d.ts +3 -5
- package/dist/api/setupRequest.d.ts.map +1 -1
- package/dist/api/setupRequest.js +20 -24
- package/dist/errorReporter.d.ts +4 -4
- package/dist/errorReporter.d.ts.map +1 -1
- package/dist/errorReporter.js +20 -17
- package/dist/errors.d.ts +1 -1
- package/dist/errors.d.ts.map +1 -1
- package/dist/errors.js +3 -3
- package/dist/filter/types/path/index.d.ts +2 -2
- package/dist/filter/types/path/index.d.ts.map +1 -1
- package/dist/filter/types/path/index.js +2 -3
- package/dist/filter/types.js +2 -1
- package/dist/filter.d.ts.map +1 -1
- package/dist/filter.js +36 -1
- package/dist/logger/jsonLogger.d.ts +2 -1
- package/dist/logger/jsonLogger.d.ts.map +1 -1
- package/dist/logger/jsonLogger.js +9 -13
- package/dist/logger/logFmtLogger.d.ts +2 -1
- package/dist/logger/logFmtLogger.d.ts.map +1 -1
- package/dist/logger/logFmtLogger.js +9 -11
- package/dist/logger/shared.d.ts +2 -1
- package/dist/logger/shared.d.ts.map +1 -1
- package/dist/logger/shared.js +7 -9
- package/dist/rateLimit.d.ts +7 -10
- package/dist/rateLimit.d.ts.map +1 -1
- package/dist/rateLimit.js +17 -16
- package/dist/services/Emailer/Sendgrid.d.ts +1 -2
- package/dist/services/Emailer/Sendgrid.d.ts.map +1 -1
- package/dist/services/Emailer/Sendgrid.js +16 -20
- package/dist/services/Emailer/fake.d.ts +2 -2
- package/dist/services/Emailer/fake.d.ts.map +1 -1
- package/dist/services/Emailer/fake.js +10 -8
- package/dist/services/Emailer/service.d.ts +7 -10
- package/dist/services/Emailer/service.d.ts.map +1 -1
- package/dist/services/Emailer/service.js +3 -3
- package/dist/services/Operations/live.d.ts +2 -3
- package/dist/services/Operations/live.d.ts.map +1 -1
- package/dist/services/Operations/live.js +44 -51
- package/dist/services/Operations/service.d.ts +14 -19
- package/dist/services/Operations/service.d.ts.map +1 -1
- package/dist/services/Operations/service.js +23 -28
- package/dist/services/QueueMaker/errors.d.ts +5 -7
- package/dist/services/QueueMaker/errors.d.ts.map +1 -1
- package/dist/services/QueueMaker/errors.js +11 -11
- package/dist/services/QueueMaker/memQueue.d.ts +6 -9
- package/dist/services/QueueMaker/memQueue.d.ts.map +1 -1
- package/dist/services/QueueMaker/memQueue.js +37 -39
- package/dist/services/QueueMaker/sbqueue.d.ts +6 -9
- package/dist/services/QueueMaker/sbqueue.d.ts.map +1 -1
- package/dist/services/QueueMaker/sbqueue.js +41 -39
- package/dist/services/QueueMaker/service.d.ts +2 -4
- package/dist/services/QueueMaker/service.d.ts.map +1 -1
- package/dist/services/QueueMaker/service.js +8 -8
- package/dist/services/Repository/dsl.d.ts +11 -13
- package/dist/services/Repository/dsl.d.ts.map +1 -1
- package/dist/services/Repository/dsl.js +12 -13
- package/dist/services/Repository/ext.d.ts +34 -62
- package/dist/services/Repository/ext.d.ts.map +1 -1
- package/dist/services/Repository/ext.js +59 -70
- package/dist/services/RepositoryBase.d.ts +101 -71
- package/dist/services/RepositoryBase.d.ts.map +1 -1
- package/dist/services/RepositoryBase.js +229 -226
- package/dist/services/RequestContextContainer.d.ts +13 -21
- package/dist/services/RequestContextContainer.d.ts.map +1 -1
- package/dist/services/RequestContextContainer.js +21 -25
- package/dist/services/Store/ContextMapContainer.d.ts +11 -18
- package/dist/services/Store/ContextMapContainer.d.ts.map +1 -1
- package/dist/services/Store/ContextMapContainer.js +17 -18
- package/dist/services/Store/Cosmos/query.d.ts +3 -2
- package/dist/services/Store/Cosmos/query.d.ts.map +1 -1
- package/dist/services/Store/Cosmos/query.js +10 -11
- package/dist/services/Store/Cosmos.d.ts +2 -3
- package/dist/services/Store/Cosmos.d.ts.map +1 -1
- package/dist/services/Store/Cosmos.js +107 -90
- package/dist/services/Store/Disk.d.ts +4 -4
- package/dist/services/Store/Disk.d.ts.map +1 -1
- package/dist/services/Store/Disk.js +54 -50
- package/dist/services/Store/Memory.d.ts +6 -8
- package/dist/services/Store/Memory.d.ts.map +1 -1
- package/dist/services/Store/Memory.js +93 -89
- package/dist/services/Store/codeFilter.d.ts.map +1 -1
- package/dist/services/Store/codeFilter.js +3 -3
- package/dist/services/Store/codeFilter.test.d.ts.map +1 -1
- package/dist/services/Store/filterApi/query.d.ts +1 -1
- package/dist/services/Store/filterApi/query.d.ts.map +1 -1
- package/dist/services/Store/filterApi/query.js +3 -3
- package/dist/services/Store/index.d.ts +1 -2
- package/dist/services/Store/index.d.ts.map +1 -1
- package/dist/services/Store/index.js +7 -8
- package/dist/services/Store/service.d.ts +20 -23
- package/dist/services/Store/service.d.ts.map +1 -1
- package/dist/services/Store/service.js +6 -6
- package/dist/services/Store/utils.d.ts +3 -3
- package/dist/services/Store/utils.d.ts.map +1 -1
- package/dist/services/Store/utils.js +26 -28
- package/dist/services/query.d.ts +6 -6
- package/dist/services/query.d.ts.map +1 -1
- package/dist/services/query.js +5 -3
- package/dist/test.arbs.d.ts +0 -2
- package/dist/test.arbs.d.ts.map +1 -1
- package/dist/test.arbs.js +3 -4
- package/package.json +28 -168
- package/src/RequestContext.ts +1 -0
- package/src/_ext/Array.ts +5 -2
- package/src/api/reportError.ts +14 -10
- package/src/api/routing/base.ts +77 -110
- package/src/api/routing/defaultErrorHandler.ts +64 -54
- package/src/api/routing/makeRequestHandler.ts +165 -135
- package/src/api/routing/match.ts +14 -8
- package/src/api/{express → routing}/schema/jwt.ts +6 -5
- package/src/api/{express → routing}/schema/routing.ts +2 -1
- package/src/api/setupRequest.ts +30 -24
- package/src/errorReporter.ts +12 -11
- package/src/errors.ts +1 -0
- package/src/filter/types/path/index.ts +2 -2
- package/src/logger/jsonLogger.ts +6 -5
- package/src/logger/logFmtLogger.ts +4 -5
- package/src/logger/shared.ts +4 -3
- package/src/rateLimit.ts +37 -34
- package/src/services/Emailer/Sendgrid.ts +12 -10
- package/src/services/Emailer/fake.ts +7 -4
- package/src/services/Emailer/service.ts +4 -1
- package/src/services/Operations/live.ts +66 -59
- package/src/services/Operations/service.ts +41 -34
- package/src/services/QueueMaker/errors.ts +15 -11
- package/src/services/QueueMaker/memQueue.ts +59 -40
- package/src/services/QueueMaker/sbqueue.ts +54 -33
- package/src/services/QueueMaker/service.ts +7 -6
- package/src/services/Repository/dsl.ts +18 -14
- package/src/services/Repository/ext.ts +58 -50
- package/src/services/RepositoryBase.ts +478 -351
- package/src/services/RequestContextContainer.ts +30 -18
- package/src/services/Store/ContextMapContainer.ts +26 -13
- package/src/services/Store/Cosmos/query.ts +17 -11
- package/src/services/Store/Cosmos.ts +209 -168
- package/src/services/Store/Disk.ts +69 -53
- package/src/services/Store/Memory.ts +138 -97
- package/src/services/Store/{Redis.ts → Redis.ts.bak} +7 -5
- package/src/services/Store/codeFilter.test.ts +61 -36
- package/src/services/Store/codeFilter.ts +1 -0
- package/src/services/Store/filterApi/query.ts +1 -0
- package/src/services/Store/index.ts +7 -6
- package/src/services/Store/service.ts +4 -1
- package/src/services/Store/utils.ts +25 -23
- package/src/services/query.ts +3 -2
- package/src/services/simpledb/{cosmosdb.ts → cosmosdb.ts.bak} +1 -0
- package/src/services/simpledb/{diskdb.ts → diskdb.ts.bak} +2 -1
- package/src/services/simpledb/{memdb.ts → memdb.ts.bak} +3 -2
- package/src/services/simpledb/{mongodb.ts → mongodb.ts.bak} +1 -0
- package/src/services/simpledb/{redisdb.ts → redisdb.ts.bak} +17 -14
- package/src/services/simpledb/{shared.ts → shared.ts.bak} +2 -1
- package/src/services/simpledb/{simpledb.ts → simpledb.ts.bak} +6 -2
- package/tsconfig.json +4 -21
- package/tsconfig.json.bak +0 -4
- package/_cjs/_global.cjs +0 -6
- package/_cjs/_global.cjs.map +0 -1
- package/_cjs/_global.ext.cjs +0 -5
- package/_cjs/_global.ext.cjs.map +0 -1
- package/_cjs/_global.schema.cjs +0 -5
- package/_cjs/_global.schema.cjs.map +0 -1
- package/_cjs/api/defaultErrorHandler.cjs +0 -37
- package/_cjs/api/defaultErrorHandler.cjs.map +0 -1
- package/_cjs/api/express/schema/jwt.cjs.map +0 -1
- package/_cjs/api/express/schema/routing.cjs +0 -23
- package/_cjs/api/express/schema/routing.cjs.map +0 -1
- package/_cjs/api/http.cjs +0 -42
- package/_cjs/api/http.cjs.map +0 -1
- package/_cjs/services/Store/Redis.cjs +0 -73
- package/_cjs/services/Store/Redis.cjs.map +0 -1
- package/_cjs/services/simpledb/cosmosdb.cjs +0 -109
- package/_cjs/services/simpledb/cosmosdb.cjs.map +0 -1
- package/_cjs/services/simpledb/diskdb.cjs +0 -125
- package/_cjs/services/simpledb/diskdb.cjs.map +0 -1
- package/_cjs/services/simpledb/index.cjs +0 -38
- package/_cjs/services/simpledb/index.cjs.map +0 -1
- package/_cjs/services/simpledb/memdb.cjs +0 -72
- package/_cjs/services/simpledb/memdb.cjs.map +0 -1
- package/_cjs/services/simpledb/mongodb.cjs +0 -99
- package/_cjs/services/simpledb/mongodb.cjs.map +0 -1
- package/_cjs/services/simpledb/redisdb.cjs +0 -135
- package/_cjs/services/simpledb/redisdb.cjs.map +0 -1
- package/_cjs/services/simpledb/shared.cjs +0 -79
- package/_cjs/services/simpledb/shared.cjs.map +0 -1
- package/_cjs/services/simpledb/simpledb.cjs +0 -85
- package/_cjs/services/simpledb/simpledb.cjs.map +0 -1
- package/dist/_global.d.ts +0 -10
- package/dist/_global.d.ts.map +0 -1
- package/dist/_global.ext.d.ts +0 -34
- package/dist/_global.ext.d.ts.map +0 -1
- package/dist/_global.ext.js +0 -6
- package/dist/_global.js +0 -12
- package/dist/_global.schema.d.ts +0 -6
- package/dist/_global.schema.d.ts.map +0 -1
- package/dist/_global.schema.js +0 -9
- package/dist/api/defaultErrorHandler.d.ts +0 -6
- package/dist/api/defaultErrorHandler.d.ts.map +0 -1
- package/dist/api/defaultErrorHandler.js +0 -34
- package/dist/api/express/schema/jwt.d.ts +0 -6
- package/dist/api/express/schema/jwt.d.ts.map +0 -1
- package/dist/api/express/schema/jwt.js +0 -11
- package/dist/api/express/schema/routing.d.ts.map +0 -1
- package/dist/api/express/schema/routing.js +0 -10
- package/dist/api/http.d.ts +0 -16
- package/dist/api/http.d.ts.map +0 -1
- package/dist/api/http.js +0 -12
- package/dist/services/Store/Redis.d.ts +0 -6
- package/dist/services/Store/Redis.d.ts.map +0 -1
- package/dist/services/Store/Redis.js +0 -76
- package/dist/services/simpledb/cosmosdb.d.ts +0 -14
- package/dist/services/simpledb/cosmosdb.d.ts.map +0 -1
- package/dist/services/simpledb/cosmosdb.js +0 -103
- package/dist/services/simpledb/diskdb.d.ts +0 -12
- package/dist/services/simpledb/diskdb.d.ts.map +0 -1
- package/dist/services/simpledb/diskdb.js +0 -109
- package/dist/services/simpledb/index.d.ts +0 -7
- package/dist/services/simpledb/index.d.ts.map +0 -1
- package/dist/services/simpledb/index.js +0 -7
- package/dist/services/simpledb/memdb.d.ts +0 -11
- package/dist/services/simpledb/memdb.d.ts.map +0 -1
- package/dist/services/simpledb/memdb.js +0 -58
- package/dist/services/simpledb/mongodb.d.ts +0 -13
- package/dist/services/simpledb/mongodb.d.ts.map +0 -1
- package/dist/services/simpledb/mongodb.js +0 -68
- package/dist/services/simpledb/redisdb.d.ts +0 -35
- package/dist/services/simpledb/redisdb.d.ts.map +0 -1
- package/dist/services/simpledb/redisdb.js +0 -126
- package/dist/services/simpledb/shared.d.ts +0 -87
- package/dist/services/simpledb/shared.d.ts.map +0 -1
- package/dist/services/simpledb/shared.js +0 -52
- package/dist/services/simpledb/simpledb.d.ts +0 -23
- package/dist/services/simpledb/simpledb.d.ts.map +0 -1
- package/dist/services/simpledb/simpledb.js +0 -69
- package/src/_global.ext.ts +0 -36
- package/src/_global.schema.ts +0 -10
- package/src/_global.ts +0 -14
- package/src/api/defaultErrorHandler.ts +0 -59
- package/src/api/express/makeJsonSchema.test.ts.bak +0 -76
- package/src/api/express/makeJsonSchema.ts.bak +0 -166
- package/src/api/express/makeOpenApiSpecs.ts.bak +0 -62
- package/src/api/http.ts +0 -26
- package/tsplus.config.json +0 -9
- /package/src/services/simpledb/{index.ts → index.ts.bak} +0 -0
|
@@ -5,22 +5,15 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
});
|
|
6
6
|
exports.RequestSettings = void 0;
|
|
7
7
|
exports.makeRequestHandler = makeRequestHandler;
|
|
8
|
-
var
|
|
9
|
-
var tsplus_module_2 = _interopRequireWildcard(require("effect-app/schema"));
|
|
10
|
-
var tsplus_module_3 = _interopRequireWildcard(require("@effect/schema/Schema"));
|
|
11
|
-
var tsplus_module_4 = _interopRequireWildcard(require("effect/Effect"));
|
|
12
|
-
var _utils = _interopRequireWildcard(require("@effect-app/core/utils"));
|
|
13
|
-
var tsplus_module_5 = _utils;
|
|
14
|
-
var tsplus_module_6 = _interopRequireWildcard(require("@effect/platform/Http/ServerResponse"));
|
|
15
|
-
var tsplus_module_7 = _interopRequireWildcard(require("@effect/platform/Http/Body"));
|
|
16
|
-
var tsplus_module_8 = _interopRequireWildcard(require("@effect-app/infra/api/setupRequest"));
|
|
8
|
+
var _utils = require("@effect-app/core/utils");
|
|
17
9
|
var _util = require("@effect-app/infra/api/util");
|
|
18
10
|
var _errorReporter = require("@effect-app/infra/errorReporter");
|
|
19
|
-
var
|
|
11
|
+
var _effectApp = require("effect-app");
|
|
12
|
+
var _http = require("effect-app/http");
|
|
13
|
+
var _schema = require("effect-app/schema");
|
|
14
|
+
var _setupRequest = require("../setupRequest.cjs");
|
|
20
15
|
var _base = require("./base.cjs");
|
|
21
|
-
|
|
22
|
-
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
|
23
|
-
const RequestSettings = exports.RequestSettings = tsplus_module_1.unsafeMake({
|
|
16
|
+
const RequestSettings = exports.RequestSettings = _effectApp.FiberRef.unsafeMake({
|
|
24
17
|
verbose: false
|
|
25
18
|
});
|
|
26
19
|
function makeRequestHandler(handler, errorHandler, middlewareLayer) {
|
|
@@ -29,27 +22,27 @@ function makeRequestHandler(handler, errorHandler, middlewareLayer) {
|
|
|
29
22
|
Response,
|
|
30
23
|
h: handle
|
|
31
24
|
} = handler;
|
|
32
|
-
const response = Response ? Response :
|
|
25
|
+
const response = Response ? Response : _effectApp.S.void;
|
|
33
26
|
const resp = response;
|
|
34
27
|
// TODO: consider if the alternative of using the struct schema is perhaps just better.
|
|
35
|
-
const encoder = "struct" in resp && resp.struct ?
|
|
28
|
+
const encoder = "struct" in resp && resp.struct ? _effectApp.S.encode(resp.struct)
|
|
36
29
|
// ? (i: any) => {
|
|
37
|
-
// if (i instanceof (response as any)) return
|
|
38
|
-
// else return
|
|
30
|
+
// if (i instanceof (response as any)) return S.encodeSync(response)(i)
|
|
31
|
+
// else return S.encodeSync(response)(new (response as any)(i))
|
|
39
32
|
// }
|
|
40
|
-
:
|
|
33
|
+
: _effectApp.S.encode(resp);
|
|
41
34
|
// const encodeResponse = adaptResponse
|
|
42
35
|
// ? (req: ReqA) => Encoder.for(adaptResponse(req))
|
|
43
36
|
// : () => encoder
|
|
44
37
|
const requestParsers = (0, _base.makeRequestParsers)(Request);
|
|
45
38
|
const parseRequest = (0, _base.parseRequestParams)(requestParsers);
|
|
46
|
-
const getParams =
|
|
47
|
-
rcx: _http.
|
|
48
|
-
req: _http.HttpServerRequest.
|
|
39
|
+
const getParams = _effectApp.Effect.map(_effectApp.Effect.all({
|
|
40
|
+
rcx: _http.HttpRouter.RouteContext,
|
|
41
|
+
req: _effectApp.Effect.flatMap(_http.HttpServerRequest.ServerRequest, req => req.json.pipe(_effectApp.Effect.map(body => ({
|
|
49
42
|
body,
|
|
50
43
|
headers: req.headers
|
|
51
|
-
})))
|
|
52
|
-
})
|
|
44
|
+
}))))
|
|
45
|
+
}), ({
|
|
53
46
|
rcx,
|
|
54
47
|
req
|
|
55
48
|
}) => ({
|
|
@@ -59,74 +52,74 @@ function makeRequestHandler(handler, errorHandler, middlewareLayer) {
|
|
|
59
52
|
headers: req.headers,
|
|
60
53
|
cookies: {} // req.cookies
|
|
61
54
|
}));
|
|
62
|
-
return
|
|
63
|
-
const req = yield* $(_http.HttpServerRequest);
|
|
64
|
-
const res =
|
|
55
|
+
return _effectApp.Effect.gen(function* ($) {
|
|
56
|
+
const req = yield* $(_http.HttpServerRequest.ServerRequest);
|
|
57
|
+
const res = _http.HttpServerResponse.empty().pipe(_ => req.method === "GET" ? _http.HttpServerResponse.setHeader(_, "Cache-Control", "no-store") : _);
|
|
65
58
|
const pars = yield* $(getParams);
|
|
66
|
-
const settings = yield* $(
|
|
59
|
+
const settings = yield* $(_effectApp.FiberRef.get(RequestSettings));
|
|
67
60
|
const eff =
|
|
68
61
|
// TODO: we don;t have access to user id here cause context is not yet created
|
|
69
|
-
|
|
62
|
+
_effectApp.Effect.logInfo("Incoming request").pipe(_effectApp.Effect.annotateLogs({
|
|
70
63
|
method: req.method,
|
|
71
64
|
path: req.originalUrl,
|
|
72
65
|
...(settings.verbose ? {
|
|
73
|
-
reqPath:
|
|
74
|
-
reqQuery:
|
|
66
|
+
reqPath: (0, _utils.pretty)(pars.params),
|
|
67
|
+
reqQuery: (0, _utils.pretty)(pars.query),
|
|
75
68
|
reqBody: (0, _utils.pretty)(pars.body),
|
|
76
69
|
reqCookies: (0, _utils.pretty)(pars.cookies),
|
|
77
70
|
reqHeaders: (0, _utils.pretty)(pars.headers)
|
|
78
71
|
} : undefined)
|
|
79
|
-
}).andThen(
|
|
80
|
-
const handleRequest = parseRequest(pars).map(({
|
|
72
|
+
}), _effectApp.Effect.andThen(_effectApp.Effect.suspend(() => {
|
|
73
|
+
const handleRequest = parseRequest(pars).pipe(_effectApp.Effect.map(({
|
|
81
74
|
body,
|
|
82
75
|
path,
|
|
83
76
|
query
|
|
84
77
|
}) => {
|
|
85
78
|
const hn = {
|
|
86
|
-
...body.
|
|
87
|
-
...query.
|
|
88
|
-
...path.
|
|
79
|
+
...(body.pipe(_effectApp.Option.getOrUndefined) ?? {}),
|
|
80
|
+
...(query.pipe(_effectApp.Option.getOrUndefined) ?? {}),
|
|
81
|
+
...(path.pipe(_effectApp.Option.getOrUndefined) ?? {})
|
|
89
82
|
};
|
|
90
83
|
return hn;
|
|
91
|
-
}).flatMap(parsedReq =>
|
|
84
|
+
}), _effectApp.Effect.flatMap(parsedReq => handle(parsedReq).pipe(_effectApp.Effect.provideService(handler.Request.Tag, parsedReq), _effectApp.Effect.flatMap(encoder), _effectApp.Effect.map(r => res.pipe(_http.HttpServerResponse.setBody(_http.HttpBody.unsafeJson(r)), _http.HttpServerResponse.setStatus(r === undefined ? 204 : 200))))));
|
|
92
85
|
// Commands should not be interruptable.
|
|
93
|
-
const r = req.method !== "GET" ?
|
|
94
|
-
const r2 = middlewareLayer ?
|
|
86
|
+
const r = req.method !== "GET" ? _effectApp.Effect.uninterruptible(handleRequest) : handleRequest; // .instrument("Performance.RequestResponse")
|
|
87
|
+
const r2 = middlewareLayer ? _effectApp.Effect.provide(r, middlewareLayer)
|
|
95
88
|
// PR is not relevant here
|
|
96
89
|
: r;
|
|
97
90
|
return errorHandler(req, res, r2);
|
|
98
|
-
})), cause =>
|
|
91
|
+
})), _effectApp.Effect.catchAllCause(cause => _effectApp.Effect.sync(() => _http.HttpServerResponse.setStatus(res, 500)).pipe(_effectApp.Effect.tap(res => _effectApp.Effect.all([(0, _errorReporter.reportError)("request")(cause, {
|
|
99
92
|
path: req.originalUrl,
|
|
100
93
|
method: req.method
|
|
101
|
-
}),
|
|
94
|
+
}), _effectApp.Effect.suspend(() => {
|
|
102
95
|
const headers = res.headers;
|
|
103
|
-
return
|
|
96
|
+
return _effectApp.Effect.logError("Finished request", cause).pipe(_effectApp.Effect.annotateLogs({
|
|
104
97
|
method: req.method,
|
|
105
98
|
path: req.originalUrl,
|
|
106
99
|
statusCode: res.status.toString(),
|
|
107
|
-
reqPath:
|
|
108
|
-
reqQuery:
|
|
100
|
+
reqPath: (0, _utils.pretty)(pars.params),
|
|
101
|
+
reqQuery: (0, _utils.pretty)(pars.query),
|
|
109
102
|
reqBody: (0, _utils.pretty)(pars.body),
|
|
110
103
|
reqCookies: (0, _utils.pretty)(pars.cookies),
|
|
111
104
|
reqHeaders: (0, _utils.pretty)(pars.headers),
|
|
112
|
-
resHeaders:
|
|
105
|
+
resHeaders: (0, _utils.pretty)(Object.entries(headers).reduce((prev, [key, value]) => {
|
|
113
106
|
prev[key] = value && typeof value === "string" ? (0, _util.snipString)(value) : value;
|
|
114
107
|
return prev;
|
|
115
|
-
}, {}))
|
|
116
|
-
});
|
|
108
|
+
}, {}))
|
|
109
|
+
}));
|
|
117
110
|
})], {
|
|
118
111
|
concurrency: "inherit"
|
|
119
|
-
}))
|
|
112
|
+
}))).pipe(_effectApp.Effect.tapErrorCause(cause => _effectApp.Effect.sync(() => console.error("Error occurred while reporting error", cause))))), _effectApp.Effect.tap(res => _effectApp.Effect.logInfo("Finished request").pipe(_effectApp.Effect.annotateLogs({
|
|
120
113
|
method: req.method,
|
|
121
114
|
path: req.originalUrl,
|
|
122
115
|
statusCode: res.status.toString(),
|
|
123
116
|
...(settings.verbose ? {
|
|
124
117
|
resHeaders: (0, _utils.pretty)(res.headers)
|
|
125
118
|
} : undefined)
|
|
126
|
-
}));
|
|
119
|
+
}))));
|
|
127
120
|
return yield* $(eff);
|
|
128
|
-
})
|
|
129
|
-
name:
|
|
130
|
-
}));
|
|
121
|
+
}).pipe(_ => (0, _setupRequest.updateRequestContext)(_, (0, _utils.copy)(_ => ({
|
|
122
|
+
name: (0, _schema.NonEmptyString255)(handler.name)
|
|
123
|
+
}))));
|
|
131
124
|
}
|
|
132
125
|
//# sourceMappingURL=makeRequestHandler.cjs.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"makeRequestHandler.cjs","names":["
|
|
1
|
+
{"version":3,"file":"makeRequestHandler.cjs","names":["_utils","require","_util","_errorReporter","_effectApp","_http","_schema","_setupRequest","_base","RequestSettings","exports","FiberRef","unsafeMake","verbose","makeRequestHandler","handler","errorHandler","middlewareLayer","Request","Response","h","handle","response","S","void","resp","encoder","struct","encode","requestParsers","makeRequestParsers","parseRequest","parseRequestParams","getParams","Effect","map","all","rcx","HttpRouter","RouteContext","req","flatMap","HttpServerRequest","ServerRequest","json","pipe","body","headers","params","query","searchParams","cookies","gen","$","res","HttpServerResponse","empty","_","method","setHeader","pars","settings","get","eff","logInfo","annotateLogs","path","originalUrl","reqPath","pretty","reqQuery","reqBody","reqCookies","reqHeaders","undefined","andThen","suspend","handleRequest","hn","Option","getOrUndefined","parsedReq","provideService","Tag","r","setBody","HttpBody","unsafeJson","setStatus","uninterruptible","r2","provide","catchAllCause","cause","sync","tap","reportError","logError","statusCode","status","toString","resHeaders","Object","entries","reduce","prev","key","value","snipString","concurrency","tapErrorCause","console","error","updateRequestContext","copy","name","NonEmptyString255"],"sources":["../../../src/api/routing/makeRequestHandler.ts"],"sourcesContent":[null],"mappings":"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"}
|
|
@@ -5,18 +5,11 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
});
|
|
6
6
|
exports.RouteDescriptors = void 0;
|
|
7
7
|
exports.match = match;
|
|
8
|
-
|
|
9
|
-
var
|
|
10
|
-
var
|
|
11
|
-
require("@effect-app/infra/api/express/schema/routing");
|
|
12
|
-
require("../http.cjs");
|
|
8
|
+
require("./schema/routing.cjs");
|
|
9
|
+
var _effectApp = require("effect-app");
|
|
10
|
+
var _http = require("effect-app/http");
|
|
13
11
|
var _makeRequestHandler = require("./makeRequestHandler.cjs");
|
|
14
|
-
|
|
15
|
-
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
|
16
|
-
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
17
|
-
/* eslint-disable @typescript-eslint/ban-types */
|
|
18
|
-
|
|
19
|
-
const RouteDescriptors = exports.RouteDescriptors = tsplus_module_1.GenericTag("@services/RouteDescriptors");
|
|
12
|
+
const RouteDescriptors = exports.RouteDescriptors = _effectApp.Context.GenericTag("@services/RouteDescriptors");
|
|
20
13
|
function match(requestHandler, errorHandler, middleware) {
|
|
21
14
|
let middlewareLayer = undefined;
|
|
22
15
|
if (middleware) {
|
|
@@ -27,12 +20,12 @@ function match(requestHandler, errorHandler, middleware) {
|
|
|
27
20
|
requestHandler = handler; // todo
|
|
28
21
|
middlewareLayer = makeRequestLayer;
|
|
29
22
|
}
|
|
30
|
-
return
|
|
23
|
+
return _effectApp.Effect.gen(function* () {
|
|
31
24
|
// const rdesc = yield* $(RouteDescriptors.flatMap((_) => _.get))
|
|
32
25
|
const handler = (0, _makeRequestHandler.makeRequestHandler)(requestHandler,
|
|
33
26
|
// one argument if no middleware, 2 if has middleware. TODO: clean this shit up
|
|
34
27
|
errorHandler, middlewareLayer);
|
|
35
|
-
const route =
|
|
28
|
+
const route = _http.HttpRouter.makeRoute(requestHandler.Request.method, requestHandler.Request.path, handler);
|
|
36
29
|
// TODO
|
|
37
30
|
// rdesc.push(makeRouteDescriptor(
|
|
38
31
|
// requestHandler.Request.path,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"match.cjs","names":["require","
|
|
1
|
+
{"version":3,"file":"match.cjs","names":["require","_effectApp","_http","_makeRequestHandler","RouteDescriptors","exports","Context","GenericTag","match","requestHandler","errorHandler","middleware","middlewareLayer","undefined","handler","makeRequestLayer","Effect","gen","makeRequestHandler","route","HttpRouter","makeRoute","Request","method","path"],"sources":["../../../src/api/routing/match.ts"],"sourcesContent":[null],"mappings":";;;;;;;AAIAA,OAAA;AAGA,IAAAC,UAAA,GAAAD,OAAA;AACA,IAAAE,KAAA,GAAAF,OAAA;AAGA,IAAAG,mBAAA,GAAAH,OAAA;AAGO,MAAMI,gBAAgB,GAAAC,OAAA,CAAAD,gBAAA,GAAGE,kBAAO,CAACC,UAAU,CAA4B,4BAA4B,CAAC;AAErG,SAAUC,KAAKA,CAoBnBC,cAeC,EACDC,YAQC,EACDC,UAkBC;EAED,IAAIC,eAAe,GAA2CC,SAAS;EACvE,IAAIF,UAAU,EAAE;IACd,MAAM;MAAEG,OAAO;MAAEC;IAAgB,CAAE,GAAGJ,UAAU,CAACF,cAAc,CAAC;IAChEA,cAAc,GAAGK,OAAc,EAAC;IAChCF,eAAe,GAAGG,gBAAgB;EACpC;EACA,OAAOC,iBAAM,CAACC,GAAG,CAAC,aAAS;IACzB;IAEA,MAAMH,OAAO,GAAG,IAAAI,sCAAkB,EAkBhCT,cAAqB;IAAE;IACvBC,YAAY,EACZE,eAAe,CAChB;IAED,MAAMO,KAAK,GAAGC,gBAAU,CAACC,SAAS,CAChCZ,cAAc,CAACa,OAAO,CAACC,MAAM,EAC7Bd,cAAc,CAACa,OAAO,CAACE,IAAI,EAC3BV,OAAO,CACR;IACD;IACA;IACA;IACA;IACA;IACA;IACA,OAAOK,KAAK;EACd,CAAC,CAAC;AACJ"}
|
|
@@ -4,18 +4,17 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.parseJwt = void 0;
|
|
7
|
-
var tsplus_module_1 = _interopRequireWildcard(require("@effect/schema/Schema"));
|
|
8
7
|
var S = _interopRequireWildcard(require("effect-app/schema"));
|
|
9
8
|
var _jwtDecode = require("jwt-decode");
|
|
10
9
|
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
|
|
11
10
|
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
|
12
|
-
const parseJwt = (schema, options) =>
|
|
11
|
+
const parseJwt = (schema, options) => S.transformOrFail(S.string, S.unknown, (s, __, ast) => S.ParseResult.try({
|
|
13
12
|
try: () => (0, _jwtDecode.jwtDecode)(s, options),
|
|
14
13
|
catch: e => S.ParseResult.type(ast, s, e?.message)
|
|
15
14
|
}), _ => {
|
|
16
15
|
throw new Error("not implemented");
|
|
17
|
-
})
|
|
16
|
+
}).pipe(S.compose(schema, {
|
|
18
17
|
strict: false
|
|
19
|
-
});
|
|
18
|
+
}));
|
|
20
19
|
exports.parseJwt = parseJwt;
|
|
21
20
|
//# sourceMappingURL=jwt.cjs.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"jwt.cjs","names":["S","_interopRequireWildcard","require","_jwtDecode","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","parseJwt","schema","options","transformOrFail","string","unknown","s","__","ast","ParseResult","try","jwtDecode","catch","type","message","_","Error","pipe","compose","strict","exports"],"sources":["../../../../src/api/routing/schema/jwt.ts"],"sourcesContent":[null],"mappings":";;;;;;AAKA,IAAAA,CAAA,GAAAC,uBAAA,CAAAC,OAAA;AACA,IAAAC,UAAA,GAAAD,OAAA;AAA6D,SAAAE,yBAAAC,CAAA,6BAAAC,OAAA,mBAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,CAAA,WAAAA,CAAA,GAAAG,CAAA,GAAAD,CAAA,KAAAF,CAAA;AAAA,SAAAJ,wBAAAI,CAAA,EAAAE,CAAA,SAAAA,CAAA,IAAAF,CAAA,IAAAA,CAAA,CAAAI,UAAA,SAAAJ,CAAA,eAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,WAAAK,OAAA,EAAAL,CAAA,QAAAG,CAAA,GAAAJ,wBAAA,CAAAG,CAAA,OAAAC,CAAA,IAAAA,CAAA,CAAAG,GAAA,CAAAN,CAAA,UAAAG,CAAA,CAAAI,GAAA,CAAAP,CAAA,OAAAQ,CAAA,KAAAC,SAAA,UAAAC,CAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,CAAA,IAAAd,CAAA,oBAAAc,CAAA,IAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAjB,CAAA,EAAAc,CAAA,SAAAI,CAAA,GAAAR,CAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAb,CAAA,EAAAc,CAAA,UAAAI,CAAA,KAAAA,CAAA,CAAAX,GAAA,IAAAW,CAAA,CAAAC,GAAA,IAAAR,MAAA,CAAAC,cAAA,CAAAJ,CAAA,EAAAM,CAAA,EAAAI,CAAA,IAAAV,CAAA,CAAAM,CAAA,IAAAd,CAAA,CAAAc,CAAA,YAAAN,CAAA,CAAAH,OAAA,GAAAL,CAAA,EAAAG,CAAA,IAAAA,CAAA,CAAAgB,GAAA,CAAAnB,CAAA,EAAAQ,CAAA,GAAAA,CAAA;AAEtD,MAAMY,QAAQ,GAAGA,CACtBC,MAAyB,EACzBC,OAAsC,KAEtC3B,CAAC,CACE4B,eAAe,CACd5B,CAAC,CAAC6B,MAAM,EACR7B,CAAC,CAAC8B,OAAO,EACT,CAACC,CAAC,EAAEC,EAAE,EAAEC,GAAG,KACTjC,CAAC,CAACkC,WAAW,CAACC,GAAG,CAAC;EAChBA,GAAG,EAAEA,CAAA,KAAM,IAAAC,oBAAS,EAACL,CAAC,EAAEJ,OAAO,CAAC;EAChCU,KAAK,EAAGhC,CAAM,IAAKL,CAAC,CAACkC,WAAW,CAACI,IAAI,CAACL,GAAG,EAAEF,CAAC,EAAE1B,CAAC,EAAEkC,OAAO;CACzD,CAAC,EACHC,CAAC,IAAgC;EAChC,MAAM,IAAIC,KAAK,CAAC,iBAAiB,CAAC;AACpC,CAAC,CACF,CACAC,IAAI,CAAC1C,CAAC,CAAC2C,OAAO,CAACjB,MAAM,EAAE;EAAEkB,MAAM,EAAE;AAAK,CAAE,CAAC,CAAC;AAAAC,OAAA,CAAApB,QAAA,GAAAA,QAAA"}
|
|
@@ -0,0 +1,136 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
Object.defineProperty(exports, "__esModule", {
|
|
4
|
+
value: true
|
|
5
|
+
});
|
|
6
|
+
exports.arrAsRouteDescriptionAny = arrAsRouteDescriptionAny;
|
|
7
|
+
exports.asRouteDescriptionAny = asRouteDescriptionAny;
|
|
8
|
+
exports.makeRouteDescriptor = makeRouteDescriptor;
|
|
9
|
+
function asRouteDescriptionAny(i) {
|
|
10
|
+
return i;
|
|
11
|
+
}
|
|
12
|
+
function arrAsRouteDescriptionAny(arr) {
|
|
13
|
+
return arr.map(asRouteDescriptionAny);
|
|
14
|
+
}
|
|
15
|
+
function makeRouteDescriptor(path, method, handler) {
|
|
16
|
+
return {
|
|
17
|
+
path,
|
|
18
|
+
handler,
|
|
19
|
+
method,
|
|
20
|
+
_tag: "Schema"
|
|
21
|
+
};
|
|
22
|
+
}
|
|
23
|
+
// export function makeFromSchema<ResA>(
|
|
24
|
+
// e: RouteDescriptor<any, any, any, any, any, any, ResA, any>
|
|
25
|
+
// ) {
|
|
26
|
+
// const jsonSchema_ = OpenApi.for
|
|
27
|
+
// const jsonSchema = <E, A>(r: REST.ReqRes<A, E, any>) => jsonSchema_(r)
|
|
28
|
+
// const { Request: Req, Response: Res_, ResponseOpenApi } = e.handler
|
|
29
|
+
// const r = ResponseOpenApi ?? Res_
|
|
30
|
+
// const Res = r ? S.extractSchema(r) : S.Void
|
|
31
|
+
// // TODO EffectOption.fromNullable(Req.Headers).flatMapOpt(jsonSchema)
|
|
32
|
+
// // TODO: use the path vs body etc serialisation also in the Client.
|
|
33
|
+
// const makeReqQuerySchema = Effect.sync(() => Option.fromNullable(Req.Query)).flatMap((_) =>
|
|
34
|
+
// _.match({
|
|
35
|
+
// onNone: () => Effect.sync(() => Option.none()),
|
|
36
|
+
// onSome: (_) => jsonSchema(_).map(Option.some)
|
|
37
|
+
// })
|
|
38
|
+
// )
|
|
39
|
+
// const makeReqHeadersSchema = Effect.sync(() => Option.fromNullable(Req.Headers)).flatMap((_) =>
|
|
40
|
+
// _.match({
|
|
41
|
+
// onNone: () => Effect.sync(() => Option.none()),
|
|
42
|
+
// onSome: (_) => jsonSchema(_).map(Option.some)
|
|
43
|
+
// })
|
|
44
|
+
// )
|
|
45
|
+
// const makeReqCookieSchema = Effect.sync(() => Option.fromNullable(Req.Cookie)).flatMap((_) =>
|
|
46
|
+
// _.match({
|
|
47
|
+
// onNone: () => Effect.sync(() => Option.none()),
|
|
48
|
+
// onSome: (_) => jsonSchema(_).map(Option.some)
|
|
49
|
+
// })
|
|
50
|
+
// )
|
|
51
|
+
// const makeReqPathSchema = Effect.sync(() => Option.fromNullable(Req.Path)).flatMap((_) =>
|
|
52
|
+
// _.match({
|
|
53
|
+
// onNone: () => Effect.sync(() => Option.none()),
|
|
54
|
+
// onSome: (_) => jsonSchema(_).map(Option.some)
|
|
55
|
+
// })
|
|
56
|
+
// )
|
|
57
|
+
// const makeReqBodySchema = Effect.sync(() => Option.fromNullable(Req.Body)).flatMap((_) =>
|
|
58
|
+
// _.match({
|
|
59
|
+
// onNone: () => Effect.sync(() => Option.none()),
|
|
60
|
+
// onSome: (_) => jsonSchema(_).map(Option.some)
|
|
61
|
+
// })
|
|
62
|
+
// )
|
|
63
|
+
// // const makeReqSchema = schema(Req)
|
|
64
|
+
// const makeResSchema = jsonSchema_(Res)
|
|
65
|
+
// function makeParameters(inn: ParameterLocation) {
|
|
66
|
+
// return (a: Option<JSONSchema | SubSchema>) => {
|
|
67
|
+
// return a
|
|
68
|
+
// .flatMap((o) => (isObjectSchema(o) ? Option.some(o) : Option.none()))
|
|
69
|
+
// .map((x) => {
|
|
70
|
+
// // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
71
|
+
// return Object.keys(x.properties!).map((p) => {
|
|
72
|
+
// // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
73
|
+
// const schema = x.properties![p]
|
|
74
|
+
// const required = Boolean(x.required?.includes(p))
|
|
75
|
+
// return { name: p, in: inn, required, schema }
|
|
76
|
+
// })
|
|
77
|
+
// })
|
|
78
|
+
// .getOrElse(() => [])
|
|
79
|
+
// }
|
|
80
|
+
// }
|
|
81
|
+
// return Effect
|
|
82
|
+
// .all({
|
|
83
|
+
// req: jsonSchema(Req.Model),
|
|
84
|
+
// reqQuery: makeReqQuerySchema,
|
|
85
|
+
// reqHeaders: makeReqHeadersSchema,
|
|
86
|
+
// reqBody: makeReqBodySchema,
|
|
87
|
+
// reqPath: makeReqPathSchema,
|
|
88
|
+
// reqCookie: makeReqCookieSchema,
|
|
89
|
+
// res: makeResSchema
|
|
90
|
+
// })
|
|
91
|
+
// .map((_) => {
|
|
92
|
+
// // console.log("$$$ REQ", _.req)
|
|
93
|
+
// const isEmpty = !e.handler.Response || e.handler.Response === S.Void
|
|
94
|
+
// return {
|
|
95
|
+
// path: e.path,
|
|
96
|
+
// method: e.method.toLowerCase(),
|
|
97
|
+
// tags: e.info?.tags,
|
|
98
|
+
// description: _.req?.description,
|
|
99
|
+
// summary: _.req?.summary,
|
|
100
|
+
// operationId: _.req?.title,
|
|
101
|
+
// parameters: [
|
|
102
|
+
// ...makeParameters("path")(_.reqPath),
|
|
103
|
+
// ...makeParameters("query")(_.reqQuery),
|
|
104
|
+
// ...makeParameters("header")(_.reqHeaders),
|
|
105
|
+
// ...makeParameters("cookie")(_.reqCookie)
|
|
106
|
+
// ],
|
|
107
|
+
// requestBody: _
|
|
108
|
+
// .reqBody
|
|
109
|
+
// .map((schema) => ({
|
|
110
|
+
// content: { "application/json": { schema } }
|
|
111
|
+
// }))
|
|
112
|
+
// .value,
|
|
113
|
+
// responses: [
|
|
114
|
+
// isEmpty
|
|
115
|
+
// ? new Response(204, { description: "Empty" })
|
|
116
|
+
// : new Response(200, {
|
|
117
|
+
// description: "OK",
|
|
118
|
+
// content: { "application/json": { schema: _.res } }
|
|
119
|
+
// }),
|
|
120
|
+
// new Response(400, { description: "ValidationError" })
|
|
121
|
+
// ]
|
|
122
|
+
// .concat(
|
|
123
|
+
// e.path.includes(":") && isEmpty
|
|
124
|
+
// ? [new Response(404, { description: "NotFoundError" })]
|
|
125
|
+
// : []
|
|
126
|
+
// )
|
|
127
|
+
// }
|
|
128
|
+
// })
|
|
129
|
+
// }
|
|
130
|
+
// class Response {
|
|
131
|
+
// constructor(
|
|
132
|
+
// public readonly statusCode: number,
|
|
133
|
+
// public readonly type: any // string | JSONSchema | SubSchema
|
|
134
|
+
// ) {}
|
|
135
|
+
// }
|
|
136
|
+
//# sourceMappingURL=routing.cjs.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"routing.cjs","names":["asRouteDescriptionAny","i","arrAsRouteDescriptionAny","arr","map","makeRouteDescriptor","path","method","handler","_tag"],"sources":["../../../../src/api/routing/schema/routing.ts"],"sourcesContent":[null],"mappings":";;;;;;;;AAyCM,SAAUA,qBAAqBA,CAA+BC,CAAI;EACtE,OAAOA,CAAuB;AAChC;AAEM,SAAUC,wBAAwBA,CACtCC,GAAqB;EAErB,OAAOA,GAAG,CAACC,GAAG,CAACJ,qBAAqB,CAAC;AACvC;AAiCM,SAAUK,mBAAmBA,CAWjCC,IAAkB,EAClBC,MAAc,EACdC,OAUC;EAYD,OAAO;IAAEF,IAAI;IAAEE,OAAO;IAAED,MAAM;IAAEE,IAAI,EAAE;EAAQ,CAAE;AAClD;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACA;AACA;AACA"}
|
|
@@ -5,54 +5,48 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
});
|
|
6
6
|
exports.setupRequestContext = setupRequestContext;
|
|
7
7
|
exports.updateRequestContext = updateRequestContext;
|
|
8
|
-
var
|
|
9
|
-
var
|
|
10
|
-
var tsplus_module_3 = _interopRequireWildcard(require("@effect-app/infra/services/RequestContextContainer"));
|
|
11
|
-
var tsplus_module_4 = _interopRequireWildcard(require("effect/Layer"));
|
|
8
|
+
var _schema = require("@effect-app/schema");
|
|
9
|
+
var _effectApp = require("effect-app");
|
|
12
10
|
var _ids = require("effect-app/ids");
|
|
13
11
|
var _RequestContext = require("../RequestContext.cjs");
|
|
14
|
-
var
|
|
12
|
+
var _RequestContextContainer = require("../services/RequestContextContainer.cjs");
|
|
15
13
|
var _ContextMapContainer = require("../services/Store/ContextMapContainer.cjs");
|
|
16
|
-
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
|
|
17
|
-
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
|
18
14
|
function makeInternalRequestContext(name) {
|
|
19
|
-
return
|
|
15
|
+
return _effectApp.Effect.sync(() => {
|
|
20
16
|
const id = _ids.RequestId.make();
|
|
21
17
|
return new _RequestContext.RequestContext({
|
|
22
18
|
id,
|
|
23
19
|
rootId: id,
|
|
24
20
|
locale: "en",
|
|
25
|
-
name:
|
|
21
|
+
name: (0, _schema.NonEmptyString255)(name)
|
|
26
22
|
});
|
|
27
23
|
});
|
|
28
24
|
}
|
|
29
|
-
const withRequestSpan = f =>
|
|
30
|
-
attributes:
|
|
31
|
-
})
|
|
25
|
+
const withRequestSpan = f => _effectApp.Effect.andThen(_RequestContextContainer.RequestContextContainer.get, ctx => f.pipe(_effectApp.Effect.withSpan("request", {
|
|
26
|
+
attributes: (0, _RequestContextContainer.spanAttributes)(ctx)
|
|
27
|
+
}),
|
|
32
28
|
// request context info is picked up directly in the logger for annotations.
|
|
33
|
-
|
|
34
|
-
const setupContextMap =
|
|
29
|
+
_effectApp.Effect.withLogSpan("request")));
|
|
30
|
+
const setupContextMap = _effectApp.Effect.andThen(_ContextMapContainer.ContextMapContainer, _ => _.start).pipe(_effectApp.Layer.effectDiscard);
|
|
35
31
|
// const RequestContextLiveFromRequestContext = (requestContext: RequestContext) =>
|
|
36
32
|
// RequestContext.Tag.makeLayer(requestContext)
|
|
37
33
|
// memoization problem
|
|
38
34
|
// const RequestContextLive = RequestContextContainer.get.toLayer(RequestContext.Tag)
|
|
39
|
-
const RequestContextStartLiveFromRequestContext = requestContext =>
|
|
35
|
+
const RequestContextStartLiveFromRequestContext = requestContext => _effectApp.Layer.provideMerge(setupContextMap,
|
|
40
36
|
// .provideMerge(RequestContextLiveFromRequestContext(requestContext))
|
|
41
|
-
|
|
42
|
-
const RequestContextStartLive = requestContext => typeof requestContext === "string" ?
|
|
37
|
+
_effectApp.Effect.andThen(_RequestContextContainer.RequestContextContainer, _ => _.start(requestContext)).pipe(_effectApp.Layer.effectDiscard));
|
|
38
|
+
const RequestContextStartLive = requestContext => typeof requestContext === "string" ? (0, _effectApp.pipe)(makeInternalRequestContext(requestContext), _effectApp.Effect.andThen(RequestContextStartLiveFromRequestContext), _effectApp.Layer.unwrapEffect) : RequestContextStartLiveFromRequestContext(requestContext);
|
|
43
39
|
/**
|
|
44
40
|
* @tsplus fluent effect/io/Effect setupRequestContext
|
|
45
41
|
*/
|
|
46
42
|
function setupRequestContext(self, requestContext) {
|
|
47
|
-
return
|
|
43
|
+
return self.pipe(withRequestSpan, _effectApp.Effect.provide(RequestContextStartLive(requestContext)));
|
|
48
44
|
}
|
|
49
|
-
const UpdateRequestContextLive = f =>
|
|
45
|
+
const UpdateRequestContextLive = f => _effectApp.Effect.andThen(_RequestContextContainer.RequestContextContainer, rcc => rcc.update(f)).pipe(_effectApp.Layer.effectDiscard);
|
|
50
46
|
/**
|
|
51
47
|
* @tsplus fluent effect/io/Effect updateRequestContext
|
|
52
48
|
*/
|
|
53
49
|
function updateRequestContext(self, f) {
|
|
54
|
-
return
|
|
55
|
-
// .provideServiceEffect(RequestContext.Tag, RequestContextContainer.get)
|
|
56
|
-
, UpdateRequestContextLive(f));
|
|
50
|
+
return _effectApp.Effect.provide(self, UpdateRequestContextLive(f));
|
|
57
51
|
}
|
|
58
52
|
//# sourceMappingURL=setupRequest.cjs.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setupRequest.cjs","names":["
|
|
1
|
+
{"version":3,"file":"setupRequest.cjs","names":["_schema","require","_effectApp","_ids","_RequestContext","_RequestContextContainer","_ContextMapContainer","makeInternalRequestContext","name","Effect","sync","id","RequestId","make","RequestContext","rootId","locale","NonEmptyString255","withRequestSpan","f","andThen","RequestContextContainer","get","ctx","pipe","withSpan","attributes","spanAttributes","withLogSpan","setupContextMap","ContextMapContainer","_","start","Layer","effectDiscard","RequestContextStartLiveFromRequestContext","requestContext","provideMerge","RequestContextStartLive","unwrapEffect","setupRequestContext","self","provide","UpdateRequestContextLive","rcc","update","updateRequestContext"],"sources":["../../src/api/setupRequest.ts"],"sourcesContent":[null],"mappings":";;;;;;;AAAA,IAAAA,OAAA,GAAAC,OAAA;AACA,IAAAC,UAAA,GAAAD,OAAA;AACA,IAAAE,IAAA,GAAAF,OAAA;AACA,IAAAG,eAAA,GAAAH,OAAA;AACA,IAAAI,wBAAA,GAAAJ,OAAA;AACA,IAAAK,oBAAA,GAAAL,OAAA;AAEA,SAASM,0BAA0BA,CAACC,IAAY;EAC9C,OAAOC,iBAAM,CAACC,IAAI,CAAC,MAAK;IACtB,MAAMC,EAAE,GAAGC,cAAS,CAACC,IAAI,EAAE;IAC3B,OAAO,IAAIC,8BAAc,CAAC;MACxBH,EAAE;MACFI,MAAM,EAAEJ,EAAE;MACVK,MAAM,EAAE,IAAI;MACZR,IAAI,EAAE,IAAAS,yBAAiB,EAACT,IAAI;KAC7B,CAAC;EACJ,CAAC,CAAC;AACJ;AAEA,MAAMU,eAAe,GAAaC,CAAkB,IAClDV,iBAAM,CAACW,OAAO,CACZC,gDAAuB,CACpBC,GAAG,EACLC,GAAG,IACFJ,CAAC,CAACK,IAAI,CACJf,iBAAM,CAACgB,QAAQ,CAAC,SAAS,EAAE;EAAEC,UAAU,EAAE,IAAAC,uCAAc,EAACJ,GAAG;AAAC,CAAE,CAAC;AAC/D;AACAd,iBAAM,CAACmB,WAAW,CAAC,SAAS,CAAC,CAC9B,CACJ;AAEH,MAAMC,eAAe,GAAGpB,iBAAM,CAACW,OAAO,CAACU,wCAAmB,EAAGC,CAAC,IAAKA,CAAC,CAACC,KAAK,CAAC,CAACR,IAAI,CAACS,gBAAK,CAACC,aAAa,CAAC;AAErG;AACA;AACA;AACA;AACA,MAAMC,yCAAyC,GAAIC,cAA8B,IAC/EH,gBAAK,CAACI,YAAY,CAChBR,eAAe;AACf;AACApB,iBAAM,CACHW,OAAO,CAACC,gDAAuB,EAAGU,CAAC,IAAKA,CAAC,CAACC,KAAK,CAACI,cAAc,CAAC,CAAC,CAChEZ,IAAI,CAACS,gBAAK,CAACC,aAAa,CAAC,CAC7B;AAEH,MAAMI,uBAAuB,GAAIF,cAAuC,IACtE,OAAOA,cAAc,KAAK,QAAQ,GAC9B,IAAAZ,eAAI,EACJjB,0BAA0B,CAAC6B,cAAc,CAAC,EAC1C3B,iBAAM,CAACW,OAAO,CAACe,yCAAyC,CAAC,EACzDF,gBAAK,CAACM,YAAY,CACnB,GACCJ,yCAAyC,CAACC,cAAc,CAAC;AAE/D;;;AAGM,SAAUI,mBAAmBA,CAAUC,IAAqB,EAAEL,cAAuC;EACzG,OAAOK,IAAI,CACRjB,IAAI,CACHN,eAAe,EACfT,iBAAM,CAACiC,OAAO,CAACJ,uBAAuB,CAACF,cAAc,CAAC,CAAC,CACxD;AACL;AAEA,MAAMO,wBAAwB,GAAIxB,CAAyC,IACzEV,iBAAM,CAACW,OAAO,CAACC,gDAAuB,EAAGuB,GAAG,IAAKA,GAAG,CAACC,MAAM,CAAC1B,CAAC,CAAC,CAAC,CAACK,IAAI,CAACS,gBAAK,CAACC,aAAa,CAAC;AAE3F;;;AAGM,SAAUY,oBAAoBA,CAAUL,IAAqB,EAAEtB,CAAyC;EAC5G,OAAOV,iBAAM,CAACiC,OAAO,CAACD,IAAI,EAAEE,wBAAwB,CAACxB,CAAC,CAAC,CAAC;AAC1D"}
|