@effect-app/infra 0.18.1 → 0.18.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 CHANGED
@@ -1,5 +1,13 @@
1
1
  # @effect-app/infra
2
2
 
3
+ ## 0.18.2
4
+
5
+ ### Patch Changes
6
+
7
+ - Untrace routing and express
8
+ - Updated dependencies
9
+ - @effect-app/infra-adapters@0.15.2
10
+
3
11
  ## 0.18.1
4
12
 
5
13
  ### Patch Changes
@@ -8,21 +8,22 @@ exports.defaultErrorHandler = defaultErrorHandler;
8
8
  var tsplus_module_1 = _interopRequireWildcard(require("@effect/io/Effect"));
9
9
  var tsplus_module_2 = _interopRequireWildcard(require("@effect/io/Cause"));
10
10
  var tsplus_module_3 = _interopRequireWildcard(require("@effect-app/core/Effect"));
11
- var tsplus_module_4 = _interopRequireWildcard(require("@effect/io/Schedule"));
11
+ var tsplus_module_4 = _interopRequireWildcard(require("@effect/io/Debug"));
12
+ var tsplus_module_5 = _interopRequireWildcard(require("@effect/io/Schedule"));
12
13
  var _reportError = require("./reportError.cjs");
13
14
  function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
14
15
  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; }
