@effect-app/infra 2.53.4 → 2.53.5

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.
Files changed (6) hide show
  1. package/CHANGELOG.md +6 -0
  2. package/dist/api/routing.d.ts +8 -8
  3. package/dist/api/routing.d.ts.map +1 -1
  4. package/dist/api/routing.js +5 -3
  5. package/package.json +1 -1
  6. package/src/api/routing.ts +3 -1
package/CHANGELOG.md CHANGED
@@ -1,5 +1,11 @@
1
1
  # @effect-app/infra
2
2
 
3
+ ## 2.53.5
4
+
5
+ ### Patch Changes
6
+
7
+ - ce235cb: fix: ParseError should Die
8
+
3
9
  ## 2.53.4
4
10
 
5
11
  ### Patch Changes
package/dist/api/routing.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { Array, Effect, Layer, type NonEmptyReadonlyArray, S } from "effect-app";
1
+ import { Array, Effect, Layer, type NonEmptyReadonlyArray, ParseResult, S } from "effect-app";
2
2
  import type { GetEffectContext, RPCContextMap } from "effect-app/client/req";
3
3
  import { type HttpHeaders, HttpRouter } from "effect-app/http";
4
4
  import type { Contravariant } from "effect/Types";
@@ -96,7 +96,7 @@ export declare const makeRouter: <Context, CTXMap extends Record<string, RPCCont
96
96
  meta: {
97
97
  moduleName: ModuleName;
98
98
  };
