@effect-app/infra 0.17.1 → 0.17.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 +6 -0
- package/_cjs/api/routing.cjs +70 -64
- package/_cjs/api/routing.cjs.map +1 -1
- package/_src/api/routing.ts +36 -29
- package/dist/api/routing.d.ts +4 -1
- package/dist/api/routing.d.ts.map +1 -1
- package/dist/api/routing.js +73 -71
- package/package.json +3 -3
package/CHANGELOG.md
CHANGED
package/_cjs/api/routing.cjs
CHANGED
|
@@ -3,6 +3,7 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
+
exports.RequestSettings = void 0;
|
|
6
7
|
exports.handle = handle;
|
|
7
8
|
exports.makeRequestHandler = makeRequestHandler;
|
|
8
9
|
exports.makeRequestParsers = makeRequestParsers;
|
|
@@ -11,15 +12,16 @@ exports.matchAll = matchAll;
|
|
|
11
12
|
exports.matchAllAlt = matchAllAlt;
|
|
12
13
|
exports.matchResource = matchResource;
|
|
13
14
|
exports.respondSuccess = respondSuccess;
|
|
14
|
-
var tsplus_module_1 = _interopRequireWildcard(require("@
|
|
15
|
-
var tsplus_module_2 = _interopRequireWildcard(require("@
|
|
16
|
-
var tsplus_module_3 = _interopRequireWildcard(require("@effect
|
|
17
|
-
var tsplus_module_4 = _interopRequireWildcard(require("@effect-app/
|
|
18
|
-
var tsplus_module_5 = _interopRequireWildcard(require("@effect-app/
|
|
19
|
-
var tsplus_module_6 = _interopRequireWildcard(require("@effect-app/
|
|
20
|
-
var tsplus_module_7 = _interopRequireWildcard(require("@effect-app/prelude/
|
|
21
|
-
var tsplus_module_8 = _interopRequireWildcard(require("@effect-app/
|
|
22
|
-
var tsplus_module_9 = _interopRequireWildcard(require("@effect-app/
|
|
15
|
+
var tsplus_module_1 = _interopRequireWildcard(require("@effect/io/FiberRef"));
|
|
16
|
+
var tsplus_module_2 = _interopRequireWildcard(require("@fp-ts/core/Option"));
|
|
17
|
+
var tsplus_module_3 = _interopRequireWildcard(require("@effect/io/Effect"));
|
|
18
|
+
var tsplus_module_4 = _interopRequireWildcard(require("@effect-app/core/Effect"));
|
|
19
|
+
var tsplus_module_5 = _interopRequireWildcard(require("@effect-app/prelude/_ext/Schema.ext"));
|
|
20
|
+
var tsplus_module_6 = _interopRequireWildcard(require("@effect-app/infra/RequestContext"));
|
|
21
|
+
var tsplus_module_7 = _interopRequireWildcard(require("@effect-app/prelude/utils"));
|
|
22
|
+
var tsplus_module_8 = _interopRequireWildcard(require("@effect-app/prelude/_ext/misc"));
|
|
23
|
+
var tsplus_module_9 = _interopRequireWildcard(require("@effect-app/core/Option"));
|
|
24
|
+
var tsplus_module_10 = _interopRequireWildcard(require("@effect-app/infra/api/setupRequest"));
|
|
23
25
|
var Ex = _interopRequireWildcard(require("@effect-app/infra-adapters/express"));
|
|
24
26
|
var MO = _interopRequireWildcard(require("@effect-app/prelude/schema"));
|
|
25
27
|
var _RequestContext2 = require("../RequestContext.cjs");
|
|
@@ -32,17 +34,21 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
|
|
|
32
34
|
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
33
35
|
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
34
36
|
|
|
37
|
+
const RequestSettings = tsplus_module_1.unsafeMake({
|
|
38
|
+
verbose: false
|
|
39
|
+
});
|
|
40
|
+
exports.RequestSettings = RequestSettings;
|
|
35
41
|
function makeRequestParsers(Request) {
|
|
36
|
-
const ph =
|
|
37
|
-
const parseHeaders = u =>
|
|
38
|
-
const pq =
|
|
39
|
-
const parseQuery = u =>
|
|
40
|
-
const pb =
|
|
41
|
-
const parseBody = u =>
|
|
42
|
-
const pp =
|
|
43
|
-
const parsePath = u =>
|
|
44
|
-
const pc =
|
|
45
|
-
const parseCookie = u =>
|
|
42
|
+
const ph = tsplus_module_3.sync(() => tsplus_module_2.map(MO.condemnFail)(tsplus_module_2.map(MO.Parser.for)(tsplus_module_2.map(s => s)(tsplus_module_2.fromNullable(Request.Headers)))));
|
|
43
|
+
const parseHeaders = u => tsplus_module_4.flatMapOption(ph, d => d(u));
|
|
44
|
+
const pq = tsplus_module_3.sync(() => tsplus_module_2.map(MO.condemnFail)(tsplus_module_2.map(MO.Parser.for)(tsplus_module_2.map(s => s)(tsplus_module_2.fromNullable(Request.Query)))));
|
|
45
|
+
const parseQuery = u => tsplus_module_4.flatMapOption(pq, d => d(u));
|
|
46
|
+
const pb = tsplus_module_3.sync(() => tsplus_module_2.map(MO.condemnFail)(tsplus_module_2.map(MO.Parser.for)(tsplus_module_2.map(s => s)(tsplus_module_2.fromNullable(Request.Body)))));
|
|
47
|
+
const parseBody = u => tsplus_module_4.flatMapOption(pb, d => d(u));
|
|
48
|
+
const pp = tsplus_module_3.sync(() => tsplus_module_2.map(MO.condemnFail)(tsplus_module_2.map(MO.Parser.for)(tsplus_module_2.map(s => s)(tsplus_module_2.fromNullable(Request.Path)))));
|
|
49
|
+
const parsePath = u => tsplus_module_4.flatMapOption(pp, d => d(u));
|
|
50
|
+
const pc = tsplus_module_3.sync(() => tsplus_module_2.map(MO.condemnFail)(tsplus_module_2.map(MO.Parser.for)(tsplus_module_2.map(s => s)(tsplus_module_2.fromNullable(Request.Cookie)))));
|
|
51
|
+
const parseCookie = u => tsplus_module_4.flatMapOption(pc, d => d(u));
|
|
46
52
|
return {
|
|
47
53
|
parseBody,
|
|
48
54
|
parseCookie,
|
|
@@ -61,10 +67,10 @@ function match(requestHandler, errorHandler, middleware) {
|
|
|
61
67
|
requestHandler = handler;
|
|
62
68
|
makeMiddlewareContext = makeContext;
|
|
63
69
|
}
|
|
64
|
-
return
|
|
70
|
+
return tsplus_module_3.zipRight(Ex.match(requestHandler.Request.method.toLowerCase())(requestHandler.Request.path.split("?")[0], makeRequestHandler(requestHandler, errorHandler, makeMiddlewareContext)), tsplus_module_3.sync(() => (0, _routing.makeRouteDescriptor)(requestHandler.Request.path, requestHandler.Request.method, requestHandler)));
|
|
65
71
|
}
|
|
66
72
|
function respondSuccess(encodeResponse) {
|
|
67
|
-
return (req, res, a) =>
|
|
73
|
+
return (req, res, a) => tsplus_module_3.flatMap(tsplus_module_3.sync(() => encodeResponse(req)(a)), r => tsplus_module_3.sync(() => {
|
|
68
74
|
r === undefined ? res.status(204).send() : res.status(200).send(JSON.stringify(r));
|
|
69
75
|
}));
|
|
70
76
|
}
|
|
@@ -82,18 +88,12 @@ function makeRequestHandler(handler, errorHandler, makeMiddlewareContext) {
|
|
|
82
88
|
const parseRequest = (0, _requestHandler.parseRequestParams)(requestParsers);
|
|
83
89
|
const respond = respondSuccess(encodeResponse);
|
|
84
90
|
function getParams(req) {
|
|
85
|
-
return
|
|
91
|
+
return tsplus_module_3.sync(() => ({
|
|
86
92
|
path: req.params,
|
|
87
93
|
query: req.query,
|
|
88
94
|
body: req.body,
|
|
89
|
-
headers: req.headers
|
|
90
|
-
|
|
91
|
-
return prev;
|
|
92
|
-
}, {}) : req.headers,
|
|
93
|
-
cookies: req.cookies ? Object.entries(req.cookies).reduce((prev, [key, value]) => {
|
|
94
|
-
prev[key] = typeof value === "string" || Array.isArray(value) ? (0, _util.snipValue)(value) : value;
|
|
95
|
-
return prev;
|
|
96
|
-
}, {}) : req.cookies
|
|
95
|
+
headers: req.headers,
|
|
96
|
+
cookies: req.cookies
|
|
97
97
|
}));
|
|
98
98
|
}
|
|
99
99
|
function makeContext(req) {
|
|
@@ -106,7 +106,7 @@ function makeRequestHandler(handler, errorHandler, makeMiddlewareContext) {
|
|
|
106
106
|
// throw new Error("AI Context missing")
|
|
107
107
|
// }
|
|
108
108
|
const requestId = req.headers["request-id"];
|
|
109
|
-
const rootId = requestId ?
|
|
109
|
+
const rootId = requestId ? tsplus_module_5.parseUnsafe(_RequestContext2.RequestId)(requestId) : _RequestContext2.RequestId.make();
|
|
110
110
|
const requestContext = new _RequestContext2.RequestContext({
|
|
111
111
|
rootId,
|
|
112
112
|
name: MO.ReasonableString(Request.Model instanceof MO.SchemaNamed ? Request.Model.name : Request.name),
|
|
@@ -126,8 +126,8 @@ function makeRequestHandler(handler, errorHandler, makeMiddlewareContext) {
|
|
|
126
126
|
return requestContext;
|
|
127
127
|
}
|
|
128
128
|
return (req, res) => {
|
|
129
|
-
return
|
|
130
|
-
requestContext:
|
|
129
|
+
return tsplus_module_3.flatMap(tsplus_module_3.struct({
|
|
130
|
+
requestContext: tsplus_module_3.sync(() => {
|
|
131
131
|
const requestContext = makeContext(req);
|
|
132
132
|
if (req.method === "GET") {
|
|
133
133
|
res.setHeader("Cache-Control", "no-store");
|
|
@@ -139,64 +139,70 @@ function makeRequestHandler(handler, errorHandler, makeMiddlewareContext) {
|
|
|
139
139
|
}), ({
|
|
140
140
|
pars,
|
|
141
141
|
requestContext
|
|
142
|
-
}) =>
|
|
142
|
+
}) => tsplus_module_10.setupRequest(tsplus_module_3.provideService(tsplus_module_3.tap(tsplus_module_3.tapErrorCause(tsplus_module_3.zipRight(tsplus_module_3.flatMap(tsplus_module_1.get(RequestSettings), s => tsplus_module_8.logAnnotates({
|
|
143
143
|
method: req.method,
|
|
144
144
|
path: req.originalUrl,
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
145
|
+
...(s.verbose ? {
|
|
146
|
+
reqPath: tsplus_module_7.RecordPretty(tsplus_module_7.object$(pars.path)),
|
|
147
|
+
reqQuery: tsplus_module_7.RecordPretty(tsplus_module_7.object$(pars.query)),
|
|
148
|
+
reqBody: (0, tsplus_module_7.pretty)(pars.body),
|
|
149
|
+
reqCookies: (0, tsplus_module_7.pretty)(pars.cookies),
|
|
150
|
+
reqHeaders: tsplus_module_7.RecordPretty(tsplus_module_7.object$(pars.headers))
|
|
151
|
+
} : undefined)
|
|
152
|
+
})(tsplus_module_3.logInfo("Processing request"))), tsplus_module_3.suspendSucceed(() => {
|
|
153
|
+
const handleRequest = tsplus_module_3.flatMap(tsplus_module_3.map(parseRequest(req), ({
|
|
152
154
|
body,
|
|
153
155
|
path,
|
|
154
156
|
query
|
|
155
157
|
}) => {
|
|
156
158
|
const hn = {
|
|
157
|
-
...
|
|
158
|
-
...
|
|
159
|
-
...
|
|
159
|
+
...tsplus_module_9.getOrUndefined(body),
|
|
160
|
+
...tsplus_module_9.getOrUndefined(query),
|
|
161
|
+
...tsplus_module_9.getOrUndefined(path)
|
|
160
162
|
};
|
|
161
163
|
return hn;
|
|
162
|
-
}), parsedReq =>
|
|
164
|
+
}), parsedReq => tsplus_module_3.flatMap(handle(parsedReq), r => respond(parsedReq, res, r)));
|
|
163
165
|
// Commands should not be interruptable.
|
|
164
|
-
const r = req.method !== "GET" ?
|
|
166
|
+
const r = req.method !== "GET" ? tsplus_module_3.uninterruptible(handleRequest) : handleRequest; // .instrument("Performance.RequestResponse")
|
|
165
167
|
// the first log entry should be of the request start.
|
|
166
|
-
const r2 = makeMiddlewareContext ?
|
|
168
|
+
const r2 = makeMiddlewareContext ? tsplus_module_4.provideSomeContextEffect(makeMiddlewareContext(req, res, requestContext))(r)
|
|
167
169
|
// PR is not relevant here
|
|
168
170
|
: r;
|
|
169
171
|
return errorHandler(req, res, requestContext, r2);
|
|
170
|
-
})), cause =>
|
|
172
|
+
})), cause => tsplus_module_3.tapErrorCause(tsplus_module_3.zipRight(tsplus_module_3.suspendSucceed(() => {
|
|
171
173
|
res.status(500).send();
|
|
172
174
|
return (0, _reportError.reportRequestError)(cause, {
|
|
173
175
|
requestContext,
|
|
174
176
|
path: req.originalUrl,
|
|
175
177
|
method: req.method
|
|
176
178
|
});
|
|
177
|
-
}),
|
|
179
|
+
}), tsplus_module_3.suspendSucceed(() => {
|
|
178
180
|
const headers = res.getHeaders();
|
|
179
|
-
return
|
|
181
|
+
return tsplus_module_8.logAnnotates({
|
|
180
182
|
method: req.method,
|
|
181
183
|
path: req.originalUrl,
|
|
182
184
|
statusCode: res.statusCode.toString(),
|
|
183
|
-
|
|
185
|
+
reqPath: tsplus_module_7.RecordPretty(tsplus_module_7.object$(pars.path)),
|
|
186
|
+
reqQuery: tsplus_module_7.RecordPretty(tsplus_module_7.object$(pars.query)),
|
|
187
|
+
reqBody: (0, tsplus_module_7.pretty)(pars.body),
|
|
188
|
+
reqCookies: (0, tsplus_module_7.pretty)(pars.cookies),
|
|
189
|
+
reqHeaders: tsplus_module_7.RecordPretty(tsplus_module_7.object$(pars.headers)),
|
|
190
|
+
resHeaders: tsplus_module_7.RecordPretty(tsplus_module_7.object$(Object.entries(headers).reduce((prev, [key, value]) => {
|
|
184
191
|
prev[key] = value && typeof value === "string" ? (0, _util.snipString)(value) : value;
|
|
185
192
|
return prev;
|
|
186
193
|
}, {})))
|
|
187
|
-
})(
|
|
188
|
-
})), cause =>
|
|
194
|
+
})(tsplus_module_3.logErrorCauseMessage("Processed request", cause));
|
|
195
|
+
})), cause => tsplus_module_3.sync(() => console.error("Error occurred while reporting error", cause)))), () => tsplus_module_3.map(tsplus_module_1.get(RequestSettings), s => {
|
|
189
196
|
const headers = res.getHeaders();
|
|
190
|
-
return
|
|
197
|
+
return tsplus_module_8.logAnnotates({
|
|
191
198
|
method: req.method,
|
|
192
199
|
path: req.originalUrl,
|
|
193
200
|
statusCode: res.statusCode.toString(),
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
})), tsplus_module_5.tag, requestContext) // otherwise external error reporter breaks.
|
|
201
|
+
...(s.verbose ? {
|
|
202
|
+
resHeaders: tsplus_module_7.RecordPretty(tsplus_module_7.object$(headers))
|
|
203
|
+
} : undefined)
|
|
204
|
+
})(tsplus_module_3.logInfo("Processed request"));
|
|
205
|
+
})), tsplus_module_6.tag, requestContext) // otherwise external error reporter breaks.
|
|
200
206
|
, requestContext));
|
|
201
207
|
};
|
|
202
208
|
}
|
|
@@ -205,7 +211,7 @@ function makeRequestHandler(handler, errorHandler, makeMiddlewareContext) {
|
|
|
205
211
|
* Requires no login.
|
|
206
212
|
*/
|
|
207
213
|
function matchAll(handlers) {
|
|
208
|
-
const mapped =
|
|
214
|
+
const mapped = tsplus_module_7.RecordKeys(tsplus_module_7.object$(handlers)).reduce((prev, cur) => {
|
|
209
215
|
prev[cur] = match(handlers[cur], _defaultErrorHandler.defaultBasicErrorHandler);
|
|
210
216
|
return prev;
|
|
211
217
|
}, {});
|
|
@@ -216,9 +222,9 @@ function matchAll(handlers) {
|
|
|
216
222
|
* Requires no login.
|
|
217
223
|
*/
|
|
218
224
|
function matchAllAlt(handlers) {
|
|
219
|
-
const mapped =
|
|
225
|
+
const mapped = tsplus_module_7.RecordKeys(tsplus_module_7.object$(handlers)).reduce((prev, cur) => {
|
|
220
226
|
const matches = matchAll(handlers[cur]);
|
|
221
|
-
|
|
227
|
+
tsplus_module_7.RecordKeys(tsplus_module_7.object$(matches)).forEach(key => prev[`${cur}.${key}`] = matches[key]);
|
|
222
228
|
return prev;
|
|
223
229
|
}, {});
|
|
224
230
|
return mapped;
|
|
@@ -252,7 +258,7 @@ function handle(_, adaptResponse) {
|
|
|
252
258
|
*/
|
|
253
259
|
function matchResource(mod) {
|
|
254
260
|
return handlers => {
|
|
255
|
-
const handler =
|
|
261
|
+
const handler = tsplus_module_7.RecordKeys(tsplus_module_7.object$(mod)).reduce((prev, cur) => {
|
|
256
262
|
prev[cur] = handle(mod[cur])(handlers[cur]);
|
|
257
263
|
return prev;
|
|
258
264
|
}, {});
|
package/_cjs/api/routing.cjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"routing.cjs","mappings":"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","names":["makeRequestParsers","Request","ph","tsplus_module_2","tsplus_module_1","MO","condemnFail","Parser","for","s","Headers","parseHeaders","u","tsplus_module_3","d","pq","Query","parseQuery","pb","Body","parseBody","pp","Path","parsePath","pc","Cookie","parseCookie","match","requestHandler","errorHandler","middleware","makeMiddlewareContext","undefined","handler","makeContext","method","toLowerCase","path","split","makeRequestHandler","respondSuccess","encodeResponse","req","res","a","r","status","send","JSON","stringify","Response","adaptResponse","h","handle","response","Void","encoder","Encoder","requestParsers","parseRequest","respond","getParams","params","query","body","headers","Object","entries","reduce","prev","key","value","cookies","Array","isArray","start","Date","supported","desiredLocale","locale","includes","requestId","rootId","tsplus_module_4","RequestId","make","requestContext","RequestContext","name","ReasonableString","Model","SchemaNamed","createdAt","setHeader","pars","tsplus_module_9","tsplus_module_7","originalUrl","reqPath","reqQuery","reqBody","reqCookies","reqHeaders","handleRequest","hn","parsedReq","r2","cause","getHeaders","statusCode","toString","resHeaders","console","error","matchAll","handlers","mapped","tsplus_module_6","cur","defaultBasicErrorHandler","matchAllAlt","matches","forEach","_","extractRequest","extractResponse","ResponseOpenApi","matchResource","mod"],"sourceRoot":"","sources":["../../_src/api/routing.ts"],"sourcesContent":[null]}
|
|
1
|
+
{"version":3,"file":"routing.cjs","mappings":"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","names":["RequestSettings","tsplus_module_1","verbose","makeRequestParsers","Request","ph","tsplus_module_3","tsplus_module_2","MO","condemnFail","Parser","for","s","Headers","parseHeaders","u","tsplus_module_4","d","pq","Query","parseQuery","pb","Body","parseBody","pp","Path","parsePath","pc","Cookie","parseCookie","match","requestHandler","errorHandler","middleware","makeMiddlewareContext","undefined","handler","makeContext","method","toLowerCase","path","split","makeRequestHandler","respondSuccess","encodeResponse","req","res","a","r","status","send","JSON","stringify","Response","adaptResponse","h","handle","response","Void","encoder","Encoder","requestParsers","parseRequest","respond","getParams","params","query","body","headers","cookies","start","Date","supported","desiredLocale","locale","includes","requestId","rootId","tsplus_module_5","RequestId","make","requestContext","RequestContext","name","ReasonableString","Model","SchemaNamed","createdAt","setHeader","pars","tsplus_module_10","tsplus_module_8","originalUrl","reqPath","reqQuery","reqBody","reqCookies","reqHeaders","handleRequest","hn","parsedReq","r2","cause","getHeaders","statusCode","toString","resHeaders","Object","entries","reduce","prev","key","value","console","error","matchAll","handlers","mapped","tsplus_module_7","cur","defaultBasicErrorHandler","matchAllAlt","matches","forEach","_","extractRequest","extractResponse","ResponseOpenApi","matchResource","mod"],"sourceRoot":"","sources":["../../_src/api/routing.ts"],"sourcesContent":[null]}
|
package/_src/api/routing.ts
CHANGED
|
@@ -15,7 +15,11 @@ import { parseRequestParams } from "./express/schema/requestHandler.js"
|
|
|
15
15
|
import type { RouteDescriptorAny } from "./express/schema/routing.js"
|
|
16
16
|
import { makeRouteDescriptor } from "./express/schema/routing.js"
|
|
17
17
|
import { reportRequestError } from "./reportError.js"
|
|
18
|
-
import { snipString
|
|
18
|
+
import { snipString } from "./util.js"
|
|
19
|
+
|
|
20
|
+
export const RequestSettings = FiberRef.unsafeMake({
|
|
21
|
+
verbose: false
|
|
22
|
+
})
|
|
19
23
|
|
|
20
24
|
export function makeRequestParsers<
|
|
21
25
|
R,
|
|
@@ -247,20 +251,8 @@ export function makeRequestHandler<
|
|
|
247
251
|
path: req.params,
|
|
248
252
|
query: req.query,
|
|
249
253
|
body: req.body,
|
|
250
|
-
headers: req.headers
|
|
251
|
-
? Object.entries(req.headers).reduce((prev, [key, value]) => {
|
|
252
|
-
prev[key] = snipValue(value)
|
|
253
|
-
return prev
|
|
254
|
-
}, {} as Record<string, any>)
|
|
255
|
-
: req.headers,
|
|
254
|
+
headers: req.headers,
|
|
256
255
|
cookies: req.cookies
|
|
257
|
-
? Object.entries(req.cookies).reduce((prev, [key, value]) => {
|
|
258
|
-
prev[key] = typeof value === "string" || Array.isArray(value)
|
|
259
|
-
? snipValue(value)
|
|
260
|
-
: value
|
|
261
|
-
return prev
|
|
262
|
-
}, {} as Record<string, any>)
|
|
263
|
-
: req.cookies
|
|
264
256
|
}))
|
|
265
257
|
}
|
|
266
258
|
|
|
@@ -314,15 +306,23 @@ export function makeRequestHandler<
|
|
|
314
306
|
pars: getParams(req)
|
|
315
307
|
})
|
|
316
308
|
.flatMap(({ pars, requestContext }) =>
|
|
317
|
-
|
|
318
|
-
|
|
319
|
-
|
|
320
|
-
|
|
321
|
-
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
|
|
325
|
-
|
|
309
|
+
RequestSettings.get.flatMap(s =>
|
|
310
|
+
Effect.logInfo("Processing request").apply(
|
|
311
|
+
Effect.logAnnotates({
|
|
312
|
+
method: req.method,
|
|
313
|
+
path: req.originalUrl,
|
|
314
|
+
...s.verbose
|
|
315
|
+
? {
|
|
316
|
+
reqPath: pars.path.$$.pretty,
|
|
317
|
+
reqQuery: pars.query.$$.pretty,
|
|
318
|
+
reqBody: pretty(pars.body),
|
|
319
|
+
reqCookies: pretty(pars.cookies),
|
|
320
|
+
reqHeaders: pars.headers.$$.pretty
|
|
321
|
+
} :
|
|
322
|
+
undefined
|
|
323
|
+
})
|
|
324
|
+
)
|
|
325
|
+
).zipRight(
|
|
326
326
|
Effect.suspendSucceed(() => {
|
|
327
327
|
const handleRequest = parseRequest(req)
|
|
328
328
|
.map(({ body, path, query }) => {
|
|
@@ -370,6 +370,13 @@ export function makeRequestHandler<
|
|
|
370
370
|
method: req.method,
|
|
371
371
|
path: req.originalUrl,
|
|
372
372
|
statusCode: res.statusCode.toString(),
|
|
373
|
+
|
|
374
|
+
reqPath: pars.path.$$.pretty,
|
|
375
|
+
reqQuery: pars.query.$$.pretty,
|
|
376
|
+
reqBody: pretty(pars.body),
|
|
377
|
+
reqCookies: pretty(pars.cookies),
|
|
378
|
+
reqHeaders: pars.headers.$$.pretty,
|
|
379
|
+
|
|
373
380
|
resHeaders: Object.entries(headers).reduce((prev, [key, value]) => {
|
|
374
381
|
prev[key] = value && typeof value === "string" ? snipString(value) : value
|
|
375
382
|
return prev
|
|
@@ -381,17 +388,17 @@ export function makeRequestHandler<
|
|
|
381
388
|
.tapErrorCause(cause => Effect(() => console.error("Error occurred while reporting error", cause)))
|
|
382
389
|
)
|
|
383
390
|
.tap(() =>
|
|
384
|
-
|
|
391
|
+
RequestSettings.get.map(s => {
|
|
385
392
|
const headers = res.getHeaders()
|
|
386
393
|
return Effect.logInfo("Processed request").apply(Effect.logAnnotates({
|
|
387
394
|
method: req.method,
|
|
388
395
|
path: req.originalUrl,
|
|
389
396
|
statusCode: res.statusCode.toString(),
|
|
390
|
-
|
|
391
|
-
|
|
392
|
-
|
|
393
|
-
|
|
394
|
-
|
|
397
|
+
...s.verbose
|
|
398
|
+
? {
|
|
399
|
+
resHeaders: headers.$$.pretty
|
|
400
|
+
} :
|
|
401
|
+
undefined
|
|
395
402
|
}))
|
|
396
403
|
})
|
|
397
404
|
)
|
package/dist/api/routing.d.ts
CHANGED
|
@@ -11,6 +11,9 @@ import { RequestContext } from "../RequestContext.js";
|
|
|
11
11
|
import type { SupportedErrors } from "./defaultErrorHandler.js";
|
|
12
12
|
import type { Encode, RequestHandler, RequestHandlerOptRes, RequestParsers } from "./express/schema/requestHandler.js";
|
|
13
13
|
import type { RouteDescriptorAny } from "./express/schema/routing.js";
|
|
14
|
+
export declare const RequestSettings: import("@effect/io/FiberRef").FiberRef<{
|
|
15
|
+
verbose: boolean;
|
|
16
|
+
}>;
|
|
14
17
|
export declare function makeRequestParsers<R, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA extends PathA & QueryA & BodyA, ResA, Errors>(Request: RequestHandler<R, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA, ResA, Errors>["Request"]): RequestParsers<PathA, CookieA, QueryA, BodyA, HeaderA>;
|
|
15
18
|
export type MakeMiddlewareContext<ResE, R2 = never, PR = never> = (req: express.Request, res: express.Response, context: RequestContext) => Effect<R2, ResE, Context<PR>>;
|
|
16
19
|
export type Middleware<R, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA extends PathA & QueryA & BodyA, ResA, ResE, R2 = never, PR = never> = (handler: RequestHandler<R, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA, ResA, ResE>) => {
|
|
@@ -91,7 +94,7 @@ export interface ReqHandler<Req, R, E, Res, ReqSchema extends MO.SchemaAny, ResS
|
|
|
91
94
|
* })
|
|
92
95
|
* ```
|
|
93
96
|
*/
|
|
94
|
-
export declare function matchResource<TModules extends Record<string, Record<string, any>>>(mod: TModules): <THandlers extends { [K in keyof TModules]: (req: InstanceType<GetRequest<TModules[K]> extends infer T ? T extends GetRequest<TModules[K]> ? T extends new (...args: any[]) => any ? T : never : never : never>) => import("@effect/io/Effect").Effect<any, SupportedErrors, MO.ParsedShapeOf<Extr<GetResponse<TModules[K]>>>>; }>(handlers: THandlers) => { [K_1 in keyof TModules]: ReqHandler<InstanceType<GetRequest<TModules[K_1]> extends infer
|
|
97
|
+
export declare function matchResource<TModules extends Record<string, Record<string, any>>>(mod: TModules): <THandlers extends { [K in keyof TModules]: (req: InstanceType<GetRequest<TModules[K]> extends infer T ? T extends GetRequest<TModules[K]> ? T extends new (...args: any[]) => any ? T : never : never : never>) => import("@effect/io/Effect").Effect<any, SupportedErrors, MO.ParsedShapeOf<Extr<GetResponse<TModules[K]>>>>; }>(handlers: THandlers) => { [K_1 in keyof TModules]: ReqHandler<InstanceType<GetRequest<TModules[K_1]> extends infer T ? T extends GetRequest<TModules[K_1]> ? T extends new (...args: any[]) => any ? T : never : never : never>, _R<ReturnType<THandlers[K_1]>>, _E<ReturnType<THandlers[K_1]>>, MO.ParsedShapeOf<Extr<GetResponse<TModules[K_1]>>>, GetRequest<TModules[K_1]>, GetResponse<TModules[K_1]>, any>; };
|
|
95
98
|
export type ReqFromSchema<ReqSchema> = InstanceType<ReqSchema extends {
|
|
96
99
|
new (...args: any[]): any;
|
|
97
100
|
} ? ReqSchema : never>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"routing.d.ts","sourceRoot":"","sources":["../../_src/api/routing.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"routing.d.ts","sourceRoot":"","sources":["../../_src/api/routing.ts"],"names":[],"mappings":"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"}
|
package/dist/api/routing.js
CHANGED
|
@@ -1,12 +1,13 @@
|
|
|
1
|
-
import * as tsplus_module_1 from "@
|
|
2
|
-
import * as tsplus_module_2 from "@
|
|
3
|
-
import * as tsplus_module_3 from "@effect
|
|
4
|
-
import * as tsplus_module_4 from "@effect-app/
|
|
5
|
-
import * as tsplus_module_5 from "@effect-app/
|
|
6
|
-
import * as tsplus_module_6 from "@effect-app/
|
|
7
|
-
import * as tsplus_module_7 from "@effect-app/prelude/
|
|
8
|
-
import * as tsplus_module_8 from "@effect-app/
|
|
9
|
-
import * as tsplus_module_9 from "@effect-app/
|
|
1
|
+
import * as tsplus_module_1 from "@effect/io/FiberRef";
|
|
2
|
+
import * as tsplus_module_2 from "@fp-ts/core/Option";
|
|
3
|
+
import * as tsplus_module_3 from "@effect/io/Effect";
|
|
4
|
+
import * as tsplus_module_4 from "@effect-app/core/Effect";
|
|
5
|
+
import * as tsplus_module_5 from "@effect-app/prelude/_ext/Schema.ext";
|
|
6
|
+
import * as tsplus_module_6 from "@effect-app/infra/RequestContext";
|
|
7
|
+
import * as tsplus_module_7 from "@effect-app/prelude/utils";
|
|
8
|
+
import * as tsplus_module_8 from "@effect-app/prelude/_ext/misc";
|
|
9
|
+
import * as tsplus_module_9 from "@effect-app/core/Option";
|
|
10
|
+
import * as tsplus_module_10 from "@effect-app/infra/api/setupRequest";
|
|
10
11
|
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
11
12
|
import * as Ex from "@effect-app/infra-adapters/express";
|
|
12
13
|
import { extractSchema, SchemaNamed } from "@effect-app/prelude/schema";
|
|
@@ -17,18 +18,21 @@ import { defaultBasicErrorHandler } from "./defaultErrorHandler.js";
|
|
|
17
18
|
import { parseRequestParams } from "./express/schema/requestHandler.js";
|
|
18
19
|
import { makeRouteDescriptor } from "./express/schema/routing.js";
|
|
19
20
|
import { reportRequestError } from "./reportError.js";
|
|
20
|
-
import { snipString
|
|
21
|
+
import { snipString } from "./util.js";
|
|
22
|
+
export const RequestSettings = tsplus_module_1.unsafeMake({
|
|
23
|
+
verbose: false
|
|
24
|
+
});
|
|
21
25
|
export function makeRequestParsers(Request) {
|
|
22
|
-
const ph =
|
|
23
|
-
const parseHeaders = (u) =>
|
|
24
|
-
const pq =
|
|
25
|
-
const parseQuery = (u) =>
|
|
26
|
-
const pb =
|
|
27
|
-
const parseBody = (u) =>
|
|
28
|
-
const pp =
|
|
29
|
-
const parsePath = (u) =>
|
|
30
|
-
const pc =
|
|
31
|
-
const parseCookie = (u) =>
|
|
26
|
+
const ph = tsplus_module_3.sync(() => tsplus_module_2.map(MO.condemnFail)(tsplus_module_2.map(MO.Parser.for)(tsplus_module_2.map(s => s)(tsplus_module_2.fromNullable(Request.Headers)))));
|
|
27
|
+
const parseHeaders = (u) => tsplus_module_4.flatMapOption(ph, d => d(u));
|
|
28
|
+
const pq = tsplus_module_3.sync(() => tsplus_module_2.map(MO.condemnFail)(tsplus_module_2.map(MO.Parser.for)(tsplus_module_2.map(s => s)(tsplus_module_2.fromNullable(Request.Query)))));
|
|
29
|
+
const parseQuery = (u) => tsplus_module_4.flatMapOption(pq, d => d(u));
|
|
30
|
+
const pb = tsplus_module_3.sync(() => tsplus_module_2.map(MO.condemnFail)(tsplus_module_2.map(MO.Parser.for)(tsplus_module_2.map(s => s)(tsplus_module_2.fromNullable(Request.Body)))));
|
|
31
|
+
const parseBody = (u) => tsplus_module_4.flatMapOption(pb, d => d(u));
|
|
32
|
+
const pp = tsplus_module_3.sync(() => tsplus_module_2.map(MO.condemnFail)(tsplus_module_2.map(MO.Parser.for)(tsplus_module_2.map(s => s)(tsplus_module_2.fromNullable(Request.Path)))));
|
|
33
|
+
const parsePath = (u) => tsplus_module_4.flatMapOption(pp, d => d(u));
|
|
34
|
+
const pc = tsplus_module_3.sync(() => tsplus_module_2.map(MO.condemnFail)(tsplus_module_2.map(MO.Parser.for)(tsplus_module_2.map(s => s)(tsplus_module_2.fromNullable(Request.Cookie)))));
|
|
35
|
+
const parseCookie = (u) => tsplus_module_4.flatMapOption(pc, d => d(u));
|
|
32
36
|
return {
|
|
33
37
|
parseBody,
|
|
34
38
|
parseCookie,
|
|
@@ -44,10 +48,10 @@ export function match(requestHandler, errorHandler, middleware) {
|
|
|
44
48
|
requestHandler = handler;
|
|
45
49
|
makeMiddlewareContext = makeContext;
|
|
46
50
|
}
|
|
47
|
-
return
|
|
51
|
+
return tsplus_module_3.zipRight(Ex.match(requestHandler.Request.method.toLowerCase())(requestHandler.Request.path.split("?")[0], makeRequestHandler(requestHandler, errorHandler, makeMiddlewareContext)), tsplus_module_3.sync(() => makeRouteDescriptor(requestHandler.Request.path, requestHandler.Request.method, requestHandler)));
|
|
48
52
|
}
|
|
49
53
|
export function respondSuccess(encodeResponse) {
|
|
50
|
-
return (req, res, a) =>
|
|
54
|
+
return (req, res, a) => tsplus_module_3.flatMap(tsplus_module_3.sync(() => encodeResponse(req)(a)), r => tsplus_module_3.sync(() => {
|
|
51
55
|
r === undefined
|
|
52
56
|
? res.status(204).send()
|
|
53
57
|
: res.status(200)
|
|
@@ -65,24 +69,12 @@ export function makeRequestHandler(handler, errorHandler, makeMiddlewareContext)
|
|
|
65
69
|
const parseRequest = parseRequestParams(requestParsers);
|
|
66
70
|
const respond = respondSuccess(encodeResponse);
|
|
67
71
|
function getParams(req) {
|
|
68
|
-
return
|
|
72
|
+
return tsplus_module_3.sync(() => ({
|
|
69
73
|
path: req.params,
|
|
70
74
|
query: req.query,
|
|
71
75
|
body: req.body,
|
|
72
|
-
headers: req.headers
|
|
73
|
-
? Object.entries(req.headers).reduce((prev, [key, value]) => {
|
|
74
|
-
prev[key] = snipValue(value);
|
|
75
|
-
return prev;
|
|
76
|
-
}, {})
|
|
77
|
-
: req.headers,
|
|
76
|
+
headers: req.headers,
|
|
78
77
|
cookies: req.cookies
|
|
79
|
-
? Object.entries(req.cookies).reduce((prev, [key, value]) => {
|
|
80
|
-
prev[key] = typeof value === "string" || Array.isArray(value)
|
|
81
|
-
? snipValue(value)
|
|
82
|
-
: value;
|
|
83
|
-
return prev;
|
|
84
|
-
}, {})
|
|
85
|
-
: req.cookies
|
|
86
78
|
}));
|
|
87
79
|
}
|
|
88
80
|
function makeContext(req) {
|
|
@@ -97,7 +89,7 @@ export function makeRequestHandler(handler, errorHandler, makeMiddlewareContext)
|
|
|
97
89
|
// throw new Error("AI Context missing")
|
|
98
90
|
// }
|
|
99
91
|
const requestId = req.headers["request-id"];
|
|
100
|
-
const rootId = requestId ?
|
|
92
|
+
const rootId = requestId ? tsplus_module_5.parseUnsafe(RequestId)(requestId) : RequestId.make();
|
|
101
93
|
const requestContext = new RequestContext({
|
|
102
94
|
rootId,
|
|
103
95
|
name: MO.ReasonableString(Request.Model instanceof SchemaNamed ? Request.Model.name : Request.name),
|
|
@@ -117,8 +109,8 @@ export function makeRequestHandler(handler, errorHandler, makeMiddlewareContext)
|
|
|
117
109
|
return requestContext;
|
|
118
110
|
}
|
|
119
111
|
return (req, res) => {
|
|
120
|
-
return
|
|
121
|
-
requestContext:
|
|
112
|
+
return tsplus_module_3.flatMap(tsplus_module_3.struct({
|
|
113
|
+
requestContext: tsplus_module_3.sync(() => {
|
|
122
114
|
const requestContext = makeContext(req);
|
|
123
115
|
if (req.method === "GET") {
|
|
124
116
|
res.setHeader("Cache-Control", "no-store");
|
|
@@ -127,61 +119,71 @@ export function makeRequestHandler(handler, errorHandler, makeMiddlewareContext)
|
|
|
127
119
|
return requestContext;
|
|
128
120
|
}),
|
|
129
121
|
pars: getParams(req)
|
|
130
|
-
}), ({ pars, requestContext }) =>
|
|
122
|
+
}), ({ pars, requestContext }) => tsplus_module_10.setupRequest(tsplus_module_3.provideService(tsplus_module_3.tap(tsplus_module_3.tapErrorCause(tsplus_module_3.zipRight(tsplus_module_3.flatMap(tsplus_module_1.get(RequestSettings), s => tsplus_module_8.logAnnotates({
|
|
131
123
|
method: req.method,
|
|
132
124
|
path: req.originalUrl,
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
125
|
+
...s.verbose
|
|
126
|
+
? {
|
|
127
|
+
reqPath: tsplus_module_7.RecordPretty(tsplus_module_7.object$(pars.path)),
|
|
128
|
+
reqQuery: tsplus_module_7.RecordPretty(tsplus_module_7.object$(pars.query)),
|
|
129
|
+
reqBody: pretty(pars.body),
|
|
130
|
+
reqCookies: pretty(pars.cookies),
|
|
131
|
+
reqHeaders: tsplus_module_7.RecordPretty(tsplus_module_7.object$(pars.headers))
|
|
132
|
+
} :
|
|
133
|
+
undefined
|
|
134
|
+
})(tsplus_module_3.logInfo("Processing request"))), tsplus_module_3.suspendSucceed(() => {
|
|
135
|
+
const handleRequest = tsplus_module_3.flatMap(tsplus_module_3.map(parseRequest(req), ({ body, path, query }) => {
|
|
140
136
|
const hn = {
|
|
141
|
-
...
|
|
142
|
-
...
|
|
143
|
-
...
|
|
137
|
+
...tsplus_module_9.getOrUndefined(body),
|
|
138
|
+
...tsplus_module_9.getOrUndefined(query),
|
|
139
|
+
...tsplus_module_9.getOrUndefined(path)
|
|
144
140
|
};
|
|
145
141
|
return hn;
|
|
146
|
-
}), parsedReq =>
|
|
142
|
+
}), parsedReq => tsplus_module_3.flatMap(handle(parsedReq), r => respond(parsedReq, res, r)));
|
|
147
143
|
// Commands should not be interruptable.
|
|
148
|
-
const r = req.method !== "GET" ?
|
|
144
|
+
const r = req.method !== "GET" ? tsplus_module_3.uninterruptible(handleRequest) : handleRequest; // .instrument("Performance.RequestResponse")
|
|
149
145
|
// the first log entry should be of the request start.
|
|
150
146
|
const r2 = makeMiddlewareContext
|
|
151
|
-
?
|
|
147
|
+
? tsplus_module_4.provideSomeContextEffect(makeMiddlewareContext(req, res, requestContext))(r)
|
|
152
148
|
// PR is not relevant here
|
|
153
149
|
: r;
|
|
154
150
|
return errorHandler(req, res, requestContext, r2);
|
|
155
|
-
})), cause =>
|
|
151
|
+
})), cause => tsplus_module_3.tapErrorCause(tsplus_module_3.zipRight(tsplus_module_3.suspendSucceed(() => {
|
|
156
152
|
res.status(500).send();
|
|
157
153
|
return reportRequestError(cause, {
|
|
158
154
|
requestContext,
|
|
159
155
|
path: req.originalUrl,
|
|
160
156
|
method: req.method
|
|
161
157
|
});
|
|
162
|
-
}),
|
|
158
|
+
}), tsplus_module_3.suspendSucceed(() => {
|
|
163
159
|
const headers = res.getHeaders();
|
|
164
|
-
return
|
|
160
|
+
return tsplus_module_8.logAnnotates({
|
|
165
161
|
method: req.method,
|
|
166
162
|
path: req.originalUrl,
|
|
167
163
|
statusCode: res.statusCode.toString(),
|
|
168
|
-
|
|
164
|
+
reqPath: tsplus_module_7.RecordPretty(tsplus_module_7.object$(pars.path)),
|
|
165
|
+
reqQuery: tsplus_module_7.RecordPretty(tsplus_module_7.object$(pars.query)),
|
|
166
|
+
reqBody: pretty(pars.body),
|
|
167
|
+
reqCookies: pretty(pars.cookies),
|
|
168
|
+
reqHeaders: tsplus_module_7.RecordPretty(tsplus_module_7.object$(pars.headers)),
|
|
169
|
+
resHeaders: tsplus_module_7.RecordPretty(tsplus_module_7.object$(Object.entries(headers).reduce((prev, [key, value]) => {
|
|
169
170
|
prev[key] = value && typeof value === "string" ? snipString(value) : value;
|
|
170
171
|
return prev;
|
|
171
172
|
}, {})))
|
|
172
|
-
})(
|
|
173
|
-
})), cause =>
|
|
173
|
+
})(tsplus_module_3.logErrorCauseMessage("Processed request", cause));
|
|
174
|
+
})), cause => tsplus_module_3.sync(() => console.error("Error occurred while reporting error", cause)))), () => tsplus_module_3.map(tsplus_module_1.get(RequestSettings), s => {
|
|
174
175
|
const headers = res.getHeaders();
|
|
175
|
-
return
|
|
176
|
+
return tsplus_module_8.logAnnotates({
|
|
176
177
|
method: req.method,
|
|
177
178
|
path: req.originalUrl,
|
|
178
179
|
statusCode: res.statusCode.toString(),
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
180
|
+
...s.verbose
|
|
181
|
+
? {
|
|
182
|
+
resHeaders: tsplus_module_7.RecordPretty(tsplus_module_7.object$(headers))
|
|
183
|
+
} :
|
|
184
|
+
undefined
|
|
185
|
+
})(tsplus_module_3.logInfo("Processed request"));
|
|
186
|
+
})), tsplus_module_6.tag, requestContext) // otherwise external error reporter breaks.
|
|
185
187
|
, requestContext));
|
|
186
188
|
};
|
|
187
189
|
}
|
|
@@ -190,7 +192,7 @@ export function makeRequestHandler(handler, errorHandler, makeMiddlewareContext)
|
|
|
190
192
|
* Requires no login.
|
|
191
193
|
*/
|
|
192
194
|
export function matchAll(handlers) {
|
|
193
|
-
const mapped =
|
|
195
|
+
const mapped = tsplus_module_7.RecordKeys(tsplus_module_7.object$(handlers)).reduce((prev, cur) => {
|
|
194
196
|
prev[cur] = match(handlers[cur], defaultBasicErrorHandler);
|
|
195
197
|
return prev;
|
|
196
198
|
}, {});
|
|
@@ -201,9 +203,9 @@ export function matchAll(handlers) {
|
|
|
201
203
|
* Requires no login.
|
|
202
204
|
*/
|
|
203
205
|
export function matchAllAlt(handlers) {
|
|
204
|
-
const mapped =
|
|
206
|
+
const mapped = tsplus_module_7.RecordKeys(tsplus_module_7.object$(handlers)).reduce((prev, cur) => {
|
|
205
207
|
const matches = matchAll(handlers[cur]);
|
|
206
|
-
|
|
208
|
+
tsplus_module_7.RecordKeys(tsplus_module_7.object$(matches)).forEach(key => prev[`${cur}.${key}`] = matches[key]);
|
|
207
209
|
return prev;
|
|
208
210
|
}, {});
|
|
209
211
|
return mapped;
|
|
@@ -237,11 +239,11 @@ export function handle(_, adaptResponse) {
|
|
|
237
239
|
*/
|
|
238
240
|
export function matchResource(mod) {
|
|
239
241
|
return (handlers) => {
|
|
240
|
-
const handler =
|
|
242
|
+
const handler = tsplus_module_7.RecordKeys(tsplus_module_7.object$(mod)).reduce((prev, cur) => {
|
|
241
243
|
prev[cur] = handle(mod[cur])(handlers[cur]);
|
|
242
244
|
return prev;
|
|
243
245
|
}, {});
|
|
244
246
|
return handler;
|
|
245
247
|
};
|
|
246
248
|
}
|
|
247
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"routing.js","sourceRoot":"","sources":["../../_src/api/routing.ts"],"names":[],"mappings":"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"}
|
|
249
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"routing.js","sourceRoot":"","sources":["../../_src/api/routing.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@effect-app/infra",
|
|
3
|
-
"version": "0.17.
|
|
3
|
+
"version": "0.17.2",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"dependencies": {
|
|
@@ -21,9 +21,9 @@
|
|
|
21
21
|
"pure-rand": "^6.0.0",
|
|
22
22
|
"redlock": "^4.2.0",
|
|
23
23
|
"@effect-app/prelude": "0.16.0",
|
|
24
|
+
"@effect-app/infra-adapters": "0.14.0",
|
|
24
25
|
"@effect-app/core": "0.16.0",
|
|
25
|
-
"@effect-app/schema": "0.14.0"
|
|
26
|
-
"@effect-app/infra-adapters": "0.14.0"
|
|
26
|
+
"@effect-app/schema": "0.14.0"
|
|
27
27
|
},
|
|
28
28
|
"devDependencies": {
|
|
29
29
|
"@babel/cli": "^7.20.7",
|