@effect-app/infra 2.34.2 → 2.35.1

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 (9) hide show
  1. package/CHANGELOG.md +20 -0
  2. package/dist/Model/query/new-kid-interpreter.d.ts +1 -1
  3. package/dist/Model/query/new-kid-interpreter.d.ts.map +1 -1
  4. package/dist/api/routing.d.ts +3 -3
  5. package/dist/api/routing.d.ts.map +1 -1
  6. package/dist/api/routing.js +15 -26
  7. package/package.json +13 -13
  8. package/src/api/routing.ts +20 -39
  9. package/test/dist/controller.test.d.ts.map +1 -1
package/CHANGELOG.md CHANGED
@@ -1,5 +1,25 @@
1
1
  # @effect-app/infra
2
2
 
3
+ ## 2.35.1
4
+
5
+ ### Patch Changes
6
+
7
+ - ab9d1ea: housekeeping: update packages
8
+ - Updated dependencies [469f28d]
9
+ - Updated dependencies [ab9d1ea]
10
+ - effect-app@2.24.1
11
+
12
+ ## 2.35.0
13
+
14
+ ### Minor Changes
15
+
16
+ - 3fa0eda: fix: stream error, change to nostream
17
+
18
+ ### Patch Changes
19
+
20
+ - Updated dependencies [3fa0eda]
21
+ - effect-app@2.24.0
22
+
3
23
  ## 2.34.2
4
24
 
5
25
  ### Patch Changes
package/dist/Model/query/new-kid-interpreter.d.ts CHANGED
@@ -3,7 +3,7 @@ import type { FilterResult } from "../filter/filterApi.js";
3
3
  import type { FieldValues } from "../filter/types.js";
4
4
  import { type QAll } from "../query/dsl.js";
5
5
  export declare const toFilter: <TFieldValues extends FieldValues, A, R, TFieldValuesRefined extends TFieldValues = TFieldValues>(q: QAll<TFieldValues, TFieldValuesRefined, A, R>) => {
6
- t: TFieldValues;
6
+ t: Exclude<TFieldValues, undefined>;
7
7
  limit: number;
8
8
  skip: number;
9
9
  select: readonly [keyof TFieldValues, ...(keyof TFieldValues)[]];
package/dist/Model/query/new-kid-interpreter.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"new-kid-interpreter.d.ts","sourceRoot":"","sources":["../../../src/Model/query/new-kid-interpreter.ts"],"names":[],"mappings":"AAEA,OAAO,EAAuB,CAAC,EAAE,MAAM,YAAY,CAAA;AAGnD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAA;AAC1D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AAErD,OAAO,EAAgB,KAAK,IAAI,EAAE,MAAM,iBAAiB,CAAA;AAiIzD,eAAO,MAAM,QAAQ,GACnB,YAAY,SAAS,WAAW,EAChC,CAAC,EACD,CAAC,EACD,mBAAmB,SAAS,YAAY,oBAErC,IAAI,CAAC,YAAY,EAAE,mBAAmB,EAAE,CAAC,EAAE,CAAC,CAAC;OAgBxB,YAAY;;;;;;;mBAhJc,KAAK,GAAG,MAAM;;;mBAAd,KAAK,GAAG,MAAM;;;;;CA4JjE,CAAA"}
1
+ {"version":3,"file":"new-kid-interpreter.d.ts","sourceRoot":"","sources":["../../../src/Model/query/new-kid-interpreter.ts"],"names":[],"mappings":"AAEA,OAAO,EAAuB,CAAC,EAAE,MAAM,YAAY,CAAA;AAGnD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAA;AAC1D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AAErD,OAAO,EAAgB,KAAK,IAAI,EAAE,MAAM,iBAAiB,CAAA;AAiIzD,eAAO,MAAM,QAAQ,GACnB,YAAY,SAAS,WAAW,EAChC,CAAC,EACD,CAAC,EACD,mBAAmB,SAAS,YAAY,oBAErC,IAAI,CAAC,YAAY,EAAE,mBAAmB,EAAE,CAAC,EAAE,CAAC,CAAC;;;;;;;;mBAhIE,KAAK,GAAG,MAAM;;;mBAAd,KAAK,GAAG,MAAM;;;;;CA4JjE,CAAA"}
package/dist/api/routing.d.ts CHANGED
@@ -5,6 +5,7 @@ import { Array, Effect, Layer, S } from "effect-app";
5
5
  import type { GetEffectContext, RPCContextMap } from "effect-app/client/req";
