effect-app 0.174.0 → 0.175.0

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @effect-app/prelude
 
+## 0.175.0
+
+### Minor Changes
+
+- 117be64: bump
+
+### Patch Changes
+
+- Updated dependencies [117be64]
+  - @effect-app/core@0.148.0
+  - @effect-app/fluent-extensions@0.141.0
+  - @effect-app/schema@0.199.0
+
+## 0.174.1
+
+### Patch Changes
+
+- 4008eb1: cleanup and add byIdAndSaveWithPure
+
 ## 0.174.0
 
 ### Minor Changes

package/_cjs/Request.cjs

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.schemaJsonUnsafe = exports.schemaJsonBodyUnsafe = exports.schemaJsonBody = exports.schemaJson = exports.responseWithJsonBody = exports.demandJson = void 0;
+exports.schemaJsonBodyUnsafe = exports.schemaJsonBody = exports.responseWithSchemaBody = exports.responseWithJsonBody = exports.demandJson = void 0;
 var _http = require("./http.cjs");
 var _lib = require("./lib.cjs");
 // TODO: consider rebuilding the text/json helpers to use a cached effect
@@ -32,21 +32,17 @@ const schemaJsonBodyUnsafe = (client, schema) => {
   return _http.HttpClient.mapEffect(client, _ => _lib.Effect.map(_.json, _lib.S.decodeUnknownSync(schema)));
 };
 /**
- * @tsplus fluent effect/platform/Http/Client schemaJson
+ * @tsplus fluent effect/platform/Http/Client responseWithSchemaBody
  */
 exports.schemaJsonBodyUnsafe = schemaJsonBodyUnsafe;
