@effect/platform 0.13.0 → 0.13.2

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.
@@ -1 +1 @@
1
- {"version":3,"file":"Headers.mjs","names":["dual","HashMap","empty","fromInput","input","undefined","isHashMap","Symbol","iterator","fromIterable","map","k","v","toLowerCase","Object","entries","has","self","key","get","set","value","setAll","headers","union","remove"],"sources":["../../src/Http/Headers.ts"],"sourcesContent":[null],"mappings":"AAAA;;;AAGA,SAASA,IAAI,QAAQ,uBAAuB;AAC5C,OAAO,KAAKC,OAAO,MAAM,sBAAsB;AAe/C;;;;AAIA,OAAO,MAAMC,KAAK,gBAAYD,OAAO,CAACC,KAAK,EAAE;AAE7C;;;;AAIA,OAAO,MAAMC,SAAS,GAAgCC,KAAK,IAAI;EAC7D,IAAIA,KAAK,KAAKC,SAAS,EAAE;IACvB,OAAOH,KAAK;GACb,MAAM,IAAID,OAAO,CAACK,SAAS,CAACF,KAAK,CAAC,EAAE;IACnC,OAAOA,KAAK;GACb,MAAM,IAAIG,MAAM,CAACC,QAAQ,IAAIJ,KAAK,EAAE;IACnC,OAAOH,OAAO,CAACQ,YAAY,CAAC,CAAC,GAAGL,KAAK,CAAC,CAACM,GAAG,CAAC,CAAC,CAACC,CAAC,EAAEC,CAAC,CAAC,KAAK,CAACD,CAAC,CAACE,WAAW,EAAE,EAAED,CAAC,CAAC,CAAC,CAAY;;EAE1F,OAAOX,OAAO,CAACQ,YAAY,CAACK,MAAM,CAACC,OAAO,CAACX,KAAK,CAAC,CAACM,GAAG,CAAC,CAAC,CAACC,CAAC,EAAEC,CAAC,CAAC,KAAK,CAACD,CAAC,CAACE,WAAW,EAAE,EAAED,CAAC,CAAC,CAAC,CAAC;AAC1F,CAAC;AAED;;;;AAIA,OAAO,MAAMI,GAAG,gBAGZhB,IAAI,CAGN,CAAC,EAAE,CAACiB,IAAI,EAAEC,GAAG,KAAKjB,OAAO,CAACe,GAAG,CAACC,IAAI,EAAEC,GAAG,CAACL,WAAW,EAAE,CAAC,CAAC;AAEzD;;;;AAIA,OAAO,MAAMM,GAAG,gBAGZnB,IAAI,CAGN,CAAC,EAAE,CAACiB,IAAI,EAAEC,GAAG,KAAKjB,OAAO,CAACkB,GAAG,CAACF,IAAI,EAAEC,GAAG,CAACL,WAAW,EAAE,CAAC,CAAC;AAEzD;;;;AAIA,OAAO,MAAMO,GAAG,gBAGZpB,IAAI,CAGN,CAAC,EAAE,CAACiB,IAAI,EAAEC,GAAG,EAAEG,KAAK,KAAKpB,OAAO,CAACmB,GAAG,CAACH,IAAI,EAAEC,GAAG,CAACL,WAAW,EAAE,EAAEQ,KAAK,CAAC,CAAC;AAEvE;;;;AAIA,OAAO,MAAMC,MAAM,gBAGftB,IAAI,CAGN,CAAC,EAAE,CAACiB,IAAI,EAAEM,OAAO,KACjBtB,OAAO,CAACuB,KAAK,CACXP,IAAI,EACJd,SAAS,CAACoB,OAAO,CAAC,CACnB,CAAC;AAEJ;;;;AAIA,OAAO,MAAME,MAAM,gBAGfzB,IAAI,CAGN,CAAC,EAAE,CAACiB,IAAI,EAAEC,GAAG,KAAKjB,OAAO,CAACwB,MAAM,CAACR,IAAI,EAAEC,GAAG,CAACL,WAAW,EAAE,CAAC,CAAC"}
1
+ {"version":3,"file":"Headers.mjs","names":["dual","ReadonlyArray","ReadonlyRecord","empty","fromInput","input","undefined","Symbol","iterator","fromEntries","map","fromIterable","k","v","toLowerCase","Object","entries","has","self","key","get","set","value","setAll","headers","remove"],"sources":["../../src/Http/Headers.ts"],"sourcesContent":[null],"mappings":"AAAA;;;AAGA,SAASA,IAAI,QAAQ,uBAAuB;AAE5C,OAAO,KAAKC,aAAa,MAAM,4BAA4B;AAC3D,OAAO,KAAKC,cAAc,MAAM,6BAA6B;AAc7D;;;;AAIA,OAAO,MAAMC,KAAK,gBAAYD,cAAc,CAACC,KAAK,EAAE;AAEpD;;;;AAIA,OAAO,MAAMC,SAAS,GAAgCC,KAAK,IAAI;EAC7D,IAAIA,KAAK,KAAKC,SAAS,EAAE;IACvB,OAAOH,KAAK;GACb,MAAM,IAAII,MAAM,CAACC,QAAQ,IAAIH,KAAK,EAAE;IACnC,OAAOH,cAAc,CAACO,WAAW,CAACR,aAAa,CAACS,GAAG,CACjDT,aAAa,CAACU,YAAY,CAACN,KAAK,CAAC,EACjC,CAAC,CAACO,CAAC,EAAEC,CAAC,CAAC,KAAK,CAACD,CAAC,CAACE,WAAW,EAAE,EAAED,CAAC,CAAU,CAC1C,CAAC;;EAEJ,OAAOX,cAAc,CAACO,WAAW,CAC/BM,MAAM,CAACC,OAAO,CAACX,KAAK,CAAC,CAACK,GAAG,CAAC,CAAC,CAACE,CAAC,EAAEC,CAAC,CAAC,KAAK,CAACD,CAAC,CAACE,WAAW,EAAE,EAAED,CAAC,CAAC,CAAC,CAC5D;AACH,CAAC;AAED;;;;AAIA,OAAO,MAAMI,GAAG,gBAGZjB,IAAI,CAGN,CAAC,EAAE,CAACkB,IAAI,EAAEC,GAAG,KAAKjB,cAAc,CAACe,GAAG,CAACC,IAAI,EAAEC,GAAG,CAACL,WAAW,EAAE,CAAC,CAAC;AAEhE;;;;AAIA,OAAO,MAAMM,GAAG,gBAGZpB,IAAI,CAGN,CAAC,EAAE,CAACkB,IAAI,EAAEC,GAAG,KAAKjB,cAAc,CAACkB,GAAG,CAACF,IAAI,EAAEC,GAAG,CAACL,WAAW,EAAE,CAAC,CAAC;AAEhE;;;;AAIA,OAAO,MAAMO,GAAG,gBAGZrB,IAAI,CAGN,CAAC,EAAE,CAACkB,IAAI,EAAEC,GAAG,EAAEG,KAAK,MAAM;EAC1B,GAAGJ,IAAI;EACP,CAACC,GAAG,CAACL,WAAW,EAAE,GAAGQ;CACtB,CAAC,CAAC;AAEH;;;;AAIA,OAAO,MAAMC,MAAM,gBAGfvB,IAAI,CAGN,CAAC,EAAE,CAACkB,IAAI,EAAEM,OAAO,MAAM;EACvB,GAAGN,IAAI;EACP,GAAGd,SAAS,CAACoB,OAAO;CACrB,CAAC,CAAC;AAEH;;;;AAIA,OAAO,MAAMC,MAAM,gBAGfzB,IAAI,CAGN,CAAC,EAAE,CAACkB,IAAI,EAAEC,GAAG,KAAKjB,cAAc,CAACuB,MAAM,CAACP,IAAI,EAAEC,GAAG,CAACL,WAAW,EAAE,CAAC,CAAC"}
@@ -35,7 +35,7 @@ export const schemaBodyUrlParams = schema => {
35
35
  */
36
36
  export const schemaHeaders = schema => {
37
37
  const parse = Schema.parse(schema);
38
- return self => parse(Object.fromEntries(self.headers));
38
+ return self => parse(self.headers);
39
39
  };
40
40
  /**
41
41
  * @since 1.0.0
@@ -1 +1 @@
1
- {"version":3,"file":"IncomingMessage.mjs","names":["dual","Global","Option","Effect","FiberRef","FileSystem","Schema","TypeId","Symbol","for","schemaBodyJson","schema","parse","self","flatMap","json","schemaBodyUrlParams","urlParams","_","Object","fromEntries","schemaHeaders","headers","maxBodySize","globalValue","unsafeMake","none","withMaxBodySize","effect","size","locally","map","Size"],"sources":["../../src/Http/IncomingMessage.ts"],"sourcesContent":[null],"mappings":"AAAA;;;AAGA,SAASA,IAAI,QAAQ,uBAAuB;AAC5C,OAAO,KAAKC,MAAM,MAAM,qBAAqB;AAC7C,OAAO,KAAKC,MAAM,MAAM,qBAAqB;AAC7C,OAAO,KAAKC,MAAM,MAAM,mBAAmB;AAC3C,OAAO,KAAKC,QAAQ,MAAM,qBAAqB;AAC/C,OAAO,KAAKC,UAAU,MAAM,6BAA6B;AAIzD,OAAO,KAAKC,MAAM,MAAM,uBAAuB;AAG/C;;;;AAIA,OAAO,MAAMC,MAAM,gBAAGC,MAAM,CAACC,GAAG,CAAC,uCAAuC,CAAC;AAsBzE;;;;AAIA,OAAO,MAAMC,cAAc,GAAUC,MAA2B,IAAI;EAClE,MAAMC,KAAK,GAAGN,MAAM,CAACM,KAAK,CAACD,MAAM,CAAC;EAClC,OAAWE,IAAwB,IACjCV,MAAM,CAACW,OAAO,CAACD,IAAI,CAACE,IAAI,EAAEH,KAAK,CAAC;AACpC,CAAC;AAED;;;;AAIA,OAAO,MAAMI,mBAAmB,GAAmDL,MAA2B,IAAI;EAChH,MAAMC,KAAK,GAAGN,MAAM,CAACM,KAAK,CAACD,MAAM,CAAC;EAClC,OAAWE,IAAwB,IACjCV,MAAM,CAACW,OAAO,CAACD,IAAI,CAACI,SAAS,EAAGC,CAAC,IAAKN,KAAK,CAACO,MAAM,CAACC,WAAW,CAACF,CAAC,CAAC,CAAC,CAAC;AACvE,CAAC;AAED;;;;AAIA,OAAO,MAAMG,aAAa,GAAmDV,MAA2B,IAAI;EAC1G,MAAMC,KAAK,GAAGN,MAAM,CAACM,KAAK,CAACD,MAAM,CAAC;EAClC,OAAWE,IAAwB,IACjCD,KAAK,CAACO,MAAM,CAACC,WAAW,CAACP,IAAI,CAACS,OAAO,CAAC,CAAC;AAC3C,CAAC;AAED;;;;AAIA,OAAO,MAAMC,WAAW,gBAAsDtB,MAAM,CAACuB,WAAW,CAC9F,mDAAmD,EACnD,MAAMpB,QAAQ,CAACqB,UAAU,CAACvB,MAAM,CAACwB,IAAI,EAAmB,CAAC,CAC1D;AAED;;;;AAIA,OAAO,MAAMC,eAAe,gBAAG3B,IAAI,CAGjC,CAAC,EAAE,CAAC4B,MAAM,EAAEC,IAAI,KAAK1B,MAAM,CAAC2B,OAAO,CAACF,MAAM,EAAEL,WAAW,EAAErB,MAAM,CAAC6B,GAAG,CAACF,IAAI,EAAExB,UAAU,CAAC2B,IAAI,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"IncomingMessage.mjs","names":["dual","Global","Option","Effect","FiberRef","FileSystem","Schema","TypeId","Symbol","for","schemaBodyJson","schema","parse","self","flatMap","json","schemaBodyUrlParams","urlParams","_","Object","fromEntries","schemaHeaders","headers","maxBodySize","globalValue","unsafeMake","none","withMaxBodySize","effect","size","locally","map","Size"],"sources":["../../src/Http/IncomingMessage.ts"],"sourcesContent":[null],"mappings":"AAAA;;;AAGA,SAASA,IAAI,QAAQ,uBAAuB;AAC5C,OAAO,KAAKC,MAAM,MAAM,qBAAqB;AAC7C,OAAO,KAAKC,MAAM,MAAM,qBAAqB;AAC7C,OAAO,KAAKC,MAAM,MAAM,mBAAmB;AAC3C,OAAO,KAAKC,QAAQ,MAAM,qBAAqB;AAC/C,OAAO,KAAKC,UAAU,MAAM,6BAA6B;AAIzD,OAAO,KAAKC,MAAM,MAAM,uBAAuB;AAG/C;;;;AAIA,OAAO,MAAMC,MAAM,gBAAGC,MAAM,CAACC,GAAG,CAAC,uCAAuC,CAAC;AAsBzE;;;;AAIA,OAAO,MAAMC,cAAc,GAAUC,MAA2B,IAAI;EAClE,MAAMC,KAAK,GAAGN,MAAM,CAACM,KAAK,CAACD,MAAM,CAAC;EAClC,OAAWE,IAAwB,IACjCV,MAAM,CAACW,OAAO,CAACD,IAAI,CAACE,IAAI,EAAEH,KAAK,CAAC;AACpC,CAAC;AAED;;;;AAIA,OAAO,MAAMI,mBAAmB,GAAmDL,MAA2B,IAAI;EAChH,MAAMC,KAAK,GAAGN,MAAM,CAACM,KAAK,CAACD,MAAM,CAAC;EAClC,OAAWE,IAAwB,IACjCV,MAAM,CAACW,OAAO,CAACD,IAAI,CAACI,SAAS,EAAGC,CAAC,IAAKN,KAAK,CAACO,MAAM,CAACC,WAAW,CAACF,CAAC,CAAC,CAAC,CAAC;AACvE,CAAC;AAED;;;;AAIA,OAAO,MAAMG,aAAa,GAAmDV,MAA2B,IAAI;EAC1G,MAAMC,KAAK,GAAGN,MAAM,CAACM,KAAK,CAACD,MAAM,CAAC;EAClC,OAAWE,IAAwB,IAAsDD,KAAK,CAACC,IAAI,CAACS,OAAO,CAAC;AAC9G,CAAC;AAED;;;;AAIA,OAAO,MAAMC,WAAW,gBAAsDtB,MAAM,CAACuB,WAAW,CAC9F,mDAAmD,EACnD,MAAMpB,QAAQ,CAACqB,UAAU,CAACvB,MAAM,CAACwB,IAAI,EAAmB,CAAC,CAC1D;AAED;;;;AAIA,OAAO,MAAMC,eAAe,gBAAG3B,IAAI,CAGjC,CAAC,EAAE,CAAC4B,MAAM,EAAEC,IAAI,KAAK1B,MAAM,CAAC2B,OAAO,CAACF,MAAM,EAAEL,WAAW,EAAErB,MAAM,CAAC6B,GAAG,CAACF,IAAI,EAAExB,UAAU,CAAC2B,IAAI,CAAC,CAAC,CAAC"}
@@ -35,7 +35,7 @@ export const fetch = (options = {}) => make(request => Effect.flatMap(UrlParams.
35
35
  reason: "InvalidUrl",
36
36
  error: _
37
37
  })), url => Effect.suspend(() => {
38
- const headers = new Headers([...request.headers]);
38
+ const headers = new Headers(request.headers);
39
39
  const send = body => Effect.map(Effect.tryPromise({
40
40
  try: signal => globalThis.fetch(url, {
41
41
  ...options,
@@ -1 +1 @@
1
- {"version":3,"file":"client.mjs","names":["Context","dual","pipeArguments","Effect","Layer","Method","UrlParams","internalBody","internalError","internalRequest","internalResponse","Schema","Stream","tag","Tag","clientProto","pipe","arguments","setProto","f","Object","setPrototypeOf","make","client","request","flatMap","resolveBody","fetch","options","makeUrl","url","urlParams","_","requestError","reason","error","suspend","headers","Headers","send","body","map","tryPromise","try","signal","globalThis","method","catch","fromWeb","hasBody","convertBody","undefined","_tag","formData","toReadableStream","stream","fetchOk","filterStatusOk","layer","succeed","catchTag","self","catchTags","cases","catchAll","filterOrElse","orElse","filterOrFail","orFailWith","filterStatus","response","status","responseError","mapEffect","mapRequest","mapRequestEffect","retry","policy","schemaFunction","schema","encode","a","tryMap","TextEncoder","JSON","stringify","setBody","uint8Array","tap","tapRequest","zipRight"],"sources":["../../../src/internal/http/client.ts"],"sourcesContent":[null],"mappings":"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"}
1
+ {"version":3,"file":"client.mjs","names":["Context","dual","pipeArguments","Effect","Layer","Method","UrlParams","internalBody","internalError","internalRequest","internalResponse","Schema","Stream","tag","Tag","clientProto","pipe","arguments","setProto","f","Object","setPrototypeOf","make","client","request","flatMap","resolveBody","fetch","options","makeUrl","url","urlParams","_","requestError","reason","error","suspend","headers","Headers","send","body","map","tryPromise","try","signal","globalThis","method","catch","fromWeb","hasBody","convertBody","undefined","_tag","formData","toReadableStream","stream","fetchOk","filterStatusOk","layer","succeed","catchTag","self","catchTags","cases","catchAll","filterOrElse","orElse","filterOrFail","orFailWith","filterStatus","response","status","responseError","mapEffect","mapRequest","mapRequestEffect","retry","policy","schemaFunction","schema","encode","a","tryMap","TextEncoder","JSON","stringify","setBody","uint8Array","tap","tapRequest","zipRight"],"sources":["../../../src/internal/http/client.ts"],"sourcesContent":[null],"mappings":"AAAA,OAAO,KAAKA,OAAO,MAAM,sBAAsB;AAC/C,SAASC,IAAI,QAAQ,uBAAuB;AAC5C,SAASC,aAAa,QAAQ,uBAAuB;AAErD,OAAO,KAAKC,MAAM,MAAM,mBAAmB;AAC3C,OAAO,KAAKC,KAAK,MAAM,kBAAkB;AAOzC,OAAO,KAAKC,MAAM,MAAM,8BAA8B;AACtD,OAAO,KAAKC,SAAS,MAAM,iCAAiC;AAC5D,OAAO,KAAKC,YAAY,MAAM,qCAAqC;AACnE,OAAO,KAAKC,aAAa,MAAM,4CAA4C;AAC3E,OAAO,KAAKC,eAAe,MAAM,8CAA8C;AAC/E,OAAO,KAAKC,gBAAgB,MAAM,+CAA+C;AAEjF,OAAO,KAAKC,MAAM,MAAM,uBAAuB;AAC/C,OAAO,KAAKC,MAAM,MAAM,uBAAuB;AAE/C;AACA,OAAO,MAAMC,GAAG,gBAAGb,OAAO,CAACc,GAAG,CAAwB,8BAA8B,CAAC;AAErF,MAAMC,WAAW,GAAG;EAClBC,IAAIA,CAAA;IACF,OAAOd,aAAa,CAAC,IAAI,EAAEe,SAAS,CAAC;EACvC;CACD;AAED,MAAMC,QAAQ,GACZC,CAAmE,IACjE;EACFC,MAAM,CAACC,cAAc,CAACF,CAAC,EAAEJ,WAAW,CAAC;EACrC,OAAOI,CAA2B;AACpC,CAAC;AAED;AACA,OAAO,MAAMG,IAAI,GACfH,CAE+E,IACtD;EACzB,SAASI,MAAMA,CAACC,OAAoC;IAClD,OAAOrB,MAAM,CAACsB,OAAO,CACnBhB,eAAe,CAACiB,WAAW,CAACF,OAAO,CAAC,EACnCA,OAAO,IAAKL,CAAC,CAACK,OAAO,CAAC,CACxB;EACH;EACA,OAAON,QAAQ,CAACK,MAAM,CAAC;AACzB,CAAC;AAED;AACA,OAAO,MAAMI,KAAK,GAAGA,CACnBC,OAAA,GAAuB,EAAE,KAEzBN,IAAI,CAAEE,OAAO,IACXrB,MAAM,CAACsB,OAAO,CACZnB,SAAS,CAACuB,OAAO,CAACL,OAAO,CAACM,GAAG,EAAEN,OAAO,CAACO,SAAS,EAAGC,CAAC,IAClDxB,aAAa,CAACyB,YAAY,CAAC;EACzBT,OAAO;EACPU,MAAM,EAAE,YAAY;EACpBC,KAAK,EAAEH;CACR,CAAC,CAAC,EACJF,GAAG,IACF3B,MAAM,CAACiC,OAAO,CAAC,MAAK;EAClB,MAAMC,OAAO,GAAG,IAAIC,OAAO,CAACd,OAAO,CAACa,OAAO,CAAC;EAC5C,MAAME,IAAI,GAAIC,IAA0B,IACtCrC,MAAM,CAACsC,GAAG,CACRtC,MAAM,CAACuC,UAAU,CAAC;IAChBC,GAAG,EAAGC,MAAM,IACVC,UAAU,CAAClB,KAAK,CAACG,GAAG,EAAE;MACpB,GAAGF,OAAO;MACVkB,MAAM,EAAEtB,OAAO,CAACsB,MAAM;MACtBT,OAAO;MACPG,IAAI;MACJI;KACD,CAAC;IACJG,KAAK,EAAGf,CAAC,IACPxB,aAAa,CAACyB,YAAY,CAAC;MACzBT,OAAO;MACPU,MAAM,EAAE,WAAW;MACnBC,KAAK,EAAEH;KACR;GACJ,CAAC,EACDA,CAAC,IAAKtB,gBAAgB,CAACsC,OAAO,CAACxB,OAAO,EAAEQ,CAAC,CAAC,CAC5C;EACH,IAAI3B,MAAM,CAAC4C,OAAO,CAACzB,OAAO,CAACsB,MAAM,CAAC,EAAE;IAClC,OAAOP,IAAI,CAACW,WAAW,CAAC1B,OAAO,CAACgB,IAAI,CAAC,CAAC;;EAExC,OAAOD,IAAI,CAACY,SAAS,CAAC;AACxB,CAAC,CAAC,CACL,CACF;AAEH,MAAMD,WAAW,GAAIV,IAAoB,IAA0B;EACjE,QAAQA,IAAI,CAACY,IAAI;IACf,KAAK,OAAO;MACV,OAAOD,SAAS;IAClB,KAAK,KAAK;MACR,OAAOX,IAAI,CAACA,IAAW;IACzB,KAAK,YAAY;MACf,OAAOA,IAAI,CAACA,IAAI;IAClB,KAAK,UAAU;MACb,OAAOA,IAAI,CAACa,QAAQ;IACtB,KAAK,QAAQ;MACX,OAAOzC,MAAM,CAAC0C,gBAAgB,CAACd,IAAI,CAACe,MAAM,CAAC;;AAEjD,CAAC;AAED,OAAO,MAAMC,OAAO,GAAGA,CACrB5B,OAAA,GAAuB,EAAE,KACC6B,cAAc,CAAC9B,KAAK,CAACC,OAAO,CAAC,CAAC;AAE1D;AACA,OAAO,MAAM8B,KAAK,gBAAGtD,KAAK,CAACuD,OAAO,CAAC9C,GAAG,eAAEc,KAAK,EAAE,CAAC;AAEhD;AACA,OAAO,MAAMiC,QAAQ,gBAYjB3D,IAAI,CACN,CAAC,EACD,CACE4D,IAA4B,EAC5BhD,GAAM,EACNM,CAA4D,KAE5DD,QAAQ,CAAEM,OAAO,IAAKrB,MAAM,CAACyD,QAAQ,CAACC,IAAI,CAACrC,OAAO,CAAC,EAAEX,GAAG,EAAEM,CAAC,CAAC,CAAC,CAChE;AAED;AACA,OAAO,MAAM2C,SAAS,gBAoElB7D,IAAI,CACN,CAAC,EACD,CASE4D,IAA4B,EAC5BE,KAAY,KAuBT7C,QAAQ,CAAEM,OAAO,IAAKrB,MAAM,CAAC2D,SAAS,CAACD,IAAI,CAACrC,OAAO,CAAC,EAAEuC,KAAK,CAAC,CAAC,CACnE;AAED;AACA,OAAO,MAAMC,QAAQ,gBAQjB/D,IAAI,CACN,CAAC,EACD,CACE4D,IAA4B,EAC5B1C,CAAsC,KACAD,QAAQ,CAAEM,OAAO,IAAKrB,MAAM,CAAC6D,QAAQ,CAACH,IAAI,CAACrC,OAAO,CAAC,EAAEL,CAAC,CAAC,CAAC,CACjG;AAED;AACA,OAAO,MAAM8C,YAAY,gBAAGhE,IAAI,CAS9B,CAAC,EAAE,CAAC4D,IAAI,EAAE1C,CAAC,EAAE+C,MAAM,KAAKhD,QAAQ,CAAEM,OAAO,IAAKrB,MAAM,CAAC8D,YAAY,CAACJ,IAAI,CAACrC,OAAO,CAAC,EAAEL,CAAC,EAAE+C,MAAM,CAAC,CAAC,CAAC;AAE/F;AACA,OAAO,MAAMC,YAAY,gBAAGlE,IAAI,CAS9B,CAAC,EAAE,CAAC4D,IAAI,EAAE1C,CAAC,EAAEiD,UAAU,KAAKlD,QAAQ,CAAEM,OAAO,IAAKrB,MAAM,CAACgE,YAAY,CAACN,IAAI,CAACrC,OAAO,CAAC,EAAEL,CAAC,EAAEiD,UAAU,CAAC,CAAC,CAAC;AAEvG;AACA,OAAO,MAAMC,YAAY,gBAAGpE,IAAI,CAS9B,CAAC,EACD,CAAC4D,IAAI,EAAE1C,CAAC,KACND,QAAQ,CAAEM,OAAO,IACfrB,MAAM,CAACgE,YAAY,CACjBN,IAAI,CAACrC,OAAO,CAAC,EACZ8C,QAAQ,IAAKnD,CAAC,CAACmD,QAAQ,CAACC,MAAM,CAAC,EAC/BD,QAAQ,IACP9D,aAAa,CAACgE,aAAa,CAAC;EAC1BhD,OAAO;EACP8C,QAAQ;EACRpC,MAAM,EAAE,YAAY;EACpBC,KAAK,EAAE;CACR,CAAC,CACL,CACF,CACJ;AAED;AACA,OAAO,MAAMsB,cAAc,gBAEmCY,YAAY,CAAEE,MAAM,IAAKA,MAAM,IAAI,GAAG,IAAIA,MAAM,GAAG,GAAG,CAAC;AAErH;AACA,OAAO,MAAM9B,GAAG,gBAAGxC,IAAI,CAQrB,CAAC,EAAE,CAAC4D,IAAI,EAAE1C,CAAC,KAAKD,QAAQ,CAAEM,OAAO,IAAKrB,MAAM,CAACsC,GAAG,CAACoB,IAAI,CAACrC,OAAO,CAAC,EAAEL,CAAC,CAAC,CAAC,CAAC;AAEtE;AACA,OAAO,MAAMsD,SAAS,gBAAGxE,IAAI,CAQ3B,CAAC,EAAE,CAAC4D,IAAI,EAAE1C,CAAC,KAAKD,QAAQ,CAAEM,OAAO,IAAKrB,MAAM,CAACsB,OAAO,CAACoC,IAAI,CAACrC,OAAO,CAAC,EAAEL,CAAC,CAAC,CAAC,CAAC;AAE1E;AACA,OAAO,MAAMuD,UAAU,gBAAGzE,IAAI,CAQ5B,CAAC,EAAE,CAAC4D,IAAI,EAAE1C,CAAC,KAAKD,QAAQ,CAAEM,OAAO,IAAKqC,IAAI,CAAC1C,CAAC,CAACK,OAAO,CAAC,CAAC,CAAC,CAAC;AAE1D;AACA,OAAO,MAAMmD,gBAAgB,gBAAG1E,IAAI,CAQlC,CAAC,EAAE,CAAC4D,IAAI,EAAE1C,CAAC,KAAKD,QAAQ,CAAEM,OAAO,IAAKrB,MAAM,CAACsB,OAAO,CAACN,CAAC,CAACK,OAAO,CAAC,EAAEqC,IAAI,CAAC,CAAC,CAAC;AAE1E;AACA,OAAO,MAAMe,KAAK,gBAQd3E,IAAI,CACN,CAAC,EACD,CACE4D,IAA4B,EAC5BgB,MAAoC,KACJ3D,QAAQ,CAAEM,OAAO,IAAKrB,MAAM,CAACyE,KAAK,CAACf,IAAI,CAACrC,OAAO,CAAC,EAAEqD,MAAM,CAAC,CAAC,CAC7F;AAED;AACA,OAAO,MAAMC,cAAc,gBAAG7E,IAAI,CAchC,CAAC,EAAE,CAAC4D,IAAI,EAAEkB,MAAM,KAAI;EACpB,MAAMC,MAAM,GAAGrE,MAAM,CAACqE,MAAM,CAACD,MAAM,CAAC;EACpC,OAAQvD,OAAO,IAAMyD,CAAC,IACpB9E,MAAM,CAACsB,OAAO,CACZtB,MAAM,CAAC+E,MAAM,CAACF,MAAM,CAACC,CAAC,CAAC,EAAE;IACvBtC,GAAG,EAAGH,IAAI,IAAK,IAAI2C,WAAW,EAAE,CAACH,MAAM,CAACI,IAAI,CAACC,SAAS,CAAC7C,IAAI,CAAC,CAAC;IAC7DO,KAAK,EAAGZ,KAAK,IACX3B,aAAa,CAACyB,YAAY,CAAC;MACzBT,OAAO;MACPU,MAAM,EAAE,QAAQ;MAChBC;KACD;GACJ,CAAC,EACDK,IAAI,IACHqB,IAAI,CAACpD,eAAe,CAAC6E,OAAO,CAC1B9D,OAAO,EACPjB,YAAY,CAACgF,UAAU,CAAC/C,IAAI,EAAE,kBAAkB,CAAC,CAClD,CAAC,CACL;AACL,CAAC,CAAC;AAEF;AACA,OAAO,MAAMgD,GAAG,gBAAGvF,IAAI,CAQrB,CAAC,EAAE,CAAC4D,IAAI,EAAE1C,CAAC,KAAKD,QAAQ,CAAEM,OAAO,IAAKrB,MAAM,CAACqF,GAAG,CAAC3B,IAAI,CAACrC,OAAO,CAAC,EAAEL,CAAC,CAAC,CAAC,CAAC;AAEtE;AACA,OAAO,MAAMsE,UAAU,gBAAGxF,IAAI,CAQ5B,CAAC,EAAE,CAAC4D,IAAI,EAAE1C,CAAC,KAAKD,QAAQ,CAAEM,OAAO,IAAKrB,MAAM,CAACuF,QAAQ,CAACvE,CAAC,CAACK,OAAO,CAAC,EAAEqC,IAAI,CAACrC,OAAO,CAAC,CAAC,CAAC,CAAC"}
@@ -5,10 +5,14 @@ import * as ServerRequest from "@effect/platform/Http/ServerRequest";
5
5
  /** @internal */
6
6
  export const make = middleware => middleware;
7
7
  /** @internal */
8
- export const logger = /*#__PURE__*/make(httpApp => Effect.withLogSpan(Effect.onExit(httpApp, exit => Effect.flatMap(ServerRequest.ServerRequest, request => Effect.annotateLogs(Effect.log("", exit._tag === "Failure" ? exit.cause : undefined), {
8
+ export const logger = /*#__PURE__*/make(httpApp => Effect.withLogSpan(Effect.flatMap(ServerRequest.ServerRequest, request => Effect.tap(Effect.tapErrorCause(httpApp, cause => Effect.annotateLogs(Effect.log(cause), {
9
9
  "http.method": request.method,
10
10
  "http.url": request.url,
11
- "http.status": exit._tag === "Success" ? exit.value.status : 500
11
+ "http.status": 500
12
+ })), response => Effect.annotateLogs(Effect.log(""), {
13
+ "http.method": request.method,
14
+ "http.url": request.url,
15
+ "http.status": response.status
12
16
  }))), "http.span"));
13
17
  /** @internal */
14
18
  export const tracer = /*#__PURE__*/make(httpApp => Effect.flatMap(ServerRequest.ServerRequest, request => Effect.withSpan(Effect.tap(httpApp, response => Effect.annotateCurrentSpan("http.status", response.status)), `http ${request.method}`, {
@@ -18,10 +22,7 @@ export const tracer = /*#__PURE__*/make(httpApp => Effect.flatMap(ServerRequest.
18
22
  }
19
23
  })));
20
24
  /** @internal */
21
- export const xForwardedHeaders = /*#__PURE__*/make(httpApp => Effect.flatMap(ServerRequest.ServerRequest, request => {
22
- const forwardedHost = Headers.get(request.headers, "x-forwarded-host");
23
- return forwardedHost._tag === "Some" ? Effect.updateService(httpApp, ServerRequest.ServerRequest, _ => _.replaceHeaders(Headers.set(request.headers, "host", forwardedHost.value))) : httpApp;
24
- }));
25
+ export const xForwardedHeaders = /*#__PURE__*/make(httpApp => Effect.updateService(httpApp, ServerRequest.ServerRequest, request => request.headers["x-forwarded-host"] ? request.replaceHeaders(Headers.set(request.headers, "host", request.headers["x-forwarded-host"])) : request));
25
26
  /** @internal */
26
27
  export const compose = /*#__PURE__*/dual(2, (self, that) => inApp => that(self(inApp)));
27
28
  /** @internal */
@@ -1 +1 @@
1
- {"version":3,"file":"middleware.mjs","names":["dual","Effect","Headers","ServerRequest","make","middleware","logger","httpApp","withLogSpan","onExit","exit","flatMap","request","annotateLogs","log","_tag","cause","undefined","method","url","value","status","tracer","withSpan","tap","response","annotateCurrentSpan","attributes","xForwardedHeaders","forwardedHost","get","headers","updateService","_","replaceHeaders","set","compose","self","that","inApp","loggerTracer"],"sources":["../../../src/internal/http/middleware.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,IAAI,QAAQ,uBAAuB;AAC5C,OAAO,KAAKC,MAAM,MAAM,mBAAmB;AAE3C,OAAO,KAAKC,OAAO,MAAM,+BAA+B;AAExD,OAAO,KAAKC,aAAa,MAAM,qCAAqC;AAEpE;AACA,OAAO,MAAMC,IAAI,GAAqCC,UAAa,IAAQA,UAAU;AAErF;AACA,OAAO,MAAMC,MAAM,gBAAGF,IAAI,CAAEG,OAAO,IACjCN,MAAM,CAACO,WAAW,CAChBP,MAAM,CAACQ,MAAM,CACXF,OAAO,EACNG,IAAI,IACHT,MAAM,CAACU,OAAO,CACZR,aAAa,CAACA,aAAa,EAC1BS,OAAO,IACNX,MAAM,CAACY,YAAY,CAACZ,MAAM,CAACa,GAAG,CAAC,EAAE,EAAEJ,IAAI,CAACK,IAAI,KAAK,SAAS,GAAGL,IAAI,CAACM,KAAK,GAAGC,SAAS,CAAC,EAAE;EACpF,aAAa,EAAEL,OAAO,CAACM,MAAM;EAC7B,UAAU,EAAEN,OAAO,CAACO,GAAG;EACvB,aAAa,EAAET,IAAI,CAACK,IAAI,KAAK,SAAS,GAAGL,IAAI,CAACU,KAAK,CAACC,MAAM,GAAG;CAC9D,CAAC,CACL,CACJ,EACD,WAAW,CACZ,CACF;AAED;AACA,OAAO,MAAMC,MAAM,gBAAGlB,IAAI,CAAEG,OAAO,IACjCN,MAAM,CAACU,OAAO,CACZR,aAAa,CAACA,aAAa,EAC1BS,OAAO,IACNX,MAAM,CAACsB,QAAQ,CACbtB,MAAM,CAACuB,GAAG,CACRjB,OAAO,EACNkB,QAAQ,IAAKxB,MAAM,CAACyB,mBAAmB,CAAC,aAAa,EAAED,QAAQ,CAACJ,MAAM,CAAC,CACzE,EACD,QAAQT,OAAO,CAACM,MAAM,EAAE,EACxB;EAAES,UAAU,EAAE;IAAE,aAAa,EAAEf,OAAO,CAACM,MAAM;IAAE,UAAU,EAAEN,OAAO,CAACO;EAAG;AAAE,CAAE,CAC3E,CACJ,CACF;AAED;AACA,OAAO,MAAMS,iBAAiB,gBAAGxB,IAAI,CAAEG,OAAO,IAC5CN,MAAM,CAACU,OAAO,CAACR,aAAa,CAACA,aAAa,EAAGS,OAAO,IAAI;EACtD,MAAMiB,aAAa,GAAG3B,OAAO,CAAC4B,GAAG,CAAClB,OAAO,CAACmB,OAAO,EAAE,kBAAkB,CAAC;EACtE,OAAOF,aAAa,CAACd,IAAI,KAAK,MAAM,GAChCd,MAAM,CAAC+B,aAAa,CAACzB,OAAO,EAAEJ,aAAa,CAACA,aAAa,EAAG8B,CAAC,IAC7DA,CAAC,CAACC,cAAc,CAAChC,OAAO,CAACiC,GAAG,CAACvB,OAAO,CAACmB,OAAO,EAAE,MAAM,EAAEF,aAAa,CAACT,KAAK,CAAC,CAAC,CAAC,GAC5Eb,OAAO;AACb,CAAC,CAAC,CACH;AAED;AACA,OAAO,MAAM6B,OAAO,gBAAGpC,IAAI,CAUzB,CAAC,EAAE,CAACqC,IAAI,EAAEC,IAAI,KAAMC,KAAK,IAAKD,IAAI,CAACD,IAAI,CAACE,KAAK,CAAC,CAAC,CAAC;AAElD;AACA,OAAO,MAAMC,YAAY,gBAAGJ,OAAO,CAACd,MAAM,EAAEhB,MAAM,CAAC"}
1
+ {"version":3,"file":"middleware.mjs","names":["dual","Effect","Headers","ServerRequest","make","middleware","logger","httpApp","withLogSpan","flatMap","request","tap","tapErrorCause","cause","annotateLogs","log","method","url","response","status","tracer","withSpan","annotateCurrentSpan","attributes","xForwardedHeaders","updateService","headers","replaceHeaders","set","compose","self","that","inApp","loggerTracer"],"sources":["../../../src/internal/http/middleware.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,IAAI,QAAQ,uBAAuB;AAC5C,OAAO,KAAKC,MAAM,MAAM,mBAAmB;AAE3C,OAAO,KAAKC,OAAO,MAAM,+BAA+B;AAExD,OAAO,KAAKC,aAAa,MAAM,qCAAqC;AAEpE;AACA,OAAO,MAAMC,IAAI,GAAqCC,UAAa,IAAQA,UAAU;AAErF;AACA,OAAO,MAAMC,MAAM,gBAAGF,IAAI,CAAEG,OAAO,IACjCN,MAAM,CAACO,WAAW,CAChBP,MAAM,CAACQ,OAAO,CACZN,aAAa,CAACA,aAAa,EAC1BO,OAAO,IACNT,MAAM,CAACU,GAAG,CACRV,MAAM,CAACW,aAAa,CAACL,OAAO,EAAGM,KAAK,IAClCZ,MAAM,CAACa,YAAY,CAACb,MAAM,CAACc,GAAG,CAACF,KAAK,CAAC,EAAE;EACrC,aAAa,EAAEH,OAAO,CAACM,MAAM;EAC7B,UAAU,EAAEN,OAAO,CAACO,GAAG;EACvB,aAAa,EAAE;CAChB,CAAC,CAAC,EACJC,QAAQ,IACPjB,MAAM,CAACa,YAAY,CAACb,MAAM,CAACc,GAAG,CAAC,EAAE,CAAC,EAAE;EAClC,aAAa,EAAEL,OAAO,CAACM,MAAM;EAC7B,UAAU,EAAEN,OAAO,CAACO,GAAG;EACvB,aAAa,EAAEC,QAAQ,CAACC;CACzB,CAAC,CACL,CACJ,EACD,WAAW,CACZ,CACF;AAED;AACA,OAAO,MAAMC,MAAM,gBAAGhB,IAAI,CAAEG,OAAO,IACjCN,MAAM,CAACQ,OAAO,CACZN,aAAa,CAACA,aAAa,EAC1BO,OAAO,IACNT,MAAM,CAACoB,QAAQ,CACbpB,MAAM,CAACU,GAAG,CACRJ,OAAO,EACNW,QAAQ,IAAKjB,MAAM,CAACqB,mBAAmB,CAAC,aAAa,EAAEJ,QAAQ,CAACC,MAAM,CAAC,CACzE,EACD,QAAQT,OAAO,CAACM,MAAM,EAAE,EACxB;EAAEO,UAAU,EAAE;IAAE,aAAa,EAAEb,OAAO,CAACM,MAAM;IAAE,UAAU,EAAEN,OAAO,CAACO;EAAG;AAAE,CAAE,CAC3E,CACJ,CACF;AAED;AACA,OAAO,MAAMO,iBAAiB,gBAAGpB,IAAI,CAAEG,OAAO,IAC5CN,MAAM,CAACwB,aAAa,CAAClB,OAAO,EAAEJ,aAAa,CAACA,aAAa,EAAGO,OAAO,IACjEA,OAAO,CAACgB,OAAO,CAAC,kBAAkB,CAAC,GAC/BhB,OAAO,CAACiB,cAAc,CAACzB,OAAO,CAAC0B,GAAG,CAClClB,OAAO,CAACgB,OAAO,EACf,MAAM,EACNhB,OAAO,CAACgB,OAAO,CAAC,kBAAkB,CAAC,CACpC,CAAC,GACAhB,OAAO,CAAC,CACf;AAED;AACA,OAAO,MAAMmB,OAAO,gBAAG7B,IAAI,CAUzB,CAAC,EAAE,CAAC8B,IAAI,EAAEC,IAAI,KAAMC,KAAK,IAAKD,IAAI,CAACD,IAAI,CAACE,KAAK,CAAC,CAAC,CAAC;AAElD;AACA,OAAO,MAAMC,YAAY,gBAAGJ,OAAO,CAACT,MAAM,EAAEd,MAAM,CAAC"}
@@ -63,15 +63,12 @@ class RouterImpl {
63
63
  }
64
64
  const toHttpApp = self => {
65
65
  const router = FindMyWay();
66
- Chunk.forEach(self.mounts, ([path, app]) => {
67
- const fn = () => {};
68
- fn.handler = Effect.updateService(app, ServerRequest.ServerRequest, request => sliceRequestUrl(request, path));
69
- router.all(path, fn);
70
- router.all(path + "/*", fn);
71
- });
66
+ const mounts = Chunk.toReadonlyArray(self.mounts);
67
+ const mountsLen = mounts.length;
72
68
  Chunk.forEach(self.routes, route => {
73
- const fn = () => {};
74
- fn.handler = route;
69
+ function fn(_, __) {
70
+ return route;
71
+ }
75
72
  if (route.method === "*") {
76
73
  router.all(route.path, fn);
77
74
  } else {
@@ -79,21 +76,25 @@ const toHttpApp = self => {
79
76
  }
80
77
  });
81
78
  return Effect.flatMap(ServerRequest.ServerRequest, request => {
79
+ if (mountsLen > 0) {
80
+ for (let i = 0; i < mountsLen; i++) {
81
+ const [path, app] = mounts[i];
82
+ if (request.url.startsWith(path)) {
83
+ return Effect.provideService(app, ServerRequest.ServerRequest, sliceRequestUrl(request, path));
84
+ }
85
+ }
86
+ }
82
87
  const result = router.find(request.method, request.url);
83
88
  if (result === null) {
84
89
  return Effect.fail(Error.RouteNotFound({
85
90
  request
86
91
  }));
87
92
  }
88
- const handler = result.handler.handler;
89
- if (RouteTypeId in handler) {
90
- const route = handler;
91
- if (route.prefix._tag === "Some") {
92
- request = sliceRequestUrl(request, route.prefix.value);
93
- }
94
- return Effect.mapInputContext(route.handler, context => Context.add(Context.add(context, ServerRequest.ServerRequest, request), RouteContext, new RouteContextImpl(result.params, result.searchParams)));
93
+ const route = result.handler();
94
+ if (route.prefix._tag === "Some") {
95
+ request = sliceRequestUrl(request, route.prefix.value);
95
96
  }
96
- return handler;
97
+ return Effect.mapInputContext(route.handler, context => Context.add(Context.add(context, ServerRequest.ServerRequest, request), RouteContext, new RouteContextImpl(result.params, result.searchParams)));
97
98
  });
98
99
  };
99
100
  function sliceRequestUrl(request, prefix) {
@@ -1 +1 @@
1
- {"version":3,"file":"router.mjs","names":["Chunk","Context","Equal","dual","Hash","Option","pipeArguments","Effect","Error","ServerRequest","Schema","Channel","Sink","Stream","FindMyWay","TypeId","Symbol","for","RouteTypeId","RouteContextTypeId","RouteContext","Tag","params","map","_","searchParams","schemaParams","schema","parse","flatMap","RouterImpl","constructor","routes","mounts","_tag","EffectTypeId","undefined","StreamTypeId","SinkTypeId","ChannelTypeId","pipe","arguments","commit","httpApp","toHttpApp","symbol","that","random","self","router","forEach","path","app","fn","handler","updateService","request","sliceRequestUrl","all","route","method","on","result","find","url","fail","RouteNotFound","prefix","value","mapInputContext","context","add","RouteContextImpl","prefexLen","length","setUrl","slice","RouteImpl","none","empty","fromIterable","makeRoute","concat","appendAll","removeTrailingSlash","endsWith","prefixAll","orElse","some","mount","mountApp","append","get","post","put","patch","del","head","options"],"sources":["../../../src/internal/http/router.ts"],"sourcesContent":[null],"mappings":"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"}
1
+ {"version":3,"file":"router.mjs","names":["Chunk","Context","Equal","dual","Hash","Option","pipeArguments","Effect","Error","ServerRequest","Schema","Channel","Sink","Stream","FindMyWay","TypeId","Symbol","for","RouteTypeId","RouteContextTypeId","RouteContext","Tag","params","map","_","searchParams","schemaParams","schema","parse","flatMap","RouterImpl","constructor","routes","mounts","_tag","EffectTypeId","undefined","StreamTypeId","SinkTypeId","ChannelTypeId","pipe","arguments","commit","httpApp","toHttpApp","symbol","that","random","self","router","toReadonlyArray","mountsLen","length","forEach","route","fn","__","method","all","path","on","request","i","app","url","startsWith","provideService","sliceRequestUrl","result","find","fail","RouteNotFound","handler","prefix","value","mapInputContext","context","add","RouteContextImpl","prefexLen","setUrl","slice","RouteImpl","none","empty","fromIterable","makeRoute","concat","appendAll","removeTrailingSlash","endsWith","prefixAll","orElse","some","mount","mountApp","append","get","post","put","patch","del","head","options"],"sources":["../../../src/internal/http/router.ts"],"sourcesContent":[null],"mappings":"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"}
@@ -12,9 +12,22 @@ class ServerResponseImpl {
12
12
  constructor(status, statusText, headers, body) {
13
13
  this.status = status;
14
14
  this.statusText = statusText;
15
- this.headers = headers;
16
15
  this.body = body;
17
16
  this[TypeId] = TypeId;
17
+ if (body.contentType || body.contentLength) {
18
+ const newHeaders = {
19
+ ...headers
20
+ };
21
+ if (body.contentType) {
22
+ newHeaders["content-type"] = body.contentType;
23
+ }
24
+ if (body.contentLength) {
25
+ newHeaders["content-length"] = body.contentLength.toString();
26
+ }
27
+ this.headers = newHeaders;
28
+ } else {
29
+ this.headers = headers;
30
+ }
18
31
  }
19
32
  pipe() {
20
33
  return pipeArguments(this, arguments);
@@ -32,9 +45,9 @@ export const toNonEffectBody = self => self.body._tag === "Effect" ? Effect.map(
32
45
  /** @internal */
33
46
  export const empty = options => new ServerResponseImpl(options?.status ?? 204, options?.statusText, options?.headers ?? Headers.empty, internalBody.empty);
34
47
  /** @internal */
35
- export const uint8Array = (body, options) => new ServerResponseImpl(options?.status ?? 200, options?.statusText, options?.headers ?? Headers.empty, internalBody.uint8Array(body, options?.contentType));
48
+ export const uint8Array = (body, options) => new ServerResponseImpl(options?.status ?? 200, options?.statusText, options?.headers ?? Headers.empty, internalBody.uint8Array(body, getContentType(options)));
36
49
  /** @internal */
37
- export const text = (body, options) => new ServerResponseImpl(options?.status ?? 200, options?.statusText, options?.headers ?? Headers.empty, internalBody.text(body, options?.contentType));
50
+ export const text = (body, options) => new ServerResponseImpl(options?.status ?? 200, options?.statusText, options?.headers ?? Headers.empty, internalBody.text(body, getContentType(options)));
38
51
  /** @internal */
39
52
  export const json = (body, options) => new ServerResponseImpl(options?.status ?? 200, options?.statusText, options?.headers ?? Headers.empty, internalBody.json(body));
40
53
  /** @internal */
@@ -55,7 +68,17 @@ export const raw = (body, options) => new ServerResponseImpl(options?.status ??
55
68
  /** @internal */
56
69
  export const formData = (body, options) => new ServerResponseImpl(options?.status ?? 200, options?.statusText, options?.headers ?? Headers.empty, internalBody.formData(body));
57
70
  /** @internal */
58
- export const stream = (body, options) => new ServerResponseImpl(options?.status ?? 200, options?.statusText, options?.headers ?? Headers.empty, internalBody.stream(body, options?.contentType, options?.contentLength));
71
+ export const stream = (body, options) => new ServerResponseImpl(options?.status ?? 200, options?.statusText, options?.headers ?? Headers.empty, internalBody.stream(body, getContentType(options), options?.contentLength));
72
+ /** @internal */
73
+ export const getContentType = options => {
74
+ if (options?.contentType) {
75
+ return options.contentType;
76
+ } else if (options?.headers) {
77
+ return options.headers["content-type"];
78
+ } else {
79
+ return;
80
+ }
81
+ };
59
82
  /** @internal */
60
83
  export const setHeader = /*#__PURE__*/dual(3, (self, key, value) => new ServerResponseImpl(self.status, self.statusText, Headers.set(self.headers, key, value), self.body));
61
84
  /** @internal */
@@ -67,15 +90,6 @@ export const setBody = /*#__PURE__*/dual(2, (self, body) => {
67
90
  let headers = self.headers;
68
91
  if (body._tag === "Empty") {
69
92
  headers = Headers.remove(Headers.remove(headers, "Content-Type"), "Content-length");
70
- } else {
71
- const contentType = body.contentType;
72
- if (contentType) {
73
- headers = Headers.set(headers, "content-type", contentType);
74
- }
75
- const contentLength = body.contentLength;
76
- if (contentLength) {
77
- headers = Headers.set(headers, "content-length", contentLength.toString());
78
- }
79
93
  }
80
94
  return new ServerResponseImpl(self.status, self.statusText, headers, body);
81
95
  });
@@ -1 +1 @@
1
- {"version":3,"file":"serverResponse.mjs","names":["dual","pipeArguments","Effect","Headers","ServerRequest","UrlParams","internalBody","internalError","TypeId","Symbol","for","ServerResponseImpl","constructor","status","statusText","headers","body","pipe","arguments","isServerResponse","u","toNonEffectBody","self","_tag","map","catchAll","effect","error","flatMap","request","fail","responseError","reason","response","setBody","succeed","empty","options","uint8Array","contentType","text","json","unsafeJson","schemaJson","schema","encode","jsonSchema","file","path","urlParams","toString","fromInput","raw","formData","stream","contentLength","setHeader","key","value","set","setHeaders","input","setAll","setStatus","args","remove"],"sources":["../../../src/internal/http/serverResponse.ts"],"sourcesContent":[null],"mappings":"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"}
1
+ {"version":3,"file":"serverResponse.mjs","names":["dual","pipeArguments","Effect","Headers","ServerRequest","UrlParams","internalBody","internalError","TypeId","Symbol","for","ServerResponseImpl","constructor","status","statusText","headers","body","contentType","contentLength","newHeaders","toString","pipe","arguments","isServerResponse","u","toNonEffectBody","self","_tag","map","catchAll","effect","error","flatMap","request","fail","responseError","reason","response","setBody","succeed","empty","options","uint8Array","getContentType","text","json","unsafeJson","schemaJson","schema","encode","jsonSchema","file","path","urlParams","fromInput","raw","formData","stream","setHeader","key","value","set","setHeaders","input","setAll","setStatus","args","remove"],"sources":["../../../src/internal/http/serverResponse.ts"],"sourcesContent":[null],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@effect/platform",
3
- "version": "0.13.0",
3
+ "version": "0.13.2",
4
4
  "description": "Unified interfaces for common platform-specific services",
5
5
  "license": "MIT",
6
6
  "repository": {
@@ -29,9 +29,9 @@
29
29
  "path-browserify": "^1.0.1"
30
30
  },
31
31
  "peerDependencies": {
32
- "@effect/data": "^0.17.1",
33
- "@effect/io": "^0.38.0",
34
- "@effect/schema": "^0.33.0",
32
+ "@effect/data": "^0.17.5",
33
+ "@effect/io": "^0.38.2",
34
+ "@effect/schema": "^0.33.1",
35
35
  "@effect/stream": "^0.34.0"
36
36
  }
37
37
  }
@@ -2,26 +2,27 @@
2
2
  * @since 1.0.0
3
3
  */
4
4
  import { dual } from "@effect/data/Function"
5
- import * as HashMap from "@effect/data/HashMap"
6
5
  import type * as Option from "@effect/data/Option"
6
+ import * as ReadonlyArray from "@effect/data/ReadonlyArray"
7
+ import * as ReadonlyRecord from "@effect/data/ReadonlyRecord"
7
8
 
8
9
  /**
9
10
  * @since 1.0.0
10
11
  * @category models
11
12
  */
12
- export interface Headers extends HashMap.HashMap<string, string> {}
13
+ export interface Headers extends ReadonlyRecord.ReadonlyRecord<string> {}
13
14
 
14
15
  /**
15
16
  * @since 1.0.0
16
17
  * @category models
17
18
  */
18
- export type Input = Headers | Readonly<Record<string, string>> | Iterable<readonly [string, string]>
19
+ export type Input = Headers | Iterable<readonly [string, string]>
19
20
 
20
21
  /**
21
22
  * @since 1.0.0
22
23
  * @category constructors
23
24
  */
24
- export const empty: Headers = HashMap.empty()
25
+ export const empty: Headers = ReadonlyRecord.empty()
25
26
 
26
27
  /**
27
28
  * @since 1.0.0
@@ -30,12 +31,15 @@ export const empty: Headers = HashMap.empty()
30
31
  export const fromInput: (input?: Input) => Headers = (input) => {
31
32
  if (input === undefined) {
32
33
  return empty
33
- } else if (HashMap.isHashMap(input)) {
34
- return input
35
34
  } else if (Symbol.iterator in input) {
36
- return HashMap.fromIterable([...input].map(([k, v]) => [k.toLowerCase(), v])) as Headers
35
+ return ReadonlyRecord.fromEntries(ReadonlyArray.map(
36
+ ReadonlyArray.fromIterable(input),
37
+ ([k, v]) => [k.toLowerCase(), v] as const
38
+ ))
37
39
  }
38
- return HashMap.fromIterable(Object.entries(input).map(([k, v]) => [k.toLowerCase(), v]))
40
+ return ReadonlyRecord.fromEntries(
41
+ Object.entries(input).map(([k, v]) => [k.toLowerCase(), v])
42
+ )
39
43
  }
40
44
 
41
45
  /**
@@ -48,7 +52,7 @@ export const has: {
48
52
  } = dual<
49
53
  (key: string) => (self: Headers) => boolean,
50
54
  (self: Headers, key: string) => boolean
51
- >(2, (self, key) => HashMap.has(self, key.toLowerCase()))
55
+ >(2, (self, key) => ReadonlyRecord.has(self, key.toLowerCase()))
52
56
 
53
57
  /**
54
58
  * @since 1.0.0
@@ -60,7 +64,7 @@ export const get: {
60
64
  } = dual<
61
65
  (key: string) => (self: Headers) => Option.Option<string>,
62
66
  (self: Headers, key: string) => Option.Option<string>
63
- >(2, (self, key) => HashMap.get(self, key.toLowerCase()))
67
+ >(2, (self, key) => ReadonlyRecord.get(self, key.toLowerCase()))
64
68
 
65
69
  /**
66
70
  * @since 1.0.0
@@ -72,7 +76,10 @@ export const set: {
72
76
  } = dual<
73
77
  (key: string, value: string) => (self: Headers) => Headers,
74
78
  (self: Headers, key: string, value: string) => Headers
75
- >(3, (self, key, value) => HashMap.set(self, key.toLowerCase(), value))
79
+ >(3, (self, key, value) => ({
80
+ ...self,
81
+ [key.toLowerCase()]: value
82
+ }))
76
83
 
77
84
  /**
78
85
  * @since 1.0.0
@@ -84,11 +91,10 @@ export const setAll: {
84
91
  } = dual<
85
92
  (headers: Input) => (self: Headers) => Headers,
86
93
  (self: Headers, headers: Input) => Headers
87
- >(2, (self, headers) =>
88
- HashMap.union(
89
- self,
90
- fromInput(headers)
91
- ))
94
+ >(2, (self, headers) => ({
95
+ ...self,
96
+ ...fromInput(headers)
97
+ }))
92
98
 
93
99
  /**
94
100
  * @since 1.0.0
@@ -100,4 +106,4 @@ export const remove: {
100
106
  } = dual<
101
107
  (key: string) => (self: Headers) => Headers,
102
108
  (self: Headers, key: string) => Headers
103
- >(2, (self, key) => HashMap.remove(self, key.toLowerCase()))
109
+ >(2, (self, key) => ReadonlyRecord.remove(self, key.toLowerCase()))
@@ -65,8 +65,7 @@ export const schemaBodyUrlParams = <I extends Readonly<Record<string, string>>,
65
65
  */
66
66
  export const schemaHeaders = <I extends Readonly<Record<string, string>>, A>(schema: Schema.Schema<I, A>) => {
67
67
  const parse = Schema.parse(schema)
68
- return <E>(self: IncomingMessage<E>): Effect.Effect<never, ParseResult.ParseError, A> =>
69
- parse(Object.fromEntries(self.headers))
68
+ return <E>(self: IncomingMessage<E>): Effect.Effect<never, ParseResult.ParseError, A> => parse(self.headers)
70
69
  }
71
70
 
72
71
  /**
@@ -30,7 +30,7 @@ const clientProto = {
30
30
  }
31
31
 
32
32
  const setProto = <R, E, A>(
33
- f: (request: ClientRequest.ClientRequest.NonEffectBody) => Effect.Effect<R, E, A>
33
+ f: (request: ClientRequest.ClientRequest) => Effect.Effect<R, E, A>
34
34
  ) => {
35
35
  Object.setPrototypeOf(f, clientProto)
36
36
  return f as Client.Client<R, E, A>
@@ -65,7 +65,7 @@ export const fetch = (
65
65
  })),
66
66
  (url) =>
67
67
  Effect.suspend(() => {
68
- const headers = new Headers([...request.headers] as any)
68
+ const headers = new Headers(request.headers)
69
69
  const send = (body: BodyInit | undefined) =>
70
70
  Effect.map(
71
71
  Effect.tryPromise({
@@ -118,20 +118,20 @@ export const layer = Layer.succeed(tag, fetch())
118
118
 
119
119
  /** @internal */
120
120
  export const catchTag: {
121
- <E extends { _tag: string }, K extends E["_tag"] & string, R1, E1, A1>(
121
+ <K extends (E extends { _tag: string } ? E["_tag"] : never), E, R1, E1, A1>(
122
122
  tag: K,
123
123
  f: (e: Extract<E, { _tag: K }>) => Effect.Effect<R1, E1, A1>
124
124
  ): <R, A>(
125
125
  self: Client.Client<R, E, A>
126
126
  ) => Client.Client<R1 | R, E1 | Exclude<E, { _tag: K }>, A1 | A>
127
- <R, E extends { _tag: string }, A, K extends E["_tag"] & string, E1, R1, A1>(
127
+ <R, E, A, K extends (E extends { _tag: string } ? E["_tag"] : never), R1, E1, A1>(
128
128
  self: Client.Client<R, E, A>,
129
129
  tag: K,
130
130
  f: (e: Extract<E, { _tag: K }>) => Effect.Effect<R1, E1, A1>
131
131
  ): Client.Client<R1 | R, E1 | Exclude<E, { _tag: K }>, A1 | A>
132
132
  } = dual(
133
133
  3,
134
- <R, E extends { _tag: string }, A, K extends E["_tag"] & string, E1, R1, A1>(
134
+ <R, E, A, K extends (E extends { _tag: string } ? E["_tag"] : never), R1, E1, A1>(
135
135
  self: Client.Client<R, E, A>,
136
136
  tag: K,
137
137
  f: (e: Extract<E, { _tag: K }>) => Effect.Effect<R1, E1, A1>
@@ -142,12 +142,11 @@ export const catchTag: {
142
142
  /** @internal */
143
143
  export const catchTags: {
144
144
  <
145
- E extends { _tag: string },
146
- Cases extends {
147
- [K in E["_tag"]]+?:
148
- | ((error: Extract<E, { _tag: K }>) => Effect.Effect<any, any, any>)
149
- | undefined
150
- }
145
+ E,
146
+ Cases
147
+ extends (E extends { _tag: string }
148
+ ? { [K in E["_tag"]]+?: ((error: Extract<E, { _tag: K }>) => Effect.Effect<any, any, any>) }
149
+ : {})
151
150
  >(
152
151
  cases: Cases
153
152
  ): <R, A>(
@@ -179,11 +178,10 @@ export const catchTags: {
179
178
  R,
180
179
  E extends { _tag: string },
181
180
  A,
182
- Cases extends {
183
- [K in E["_tag"]]+?:
184
- | ((error: Extract<E, { _tag: K }>) => Effect.Effect<any, any, any>)
185
- | undefined
186
- }
181
+ Cases
182
+ extends (E extends { _tag: string }
183
+ ? { [K in E["_tag"]]+?: ((error: Extract<E, { _tag: K }>) => Effect.Effect<any, any, any>) }
184
+ : {})
187
185
  >(
188
186
  self: Client.Client<R, E, A>,
189
187
  cases: Cases
@@ -216,11 +214,10 @@ export const catchTags: {
216
214
  R,
217
215
  E extends { _tag: string },
218
216
  A,
219
- Cases extends {
220
- [K in E["_tag"]]+?:
221
- | ((error: Extract<E, { _tag: K }>) => Effect.Effect<any, any, any>)
222
- | undefined
223
- }
217
+ Cases
218
+ extends (E extends { _tag: string }
219
+ ? { [K in E["_tag"]]+?: ((error: Extract<E, { _tag: K }>) => Effect.Effect<any, any, any>) }
220
+ : {})
224
221
  >(
225
222
  self: Client.Client<R, E, A>,
226
223
  cases: Cases