6
6
  import type { HttpServerError } from "effect-app/http";
7
7
  import { HttpRouter, HttpServerRequest } from "effect-app/http";
8
+ import type { ParseError } from "effect/ParseResult";
8
9
  import type { Contravariant } from "effect/Types";
9
10
  import type { Middleware } from "./routing/DynamicMiddleware.js";
10
11
  export type _R<T extends Effect<any, any, any>> = [T] extends [
@@ -17,12 +18,11 @@ export type EffectDeps<A> = {
17
18
  [K in keyof A as A[K] extends Effect<any, any, any> ? K : never]: A[K] extends Effect<any, any, any> ? A[K] : never;
18
19
  };
19
20
  /**
20
- * Plain jane JSON version
21
- * @deprecated use HttpRpcRouterNoStream.toHttpApp once support options
21
+ * Plain jane JSON version, with custom status codes just for fun
22
22
  */
23
23
  export declare const toHttpApp: <R extends RpcRouter.RpcRouter<any, any>>(self: R, options?: {
24
24
  readonly spanPrefix?: string;
25
- }) => HttpApp.Default<HttpServerError.RequestError, RpcRouter.RpcRouter.Context<R>>;
25
+ }) => HttpApp.Default<HttpServerError.RequestError | ParseError, RpcRouter.RpcRouter.Context<R>>;
26
26
  export interface Hint<Err extends string> {
27
27
  Err: Err;
28
28
  }
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
@@ -1,5 +1,5 @@
1
1
  import { Rpc, RpcRouter } from "@effect/rpc";
2
- import { Array, Cause, Chunk, Context, Duration, Effect, FiberRef, flow, Layer, Predicate, Request, S, Schedule, Schema, Stream } from "effect-app";
2
+ import { Array, Cause, Duration, Effect, FiberRef, flow, Layer, Predicate, Request, S, Schedule, Schema } from "effect-app";
3
3
  import { HttpHeaders, HttpRouter, HttpServerRequest, HttpServerResponse } from "effect-app/http";
4
4
  import { pretty, typedKeysOf, typedValuesOf } from "effect-app/utils";
5
5
  import { logError, reportError } from "../errorReporter.js";
@@ -10,32 +10,21 @@ const logRequestError = logError("Request");
10
10
  const reportRequestError = reportError("Request");
11
11
  const optimisticConcurrencySchedule = Schedule.once.pipe(Schedule.intersect(Schedule.recurWhile((a) => a?._tag === "OptimisticConcurrencyException")));
12
12
  /**
13
- * Plain jane JSON version
14
- * @deprecated use HttpRpcRouterNoStream.toHttpApp once support options
13
+ * Plain jane JSON version, with custom status codes just for fun
15
14
  */
16
15
  export const toHttpApp = (self, options) => {
17
- const handler = RpcRouter.toHandler(self, options);
18
- return Effect.withFiberRuntime((fiber) => {
19
- const context = fiber.getFiberRef(FiberRef.currentContext);
20
- const request = Context.unsafeGet(context, HttpServerRequest.HttpServerRequest);
21
- return Effect.flatMap(request.json, (_) => handler(_).pipe(Stream.provideContext(context), Stream.runCollect, Effect.map((_) => Chunk.toReadonlyArray(_)), Effect.andThen((_) => {
22
- let status = 200;
23
- for (const r of _.flat()) {
24
- if (typeof r === "number")
25
- continue;
26
- const results = Array.isArray(r) ? r : [r];
27
- if (results.some((_) => _._tag === "Failure" && _.cause._tag === "Die")) {
28
- status = 500;
29
- break;
30
- }
31
- if (results.some((_) => _._tag === "Failure" && _.cause._tag === "Fail")) {
32
- status = 422; // 418
33
- break;
34
- }
35
- }
36
- return HttpServerResponse.json(_, { status });
37
- }), Effect.orDie, Effect.tapDefect(reportError("RPCHttpApp"))));
38
- });
16
+ const handler = RpcRouter.toHandlerNoStream(self, options);
17
+ return HttpServerRequest.HttpServerRequest.pipe(Effect.flatMap((_) => _.json), Effect.flatMap(handler), Effect.flatMap((r) => {
18
+ let status = 200;
19
+ const results = Array.isArray(r) ? r : [r];
20
+ if (results.some((_) => _._tag === "Failure" && _.cause._tag === "Die")) {
21
+ status = 500;
22
+ }
23
+ else if (results.some((_) => _._tag === "Failure" && _.cause._tag === "Fail")) {
24
+ status = 422; // 418
25
+ }
26
+ return HttpServerResponse.json(r, { status }).pipe(Effect.orDie);
27
+ }), Effect.tapDefect(reportError("RPCHttpApp")));
39
28
  };