-const schemaJson = (client, schema) => {
-  return _http.HttpClient.mapEffect(client, _ => _lib.Effect.flatMap(responseWithJsonBody(_), _lib.S.decodeUnknown(schema)));
-};
-/**
- * @tsplus fluent effect/platform/Http/Client schemaJsonUnsafe
- */
-exports.schemaJson = schemaJson;
-const schemaJsonUnsafe = (client, schema) => {
-  return _http.HttpClient.mapEffect(client, _ => _lib.Effect.flatMap(responseWithJsonBody(_), _lib.S.decodeUnknown(schema)));
+const responseWithSchemaBody = (client, schema) => {
+  return _http.HttpClient.mapEffect(client, _ => _lib.Effect.flatMap(responseWithJsonBody(_), _ => _lib.Effect.map(_lib.S.decodeUnknown(schema)(_.body), body => ({
+    ..._,
+    body
+  }))));
 };
 /** @tsplus getter effect/platform/Http/Client demandJson */
-exports.schemaJsonUnsafe = schemaJsonUnsafe;
+exports.responseWithSchemaBody = responseWithSchemaBody;
 const demandJson = client => _http.HttpClient.mapRequest(client, _ => _http.HttpClientRequest.acceptJson(_)).pipe(_http.HttpClient.transform((r, request) => _lib.Effect.tap(r, response => _lib.Option.getOrUndefined(_http.HttpHeaders.get(response.headers, "Content-Type"))?.startsWith("application/json") ? _lib.Effect.unit : _lib.Effect.fail(_http.HttpClientError.ResponseError({
   request,
   response,

package/_cjs/Request.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"Request.cjs","names":["_http","require","_lib","responseWithJsonBody","response","Effect","map","json","body","headers","status","remoteAddress","exports","schemaJsonBody","client","schema","HttpClient","mapEffect","_","flatMap","S","decodeUnknown","schemaJsonBodyUnsafe","decodeUnknownSync","schemaJson","schemaJsonUnsafe","demandJson","mapRequest","HttpClientRequest","acceptJson","pipe","transform","r","request","tap","Option","getOrUndefined","HttpHeaders","get","startsWith","unit","fail","HttpClientError","ResponseError","reason","error"],"sources":["../src/Request.ts"],"sourcesContent":[null],"mappings":";;;;;;AAGA,IAAAA,KAAA,GAAAC,OAAA;AACA,IAAAC,IAAA,GAAAD,OAAA;AAMA;AACA;AAEA;;;AAGO,MAAME,oBAAoB,GAC/BC,QAAwB,IAExBC,WAAM,CAACC,GAAG,CAACF,QAAQ,CAACG,IAAI,EAAGC,IAAI,KAAiC;EAC9DA,IAAI;EACJC,OAAO,EAAEL,QAAQ,CAACK,OAAO;EACzBC,MAAM,EAAEN,QAAQ,CAACM,MAAM;EACvBC,aAAa,EAAEP,QAAQ,CAACO;CACzB,CAAC,CAAC;AAEL;;;AAAAC,OAAA,CAAAT,oBAAA,GAAAA,oBAAA;AAGO,MAAMU,cAAc,GAAGA,CAC5BC,MAA+C,EAC/CC,MAA2B,KACzB;EACF,OAAOC,gBAAU,CAACC,SAAS,CAACH,MAAM,EAAGI,CAAC,IAAKb,WAAM,CAACc,OAAO,CAACD,CAAC,CAACX,IAAI,EAAEa,MAAC,CAACC,aAAa,CAACN,MAAM,CAAC,CAAC,CAAC;AAC7F,CAAC;AAED;;;AAAAH,OAAA,CAAAC,cAAA,GAAAA,cAAA;AAGO,MAAMS,oBAAoB,GAAGA,CAClCR,MAA+C,EAC/CC,MAAwB,KACtB;EACF,OAAOC,gBAAU,CAACC,SAAS,CAACH,MAAM,EAAGI,CAAC,IAAKb,WAAM,CAACC,GAAG,CAACY,CAAC,CAACX,IAAI,EAAEa,MAAC,CAACG,iBAAiB,CAACR,MAAM,CAAC,CAAC,CAAC;AAC7F,CAAC;AAED;;;AAAAH,OAAA,CAAAU,oBAAA,GAAAA,oBAAA;AAGO,MAAME,UAAU,GAAGA,CAWxBV,MAA+C,EAC/CC,MAA2B,KACzB;EACF,OAAOC,gBAAU,CAACC,SAAS,CAACH,MAAM,EAAGI,CAAC,IAAKb,WAAM,CAACc,OAAO,CAAChB,oBAAoB,CAACe,CAAC,CAAC,EAAEE,MAAC,CAACC,aAAa,CAACN,MAAM,CAAC,CAAC,CAAC;AAC9G,CAAC;AAED;;;AAAAH,OAAA,CAAAY,UAAA,GAAAA,UAAA;AAGO,MAAMC,gBAAgB,GAAGA,CAW9BX,MAA+C,EAC/CC,MAA2B,KACzB;EACF,OAAOC,gBAAU,CAACC,SAAS,CAACH,MAAM,EAAGI,CAAC,IAAKb,WAAM,CAACc,OAAO,CAAChB,oBAAoB,CAACe,CAAC,CAAC,EAAEE,MAAC,CAACC,aAAa,CAACN,MAAM,CAAC,CAAC,CAAC;AAC9G,CAAC;AAED;AAAAH,OAAA,CAAAa,gBAAA,GAAAA,gBAAA;AACO,MAAMC,UAAU,GAAUZ,MAA+C,IAC9EE,gBAAU,CACPW,UAAU,CAACb,MAAM,EAAGI,CAAC,IAAKU,uBAAiB,CAACC,UAAU,CAACX,CAAC,CAAC,CAAC,CAC1DY,IAAI,CAACd,gBAAU,CAACe,SAAS,CAAC,CAACC,CAAC,EAAEC,OAAO,KACpC5B,WAAM,CAAC6B,GAAG,CAACF,CAAC,EAAG5B,QAAQ,IACrB+B,WAAM,CACDC,cAAc,CAACC,iBAAW,CACxBC,GAAG,CAAClC,QAAQ,CAACK,OAAO,EAAE,cAAc,CAAC,CAAC,EACvC8B,UAAU,CAAC,kBAAkB,CAAC,GAChClC,WAAM,CAACmC,IAAI,GACXnC,WAAM,CAACoC,IAAI,CAACC,qBAAe,CAACC,aAAa,CAAC;EAC1CV,OAAO;EACP7B,QAAQ;EACRwC,MAAM,EAAE,QAAQ;EAChBC,KAAK,EAAE,qBAAqB,GAAGV,WAAM,CAACC,cAAc,CAACC,iBAAW,CAACC,GAAG,CAAClC,QAAQ,CAACK,OAAO,EAAE,cAAc,CAAC;CACvG,CAAC,CAAC,CAAC,CACT,CAAC;AAAAG,OAAA,CAAAc,UAAA,GAAAA,UAAA"}
+{"version":3,"file":"Request.cjs","names":["_http","require","_lib","responseWithJsonBody","response","Effect","map","json","body","headers","status","remoteAddress","exports","schemaJsonBody","client","schema","HttpClient","mapEffect","_","flatMap","S","decodeUnknown","schemaJsonBodyUnsafe","decodeUnknownSync","responseWithSchemaBody","demandJson","mapRequest","HttpClientRequest","acceptJson","pipe","transform","r","request","tap","Option","getOrUndefined","HttpHeaders","get","startsWith","unit","fail","HttpClientError","ResponseError","reason","error"],"sources":["../src/Request.ts"],"sourcesContent":[null],"mappings":";;;;;;AAGA,IAAAA,KAAA,GAAAC,OAAA;AACA,IAAAC,IAAA,GAAAD,OAAA;AAMA;AACA;AAEA;;;AAGO,MAAME,oBAAoB,GAC/BC,QAAwB,IAExBC,WAAM,CAACC,GAAG,CAACF,QAAQ,CAACG,IAAI,EAAGC,IAAI,KAAiC;EAC9DA,IAAI;EACJC,OAAO,EAAEL,QAAQ,CAACK,OAAO;EACzBC,MAAM,EAAEN,QAAQ,CAACM,MAAM;EACvBC,aAAa,EAAEP,QAAQ,CAACO;CACzB,CAAC,CAAC;AAEL;;;AAAAC,OAAA,CAAAT,oBAAA,GAAAA,oBAAA;AAGO,MAAMU,cAAc,GAAGA,CAC5BC,MAA+C,EAC/CC,MAA2B,KACzB;EACF,OAAOC,gBAAU,CAACC,SAAS,CAACH,MAAM,EAAGI,CAAC,IAAKb,WAAM,CAACc,OAAO,CAACD,CAAC,CAACX,IAAI,EAAEa,MAAC,CAACC,aAAa,CAACN,MAAM,CAAC,CAAC,CAAC;AAC7F,CAAC;AAED;;;AAAAH,OAAA,CAAAC,cAAA,GAAAA,cAAA;AAGO,MAAMS,oBAAoB,GAAGA,CAClCR,MAA+C,EAC/CC,MAAwB,KACtB;EACF,OAAOC,gBAAU,CAACC,SAAS,CAACH,MAAM,EAAGI,CAAC,IAAKb,WAAM,CAACC,GAAG,CAACY,CAAC,CAACX,IAAI,EAAEa,MAAC,CAACG,iBAAiB,CAACR,MAAM,CAAC,CAAC,CAAC;AAC7F,CAAC;AAED;;;AAAAH,OAAA,CAAAU,oBAAA,GAAAA,oBAAA;AAGO,MAAME,sBAAsB,GAAGA,CAWpCV,MAA+C,EAC/CC,MAA2B,KACzB;EACF,OAAOC,gBAAU,CAACC,SAAS,CACzBH,MAAM,EACLI,CAAC,IACAb,WAAM,CAACc,OAAO,CACZhB,oBAAoB,CAACe,CAAC,CAAC,EACtBA,CAAC,IAAKb,WAAM,CAACC,GAAG,CAACc,MAAC,CAACC,aAAa,CAACN,MAAM,CAAC,CAACG,CAAC,CAACV,IAAI,CAAC,EAAGA,IAAI,KAAM;IAAE,GAAGU,CAAC;IAAEV;EAAI,CAAE,CAAC,CAAC,CAC/E,CACJ;AACH,CAAC;AAED;AAAAI,OAAA,CAAAY,sBAAA,GAAAA,sBAAA;AACO,MAAMC,UAAU,GAAUX,MAA+C,IAC9EE,gBAAU,CACPU,UAAU,CAACZ,MAAM,EAAGI,CAAC,IAAKS,uBAAiB,CAACC,UAAU,CAACV,CAAC,CAAC,CAAC,CAC1DW,IAAI,CAACb,gBAAU,CAACc,SAAS,CAAC,CAACC,CAAC,EAAEC,OAAO,KACpC3B,WAAM,CAAC4B,GAAG,CAACF,CAAC,EAAG3B,QAAQ,IACrB8B,WAAM,CACDC,cAAc,CAACC,iBAAW,CACxBC,GAAG,CAACjC,QAAQ,CAACK,OAAO,EAAE,cAAc,CAAC,CAAC,EACvC6B,UAAU,CAAC,kBAAkB,CAAC,GAChCjC,WAAM,CAACkC,IAAI,GACXlC,WAAM,CAACmC,IAAI,CAACC,qBAAe,CAACC,aAAa,CAAC;EAC1CV,OAAO;EACP5B,QAAQ;EACRuC,MAAM,EAAE,QAAQ;EAChBC,KAAK,EAAE,qBAAqB,GAAGV,WAAM,CAACC,cAAc,CAACC,iBAAW,CAACC,GAAG,CAACjC,QAAQ,CAACK,OAAO,EAAE,cAAc,CAAC;CACvG,CAAC,CAAC,CAAC,CACT,CAAC;AAAAG,OAAA,CAAAa,UAAA,GAAAA,UAAA"}

package/dist/Request.d.ts

@@ -2,7 +2,7 @@ import type { Schema } from "@effect-app/schema";
 import type { ClientResponse } from "@effect/platform/Http/ClientResponse";
 import type { Headers } from "@effect/platform/Http/Headers";
 import { HttpClient, HttpClientError } from "./http.js";
-import { Effect, S } from "./lib.js";
+import { Effect, Option, S } from "./lib.js";
 export interface ResponseWithBody<A> extends Pick<ClientResponse, "headers" | "status" | "remoteAddress"> {
     readonly body: A;
 }
@@ -19,21 +19,18 @@ export declare const schemaJsonBody: <R, To, From, A, B>(client: HttpClient.Clie
  */
 export declare const schemaJsonBodyUnsafe: <To, From, A, B>(client: HttpClient.Client<A, B, ClientResponse>, schema: Schema<To, From, never>) => HttpClient.Client<A, HttpClientError.ResponseError | B, To>;
 /**
- * @tsplus fluent effect/platform/Http/Client schemaJson
+ * @tsplus fluent effect/platform/Http/Client responseWithSchemaBody
  */
-export declare const schemaJson: <R, From extends {
+export declare const responseWithSchemaBody: <R, From extends {
     readonly status?: number;
     readonly headers?: Headers;
     readonly body?: unknown;
-}, To, A, B>(client: HttpClient.Client<A, B, ClientResponse>, schema: Schema<To, From, R>) => HttpClient.Client<R | A, HttpClientError.ResponseError | B | S.ParseResult.ParseError, To>;
-/**
- * @tsplus fluent effect/platform/Http/Client schemaJsonUnsafe
- */
-export declare const schemaJsonUnsafe: <R, From extends {
-    readonly status?: number;
-    readonly headers?: Headers;
-    readonly body?: unknown;
-}, To, A, B>(client: HttpClient.Client<A, B, ClientResponse>, schema: Schema<To, From, R>) => HttpClient.Client<R | A, HttpClientError.ResponseError | B | S.ParseResult.ParseError, To>;
+}, To, A, B>(client: HttpClient.Client<A, B, ClientResponse>, schema: Schema<To, From, R>) => HttpClient.Client<R | A, HttpClientError.ResponseError | B | S.ParseResult.ParseError, {
+    body: To;
+    headers: Headers;
+    status: number;
+    remoteAddress: Option.Option<string>;
+}>;
 /** @tsplus getter effect/platform/Http/Client demandJson */
 export declare const demandJson: <R, E>(client: HttpClient.Client<R, E, ClientResponse>) => HttpClient.Client<R, HttpClientError.ResponseError | E, ClientResponse>;
 //# sourceMappingURL=Request.d.ts.map

package/dist/Request.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Request.d.ts","sourceRoot":"","sources":["../src/Request.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAA;AAChD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAA;AAC1E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAA;AAC5D,OAAO,EAAE,UAAU,EAAE,eAAe,EAAkC,MAAM,WAAW,CAAA;AACvF,OAAO,EAAE,MAAM,EAAU,CAAC,EAAE,MAAM,UAAU,CAAA;AAE5C,MAAM,WAAW,gBAAgB,CAAC,CAAC,CAAE,SAAQ,IAAI,CAAC,cAAc,EAAE,SAAS,GAAG,QAAQ,GAAG,eAAe,CAAC;IACvG,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAA;CACjB;AAKD;;GAEG;AACH,eAAO,MAAM,oBAAoB,aACrB,cAAc,mFAOrB,CAAA;AAEL;;GAEG;AACH,eAAO,MAAM,cAAc,iMAK1B,CAAA;AAED;;GAEG;AACH,eAAO,MAAM,oBAAoB,mKAKhC,CAAA;AAED;;GAEG;AACH,eAAO,MAAM,UAAU;sBAGD,MAAM;uBACL,OAAO;oBACV,OAAO;wLAU1B,CAAA;AAED;;GAEG;AACH,eAAO,MAAM,gBAAgB;sBAGP,MAAM;uBACL,OAAO;oBACV,OAAO;wLAU1B,CAAA;AAED,4DAA4D;AAC5D,eAAO,MAAM,UAAU,oIAgBjB,CAAA"}
+{"version":3,"file":"Request.d.ts","sourceRoot":"","sources":["../src/Request.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAA;AAChD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAA;AAC1E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAA;AAC5D,OAAO,EAAE,UAAU,EAAE,eAAe,EAAkC,MAAM,WAAW,CAAA;AACvF,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,UAAU,CAAA;AAE5C,MAAM,WAAW,gBAAgB,CAAC,CAAC,CAAE,SAAQ,IAAI,CAAC,cAAc,EAAE,SAAS,GAAG,QAAQ,GAAG,eAAe,CAAC;IACvG,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAA;CACjB;AAKD;;GAEG;AACH,eAAO,MAAM,oBAAoB,aACrB,cAAc,mFAOrB,CAAA;AAEL;;GAEG;AACH,eAAO,MAAM,cAAc,iMAK1B,CAAA;AAED;;GAEG;AACH,eAAO,MAAM,oBAAoB,mKAKhC,CAAA;AAED;;GAEG;AACH,eAAO,MAAM,sBAAsB;sBAGb,MAAM;uBACL,OAAO;oBACV,OAAO;;;;;;EAiB1B,CAAA;AAED,4DAA4D;AAC5D,eAAO,MAAM,UAAU,oIAgBjB,CAAA"}

package/dist/Request.js

@@ -24,16 +24,10 @@ export const schemaJsonBodyUnsafe = (client, schema) => {
     return HttpClient.mapEffect(client, (_) => Effect.map(_.json, S.decodeUnknownSync(schema)));
 };
 /**
- * @tsplus fluent effect/platform/Http/Client schemaJson
+ * @tsplus fluent effect/platform/Http/Client responseWithSchemaBody
  */
-export const schemaJson = (client, schema) => {
-    return HttpClient.mapEffect(client, (_) => Effect.flatMap(responseWithJsonBody(_), S.decodeUnknown(schema)));
-};
-/**
- * @tsplus fluent effect/platform/Http/Client schemaJsonUnsafe
- */
-export const schemaJsonUnsafe = (client, schema) => {
-    return HttpClient.mapEffect(client, (_) => Effect.flatMap(responseWithJsonBody(_), S.decodeUnknown(schema)));
+export const responseWithSchemaBody = (client, schema) => {
+    return HttpClient.mapEffect(client, (_) => Effect.flatMap(responseWithJsonBody(_), (_) => Effect.map(S.decodeUnknown(schema)(_.body), (body) => ({ ..._, body }))));
 };
 /** @tsplus getter effect/platform/Http/Client demandJson */
 export const demandJson = (client) => HttpClient
@@ -49,4 +43,4 @@ export const demandJson = (client) => HttpClient
         reason: "Decode",
         error: "not json response: " + Option.getOrUndefined(HttpHeaders.get(response.headers, "Content-Type"))
     })))));
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVxdWVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9SZXF1ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUdBLE9BQU8sRUFBRSxVQUFVLEVBQUUsZUFBZSxFQUFFLGlCQUFpQixFQUFFLFdBQVcsRUFBRSxNQUFNLFdBQVcsQ0FBQTtBQUN2RixPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sRUFBRSxDQUFDLEVBQUUsTUFBTSxVQUFVLENBQUE7QUFNNUMseUVBQXlFO0FBQ3pFLDBGQUEwRjtBQUUxRjs7R0FFRztBQUNILE1BQU0sQ0FBQyxNQUFNLG9CQUFvQixHQUFHLENBQ2xDLFFBQXdCLEVBQ3hCLEVBQUUsQ0FDRixNQUFNLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxJQUFJLEVBQTZCLEVBQUUsQ0FBQyxDQUFDO0lBQzlELElBQUk7SUFDSixPQUFPLEVBQUUsUUFBUSxDQUFDLE9BQU87SUFDekIsTUFBTSxFQUFFLFFBQVEsQ0FBQyxNQUFNO0lBQ3ZCLGFBQWEsRUFBRSxRQUFRLENBQUMsYUFBYTtDQUN0QyxDQUFDLENBQUMsQ0FBQTtBQUVMOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sY0FBYyxHQUFHLENBQzVCLE1BQStDLEVBQy9DLE1BQTJCLEVBQzNCLEVBQUU7SUFDRixPQUFPLFVBQVUsQ0FBQyxTQUFTLENBQUMsTUFBTSxFQUFFLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxDQUFDLGFBQWEsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLENBQUE7QUFDN0YsQ0FBQyxDQUFBO0FBRUQ7O0dBRUc7QUFDSCxNQUFNLENBQUMsTUFBTSxvQkFBb0IsR0FBRyxDQUNsQyxNQUErQyxFQUMvQyxNQUF3QixFQUN4QixFQUFFO0lBQ0YsT0FBTyxVQUFVLENBQUMsU0FBUyxDQUFDLE1BQU0sRUFBRSxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQyxpQkFBaUIsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLENBQUE7QUFDN0YsQ0FBQyxDQUFBO0FBRUQ7O0dBRUc7QUFDSCxNQUFNLENBQUMsTUFBTSxVQUFVLEdBQUcsQ0FXeEIsTUFBK0MsRUFDL0MsTUFBMkIsRUFDM0IsRUFBRTtJQUNGLE9BQU8sVUFBVSxDQUFDLFNBQVMsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsb0JBQW9CLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLGFBQWEsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLENBQUE7QUFDOUcsQ0FBQyxDQUFBO0FBRUQ7O0dBRUc7QUFDSCxNQUFNLENBQUMsTUFBTSxnQkFBZ0IsR0FBRyxDQVc5QixNQUErQyxFQUMvQyxNQUEyQixFQUMzQixFQUFFO0lBQ0YsT0FBTyxVQUFVLENBQUMsU0FBUyxDQUFDLE1BQU0sRUFBRSxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxvQkFBb0IsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsYUFBYSxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsQ0FBQTtBQUM5RyxDQUFDLENBQUE7QUFFRCw0REFBNEQ7QUFDNUQsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHLENBQU8sTUFBK0MsRUFBRSxFQUFFLENBQ2xGLFVBQVU7S0FDUCxVQUFVLENBQUMsTUFBTSxFQUFFLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxpQkFBaUIsQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDLENBQUM7S0FDMUQsSUFBSSxDQUFDLFVBQVUsQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLEVBQUUsT0FBTyxFQUFFLEVBQUUsQ0FDeEMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxRQUFRLEVBQUUsRUFBRSxDQUN6QixNQUFNO0tBQ0QsY0FBYyxDQUFDLFdBQVc7S0FDeEIsR0FBRyxDQUFDLFFBQVEsQ0FBQyxPQUFPLEVBQUUsY0FBYyxDQUFDLENBQUM7SUFDekMsRUFBRSxVQUFVLENBQUMsa0JBQWtCLENBQUM7SUFDbEMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxJQUFJO0lBQ2IsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsZUFBZSxDQUFDLGFBQWEsQ0FBQztRQUMxQyxPQUFPO1FBQ1AsUUFBUTtRQUNSLE1BQU0sRUFBRSxRQUFRO1FBQ2hCLEtBQUssRUFBRSxxQkFBcUIsR0FBRyxNQUFNLENBQUMsY0FBYyxDQUFDLFdBQVcsQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDLE9BQU8sRUFBRSxjQUFjLENBQUMsQ0FBQztLQUN4RyxDQUFDLENBQUMsQ0FBQyxDQUNULENBQUMsQ0FBQSJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVxdWVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9SZXF1ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUdBLE9BQU8sRUFBRSxVQUFVLEVBQUUsZUFBZSxFQUFFLGlCQUFpQixFQUFFLFdBQVcsRUFBRSxNQUFNLFdBQVcsQ0FBQTtBQUN2RixPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sRUFBRSxDQUFDLEVBQUUsTUFBTSxVQUFVLENBQUE7QUFNNUMseUVBQXlFO0FBQ3pFLDBGQUEwRjtBQUUxRjs7R0FFRztBQUNILE1BQU0sQ0FBQyxNQUFNLG9CQUFvQixHQUFHLENBQ2xDLFFBQXdCLEVBQ3hCLEVBQUUsQ0FDRixNQUFNLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxJQUFJLEVBQTZCLEVBQUUsQ0FBQyxDQUFDO0lBQzlELElBQUk7SUFDSixPQUFPLEVBQUUsUUFBUSxDQUFDLE9BQU87SUFDekIsTUFBTSxFQUFFLFFBQVEsQ0FBQyxNQUFNO0lBQ3ZCLGFBQWEsRUFBRSxRQUFRLENBQUMsYUFBYTtDQUN0QyxDQUFDLENBQUMsQ0FBQTtBQUVMOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sY0FBYyxHQUFHLENBQzVCLE1BQStDLEVBQy9DLE1BQTJCLEVBQzNCLEVBQUU7SUFDRixPQUFPLFVBQVUsQ0FBQyxTQUFTLENBQUMsTUFBTSxFQUFFLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxDQUFDLGFBQWEsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLENBQUE7QUFDN0YsQ0FBQyxDQUFBO0FBRUQ7O0dBRUc7QUFDSCxNQUFNLENBQUMsTUFBTSxvQkFBb0IsR0FBRyxDQUNsQyxNQUErQyxFQUMvQyxNQUF3QixFQUN4QixFQUFFO0lBQ0YsT0FBTyxVQUFVLENBQUMsU0FBUyxDQUFDLE1BQU0sRUFBRSxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQyxpQkFBaUIsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLENBQUE7QUFDN0YsQ0FBQyxDQUFBO0FBRUQ7O0dBRUc7QUFDSCxNQUFNLENBQUMsTUFBTSxzQkFBc0IsR0FBRyxDQVdwQyxNQUErQyxFQUMvQyxNQUEyQixFQUMzQixFQUFFO0lBQ0YsT0FBTyxVQUFVLENBQUMsU0FBUyxDQUN6QixNQUFNLEVBQ04sQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUNKLE1BQU0sQ0FBQyxPQUFPLENBQ1osb0JBQW9CLENBQUMsQ0FBQyxDQUFDLEVBQ3ZCLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxhQUFhLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsSUFBSSxFQUFFLEVBQUUsQ0FBQyxDQUFDLEVBQUUsR0FBRyxDQUFDLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUMvRSxDQUNKLENBQUE7QUFDSCxDQUFDLENBQUE7QUFFRCw0REFBNEQ7QUFDNUQsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHLENBQU8sTUFBK0MsRUFBRSxFQUFFLENBQ2xGLFVBQVU7S0FDUCxVQUFVLENBQUMsTUFBTSxFQUFFLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxpQkFBaUIsQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDLENBQUM7S0FDMUQsSUFBSSxDQUFDLFVBQVUsQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLEVBQUUsT0FBTyxFQUFFLEVBQUUsQ0FDeEMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxRQUFRLEVBQUUsRUFBRSxDQUN6QixNQUFNO0tBQ0QsY0FBYyxDQUFDLFdBQVc7S0FDeEIsR0FBRyxDQUFDLFFBQVEsQ0FBQyxPQUFPLEVBQUUsY0FBYyxDQUFDLENBQUM7SUFDekMsRUFBRSxVQUFVLENBQUMsa0JBQWtCLENBQUM7SUFDbEMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxJQUFJO0lBQ2IsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsZUFBZSxDQUFDLGFBQWEsQ0FBQztRQUMxQyxPQUFPO1FBQ1AsUUFBUTtRQUNSLE1BQU0sRUFBRSxRQUFRO1FBQ2hCLEtBQUssRUFBRSxxQkFBcUIsR0FBRyxNQUFNLENBQUMsY0FBYyxDQUFDLFdBQVcsQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDLE9BQU8sRUFBRSxjQUFjLENBQUMsQ0FBQztLQUN4RyxDQUFDLENBQUMsQ0FBQyxDQUNULENBQUMsQ0FBQSJ9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "effect-app",
-  "version": "0.174.0",
+  "version": "0.175.0",
   "license": "MIT",
   "type": "module",
   "dependencies": {
@@ -13,9 +13,9 @@
     "ts-pattern": "^5.0.8",
     "uuid": "^9.0.1",
     "validator": "^13.11.0",
-    "@effect-app/core": "0.147.0",
-    "@effect-app/schema": "0.198.0",
-    "@effect-app/fluent-extensions": "0.140.0"
+    "@effect-app/core": "0.148.0",
+    "@effect-app/fluent-extensions": "0.141.0",
+    "@effect-app/schema": "0.199.0"
   },
   "devDependencies": {
     "@babel/cli": "^7.23.9",
@@ -27,13 +27,13 @@
     "ts-node": "^10.9.2",
     "typescript": "^5.3.3",
     "vitest": "^1.3.1",
-    "@effect-app/compiler": "0.68.0"
+    "@effect-app/compiler": "0.69.0"
   },
   "peerDependencies": {
     "@effect/platform": "^0.46.1",
     "effect": "^2.4.0",
     "@effect/schema": "^0.63.0",
-    "@fp-ts/optic": "^0.22.0"
+    "@fp-ts/optic": "0.22.0"
   },
   "typesVersions": {
     "*": {

package/src/Request.ts

@@ -45,9 +45,9 @@ export const schemaJsonBodyUnsafe = <To, From, A, B>(
 }
 
 /**
- * @tsplus fluent effect/platform/Http/Client schemaJson
+ * @tsplus fluent effect/platform/Http/Client responseWithSchemaBody
  */
-export const schemaJson = <
+export const responseWithSchemaBody = <
   R,
   From extends {
     readonly status?: number
@@ -61,27 +61,14 @@ export const schemaJson = <
   client: HttpClient.Client<A, B, ClientResponse>,
   schema: Schema<To, From, R>
 ) => {
-  return HttpClient.mapEffect(client, (_) => Effect.flatMap(responseWithJsonBody(_), S.decodeUnknown(schema)))
-}
-
-/**
- * @tsplus fluent effect/platform/Http/Client schemaJsonUnsafe
- */
-export const schemaJsonUnsafe = <
-  R,
-  From extends {
-    readonly status?: number
-    readonly headers?: Headers
-    readonly body?: unknown
-  },
-  To,
-  A,
-  B
->(
-  client: HttpClient.Client<A, B, ClientResponse>,
-  schema: Schema<To, From, R>
-) => {
-  return HttpClient.mapEffect(client, (_) => Effect.flatMap(responseWithJsonBody(_), S.decodeUnknown(schema)))
+  return HttpClient.mapEffect(
+    client,
+    (_) =>
+      Effect.flatMap(
+        responseWithJsonBody(_),
+        (_) => Effect.map(S.decodeUnknown(schema)(_.body), (body) => ({ ..._, body }))
+      )
+  )
 }
 
 /** @tsplus getter effect/platform/Http/Client demandJson */

package/vitest.config.ts.timestamp-1670862388823.mjs

@@ -0,0 +1,23 @@
+// vitest.config.ts
+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";
+
+// ../../vite.config.base.ts
+import { tsPlugin } from "file:///Users/patrickroza/Projects/Personal/effect-ts-app/libs/packages/compiler/dist/vitePlugin.js";
+function makeConfig() {
+  return {
+    plugins: [tsPlugin({})],
+    test: {
+      include: ["./_src/**/*.test.{js,mjs,cjs,ts,mts,cts,jsx,tsx}"],
+      exclude: ["./_test/**/*"],
+      reporters: "verbose",
+      globals: true
+    }
+  };
+}
+
+// vitest.config.ts
+var vitest_config_default = defineConfig(makeConfig());
+export {
+  vitest_config_default as default
+};
+//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsidml0ZXN0LmNvbmZpZy50cyIsICIuLi8uLi92aXRlLmNvbmZpZy5iYXNlLnRzIl0sCiAgInNvdXJjZXNDb250ZW50IjogWyJjb25zdCBfX3ZpdGVfaW5qZWN0ZWRfb3JpZ2luYWxfZGlybmFtZSA9IFwiL1VzZXJzL3BhdHJpY2tyb3phL1Byb2plY3RzL1BlcnNvbmFsL2VmZmVjdC10cy1hcHAvbGlicy9wYWNrYWdlcy9ib2lsZXJwbGF0ZS1wcmVsdWRlXCI7Y29uc3QgX192aXRlX2luamVjdGVkX29yaWdpbmFsX2ZpbGVuYW1lID0gXCIvVXNlcnMvcGF0cmlja3JvemEvUHJvamVjdHMvUGVyc29uYWwvZWZmZWN0LXRzLWFwcC9saWJzL3BhY2thZ2VzL2JvaWxlcnBsYXRlLXByZWx1ZGUvdml0ZXN0LmNvbmZpZy50c1wiO2NvbnN0IF9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9pbXBvcnRfbWV0YV91cmwgPSBcImZpbGU6Ly8vVXNlcnMvcGF0cmlja3JvemEvUHJvamVjdHMvUGVyc29uYWwvZWZmZWN0LXRzLWFwcC9saWJzL3BhY2thZ2VzL2JvaWxlcnBsYXRlLXByZWx1ZGUvdml0ZXN0LmNvbmZpZy50c1wiOy8vLyA8cmVmZXJlbmNlIHR5cGVzPVwidml0ZXN0XCIgLz5cbmltcG9ydCB7IGRlZmluZUNvbmZpZyB9IGZyb20gXCJ2aXRlXCJcbmltcG9ydCBtYWtlQ29uZmlnIGZyb20gXCIuLi8uLi92aXRlLmNvbmZpZy5iYXNlXCJcblxuZXhwb3J0IGRlZmF1bHQgZGVmaW5lQ29uZmlnKG1ha2VDb25maWcoKSlcbiIsICJjb25zdCBfX3ZpdGVfaW5qZWN0ZWRfb3JpZ2luYWxfZGlybmFtZSA9IFwiL1VzZXJzL3BhdHJpY2tyb3phL1Byb2plY3RzL1BlcnNvbmFsL2VmZmVjdC10cy1hcHAvbGlic1wiO2NvbnN0IF9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9maWxlbmFtZSA9IFwiL1VzZXJzL3BhdHJpY2tyb3phL1Byb2plY3RzL1BlcnNvbmFsL2VmZmVjdC10cy1hcHAvbGlicy92aXRlLmNvbmZpZy5iYXNlLnRzXCI7Y29uc3QgX192aXRlX2luamVjdGVkX29yaWdpbmFsX2ltcG9ydF9tZXRhX3VybCA9IFwiZmlsZTovLy9Vc2Vycy9wYXRyaWNrcm96YS9Qcm9qZWN0cy9QZXJzb25hbC9lZmZlY3QtdHMtYXBwL2xpYnMvdml0ZS5jb25maWcuYmFzZS50c1wiOy8vLyA8cmVmZXJlbmNlIHR5cGVzPVwidml0ZXN0XCIgLz5cbmltcG9ydCB7IHRzUGx1Z2luIH0gZnJvbSBcIkBlZmZlY3QtdHMtYXBwL2NvbXBpbGVyL3ZpdGVQbHVnaW5cIlxuZXhwb3J0IGRlZmF1bHQgZnVuY3Rpb24gbWFrZUNvbmZpZygpIHtcbiAgcmV0dXJuIHtcbiAgICAvLyBlc2xpbnQtZGlzYWJsZS1uZXh0LWxpbmUgQHR5cGVzY3JpcHQtZXNsaW50L25vLXZhci1yZXF1aXJlc1xuICAgIHBsdWdpbnM6IFt0c1BsdWdpbih7fSldLFxuICAgIHRlc3Q6IHtcbiAgICAgIGluY2x1ZGU6IFtcIi4vX3NyYy8qKi8qLnRlc3Que2pzLG1qcyxjanMsdHMsbXRzLGN0cyxqc3gsdHN4fVwiXSxcbiAgICAgIGV4Y2x1ZGU6IFtcIi4vX3Rlc3QvKiovKlwiXSxcbiAgICAgIHJlcG9ydGVyczogXCJ2ZXJib3NlXCIsXG4gICAgICBnbG9iYWxzOiB0cnVlXG4gICAgfSxcbiAgICAvLyByZXNvbHZlOiB7XG4gICAgLy8gICBhbGlhczoge1xuICAgIC8vICAgICBcIkBlZmZlY3QvaW8vdGVzdFwiOiBwYXRoLnJlc29sdmUoX19kaXJuYW1lLCBcIi90ZXN0XCIpLFxuICAgIC8vICAgICBcIkBlZmZlY3QvaW9cIjogcGF0aC5yZXNvbHZlKF9fZGlybmFtZSwgXCIvc3JjXCIpXG4gICAgLy8gICB9XG4gICAgLy8gfVxuICB9XG59XG4iXSwKICAibWFwcGluZ3MiOiAiO0FBQ0EsU0FBUyxvQkFBb0I7OztBQ0E3QixTQUFTLGdCQUFnQjtBQUNWLFNBQVIsYUFBOEI7QUFDbkMsU0FBTztBQUFBLElBRUwsU0FBUyxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUM7QUFBQSxJQUN0QixNQUFNO0FBQUEsTUFDSixTQUFTLENBQUMsa0RBQWtEO0FBQUEsTUFDNUQsU0FBUyxDQUFDLGNBQWM7QUFBQSxNQUN4QixXQUFXO0FBQUEsTUFDWCxTQUFTO0FBQUEsSUFDWDtBQUFBLEVBT0Y7QUFDRjs7O0FEZkEsSUFBTyx3QkFBUSxhQUFhLFdBQVcsQ0FBQzsiLAogICJuYW1lcyI6IFtdCn0K