effect-app 1.15.1 → 1.15.3

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,17 @@
1
1
  # @effect-app/prelude
2
2
 
3
+ ## 1.15.3
4
+
5
+ ### Patch Changes
6
+
7
+ - 97a0bf8: fix client type
8
+
9
+ ## 1.15.2
10
+
11
+ ### Patch Changes
12
+
13
+ - fb62f02: bwc
14
+
3
15
  ## 1.15.1
4
16
 
5
17
  ### Patch Changes
@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
6
6
  exports.makeClientRouter = void 0;
7
7
  var _REST = require("@effect-app/schema/REST");
8
8
  var _lib = require("../lib.cjs");
9
+ // TODO: get rid of Request in Request
9
10
  const makeClientRouter = () => {
10
11
  function Req() {
11
12
  return (fields, config) => {
@@ -1 +1 @@
1
- {"version":3,"file":"router.cjs","names":["_REST","require","_lib","makeClientRouter","Req","fields","config","req","success","Req_","Response","S","Void","req2","Object","assign","Request","exports"],"sources":["../../src/client/router.ts"],"sourcesContent":[null],"mappings":";;;;;;AACA,IAAAA,KAAA,GAAAC,OAAA;AACA,IAAAC,IAAA,GAAAD,OAAA;AAEO,MAAME,gBAAgB,GAAGA,CAAA,KAAmC;EACjE,SAASC,GAAGA,CAAA;IAiDV,OAAO,CACLC,MAAc,EACdC,MAAU,KACR;MACF;MACA,MAAMC,GAAG,GAAGD,MAAM,EAAEE,OAAO,GACvB,IAAAC,SAAI,EAAI;QAAE,GAAGH,MAAM;QAAEI,QAAQ,EAAEJ,MAAM,CAACE;MAAO,CAAE,CAAC,EAAK,CAASH,MAAM,CAAC,GACrE,IAAAI,SAAI,EAAC;QAAE,GAAGH,MAAM;QAAEE,OAAO,EAAEG,MAAC,CAACC,IAAI;QAAEF,QAAQ,EAAEC,MAAC,CAACC;MAAI,CAAE,CAAC,EAAK,CAASP,MAAM,CAAC;MAC/E,MAAMQ,IAAI,GAAGC,MAAM,CAACC,MAAM,CAACR,GAAG,EAAE;QAAES,OAAO,EAAET;MAAG,CAAE,CAAC,EAAC;MAClD,OAAOM,IAAI;IACb,CAAC;EACH;EAEA,OAAOT,GAAG;AACZ,CAAC;AAAAa,OAAA,CAAAd,gBAAA,GAAAA,gBAAA","ignoreList":[]}
1
+ {"version":3,"file":"router.cjs","names":["_REST","require","_lib","makeClientRouter","Req","fields","config","req","success","Req_","Response","S","Void","req2","Object","assign","Request","exports"],"sources":["../../src/client/router.ts"],"sourcesContent":[null],"mappings":";;;;;;AACA,IAAAA,KAAA,GAAAC,OAAA;AAEA,IAAAC,IAAA,GAAAD,OAAA;AAEA;AACO,MAAME,gBAAgB,GAAGA,CAAA,KAAmC;EACjE,SAASC,GAAGA,CAAA;IAmEV,OAAO,CACLC,MAAc,EACdC,MAAU,KACR;MACF;MACA,MAAMC,GAAG,GAAGD,MAAM,EAAEE,OAAO,GACvB,IAAAC,SAAI,EAAI;QAAE,GAAGH,MAAM;QAAEI,QAAQ,EAAEJ,MAAM,CAACE;MAAO,CAAE,CAAC,EAAK,CAASH,MAAM,CAAC,GACrE,IAAAI,SAAI,EAAC;QAAE,GAAGH,MAAM;QAAEE,OAAO,EAAEG,MAAC,CAACC,IAAI;QAAEF,QAAQ,EAAEC,MAAC,CAACC;MAAI,CAAE,CAAC,EAAK,CAASP,MAAM,CAAC;MAC/E,MAAMQ,IAAI,GAAGC,MAAM,CAACC,MAAM,CAACR,GAAG,EAAE;QAAES,OAAO,EAAET;MAAG,CAAE,CAAC,EAAC;MAClD,OAAOM,IAAI;IACb,CAAC;EACH;EAEA,OAAOT,GAAG;AACZ,CAAC;AAAAa,OAAA,CAAAd,gBAAA,GAAAA,gBAAA","ignoreList":[]}
@@ -2,6 +2,7 @@ import { Effect } from "@effect-app/core";
2
2
  import type { Schema } from "effect-app/schema";
3
3
  import { REST } from "effect-app/schema";
4
4
  import type { HttpClient } from "../http.js";
5
+ import { S } from "../lib.js";
5
6
  import type { ApiConfig } from "./config.js";
6
7
  import type { SupportedErrors } from "./errors.js";
7
8
  import type { FetchError, FetchResponse } from "./fetch.js";
@@ -21,10 +22,10 @@ type RequestHandlers<R, E, M extends Requests> = {
21
22
  mapPath: string;
22
23
  name: string;
23
24
  } : {
24
- handler: (req: InstanceType<REST.GetRequest<M[K]>>) => Effect<FetchResponse<ExtractResponse<REST.GetResponse<M[K]>>>, E, R>;
25
+ handler: (req: S.Schema.Type<REST.GetRequest<M[K]>>) => Effect<FetchResponse<ExtractResponse<REST.GetResponse<M[K]>>>, E, R>;
25
26
  Request: REST.GetRequest<M[K]>;
26
27
  Reponse: ExtractResponse<REST.GetResponse<M[K]>>;
27
- mapPath: (req: InstanceType<REST.GetRequest<M[K]>>) => string;
28
+ mapPath: (req: S.Schema.Type<REST.GetRequest<M[K]>>) => string;
28
29
  name: string;
29
30
  };
30
31
  };
@@ -36,10 +37,10 @@ type RequestHandlersE<R, E, M extends Requests> = {
36
37
  mapPath: string;
37
38
  name: string;
38
39
  } : {
39
- handler: (req: InstanceType<REST.GetRequest<M[K]>>) => Effect<FetchResponse<ExtractEResponse<REST.GetResponse<M[K]>>>, E, R>;
40
+ handler: (req: S.Schema.Type<REST.GetRequest<M[K]>>) => Effect<FetchResponse<ExtractEResponse<REST.GetResponse<M[K]>>>, E, R>;
40
41
  Request: REST.GetRequest<M[K]>;
41
42
  Reponse: ExtractResponse<REST.GetResponse<M[K]>>;
42
- mapPath: (req: InstanceType<REST.GetRequest<M[K]>>) => string;
43
+ mapPath: (req: S.Schema.Type<REST.GetRequest<M[K]>>) => string;
43
44
  name: string;
44
45
  };
45
46
  };
@@ -1 +1 @@
1
- {"version":3,"file":"clientFor.d.ts","sourceRoot":"","sources":["../../src/client/clientFor.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"clientFor.d.ts","sourceRoot":"","sources":["../../src/client/clientFor.ts"],"names":[],"mappings":"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"}
@@ -6,17 +6,17 @@ export declare const makeClientRouter: <RequestConfig extends object>() => <M>()
6
6
  }>(fields: Fields, config: C): BuildRequest<Fields, "/", "AUTO", M, C & {
7
7
  Response: C["success"];
8
8
  }> & {
9
- Request: M;
9
+ Request: BuildRequest<Fields, "/", "AUTO", M, C>;
10
10
  };
11
11
  <Fields extends S.Struct.Fields, C_1 extends RequestConfig>(fields: Fields, config: C_1): BuildRequest<Fields, "/", "AUTO", M, C_1 & {
12
12
  Response: typeof S.Void;
13
13
  }> & {
14
- Request: M;
14
+ Request: BuildRequest<Fields, "/", "AUTO", M, C_1>;
15
15
  };
16
16
  <Fields extends S.Struct.Fields>(fields: Fields): BuildRequest<Fields, "/", "AUTO", M, {
17
17
  Response: typeof S.Void;
18
18
  }> & {
19
- Request: M;
19
+ Request: BuildRequest<Fields, "/", "AUTO", M, import("vitest/dist/chunks/environment.C5eAp3K6.js").C>;
20
20
  };
21
21
  };
22
22
  //# sourceMappingURL=router.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../src/client/router.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAA;AAE3D,OAAO,EAAE,CAAC,EAAE,MAAM,WAAW,CAAA;AAE7B,eAAO,MAAM,gBAAgB,GAAI,aAAa,SAAS,MAAM,QAC9C,CAAC,OAAK;IACjB,CAAC,MAA8B,SAAf,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,CAAmD,SAAzC,aAAa,GAAG;QAAE,OAAO,EAAE,CAAC,CAAC,MAAM,CAAC,GAAG,CAAA;KAAE,EAClF,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,CAAC,GAEP,YAAY,CACZ,MAAM,EACN,GAAG,EACH,MAAM,EACN,CAAC,EACD,CAAC,GAAG;QACF,QAAQ,EAAE,CAAC,CAAC,SAAS,CAAC,CAAA;KACvB,CACF,GACC;QACA,OAAO,EAAE,CAAC,CAAA;KACX,CAAA;IACH,CAAC,MAA8B,SAAf,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,GAAuB,SAAb,aAAa,EACtD,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,GAAC,GAEP,YAAY,CACZ,MAAM,EACN,GAAG,EACH,MAAM,EACN,CAAC,EACD,GAAC,GAAG;QACF,QAAQ,EAAE,OAAO,CAAC,CAAC,IAAI,CAAA;KACxB,CACF,GACC;QACA,OAAO,EAAE,CAAC,CAAA;KACX,CAAA;IACH,CAAC,MAA8B,SAAf,CAAC,CAAC,MAAM,CAAC,MAAM,EAC7B,MAAM,EAAE,MAAM,GAEZ,YAAY,CACZ,MAAM,EACN,GAAG,EACH,MAAM,EACN,CAAC,EACD;QACE,QAAQ,EAAE,OAAO,CAAC,CAAC,IAAI,CAAA;KACxB,CACF,GACC;QACA,OAAO,EAAE,CAAC,CAAA;KACX,CAAA;CAgBN,CAAA"}
1
+ {"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../src/client/router.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAA;AAG3D,OAAO,EAAE,CAAC,EAAE,MAAM,WAAW,CAAA;AAG7B,eAAO,MAAM,gBAAgB,GAAI,aAAa,SAAS,MAAM,QAC9C,CAAC,OAAK;IACjB,CAAC,MAA8B,SAAf,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,CAAmD,SAAzC,aAAa,GAAG;QAAE,OAAO,EAAE,CAAC,CAAC,MAAM,CAAC,GAAG,CAAA;KAAE,EAClF,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,CAAC,GAEP,YAAY,CACZ,MAAM,EACN,GAAG,EACH,MAAM,EACN,CAAC,EACD,CAAC,GAAG;QACF,QAAQ,EAAE,CAAC,CAAC,SAAS,CAAC,CAAA;KACvB,CACF,GACC;QACA,OAAO,EAAE,YAAY,CACnB,MAAM,EACN,GAAG,EACH,MAAM,EACN,CAAC,EACD,CAAC,CACF,CAAA;KACF,CAAA;IACH,CAAC,MAA8B,SAAf,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,GAAuB,SAAb,aAAa,EACtD,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,GAAC,GAEP,YAAY,CACZ,MAAM,EACN,GAAG,EACH,MAAM,EACN,CAAC,EACD,GAAC,GAAG;QACF,QAAQ,EAAE,OAAO,CAAC,CAAC,IAAI,CAAA;KACxB,CACF,GACC;QACA,OAAO,EAAE,YAAY,CACnB,MAAM,EACN,GAAG,EACH,MAAM,EACN,CAAC,EACD,GAAC,CACF,CAAA;KACF,CAAA;IACH,CAAC,MAA8B,SAAf,CAAC,CAAC,MAAM,CAAC,MAAM,EAC7B,MAAM,EAAE,MAAM,GAEZ,YAAY,CACZ,MAAM,EACN,GAAG,EACH,MAAM,EACN,CAAC,EACD;QACE,QAAQ,EAAE,OAAO,CAAC,CAAC,IAAI,CAAA;KACxB,CACF,GACC;QACA,OAAO,EAAE,YAAY,CACnB,MAAM,EACN,GAAG,EACH,MAAM,EACN,CAAC,EACD,sDAAC,CACF,CAAA;KACF,CAAA;CAgBN,CAAA"}
@@ -1,5 +1,6 @@
1
1
  import { Req as Req_ } from "@effect-app/schema/REST";
2
2
  import { S } from "../lib.js";
3
+ // TODO: get rid of Request in Request
3
4
  export const makeClientRouter = () => {
4
5
  function Req() {
5
6
  return (fields, config) => {
@@ -13,4 +14,4 @@ export const makeClientRouter = () => {
13
14
  }
14
15
  return Req;
15
16
  };
16
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NsaWVudC9yb3V0ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLEdBQUcsSUFBSSxJQUFJLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQTtBQUNyRCxPQUFPLEVBQUUsQ0FBQyxFQUFFLE1BQU0sV0FBVyxDQUFBO0FBRTdCLE1BQU0sQ0FBQyxNQUFNLGdCQUFnQixHQUFHLEdBQWlDLEVBQUU7SUFDakUsU0FBUyxHQUFHO1FBaURWLE9BQU8sQ0FDTCxNQUFjLEVBQ2QsTUFBVSxFQUNWLEVBQUU7WUFDRix5RUFBeUU7WUFDekUsTUFBTSxHQUFHLEdBQUcsTUFBTSxFQUFFLE9BQU87Z0JBQ3pCLENBQUMsQ0FBQyxJQUFJLENBQUksRUFBRSxHQUFHLE1BQU0sRUFBRSxRQUFRLEVBQUUsTUFBTSxDQUFDLE9BQU8sRUFBRSxDQUFDLEVBQUssQ0FBUyxNQUFNLENBQUM7Z0JBQ3ZFLENBQUMsQ0FBQyxJQUFJLENBQUMsRUFBRSxHQUFHLE1BQU0sRUFBRSxPQUFPLEVBQUUsQ0FBQyxDQUFDLElBQUksRUFBRSxRQUFRLEVBQUUsQ0FBQyxDQUFDLElBQUksRUFBRSxDQUFDLEVBQUssQ0FBUyxNQUFNLENBQUMsQ0FBQTtZQUMvRSxNQUFNLElBQUksR0FBRyxNQUFNLENBQUMsTUFBTSxDQUFDLEdBQUcsRUFBRSxFQUFFLE9BQU8sRUFBRSxHQUFHLEVBQUUsQ0FBQyxDQUFBLENBQUMsTUFBTTtZQUN4RCxPQUFPLElBQUksQ0FBQTtRQUNiLENBQUMsQ0FBQTtJQUNILENBQUM7SUFFRCxPQUFPLEdBQUcsQ0FBQTtBQUNaLENBQUMsQ0FBQSJ9
17
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NsaWVudC9yb3V0ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLEdBQUcsSUFBSSxJQUFJLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQTtBQUVyRCxPQUFPLEVBQUUsQ0FBQyxFQUFFLE1BQU0sV0FBVyxDQUFBO0FBRTdCLHNDQUFzQztBQUN0QyxNQUFNLENBQUMsTUFBTSxnQkFBZ0IsR0FBRyxHQUFpQyxFQUFFO0lBQ2pFLFNBQVMsR0FBRztRQW1FVixPQUFPLENBQ0wsTUFBYyxFQUNkLE1BQVUsRUFDVixFQUFFO1lBQ0YseUVBQXlFO1lBQ3pFLE1BQU0sR0FBRyxHQUFHLE1BQU0sRUFBRSxPQUFPO2dCQUN6QixDQUFDLENBQUMsSUFBSSxDQUFJLEVBQUUsR0FBRyxNQUFNLEVBQUUsUUFBUSxFQUFFLE1BQU0sQ0FBQyxPQUFPLEVBQUUsQ0FBQyxFQUFLLENBQVMsTUFBTSxDQUFDO2dCQUN2RSxDQUFDLENBQUMsSUFBSSxDQUFDLEVBQUUsR0FBRyxNQUFNLEVBQUUsT0FBTyxFQUFFLENBQUMsQ0FBQyxJQUFJLEVBQUUsUUFBUSxFQUFFLENBQUMsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxFQUFLLENBQVMsTUFBTSxDQUFDLENBQUE7WUFDL0UsTUFBTSxJQUFJLEdBQUcsTUFBTSxDQUFDLE1BQU0sQ0FBQyxHQUFHLEVBQUUsRUFBRSxPQUFPLEVBQUUsR0FBRyxFQUFFLENBQUMsQ0FBQSxDQUFDLE1BQU07WUFDeEQsT0FBTyxJQUFJLENBQUE7UUFDYixDQUFDLENBQUE7SUFDSCxDQUFDO0lBRUQsT0FBTyxHQUFHLENBQUE7QUFDWixDQUFDLENBQUEifQ==
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "effect-app",
3
- "version": "1.15.1",
3
+ "version": "1.15.3",
4
4
  "license": "MIT",
5
5
  "type": "module",
6
6
  "dependencies": {
@@ -262,7 +262,7 @@ type RequestHandlers<R, E, M extends Requests> = {
262
262
  }
263
263
  : {
264
264
  handler: (
265
- req: InstanceType<REST.GetRequest<M[K]>>
265
+ req: S.Schema.Type<REST.GetRequest<M[K]>>
266
266
  ) => Effect<
267
267
  FetchResponse<ExtractResponse<REST.GetResponse<M[K]>>>,
268
268
  E,
@@ -270,7 +270,7 @@ type RequestHandlers<R, E, M extends Requests> = {
270
270
  >
271
271
  Request: REST.GetRequest<M[K]>
272
272
  Reponse: ExtractResponse<REST.GetResponse<M[K]>>
273
- mapPath: (req: InstanceType<REST.GetRequest<M[K]>>) => string
273
+ mapPath: (req: S.Schema.Type<REST.GetRequest<M[K]>>) => string
274
274
  name: string
275
275
  }
276
276
  }
@@ -289,7 +289,7 @@ type RequestHandlersE<R, E, M extends Requests> = {
289
289
  }
290
290
  : {
291
291
  handler: (
292
- req: InstanceType<REST.GetRequest<M[K]>>
292
+ req: S.Schema.Type<REST.GetRequest<M[K]>>
293
293
  ) => Effect<
294
294
  FetchResponse<ExtractEResponse<REST.GetResponse<M[K]>>>,
295
295
  E,
@@ -297,7 +297,7 @@ type RequestHandlersE<R, E, M extends Requests> = {
297
297
  >
298
298
  Request: REST.GetRequest<M[K]>
299
299
  Reponse: ExtractResponse<REST.GetResponse<M[K]>>
300
- mapPath: (req: InstanceType<REST.GetRequest<M[K]>>) => string
300
+ mapPath: (req: S.Schema.Type<REST.GetRequest<M[K]>>) => string
301
301
  name: string
302
302
  }
303
303
  }
@@ -1,7 +1,9 @@
1
1
  import type { BuildRequest } from "@effect-app/schema/REST"
2
2
  import { Req as Req_ } from "@effect-app/schema/REST"
3
+ import type { C } from "vitest/dist/chunks/environment.C5eAp3K6.js"
3
4
  import { S } from "../lib.js"
4
5
 
6
+ // TODO: get rid of Request in Request
5
7
  export const makeClientRouter = <RequestConfig extends object>() => {
6
8
  function Req<M>(): {
7
9
  <Fields extends S.Struct.Fields, C extends RequestConfig & { success: S.Schema.Any }>(
@@ -18,7 +20,13 @@ export const makeClientRouter = <RequestConfig extends object>() => {
18
20
  }
19
21
  >
20
22
  & {
21
- Request: M
23
+ Request: BuildRequest<
24
+ Fields,
25
+ "/",
26
+ "AUTO",
27
+ M,
28
+ C
29
+ >
22
30
  }
23
31
  <Fields extends S.Struct.Fields, C extends RequestConfig>(
24
32
  fields: Fields,
@@ -34,7 +42,13 @@ export const makeClientRouter = <RequestConfig extends object>() => {
34
42
  }
35
43
  >
36
44
  & {
37
- Request: M
45
+ Request: BuildRequest<
46
+ Fields,
47
+ "/",
48
+ "AUTO",
49
+ M,
50
+ C
51
+ >
38
52
  }
39
53
  <Fields extends S.Struct.Fields>(
40
54
  fields: Fields
@@ -49,7 +63,13 @@ export const makeClientRouter = <RequestConfig extends object>() => {
49
63
  }
50
64
  >
51
65
  & {
52
- Request: M
66
+ Request: BuildRequest<
67
+ Fields,
68
+ "/",
69
+ "AUTO",
70
+ M,
71
+ C
72
+ >
53
73
  }
54
74
  } {
55
75
  return <Fields extends S.Struct.Fields, C extends RequestConfig & { success: S.Schema.Any }>(