40
29
  export const RouterSymbol = Symbol();
41
30
  // export interface RouteMatcher<
@@ -244,4 +233,4 @@ export const RpcHeadersFromHttpHeaders = Effect
244
233
  yield* FiberRef.update(Rpc.currentHeaders, (headers) => HttpHeaders.merge(httpReq.headers, headers));
245
234
  })
246
235
  .pipe(Layer.effectDiscard);
247
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"routing.js","sourceRoot":"","sources":["../../src/api/routing.ts"],"names":[],"mappings":"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"}
236
+ //# 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.34.2",
3
+ "version": "2.35.1",
4
4
  "license": "MIT",
5
5
  "type": "module",
6
6
  "dependencies": {
@@ -13,7 +13,7 @@
13
13
  "proper-lockfile": "^4.1.2",
14
14
  "pure-rand": "6.1.0",
15
15
  "query-string": "^9.1.1",
16
- "effect-app": "2.23.2"
16
+ "effect-app": "2.24.1"
17
17
  },
18
18
  "devDependencies": {
19
19
  "@azure/cosmos": "^4.2.0",
@@ -24,9 +24,9 @@
24
24
  "@babel/plugin-syntax-import-attributes": "^7.26.0",
25
25
  "@babel/plugin-transform-modules-commonjs": "^7.26.3",
26
26
  "babel-plugin-replace-import-extension": "^1.1.4",
27
- "@sentry/node": "^8.47.0",
27
+ "@sentry/node": "^8.51.0",
28
28
  "@types/express": "^5.0.0",
29
- "@types/node": "~22.10.5",
29
+ "@types/node": "~22.10.9",
30
30
  "@types/proper-lockfile": "^4.1.4",
31
31
  "@types/redis": "^2.8.32",
32
32
  "@types/redlock": "^4.0.7",
@@ -37,23 +37,23 @@
37
37
  "redis": "^3.1.2",
38
38
  "redlock": "^4.2.0",
39
39
  "strip-ansi": "^7.1.0",
40
- "typescript": "^5.7.2",
41
- "vitest": "^2.1.8"
40
+ "typescript": "^5.7.3",
41
+ "vitest": "^3.0.4"
42
42
  },
43
43
  "peerDependencies": {
44
44
  "@azure/cosmos": "^4.2.0",
45
45
  "@azure/service-bus": "^7.9.5",
46
- "@effect/experimental": "^0.36.1",
47
- "@effect/platform": "^0.72.1",
48
- "@effect/rpc-http": "^0.45.1",
49
- "@effect/rpc": "^0.47.1",
50
- "@effect/sql": "^0.25.1",
51
- "@effect/vitest": "^0.16.1",
46
+ "@effect/experimental": "^0.39.1",
47
+ "@effect/platform": "^0.75.1",
48
+ "@effect/rpc-http": "^0.48.1",
49
+ "@effect/rpc": "^0.50.1",
50
+ "@effect/sql": "^0.28.1",
51
+ "@effect/vitest": "^0.17.3",
52
52
  "@sendgrid/helpers": "^8.0.0",
53
53
  "@sendgrid/mail": "^8.1.4",
54
54
  "redis": "^3.1.2",
55
55
  "redlock": "^4.2.0",
56
- "effect": "^3.12.1",
56
+ "effect": "^3.12.7",
57
57
  "express": "^4.21.2"
58
58
  },