99
- })[K]>>, S.ParseResult.ParseError | S.Schema.Type<GetFailure<(Rsc & {
99
+ })[K]>>, ParseResult.ParseError | S.Schema.Type<GetFailure<(Rsc & {
100
100
  meta: {
101
101
  moduleName: ModuleName;
102
102
  };
@@ -106,7 +106,7 @@ export declare const makeRouter: <Context, CTXMap extends Record<string, RPCCont
106
106
  meta: {
107
107
  moduleName: ModuleName;
108
108
  };
109
- })[K]>>, S.ParseResult.ParseError | S.Schema.Type<GetFailure<(Rsc & {
109
+ })[K]>>, ParseResult.ParseError | S.Schema.Type<GetFailure<(Rsc & {
110
110
  meta: {
111
111
  moduleName: ModuleName;
112
112
  };
@@ -119,7 +119,7 @@ export declare const makeRouter: <Context, CTXMap extends Record<string, RPCCont
119
119
  meta: {
120
120
  moduleName: ModuleName;
121
121
  };
122
- })[K]>>, S.ParseResult.ParseError | S.Schema.Type<GetFailure<(Rsc & {
122
+ })[K]>>, ParseResult.ParseError | S.Schema.Type<GetFailure<(Rsc & {
123
123
  meta: {
124
124
  moduleName: ModuleName;
125
125
  };
@@ -127,7 +127,7 @@ export declare const makeRouter: <Context, CTXMap extends Record<string, RPCCont
127
127
  meta: {
128
128
  moduleName: ModuleName;
129
129
  };
130
- })[K]>>, S.ParseResult.ParseError | S.Schema.Type<GetFailure<(Rsc & {
130
+ })[K]>>, ParseResult.ParseError | S.Schema.Type<GetFailure<(Rsc & {
131
131
  meta: {
132
132
  moduleName: ModuleName;
133
133
  };
@@ -213,10 +213,10 @@ export declare const makeRouter: <Context, CTXMap extends Record<string, RPCCont
213
213
  } & RouteMatcher<CTXMap, Rsc_1, Context> & {
214
214
  router: AddAction<Filter<Rsc_1>[keyof Filter<Rsc_1>], {}>;
215
215
  router3: <const Impl extends { [K in keyof Filter<Rsc_1>]: ({
216
- raw: (req: S.Schema.Type<Rsc_1[K]>) => Effect<S.Schema.Encoded<GetSuccess<Rsc_1[K]>>, S.ParseResult.ParseError | S.Schema.Type<GetFailure<Rsc_1[K]>>, any>;
216
+ raw: (req: S.Schema.Type<Rsc_1[K]>) => Effect<S.Schema.Encoded<GetSuccess<Rsc_1[K]>>, ParseResult.ParseError | S.Schema.Type<GetFailure<Rsc_1[K]>>, any>;
217
217
  } | {
218
- raw: Effect<S.Schema.Encoded<GetSuccess<Rsc_1[K]>>, S.ParseResult.ParseError | S.Schema.Type<GetFailure<Rsc_1[K]>>, any>;
219
- }) | (((req: S.Schema.Type<Rsc_1[K]>) => Effect<S.Schema.Type<GetSuccess<Rsc_1[K]>>, S.ParseResult.ParseError | S.Schema.Type<GetFailure<Rsc_1[K]>>, any>) | Effect<S.Schema.Type<GetSuccess<Rsc_1[K]>>, S.ParseResult.ParseError | S.Schema.Type<GetFailure<Rsc_1[K]>>, any>); }>(impl: Impl) => { [K in keyof Impl & keyof Filter<Rsc_1>]: Handler<Filter<Rsc_1>[K], Impl[K] extends {
218
+ raw: Effect<S.Schema.Encoded<GetSuccess<Rsc_1[K]>>, ParseResult.ParseError | S.Schema.Type<GetFailure<Rsc_1[K]>>, any>;
219
+ }) | (((req: S.Schema.Type<Rsc_1[K]>) => Effect<S.Schema.Type<GetSuccess<Rsc_1[K]>>, ParseResult.ParseError | S.Schema.Type<GetFailure<Rsc_1[K]>>, any>) | Effect<S.Schema.Type<GetSuccess<Rsc_1[K]>>, ParseResult.ParseError | S.Schema.Type<GetFailure<Rsc_1[K]>>, any>); }>(impl: Impl) => { [K in keyof Impl & keyof Filter<Rsc_1>]: Handler<Filter<Rsc_1>[K], Impl[K] extends {
220
220
  raw: any;
221
221
  } ? "raw" : "d", Exclude<Context | Exclude<Impl[K] extends {
222
222
  raw: any;
package/dist/api/routing.d.ts.map CHANGED
@@ -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
@@ -6,7 +6,7 @@ import { determineMethod } from "@effect-app/infra/api/routing/utils";
6
6
  import { logError, reportError } from "@effect-app/infra/errorReporter";
7
7
  import { InfraLogger } from "@effect-app/infra/logger";
8
8
  import { Rpc, RpcGroup, RpcServer } from "@effect/rpc";
9
- import { Array, Cause, Duration, Effect, Layer, Predicate, Request, S, Schedule, Schema } from "effect-app";
9
+ import { Array, Cause, Duration, Effect, Layer, ParseResult, Predicate, Request, S, Schedule, Schema } from "effect-app";
10
10
  import { HttpRouter } from "effect-app/http";
11
11
  import { pretty, typedKeysOf, typedValuesOf } from "effect-app/utils";
12
12
  import { makeRpc } from "./routing/DynamicMiddleware.js";
@@ -124,7 +124,9 @@ export const makeRouter = (middleware, devMode) => {
124
124
  }, {}))
125
125
  .pipe(
126
126
  // can't use andThen due to some being a function and effect
127
- Effect.zipRight(handle(input, headers)), Effect.tapErrorCause((cause) => Cause.isFailure(cause) ? logRequestError(cause) : Effect.void), Effect.tapDefect((cause) => Effect
127
+ Effect.zipRight(handle(input, headers)),
128
+ // TODO: support ParseResult if the error channel of the request allows it.. but who would want that?
129
+ Effect.catchAll((_) => ParseResult.isParseError(_) ? Effect.die(_) : Effect.fail(_)), Effect.tapErrorCause((cause) => Cause.isFailure(cause) ? logRequestError(cause) : Effect.void), Effect.tapDefect((cause) => Effect
128
130
  .all([
129
131
  reportRequestError(cause, {
130
132
  action: `${meta.moduleName}.${req._tag}`
@@ -223,4 +225,4 @@ export const makeRouter = (middleware, devMode) => {
223
225
  };
224
226
  };
225
227
  export const RequestCacheLayers = Layer.mergeAll(Layer.setRequestCache(Request.makeCache({ capacity: 500, timeToLive: Duration.hours(8) })), Layer.setRequestCaching(true), Layer.setRequestBatching(true));
226
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"routing.js","sourceRoot":"","sources":["../../src/api/routing.ts"],"names":[],"mappings":"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"}
228
+ //# 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": "2.53.4",
3
+ "version": "2.53.5",
4
4
  "license": "MIT",
5
5
  "type": "module",
6
6
  "dependencies": {
package/src/api/routing.ts CHANGED
@@ -6,7 +6,7 @@ import { determineMethod } from "@effect-app/infra/api/routing/utils"
6
6
  import { logError, reportError } from "@effect-app/infra/errorReporter"
7
7
  import { InfraLogger } from "@effect-app/infra/logger"
8
8
  import { Rpc, RpcGroup, RpcServer } from "@effect/rpc"
9
- import { Array, Cause, Duration, Effect, Layer, type NonEmptyReadonlyArray, Predicate, Request, S, Schedule, Schema } from "effect-app"
9
+ import { Array, Cause, Duration, Effect, Layer, type NonEmptyReadonlyArray, ParseResult, Predicate, Request, S, Schedule, Schema } from "effect-app"
10
10
  import type { GetEffectContext, RPCContextMap } from "effect-app/client/req"
11
11
  import { type HttpHeaders, HttpRouter } from "effect-app/http"
12
12
  import { pretty, typedKeysOf, typedValuesOf } from "effect-app/utils"
@@ -342,6 +342,8 @@ export const makeRouter = <
342
342
  .pipe(
343
343
  // can't use andThen due to some being a function and effect
344
344
  Effect.zipRight(handle(input, headers)),
345
+ // TODO: support ParseResult if the error channel of the request allows it.. but who would want that?
346
+ Effect.catchAll((_) => ParseResult.isParseError(_) ? Effect.die(_) : Effect.fail(_)),
345
347
  Effect.tapErrorCause((cause) => Cause.isFailure(cause) ? logRequestError(cause) : Effect.void),
346
348
  Effect.tapDefect((cause) =>
347
349
  Effect