15
16
  function defaultBasicErrorHandler(_req, res, _requestContext, r2) {
16
- return tsplus_module_1.catchAll(tsplus_module_1.catchTag(tsplus_module_1.tapErrorCause(r2, cause => tsplus_module_2.isFailure(cause) ? (0, _reportError.logRequestError)(cause) : tsplus_module_3.unit), "ValidationError", err => tsplus_module_1.sync(() => {
17
+ return tsplus_module_4.untraced(() => tsplus_module_1.catchAll(tsplus_module_1.catchTag(tsplus_module_1.tapErrorCause(r2, cause => tsplus_module_2.isFailure(cause) ? (0, _reportError.logRequestError)(cause) : tsplus_module_3.unit), "ValidationError", err => tsplus_module_1.sync(() => {
17
18
  res.status(400).send(err.errors);
18
19
  }))
19
20
  // final catch all; expecting never so that unhandled known errors will show up
20
- , err => tsplus_module_1.flatMap(tsplus_module_1.map(tsplus_module_1.logError("Program error, compiler probably silenced, got an unsupported Error in Error Channel of Effect" + err), () => err), tsplus_module_1.die));
21
+ , err => tsplus_module_1.flatMap(tsplus_module_1.map(tsplus_module_1.logError("Program error, compiler probably silenced, got an unsupported Error in Error Channel of Effect" + err), () => err), tsplus_module_1.die)));
21
22
  }
22
- const optimisticConcurrencySchedule = tsplus_module_4.intersect(tsplus_module_4.recurWhile(a => a._tag === "OptimisticConcurrencyException"))(tsplus_module_4.once());
23
+ const optimisticConcurrencySchedule = tsplus_module_5.intersect(tsplus_module_5.recurWhile(a => a._tag === "OptimisticConcurrencyException"))(tsplus_module_5.once());
23
24
  function defaultErrorHandler(req, res, _, r2) {
24
25
  const r3 = req.method === "PATCH" ? tsplus_module_1.retry(r2, optimisticConcurrencySchedule) : r2;
25
- return tsplus_module_1.catchAll(tsplus_module_1.catchTag(tsplus_module_1.catchTag(tsplus_module_1.catchTag(tsplus_module_1.catchTag(tsplus_module_1.catchTag(tsplus_module_1.catchTag(tsplus_module_1.tapErrorCause(r3, cause => tsplus_module_2.isFailure(cause) ? (0, _reportError.logRequestError)(cause) : tsplus_module_3.unit), "ValidationError", err => tsplus_module_1.sync(() => {
26
+ return tsplus_module_4.untraced(() => tsplus_module_1.catchAll(tsplus_module_1.catchTag(tsplus_module_1.catchTag(tsplus_module_1.catchTag(tsplus_module_1.catchTag(tsplus_module_1.catchTag(tsplus_module_1.catchTag(tsplus_module_1.tapErrorCause(r3, cause => tsplus_module_2.isFailure(cause) ? (0, _reportError.logRequestError)(cause) : tsplus_module_3.unit), "ValidationError", err => tsplus_module_1.sync(() => {
26
27
  res.status(400).send(err.errors);
27
28
  })), "NotFoundError", err => tsplus_module_1.sync(() => {
28
29
  res.status(404).send(err);
@@ -37,6 +38,6 @@ function defaultErrorHandler(req, res, _, r2) {
37
38
  res.status(412).send(err);
38
39
  }))
39
40
  // final catch all; expecting never so that unhandled known errors will show up
40
- , err => tsplus_module_1.flatMap(tsplus_module_1.map(tsplus_module_1.logError("Program error, compiler probably silenced, got an unsupported Error in Error Channel of Effect" + err), () => err), tsplus_module_1.die));
41
+ , err => tsplus_module_1.flatMap(tsplus_module_1.map(tsplus_module_1.logError("Program error, compiler probably silenced, got an unsupported Error in Error Channel of Effect" + err), () => err), tsplus_module_1.die)));
41
42
  }
42
43
  //# sourceMappingURL=defaultErrorHandler.cjs.map
@@ -1 +1 @@
1
- {"version":3,"file":"defaultErrorHandler.cjs","mappings":";;;;;;;;;;;AAUA;AAAkD;AAAA;AAE5C,SAAUA,wBAAwB,CACtCC,IAAqB,EACrBC,GAAqB,EACrBC,eAA+B,EAC/BC,EAAoC;EAEpC,OAAOC,kFAAE,EACQC,KAAK,IAAIC,+BAAK,CAAY,GAAG,gCAAe,EAACD,KAAK,CAAC,GAAEE,oBAAY,CAAC,EACvE,iBAAiB,EAAEC,GAAG,IAC9BJ,qBAAO,MAAK;IACVH,GAAG,CAACQ,MAAM,CAAC,GAAG,CAAC,CAACC,IAAI,CAACF,GAAG,CAACG,MAAM,CAAC;EAClC,CAAC,CAAC;EACJ;EAAA,EACWH,GAAU,IACnBJ,qEACE,gGAAgG,GAAGI,GAAG,CACvG,EACM,MAAMA,GAAc,CAAC,sBACN,CACvB;AACL;AAEA,MAAMI,6BAA6B,6BACjCC,2BAAqCC,CAAC,IAAIA,CAAC,CAACC,IAAI,KAAK,gCAAgC,CAAC,EADlDF,sBAAe,CACmC;AAElF,SAAUG,mBAAmB,CACjCC,GAAoB,EACpBhB,GAAqB,EACrBiB,CAAiB,EACjBf,EAAoC;EAEpC,MAAMgB,EAAE,GAAGF,GAAG,CAACG,MAAM,KAAK,OAAO,GAC7BhB,wBAAE,EAAOQ,6BAA6B,CAAC,GACvCT,EAAE;EACN,OAAOC,+MAAE,EACQC,KAAK,IAAIC,+BAAK,CAAY,GAAG,gCAAe,EAACD,KAAK,CAAC,GAAEE,oBAAY,CAAC,EACvE,iBAAiB,EAAEC,GAAG,IAC9BJ,qBAAO,MAAK;IACVH,GAAG,CAACQ,MAAM,CAAC,GAAG,CAAC,CAACC,IAAI,CAACF,GAAG,CAACG,MAAM,CAAC;EAClC,CAAC,CAAC,CAAC,EACK,eAAe,EAAEH,GAAG,IAC5BJ,qBAAO,MAAK;IACVH,GAAG,CAACQ,MAAM,CAAC,GAAG,CAAC,CAACC,IAAI,CAACF,GAAG,CAAC;EAC3B,CAAC,CAAC,CAAC,EACK,kBAAkB,EAAEA,GAAG,IAC/BJ,qBAAO,MAAK;IACVH,GAAG,CAACQ,MAAM,CAAC,GAAG,CAAC,CAACC,IAAI,CAACF,GAAG,CAAC;EAC3B,CAAC,CAAC,CAAC,EACK,mBAAmB,EAAEA,GAAG,IAChCJ,qBAAO,MAAK;IACVH,GAAG,CAACQ,MAAM,CAAC,GAAG,CAAC,CAACC,IAAI,CAACF,GAAG,CAAC;EAC3B,CAAC,CAAC,CAAC,EACK,mBAAmB,EAAEA,GAAG,IAChCJ,qBAAO,MAAK;IACVH,GAAG,CAACQ,MAAM,CAAC,GAAG,CAAC,CAACC,IAAI,CAACF,GAAG,CAAC;EAC3B,CAAC,CAAC,CAAC,EACK,gCAAgC,EAAEA,GAAG,IAC7CJ,qBAAO,MAAK;IACV;IACAH,GAAG,CAACQ,MAAM,CAAC,GAAG,CAAC,CAACC,IAAI,CAACF,GAAG,CAAC;EAC3B,CAAC,CAAC;EACJ;EAAA,EACWA,GAAU,IACnBJ,qEACE,gGAAgG,GAAGI,GAAG,CACvG,EACM,MAAMA,GAAc,CAAC,sBACN,CACvB;AACL","names":["defaultBasicErrorHandler","_req","res","_requestContext","r2","tsplus_module_1","cause","tsplus_module_2","tsplus_module_3","err","status","send","errors","optimisticConcurrencySchedule","tsplus_module_4","a","_tag","defaultErrorHandler","req","_","r3","method"],"sourceRoot":"","sources":["../../_src/api/defaultErrorHandler.ts"],"sourcesContent":[null]}
1
+ {"version":3,"file":"defaultErrorHandler.cjs","mappings":";;;;;;;;;;;;AAUA;AAAkD;AAAA;AAE5C,SAAUA,wBAAwB,CACtCC,IAAqB,EACrBC,GAAqB,EACrBC,eAA+B,EAC/BC,EAAoC;EAEpC,OAAOC,yBAAe,MACpBC,kFAAE,EACeC,KAAK,IAAIC,+BAAK,CAAY,GAAG,gCAAe,EAACD,KAAK,CAAC,GAAEE,oBAAY,CAAC,EACvE,iBAAiB,EAAEC,GAAG,IAC9BJ,qBAAO,MAAK;IACVJ,GAAG,CAACS,MAAM,CAAC,GAAG,CAAC,CAACC,IAAI,CAACF,GAAG,CAACG,MAAM,CAAC;EAClC,CAAC,CAAC;EACJ;EAAA,EACWH,GAAU,IACnBJ,qEACE,gGAAgG,GAAGI,GAAG,CACvG,EACM,MAAMA,GAAc,CAAC,sBACN,CACvB,CACJ;AACH;AAEA,MAAMI,6BAA6B,6BACjCC,2BAAqCC,CAAC,IAAIA,CAAC,CAACC,IAAI,KAAK,gCAAgC,CAAC,EADlDF,sBAAe,CACmC;AAElF,SAAUG,mBAAmB,CACjCC,GAAoB,EACpBjB,GAAqB,EACrBkB,CAAiB,EACjBhB,EAAoC;EAEpC,MAAMiB,EAAE,GAAGF,GAAG,CAACG,MAAM,KAAK,OAAO,GAC7BhB,wBAAE,EAAOQ,6BAA6B,CAAC,GACvCV,EAAE;EACN,OAAOC,yBAAe,MACpBC,+MAAE,EACeC,KAAK,IAAIC,+BAAK,CAAY,GAAG,gCAAe,EAACD,KAAK,CAAC,GAAEE,oBAAY,CAAC,EACvE,iBAAiB,EAAEC,GAAG,IAC9BJ,qBAAO,MAAK;IACVJ,GAAG,CAACS,MAAM,CAAC,GAAG,CAAC,CAACC,IAAI,CAACF,GAAG,CAACG,MAAM,CAAC;EAClC,CAAC,CAAC,CAAC,EACK,eAAe,EAAEH,GAAG,IAC5BJ,qBAAO,MAAK;IACVJ,GAAG,CAACS,MAAM,CAAC,GAAG,CAAC,CAACC,IAAI,CAACF,GAAG,CAAC;EAC3B,CAAC,CAAC,CAAC,EACK,kBAAkB,EAAEA,GAAG,IAC/BJ,qBAAO,MAAK;IACVJ,GAAG,CAACS,MAAM,CAAC,GAAG,CAAC,CAACC,IAAI,CAACF,GAAG,CAAC;EAC3B,CAAC,CAAC,CAAC,EACK,mBAAmB,EAAEA,GAAG,IAChCJ,qBAAO,MAAK;IACVJ,GAAG,CAACS,MAAM,CAAC,GAAG,CAAC,CAACC,IAAI,CAACF,GAAG,CAAC;EAC3B,CAAC,CAAC,CAAC,EACK,mBAAmB,EAAEA,GAAG,IAChCJ,qBAAO,MAAK;IACVJ,GAAG,CAACS,MAAM,CAAC,GAAG,CAAC,CAACC,IAAI,CAACF,GAAG,CAAC;EAC3B,CAAC,CAAC,CAAC,EACK,gCAAgC,EAAEA,GAAG,IAC7CJ,qBAAO,MAAK;IACV;IACAJ,GAAG,CAACS,MAAM,CAAC,GAAG,CAAC,CAACC,IAAI,CAACF,GAAG,CAAC;EAC3B,CAAC,CAAC;EACJ;EAAA,EACWA,GAAU,IACnBJ,qEACE,gGAAgG,GAAGI,GAAG,CACvG,EACM,MAAMA,GAAc,CAAC,sBACN,CACvB,CACJ;AACH","names":["defaultBasicErrorHandler","_req","res","_requestContext","r2","tsplus_module_4","tsplus_module_1","cause","tsplus_module_2","tsplus_module_3","err","status","send","errors","optimisticConcurrencySchedule","tsplus_module_5","a","_tag","defaultErrorHandler","req","_","r3","method"],"sourceRoot":"","sources":["../../_src/api/defaultErrorHandler.ts"],"sourcesContent":[null]}
@@ -22,6 +22,7 @@ var tsplus_module_7 = _interopRequireWildcard(require("@effect-app/prelude/utils
22
22
  var tsplus_module_8 = _interopRequireWildcard(require("@effect-app/prelude/_ext/misc"));
23
23
  var tsplus_module_9 = _interopRequireWildcard(require("@effect-app/core/Option"));
24
24
  var tsplus_module_10 = _interopRequireWildcard(require("@effect-app/infra/api/setupRequest"));
25
+ var tsplus_module_11 = _interopRequireWildcard(require("@effect/io/Debug"));
25
26
  var Ex = _interopRequireWildcard(require("@effect-app/infra-adapters/express"));
26
27
  var MO = _interopRequireWildcard(require("@effect-app/prelude/schema"));
27
28
  var _RequestContext2 = require("../RequestContext.cjs");
@@ -126,7 +127,7 @@ function makeRequestHandler(handler, errorHandler, makeMiddlewareContext) {
126
127
  return requestContext;
127
128
  }
128
129
  return (req, res) => {
129
- return tsplus_module_3.flatMap(tsplus_module_3.struct({
130
+ return tsplus_module_11.untraced(() => tsplus_module_3.flatMap(tsplus_module_3.struct({
130
131
  requestContext: tsplus_module_3.sync(() => {
131
132
  const requestContext = makeContext(req);
132
133
  if (req.method === "GET") {
@@ -200,7 +201,7 @@ function makeRequestHandler(handler, errorHandler, makeMiddlewareContext) {
200
201
  } : undefined)
201
202
  })(tsplus_module_3.logInfo("Finished request"));
202
203
  })), tsplus_module_6.tag, requestContext) // otherwise external error reporter breaks.
203
- , requestContext));
204
+ , requestContext)));
204
205
  };
205
206
  }
206
207
  /**
@@ -1 +1 @@
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]}
1
+ {"version":3,"file":"routing.cjs","mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AACA;AAGA;AAKA;AAEA;AAEA;AAEA;AACA;AACA;AAAsC;AAAA;AAjBtC;;AAmBO,MAAMA,eAAe,GAAGC,2BAAoB;EACjDC,OAAO,EAAE;CACV,CAAC;AAAA;AAEI,SAAUC,kBAAkB,CAWhCC,OAUY;EAEZ,MAAMC,EAAE,GAAGC,2BACTC,oBAGOC,EAAE,CAACC,WAAW,EAHrBF,oBAEOC,EA5CG,CA4CHE,MAAM,CAACC,GAAG,EAFjBJ,oBACOK,CAAC,IAAIA,CAAC,EADbL,6BAAoBH,OAAO,CAACS,OAAO,CAAC,CACtB,CACI,CACI,CACvB;EACD,MAAMC,YAAY,GAAIC,CAAU,IAAKC,gCAAE,EAAYC,CAAC,IAAIA,CAAC,CAACF,CAAC,CAAC,CAAC;EAE7D,MAAMG,EAAE,GAAGZ,2BACTC,oBAGOC,EAAE,CAACC,WAAW,EAHrBF,oBAEOC,EApDG,CAoDHE,MAAM,CAACC,GAAG,EAFjBJ,oBACOK,CAAC,IAAIA,CAAC,EADbL,6BAAoBH,OAAO,CAACe,KAAK,CAAC,CACpB,CACI,CACI,CACvB;EACD,MAAMC,UAAU,GAAIL,CAAU,IAAKC,gCAAE,EAAYC,CAAC,IAAIA,CAAC,CAACF,CAAC,CAAC,CAAC;EAE3D,MAAMM,EAAE,GAAGf,2BACTC,oBAGOC,EAAE,CAACC,WAAW,EAHrBF,oBAEOC,EA5DG,CA4DHE,MAAM,CAACC,GAAG,EAFjBJ,oBACOK,CAAC,IAAIA,CAAC,EADbL,6BAAoBH,OAAO,CAACkB,IAAI,CAAC,CACnB,CACI,CACI,CACvB;EACD,MAAMC,SAAS,GAAIR,CAAU,IAAKC,gCAAE,EAAYC,CAAC,IAAIA,CAAC,CAACF,CAAC,CAAC,CAAC;EAE1D,MAAMS,EAAE,GAAGlB,2BACTC,oBAGOC,EAAE,CAACC,WAAW,EAHrBF,oBAEOC,EApEG,CAoEHE,MAAM,CAACC,GAAG,EAFjBJ,oBACOK,CAAC,IAAIA,CAAC,EADbL,6BAAoBH,OAAO,CAACqB,IAAI,CAAC,CACnB,CACI,CACI,CACvB;EACD,MAAMC,SAAS,GAAIX,CAAU,IAAKC,gCAAE,EAAYC,CAAC,IAAIA,CAAC,CAACF,CAAC,CAAC,CAAC;EAE1D,MAAMY,EAAE,GAAGrB,2BACTC,oBAGOC,EAAE,CAACC,WAAW,EAHrBF,oBAEOC,EA5EG,CA4EHE,MAAM,CAACC,GAAG,EAFjBJ,oBACOK,CAAC,IAAIA,CAAC,EADbL,6BAAoBH,OAAO,CAACwB,MAAM,CAAC,CACrB,CACI,CACI,CACvB;EACD,MAAMC,WAAW,GAAId,CAAU,IAAKC,gCAAE,EAAYC,CAAC,IAAIA,CAAC,CAACF,CAAC,CAAC,CAAC;EAE5D,OAAO;IACLQ,SAAS;IACTM,WAAW;IACXf,YAAY;IACZY,SAAS;IACTN;GACD;AACH;AA2BM,SAAUU,KAAK,CAcnBC,cAUC,EACDC,YAK8B,EAC9BC,UAYC;EAED,IAAIC,qBAAqB,GAAGC,SAAS;EACrC,IAAIF,UAAU,EAAE;IACd,MAAM;MAAEG,OAAO;MAAEC;IAAW,CAAE,GAAGJ,UAAU,CAACF,cAAc,CAAC;IAC3DA,cAAc,GAAGK,OAAO;IACxBF,qBAAqB,GAAGG,WAAW;;EAErC,OAAO/B,2BAAE,CAACwB,KAAK,CAACC,cAAc,CAAC3B,OAAO,CAACkC,MAAM,CAACC,WAAW,EAAS,CAAC,CACjER,cAAc,CAAC3B,OAAO,CAACoC,IAAI,CAACC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EACzCC,kBAAkB,CAChBX,cAAc,EACdC,YAAY,EACZE,qBAAqB,CACtB,CACF,EACC5B,qBAAO,MACL,gCAAmB,EACjByB,cAAc,CAAC3B,OAAO,CAACoC,IAAI,EAC3BT,cAAc,CAAC3B,OAAO,CAACkC,MAAM,EAC7BP,cAAc,CACf,CACF,CACF;AACH;AAEM,SAAUY,cAAc,CAC5BC,cAA2C;EAE3C,OAAO,CAACC,GAAS,EAAEC,GAAqB,EAAEC,CAAI,KAC5CzC,6CAAO,MAAMsC,cAAc,CAACC,GAAG,CAAC,CAACE,CAAC,CAAC,CAAC,EACzBC,CAAC,IACR1C,qBAAO,MAAK;IACV0C,CAAC,KAAKb,SAAS,GACXW,GAAG,CAACG,MAAM,CAAC,GAAG,CAAC,CAACC,IAAI,EAAE,GACtBJ,GAAG,CAACG,MAAM,CAAC,GAAG,CAAC,CACdC,IAAI,CAACC,IAAI,CAACC,SAAS,CAACJ,CAAC,CAAC,CAAC;EAC9B,CAAC,CAAC,CACH;AACP;AAEM,SAAUN,kBAAkB,CAchCN,OAUC,EACDJ,YAKkC,EAClCE,qBAAwD;EAExD,MAAM;IAAE9B,OAAO;IAAEiD,QAAQ;IAAEC,aAAa;IAAEC,CAAC,EAAEC;EAAM,CAAE,GAAGpB,OAAO;EAC/D,MAAMqB,QAAQ,GAAGJ,QAAQ,GAAG,oBAAa,EAACA,QAAe,CAAC,GAzOhD7C,EAAE,CAyOiDkD,IAAI;EACjE,MAAMC,OAAO,GAAGnD,EA1OJ,CA0OIoD,OAAO,CAACjD,GAAG,CAAC8C,QAAQ,CAAC;EACrC,MAAMb,cAAc,GAAGU,aAAa,GAC/BT,GAAS,IAAKrC,EA5OP,CA4OOoD,OAAO,CAACjD,GAAG,CAAC2C,aAAa,CAACT,GAAG,CAAC,CAAC,GAC9C,MAAMc,OAAO;EAEjB,MAAME,cAAc,GAAG1D,kBAAkB,CAACC,OAAO,CAAC;EAClD,MAAM0D,YAAY,GAAG,sCAAkB,EAACD,cAAc,CAAC;EACvD,MAAME,OAAO,GAAGpB,cAAc,CAACC,cAAc,CAAC;EAE9C,SAASoB,SAAS,CAACnB,GAAoB;IACrC,OAAOvC,qBAAO,OAAO;MACnBkC,IAAI,EAAEK,GAAG,CAACoB,MAAM;MAChBC,KAAK,EAAErB,GAAG,CAACqB,KAAK;MAChBC,IAAI,EAAEtB,GAAG,CAACsB,IAAI;MACdC,OAAO,EAAEvB,GAAG,CAACuB,OAAO;MACpBC,OAAO,EAAExB,GAAG,CAACwB;KACd,CAAC,CAAC;EACL;EAEA,SAAShC,WAAW,CAACQ,GAAoB;IACvC,MAAMyB,KAAK,GAAG,IAAIC,IAAI,EAAE;IACxB,MAAMC,SAAS,GAAG,CAAC,IAAI,EAAE,IAAI,CAAU;IACvC,MAAMC,aAAa,GAAG5B,GAAG,CAACuB,OAAO,CAAC,UAAU,CAAC;IAC7C,MAAMM,MAAM,GAAGD,aAAa,IAAID,SAAS,CAACG,QAAQ,CAACF,aAAoB,CAAC,GACnEA,aAA0C,GAC1C,IAAc;IAEnB;IACA;IACA;IACA;IAEA,MAAMG,SAAS,GAAG/B,GAAG,CAACuB,OAAO,CAAC,YAAY,CAAC;IAC3C,MAAMS,MAAM,GAAGD,SAAS,GAAGE,sDAAS,EAAaF,SAAS,CAAC,GAAGG,0BAAS,CAACC,IAAI,EAAE;IAE9E,MAAMC,cAAc,GAAG,IAAIC,+BAAc,CAAC;MACxCL,MAAM;MACNM,IAAI,EAAE3E,EA/QE,CA+QF4E,gBAAgB,CACpBhF,OAAO,CAACiF,KAAK,YAAYC,cAAW,GAAGlF,OAAO,CAACiF,KAAK,CAACF,IAAI,GAAG/E,OAAO,CAAC+E,IAAI,CACzE;MACDT,MAAM;MACNa,SAAS,EAAEjB;MACX;MACA;MACA;MACA;MACA;MACA;MACA;MACA;MACA;KACD,CAAC;IACF;IACA,OAAOW,cAAc;EACvB;EAEA,OAAO,CAACpC,GAAoB,EAAEC,GAAqB,KAAI;IACrD,OAAO0C,0BAAe,MACpBlF,+CAAc;MACZ2E,cAAc,EAAE3E,qBAAO,MAAK;QAC1B,MAAM2E,cAAc,GAAG5C,WAAW,CAACQ,GAAG,CAAC;QACvC,IAAIA,GAAG,CAACP,MAAM,KAAK,KAAK,EAAE;UACxBQ,GAAG,CAAC2C,SAAS,CAAC,eAAe,EAAE,UAAU,CAAC;;QAE5C3C,GAAG,CAAC2C,SAAS,CAAC,kBAAkB,EAAER,cAAc,CAACP,MAAM,CAAC;QACxD,OAAOO,cAAc;MACvB,CAAC,CAAC;MACFS,IAAI,EAAE1B,SAAS,CAACnB,GAAG;KACpB,CAAC,EACS,CAAC;MAAE6C,IAAI;MAAET;IAAc,CAAE,KAChCU,mMAAe,GAAa/E,CAAC,IAEzBgF,6BAAoB;MAClBtD,MAAM,EAAEO,GAAG,CAACP,MAAM;MAClBE,IAAI,EAAEK,GAAG,CAACgD,WAAW;MACrB,IAAGjF,CAAC,CAACV,OAAO,GACR;QACA4F,OAAO,uDAAEJ,IAAI,CAAClD,IAAI,EAAU;QAC5BuD,QAAQ,uDAAEL,IAAI,CAACxB,KAAK,EAAU;QAC9B8B,OAAO,EAAE,0BAAM,EAACN,IAAI,CAACvB,IAAI,CAAC;QAC1B8B,UAAU,EAAE,0BAAM,EAACP,IAAI,CAACrB,OAAO,CAAC;QAChC6B,UAAU,uDAAER,IAAI,CAACtB,OAAO;OACzB,GACDjC,SAAS;KACZ,CAAC,CAbJ7B,wBAAe,kBAAkB,CAAC,CAcjC,CACF,EACCA,+BAAsB,MAAK;MACzB,MAAM6F,aAAa,GAAG7F,wDAAY,CAACuC,GAAG,CAAC,EAChC,CAAC;QAAEsB,IAAI;QAAE3B,IAAI;QAAE0B;MAAK,CAAE,KAAI;QAC7B,MAAMkC,EAAE,GAAG;UACT,kCAAGjC,IAAI,CAAM;UACb,kCAAGD,KAAK,CAAM;UACd,kCAAG1B,IAAI;SACW;QACpB,OAAO4D,EAAE;MACX,CAAC,CAAC,EACOC,SAAS,IAChB/F,8BAAM,CAAC+F,SAAgB,CAAC,EACbrD,CAAC,IAAIe,OAAO,CAACsC,SAAS,EAAEvD,GAAG,EAAEE,CAAC,CAAC,CAAC,CAC5C;MACH;MACA,MAAMA,CAAC,GAAGH,GAAG,CAACP,MAAM,KAAK,KAAK,GAAEhC,gCAAC6F,aAAa,IAAmBA,aAAa,EAAC;MAC/E;MACA,MAAMG,EAAE,GAAGpE,qBAAqB,GAC5BlB,yCAA2BkB,qBAAqB,CAACW,GAAG,EAAEC,GAAG,EAAEmC,cAAc,CAAC,EAA1EjC,CAAC;MACH;MAAA,EACEA,CAAyC;MAC7C,OAAOhB,YAAY,CACjBa,GAAG,EACHC,GAAG,EACHmC,cAAc,EACdqB,EAAE,CACH;IACH,CAAC,CAAC,CACH,EACgBC,KAAK,IAClBjG,uDACEA,qBAAO,MAAMwC,GAAG,CAACG,MAAM,CAAC,GAAG,CAAC,CAACC,IAAI,EAAE,CAAC,EACpC,mCAAkB,EAACqD,KAAK,EAAE;MACxBtB,cAAc;MACdzC,IAAI,EAAEK,GAAG,CAACgD,WAAW;MACrBvD,MAAM,EAAEO,GAAG,CAACP;KACb,CAAC,EACFhC,+BAAsB,MAAK;MACzB,MAAM8D,OAAO,GAAGtB,GAAG,CAAC0D,UAAU,EAAE;MAChC,OAGQZ,6BAAoB;QAC1BtD,MAAM,EAAEO,GAAG,CAACP,MAAM;QAClBE,IAAI,EAAEK,GAAG,CAACgD,WAAW;QACrBY,UAAU,EAAE3D,GAAG,CAAC2D,UAAU,CAACC,QAAQ,EAAE;QAErCZ,OAAO,uDAAEJ,IAAI,CAAClD,IAAI,EAAU;QAC5BuD,QAAQ,uDAAEL,IAAI,CAACxB,KAAK,EAAU;QAC9B8B,OAAO,EAAE,0BAAM,EAACN,IAAI,CAACvB,IAAI,CAAC;QAC1B8B,UAAU,EAAE,0BAAM,EAACP,IAAI,CAACrB,OAAO,CAAC;QAChC6B,UAAU,uDAAER,IAAI,CAACtB,OAAO,EAAU;QAElCuC,UAAU,uDAAEC,MAAM,CAACC,OAAO,CAACzC,OAAO,CAAC,CAAC0C,MAAM,CAAC,CAACC,IAAI,EAAE,CAACC,GAAG,EAAEC,KAAK,CAAC,KAAI;UAChEF,IAAI,CAACC,GAAG,CAAC,GAAGC,KAAK,IAAI,OAAOA,KAAK,KAAK,QAAQ,GAAG,oBAAU,EAACA,KAAK,CAAC,GAAGA,KAAK;UAC1E,OAAOF,IAAI;QACb,CAAC,EAAE,EAAyB,CAAC;OAE9B,CAAC,CAnBKzG,qCACL,kBAAkB,EAClBiG,KAAK,CACN;IAiBH,CAAC,CAAC,CACH,EACgBA,KAAK,IAAIjG,qBAAO,MAAM4G,OAAO,CAACC,KAAK,CAAC,sCAAsC,EAAEZ,KAAK,CAAC,CAAC,CAAC,CACtG,EACI,MACHjG,2DAAe,GAAaM,CAAC,IAAG;MAC9B,MAAMwD,OAAO,GAAGtB,GAAG,CAAC0D,UAAU,EAAE;MAChC,OAAgDZ,6BAAoB;QAClEtD,MAAM,EAAEO,GAAG,CAACP,MAAM;QAClBE,IAAI,EAAEK,GAAG,CAACgD,WAAW;QACrBY,UAAU,EAAE3D,GAAG,CAAC2D,UAAU,CAACC,QAAQ,EAAE;QACrC,IAAG9F,CAAC,CAACV,OAAO,GACR;UACAyG,UAAU,uDAAEvC,OAAO;SACpB,GACDjC,SAAS;OACZ,CAAC,CATK7B,wBAAe,kBAAkB,CAAC;IAU3C,CAAC,CAAC,CACH,uBACmC2E,cAAc,CAAC,CAAC;IAAA,EACtCA,cAAc,CAAC,CAChC,CACJ;EACH,CAAC;AACH;AA2CA;;;;AAIM,SAAUmC,QAAQ,CAA4BC,QAAW;EAC7D,MAAMC,MAAM,GAAGC,2DAAQ,GAAST,MAAM,CAAC,CAACC,IAAI,EAAES,GAAG,KAAI;IACnDT,IAAI,CAACS,GAAG,CAAC,GAAG1F,KAAK,CAACuF,QAAQ,CAACG,GAAG,CAAsB,EAAEC,6CAAwB,CAAC;IAC/E,OAAOV,IAAI;EACb,CAAC,EAAE,EAAS,CAA8B;EAE1C,OAAOO,MAAM;AACf;AAEA;;;;AAIM,SAAUI,WAAW,CAAgCL,QAAW;EACpE,MAAMC,MAAM,GAAGC,2DAAQ,GAAST,MAAM,CAAC,CAACC,IAAI,EAAES,GAAG,KAAI;IACnD,MAAMG,OAAO,GAAGP,QAAQ,CAACC,QAAQ,CAACG,GAAG,CAAC,CAAC;IACvCD,0DAAO,GAASK,OAAO,CAACZ,GAAG,IAAID,IAAI,CAAC,GAAGS,GAAa,IAAIR,GAAa,EAAE,CAAC,GAAGW,OAAO,CAACX,GAAG,CAAC,CAAC;IACxF,OAAOD,IAAI;EACb,CAAC,EAAE,EAAS,CAA2C;EAEvD,OAAOO,MAAM;AACf;AAwCM,SAAU9D,MAAM,CAMpBqE,CAAsC,EACtCvE,aAAmB;EAEnB;EACA,MAAMlD,OAAO,GAAGI,EAAE,CAACsH,cAAc,CAACD,CAAC,CAAC;EACpC,MAAMxE,QAAQ,GAAG7C,EAAE,CAACuH,eAAe,CAACF,CAAC,CAAC;EAUtC,OACEtE,CAAgC,KAC5B;IACJD,aAAa;IACbC,CAAC;IACDnD,OAAO;IACPiD,QAAQ;IACR2E,eAAe,EAAEH,CAAC,CAACG,eAAe,IAAI3E;GAQtC;AACJ;AAqBA;;;;;;;;;;;;;;;AAeM,SAAU4E,aAAa,CAAuDC,GAAa;EAE/F,OAOEb,QAAmB,IACjB;IACF,MAAMjF,OAAO,GAAGmF,sDAAG,GAAST,MAAM,CAAC,CAACC,IAAI,EAAES,GAAG,KAAI;MAC/CT,IAAI,CAACS,GAAG,CAAC,GAAGhE,MAAM,CAAC0E,GAAG,CAACV,GAAG,CAAC,CAAC,CAACH,QAAQ,CAACG,GAAG,CAAQ,CAAC;MAClD,OAAOT,IAAI;IACb,CAAC,EAAE,EAAS,CAAC;IAEb,OAAO3E,OASN;EACH,CAAC;AACH","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","tsplus_module_11","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]}
@@ -8,8 +8,9 @@ exports.setupRequestFrom = exports.setupRequest = void 0;
8
8
  var tsplus_module_1 = _interopRequireWildcard(require("@effect/io/Effect"));
9
9
  var tsplus_module_2 = _interopRequireWildcard(require("@effect-app/prelude/_ext/misc"));
10
10
  var tsplus_module_3 = _interopRequireWildcard(require("@effect-app/core/Function"));
11
- var tsplus_module_4 = _interopRequireWildcard(require("@effect-app/infra/RequestContext"));
12
- var tsplus_module_5 = _interopRequireWildcard(require("@effect-app/prelude/schema"));
11
+ var tsplus_module_4 = _interopRequireWildcard(require("@effect/io/Debug"));
12
+ var tsplus_module_5 = _interopRequireWildcard(require("@effect-app/infra/RequestContext"));
13
+ var tsplus_module_6 = _interopRequireWildcard(require("@effect-app/prelude/schema"));
13
14
  var _RequestContext2 = require("../RequestContext.cjs");
14
15
  function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
15
16
  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; }
@@ -21,31 +22,31 @@ exports.setupRequestFrom = setupRequestFrom;
21
22
  * @tsplus fluent effect/io/Effect setupRequest
22
23
  */
23
24
  function setupRequest_1(self, requestContext) {
24
- return tsplus_module_3.pipe(tsplus_module_1.logSpan(self, "request"), tsplus_module_2.logAnnotates({
25
+ return tsplus_module_4.untraced(() => tsplus_module_3.pipe(tsplus_module_1.logSpan(self, "request"), tsplus_module_2.logAnnotates({
25
26
  requestRootId: requestContext.rootId,
26
27
  requestId: requestContext.id,
27
28
  requestName: requestContext.name
28
- }));
29
+ })));
29
30
  }
30
31
  /**
31
32
  * @tsplus getter effect/io/Effect setupRequestFrom
32
33
  */
33
34
  function setupRequestFrom_1(self) {
34
- return tsplus_module_1.serviceWithEffect(tsplus_module_4.tag, requestContext => setupRequest_1(self, requestContext));
35
+ return tsplus_module_4.untraced(() => tsplus_module_1.serviceWithEffect(tsplus_module_5.tag, requestContext => setupRequest_1(self, requestContext)));
35
36
  }
36
37
  /**
37
38
  * @tsplus fluent effect/io/Effect setupRequestFromWith
38
39
  */
39
40
  function setupReq3(self, name) {
40
- return tsplus_module_1.provideService(setupRequestFrom_1(self), tsplus_module_4.tag, makeInternalRequestContext(name));
41
+ return tsplus_module_4.untraced(() => tsplus_module_1.provideService(setupRequestFrom_1(self), tsplus_module_5.tag, makeInternalRequestContext(name)));
41
42
  }
42
43
  function makeInternalRequestContext(name) {
43
- const id = tsplus_module_5.StringId.make();
44
+ const id = tsplus_module_6.StringId.make();
44
45
  return new _RequestContext2.RequestContext({
45
46
  id,
46
47
  rootId: id,
47
48
  locale: "en",
48
- name: tsplus_module_5.ReasonableString(name)
49
+ name: tsplus_module_6.ReasonableString(name)
49
50
  });
50
51
  }
51
52
  //# sourceMappingURL=setupRequest.cjs.map
@@ -1 +1 @@
1
- {"version":3,"file":"setupRequest.cjs","mappings":";;;;;;;;;;;;AAAA;AAAqD;AAAA;MAKrCA,YAAY;AAAA;MAcZC,gBAAgB;AAAA;AAjBhC;;;AAGA,wBAAsCC,IAAqB,EAAEC,cAA8B;EACzF,OAAOC,oBAAI,CACTC,4BAAI,EAAS,SAAS,CAAC,EACvBC,6BAAoB;IAClBC,aAAa,EAAEJ,cAAc,CAACK,MAAM;IACpCC,SAAS,EAAEN,cAAc,CAACO,EAAE;IAC5BC,WAAW,EAAER,cAAc,CAACS;GAC7B,CAAC,CACH;AACH;AAEA;;;AAGA,4BAA0CV,IAAqB;EAC7D,OAAOG,uDAAoCF,cAAc,IAAIU,mBAAI,EAAcV,cAAc,CAAC,CAAC;AACjG;AAEA;;;AAGM,SAAUW,SAAS,CAAUZ,IAAqB,EAAEU,IAAY;EACpE,OAAOP,sDAAI,wBAE2BU,0BAA0B,CAACH,IAAI,CAAC,CAAC;AACzE;AAEA,SAASG,0BAA0B,CAACH,IAAY;EAC9C,MAAMF,EAAE,GAAGM,wBAAQ,CAACC,IAAI,EAAE;EAC1B,OAAO,IAAIC,+BAAc,CAAC;IACxBR,EAAE;IACFF,MAAM,EAAEE,EAAE;IACVS,MAAM,EAAE,IAAI;IACZP,IAAI,EAAEI,gCAAgB,CAACJ,IAAI;GAC5B,CAAC;AACJ","names":["setupRequest","setupRequestFrom","self","requestContext","tsplus_module_3","tsplus_module_1","tsplus_module_2","requestRootId","rootId","requestId","id","requestName","name","setupRequest_1","setupReq3","makeInternalRequestContext","tsplus_module_5","make","RequestContext","locale"],"sourceRoot":"","sources":["../../_src/api/setupRequest.ts"],"sourcesContent":[null]}
1
+ {"version":3,"file":"setupRequest.cjs","mappings":";;;;;;;;;;;;;AAAA;AAAqD;AAAA;MAKrCA,YAAY;AAAA;MAgBZC,gBAAgB;AAAA;AAnBhC;;;AAGA,wBAAsCC,IAAqB,EAAEC,cAA8B;EACzF,OAAOC,yBAAe,MACpBC,oBAAI,CACFC,4BAAI,EAAS,SAAS,CAAC,EACvBC,6BAAoB;IAClBC,aAAa,EAAEL,cAAc,CAACM,MAAM;IACpCC,SAAS,EAAEP,cAAc,CAACQ,EAAE;IAC5BC,WAAW,EAAET,cAAc,CAACU;GAC7B,CAAC,CACH,CACF;AACH;AAEA;;;AAGA,4BAA0CX,IAAqB;EAC7D,OAAOE,yBAAe,MAAME,uDAAoCH,cAAc,IAAIW,mBAAI,EAAcX,cAAc,CAAC,CAAC,CAAC;AACvH;AAEA;;;AAGM,SAAUY,SAAS,CAAUb,IAAqB,EAAEW,IAAY;EACpE,OAAOT,yBAAe,MACpBE,sDAAI,wBAEkCU,0BAA0B,CAACH,IAAI,CAAC,CAAC,CACxE;AACH;AAEA,SAASG,0BAA0B,CAACH,IAAY;EAC9C,MAAMF,EAAE,GAAGM,wBAAQ,CAACC,IAAI,EAAE;EAC1B,OAAO,IAAIC,+BAAc,CAAC;IACxBR,EAAE;IACFF,MAAM,EAAEE,EAAE;IACVS,MAAM,EAAE,IAAI;IACZP,IAAI,EAAEI,gCAAgB,CAACJ,IAAI;GAC5B,CAAC;AACJ","names":["setupRequest","setupRequestFrom","self","requestContext","tsplus_module_4","tsplus_module_3","tsplus_module_1","tsplus_module_2","requestRootId","rootId","requestId","id","requestName","name","setupRequest_1","setupReq3","makeInternalRequestContext","tsplus_module_6","make","RequestContext","locale"],"sourceRoot":"","sources":["../../_src/api/setupRequest.ts"],"sourcesContent":[null]}
@@ -16,20 +16,22 @@ export function defaultBasicErrorHandler<R>(
16
16
  _requestContext: RequestContext,
17
17
  r2: Effect<R, ValidationError, void>
18
18
  ) {
19
- return r2
20
- .tapErrorCause(cause => cause.isFailure() ? logRequestError(cause) : Effect.unit)
21
- .catchTag("ValidationError", err =>
22
- Effect(() => {
23
- res.status(400).send(err.errors)
24
- }))
25
- // final catch all; expecting never so that unhandled known errors will show up
26
- .catchAll((err: never) =>
27
- Effect.logError(
28
- "Program error, compiler probably silenced, got an unsupported Error in Error Channel of Effect" + err
19
+ return Debug.untraced(() =>
20
+ r2
21
+ .tapErrorCause(cause => cause.isFailure() ? logRequestError(cause) : Effect.unit)
22
+ .catchTag("ValidationError", err =>
23
+ Effect(() => {
24
+ res.status(400).send(err.errors)
25
+ }))
26
+ // final catch all; expecting never so that unhandled known errors will show up
27
+ .catchAll((err: never) =>
28
+ Effect.logError(
29
+ "Program error, compiler probably silenced, got an unsupported Error in Error Channel of Effect" + err
30
+ )
31
+ .map(() => err as unknown)
32
+ .flatMap(Effect.die)
29
33
  )
30
- .map(() => err as unknown)
31
- .flatMap(Effect.die)
32
- )
34
+ )
33
35
  }
34
36
 
35
37
  const optimisticConcurrencySchedule = Schedule.once() &&
@@ -44,41 +46,43 @@ export function defaultErrorHandler<R>(
44
46
  const r3 = req.method === "PATCH"
45
47
  ? r2.retry(optimisticConcurrencySchedule)
46
48
  : r2
47
- return r3
48
- .tapErrorCause(cause => cause.isFailure() ? logRequestError(cause) : Effect.unit)
49
- .catchTag("ValidationError", err =>
50
- Effect(() => {
51
- res.status(400).send(err.errors)
52
- }))
53
- .catchTag("NotFoundError", err =>
54
- Effect(() => {
55
- res.status(404).send(err)
56
- }))
57
- .catchTag("NotLoggedInError", err =>
58
- Effect(() => {
59
- res.status(401).send(err)
60
- }))
61
- .catchTag("UnauthorizedError", err =>
62
- Effect(() => {
63
- res.status(403).send(err)
64
- }))
65
- .catchTag("InvalidStateError", err =>
66
- Effect(() => {
67
- res.status(422).send(err)
68
- }))
69
- .catchTag("OptimisticConcurrencyException", err =>
70
- Effect(() => {
71
- // 412 or 409.. https://stackoverflow.com/questions/19122088/which-http-status-code-to-use-to-reject-a-put-due-to-optimistic-locking-failure
72
- res.status(412).send(err)
73
- }))
74
- // final catch all; expecting never so that unhandled known errors will show up
75
- .catchAll((err: never) =>
76
- Effect.logError(
77
- "Program error, compiler probably silenced, got an unsupported Error in Error Channel of Effect" + err
49
+ return Debug.untraced(() =>
50
+ r3
51
+ .tapErrorCause(cause => cause.isFailure() ? logRequestError(cause) : Effect.unit)
52
+ .catchTag("ValidationError", err =>
53
+ Effect(() => {
54
+ res.status(400).send(err.errors)
55
+ }))
56
+ .catchTag("NotFoundError", err =>
57
+ Effect(() => {
58
+ res.status(404).send(err)
59
+ }))
60
+ .catchTag("NotLoggedInError", err =>
61
+ Effect(() => {
62
+ res.status(401).send(err)
63
+ }))
64
+ .catchTag("UnauthorizedError", err =>
65
+ Effect(() => {
66
+ res.status(403).send(err)
67
+ }))
68
+ .catchTag("InvalidStateError", err =>
69
+ Effect(() => {
70
+ res.status(422).send(err)
71
+ }))
72
+ .catchTag("OptimisticConcurrencyException", err =>
73
+ Effect(() => {
74
+ // 412 or 409.. https://stackoverflow.com/questions/19122088/which-http-status-code-to-use-to-reject-a-put-due-to-optimistic-locking-failure
75
+ res.status(412).send(err)
76
+ }))
77
+ // final catch all; expecting never so that unhandled known errors will show up
78
+ .catchAll((err: never) =>
79
+ Effect.logError(
80
+ "Program error, compiler probably silenced, got an unsupported Error in Error Channel of Effect" + err
81
+ )
82
+ .map(() => err as unknown)
83
+ .flatMap(Effect.die)
78
84
  )
79
- .map(() => err as unknown)
80
- .flatMap(Effect.die)
81
- )
85
+ )
82
86
  }
83
87
 
84
88
  export type SupportedErrors =
@@ -294,116 +294,118 @@ export function makeRequestHandler<
294
294
  }
295
295
 
296
296
  return (req: express.Request, res: express.Response) => {
297
- return Effect.struct({
298
- requestContext: Effect(() => {
299
- const requestContext = makeContext(req)
300
- if (req.method === "GET") {
301
- res.setHeader("Cache-Control", "no-store")
302
- }
303
- res.setHeader("Content-Language", requestContext.locale)
304
- return requestContext
305
- }),
306
- pars: getParams(req)
307
- })
308
- .flatMap(({ pars, requestContext }) =>
309
- RequestSettings.get.flatMap(s =>
310
- Effect.logInfo("Incoming 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
297
+ return Debug.untraced(() =>
298
+ Effect.struct({
299
+ requestContext: Effect(() => {
300
+ const requestContext = makeContext(req)
301
+ if (req.method === "GET") {
302
+ res.setHeader("Cache-Control", "no-store")
303
+ }
304
+ res.setHeader("Content-Language", requestContext.locale)
305
+ return requestContext
306
+ }),
307
+ pars: getParams(req)
308
+ })
309
+ .flatMap(({ pars, requestContext }) =>
310
+ RequestSettings.get.flatMap(s =>
311
+ Effect.logInfo("Incoming request").apply(
312
+ Effect.logAnnotates({
313
+ method: req.method,
314
+ path: req.originalUrl,
315
+ ...s.verbose
316
+ ? {
317
+ reqPath: pars.path.$$.pretty,
318
+ reqQuery: pars.query.$$.pretty,
319
+ reqBody: pretty(pars.body),
320
+ reqCookies: pretty(pars.cookies),
321
+ reqHeaders: pars.headers.$$.pretty
322
+ } :
323
+ undefined
324
+ })
325
+ )
326
+ ).zipRight(
327
+ Effect.suspendSucceed(() => {
328
+ const handleRequest = parseRequest(req)
329
+ .map(({ body, path, query }) => {
330
+ const hn = {
331
+ ...body.value,
332
+ ...query.value,
333
+ ...path.value
334
+ } as unknown as ReqA
335
+ return hn
336
+ })
337
+ .flatMap(parsedReq =>
338
+ handle(parsedReq as any)
339
+ .flatMap(r => respond(parsedReq, res, r))
340
+ )
341
+ // Commands should not be interruptable.
342
+ const r = req.method !== "GET" ? handleRequest.uninterruptible : handleRequest // .instrument("Performance.RequestResponse")
343
+ // the first log entry should be of the request start.
344
+ const r2 = makeMiddlewareContext
345
+ ? r.provideSomeContextEffect(makeMiddlewareContext(req, res, requestContext))
346
+ // PR is not relevant here
347
+ : r as Effect<R, E | ValidationError, void>
348
+ return errorHandler(
349
+ req,
350
+ res,
351
+ requestContext,
352
+ r2
353
+ )
323
354
  })
324
355
  )
325
- ).zipRight(
326
- Effect.suspendSucceed(() => {
327
- const handleRequest = parseRequest(req)
328
- .map(({ body, path, query }) => {
329
- const hn = {
330
- ...body.value,
331
- ...query.value,
332
- ...path.value
333
- } as unknown as ReqA
334
- return hn
335
- })
336
- .flatMap(parsedReq =>
337
- handle(parsedReq as any)
338
- .flatMap(r => respond(parsedReq, res, r))
356
+ .tapErrorCause(cause =>
357
+ Effect.tuplePar(
358
+ Effect(() => res.status(500).send()),
359
+ reportRequestError(cause, {
360
+ requestContext,
361
+ path: req.originalUrl,
362
+ method: req.method
363
+ }),
364
+ Effect.suspendSucceed(() => {
365
+ const headers = res.getHeaders()
366
+ return Effect.logErrorCauseMessage(
367
+ "Finished request",
368
+ cause
369
+ ).apply(Effect.logAnnotates({
370
+ method: req.method,
371
+ path: req.originalUrl,
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
+
380
+ resHeaders: Object.entries(headers).reduce((prev, [key, value]) => {
381
+ prev[key] = value && typeof value === "string" ? snipString(value) : value
382
+ return prev
383
+ }, {} as Record<string, any>)
384
+ .$$.pretty
385
+ }))
386
+ })
339
387
  )
340
- // Commands should not be interruptable.
341
- const r = req.method !== "GET" ? handleRequest.uninterruptible : handleRequest // .instrument("Performance.RequestResponse")
342
- // the first log entry should be of the request start.
343
- const r2 = makeMiddlewareContext
344
- ? r.provideSomeContextEffect(makeMiddlewareContext(req, res, requestContext))
345
- // PR is not relevant here
346
- : r as Effect<R, E | ValidationError, void>
347
- return errorHandler(
348
- req,
349
- res,
350
- requestContext,
351
- r2
388
+ .tapErrorCause(cause => Effect(() => console.error("Error occurred while reporting error", cause)))
352
389
  )
353
- })
354
- )
355
- .tapErrorCause(cause =>
356
- Effect.tuplePar(
357
- Effect(() => res.status(500).send()),
358
- reportRequestError(cause, {
359
- requestContext,
360
- path: req.originalUrl,
361
- method: req.method
362
- }),
363
- Effect.suspendSucceed(() => {
390
+ .tap(() =>
391
+ RequestSettings.get.flatMap(s => {
364
392
  const headers = res.getHeaders()
365
- return Effect.logErrorCauseMessage(
366
- "Finished request",
367
- cause
368
- ).apply(Effect.logAnnotates({
393
+ return Effect.logInfo("Finished request").apply(Effect.logAnnotates({
369
394
  method: req.method,
370
395
  path: req.originalUrl,
371
396
  statusCode: res.statusCode.toString(),
372
-
373
- reqPath: pars.path.$$.pretty,
374
- reqQuery: pars.query.$$.pretty,
375
- reqBody: pretty(pars.body),
376
- reqCookies: pretty(pars.cookies),
377
- reqHeaders: pars.headers.$$.pretty,
378
-
379
- resHeaders: Object.entries(headers).reduce((prev, [key, value]) => {
380
- prev[key] = value && typeof value === "string" ? snipString(value) : value
381
- return prev
382
- }, {} as Record<string, any>)
383
- .$$.pretty
397
+ ...s.verbose
398
+ ? {
399
+ resHeaders: headers.$$.pretty
400
+ } :
401
+ undefined
384
402
  }))
385
403
  })
386
404
  )
387
- .tapErrorCause(cause => Effect(() => console.error("Error occurred while reporting error", cause)))
388
- )
389
- .tap(() =>
390
- RequestSettings.get.flatMap(s => {
391
- const headers = res.getHeaders()
392
- return Effect.logInfo("Finished request").apply(Effect.logAnnotates({
393
- method: req.method,
394
- path: req.originalUrl,
395
- statusCode: res.statusCode.toString(),
396
- ...s.verbose
397
- ? {
398
- resHeaders: headers.$$.pretty
399
- } :
400
- undefined
401
- }))
402
- })
403
- )
404
- .provideService(RequestContext.Tag, requestContext) // otherwise external error reporter breaks.
405
- .setupRequest(requestContext)
406
- )
405
+ .provideService(RequestContext.Tag, requestContext) // otherwise external error reporter breaks.
406
+ .setupRequest(requestContext)
407
+ )
408
+ )
407
409
  }
408
410
  }
409
411
 
@@ -4,13 +4,15 @@ import { RequestContext } from "../RequestContext.js"
4
4
  * @tsplus fluent effect/io/Effect setupRequest
5
5
  */
6
6
  export function setupRequest<R, E, A>(self: Effect<R, E, A>, requestContext: RequestContext) {
7
- return pipe(
8
- self.logSpan("request"),
9
- Effect.logAnnotates({
10
- requestRootId: requestContext.rootId,
11
- requestId: requestContext.id,
12
- requestName: requestContext.name
13
- })
7
+ return Debug.untraced(() =>
8
+ pipe(
9
+ self.logSpan("request"),
10
+ Effect.logAnnotates({
11
+ requestRootId: requestContext.rootId,
12
+ requestId: requestContext.id,
13
+ requestName: requestContext.name
14
+ })
15
+ )
14
16
  )
15
17
  }
16
18
 
@@ -18,16 +20,18 @@ export function setupRequest<R, E, A>(self: Effect<R, E, A>, requestContext: Req
18
20
  * @tsplus getter effect/io/Effect setupRequestFrom
19
21
  */
20
22
  export function setupRequestFrom<R, E, A>(self: Effect<R, E, A>) {
21
- return RequestContext.Tag.accessWithEffect(requestContext => self.setupRequest(requestContext))
23
+ return Debug.untraced(() => RequestContext.Tag.accessWithEffect(requestContext => self.setupRequest(requestContext)))
22
24
  }
23
25
 
24
26
  /**
25
27
  * @tsplus fluent effect/io/Effect setupRequestFromWith
26
28
  */
27
29
  export function setupReq3<R, E, A>(self: Effect<R, E, A>, name: string) {
28
- return self
29
- .setupRequestFrom
30
- .provideService(RequestContext.Tag, makeInternalRequestContext(name))
30
+ return Debug.untraced(() =>
31
+ self
32
+ .setupRequestFrom
33
+ .provideService(RequestContext.Tag, makeInternalRequestContext(name))
34
+ )
31
35
  }
32
36
 
33
37
  function makeInternalRequestContext(name: string) {
@@ -1 +1 @@
1
- {"version":3,"file":"defaultErrorHandler.d.ts","sourceRoot":"","sources":["../../_src/api/defaultErrorHandler.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,OAAO,MAAM,SAAS,CAAA;AAClC,OAAO,KAAK,EACV,iBAAiB,EACjB,aAAa,EACb,gBAAgB,EAChB,8BAA8B,EAC9B,iBAAiB,EACjB,eAAe,EAChB,MAAM,cAAc,CAAA;AACrB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAG1D,wBAAgB,wBAAwB,CAAC,CAAC,EACxC,IAAI,EAAE,OAAO,CAAC,OAAO,EACrB,GAAG,EAAE,OAAO,CAAC,QAAQ,EACrB,eAAe,EAAE,cAAc,EAC/B,EAAE,EAAE,MAAM,CAAC,CAAC,EAAE,eAAe,EAAE,IAAI,CAAC,uEAgBrC;AAKD,wBAAgB,mBAAmB,CAAC,CAAC,EACnC,GAAG,EAAE,OAAO,CAAC,OAAO,EACpB,GAAG,EAAE,OAAO,CAAC,QAAQ,EACrB,CAAC,EAAE,cAAc,EACjB,EAAE,EAAE,MAAM,CAAC,CAAC,EAAE,eAAe,EAAE,IAAI,CAAC,uEAwCrC;AAED,MAAM,MAAM,eAAe,GACvB,eAAe,GACf,aAAa,GACb,gBAAgB,GAChB,iBAAiB,GACjB,iBAAiB,GACjB,8BAA8B,CAAA"}
1
+ {"version":3,"file":"defaultErrorHandler.d.ts","sourceRoot":"","sources":["../../_src/api/defaultErrorHandler.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,OAAO,MAAM,SAAS,CAAA;AAClC,OAAO,KAAK,EACV,iBAAiB,EACjB,aAAa,EACb,gBAAgB,EAChB,8BAA8B,EAC9B,iBAAiB,EACjB,eAAe,EAChB,MAAM,cAAc,CAAA;AACrB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAG1D,wBAAgB,wBAAwB,CAAC,CAAC,EACxC,IAAI,EAAE,OAAO,CAAC,OAAO,EACrB,GAAG,EAAE,OAAO,CAAC,QAAQ,EACrB,eAAe,EAAE,cAAc,EAC/B,EAAE,EAAE,MAAM,CAAC,CAAC,EAAE,eAAe,EAAE,IAAI,CAAC,uEAkBrC;AAKD,wBAAgB,mBAAmB,CAAC,CAAC,EACnC,GAAG,EAAE,OAAO,CAAC,OAAO,EACpB,GAAG,EAAE,OAAO,CAAC,QAAQ,EACrB,CAAC,EAAE,cAAc,EACjB,EAAE,EAAE,MAAM,CAAC,CAAC,EAAE,eAAe,EAAE,IAAI,CAAC,uEA0CrC;AAED,MAAM,MAAM,eAAe,GACvB,eAAe,GACf,aAAa,GACb,gBAAgB,GAChB,iBAAiB,GACjB,iBAAiB,GACjB,8BAA8B,CAAA"}
@@ -1,21 +1,22 @@
1
1
  import * as tsplus_module_1 from "@effect/io/Effect";
2
2
  import * as tsplus_module_2 from "@effect/io/Cause";
3
3
  import * as tsplus_module_3 from "@effect-app/core/Effect";
4
- import * as tsplus_module_4 from "@effect/io/Schedule";
4
+ import * as tsplus_module_4 from "@effect/io/Debug";
5
+ import * as tsplus_module_5 from "@effect/io/Schedule";
5
6
  import { logRequestError } from "./reportError.js";
6
7
  export function defaultBasicErrorHandler(_req, res, _requestContext, r2) {
7
- return tsplus_module_1.catchAll(tsplus_module_1.catchTag(tsplus_module_1.tapErrorCause(r2, cause => tsplus_module_2.isFailure(cause) ? logRequestError(cause) : tsplus_module_3.unit), "ValidationError", err => tsplus_module_1.sync(() => {
8
+ return tsplus_module_4.untraced(() => tsplus_module_1.catchAll(tsplus_module_1.catchTag(tsplus_module_1.tapErrorCause(r2, cause => tsplus_module_2.isFailure(cause) ? logRequestError(cause) : tsplus_module_3.unit), "ValidationError", err => tsplus_module_1.sync(() => {
8
9
  res.status(400).send(err.errors);
9
10
  }))
10
11
  // final catch all; expecting never so that unhandled known errors will show up
11
- , (err) => tsplus_module_1.flatMap(tsplus_module_1.map(tsplus_module_1.logError("Program error, compiler probably silenced, got an unsupported Error in Error Channel of Effect" + err), () => err), tsplus_module_1.die));
12
+ , (err) => tsplus_module_1.flatMap(tsplus_module_1.map(tsplus_module_1.logError("Program error, compiler probably silenced, got an unsupported Error in Error Channel of Effect" + err), () => err), tsplus_module_1.die)));
12
13
  }
13
- const optimisticConcurrencySchedule = tsplus_module_4.intersect(tsplus_module_4.recurWhile(a => a._tag === "OptimisticConcurrencyException"))(tsplus_module_4.once());
14
+ const optimisticConcurrencySchedule = tsplus_module_5.intersect(tsplus_module_5.recurWhile(a => a._tag === "OptimisticConcurrencyException"))(tsplus_module_5.once());
14
15
  export function defaultErrorHandler(req, res, _, r2) {
15
16
  const r3 = req.method === "PATCH"
16
17
  ? tsplus_module_1.retry(r2, optimisticConcurrencySchedule)
17
18
  : r2;
18
- return tsplus_module_1.catchAll(tsplus_module_1.catchTag(tsplus_module_1.catchTag(tsplus_module_1.catchTag(tsplus_module_1.catchTag(tsplus_module_1.catchTag(tsplus_module_1.catchTag(tsplus_module_1.tapErrorCause(r3, cause => tsplus_module_2.isFailure(cause) ? logRequestError(cause) : tsplus_module_3.unit), "ValidationError", err => tsplus_module_1.sync(() => {
19
+ return tsplus_module_4.untraced(() => tsplus_module_1.catchAll(tsplus_module_1.catchTag(tsplus_module_1.catchTag(tsplus_module_1.catchTag(tsplus_module_1.catchTag(tsplus_module_1.catchTag(tsplus_module_1.catchTag(tsplus_module_1.tapErrorCause(r3, cause => tsplus_module_2.isFailure(cause) ? logRequestError(cause) : tsplus_module_3.unit), "ValidationError", err => tsplus_module_1.sync(() => {
19
20
  res.status(400).send(err.errors);
20
21
  })), "NotFoundError", err => tsplus_module_1.sync(() => {
21
22
  res.status(404).send(err);
@@ -30,6 +31,6 @@ export function defaultErrorHandler(req, res, _, r2) {
30
31
  res.status(412).send(err);
31
32
  }))
32
33
  // final catch all; expecting never so that unhandled known errors will show up
33
- , (err) => tsplus_module_1.flatMap(tsplus_module_1.map(tsplus_module_1.logError("Program error, compiler probably silenced, got an unsupported Error in Error Channel of Effect" + err), () => err), tsplus_module_1.die));
34
+ , (err) => tsplus_module_1.flatMap(tsplus_module_1.map(tsplus_module_1.logError("Program error, compiler probably silenced, got an unsupported Error in Error Channel of Effect" + err), () => err), tsplus_module_1.die)));
34
35
  }
35
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVmYXVsdEVycm9ySGFuZGxlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL19zcmMvYXBpL2RlZmF1bHRFcnJvckhhbmRsZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7OztBQVVBLE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQTtBQUVsRCxNQUFNLFVBQVUsd0JBQXdCLENBQ3RDLElBQXFCLEVBQ3JCLEdBQXFCLEVBQ3JCLGVBQStCLEVBQy9CLEVBQW9DO0lBRXBDLE9BQU8seUJBQUEseUJBQUEsOEJBQUEsRUFBRSxFQUNRLEtBQUssQ0FBQyxFQUFFLENBQUMsMEJBQUEsS0FBSyxDQUFZLENBQUMsQ0FBQyxDQUFDLGVBQWUsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLHFCQUFZLENBQUMsRUFDdkUsaUJBQWlCLEVBQUUsR0FBRyxDQUFDLEVBQUUsQ0FDakMscUJBQU8sR0FBRyxFQUFFO1FBQ1YsR0FBRyxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxDQUFBO0lBQ2xDLENBQUMsQ0FBQyxDQUFDO0lBQ0wsK0VBQStFO01BQ3JFLENBQUMsR0FBVSxFQUFFLEVBQUUsQ0FDdkIsd0JBQUEsb0JBQUEseUJBQ0UsZ0dBQWdHLEdBQUcsR0FBRyxDQUN2RyxFQUNNLEdBQUcsRUFBRSxDQUFDLEdBQWMsQ0FBQyxzQkFDTixDQUN2QixDQUFBO0FBQ0wsQ0FBQztBQUVELE1BQU0sNkJBQTZCLDZCQUNqQywyQkFBcUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsSUFBSSxLQUFLLGdDQUFnQyxDQUFDLEVBRGxELHNCQUFlLENBQ21DLENBQUE7QUFFeEYsTUFBTSxVQUFVLG1CQUFtQixDQUNqQyxHQUFvQixFQUNwQixHQUFxQixFQUNyQixDQUFpQixFQUNqQixFQUFvQztJQUVwQyxNQUFNLEVBQUUsR0FBRyxHQUFHLENBQUMsTUFBTSxLQUFLLE9BQU87UUFDL0IsQ0FBQyxDQUFDLHNCQUFBLEVBQUUsRUFBTyw2QkFBNkIsQ0FBQztRQUN6QyxDQUFDLENBQUMsRUFBRSxDQUFBO0lBQ04sT0FBTyx5QkFBQSx5QkFBQSx5QkFBQSx5QkFBQSx5QkFBQSx5QkFBQSx5QkFBQSw4QkFBQSxFQUFFLEVBQ1EsS0FBSyxDQUFDLEVBQUUsQ0FBQywwQkFBQSxLQUFLLENBQVksQ0FBQyxDQUFDLENBQUMsZUFBZSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMscUJBQVksQ0FBQyxFQUN2RSxpQkFBaUIsRUFBRSxHQUFHLENBQUMsRUFBRSxDQUNqQyxxQkFBTyxHQUFHLEVBQUU7UUFDVixHQUFHLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLENBQUE7SUFDbEMsQ0FBQyxDQUFDLENBQUMsRUFDSyxlQUFlLEVBQUUsR0FBRyxDQUFDLEVBQUUsQ0FDL0IscUJBQU8sR0FBRyxFQUFFO1FBQ1YsR0FBRyxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUE7SUFDM0IsQ0FBQyxDQUFDLENBQUMsRUFDSyxrQkFBa0IsRUFBRSxHQUFHLENBQUMsRUFBRSxDQUNsQyxxQkFBTyxHQUFHLEVBQUU7UUFDVixHQUFHLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQTtJQUMzQixDQUFDLENBQUMsQ0FBQyxFQUNLLG1CQUFtQixFQUFFLEdBQUcsQ0FBQyxFQUFFLENBQ25DLHFCQUFPLEdBQUcsRUFBRTtRQUNWLEdBQUcsQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFBO0lBQzNCLENBQUMsQ0FBQyxDQUFDLEVBQ0ssbUJBQW1CLEVBQUUsR0FBRyxDQUFDLEVBQUUsQ0FDbkMscUJBQU8sR0FBRyxFQUFFO1FBQ1YsR0FBRyxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUE7SUFDM0IsQ0FBQyxDQUFDLENBQUMsRUFDSyxnQ0FBZ0MsRUFBRSxHQUFHLENBQUMsRUFBRSxDQUNoRCxxQkFBTyxHQUFHLEVBQUU7UUFDViw0SUFBNEk7UUFDNUksR0FBRyxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUE7SUFDM0IsQ0FBQyxDQUFDLENBQUM7SUFDTCwrRUFBK0U7TUFDckUsQ0FBQyxHQUFVLEVBQUUsRUFBRSxDQUN2Qix3QkFBQSxvQkFBQSx5QkFDRSxnR0FBZ0csR0FBRyxHQUFHLENBQ3ZHLEVBQ00sR0FBRyxFQUFFLENBQUMsR0FBYyxDQUFDLHNCQUNOLENBQ3ZCLENBQUE7QUFDTCxDQUFDIn0=
36
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVmYXVsdEVycm9ySGFuZGxlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL19zcmMvYXBpL2RlZmF1bHRFcnJvckhhbmRsZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFVQSxPQUFPLEVBQUUsZUFBZSxFQUFFLE1BQU0sa0JBQWtCLENBQUE7QUFFbEQsTUFBTSxVQUFVLHdCQUF3QixDQUN0QyxJQUFxQixFQUNyQixHQUFxQixFQUNyQixlQUErQixFQUMvQixFQUFvQztJQUVwQyxPQUFPLHlCQUFlLEdBQUcsRUFBRSxDQUN6Qix5QkFBQSx5QkFBQSw4QkFBQSxFQUFFLEVBQ2UsS0FBSyxDQUFDLEVBQUUsQ0FBQywwQkFBQSxLQUFLLENBQVksQ0FBQyxDQUFDLENBQUMsZUFBZSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMscUJBQVksQ0FBQyxFQUN2RSxpQkFBaUIsRUFBRSxHQUFHLENBQUMsRUFBRSxDQUNqQyxxQkFBTyxHQUFHLEVBQUU7UUFDVixHQUFHLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLENBQUE7SUFDbEMsQ0FBQyxDQUFDLENBQUM7SUFDTCwrRUFBK0U7TUFDckUsQ0FBQyxHQUFVLEVBQUUsRUFBRSxDQUN2Qix3QkFBQSxvQkFBQSx5QkFDRSxnR0FBZ0csR0FBRyxHQUFHLENBQ3ZHLEVBQ00sR0FBRyxFQUFFLENBQUMsR0FBYyxDQUFDLHNCQUNOLENBQ3ZCLENBQ0osQ0FBQTtBQUNILENBQUM7QUFFRCxNQUFNLDZCQUE2Qiw2QkFDakMsMkJBQXFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLElBQUksS0FBSyxnQ0FBZ0MsQ0FBQyxFQURsRCxzQkFBZSxDQUNtQyxDQUFBO0FBRXhGLE1BQU0sVUFBVSxtQkFBbUIsQ0FDakMsR0FBb0IsRUFDcEIsR0FBcUIsRUFDckIsQ0FBaUIsRUFDakIsRUFBb0M7SUFFcEMsTUFBTSxFQUFFLEdBQUcsR0FBRyxDQUFDLE1BQU0sS0FBSyxPQUFPO1FBQy9CLENBQUMsQ0FBQyxzQkFBQSxFQUFFLEVBQU8sNkJBQTZCLENBQUM7UUFDekMsQ0FBQyxDQUFDLEVBQUUsQ0FBQTtJQUNOLE9BQU8seUJBQWUsR0FBRyxFQUFFLENBQ3pCLHlCQUFBLHlCQUFBLHlCQUFBLHlCQUFBLHlCQUFBLHlCQUFBLHlCQUFBLDhCQUFBLEVBQUUsRUFDZSxLQUFLLENBQUMsRUFBRSxDQUFDLDBCQUFBLEtBQUssQ0FBWSxDQUFDLENBQUMsQ0FBQyxlQUFlLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxxQkFBWSxDQUFDLEVBQ3ZFLGlCQUFpQixFQUFFLEdBQUcsQ0FBQyxFQUFFLENBQ2pDLHFCQUFPLEdBQUcsRUFBRTtRQUNWLEdBQUcsQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsQ0FBQTtJQUNsQyxDQUFDLENBQUMsQ0FBQyxFQUNLLGVBQWUsRUFBRSxHQUFHLENBQUMsRUFBRSxDQUMvQixxQkFBTyxHQUFHLEVBQUU7UUFDVixHQUFHLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQTtJQUMzQixDQUFDLENBQUMsQ0FBQyxFQUNLLGtCQUFrQixFQUFFLEdBQUcsQ0FBQyxFQUFFLENBQ2xDLHFCQUFPLEdBQUcsRUFBRTtRQUNWLEdBQUcsQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFBO0lBQzNCLENBQUMsQ0FBQyxDQUFDLEVBQ0ssbUJBQW1CLEVBQUUsR0FBRyxDQUFDLEVBQUUsQ0FDbkMscUJBQU8sR0FBRyxFQUFFO1FBQ1YsR0FBRyxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUE7SUFDM0IsQ0FBQyxDQUFDLENBQUMsRUFDSyxtQkFBbUIsRUFBRSxHQUFHLENBQUMsRUFBRSxDQUNuQyxxQkFBTyxHQUFHLEVBQUU7UUFDVixHQUFHLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQTtJQUMzQixDQUFDLENBQUMsQ0FBQyxFQUNLLGdDQUFnQyxFQUFFLEdBQUcsQ0FBQyxFQUFFLENBQ2hELHFCQUFPLEdBQUcsRUFBRTtRQUNWLDRJQUE0STtRQUM1SSxHQUFHLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQTtJQUMzQixDQUFDLENBQUMsQ0FBQztJQUNMLCtFQUErRTtNQUNyRSxDQUFDLEdBQVUsRUFBRSxFQUFFLENBQ3ZCLHdCQUFBLG9CQUFBLHlCQUNFLGdHQUFnRyxHQUFHLEdBQUcsQ0FDdkcsRUFDTSxHQUFHLEVBQUUsQ0FBQyxHQUFjLENBQUMsc0JBQ04sQ0FDdkIsQ0FDSixDQUFBO0FBQ0gsQ0FBQyJ9
@@ -94,7 +94,7 @@ export interface ReqHandler<Req, R, E, Res, ReqSchema extends MO.SchemaAny, ResS
94
94
  * })
95
95
  * ```
96
96
  */
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_1 ? T_1 extends GetRequest<TModules[K_1]> ? T_1 extends new (...args: any[]) => any ? T_1 : 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>; };
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>; };
98
98
  export type ReqFromSchema<ReqSchema> = InstanceType<ReqSchema extends {
99
99
  new (...args: any[]): any;
100
100
  } ? ReqSchema : never>;
@@ -1 +1 @@
1
- {"version":3,"file":"routing.d.ts","sourceRoot":"","sources":["../../_src/api/routing.ts"],"names":[],"mappings":";;;AACA,OAAO,KAAK,EAAE,MAAM,oCAAoC,CAAA;AACxD,OAAO,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,+BAA+B,CAAA;AAC3D,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AAEzE,OAAO,KAAK,EAAE,MAAM,4BAA4B,CAAA;AAEhD,OAAO,KAAK,OAAO,MAAM,SAAS,CAAA;AAClC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AACnD,OAAO,EAAE,cAAc,EAAa,MAAM,sBAAsB,CAAA;AAChE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAA;AAE/D,OAAO,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,oBAAoB,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAA;AAEtH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAA;AAKrE,eAAO,MAAM,eAAe;;EAE1B,CAAA;AAEF,wBAAgB,kBAAkB,CAChC,CAAC,EACD,KAAK,EACL,OAAO,EACP,MAAM,EACN,KAAK,EACL,OAAO,EACP,IAAI,SAAS,KAAK,GAAG,MAAM,GAAG,KAAK,EACnC,IAAI,EACJ,MAAM,EAEN,OAAO,EAAE,cAAc,CACrB,CAAC,EACD,KAAK,EACL,OAAO,EACP,MAAM,EACN,KAAK,EACL,OAAO,EACP,IAAI,EACJ,IAAI,EACJ,MAAM,CACP,CAAC,SAAS,CAAC,GACX,cAAc,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,CAgDxD;AAED,MAAM,MAAM,qBAAqB,CAAC,IAAI,EAAE,EAAE,GAAG,KAAK,EAAE,EAAE,GAAG,KAAK,IAAI,CAChE,GAAG,EAAE,OAAO,CAAC,OAAO,EACpB,GAAG,EAAE,OAAO,CAAC,QAAQ,EACrB,OAAO,EAAE,cAAc,KACpB,MAAM,CAAC,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC,CAAA;AAElC,MAAM,MAAM,UAAU,CACpB,CAAC,EACD,KAAK,EACL,OAAO,EACP,MAAM,EACN,KAAK,EACL,OAAO,EACP,IAAI,SAAS,KAAK,GAAG,MAAM,GAAG,KAAK,EACnC,IAAI,EACJ,IAAI,EACJ,EAAE,GAAG,KAAK,EACV,EAAE,GAAG,KAAK,IACR,CACF,OAAO,EAAE,cAAc,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,KACjF;IACH,OAAO,EAAE,OAAO,OAAO,CAAA;IACvB,WAAW,EAAE,qBAAqB,CAAC,IAAI,EAAE,EAAE,EAAE,EAAE,CAAC,CAAA;CACjD,CAAA;AAED,wBAAgB,KAAK,CACnB,CAAC,EACD,CAAC,EACD,KAAK,EACL,OAAO,EACP,MAAM,EACN,KAAK,EACL,OAAO,EACP,IAAI,SAAS,KAAK,GAAG,MAAM,GAAG,KAAK,EACnC,IAAI,EACJ,EAAE,GAAG,KAAK,EACV,EAAE,GAAG,KAAK,EACV,IAAI,GAAG,KAAK,EAEZ,cAAc,EAAE,cAAc,CAC5B,CAAC,EACD,KAAK,EACL,OAAO,EACP,MAAM,EACN,KAAK,EACL,OAAO,EACP,IAAI,EACJ,IAAI,EACJ,CAAC,CACF,EACD,YAAY,EAAE,CAAC,CAAC,EACd,GAAG,EAAE,OAAO,CAAC,OAAO,EACpB,GAAG,EAAE,OAAO,CAAC,QAAQ,EACrB,cAAc,EAAE,cAAc,EAC9B,EAAE,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,GAAG,eAAe,EAAE,IAAI,CAAC,KACrC,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,EAC9B,UAAU,CAAC,EAAE,UAAU,CACrB,CAAC,EACD,KAAK,EACL,OAAO,EACP,MAAM,EACN,KAAK,EACL,OAAO,EACP,IAAI,EACJ,IAAI,EACJ,CAAC,EACD,EAAE,EACF,EAAE,CACH,yMAwBF;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,EACvC,cAAc,EAAE,CAAC,GAAG,EAAE,IAAI,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,SAE9B,IAAI,OAAO,gBAAgB,KAAK,CAAC,4DAU/C;AAED,wBAAgB,kBAAkB,CAChC,CAAC,EACD,CAAC,EACD,KAAK,EACL,OAAO,EACP,MAAM,EACN,KAAK,EACL,OAAO,EACP,IAAI,SAAS,KAAK,GAAG,MAAM,GAAG,KAAK,EACnC,IAAI,GAAG,IAAI,EACX,EAAE,GAAG,KAAK,EACV,EAAE,GAAG,KAAK,EACV,IAAI,GAAG,KAAK,EAEZ,OAAO,EAAE,oBAAoB,CAC3B,CAAC,GAAG,EAAE,EACN,KAAK,EACL,OAAO,EACP,MAAM,EACN,KAAK,EACL,OAAO,EACP,IAAI,EACJ,IAAI,EACJ,CAAC,CACF,EACD,YAAY,EAAE,CAAC,CAAC,EACd,GAAG,EAAE,OAAO,CAAC,OAAO,EACpB,GAAG,EAAE,OAAO,CAAC,QAAQ,EACrB,cAAc,EAAE,cAAc,EAC9B,EAAE,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,GAAG,eAAe,EAAE,IAAI,CAAC,KACrC,MAAM,CAAC,IAAI,GAAG,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,EAClC,qBAAqB,CAAC,EAAE,qBAAqB,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,GACvD,CAAC,GAAG,EAAE,OAAO,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,QAAQ,KAAK,MAAM,CAAC,IAAI,GAAG,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,CA2KrF;AAED,MAAM,MAAM,eAAe,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,mBAAmB,CAAA;CAAE,CAAA;AACpE,MAAM,MAAM,mBAAmB,GAAG,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,eAAe,CAAC,CAAA;AAEzG,MAAM,MAAM,iBAAiB,GAAG,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;AAE3F,KAAK,QAAQ,CAAC,CAAC,SAAS,eAAe,IAAI;KACxC,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,cAAc,CACzC,MAAM,CAAC,EACP,GAAG,EAAE,eAAe;IACpB,GAAG,EAAE,iBAAiB;IACtB,GAAG,EAAE,gBAAgB;IACrB,GAAG,EAAE,eAAe;IACpB,GAAG,EAAE,iBAAiB;IACtB,GAAG,EAAE,cAAc;IACnB,GAAG,EAAE,cAAc;IACnB,eAAe,CAChB,GAAG,UAAU,CAAC,CAAC,EAAE,KAAK,CAAC,GACpB,KAAK;CACV,CAAA;AAED,MAAM,MAAM,UAAU,CACpB,CAAC,EAQD,EAAE,GAAG,KAAK,IACR,MAAM,CACN,EAAE,CAAC,gBAAgB,GACnB,EAAE,CAAC,UAAU,GACb,OAAO,CACP,CAAC,EACD,EAAE,CACH,EACD,KAAK,EACL,kBAAkB,CACnB,CAAA;AAED;;;GAGG;AACH,wBAAgB,QAAQ,CAAC,CAAC,SAAS,eAAe,EAAE,QAAQ,EAAE,CAAC,eAO9D;AAED;;;GAGG;AACH,wBAAgB,WAAW,CAAC,CAAC,SAAS,mBAAmB,EAAE,QAAQ,EAAE,CAAC,4BAQrE;AAED,MAAM,MAAM,mBAAmB,GAAG;IAChC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAA;CACnD,CAAA;AAED,MAAM,MAAM,YAAY,CAAC,CAAC,SAAS,mBAAmB,IAAI;KACvD,CAAC,IAAI,MAAM,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CAC/B,CAAA;AAID,MAAM,MAAM,OAAO,CAAC,CAAC,SAAS,MAAM,IAAI,MAAM,SAAS,CAAC,GAAG,MAAM,GAAG;KACjE,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,GAAG,CAChB,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,MAAM,CAAC,GAAG,CAAC,SAAS,MAAM,GAAG,CAAC,SAAS,SAAS,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,GACzF,WAAW,CAAC,CAAC,CAAC,SAAS,MAAM,EAAE,GAAG,CAAC;SAChC,CAAC,IAAI,MAAM,EAAE,IAAI,GAAG,OAAO,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC,IAAI,OAAO,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;KAC1F,CAAC,GACF,KAAK,GACP,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,GACV,KAAK,KACN,IAAI;CACV,SAAS,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,CAAC,KAAK,IAAI,CAAC,GAAG,CAAC,SAAS,OAAO,GAAiB;KAAG,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAAE,GAAG,KAAK,GAClH,KAAK,CAAA;AAEP,KAAK,WAAW,CAAC,CAAC,SAAS,MAAM,IAAI,MAAM,SAAS,CAAC,GAAG,MAAM,GAAG;KAC9D,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,GAAG,CAChB,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,MAAM,CAAC,GAAG,CAAC,SAAS,MAAM,GAAG,CAAC,SAAS,SAAS,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,GAMzF,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,GACZ,KAAK,GACL,KAAK,KACN,IAAI;CACV,SAAS,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,CAAC,KAAK,IAAI,CAAC,GAAG,CAAC,SAAS,OAAO,GAAiB;KAAG,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAAE,GAAG,KAAK,GAClH,KAAK,CAAA;AAEP,wBAAgB,MAAM,CACpB,OAAO,SAAS,MAAM,CACpB,MAAM,EACN,GAAG,CACJ,EAED,CAAC,EAAE,OAAO,GAAG;IAAE,eAAe,CAAC,EAAE,GAAG,CAAA;CAAE,EACtC,aAAa,CAAC,EAAE,GAAG,wEASgB,GAAG,EAAE,KAAG,GAAG,iMAAX,GAAG,EAAE,KAAG,GAAG,qIAqB/C;AAED,MAAM,MAAM,IAAI,CAAC,CAAC,IAAI,CAAC,SAAS;IAAE,KAAK,EAAE,EAAE,CAAC,SAAS,CAAA;CAAE,GAAG,CAAC,CAAC,OAAO,CAAC,GAChE,CAAC,SAAS,EAAE,CAAC,SAAS,GAAG,CAAC,GAC1B,KAAK,CAAA;AAET,MAAM,WAAW,UAAU,CACzB,GAAG,EACH,CAAC,EACD,CAAC,EACD,GAAG,EACH,SAAS,SAAS,EAAE,CAAC,SAAS,EAC9B,SAAS,SAAS,EAAE,CAAC,SAAS,EAC9B,GAAG,GAAG,GAAG;IAET,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC,CAAA;IAC1C,OAAO,EAAE,SAAS,CAAA;IAClB,QAAQ,EAAE,SAAS,CAAA;IACnB,eAAe,EAAE,GAAG,CAAA;CACrB;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,aAAa,CAAC,QAAQ,SAAS,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,QAAQ,kuBA2BhG;AAED,MAAM,MAAM,aAAa,CAAC,SAAS,IAAI,YAAY,CACjD,SAAS,SAAS;IAAE,KAAI,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,GAAG,CAAA;CAAE,GAAG,SAAS,GACtD,KAAK,CACV,CAAA;AAED,MAAM,MAAM,aAAa,CAAC,SAAS,IAAI,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAA"}
1
+ {"version":3,"file":"routing.d.ts","sourceRoot":"","sources":["../../_src/api/routing.ts"],"names":[],"mappings":"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"}
@@ -8,6 +8,7 @@ import * as tsplus_module_7 from "@effect-app/prelude/utils";
8
8
  import * as tsplus_module_8 from "@effect-app/prelude/_ext/misc";
9
9
  import * as tsplus_module_9 from "@effect-app/core/Option";
10
10
  import * as tsplus_module_10 from "@effect-app/infra/api/setupRequest";
11
+ import * as tsplus_module_11 from "@effect/io/Debug";
11
12
  /* eslint-disable @typescript-eslint/no-explicit-any */
12
13
  import * as Ex from "@effect-app/infra-adapters/express";
13
14
  import { extractSchema, SchemaNamed } from "@effect-app/prelude/schema";
@@ -109,7 +110,7 @@ export function makeRequestHandler(handler, errorHandler, makeMiddlewareContext)
109
110
  return requestContext;
110
111
  }
111
112
  return (req, res) => {
112
- return tsplus_module_3.flatMap(tsplus_module_3.struct({
113
+ return tsplus_module_11.untraced(() => tsplus_module_3.flatMap(tsplus_module_3.struct({
113
114
  requestContext: tsplus_module_3.sync(() => {
114
115
  const requestContext = makeContext(req);
115
116
  if (req.method === "GET") {
@@ -181,7 +182,7 @@ export function makeRequestHandler(handler, errorHandler, makeMiddlewareContext)
181
182
  undefined
182
183
  })(tsplus_module_3.logInfo("Finished request"));
183
184
  })), tsplus_module_6.tag, requestContext) // otherwise external error reporter breaks.
184
- , requestContext));
185
+ , requestContext)));
185
186
  };
186
187
  }
187
188
  /**
@@ -243,4 +244,4 @@ export function matchResource(mod) {
243
244
  return handler;
244
245
  };
245
246
  }
246
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"routing.js","sourceRoot":"","sources":["../../_src/api/routing.ts"],"names":[],"mappings":"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"}
247
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"routing.js","sourceRoot":"","sources":["../../_src/api/routing.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,uDAAuD;AACvD,OAAO,KAAK,EAAE,MAAM,oCAAoC,CAAA;AAGxD,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AACvE,OAAO,KAAK,EAAE,MAAM,4BAA4B,CAAA;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAA;AAGlD,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAA;AAEhE,OAAO,EAAE,wBAAwB,EAAE,MAAM,0BAA0B,CAAA;AAEnE,OAAO,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAA;AAEvE,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAA;AACjE,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAA;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;AAEtC,MAAM,CAAC,MAAM,eAAe,GAAG,2BAAoB;IACjD,OAAO,EAAE,KAAK;CACf,CAAC,CAAA;AAEF,MAAM,UAAU,kBAAkB,CAWhC,OAUY;IAEZ,MAAM,EAAE,GAAG,2BACT,oBAGO,EAAE,CAAC,WAAW,EAHrB,oBAEO,AA5CC,EAAE,CA4CH,MAAM,CAAC,GAAG,EAFjB,oBACO,CAAC,CAAC,EAAE,CAAC,CAAC,EADb,6BAAoB,OAAO,CAAC,OAAO,CAAC,CACtB,CACI,CACI,CACvB,CAAA;IACD,MAAM,YAAY,GAAG,CAAC,CAAU,EAAE,EAAE,CAAC,8BAAA,EAAE,EAAY,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IAE7D,MAAM,EAAE,GAAG,2BACT,oBAGO,EAAE,CAAC,WAAW,EAHrB,oBAEO,AApDC,EAAE,CAoDH,MAAM,CAAC,GAAG,EAFjB,oBACO,CAAC,CAAC,EAAE,CAAC,CAAC,EADb,6BAAoB,OAAO,CAAC,KAAK,CAAC,CACpB,CACI,CACI,CACvB,CAAA;IACD,MAAM,UAAU,GAAG,CAAC,CAAU,EAAE,EAAE,CAAC,8BAAA,EAAE,EAAY,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IAE3D,MAAM,EAAE,GAAG,2BACT,oBAGO,EAAE,CAAC,WAAW,EAHrB,oBAEO,AA5DC,EAAE,CA4DH,MAAM,CAAC,GAAG,EAFjB,oBACO,CAAC,CAAC,EAAE,CAAC,CAAC,EADb,6BAAoB,OAAO,CAAC,IAAI,CAAC,CACnB,CACI,CACI,CACvB,CAAA;IACD,MAAM,SAAS,GAAG,CAAC,CAAU,EAAE,EAAE,CAAC,8BAAA,EAAE,EAAY,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IAE1D,MAAM,EAAE,GAAG,2BACT,oBAGO,EAAE,CAAC,WAAW,EAHrB,oBAEO,AApEC,EAAE,CAoEH,MAAM,CAAC,GAAG,EAFjB,oBACO,CAAC,CAAC,EAAE,CAAC,CAAC,EADb,6BAAoB,OAAO,CAAC,IAAI,CAAC,CACnB,CACI,CACI,CACvB,CAAA;IACD,MAAM,SAAS,GAAG,CAAC,CAAU,EAAE,EAAE,CAAC,8BAAA,EAAE,EAAY,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IAE1D,MAAM,EAAE,GAAG,2BACT,oBAGO,EAAE,CAAC,WAAW,EAHrB,oBAEO,AA5EC,EAAE,CA4EH,MAAM,CAAC,GAAG,EAFjB,oBACO,CAAC,CAAC,EAAE,CAAC,CAAC,EADb,6BAAoB,OAAO,CAAC,MAAM,CAAC,CACrB,CACI,CACI,CACvB,CAAA;IACD,MAAM,WAAW,GAAG,CAAC,CAAU,EAAE,EAAE,CAAC,8BAAA,EAAE,EAAY,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IAE5D,OAAO;QACL,SAAS;QACT,WAAW;QACX,YAAY;QACZ,SAAS;QACT,UAAU;KACX,CAAA;AACH,CAAC;AA2BD,MAAM,UAAU,KAAK,CAcnB,cAUC,EACD,YAK8B,EAC9B,UAYC;IAED,IAAI,qBAAqB,GAAG,SAAS,CAAA;IACrC,IAAI,UAAU,EAAE;QACd,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,UAAU,CAAC,cAAc,CAAC,CAAA;QAC3D,cAAc,GAAG,OAAO,CAAA;QACxB,qBAAqB,GAAG,WAAW,CAAA;KACpC;IACD,OAAO,yBAAA,EAAE,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,EAAS,CAAC,CACjE,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EACzC,kBAAkB,CAChB,cAAc,EACd,YAAY,EACZ,qBAAqB,CACtB,CACF,EACC,qBAAO,GAAG,EAAE,CACV,mBAAmB,CACjB,cAAc,CAAC,OAAO,CAAC,IAAI,EAC3B,cAAc,CAAC,OAAO,CAAC,MAAM,EAC7B,cAAc,CACf,CACF,CACF,CAAA;AACH,CAAC;AAED,MAAM,UAAU,cAAc,CAC5B,cAA2C;IAE3C,OAAO,CAAC,GAAS,EAAE,GAAqB,EAAE,CAAI,EAAE,EAAE,CAChD,wBAAA,qBAAO,GAAG,EAAE,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EACzB,CAAC,CAAC,EAAE,CACX,qBAAO,GAAG,EAAE;QACV,CAAC,KAAK,SAAS;YACb,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE;YACxB,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC;iBACd,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAA;IAC9B,CAAC,CAAC,CACH,CAAA;AACP,CAAC;AAED,MAAM,UAAU,kBAAkB,CAchC,OAUC,EACD,YAKkC,EAClC,qBAAwD;IAExD,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,CAAC,EAAE,MAAM,EAAE,GAAG,OAAO,CAAA;IAC/D,MAAM,QAAQ,GAAG,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC,QAAe,CAAC,CAAC,CAAC,CAzOlD,EAAE,CAyOiD,IAAI,CAAA;IACjE,MAAM,OAAO,GAAG,AA1ON,EAAE,CA0OI,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;IACrC,MAAM,cAAc,GAAG,aAAa;QAClC,CAAC,CAAC,CAAC,GAAS,EAAE,EAAE,CAAC,AA5OT,EAAE,CA4OO,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;QAChD,CAAC,CAAC,GAAG,EAAE,CAAC,OAAO,CAAA;IAEjB,MAAM,cAAc,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAA;IAClD,MAAM,YAAY,GAAG,kBAAkB,CAAC,cAAc,CAAC,CAAA;IACvD,MAAM,OAAO,GAAG,cAAc,CAAC,cAAc,CAAC,CAAA;IAE9C,SAAS,SAAS,CAAC,GAAoB;QACrC,OAAO,qBAAO,GAAG,EAAE,CAAC,CAAC;YACnB,IAAI,EAAE,GAAG,CAAC,MAAM;YAChB,KAAK,EAAE,GAAG,CAAC,KAAK;YAChB,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,OAAO,EAAE,GAAG,CAAC,OAAO;YACpB,OAAO,EAAE,GAAG,CAAC,OAAO;SACrB,CAAC,CAAC,CAAA;IACL,CAAC;IAED,SAAS,WAAW,CAAC,GAAoB;QACvC,MAAM,KAAK,GAAG,IAAI,IAAI,EAAE,CAAA;QACxB,MAAM,SAAS,GAAG,CAAC,IAAI,EAAE,IAAI,CAAU,CAAA;QACvC,MAAM,aAAa,GAAG,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;QAC7C,MAAM,MAAM,GAAG,aAAa,IAAI,SAAS,CAAC,QAAQ,CAAC,aAAoB,CAAC;YACtE,CAAC,CAAE,aAA0C;YAC7C,CAAC,CAAE,IAAc,CAAA;QAEnB,0CAA0C;QAC1C,kBAAkB;QAClB,0CAA0C;QAC1C,IAAI;QAEJ,MAAM,SAAS,GAAG,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,CAAA;QAC3C,MAAM,MAAM,GAAG,SAAS,CAAC,CAAC,CAAC,4BAAA,SAAS,EAAa,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,EAAE,CAAA;QAE9E,MAAM,cAAc,GAAG,IAAI,cAAc,CAAC;YACxC,MAAM;YACN,IAAI,EAAE,AA/QA,EAAE,CA+QF,gBAAgB,CACpB,OAAO,CAAC,KAAK,YAAY,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CACzE;YACD,MAAM;YACN,SAAS,EAAE,KAAK;YAChB,iCAAiC;YACjC,QAAQ;YACR,yCAAyC;YACzC,mDAAmD;YACnD,gBAAgB;YAChB,8CAA8C;YAC9C,SAAS;YACT,MAAM;YACN,UAAU;SACX,CAAC,CAAA;QACF,0CAA0C;QAC1C,OAAO,cAAc,CAAA;IACvB,CAAC;IAED,OAAO,CAAC,GAAoB,EAAE,GAAqB,EAAE,EAAE;QACrD,OAAO,0BAAe,GAAG,EAAE,CACzB,wBAAA,uBAAc;YACZ,cAAc,EAAE,qBAAO,GAAG,EAAE;gBAC1B,MAAM,cAAc,GAAG,WAAW,CAAC,GAAG,CAAC,CAAA;gBACvC,IAAI,GAAG,CAAC,MAAM,KAAK,KAAK,EAAE;oBACxB,GAAG,CAAC,SAAS,CAAC,eAAe,EAAE,UAAU,CAAC,CAAA;iBAC3C;gBACD,GAAG,CAAC,SAAS,CAAC,kBAAkB,EAAE,cAAc,CAAC,MAAM,CAAC,CAAA;gBACxD,OAAO,cAAc,CAAA;YACvB,CAAC,CAAC;YACF,IAAI,EAAE,SAAS,CAAC,GAAG,CAAC;SACrB,CAAC,EACS,CAAC,EAAE,IAAI,EAAE,cAAc,EAAE,EAAE,EAAE,CACpC,8BAAA,+BAAA,oBAAA,8BAAA,yBAAA,4CAAA,eAAe,GAAa,CAAC,CAAC,EAAE,CAE5B,6BAAoB;YAClB,MAAM,EAAE,GAAG,CAAC,MAAM;YAClB,IAAI,EAAE,GAAG,CAAC,WAAW;YACrB,GAAG,CAAC,CAAC,OAAO;gBACV,CAAC,CAAC;oBACA,OAAO,uDAAE,IAAI,CAAC,IAAI,EAAU;oBAC5B,QAAQ,uDAAE,IAAI,CAAC,KAAK,EAAU;oBAC9B,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC;oBAC1B,UAAU,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;oBAChC,UAAU,uDAAE,IAAI,CAAC,OAAO,EAAU;iBACnC,CAAC,CAAC;gBACH,SAAS;SACZ,CAAC,CAbJ,wBAAe,kBAAkB,CAAC,CAcjC,CACF,EACC,+BAAsB,GAAG,EAAE;YACzB,MAAM,aAAa,GAAG,wBAAA,oBAAA,YAAY,CAAC,GAAG,CAAC,EAChC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE;gBAC7B,MAAM,EAAE,GAAG;oBACT,kCAAG,IAAI,CAAM;oBACb,kCAAG,KAAK,CAAM;oBACd,kCAAG,IAAI,CAAM;iBACK,CAAA;gBACpB,OAAO,EAAE,CAAA;YACX,CAAC,CAAC,EACO,SAAS,CAAC,EAAE,CACnB,wBAAA,MAAM,CAAC,SAAgB,CAAC,EACb,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,SAAS,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,CAC5C,CAAA;YACH,wCAAwC;YACxC,MAAM,CAAC,GAAG,GAAG,CAAC,MAAM,KAAK,KAAK,CAAC,CAAC,iCAAC,aAAa,EAAiB,CAAC,CAAC,aAAa,CAAA,CAAC,6CAA6C;YAC5H,sDAAsD;YACtD,MAAM,EAAE,GAAG,qBAAqB;gBAC9B,CAAC,CAAC,yCAA2B,qBAAqB,CAAC,GAAG,EAAE,GAAG,EAAE,cAAc,CAAC,EAA1E,CAAC,CAA0E;gBAC7E,0BAA0B;gBAC1B,CAAC,CAAC,CAAyC,CAAA;YAC7C,OAAO,YAAY,CACjB,GAAG,EACH,GAAG,EACH,cAAc,EACd,EAAE,CACH,CAAA;QACH,CAAC,CAAC,CACH,EACgB,KAAK,CAAC,EAAE,CACrB,8BAAA,yBACE,qBAAO,GAAG,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,EACpC,kBAAkB,CAAC,KAAK,EAAE;YACxB,cAAc;YACd,IAAI,EAAE,GAAG,CAAC,WAAW;YACrB,MAAM,EAAE,GAAG,CAAC,MAAM;SACnB,CAAC,EACF,+BAAsB,GAAG,EAAE;YACzB,MAAM,OAAO,GAAG,GAAG,CAAC,UAAU,EAAE,CAAA;YAChC,OAGQ,6BAAoB;gBAC1B,MAAM,EAAE,GAAG,CAAC,MAAM;gBAClB,IAAI,EAAE,GAAG,CAAC,WAAW;gBACrB,UAAU,EAAE,GAAG,CAAC,UAAU,CAAC,QAAQ,EAAE;gBAErC,OAAO,uDAAE,IAAI,CAAC,IAAI,EAAU;gBAC5B,QAAQ,uDAAE,IAAI,CAAC,KAAK,EAAU;gBAC9B,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC;gBAC1B,UAAU,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;gBAChC,UAAU,uDAAE,IAAI,CAAC,OAAO,EAAU;gBAElC,UAAU,uDAAE,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;oBAChE,IAAI,CAAC,GAAG,CAAC,GAAG,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAA;oBAC1E,OAAO,IAAI,CAAA;gBACb,CAAC,EAAE,EAAyB,CAAC,EACjB;aACb,CAAC,CAnBK,qCACL,kBAAkB,EAClB,KAAK,CACN,EAgBE;QACL,CAAC,CAAC,CACH,EACgB,KAAK,CAAC,EAAE,CAAC,qBAAO,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,sCAAsC,EAAE,KAAK,CAAC,CAAC,CAAC,CACtG,EACI,GAAG,EAAE,CACR,4CAAA,eAAe,GAAa,CAAC,CAAC,EAAE;YAC9B,MAAM,OAAO,GAAG,GAAG,CAAC,UAAU,EAAE,CAAA;YAChC,OAAgD,6BAAoB;gBAClE,MAAM,EAAE,GAAG,CAAC,MAAM;gBAClB,IAAI,EAAE,GAAG,CAAC,WAAW;gBACrB,UAAU,EAAE,GAAG,CAAC,UAAU,CAAC,QAAQ,EAAE;gBACrC,GAAG,CAAC,CAAC,OAAO;oBACV,CAAC,CAAC;wBACA,UAAU,uDAAE,OAAO,EAAU;qBAC9B,CAAC,CAAC;oBACH,SAAS;aACZ,CAAC,CATK,wBAAe,kBAAkB,CAAC,EAStC;QACL,CAAC,CAAC,CACH,uBACmC,cAAc,CAAC,CAAC,4CAA4C;UAClF,cAAc,CAAC,CAChC,CACJ,CAAA;IACH,CAAC,CAAA;AACH,CAAC;AA2CD;;;GAGG;AACH,MAAM,UAAU,QAAQ,CAA4B,QAAW;IAC7D,MAAM,MAAM,GAAG,mDAAA,QAAQ,GAAS,MAAM,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE;QACnD,IAAI,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAsB,EAAE,wBAAwB,CAAC,CAAA;QAC/E,OAAO,IAAI,CAAA;IACb,CAAC,EAAE,EAAS,CAA8B,CAAA;IAE1C,OAAO,MAAM,CAAA;AACf,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,WAAW,CAAgC,QAAW;IACpE,MAAM,MAAM,GAAG,mDAAA,QAAQ,GAAS,MAAM,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE;QACnD,MAAM,OAAO,GAAG,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAA;QACvC,mDAAA,OAAO,GAAS,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,GAAa,IAAI,GAAa,EAAE,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAA;QACxF,OAAO,IAAI,CAAA;IACb,CAAC,EAAE,EAAS,CAA2C,CAAA;IAEvD,OAAO,MAAM,CAAA;AACf,CAAC;AAwCD,MAAM,UAAU,MAAM,CAMpB,CAAsC,EACtC,aAAmB;IAEnB,wDAAwD;IACxD,MAAM,OAAO,GAAG,EAAE,CAAC,cAAc,CAAC,CAAC,CAAC,CAAA;IACpC,MAAM,QAAQ,GAAG,EAAE,CAAC,eAAe,CAAC,CAAC,CAAC,CAAA;IAUtC,OAAO,CACL,CAAgC,EAChC,EAAE,CAAC,CAAC;QACJ,aAAa;QACb,CAAC;QACD,OAAO;QACP,QAAQ;QACR,eAAe,EAAE,CAAC,CAAC,eAAe,IAAI,QAAQ;KAQ9C,CAAA,CAAA;AACJ,CAAC;AAqBD;;;;;;;;;;;;;;GAcG;AACH,MAAM,UAAU,aAAa,CAAuD,GAAa;IAE/F,OAAO,CAOL,QAAmB,EACnB,EAAE;QACF,MAAM,OAAO,GAAG,mDAAA,GAAG,GAAS,MAAM,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE;YAC/C,IAAI,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAQ,CAAC,CAAA;YAClD,OAAO,IAAI,CAAA;QACb,CAAC,EAAE,EAAS,CAAC,CAAA;QAEb,OAAO,OASN,CAAA;IACH,CAAC,CAAA;AACH,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"setupRequest.d.ts","sourceRoot":"","sources":["../../_src/api/setupRequest.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;;;;;AAKrD,wBAAgB,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,cAAc,EAAE,cAAc,+CAS1F;;;;;AAKD,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,gEAE9D;;;;;AAKD,wBAAgB,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,wEAIrE"}
1
+ {"version":3,"file":"setupRequest.d.ts","sourceRoot":"","sources":["../../_src/api/setupRequest.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;;;;;AAKrD,wBAAgB,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,cAAc,EAAE,cAAc,+CAW1F;;;;;AAKD,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,gEAE9D;;;;;AAKD,wBAAgB,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,wEAMrE"}
@@ -1,8 +1,9 @@
1
1
  import * as tsplus_module_1 from "@effect/io/Effect";
2
2
  import * as tsplus_module_2 from "@effect-app/prelude/_ext/misc";
3
3
  import * as tsplus_module_3 from "@effect-app/core/Function";
4
- import * as tsplus_module_4 from "@effect-app/infra/RequestContext";
5
- import * as tsplus_module_5 from "@effect-app/prelude/schema";
4
+ import * as tsplus_module_4 from "@effect/io/Debug";
5
+ import * as tsplus_module_5 from "@effect-app/infra/RequestContext";
6
+ import * as tsplus_module_6 from "@effect-app/prelude/schema";
6
7
  export const setupRequest = setupRequest_1;
7
8
  export const setupRequestFrom = setupRequestFrom_1;
8
9
  import { RequestContext } from "../RequestContext.js";
@@ -10,31 +11,31 @@ import { RequestContext } from "../RequestContext.js";
10
11
  * @tsplus fluent effect/io/Effect setupRequest
11
12
  */
12
13
  function setupRequest_1(self, requestContext) {
13
- return tsplus_module_3.pipe(tsplus_module_1.logSpan(self, "request"), tsplus_module_2.logAnnotates({
14
+ return tsplus_module_4.untraced(() => tsplus_module_3.pipe(tsplus_module_1.logSpan(self, "request"), tsplus_module_2.logAnnotates({
14
15
  requestRootId: requestContext.rootId,
15
16
  requestId: requestContext.id,
16
17
  requestName: requestContext.name
17
- }));
18
+ })));
18
19
  }
19
20
  /**
20
21
  * @tsplus getter effect/io/Effect setupRequestFrom
21
22
  */
22
23
  function setupRequestFrom_1(self) {
23
- return tsplus_module_1.serviceWithEffect(tsplus_module_4.tag, requestContext => setupRequest_1(self, requestContext));
24
+ return tsplus_module_4.untraced(() => tsplus_module_1.serviceWithEffect(tsplus_module_5.tag, requestContext => setupRequest_1(self, requestContext)));
24
25
  }
25
26
  /**
26
27
  * @tsplus fluent effect/io/Effect setupRequestFromWith
27
28
  */
28
29
  export function setupReq3(self, name) {
29
- return tsplus_module_1.provideService(setupRequestFrom_1(self), tsplus_module_4.tag, makeInternalRequestContext(name));
30
+ return tsplus_module_4.untraced(() => tsplus_module_1.provideService(setupRequestFrom_1(self), tsplus_module_5.tag, makeInternalRequestContext(name)));
30
31
  }
31
32
  function makeInternalRequestContext(name) {
32
- const id = tsplus_module_5.StringId.make();
33
+ const id = tsplus_module_6.StringId.make();
33
34
  return new RequestContext({
34
35
  id,
35
36
  rootId: id,
36
37
  locale: "en",
37
- name: tsplus_module_5.ReasonableString(name)
38
+ name: tsplus_module_6.ReasonableString(name)
38
39
  });
39
40
  }
40
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2V0dXBSZXF1ZXN0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vX3NyYy9hcGkvc2V0dXBSZXF1ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O2FBS2dCLFlBQVk7YUFjWixnQkFBZ0I7QUFuQmhDLE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQTtBQUVyRDs7R0FFRztBQUNILHdCQUFzQyxJQUFxQixFQUFFLGNBQThCO0lBQ3pGLE9BQU8sZ0JBQUEsSUFBSSxDQUNULHdCQUFBLElBQUksRUFBUyxTQUFTLENBQUMsRUFDdkIsNkJBQW9CO1FBQ2xCLGFBQWEsRUFBRSxjQUFjLENBQUMsTUFBTTtRQUNwQyxTQUFTLEVBQUUsY0FBYyxDQUFDLEVBQUU7UUFDNUIsV0FBVyxFQUFFLGNBQWMsQ0FBQyxJQUFJO0tBQ2pDLENBQUMsQ0FDSCxDQUFBO0FBQ0gsQ0FBQztBQUVEOztHQUVHO0FBQ0gsNEJBQTBDLElBQXFCO0lBQzdELE9BQU8sdURBQW9DLGNBQWMsQ0FBQyxFQUFFLENBQUMsZUFBQSxJQUFJLEVBQWMsY0FBYyxDQUFDLENBQUMsQ0FBQTtBQUNqRyxDQUFDO0FBRUQ7O0dBRUc7QUFDSCxNQUFNLFVBQVUsU0FBUyxDQUFVLElBQXFCLEVBQUUsSUFBWTtJQUNwRSxPQUFPLGtEQUFBLElBQUksd0JBRTJCLDBCQUEwQixDQUFDLElBQUksQ0FBQyxDQUFDLENBQUE7QUFDekUsQ0FBQztBQUVELFNBQVMsMEJBQTBCLENBQUMsSUFBWTtJQUM5QyxNQUFNLEVBQUUsR0FBRyxnQkFBQSxRQUFRLENBQUMsSUFBSSxFQUFFLENBQUE7SUFDMUIsT0FBTyxJQUFJLGNBQWMsQ0FBQztRQUN4QixFQUFFO1FBQ0YsTUFBTSxFQUFFLEVBQUU7UUFDVixNQUFNLEVBQUUsSUFBSTtRQUNaLElBQUksRUFBRSxnQkFBQSxnQkFBZ0IsQ0FBQyxJQUFJLENBQUM7S0FDN0IsQ0FBQyxDQUFBO0FBQ0osQ0FBQyJ9
41
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2V0dXBSZXF1ZXN0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vX3NyYy9hcGkvc2V0dXBSZXF1ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7OzthQUtnQixZQUFZO2FBZ0JaLGdCQUFnQjtBQXJCaEMsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLHNCQUFzQixDQUFBO0FBRXJEOztHQUVHO0FBQ0gsd0JBQXNDLElBQXFCLEVBQUUsY0FBOEI7SUFDekYsT0FBTyx5QkFBZSxHQUFHLEVBQUUsQ0FDekIsZ0JBQUEsSUFBSSxDQUNGLHdCQUFBLElBQUksRUFBUyxTQUFTLENBQUMsRUFDdkIsNkJBQW9CO1FBQ2xCLGFBQWEsRUFBRSxjQUFjLENBQUMsTUFBTTtRQUNwQyxTQUFTLEVBQUUsY0FBYyxDQUFDLEVBQUU7UUFDNUIsV0FBVyxFQUFFLGNBQWMsQ0FBQyxJQUFJO0tBQ2pDLENBQUMsQ0FDSCxDQUNGLENBQUE7QUFDSCxDQUFDO0FBRUQ7O0dBRUc7QUFDSCw0QkFBMEMsSUFBcUI7SUFDN0QsT0FBTyx5QkFBZSxHQUFHLEVBQUUsQ0FBQyx1REFBb0MsY0FBYyxDQUFDLEVBQUUsQ0FBQyxlQUFBLElBQUksRUFBYyxjQUFjLENBQUMsQ0FBQyxDQUFDLENBQUE7QUFDdkgsQ0FBQztBQUVEOztHQUVHO0FBQ0gsTUFBTSxVQUFVLFNBQVMsQ0FBVSxJQUFxQixFQUFFLElBQVk7SUFDcEUsT0FBTyx5QkFBZSxHQUFHLEVBQUUsQ0FDekIsa0RBQUEsSUFBSSx3QkFFa0MsMEJBQTBCLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FDeEUsQ0FBQTtBQUNILENBQUM7QUFFRCxTQUFTLDBCQUEwQixDQUFDLElBQVk7SUFDOUMsTUFBTSxFQUFFLEdBQUcsZ0JBQUEsUUFBUSxDQUFDLElBQUksRUFBRSxDQUFBO0lBQzFCLE9BQU8sSUFBSSxjQUFjLENBQUM7UUFDeEIsRUFBRTtRQUNGLE1BQU0sRUFBRSxFQUFFO1FBQ1YsTUFBTSxFQUFFLElBQUk7UUFDWixJQUFJLEVBQUUsZ0JBQUEsZ0JBQWdCLENBQUMsSUFBSSxDQUFDO0tBQzdCLENBQUMsQ0FBQTtBQUNKLENBQUMifQ==
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@effect-app/infra",
3
- "version": "0.18.1",
3
+ "version": "0.18.2",
4
4
  "license": "MIT",
5
5
  "type": "module",
6
6
  "dependencies": {
@@ -22,7 +22,7 @@
22
22
  "redlock": "^4.2.0",
23
23
  "@effect-app/prelude": "0.17.1",
24
24
  "@effect-app/core": "0.17.1",
25
- "@effect-app/infra-adapters": "0.15.1",
25
+ "@effect-app/infra-adapters": "0.15.2",
26
26
  "@effect-app/schema": "0.15.1"
27
27
  },
28
28
  "devDependencies": {