59
59
  "typesVersions": {
package/src/api/routing.ts CHANGED
@@ -8,8 +8,6 @@ import type { NonEmptyArray, NonEmptyReadonlyArray } from "effect-app"
8
8
  import {
9
9
  Array,
10
10
  Cause,
11
- Chunk,
12
- Context,
13
11
  Duration,
14
12
  Effect,
15
13
  FiberRef,
@@ -19,13 +17,13 @@ import {
19
17
  Request,
20
18
  S,
21
19
  Schedule,
22
- Schema,
23
- Stream
20
+ Schema
24
21
  } from "effect-app"
25
22
  import type { GetEffectContext, RPCContextMap } from "effect-app/client/req"
26
23
  import type { HttpServerError } from "effect-app/http"
27
24
  import { HttpHeaders, HttpRouter, HttpServerRequest, HttpServerResponse } from "effect-app/http"
28
25
  import { pretty, typedKeysOf, typedValuesOf } from "effect-app/utils"
26
+ import type { ParseError } from "effect/ParseResult"
29
27
  import type { Contravariant } from "effect/Types"
30
28
  import { logError, reportError } from "../errorReporter.js"
31
29
  import { InfraLogger } from "../logger.js"
@@ -54,47 +52,30 @@ export type EffectDeps<A> = {
54
52
  [K in keyof A as A[K] extends Effect<any, any, any> ? K : never]: A[K] extends Effect<any, any, any> ? A[K] : never
55
53
  }
56
54
  /**
57
- * Plain jane JSON version
58
- * @deprecated use HttpRpcRouterNoStream.toHttpApp once support options
55
+ * Plain jane JSON version, with custom status codes just for fun
59
56
  */
60
57
  export const toHttpApp = <R extends RpcRouter.RpcRouter<any, any>>(self: R, options?: {
61
58
  readonly spanPrefix?: string
62
59
  }): HttpApp.Default<
63
- HttpServerError.RequestError,
60
+ HttpServerError.RequestError | ParseError,
64
61
  RpcRouter.RpcRouter.Context<R>
65
62
  > => {
66
- const handler = RpcRouter.toHandler(self, options)
67
- return Effect.withFiberRuntime((fiber) => {
68
- const context = fiber.getFiberRef(FiberRef.currentContext)
69
- const request = Context.unsafeGet(context, HttpServerRequest.HttpServerRequest)
70
- return Effect.flatMap(
71
- request.json,
72
- (_) =>
73
- handler(_).pipe(
74
- Stream.provideContext(context),
75
- Stream.runCollect,
76
- Effect.map((_) => Chunk.toReadonlyArray(_)),
77
- Effect.andThen((_) => {
78
- let status = 200
79
- for (const r of _.flat()) {
80
- if (typeof r === "number") continue
81
- const results = Array.isArray(r) ? r : [r]
82
- if (results.some((_: S.ExitEncoded<any, any, any>) => _._tag === "Failure" && _.cause._tag === "Die")) {
83
- status = 500
84
- break
85
- }
86
- if (results.some((_: S.ExitEncoded<any, any, any>) => _._tag === "Failure" && _.cause._tag === "Fail")) {
87
- status = 422 // 418
88
- break
89
- }
90
- }
91
- return HttpServerResponse.json(_, { status })
92
- }),
93
- Effect.orDie,
94
- Effect.tapDefect(reportError("RPCHttpApp"))
95
- )
96
- )
97
- })
63
+ const handler = RpcRouter.toHandlerNoStream(self, options)
64
+ return HttpServerRequest.HttpServerRequest.pipe(
65
+ Effect.flatMap((_) => _.json),
66
+ Effect.flatMap(handler),
67
+ Effect.flatMap((r) => {
68
+ let status = 200
69
+ const results = Array.isArray(r) ? r : [r]
70
+ if (results.some((_: S.ExitEncoded<any, any, any>) => _._tag === "Failure" && _.cause._tag === "Die")) {
71
+ status = 500
72
+ } else if (results.some((_: S.ExitEncoded<any, any, any>) => _._tag === "Failure" && _.cause._tag === "Fail")) {
73
+ status = 422 // 418
74
+ }
75
+ return HttpServerResponse.json(r, { status }).pipe(Effect.orDie)
76
+ }),
77
+ Effect.tapDefect(reportError("RPCHttpApp"))
78
+ )
98
79
  }
99
80
 
100
81
  export interface Hint<Err extends string> {
package/test/dist/controller.test.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"controller.test.d.ts","sourceRoot":"","sources":["../controller.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"controller.test.d.ts","sourceRoot":"","sources":["../controller.test.ts"],"names":[],"mappings":"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"}