effect-app 0.176.1 → 0.177.0

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 +13 -0
  2. package/_cjs/client/clientFor.cjs +8 -8
  3. package/_cjs/client/clientFor.cjs.map +1 -1
  4. package/dist/client/clientFor.js +9 -9
  5. package/dist/client/errors.d.ts +30 -30
  6. package/dist/client/fetch.d.ts +4 -4
  7. package/package.json +3 -3
  8. package/src/client/clientFor.ts +8 -8
  9. package/vitest.config.ts.timestamp-1670862388823.mjs +23 -0
package/CHANGELOG.md CHANGED
@@ -1,5 +1,18 @@
1
1
  # @effect-app/prelude
2
2
 
3
+ ## 0.177.0
4
+
5
+ ### Minor Changes
6
+
7
+ - 32f852e: add requestname to span
8
+
9
+ ## 0.176.2
10
+
11
+ ### Patch Changes
12
+
13
+ - Updated dependencies [d1e4f1b]
14
+ - @effect-app/schema@0.201.2
15
+
3
16
  ## 0.176.1
4
17
 
5
18
  ### Patch Changes
package/_cjs/client/clientFor.cjs CHANGED
@@ -79,14 +79,14 @@ function clientFor_(models) {
79
79
  .flatMap(x => x.ast.propertySignatures);
80
80
  // @ts-expect-error doc
81
81
  prev[cur] = Request.method === "GET" ? fields.length === 0 ? {
82
- handler: (0, _fetch.fetchApi)(Request.method, Request.path).pipe(_core.Effect.flatMap((0, _fetch.mapResponseM)(parseResponse)), _core.Effect.withSpan("client.request", {
82
+ handler: (0, _fetch.fetchApi)(Request.method, Request.path).pipe(_core.Effect.flatMap((0, _fetch.mapResponseM)(parseResponse)), _core.Effect.withSpan("client.request " + requestName, {
83
83
  attributes: {
84
84
  "request.name": requestName
85
85
  }
86
86
  })),
87
87
  ...meta
88
88
  } : {
89
- handler: req => (0, _fetch.fetchApi)(Request.method, (0, _fetch.makePathWithQuery)(path, _lib.S.encodeSync(Request)(req))).pipe(_core.Effect.flatMap((0, _fetch.mapResponseM)(parseResponse)), _core.Effect.withSpan("client.request", {
89
+ handler: req => (0, _fetch.fetchApi)(Request.method, (0, _fetch.makePathWithQuery)(path, _lib.S.encodeSync(Request)(req))).pipe(_core.Effect.flatMap((0, _fetch.mapResponseM)(parseResponse)), _core.Effect.withSpan("client.request " + requestName, {
90
90
  attributes: {
91
91
  "request.name": requestName
92
92
  }
@@ -94,14 +94,14 @@ function clientFor_(models) {
94
94
  ...meta,
95
95
  mapPath: req => req ? (0, _fetch.makePathWithQuery)(path, _lib.S.encodeSync(Request)(req)) : Request.path
96
96
  } : fields.length === 0 ? {
97
- handler: (0, _fetch.fetchApi3S)(b)({}).pipe(_core.Effect.withSpan("client.request", {
97
+ handler: (0, _fetch.fetchApi3S)(b)({}).pipe(_core.Effect.withSpan("client.request " + requestName, {
98
98
  attributes: {
99
99
  "request.name": requestName
100
100
  }
101
101
  })),
102
102
  ...meta
103
103
  } : {
104
- handler: req => (0, _fetch.fetchApi3S)(b)(req).pipe(_core.Effect.withSpan("client.request", {
104
+ handler: req => (0, _fetch.fetchApi3S)(b)(req).pipe(_core.Effect.withSpan("client.request " + requestName, {
105
105
  attributes: {
106
106
  "request.name": requestName
107
107
  }
@@ -112,14 +112,14 @@ function clientFor_(models) {
112
112
  // generate handler
113
113
  // @ts-expect-error doc
114
114
  prev[`${cur}E`] = Request.method === "GET" ? fields.length === 0 ? {
115
- handler: (0, _fetch.fetchApi)(Request.method, Request.path).pipe(_core.Effect.flatMap((0, _fetch.mapResponseM)(parseResponseE)), _core.Effect.withSpan("client.request", {
115
+ handler: (0, _fetch.fetchApi)(Request.method, Request.path).pipe(_core.Effect.flatMap((0, _fetch.mapResponseM)(parseResponseE)), _core.Effect.withSpan("client.request " + requestName, {
116
116
  attributes: {
117
117
  "request.name": requestName
118
118
  }
119
119
  })),
120
120
  ...meta
121
121
  } : {
122
- handler: req => (0, _fetch.fetchApi)(Request.method, (0, _fetch.makePathWithQuery)(path, _lib.S.encodeSync(Request)(req))).pipe(_core.Effect.flatMap((0, _fetch.mapResponseM)(parseResponseE)), _core.Effect.withSpan("client.request", {
122
+ handler: req => (0, _fetch.fetchApi)(Request.method, (0, _fetch.makePathWithQuery)(path, _lib.S.encodeSync(Request)(req))).pipe(_core.Effect.flatMap((0, _fetch.mapResponseM)(parseResponseE)), _core.Effect.withSpan("client.request " + requestName, {
123
123
  attributes: {
124
124
  "request.name": requestName
125
125
  }
@@ -127,14 +127,14 @@ function clientFor_(models) {
127
127
  ...meta,
128
128
  mapPath: req => req ? (0, _fetch.makePathWithQuery)(path, _lib.S.encodeSync(Request)(req)) : Request.path
129
129
  } : fields.length === 0 ? {
130
- handler: (0, _fetch.fetchApi3SE)(b)({}).pipe(_core.Effect.withSpan("client.request", {
130
+ handler: (0, _fetch.fetchApi3SE)(b)({}).pipe(_core.Effect.withSpan("client.request " + requestName, {
131
131
  attributes: {
132
132
  "request.name": requestName
133
133
  }
134
134
  })),
135
135
  ...meta
136
136
  } : {
137
- handler: req => (0, _fetch.fetchApi3SE)(b)(req).pipe(_core.Effect.withSpan("client.request", {
137
+ handler: req => (0, _fetch.fetchApi3SE)(b)(req).pipe(_core.Effect.withSpan("client.request " + requestName, {
138
138
  attributes: {
139
139
  "request.name": requestName
140
140
  }
package/_cjs/client/clientFor.cjs.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"clientFor.cjs","names":["_core","require","_schema","_pathParser","_lib","_utils","_fetch","_config","Object","keys","forEach","key","prototype","hasOwnProperty","call","_exportNames","exports","defineProperty","enumerable","get","cache","Map","clientFor","models","found","m","clientFor_","set","typedKeysOf","filter","x","reduce","prev","cur","h","Request_","REST","extractRequest","Response","extractResponse","meta","Error","requestName","moduleName","replaceAll","Request","path","method","determineMethod","assign","Auto","b","mapPath","name","res","parseResponse","flow","S","decodeUnknown","_","Effect","mapError","err","ResError","parseResponseE","andThen","encode","Path","fields","Body","Query","flatMap","ast","propertySignatures","length","handler","fetchApi","pipe","mapResponseM","withSpan","attributes","req","makePathWithQuery","encodeSync","fetchApi3S","makePathWithBody","fetchApi3SE"],"sources":["../../src/client/clientFor.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;AAGA,IAAAA,KAAA,GAAAC,OAAA;AAEA,IAAAC,OAAA,GAAAD,OAAA;AACA,IAAAE,WAAA,GAAAF,OAAA;AAEA,IAAAG,IAAA,GAAAH,OAAA;AACA,IAAAI,MAAA,GAAAJ,OAAA;AAIA,IAAAK,MAAA,GAAAL,OAAA;AAUA,IAAAM,OAAA,GAAAN,OAAA;AAAAO,MAAA,CAAAC,IAAA,CAAAF,OAAA,EAAAG,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAC,YAAA,EAAAJ,GAAA;EAAA,IAAAA,GAAA,IAAAK,OAAA,IAAAA,OAAA,CAAAL,GAAA,MAAAJ,OAAA,CAAAI,GAAA;EAAAH,MAAA,CAAAS,cAAA,CAAAD,OAAA,EAAAL,GAAA;IAAAO,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAZ,OAAA,CAAAI,GAAA;IAAA;EAAA;AAAA;AAvBA;AACA;;AAgCA,MAAMS,KAAK,GAAG,IAAIC,GAAG,EAAoB;AAcnC,SAAUC,SAASA,CACvBC,MAAS;EAET,MAAMC,KAAK,GAAGJ,KAAK,CAACD,GAAG,CAACI,MAAM,CAAC;EAC/B,IAAIC,KAAK,EAAE;IACT,OAAOA,KAAK;EACd;EACA,MAAMC,CAAC,GAAGC,UAAU,CAACH,MAAM,CAAC;EAC5BH,KAAK,CAACO,GAAG,CAACJ,MAAM,EAAEE,CAAC,CAAC;EACpB,OAAOA,CAAC;AACV;AAEA,SAASC,UAAUA,CAAqBH,MAAS;EAC/C,OAAQ,IAAAK,kBAAW,EAACL,MAAM;EACxB;EAAA,CACCM,MAAM,CAAEC,CAAC,IAAKA,CAAC,KAAK,SAAS,IAAIA,CAAC,KAAK,MAAM,CAAC,CAC9CC,MAAM,CAAC,CAACC,IAAI,EAAEC,GAAG,KAAI;IACpB,MAAMC,CAAC,GAAGX,MAAM,CAACU,GAAG,CAAC;IAErB,MAAME,QAAQ,GAAGC,YAAI,CAACC,cAAc,CAACH,CAAC,CAAe;IACrD,MAAMI,QAAQ,GAAGF,YAAI,CAACG,eAAe,CAACL,CAAC,CAAC;IAExC,MAAMT,CAAC,GAAIF,MAAc,CAACiB,IAA8B;IACxD,IAAI,CAACf,CAAC,EAAE,MAAM,IAAIgB,KAAK,CAAC,8BAA8B,CAAC;IACvD,MAAMC,WAAW,GAAG,GAAGjB,CAAC,CAACkB,UAAU,IAAIV,GAAa,EAAE,CACnDW,UAAU,CAAC,KAAK,EAAE,EAAE,CAAC;IAExB,MAAMC,OAAO,GAAG,cAAeV,QAAgB;MAC7C,OAAOW,IAAI,GAAG,GAAG,GAAGJ,WAAW,IAAIP,QAAQ,CAACW,IAAI,KAAK,GAAG,GAAG,EAAE,GAAGX,QAAQ,CAACW,IAAI,CAAC;MAC9E,OAAOC,MAAM,GAAGZ,QAAQ,CAACY,MAA+B,KAAK,MAAM,GAC/DX,YAAI,CAACY,eAAe,CAACf,GAAa,EAAEE,QAAQ,CAAC,GAC7CA,QAAQ,CAACY,MAAM;KACK;IAE1B,IAAKZ,QAAgB,CAACY,MAAM,KAAK,MAAM,EAAE;MACvCvC,MAAM,CAACyC,MAAM,CAACJ,OAAO,EAAE;QACrB,CAACA,OAAO,CAACE,MAAM,KAAK,KAAK,IAAIF,OAAO,CAACE,MAAM,KAAK,QAAQ,GAAG,OAAO,GAAG,MAAM,GAAIZ,QAAgB,CAACe;OACjG,CAAC;IACJ;IAEA,MAAMC,CAAC,GAAG3C,MAAM,CAACyC,MAAM,CAAC,EAAE,EAAEf,CAAC,EAAE;MAAEW,OAAO;MAAEP;IAAQ,CAAE,CAAC;IAErD,MAAME,IAAI,GAAG;MACXK,OAAO;MACPP,QAAQ;MACRc,OAAO,EAAEP,OAAO,CAACC,IAAI;MACrBO,IAAI,EAAEX;KACP;IAED,MAAMY,GAAG,GAAGhB,QAAuB;IACnC,MAAMiB,aAAa,GAAG,IAAAC,UAAI,EAACC,MAAC,CAACC,aAAa,CAACJ,GAAG,CAAC,EAAGK,CAAC,IAAKC,YAAM,CAACC,QAAQ,CAACF,CAAC,EAAGG,GAAG,IAAK,IAAIC,eAAQ,CAACD,GAAG,CAAC,CAAC,CAAC;IAEvG,MAAME,cAAc,GAAG,IAAAR,UAAI,EAACD,aAAa,EAAEK,YAAM,CAACK,OAAO,CAACR,MAAC,CAACS,MAAM,CAACZ,GAAG,CAAC,CAAC,CAAC;IAEzE,MAAMR,IAAI,GAAG,IAAIqB,gBAAI,CAACtB,OAAO,CAACC,IAAI,CAAC;IAEnC;IACA;IACA;IACA,MAAMsB,MAAM,GAAG,CAACvB,OAAO,CAACwB,IAAI,EAAExB,OAAO,CAACyB,KAAK,EAAEzB,OAAO,CAACsB,IAAI,CAAC,CACvDtC,MAAM,CAAEC,CAAC,IAAKA,CAAC;IAChB;IAAA,CACCyC,OAAO,CAAEzC,CAAC,IAAKA,CAAC,CAAC0C,GAAG,CAACC,kBAAkB,CAAC;IAC3C;IACAzC,IAAI,CAACC,GAAG,CAAC,GAAGY,OAAO,CAACE,MAAM,KAAK,KAAK,GAChCqB,MAAM,CAACM,MAAM,KAAK,CAAC,GACjB;MACAC,OAAO,EAAE,IAAAC,eAAQ,EAAC/B,OAAO,CAACE,MAAM,EAAEF,OAAO,CAACC,IAAI,CAAC,CAC5C+B,IAAI,CACHjB,YAAM,CAACW,OAAO,CAAC,IAAAO,mBAAY,EAACvB,aAAa,CAAC,CAAC,EAC3CK,YAAM,CACHmB,QAAQ,CAAC,gBAAgB,EAAE;QAC1BC,UAAU,EAAE;UAAE,cAAc,EAAEtC;QAAW;OAC1C,CAAC,CACL;MACH,GAAGF;KACJ,GACC;MACAmC,OAAO,EAAGM,GAAQ,IAChB,IAAAL,eAAQ,EAAC/B,OAAO,CAACE,MAAM,EAAE,IAAAmC,wBAAiB,EAACpC,IAAI,EAAEW,MAAC,CAAC0B,UAAU,CAACtC,OAAO,CAAC,CAACoC,GAAG,CAAC,CAAC,CAAC,CAC1EJ,IAAI,CACHjB,YAAM,CAACW,OAAO,CAAC,IAAAO,mBAAY,EAACvB,aAAa,CAAC,CAAC,EAC3CK,YAAM,CACHmB,QAAQ,CAAC,gBAAgB,EAAE;QAC1BC,UAAU,EAAE;UAAE,cAAc,EAAEtC;QAAW;OAC1C,CAAC,CACL;MACL,GAAGF,IAAI;MACPY,OAAO,EAAG6B,GAAQ,IAAKA,GAAG,GAAG,IAAAC,wBAAiB,EAACpC,IAAI,EAAEW,MAAC,CAAC0B,UAAU,CAACtC,OAAO,CAAC,CAACoC,GAAG,CAAC,CAAC,GAAGpC,OAAO,CAACC;KAC5F,GACDsB,MAAM,CAACM,MAAM,KAAK,CAAC,GACnB;MACAC,OAAO,EAAE,IAAAS,iBAAU,EAACjC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC0B,IAAI,CAACjB,YAAM,CAACmB,QAAQ,CAAC,gBAAgB,EAAE;QAChEC,UAAU,EAAE;UAAE,cAAc,EAAEtC;QAAW;OAC1C,CAAC,CAAC;MACH,GAAGF;KACJ,GACC;MACAmC,OAAO,EAAGM,GAAQ,IAChB,IAAAG,iBAAU,EAACjC,CAAC,CAAC,CAAC8B,GAAG,CAAC,CAACJ,IAAI,CAACjB,YAAM,CAACmB,QAAQ,CAAC,gBAAgB,EAAE;QACxDC,UAAU,EAAE;UAAE,cAAc,EAAEtC;QAAW;OAC1C,CAAC,CAAC;MAEL,GAAGF,IAAI;MACPY,OAAO,EAAG6B,GAAQ,IAChBA,GAAG,GACCpC,OAAO,CAACE,MAAM,KAAK,QAAQ,GACzB,IAAAmC,wBAAiB,EAACpC,IAAI,EAAEW,MAAC,CAAC0B,UAAU,CAACtC,OAAO,CAAC,CAACoC,GAAG,CAAC,CAAC,GACnD,IAAAI,uBAAgB,EAACvC,IAAI,EAAEW,MAAC,CAAC0B,UAAU,CAACtC,OAAO,CAAC,CAACoC,GAAG,CAAC,CAAC,GACpDpC,OAAO,CAACC;KACf;IAEH;IAEA;IACAd,IAAI,CAAC,GAAGC,GAAG,GAAG,CAAC,GAAGY,OAAO,CAACE,MAAM,KAAK,KAAK,GACtCqB,MAAM,CAACM,MAAM,KAAK,CAAC,GACjB;MACAC,OAAO,EAAE,IAAAC,eAAQ,EAAC/B,OAAO,CAACE,MAAM,EAAEF,OAAO,CAACC,IAAI,CAAC,CAC5C+B,IAAI,CACHjB,YAAM,CAACW,OAAO,CAAC,IAAAO,mBAAY,EAACd,cAAc,CAAC,CAAC,EAC5CJ,YAAM,CACHmB,QAAQ,CAAC,gBAAgB,EAAE;QAC1BC,UAAU,EAAE;UAAE,cAAc,EAAEtC;QAAW;OAC1C,CAAC,CACL;MACH,GAAGF;KACJ,GACC;MACAmC,OAAO,EAAGM,GAAQ,IAChB,IAAAL,eAAQ,EAAC/B,OAAO,CAACE,MAAM,EAAE,IAAAmC,wBAAiB,EAACpC,IAAI,EAAEW,MAAC,CAAC0B,UAAU,CAACtC,OAAO,CAAC,CAACoC,GAAG,CAAC,CAAC,CAAC,CAC1EJ,IAAI,CACHjB,YAAM,CAACW,OAAO,CAAC,IAAAO,mBAAY,EAACd,cAAc,CAAC,CAAC,EAC5CJ,YAAM,CACHmB,QAAQ,CAAC,gBAAgB,EAAE;QAC1BC,UAAU,EAAE;UAAE,cAAc,EAAEtC;QAAW;OAC1C,CAAC,CACL;MAEL,GAAGF,IAAI;MACPY,OAAO,EAAG6B,GAAQ,IAAKA,GAAG,GAAG,IAAAC,wBAAiB,EAACpC,IAAI,EAAEW,MAAC,CAAC0B,UAAU,CAACtC,OAAO,CAAC,CAACoC,GAAG,CAAC,CAAC,GAAGpC,OAAO,CAACC;KAC5F,GACDsB,MAAM,CAACM,MAAM,KAAK,CAAC,GACnB;MACAC,OAAO,EAAE,IAAAW,kBAAW,EAACnC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC0B,IAAI,CAACjB,YAAM,CAACmB,QAAQ,CAAC,gBAAgB,EAAE;QACjEC,UAAU,EAAE;UAAE,cAAc,EAAEtC;QAAW;OAC1C,CAAC,CAAC;MACH,GAAGF;KACJ,GACC;MACAmC,OAAO,EAAGM,GAAQ,IAChB,IAAAK,kBAAW,EAACnC,CAAC,CAAC,CAAC8B,GAAG,CAAC,CAACJ,IAAI,CAACjB,YAAM,CAACmB,QAAQ,CAAC,gBAAgB,EAAE;QACzDC,UAAU,EAAE;UAAE,cAAc,EAAEtC;QAAW;OAC1C,CAAC,CAAC;MAEL,GAAGF,IAAI;MACPY,OAAO,EAAG6B,GAAQ,IAChBA,GAAG,GACCpC,OAAO,CAACE,MAAM,KAAK,QAAQ,GACzB,IAAAmC,wBAAiB,EAACpC,IAAI,EAAEW,MAAC,CAAC0B,UAAU,CAACtC,OAAO,CAAC,CAACoC,GAAG,CAAC,CAAC,GACnD,IAAAI,uBAAgB,EAACvC,IAAI,EAAEW,MAAC,CAAC0B,UAAU,CAACtC,OAAO,CAAC,CAACoC,GAAG,CAAC,CAAC,GACpDpC,OAAO,CAACC;KACf;IACH;IAEA,OAAOd,IAAI;EACb,CAAC,EAAE,EAAe,CAAC;AACvB"}
1
+ {"version":3,"file":"clientFor.cjs","names":["_core","require","_schema","_pathParser","_lib","_utils","_fetch","_config","Object","keys","forEach","key","prototype","hasOwnProperty","call","_exportNames","exports","defineProperty","enumerable","get","cache","Map","clientFor","models","found","m","clientFor_","set","typedKeysOf","filter","x","reduce","prev","cur","h","Request_","REST","extractRequest","Response","extractResponse","meta","Error","requestName","moduleName","replaceAll","Request","path","method","determineMethod","assign","Auto","b","mapPath","name","res","parseResponse","flow","S","decodeUnknown","_","Effect","mapError","err","ResError","parseResponseE","andThen","encode","Path","fields","Body","Query","flatMap","ast","propertySignatures","length","handler","fetchApi","pipe","mapResponseM","withSpan","attributes","req","makePathWithQuery","encodeSync","fetchApi3S","makePathWithBody","fetchApi3SE"],"sources":["../../src/client/clientFor.ts"],"sourcesContent":[null],"mappings":"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"}
package/dist/client/clientFor.js CHANGED
@@ -65,7 +65,7 @@ function clientFor_(models) {
65
65
  ? {
66
66
  handler: fetchApi(Request.method, Request.path)
67
67
  .pipe(Effect.flatMap(mapResponseM(parseResponse)), Effect
68
- .withSpan("client.request", {
68
+ .withSpan("client.request " + requestName, {
69
69
  attributes: { "request.name": requestName }
70
70
  })),
71
71
  ...meta
@@ -73,7 +73,7 @@ function clientFor_(models) {
73
73
  : {
74
74
  handler: (req) => fetchApi(Request.method, makePathWithQuery(path, S.encodeSync(Request)(req)))
75
75
  .pipe(Effect.flatMap(mapResponseM(parseResponse)), Effect
76
- .withSpan("client.request", {
76
+ .withSpan("client.request " + requestName, {
77
77
  attributes: { "request.name": requestName }
78
78
  })),
79
79
  ...meta,
@@ -81,13 +81,13 @@ function clientFor_(models) {
81
81
  }
82
82
  : fields.length === 0
83
83
  ? {
84
- handler: fetchApi3S(b)({}).pipe(Effect.withSpan("client.request", {
84
+ handler: fetchApi3S(b)({}).pipe(Effect.withSpan("client.request " + requestName, {
85
85
  attributes: { "request.name": requestName }
86
86
  })),
87
87
  ...meta
88
88
  }
89
89
  : {
90
- handler: (req) => fetchApi3S(b)(req).pipe(Effect.withSpan("client.request", {
90
+ handler: (req) => fetchApi3S(b)(req).pipe(Effect.withSpan("client.request " + requestName, {
91
91
  attributes: { "request.name": requestName }
92
92
  })),
93
93
  ...meta,
@@ -104,7 +104,7 @@ function clientFor_(models) {
104
104
  ? {
105
105
  handler: fetchApi(Request.method, Request.path)
106
106
  .pipe(Effect.flatMap(mapResponseM(parseResponseE)), Effect
107
- .withSpan("client.request", {
107
+ .withSpan("client.request " + requestName, {
108
108
  attributes: { "request.name": requestName }
109
109
  })),
110
110
  ...meta
@@ -112,7 +112,7 @@ function clientFor_(models) {
112
112
  : {
113
113
  handler: (req) => fetchApi(Request.method, makePathWithQuery(path, S.encodeSync(Request)(req)))
114
114
  .pipe(Effect.flatMap(mapResponseM(parseResponseE)), Effect
115
- .withSpan("client.request", {
115
+ .withSpan("client.request " + requestName, {
116
116
  attributes: { "request.name": requestName }
117
117
  })),
118
118
  ...meta,
@@ -120,13 +120,13 @@ function clientFor_(models) {
120
120
  }
121
121
  : fields.length === 0
122
122
  ? {
123
- handler: fetchApi3SE(b)({}).pipe(Effect.withSpan("client.request", {
123
+ handler: fetchApi3SE(b)({}).pipe(Effect.withSpan("client.request " + requestName, {
124
124
  attributes: { "request.name": requestName }
125
125
  })),
126
126
  ...meta
127
127
  }
128
128
  : {
129
- handler: (req) => fetchApi3SE(b)(req).pipe(Effect.withSpan("client.request", {
129
+ handler: (req) => fetchApi3SE(b)(req).pipe(Effect.withSpan("client.request " + requestName, {
130
130
  attributes: { "request.name": requestName }
131
131
  })),
132
132
  ...meta,
@@ -140,4 +140,4 @@ function clientFor_(models) {
140
140
  return prev;
141
141
  }, {}));
142
142
  }
143
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"clientFor.js","sourceRoot":"","sources":["../../src/client/clientFor.ts"],"names":[],"mappings":"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"}
143
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"clientFor.js","sourceRoot":"","sources":["../../src/client/clientFor.ts"],"names":[],"mappings":"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"}
package/dist/client/errors.d.ts CHANGED
@@ -1,15 +1,15 @@
1
1
  import { S } from "../lib.js";
2
2
  declare const NotFoundError_base: import("@effect/schema/Schema").Class<{
3
3
  readonly _tag: "NotFoundError";
4
- readonly type: string;
5
4
  readonly id: unknown;
5
+ readonly type: string;
6
6
  }, {
7
7
  readonly _tag: "NotFoundError";
8
- readonly type: string;
9
8
  readonly id: unknown;
10
- }, never, {
11
9
  readonly type: string;
10
+ }, never, {
12
11
  readonly id: unknown;
12
+ readonly type: string;
13
13
  }, NotFoundError<ItemType>, {
14
14
  type: S.Schema<string, string, never>;
15
15
  id: S.Schema<unknown, unknown, never>;
@@ -130,16 +130,16 @@ export declare class OptimisticConcurrencyException extends OptimisticConcurrenc
130
130
  message: string;
131
131
  }, disableValidation?: boolean);
132
132
  }
133
- export declare const SupportedErrors: S.Schema<InvalidStateError | OptimisticConcurrencyException | NotFoundError<ItemType> | NotLoggedInError | LoginError | UnauthorizedError | ValidationError, {
134
- readonly _tag: "InvalidStateError";
135
- readonly message: string;
133
+ export declare const SupportedErrors: S.Schema<NotFoundError<ItemType> | InvalidStateError | ValidationError | NotLoggedInError | LoginError | UnauthorizedError | OptimisticConcurrencyException, {
134
+ readonly _tag: "NotFoundError";
135
+ readonly id: unknown;
136
+ readonly type: string;
136
137
  } | {
137
- readonly _tag: "OptimisticConcurrencyException";
138
+ readonly _tag: "InvalidStateError";
138
139
  readonly message: string;
139
140
  } | {
140
- readonly _tag: "NotFoundError";
141
- readonly type: string;
142
- readonly id: unknown;
141
+ readonly _tag: "ValidationError";
142
+ readonly errors: readonly unknown[];
143
143
  } | {
144
144
  readonly _tag: "NotLoggedInError";
145
145
  readonly message?: string | undefined;
@@ -150,20 +150,20 @@ export declare const SupportedErrors: S.Schema<InvalidStateError | OptimisticCon
150
150
  readonly _tag: "UnauthorizedError";
151
151
  readonly message?: string | undefined;
152
152
  } | {
153
- readonly _tag: "ValidationError";
154
- readonly errors: readonly unknown[];
153
+ readonly _tag: "OptimisticConcurrencyException";
154
+ readonly message: string;
155
155
  }, never>;
156
156
  export type SupportedErrors = S.Schema.To<typeof SupportedErrors>;
157
- export declare const MutationErrors: S.Schema<InvalidStateError | OptimisticConcurrencyException | NotFoundError<ItemType> | NotLoggedInError | LoginError | UnauthorizedError | ValidationError, {
158
- readonly _tag: "InvalidStateError";
159
- readonly message: string;
157
+ export declare const MutationErrors: S.Schema<NotFoundError<ItemType> | InvalidStateError | ValidationError | NotLoggedInError | LoginError | UnauthorizedError | OptimisticConcurrencyException, {
158
+ readonly _tag: "NotFoundError";
159
+ readonly id: unknown;
160
+ readonly type: string;
160
161
  } | {
161
- readonly _tag: "OptimisticConcurrencyException";
162
+ readonly _tag: "InvalidStateError";
162
163
  readonly message: string;
163
164
  } | {
164
- readonly _tag: "NotFoundError";
165
- readonly type: string;
166
- readonly id: unknown;
165
+ readonly _tag: "ValidationError";
166
+ readonly errors: readonly unknown[];
167
167
  } | {
168
168
  readonly _tag: "NotLoggedInError";
169
169
  readonly message?: string | undefined;
@@ -173,20 +173,20 @@ export declare const MutationErrors: S.Schema<InvalidStateError | OptimisticConc
173
173
  } | {
174
174
  readonly _tag: "UnauthorizedError";
175
175
  readonly message?: string | undefined;
176
- } | {
177
- readonly _tag: "ValidationError";
178
- readonly errors: readonly unknown[];
179
- }, never>;
180
- export declare const QueryErrors: S.Schema<InvalidStateError | OptimisticConcurrencyException | NotFoundError<ItemType> | NotLoggedInError | LoginError | UnauthorizedError | ValidationError, {
181
- readonly _tag: "InvalidStateError";
182
- readonly message: string;
183
176
  } | {
184
177
  readonly _tag: "OptimisticConcurrencyException";
185
178
  readonly message: string;
186
- } | {
179
+ }, never>;
180
+ export declare const QueryErrors: S.Schema<NotFoundError<ItemType> | InvalidStateError | ValidationError | NotLoggedInError | LoginError | UnauthorizedError | OptimisticConcurrencyException, {
187
181
  readonly _tag: "NotFoundError";
188
- readonly type: string;
189
182
  readonly id: unknown;
183
+ readonly type: string;
184
+ } | {
185
+ readonly _tag: "InvalidStateError";
186
+ readonly message: string;
187
+ } | {
188
+ readonly _tag: "ValidationError";
189
+ readonly errors: readonly unknown[];
190
190
  } | {
191
191
  readonly _tag: "NotLoggedInError";
192
192
  readonly message?: string | undefined;
@@ -197,8 +197,8 @@ export declare const QueryErrors: S.Schema<InvalidStateError | OptimisticConcurr
197
197
  readonly _tag: "UnauthorizedError";
198
198
  readonly message?: string | undefined;
199
199
  } | {
200
- readonly _tag: "ValidationError";
201
- readonly errors: readonly unknown[];
200
+ readonly _tag: "OptimisticConcurrencyException";
201
+ readonly message: string;
202
202
  }, never>;
203
203
  export type MutationErrors = S.Schema.To<typeof MutationErrors>;
204
204
  export type QueryErrors = S.Schema.To<typeof QueryErrors>;
package/dist/client/fetch.d.ts CHANGED
@@ -16,12 +16,12 @@ export declare function fetchApi(method: Method, path: string, body?: unknown):
16
16
  status: number;
17
17
  body: unknown;
18
18
  headers: import("@effect/platform/Http/Headers").Headers;
19
- } | FetchResponse<unknown>, HttpRequestError | InvalidStateError | OptimisticConcurrencyException | NotFoundError<ItemType> | NotLoggedInError | import("./errors.js").LoginError | UnauthorizedError | ValidationError | HttpResponseError<unknown> | import("@effect/platform/Http/Body").BodyError, HttpClient.Client.Default | ApiConfig>;
19
+ } | FetchResponse<unknown>, NotFoundError<ItemType> | InvalidStateError | ValidationError | NotLoggedInError | import("./errors.js").LoginError | UnauthorizedError | OptimisticConcurrencyException | HttpRequestError | HttpResponseError<unknown> | import("@effect/platform/Http/Body").BodyError, HttpClient.Client.Default | ApiConfig>;
20
20
  export declare function fetchApi2S<RequestR, RequestFrom, RequestTo, ResponseR, ResponseFrom, ResponseTo>(request: Schema<RequestTo, RequestFrom, RequestR>, response: Schema<ResponseTo, ResponseFrom, ResponseR>): (method: Method, path: Path) => (req: RequestTo) => Effect.Effect<{
21
21
  body: ResponseTo;
22
22
  headers: Headers;
23
23
  status: number;
24
- }, S.ParseResult.ParseError | HttpRequestError | ResError | InvalidStateError | OptimisticConcurrencyException | NotFoundError<ItemType> | NotLoggedInError | import("./errors.js").LoginError | UnauthorizedError | ValidationError | HttpResponseError<unknown> | import("@effect/platform/Http/Body").BodyError, HttpClient.Client.Default | ApiConfig | RequestR | ResponseR>;
24
+ }, S.ParseResult.ParseError | NotFoundError<ItemType> | InvalidStateError | ValidationError | NotLoggedInError | import("./errors.js").LoginError | UnauthorizedError | OptimisticConcurrencyException | HttpRequestError | ResError | HttpResponseError<unknown> | import("@effect/platform/Http/Body").BodyError, HttpClient.Client.Default | ApiConfig | RequestR | ResponseR>;
25
25
  export declare function fetchApi3S<RequestA, RequestE, ResponseE = unknown, ResponseA = void>({ Request, Response }: {
26
26
  Request: REST.RequestSchemed<RequestA, RequestE>;
27
27
  Response: REST.ReqRes<ResponseA, ResponseE, any>;
@@ -29,11 +29,11 @@ export declare function fetchApi3S<RequestA, RequestE, ResponseE = unknown, Resp
29
29
  body: ResponseA;
30
30
  headers: Headers;
31
31
  status: number;
32
- }, S.ParseResult.ParseError | HttpRequestError | ResError | InvalidStateError | OptimisticConcurrencyException | NotFoundError<ItemType> | NotLoggedInError | import("./errors.js").LoginError | UnauthorizedError | ValidationError | HttpResponseError<unknown> | import("@effect/platform/Http/Body").BodyError, any>;
32
+ }, S.ParseResult.ParseError | NotFoundError<ItemType> | InvalidStateError | ValidationError | NotLoggedInError | import("./errors.js").LoginError | UnauthorizedError | OptimisticConcurrencyException | HttpRequestError | ResError | HttpResponseError<unknown> | import("@effect/platform/Http/Body").BodyError, any>;
33
33
  export declare function fetchApi3SE<RequestA, RequestE, ResponseE = unknown, ResponseA = void>({ Request, Response }: {
34
34
  Request: REST.RequestSchemed<RequestA, RequestE>;
35
35
  Response: REST.ReqRes<ResponseA, ResponseE, any>;
36
- }): (req: RequestA) => Effect.Effect<FetchResponse<ResponseE>, S.ParseResult.ParseError | HttpRequestError | ResError | InvalidStateError | OptimisticConcurrencyException | NotFoundError<ItemType> | NotLoggedInError | import("./errors.js").LoginError | UnauthorizedError | ValidationError | HttpResponseError<unknown> | import("@effect/platform/Http/Body").BodyError, any>;
36
+ }): (req: RequestA) => Effect.Effect<FetchResponse<ResponseE>, S.ParseResult.ParseError | NotFoundError<ItemType> | InvalidStateError | ValidationError | NotLoggedInError | import("./errors.js").LoginError | UnauthorizedError | OptimisticConcurrencyException | HttpRequestError | ResError | HttpResponseError<unknown> | import("@effect/platform/Http/Body").BodyError, any>;
37
37
  export declare function makePathWithQuery(path: Path, pars: Record<string, string | number | boolean | readonly string[] | readonly number[] | readonly boolean[] | null>): string;
38
38
  export declare function makePathWithBody(path: Path, pars: Record<string, string | number | boolean | readonly string[] | readonly number[] | readonly boolean[] | null>): string;
39
39
  export declare function mapResponse<T, A>(map: (t: T) => A): (r: FetchResponse<T>) => FetchResponse<A>;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "effect-app",
3
- "version": "0.176.1",
3
+ "version": "0.177.0",
4
4
  "license": "MIT",
5
5
  "type": "module",
6
6
  "dependencies": {
@@ -14,8 +14,8 @@
14
14
  "uuid": "^9.0.1",
15
15
  "validator": "^13.11.0",
16
16
  "@effect-app/core": "0.149.0",
17
- "@effect-app/schema": "0.201.1",
18
- "@effect-app/fluent-extensions": "0.142.0"
17
+ "@effect-app/fluent-extensions": "0.142.0",
18
+ "@effect-app/schema": "0.201.2"
19
19
  },
20
20
  "devDependencies": {
21
21
  "@babel/cli": "^7.23.9",
package/src/client/clientFor.ts CHANGED
@@ -116,7 +116,7 @@ function clientFor_<M extends Requests>(models: M) {
116
116
  .pipe(
117
117
  Effect.flatMap(mapResponseM(parseResponse)),
118
118
  Effect
119
- .withSpan("client.request", {
119
+ .withSpan("client.request " + requestName, {
120
120
  attributes: { "request.name": requestName }
121
121
  })
122
122
  ),
@@ -128,7 +128,7 @@ function clientFor_<M extends Requests>(models: M) {
128
128
  .pipe(
129
129
  Effect.flatMap(mapResponseM(parseResponse)),
130
130
  Effect
131
- .withSpan("client.request", {
131
+ .withSpan("client.request " + requestName, {
132
132
  attributes: { "request.name": requestName }
133
133
  })
134
134
  ),
@@ -137,14 +137,14 @@ function clientFor_<M extends Requests>(models: M) {
137
137
  }
138
138
  : fields.length === 0
139
139
  ? {
140
- handler: fetchApi3S(b)({}).pipe(Effect.withSpan("client.request", {
140
+ handler: fetchApi3S(b)({}).pipe(Effect.withSpan("client.request " + requestName, {
141
141
  attributes: { "request.name": requestName }
142
142
  })),
143
143
  ...meta
144
144
  }
145
145
  : {
146
146
  handler: (req: any) =>
147
- fetchApi3S(b)(req).pipe(Effect.withSpan("client.request", {
147
+ fetchApi3S(b)(req).pipe(Effect.withSpan("client.request " + requestName, {
148
148
  attributes: { "request.name": requestName }
149
149
  })),
150
150
 
@@ -167,7 +167,7 @@ function clientFor_<M extends Requests>(models: M) {
167
167
  .pipe(
168
168
  Effect.flatMap(mapResponseM(parseResponseE)),
169
169
  Effect
170
- .withSpan("client.request", {
170
+ .withSpan("client.request " + requestName, {
171
171
  attributes: { "request.name": requestName }
172
172
  })
173
173
  ),
@@ -179,7 +179,7 @@ function clientFor_<M extends Requests>(models: M) {
179
179
  .pipe(
180
180
  Effect.flatMap(mapResponseM(parseResponseE)),
181
181
  Effect
182
- .withSpan("client.request", {
182
+ .withSpan("client.request " + requestName, {
183
183
  attributes: { "request.name": requestName }
184
184
  })
185
185
  ),
@@ -189,14 +189,14 @@ function clientFor_<M extends Requests>(models: M) {
189
189
  }
190
190
  : fields.length === 0
191
191
  ? {
192
- handler: fetchApi3SE(b)({}).pipe(Effect.withSpan("client.request", {
192
+ handler: fetchApi3SE(b)({}).pipe(Effect.withSpan("client.request " + requestName, {
193
193
  attributes: { "request.name": requestName }
194
194
  })),
195
195
  ...meta
196
196
  }
197
197
  : {
198
198
  handler: (req: any) =>
199
- fetchApi3SE(b)(req).pipe(Effect.withSpan("client.request", {
199
+ fetchApi3SE(b)(req).pipe(Effect.withSpan("client.request " + requestName, {
200
200
  attributes: { "request.name": requestName }
201
201
  })),
202
202
 
package/vitest.config.ts.timestamp-1670862388823.mjs ADDED
@@ -0,0 +1,23 @@
1
+ // vitest.config.ts
2
+ import { defineConfig } from "file:///Users/patrickroza/Projects/Personal/effect-ts-app/libs/node_modules/.pnpm/vite@4.0.0_@types+node@18.11.12/node_modules/vite/dist/node/index.js";
3
+
4
+ // ../../vite.config.base.ts
5
+ import { tsPlugin } from "file:///Users/patrickroza/Projects/Personal/effect-ts-app/libs/packages/compiler/dist/vitePlugin.js";
6
+ function makeConfig() {
7
+ return {
8
+ plugins: [tsPlugin({})],
9
+ test: {
10
+ include: ["./_src/**/*.test.{js,mjs,cjs,ts,mts,cts,jsx,tsx}"],
11
+ exclude: ["./_test/**/*"],
12
+ reporters: "verbose",
13
+ globals: true
14
+ }
15
+ };
16
+ }
17
+
18
+ // vitest.config.ts
19
+ var vitest_config_default = defineConfig(makeConfig());
20
+ export {
21
+ vitest_config_default as default
22
+ };
23
+ //# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsidml0ZXN0LmNvbmZpZy50cyIsICIuLi8uLi92aXRlLmNvbmZpZy5iYXNlLnRzIl0sCiAgInNvdXJjZXNDb250ZW50IjogWyJjb25zdCBfX3ZpdGVfaW5qZWN0ZWRfb3JpZ2luYWxfZGlybmFtZSA9IFwiL1VzZXJzL3BhdHJpY2tyb3phL1Byb2plY3RzL1BlcnNvbmFsL2VmZmVjdC10cy1hcHAvbGlicy9wYWNrYWdlcy9ib2lsZXJwbGF0ZS1wcmVsdWRlXCI7Y29uc3QgX192aXRlX2luamVjdGVkX29yaWdpbmFsX2ZpbGVuYW1lID0gXCIvVXNlcnMvcGF0cmlja3JvemEvUHJvamVjdHMvUGVyc29uYWwvZWZmZWN0LXRzLWFwcC9saWJzL3BhY2thZ2VzL2JvaWxlcnBsYXRlLXByZWx1ZGUvdml0ZXN0LmNvbmZpZy50c1wiO2NvbnN0IF9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9pbXBvcnRfbWV0YV91cmwgPSBcImZpbGU6Ly8vVXNlcnMvcGF0cmlja3JvemEvUHJvamVjdHMvUGVyc29uYWwvZWZmZWN0LXRzLWFwcC9saWJzL3BhY2thZ2VzL2JvaWxlcnBsYXRlLXByZWx1ZGUvdml0ZXN0LmNvbmZpZy50c1wiOy8vLyA8cmVmZXJlbmNlIHR5cGVzPVwidml0ZXN0XCIgLz5cbmltcG9ydCB7IGRlZmluZUNvbmZpZyB9IGZyb20gXCJ2aXRlXCJcbmltcG9ydCBtYWtlQ29uZmlnIGZyb20gXCIuLi8uLi92aXRlLmNvbmZpZy5iYXNlXCJcblxuZXhwb3J0IGRlZmF1bHQgZGVmaW5lQ29uZmlnKG1ha2VDb25maWcoKSlcbiIsICJjb25zdCBfX3ZpdGVfaW5qZWN0ZWRfb3JpZ2luYWxfZGlybmFtZSA9IFwiL1VzZXJzL3BhdHJpY2tyb3phL1Byb2plY3RzL1BlcnNvbmFsL2VmZmVjdC10cy1hcHAvbGlic1wiO2NvbnN0IF9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9maWxlbmFtZSA9IFwiL1VzZXJzL3BhdHJpY2tyb3phL1Byb2plY3RzL1BlcnNvbmFsL2VmZmVjdC10cy1hcHAvbGlicy92aXRlLmNvbmZpZy5iYXNlLnRzXCI7Y29uc3QgX192aXRlX2luamVjdGVkX29yaWdpbmFsX2ltcG9ydF9tZXRhX3VybCA9IFwiZmlsZTovLy9Vc2Vycy9wYXRyaWNrcm96YS9Qcm9qZWN0cy9QZXJzb25hbC9lZmZlY3QtdHMtYXBwL2xpYnMvdml0ZS5jb25maWcuYmFzZS50c1wiOy8vLyA8cmVmZXJlbmNlIHR5cGVzPVwidml0ZXN0XCIgLz5cbmltcG9ydCB7IHRzUGx1Z2luIH0gZnJvbSBcIkBlZmZlY3QtdHMtYXBwL2NvbXBpbGVyL3ZpdGVQbHVnaW5cIlxuZXhwb3J0IGRlZmF1bHQgZnVuY3Rpb24gbWFrZUNvbmZpZygpIHtcbiAgcmV0dXJuIHtcbiAgICAvLyBlc2xpbnQtZGlzYWJsZS1uZXh0LWxpbmUgQHR5cGVzY3JpcHQtZXNsaW50L25vLXZhci1yZXF1aXJlc1xuICAgIHBsdWdpbnM6IFt0c1BsdWdpbih7fSldLFxuICAgIHRlc3Q6IHtcbiAgICAgIGluY2x1ZGU6IFtcIi4vX3NyYy8qKi8qLnRlc3Que2pzLG1qcyxjanMsdHMsbXRzLGN0cyxqc3gsdHN4fVwiXSxcbiAgICAgIGV4Y2x1ZGU6IFtcIi4vX3Rlc3QvKiovKlwiXSxcbiAgICAgIHJlcG9ydGVyczogXCJ2ZXJib3NlXCIsXG4gICAgICBnbG9iYWxzOiB0cnVlXG4gICAgfSxcbiAgICAvLyByZXNvbHZlOiB7XG4gICAgLy8gICBhbGlhczoge1xuICAgIC8vICAgICBcIkBlZmZlY3QvaW8vdGVzdFwiOiBwYXRoLnJlc29sdmUoX19kaXJuYW1lLCBcIi90ZXN0XCIpLFxuICAgIC8vICAgICBcIkBlZmZlY3QvaW9cIjogcGF0aC5yZXNvbHZlKF9fZGlybmFtZSwgXCIvc3JjXCIpXG4gICAgLy8gICB9XG4gICAgLy8gfVxuICB9XG59XG4iXSwKICAibWFwcGluZ3MiOiAiO0FBQ0EsU0FBUyxvQkFBb0I7OztBQ0E3QixTQUFTLGdCQUFnQjtBQUNWLFNBQVIsYUFBOEI7QUFDbkMsU0FBTztBQUFBLElBRUwsU0FBUyxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUM7QUFBQSxJQUN0QixNQUFNO0FBQUEsTUFDSixTQUFTLENBQUMsa0RBQWtEO0FBQUEsTUFDNUQsU0FBUyxDQUFDLGNBQWM7QUFBQSxNQUN4QixXQUFXO0FBQUEsTUFDWCxTQUFTO0FBQUEsSUFDWDtBQUFBLEVBT0Y7QUFDRjs7O0FEZkEsSUFBTyx3QkFBUSxhQUFhLFdBQVcsQ0FBQzsiLAogICJuYW1lcyI6IFtdCn0K