effect-app 1.4.4 → 1.4.6

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @effect-app/prelude
 
+## 1.4.6
+
+### Patch Changes
+
+- 9d944a1: update packages
+- Updated dependencies [9d944a1]
+  - @effect-app/schema@1.2.7
+  - @effect-app/core@1.2.2
+
+## 1.4.5
+
+### Patch Changes
+
+- a67d115: improve client trace
+
 ## 1.4.4
 
 ### Patch Changes

package/_cjs/client/fetch.cjs

@@ -96,25 +96,21 @@ const getClient = _core.Effect.flatMap(_http.HttpClient.Client, defaultClient =>
   })
 }))));
 function fetchApi(method, path, body) {
-  return _core.Effect.flatMap(getClient, client => (method === "GET" ? client(_http.HttpClientRequest.make(method)(path)) : body === undefined ? client(_http.HttpClientRequest.make(method)(path)) : _http.HttpClientRequest.make(method)(path).pipe(_http.HttpClientRequest.jsonBody(body), _core.Effect.flatMap(client))).pipe(_core.Effect.scoped, _core.Effect.withSpan("http.request", {
-    attributes: {
-      "http.method": method,
-      "http.url": path
-    }
-  })));
+  return _core.Effect.flatMap(getClient, client => (method === "GET" ? client(_http.HttpClientRequest.make(method)(path)) : body === undefined ? client(_http.HttpClientRequest.make(method)(path)) : _http.HttpClientRequest.make(method)(path).pipe(_http.HttpClientRequest.jsonBody(body), _core.Effect.flatMap(client))).pipe(_core.Effect.scoped));
 }
 function fetchApi2S(request, response) {
   const encodeRequest = _lib.S.encode(request);
   const decRes = _lib.S.decodeUnknown(response);
   const decodeRes = u => _core.Effect.mapError(decRes(u), err => new ResError(err));
+  const parse = (0, _Function.flow)(mapResponseM(decodeRes), _core.Effect.map(i => ({
+    ...i,
+    // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
+    body: i.body
+  })), _core.Effect.withSpan("client.decode"));
   return (method, path) => req => {
     return _core.Effect.andThen(encodeRequest(req), encoded => fetchApi(method, method === "DELETE"
     // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-    ? makePathWithQuery(path, encoded) : makePathWithBody(path, encoded), encoded).pipe(_core.Effect.flatMap(mapResponseM(decodeRes)), _core.Effect.map(i => ({
-      ...i,
-      // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
-      body: i.body
-    }))));
+    ? makePathWithQuery(path, encoded) : makePathWithBody(path, encoded), encoded).pipe(_core.Effect.flatMap(parse)));
   };
 }
 function fetchApi3S({

package/_cjs/client/fetch.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"fetch.cjs","names":["_core","require","_Function","_effect","_schema","_pathParser","_queryString","_interopRequireDefault","_config","_errors","_http","_lib","obj","__esModule","default","ResError","error","_tag","constructor","exports","getClient","Effect","flatMap","HttpClient","Client","defaultClient","map","ApiConfig","Tag","apiUrl","headers","pipe","filterStatusOk","mapRequest","_","HttpClientRequest","acceptJson","prependUrl","setHeaders","Option","getOrUndefined","HashMap","get","StringId","make","Object","fromEntries","tapRequest","r","logDebug","method","annotateLogs","url","body","TextDecoder","decode","mapEffect","status","sync","json","catchTag","err","toError","s","response","S","decodeUnknown","catchAll","fail","NotFoundError","ValidationError","NotLoggedInError","InvalidStateError","ServiceUnavailableError","UnauthorizedError","OptimisticConcurrencyException","catchTags","orDie","text","fromNullable","fetchApi","path","client","undefined","jsonBody","scoped","withSpan","attributes","fetchApi2S","request","encodeRequest","encode","decRes","decodeRes","u","mapError","req","andThen","encoded","makePathWithQuery","makePathWithBody","mapResponseM","i","fetchApi3S","Request","Response","Path","fetchApi3SE","a","pars","forQs","Record","filter","k","params","includes","q","build","ignoreSearch","ignoreConstraints","keys","length","qs","stringify","mapResponse","all","EmptyResponse","freeze","EmptyResponseM","EmptyResponseMThunk_","constant","EmptyResponseMThunk","getBody","eff","die"],"sources":["../../src/client/fetch.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"fetch.cjs","names":["_core","require","_Function","_effect","_schema","_pathParser","_queryString","_interopRequireDefault","_config","_errors","_http","_lib","obj","__esModule","default","ResError","error","_tag","constructor","exports","getClient","Effect","flatMap","HttpClient","Client","defaultClient","map","ApiConfig","Tag","apiUrl","headers","pipe","filterStatusOk","mapRequest","_","HttpClientRequest","acceptJson","prependUrl","setHeaders","Option","getOrUndefined","HashMap","get","StringId","make","Object","fromEntries","tapRequest","r","logDebug","method","annotateLogs","url","body","TextDecoder","decode","mapEffect","status","sync","json","catchTag","err","toError","s","response","S","decodeUnknown","catchAll","fail","NotFoundError","ValidationError","NotLoggedInError","InvalidStateError","ServiceUnavailableError","UnauthorizedError","OptimisticConcurrencyException","catchTags","orDie","text","fromNullable","fetchApi","path","client","undefined","jsonBody","scoped","fetchApi2S","request","encodeRequest","encode","decRes","decodeRes","u","mapError","parse","flow","mapResponseM","i","withSpan","req","andThen","encoded","makePathWithQuery","makePathWithBody","fetchApi3S","Request","Response","Path","fetchApi3SE","a","pars","forQs","Record","filter","k","params","includes","q","build","ignoreSearch","ignoreConstraints","keys","length","qs","stringify","mapResponse","all","EmptyResponse","freeze","EmptyResponseM","EmptyResponseMThunk_","constant","EmptyResponseMThunk","getBody","eff","die"],"sources":["../../src/client/fetch.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/client/fetch.d.ts

@@ -21,7 +21,7 @@ export declare function fetchApi2S<RequestR, RequestFrom, RequestTo, ResponseR,
     body: ResponseTo;
     headers: Headers;
     status: number;
-}, S.ParseResult.ParseError | NotFoundError<ItemType> | InvalidStateError | ServiceUnavailableError | ValidationError | NotLoggedInError | import("./errors.js").LoginError | UnauthorizedError | OptimisticConcurrencyException | HttpRequestError | ResError | HttpResponseError<unknown> | import("@effect/platform/Http/Body").BodyError, HttpClient.Client.Default | ApiConfig | RequestR | ResponseR>;
+}, S.ParseResult.ParseError | NotFoundError<ItemType> | InvalidStateError | ServiceUnavailableError | ValidationError | NotLoggedInError | import("./errors.js").LoginError | UnauthorizedError | OptimisticConcurrencyException | HttpRequestError | ResError | HttpResponseError<unknown> | import("@effect/platform/Http/Body").BodyError, HttpClient.Client.Default | ApiConfig | RequestR | Exclude<ResponseR, import("effect/Tracer").ParentSpan>>;
 export declare function fetchApi3S<RequestA, RequestE, ResponseE = unknown, ResponseA = void>({ Request, Response }: {
     Request: REST.RequestSchemed<RequestA, RequestE>;
     Response: REST.ReqRes<ResponseA, ResponseE, any>;

package/dist/client/fetch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../../src/client/fetch.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../../src/client/fetch.ts"],"names":[],"mappings":"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"}

package/dist/client/fetch.js

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { Effect, HashMap, Option } from "@effect-app/core";
-import { constant } from "@effect-app/core/Function";
+import { constant, flow } from "@effect-app/core/Function";
 import { Record } from "effect";
 import { StringId } from "effect-app/schema";
 import { Path } from "path-parser";
@@ -93,22 +93,23 @@ export function fetchApi(method, path, body) {
             : HttpClientRequest
                 .make(method)(path)
                 .pipe(HttpClientRequest.jsonBody(body), Effect.flatMap(client)))
-        .pipe(Effect.scoped, Effect.withSpan("http.request", { attributes: { "http.method": method, "http.url": path } })));
+        .pipe(Effect.scoped));
 }
 export function fetchApi2S(request, response) {
     const encodeRequest = S.encode(request);
     const decRes = S.decodeUnknown(response);
     const decodeRes = (u) => Effect.mapError(decRes(u), (err) => new ResError(err));
+    const parse = flow(mapResponseM(decodeRes), Effect.map((i) => ({
+        ...i,
+        // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
+        body: i.body
+    })), Effect.withSpan("client.decode"));
     return (method, path) => (req) => {
         return Effect.andThen(encodeRequest(req), (encoded) => fetchApi(method, method === "DELETE"
             // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
             ? makePathWithQuery(path, encoded)
             : makePathWithBody(path, encoded), encoded)
-            .pipe(Effect.flatMap(mapResponseM(decodeRes)), Effect.map((i) => ({
-            ...i,
-            // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
-            body: i.body
-        }))));
+            .pipe(Effect.flatMap(parse)));
     };
 }
 export function fetchApi3S({ Request, Response }) {
@@ -153,4 +154,4 @@ export function EmptyResponseMThunk() {
 export function getBody(eff) {
     return Effect.flatMap(eff, (r) => r.body === null ? Effect.die("Not found") : Effect.sync(() => r.body));
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../src/client/fetch.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../src/client/fetch.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "effect-app",
-  "version": "1.4.4",
+  "version": "1.4.6",
   "license": "MIT",
   "type": "module",
   "dependencies": {
@@ -12,8 +12,8 @@
     "ts-pattern": "^5.1.1",
     "uuid": "^9.0.1",
     "validator": "^13.12.0",
-    "@effect-app/core": "1.2.1",
-    "@effect-app/schema": "1.2.6"
+    "@effect-app/core": "1.2.2",
+    "@effect-app/schema": "1.2.7"
   },
   "devDependencies": {
     "@babel/cli": "^7.24.5",
@@ -27,9 +27,9 @@
     "vitest": "^1.6.0"
   },
   "peerDependencies": {
-    "@effect/platform": "^0.53.5",
-    "effect": "^3.1.4",
-    "@effect/schema": "^0.67.2"
+    "@effect/platform": "^0.53.12",
+    "effect": "^3.2.1",
+    "@effect/schema": "^0.67.9"
   },
   "typesVersions": {
     "*": {

package/src/client/fetch.ts

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { Effect, HashMap, Option } from "@effect-app/core"
-import { constant } from "@effect-app/core/Function"
+import { constant, flow } from "@effect-app/core/Function"
 import type { Headers, HttpError, HttpRequestError, HttpResponseError, Method } from "@effect-app/core/http/http-client"
 import { Record } from "effect"
 import type { REST, Schema } from "effect-app/schema"
@@ -147,10 +147,7 @@ export function fetchApi(
       : HttpClientRequest
         .make(method)(path)
         .pipe(HttpClientRequest.jsonBody(body), Effect.flatMap(client)))
-      .pipe(
-        Effect.scoped,
-        Effect.withSpan("http.request", { attributes: { "http.method": method, "http.url": path } })
-      ))
+      .pipe(Effect.scoped))
 }
 
 export function fetchApi2S<RequestR, RequestFrom, RequestTo, ResponseR, ResponseFrom, ResponseTo>(
@@ -160,6 +157,15 @@ export function fetchApi2S<RequestR, RequestFrom, RequestTo, ResponseR, Response
   const encodeRequest = S.encode(request)
   const decRes = S.decodeUnknown(response)
   const decodeRes = (u: unknown) => Effect.mapError(decRes(u), (err) => new ResError(err))
+  const parse = flow(
+    mapResponseM(decodeRes),
+    Effect.map((i) => ({
+      ...i,
+      // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
+      body: i.body as ResponseTo
+    })),
+    Effect.withSpan("client.decode")
+  )
   return (method: Method, path: Path) => (req: RequestTo) => {
     return Effect.andThen(encodeRequest(req), (encoded) =>
       fetchApi(
@@ -170,14 +176,7 @@ export function fetchApi2S<RequestR, RequestFrom, RequestTo, ResponseR, Response
           : makePathWithBody(path, encoded as any),
         encoded
       )
-        .pipe(
-          Effect.flatMap(mapResponseM(decodeRes)),
-          Effect.map((i) => ({
-            ...i,
-            // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
-            body: i.body as ResponseTo
-          }))
-        ))
+        .pipe(Effect.flatMap(parse)))
   }
 }