effect 4.0.0-beta.91 → 4.0.0-beta.93

package/dist/unstable/observability/OtlpTracer.js

@@ -15,7 +15,6 @@ import * as Config from "../../Config.js";
 import * as Duration from "../../Duration.js";
 import * as Effect from "../../Effect.js";
 import { flow } from "../../Function.js";
-import { renderPrettyError } from "../../internal/effect.js";
 import * as Layer from "../../Layer.js";
 import * as Option from "../../Option.js";
 import * as Tracer from "../../Tracer.js";
@@ -204,7 +203,9 @@ const makeOtlpSpan = self => {
       }
     });
   } else {
-    const errors = Cause.prettyErrors(status.exit.cause);
+    const errors = Cause.prettyErrors(status.exit.cause, {
+      includeCauseInStack: true
+    });
     otelStatus = {
       code: StatusCode.Error
     };
@@ -228,7 +229,7 @@ const makeOtlpSpan = self => {
           }, {
             "key": "exception.stacktrace",
             "value": {
-              "stringValue": renderPrettyError(error) ?? "No stack trace available"
+              "stringValue": error.stack ?? "No stack trace available"
             }
           }]
         });

package/dist/unstable/observability/OtlpTracer.js.map

@@ -1 +1 @@
-{"version":3,"file":"OtlpTracer.js","names":["Cause","Config","Duration","Effect","flow","renderPrettyError","Layer","Option","Tracer","OtlpEnv","Exporter","entriesToAttributes","OtlpResource","OtlpSerialization","make","fnUntraced","options","otelResource","fromConfig","resource","serialization","scope","name","serviceNameUnsafe","exporter","label","url","headers","exportInterval","seconds","maxBatchSize","body","spans","data","resourceSpans","scopeSpans","traces","shutdownTimeout","exportFn","span","sampled","push","makeOtlpSpan","makeSpan","status","_tag","startTime","attributes","Map","export","context","primitive","fiber","currentSpan","undefined","layer","effect","layerFromConfig","gen","disabled","endpoint","exporters","all","boolean","pipe","withDefault","includes","empty","baseTimeout","tracesTimeout","exportTimeout","scheduleDelay","option","int","map","millis","firstSomeOf","_","toString","getOrUndefined","orDie","unwrap","SpanProto","end","endTime","exit","attribute","key","value","set","event","events","addLinks","links","self","Object","assign","create","isSome","parent","traceId","generateId","spanId","len","chars","result","i","Math","floor","random","length","entries","timeUnixNano","String","droppedAttributesCount","otelStatus","constOtelStatusSuccess","hasInterruptsOnly","cause","code","StatusCode","Ok","message","stringValue","boolValue","errors","prettyErrors","Error","error","parentSpanId","match","onNone","onSome","kind","SpanKind","startTimeUnixNano","endTimeUnixNano","droppedEventsCount","link","droppedLinksCount","Unset","unspecified","internal","server","client","producer","consumer"],"sources":["../../../src/unstable/observability/OtlpTracer.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"OtlpTracer.js","names":["Cause","Config","Duration","Effect","flow","Layer","Option","Tracer","OtlpEnv","Exporter","entriesToAttributes","OtlpResource","OtlpSerialization","make","fnUntraced","options","otelResource","fromConfig","resource","serialization","scope","name","serviceNameUnsafe","exporter","label","url","headers","exportInterval","seconds","maxBatchSize","body","spans","data","resourceSpans","scopeSpans","traces","shutdownTimeout","exportFn","span","sampled","push","makeOtlpSpan","makeSpan","status","_tag","startTime","attributes","Map","export","context","primitive","fiber","currentSpan","undefined","layer","effect","layerFromConfig","gen","disabled","endpoint","exporters","all","boolean","pipe","withDefault","includes","empty","baseTimeout","tracesTimeout","exportTimeout","scheduleDelay","option","int","map","millis","firstSomeOf","_","toString","getOrUndefined","orDie","unwrap","SpanProto","end","endTime","exit","attribute","key","value","set","event","events","addLinks","links","self","Object","assign","create","isSome","parent","traceId","generateId","spanId","len","chars","result","i","Math","floor","random","length","entries","timeUnixNano","String","droppedAttributesCount","otelStatus","constOtelStatusSuccess","hasInterruptsOnly","cause","code","StatusCode","Ok","message","stringValue","boolValue","errors","prettyErrors","includeCauseInStack","Error","error","stack","parentSpanId","match","onNone","onSome","kind","SpanKind","startTimeUnixNano","endTimeUnixNano","droppedEventsCount","link","droppedLinksCount","Unset","unspecified","internal","server","client","producer","consumer"],"sources":["../../../src/unstable/observability/OtlpTracer.ts"],"sourcesContent":[null],"mappings":"AAAA;;;;;;;;;;;;AAYA,OAAO,KAAKA,KAAK,MAAM,gBAAgB;AACvC,OAAO,KAAKC,MAAM,MAAM,iBAAiB;AAEzC,OAAO,KAAKC,QAAQ,MAAM,mBAAmB;AAC7C,OAAO,KAAKC,MAAM,MAAM,iBAAiB;AAEzC,SAASC,IAAI,QAAQ,mBAAmB;AACxC,OAAO,KAAKC,KAAK,MAAM,gBAAgB;AACvC,OAAO,KAAKC,MAAM,MAAM,iBAAiB;AAEzC,OAAO,KAAKC,MAAM,MAAM,iBAAiB;AAIzC,OAAO,KAAKC,OAAO,MAAM,uBAAuB;AAChD,OAAO,KAAKC,QAAQ,MAAM,mBAAmB;AAE7C,SAASC,mBAAmB,QAAQ,mBAAmB;AACvD,OAAO,KAAKC,YAAY,MAAM,mBAAmB;AACjD,SAASC,iBAAiB,QAAQ,wBAAwB;AAE1D;;;;;;;;;;;AAWA,OAAO,MAAMC,IAAI,gBAkBbV,MAAM,CAACW,UAAU,CAAC,WAAUC,OAAO;EACrC,MAAMC,YAAY,GAAG,OAAOL,YAAY,CAACM,UAAU,CAACF,OAAO,CAACG,QAAQ,CAAC;EACrE,MAAMC,aAAa,GAAG,OAAOP,iBAAiB;EAC9C,MAAMQ,KAAK,GAAU;IACnBC,IAAI,EAAEV,YAAY,CAACW,iBAAiB,CAACN,YAAY;GAClD;EAED,MAAMO,QAAQ,GAAG,OAAOd,QAAQ,CAACI,IAAI,CAAC;IACpCW,KAAK,EAAE,YAAY;IACnBC,GAAG,EAAEV,OAAO,CAACU,GAAG;IAChBC,OAAO,EAAEX,OAAO,CAACW,OAAO;IACxBC,cAAc,EAAEZ,OAAO,CAACY,cAAc,IAAIzB,QAAQ,CAAC0B,OAAO,CAAC,CAAC,CAAC;IAC7DC,YAAY,EAAEd,OAAO,CAACc,YAAY,IAAI,IAAI;IAC1CC,IAAIA,CAACC,KAAK;MACR,MAAMC,IAAI,GAAc;QACtBC,aAAa,EAAE,CAAC;UACdf,QAAQ,EAAEF,YAAY;UACtBkB,UAAU,EAAE,CAAC;YACXd,KAAK;YACLW;WACD;SACF;OACF;MACD,OAAOZ,aAAa,CAACgB,MAAM,CAACH,IAAI,CAAC;IACnC,CAAC;IACDI,eAAe,EAAErB,OAAO,CAACqB,eAAe,IAAIlC,QAAQ,CAAC0B,OAAO,CAAC,CAAC;GAC/D,CAAC;EAEF,SAASS,QAAQA,CAACC,IAAc;IAC9B,IAAI,CAACA,IAAI,CAACC,OAAO,EAAE;IACnBhB,QAAQ,CAACiB,IAAI,CAACC,YAAY,CAACH,IAAI,CAAC,CAAC;EACnC;EAEA,OAAO/B,MAAM,CAACM,IAAI,CAAC;IACjByB,IAAIA,CAACvB,OAAO;MACV,OAAO2B,QAAQ,CAAC;QACd,GAAG3B,OAAO;QACV4B,MAAM,EAAE;UACNC,IAAI,EAAE,SAAS;UACfC,SAAS,EAAE9B,OAAO,CAAC8B;SACpB;QACDC,UAAU,EAAE,IAAIC,GAAG,EAAE;QACrBC,MAAM,EAAEX;OACT,CAAC;IACJ,CAAC;IACDY,OAAO,EAAElC,OAAO,CAACkC,OAAO,GACtB,UAASC,SAAS,EAAEC,KAAK;MACvB,IAAIA,KAAK,CAACC,WAAW,KAAKC,SAAS,EAAE;QACnC,OAAOH,SAAS,CAAC,yBAAyB,CAAC,CAACC,KAAK,CAAC;MACpD;MACA,OAAOpC,OAAO,CAACkC,OAAQ,CAACC,SAAS,EAAEC,KAAK,CAACC,WAAW,CAAC;IACvD,CAAC,GACDC;GACH,CAAC;AACJ,CAAC,CAAC;AAEF;;;;;;AAMA,OAAO,MAAMC,KAAK,gBAY2DlD,IAAI,CAACS,IAAI,eAAER,KAAK,CAACkD,MAAM,CAAChD,MAAM,CAACA,MAAM,CAAC,CAAC;AAEpH;;;;;;AAMA,OAAO,MAAMiD,eAAe,GAAIzC,OAQ/B,IACCZ,MAAM,CAACsD,GAAG,CAAC,aAAS;EAClB,MAAM;IAAEC,QAAQ;IAAEC,QAAQ;IAAEC;EAAS,CAAE,GAAG,OAAO3D,MAAM,CAAC4D,GAAG,CAAC;IAC1DH,QAAQ,EAAEzD,MAAM,CAAC6D,OAAO,CAAC,mBAAmB,CAAC,CAACC,IAAI,CAAC9D,MAAM,CAAC+D,WAAW,CAAC,KAAK,CAAC,CAAC;IAC7EL,QAAQ,EAAEnD,OAAO,CAACmD,QAAQ,CAAC,QAAQ,CAAC;IACpCC,SAAS,EAAEpD,OAAO,CAACoD,SAAS,CAAC,QAAQ;GACtC,CAAC;EAEF,IAAIF,QAAQ,IAAI,CAACC,QAAQ,IAAI,CAACC,SAAS,CAACK,QAAQ,CAAC,MAAM,CAAC,EAAE;IACxD,OAAO5D,KAAK,CAAC6D,KAAK;EACpB;EAEA,MAAM;IAAEC,WAAW;IAAEC,aAAa;IAAEC,aAAa;IAAEC,aAAa;IAAEzC;EAAY,CAAE,GAAG,OAAO5B,MAAM,CAAC4D,GAAG,CAAC;IACnGM,WAAW,EAAElE,MAAM,CAACsE,MAAM,CAACtE,MAAM,CAACuE,GAAG,CAAC,4BAA4B,CAAC,CAAC;IACpEJ,aAAa,EAAEnE,MAAM,CAACsE,MAAM,CAACtE,MAAM,CAACuE,GAAG,CAAC,mCAAmC,CAAC,CAAC;IAC7EH,aAAa,EAAEpE,MAAM,CAACsE,MAAM,CAACtE,MAAM,CAACuE,GAAG,CAAC,yBAAyB,CAAC,CAAC;IACnEF,aAAa,EAAErE,MAAM,CAACsE,MAAM,CAC1BtE,MAAM,CAACuE,GAAG,CAAC,yBAAyB,CAAC,CAACT,IAAI,CACxC9D,MAAM,CAACwE,GAAG,CAACvE,QAAQ,CAACwE,MAAM,CAAC,CAC5B,CACF;IACD7C,YAAY,EAAE5B,MAAM,CAACsE,MAAM,CAACtE,MAAM,CAACuE,GAAG,CAAC,gCAAgC,CAAC;GACzE,CAAC;EAEF,MAAMpC,eAAe,GAAG9B,MAAM,CAACqE,WAAW,CAAC,CAACP,aAAa,EAAED,WAAW,EAAEE,aAAa,CAAC,CAAC,CAACN,IAAI,CAC1FzD,MAAM,CAACmE,GAAG,CAAEG,CAAC,IAAK1E,QAAQ,CAACwE,MAAM,CAACE,CAAC,CAAC,CAAC,CACtC;EAED,OAAOtB,KAAK,CAAC;IACX7B,GAAG,EAAEkC,QAAQ,CAACkB,QAAQ,EAAE;IACxB3D,QAAQ,EAAEH,OAAO,EAAEG,QAAQ;IAC3BQ,OAAO,EAAEX,OAAO,EAAEW,OAAO,KAAK,OAAOlB,OAAO,CAACkB,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC/DC,cAAc,EAAErB,MAAM,CAACwE,cAAc,CAACR,aAAa,CAAC;IACpDzC,YAAY,EAAEvB,MAAM,CAACwE,cAAc,CAACjD,YAAY,CAAC;IACjDoB,OAAO,EAAElC,OAAO,EAAEkC,OAAO;IACzBb,eAAe,EAAE9B,MAAM,CAACwE,cAAc,CAAC1C,eAAe;GACvD,CAAC;AACJ,CAAC,CAAC,CAAC2B,IAAI,CAAC5D,MAAM,CAAC4E,KAAK,EAAE1E,KAAK,CAAC2E,MAAM,CAAC;AAYrC,MAAMC,SAAS,GAAG;EAChBrC,IAAI,EAAE,MAAM;EACZsC,GAAGA,CAAiBC,OAAe,EAAEC,IAAiC;IACpE,IAAI,CAACzC,MAAM,GAAG;MACZC,IAAI,EAAE,OAAO;MACbC,SAAS,EAAE,IAAI,CAACF,MAAM,CAACE,SAAS;MAChCsC,OAAO;MACPC;KACD;IACD,IAAI,CAACpC,MAAM,CAAC,IAAI,CAAC;EACnB,CAAC;EACDqC,SAASA,CAAiBC,GAAW,EAAEC,KAAc;IACnD,IAAI,CAACzC,UAAU,CAAC0C,GAAG,CAACF,GAAG,EAAEC,KAAK,CAAC;EACjC,CAAC;EACDE,KAAKA,CAAiBpE,IAAY,EAAEwB,SAAiB,EAAEC,UAAoC;IACzF,IAAI,CAAC4C,MAAM,CAAClD,IAAI,CAAC,CAACnB,IAAI,EAAEwB,SAAS,EAAEC,UAAU,CAAC,CAAC;EACjD,CAAC;EACD6C,QAAQA,CAAiBC,KAAqC;IAC5D,IAAI,CAACA,KAAK,CAACpD,IAAI,CAAC,GAAGoD,KAAK,CAAC;EAC3B;CACD;AAGD,MAAMlD,QAAQ,GAAI3B,OAUjB,IAAc;EACb,MAAM8E,IAAI,GAAsBC,MAAM,CAACC,MAAM,CAC3CD,MAAM,CAACE,MAAM,CAACf,SAAS,CAAC,EACxBlE,OAAmC,CACpC;EACD,IAAIT,MAAM,CAAC2F,MAAM,CAACJ,IAAI,CAACK,MAAM,CAAC,EAAE;IAC9BL,IAAI,CAACM,OAAO,GAAGN,IAAI,CAACK,MAAM,CAACX,KAAK,CAACY,OAAO;EAC1C,CAAC,MAAM;IACLN,IAAI,CAACM,OAAO,GAAGC,UAAU,CAAC,EAAE,CAAC;EAC/B;EACAP,IAAI,CAACQ,MAAM,GAAGD,UAAU,CAAC,EAAE,CAAC;EAC5BP,IAAI,CAACH,MAAM,GAAG,EAAE;EAChB,OAAOG,IAAI;AACb,CAAC;AAED,MAAMO,UAAU,GAAIE,GAAW,IAAY;EACzC,MAAMC,KAAK,GAAG,kBAAkB;EAChC,IAAIC,MAAM,GAAG,EAAE;EACf,KAAK,IAAIC,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAGH,GAAG,EAAEG,CAAC,EAAE,EAAE;IAC5BD,MAAM,IAAID,KAAK,CAACG,IAAI,CAACC,KAAK,CAACD,IAAI,CAACE,MAAM,EAAE,GAAGL,KAAK,CAACM,MAAM,CAAC,CAAC;EAC3D;EACA,OAAOL,MAAM;AACf,CAAC;AAED,MAAM/D,YAAY,GAAIoD,IAAc,IAAc;EAChD,MAAMlD,MAAM,GAAGkD,IAAI,CAAClD,MAAgD;EACpE,MAAMG,UAAU,GAAGpC,mBAAmB,CAACmF,IAAI,CAAC/C,UAAU,CAACgE,OAAO,EAAE,CAAC;EACjE,MAAMpB,MAAM,GAAGG,IAAI,CAACH,MAAM,CAACjB,GAAG,CAAC,CAAC,CAACpD,IAAI,EAAEwB,SAAS,EAAEC,UAAU,CAAC,MAAM;IACjEzB,IAAI;IACJ0F,YAAY,EAAEC,MAAM,CAACnE,SAAS,CAAC;IAC/BC,UAAU,EAAEA,UAAU,GAClBpC,mBAAmB,CAACoF,MAAM,CAACgB,OAAO,CAAChE,UAAU,CAAC,CAAC,GAC/C,EAAE;IACNmE,sBAAsB,EAAE;GACzB,CAAC,CAAC;EACH,IAAIC,UAAkB;EAEtB,IAAIvE,MAAM,CAACyC,IAAI,CAACxC,IAAI,KAAK,SAAS,EAAE;IAClCsE,UAAU,GAAGC,sBAAsB;EACrC,CAAC,MAAM,IAAInH,KAAK,CAACoH,iBAAiB,CAACzE,MAAM,CAACyC,IAAI,CAACiC,KAAK,CAAC,EAAE;IACrDH,UAAU,GAAG;MACXI,IAAI,EAAEC,UAAU,CAACC,EAAE;MACnBC,OAAO,EAAE;KACV;IACD3E,UAAU,CAACN,IAAI,CAAC;MACd8C,GAAG,EAAE,YAAY;MACjBC,KAAK,EAAE;QAAEmC,WAAW,EAAE;MAAgB;KACvC,EAAE;MACDpC,GAAG,EAAE,oBAAoB;MACzBC,KAAK,EAAE;QAAEoC,SAAS,EAAE;MAAI;KACzB,CAAC;EACJ,CAAC,MAAM;IACL,MAAMC,MAAM,GAAG5H,KAAK,CAAC6H,YAAY,CAAClF,MAAM,CAACyC,IAAI,CAACiC,KAAK,EAAE;MACnDS,mBAAmB,EAAE;KACtB,CAAC;IACFZ,UAAU,GAAG;MACXI,IAAI,EAAEC,UAAU,CAACQ;KAClB;IACD,IAAIH,MAAM,CAACf,MAAM,GAAG,CAAC,EAAE;MACrBK,UAAU,CAACO,OAAO,GAAGG,MAAM,CAAC,CAAC,CAAC,CAACH,OAAO;MACtC,KAAK,MAAMO,KAAK,IAAIJ,MAAM,EAAE;QAC1BlC,MAAM,CAAClD,IAAI,CAAC;UACVnB,IAAI,EAAE,WAAW;UACjB0F,YAAY,EAAEC,MAAM,CAACrE,MAAM,CAACwC,OAAO,CAAC;UACpC8B,sBAAsB,EAAE,CAAC;UACzBnE,UAAU,EAAE,CACV;YACE,KAAK,EAAE,gBAAgB;YACvB,OAAO,EAAE;cACP,aAAa,EAAEkF,KAAK,CAAC3G;;WAExB,EACD;YACE,KAAK,EAAE,mBAAmB;YAC1B,OAAO,EAAE;cACP,aAAa,EAAE2G,KAAK,CAACP;;WAExB,EACD;YACE,KAAK,EAAE,sBAAsB;YAC7B,OAAO,EAAE;cACP,aAAa,EAAEO,KAAK,CAACC,KAAK,IAAI;;WAEjC;SAEJ,CAAC;MACJ;IACF;EACF;EAEA,OAAO;IACL9B,OAAO,EAAEN,IAAI,CAACM,OAAO;IACrBE,MAAM,EAAER,IAAI,CAACQ,MAAM;IACnB6B,YAAY,EAAE5H,MAAM,CAAC6H,KAAK,CAACtC,IAAI,CAACK,MAAM,EAAE;MACtCkC,MAAM,EAAEA,CAAA,KAAM/E,SAAS;MACvBgF,MAAM,EAAGnC,MAAM,IAAKA,MAAM,CAACG;KAC5B,CAAC;IACFhF,IAAI,EAAEwE,IAAI,CAACxE,IAAI;IACfiH,IAAI,EAAEC,QAAQ,CAAC1C,IAAI,CAACyC,IAAI,CAAC;IACzBE,iBAAiB,EAAExB,MAAM,CAACrE,MAAM,CAACE,SAAS,CAAC;IAC3C4F,eAAe,EAAEzB,MAAM,CAACrE,MAAM,CAACwC,OAAO,CAAC;IACvCrC,UAAU;IACVmE,sBAAsB,EAAE,CAAC;IACzBvB,MAAM;IACNgD,kBAAkB,EAAE,CAAC;IACrB/F,MAAM,EAAEuE,UAAU;IAClBtB,KAAK,EAAEC,IAAI,CAACD,KAAK,CAACnB,GAAG,CAAEkE,IAAI,KAAM;MAC/BxC,OAAO,EAAEwC,IAAI,CAACrG,IAAI,CAAC6D,OAAO;MAC1BE,MAAM,EAAEsC,IAAI,CAACrG,IAAI,CAAC+D,MAAM;MACxBvD,UAAU,EAAEpC,mBAAmB,CAACoF,MAAM,CAACgB,OAAO,CAAC6B,IAAI,CAAC7F,UAAU,CAAC,CAAC;MAChEmE,sBAAsB,EAAE;KACzB,CAAC,CAAC;IACH2B,iBAAiB,EAAE;GACpB;AACH,CAAC;AA4ED,MAAMrB,UAAU,GAAG;EACjBsB,KAAK,EAAE,CAAC;EACRrB,EAAE,EAAE,CAAC;EACLO,KAAK,EAAE;CACC;AAIV,MAAMQ,QAAQ,GAAG;EACfO,WAAW,EAAE,CAAC;EACdC,QAAQ,EAAE,CAAC;EACXC,MAAM,EAAE,CAAC;EACTC,MAAM,EAAE,CAAC;EACTC,QAAQ,EAAE,CAAC;EACXC,QAAQ,EAAE;CACF;AAEV,MAAMhC,sBAAsB,GAAW;EACrCG,IAAI,EAAEC,UAAU,CAACC;CAClB","ignoreList":[]}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "effect",
   "type": "module",
-  "version": "4.0.0-beta.91",
+  "version": "4.0.0-beta.93",
   "license": "MIT",
   "description": "The missing standard library for TypeScript, for writing production-grade software.",
   "homepage": "https://effect.website",

package/src/Cause.ts

@@ -1234,7 +1234,9 @@ export const filterInterruptors: <E>(self: Cause<E>) => Result.Result<Set<number
  * @category rendering
  * @since 3.2.0
  */
-export const prettyErrors: <E>(self: Cause<E>) => Array<Error> = effect.causePrettyErrors
+export const prettyErrors: <E>(self: Cause<E>, options?: {
+  readonly includeCauseInStack?: boolean | undefined
+}) => Array<Error> = effect.causePrettyErrors
 
 /**
  * Formats a `Cause` as a human-readable string for logging or debugging.

package/src/Schema.ts

@@ -122,6 +122,12 @@ export interface MakeOptions {
    * Whether to disable validation for the schema.
    */
   readonly disableChecks?: boolean | undefined
+
+  /** @internal */
+  readonly "~payload"?: {
+    readonly token: unknown
+    readonly value: unknown
+  }
 }
 
 /**
@@ -10975,7 +10981,10 @@ export interface fromJsonString<S extends Constraint> extends decodeTo<S, String
  * @since 4.0.0
  */
 export function fromJsonString<S extends Constraint>(schema: S): fromJsonString<S> {
+  const identifier = SchemaAST.resolveIdentifier(schema.ast)
   return String.annotate({
+    // Give the transport wrapper its own name so the decoded payload keeps its identifier.
+    identifier: identifier === undefined ? undefined : `${identifier}JsonString`,
     expected: "a string that will be decoded as JSON",
     contentMediaType: "application/json",
     contentSchema: SchemaAST.toEncoded(schema.ast)
@@ -12467,6 +12476,8 @@ type InheritStaticMembers<C, Static> = C & Pick<Static, Exclude<keyof Static, ke
 
 const immerable: unique symbol = globalThis.Symbol.for("immer-draftable") as any
 
+const payloadToken = {}
+
 function makeClass<
   Self,
   S extends Struct<Struct.Fields>,
@@ -12483,9 +12494,12 @@ function makeClass<
 
   const out = class extends Inherited {
     constructor(...[input, options]: ReadonlyArray<any>) {
-      input = input ?? {}
-      const validated = struct.make(input, options)
-      super({ ...input, ...validated }, { ...options, disableChecks: true })
+      const internalOptions = options as MakeOptions | undefined
+      const payload = internalOptions?.["~payload"]
+      const value = payload?.token === payloadToken
+        ? payload.value
+        : struct.make(input ?? {}, options)
+      super(value, { ...options, disableChecks: true, "~payload": { token: payloadToken, value } })
     }
 
     static readonly [TypeId] = TypeId

package/src/internal/core.ts

@@ -87,7 +87,7 @@ export const StructuralProto = {
     const thatKeys = Object.keys(that)
     if (selfKeys.length !== thatKeys.length) return false
     for (let i = 0; i < selfKeys.length; i++) {
-      if (selfKeys[i] !== thatKeys[i] && !Equal.equals(this[selfKeys[i]], that[selfKeys[i]])) {
+      if (selfKeys[i] !== thatKeys[i] || !Equal.equals(this[selfKeys[i]], that[selfKeys[i]])) {
         return false
       }
     }

package/src/internal/effect.ts

@@ -310,7 +310,9 @@ export const causeSquash = <E>(self: Cause.Cause<E>): unknown => {
 }
 
 /** @internal */
-export const causePrettyErrors = <E>(self: Cause.Cause<E>): Array<Error> => {
+export const causePrettyErrors = <E>(self: Cause.Cause<E>, options?: {
+  readonly includeCauseInStack?: boolean | undefined
+}): Array<Error> => {
   const errors: Array<Error> = []
   const interrupts: Array<Cause.Interrupt> = []
   if (self.reasons.length === 0) return errors
@@ -326,7 +328,8 @@ export const causePrettyErrors = <E>(self: Cause.Cause<E>): Array<Error> => {
     errors.push(
       causePrettyError(
         failure._tag === "Die" ? failure.defect : failure.error as any,
-        failure.annotations
+        failure.annotations,
+        options
       )
     )
   }
@@ -337,7 +340,7 @@ export const causePrettyErrors = <E>(self: Cause.Cause<E>): Array<Error> => {
     const error = new globalThis.Error("All fibers interrupted without error", { cause })
     error.name = "InterruptError"
     error.stack = `${error.name}: ${error.message}`
-    errors.push(causePrettyError(error, interrupts[0].annotations))
+    errors.push(causePrettyError(error, interrupts[0].annotations, options))
   }
 
   setStackTraceLimit(prevStackLimit)
@@ -347,7 +350,10 @@ export const causePrettyErrors = <E>(self: Cause.Cause<E>): Array<Error> => {
 /** @internal */
 export const causePrettyError = (
   original: Record<string, unknown> | Error,
-  annotations?: ReadonlyMap<string, unknown>
+  annotations?: ReadonlyMap<string, unknown>,
+  options?: {
+    readonly includeCauseInStack?: boolean | undefined
+  }
 ): Error => {
   const kind = typeof original
   let error: Error
@@ -364,6 +370,9 @@ export const causePrettyError = (
       const stack = `${error.name}: ${error.message}`
       error.stack = annotations ? addStackAnnotations(stack, annotations) : stack
     }
+    if (options?.includeCauseInStack) {
+      error.stack = renderPrettyError(error)!
+    }
     for (const key of Object.keys(original)) {
       if (!(key in error)) {
         ;(error as any)[key] = (original as any)[key]
@@ -461,8 +470,7 @@ const currentStackTrace = (frame: StackFrame): string => {
 export const causePretty = <E>(cause: Cause.Cause<E>): string =>
   causePrettyErrors<E>(cause).map(renderPrettyError).join("\n")
 
-/** @internal */
-export const renderPrettyError = (e: Error): string | undefined =>
+const renderPrettyError = (e: Error): string | undefined =>
   e.cause ? `${e.stack} {\n${renderErrorCause(e.cause as Error, "  ")}\n}` : e.stack
 
 const renderErrorCause = (cause: Error, prefix: string) => {

package/src/unstable/http/HttpBody.ts

@@ -335,8 +335,8 @@ export const jsonSchema = <S extends Schema.Constraint>(
  * @category constructors
  * @since 4.0.0
  */
-export const urlParams = (urlParams: UrlParams.UrlParams, contentType?: string): Uint8Array =>
-  text(UrlParams.toString(urlParams), contentType ?? "application/x-www-form-urlencoded")
+export const urlParams = (urlParams: UrlParams.Input, contentType?: string): Uint8Array =>
+  text(UrlParams.toString(UrlParams.fromInput(urlParams)), contentType ?? "application/x-www-form-urlencoded")
 
 /**
  * HTTP body variant backed by Web `FormData`.

package/src/unstable/http/HttpClient.ts

@@ -40,7 +40,7 @@ import * as HttpClientResponse from "./HttpClientResponse.ts"
 import * as HttpIncomingMessage from "./HttpIncomingMessage.ts"
 import * as HttpMethod from "./HttpMethod.ts"
 import * as TraceContext from "./HttpTraceContext.ts"
-import * as UrlParams from "./UrlParams.ts"
+import * as Url from "./Url.ts"
 
 const TypeId = "~effect/http/HttpClient"
 
@@ -790,7 +790,7 @@ export const make = (
       Effect.withFiber((fiber) => {
         const scopedController = scopedRequests.get(request)
         const controller = scopedController ?? new AbortController()
-        const urlResult = UrlParams.makeUrl(request.url, request.urlParams, Option.getOrUndefined(request.hash))
+        const urlResult = Url.make(request.url, request.urlParams, Option.getOrUndefined(request.hash))
         if (Result.isFailure(urlResult)) {
           return Effect.fail(
             new Error.HttpClientError({

package/src/unstable/http/HttpClientRequest.ts

@@ -28,6 +28,7 @@ import * as Stream from "../../Stream.ts"
 import * as Headers from "./Headers.ts"
 import * as HttpBody from "./HttpBody.ts"
 import { hasBody, type HttpMethod } from "./HttpMethod.ts"
+import * as Url from "./Url.ts"
 import * as UrlParams from "./UrlParams.ts"
 
 const TypeId = "~effect/http/HttpClientRequest"
@@ -116,7 +117,7 @@ const Proto = {
 export function makeWith(
   method: HttpMethod,
   url: string,
-  urlParams: UrlParams.UrlParams,
+  urlParams: UrlParams.Input,
   hash: Option.Option<string>,
   headers: Headers.Headers,
   body: HttpBody.HttpBody
@@ -1180,7 +1181,7 @@ export const bodyFile: {
  * @since 4.0.0
  */
 export function toUrl(self: HttpClientRequest): Option.Option<URL> {
-  const r = UrlParams.makeUrl(self.url, self.urlParams, Option.getOrUndefined(self.hash))
+  const r = Url.make(self.url, self.urlParams, Option.getOrUndefined(self.hash))
   if (Result.isSuccess(r)) {
     return Option.some(r.success)
   }
@@ -1230,8 +1231,8 @@ const parseContentLength = (contentLength: string | null): number | undefined =>
 export const toWebResult = (self: HttpClientRequest, options?: {
   readonly signal?: AbortSignal | undefined
   readonly context?: Context.Context<never> | undefined
-}): Result.Result<Request, UrlParams.UrlParamsError> => {
-  const url = UrlParams.makeUrl(self.url, self.urlParams, Option.getOrUndefined(self.hash))
+}): Result.Result<Request, Url.UrlError> => {
+  const url = Url.make(self.url, self.urlParams, Option.getOrUndefined(self.hash))
   if (Result.isFailure(url)) {
     return Result.fail(url.failure)
   }
@@ -1271,7 +1272,7 @@ export const toWebResult = (self: HttpClientRequest, options?: {
   }
   return Result.try({
     try: () => new Request(url.success, requestInit),
-    catch: (cause) => new UrlParams.UrlParamsError({ cause })
+    catch: (cause) => new Url.UrlError({ cause })
   })
 }
 
@@ -1279,14 +1280,14 @@ const isReadableStream = (u: unknown): u is ReadableStream<Uint8Array> =>
   typeof ReadableStream !== "undefined" && u instanceof ReadableStream
 
 /**
- * Converts an `HttpClientRequest` to a Web `Request`, failing with `UrlParamsError` when the request URL is invalid.
+ * Converts an `HttpClientRequest` to a Web `Request`, failing with `UrlError` when the request URL is invalid.
  *
  * @category converting
  * @since 4.0.0
  */
 export const toWeb = (self: HttpClientRequest, options?: {
   readonly signal?: AbortSignal | undefined
-}): Effect.Effect<Request, UrlParams.UrlParamsError> =>
+}): Effect.Effect<Request, Url.UrlError> =>
   Effect.contextWith((context) =>
     Effect.fromResult(toWebResult(self, {
       context: context,

package/src/unstable/http/Url.ts

@@ -9,11 +9,66 @@
  * @since 4.0.0
  */
 import * as Cause from "../../Cause.ts"
+import * as Data from "../../Data.ts"
 import { dual } from "../../Function.ts"
 import * as Redacted from "../../Redacted.ts"
 import * as Result from "../../Result.ts"
 import * as UrlParams from "./UrlParams.ts"
 
+/**
+ * Error returned when constructing a `URL` fails.
+ *
+ * @category errors
+ * @since 4.0.0
+ */
+export class UrlError extends Data.TaggedError("UrlError")<{
+  readonly cause: unknown
+}> {}
+
+/**
+ * Creates a `URL` safely by appending `UrlParams` and an optional hash to a URL string.
+ *
+ * **Details**
+ *
+ * Returns a `Result` that fails with `UrlError` if the URL cannot be constructed.
+ *
+ * @category constructors
+ * @since 4.0.0
+ */
+export const make = (
+  url: string,
+  params: UrlParams.UrlParams,
+  hash: string | undefined
+): Result.Result<URL, UrlError> =>
+  Result.try({
+    try: () => {
+      const urlInstance = new URL(url, baseUrl())
+      for (let i = 0; i < params.params.length; i++) {
+        const [key, value] = params.params[i]
+        if (value !== undefined) {
+          urlInstance.searchParams.append(key, value)
+        }
+      }
+      if (hash !== undefined) {
+        urlInstance.hash = hash
+      }
+      return urlInstance
+    },
+    catch: (cause) => new UrlError({ cause })
+  })
+
+const baseUrl = (): string | undefined => {
+  if (
+    "location" in globalThis &&
+    globalThis.location !== undefined &&
+    globalThis.location.origin !== undefined &&
+    globalThis.location.pathname !== undefined
+  ) {
+    return location.origin + location.pathname
+  }
+  return undefined
+}
+
 /**
  * Parses a URL string safely into a `URL` object, returning a `Result` type for
  * error handling.
@@ -502,7 +557,7 @@ export const setUrlParams: {
    * @category setters
    * @since 4.0.0
    */
-  (urlParams: UrlParams.UrlParams): (url: URL) => URL
+  (urlParams: UrlParams.Input): (url: URL) => URL
   /**
    * Updates the query parameters of a URL.
    *
@@ -532,10 +587,10 @@ export const setUrlParams: {
    * @category setters
    * @since 4.0.0
    */
-  (url: URL, urlParams: UrlParams.UrlParams): URL
-} = dual(2, (url: URL, searchParams: UrlParams.UrlParams) =>
+  (url: URL, urlParams: UrlParams.Input): URL
+} = dual(2, (url: URL, urlParams: UrlParams.Input) =>
   mutate(url, (url) => {
-    url.search = UrlParams.toString(searchParams)
+    url.search = UrlParams.toString(UrlParams.fromInput(urlParams))
   }))
 
 /**
@@ -619,7 +674,7 @@ export const modifyUrlParams: {
    * @category modifiers
    * @since 4.0.0
    */
-  (f: (urlParams: UrlParams.UrlParams) => UrlParams.UrlParams): (url: URL) => URL
+  (f: (urlParams: UrlParams.UrlParams) => UrlParams.Input): (url: URL) => URL
   /**
    * Reads the query parameters of a URL, modifies them, and updates the URL.
    *
@@ -646,8 +701,8 @@ export const modifyUrlParams: {
    * @category modifiers
    * @since 4.0.0
    */
-  (url: URL, f: (urlParams: UrlParams.UrlParams) => UrlParams.UrlParams): URL
-} = dual(2, (url: URL, f: (urlParams: UrlParams.UrlParams) => UrlParams.UrlParams) =>
+  (url: URL, f: (urlParams: UrlParams.UrlParams) => UrlParams.Input): URL
+} = dual(2, (url: URL, f: (urlParams: UrlParams.UrlParams) => UrlParams.Input) =>
   mutate(url, (url) => {
     const params = f(UrlParams.fromInput(url.searchParams))
     url.search = UrlParams.toString(params)

package/src/unstable/http/UrlParams.ts

@@ -9,7 +9,6 @@
  * @since 4.0.0
  */
 import * as Arr from "../../Array.ts"
-import * as Data from "../../Data.ts"
 import * as Effect from "../../Effect.ts"
 import * as Equal from "../../Equal.ts"
 import * as Equ from "../../Equivalence.ts"
@@ -21,7 +20,6 @@ import * as Option from "../../Option.ts"
 import type { Pipeable } from "../../Pipeable.ts"
 import { hasProperty } from "../../Predicate.ts"
 import type { ReadonlyRecord } from "../../Record.ts"
-import * as Result from "../../Result.ts"
 import * as Schema from "../../Schema.ts"
 import * as SchemaIssue from "../../SchemaIssue.ts"
 import * as SchemaTransformation from "../../SchemaTransformation.ts"
@@ -65,6 +63,7 @@ export const isUrlParams = (u: unknown): u is UrlParams => hasProperty(u, TypeId
  * @since 4.0.0
  */
 export type Input =
+  | UrlParams
   | CoercibleRecordInput
   | Iterable<readonly [string, Coercible]>
   | URLSearchParams
@@ -157,6 +156,9 @@ export const make = (params: ReadonlyArray<readonly [string, string]>): UrlParam
  * @since 4.0.0
  */
 export const fromInput = (input: Input): UrlParams => {
+  if (isUrlParams(input)) {
+    return input
+  }
   const parsed = fromInputNested(input)
   const out: Array<[string, string]> = []
   for (let i = 0; i < parsed.length; i++) {
@@ -634,68 +636,13 @@ export const remove: {
   (self: UrlParams, key: string): UrlParams
 } = dual(2, (self: UrlParams, key: string): UrlParams => transform(self, Arr.filter(([k]) => k !== key)))
 
-/**
- * Error returned when constructing a `URL` from `UrlParams` fails.
- *
- * @category errors
- * @since 4.0.0
- */
-export class UrlParamsError extends Data.TaggedError("UrlParamsError")<{
-  cause: unknown
-}> {}
-
-/**
- * Creates a `URL` safely by appending `UrlParams` and an optional hash to a URL string.
- *
- * **Details**
- *
- * Returns a `Result` that fails with `UrlParamsError` if the URL cannot be
- * constructed.
- *
- * @category converting
- * @since 4.0.0
- */
-export const makeUrl = (
-  url: string,
-  params: UrlParams,
-  hash: string | undefined
-): Result.Result<URL, UrlParamsError> => {
-  try {
-    const urlInstance = new URL(url, baseUrl())
-    for (let i = 0; i < params.params.length; i++) {
-      const [key, value] = params.params[i]
-      if (value !== undefined) {
-        urlInstance.searchParams.append(key, value)
-      }
-    }
-    if (hash !== undefined) {
-      urlInstance.hash = hash
-    }
-    return Result.succeed(urlInstance)
-  } catch (e) {
-    return Result.fail(new UrlParamsError({ cause: e }))
-  }
-}
-
 /**
  * Serializes `UrlParams` to a URL query string without a leading question mark.
  *
  * @category converting
  * @since 4.0.0
  */
-export const toString = (self: UrlParams): string => new URLSearchParams(self.params as any).toString()
-
-const baseUrl = (): string | undefined => {
-  if (
-    "location" in globalThis &&
-    globalThis.location !== undefined &&
-    globalThis.location.origin !== undefined &&
-    globalThis.location.pathname !== undefined
-  ) {
-    return location.origin + location.pathname
-  }
-  return undefined
-}
+export const toString = (input: Input): string => new URLSearchParams(fromInput(input).params as any).toString()
 
 /**
  * Builds a `Record` containing all the key-value pairs in the given `UrlParams`

package/src/unstable/httpapi/HttpApiBuilder.ts

@@ -21,6 +21,7 @@ import * as Layer from "../../Layer.ts"
 import * as Option from "../../Option.ts"
 import type { Path } from "../../Path.ts"
 import { type Pipeable, pipeArguments } from "../../Pipeable.ts"
+import { hasProperty } from "../../Predicate.ts"
 import * as Redacted from "../../Redacted.ts"
 import * as Result from "../../Result.ts"
 import * as Schema from "../../Schema.ts"
@@ -603,13 +604,20 @@ function decodePayload(
       )
     }
     case "Json":
-      const json = Effect.orDie(Effect.flatMap(httpRequest.text, (text) => {
+      return Effect.flatMap(Effect.orDie(httpRequest.text), (text) => {
         if (text === "") {
-          return existing.nullOnEmpty ? Effect.succeed(null) : Effect.undefined
+          return decode(existing.nullOnEmpty ? null : undefined)
         }
-        return Effect.succeed(JSON.parse(text))
-      }))
-      return Effect.flatMap(json, decode)
+        try {
+          return decode(JSON.parse(text))
+        } catch (cause) {
+          return Effect.fail(
+            new Schema.SchemaError(
+              new SchemaIssue.InvalidValue(Option.some(text), { message: `Invalid JSON: ${cause}` })
+            )
+          )
+        }
+      })
     case "Text":
       return Effect.flatMap(Effect.orDie(httpRequest.text), decode)
     case "FormUrlEncoded": {
@@ -766,6 +774,7 @@ const makeSecurityMiddleware = (
     readonly group: HttpApiGroup.AnyWithProps
     readonly endpoint: HttpApiEndpoint.AnyWithProps
   }) {
+    handler = Effect.mapError(handler, (error) => new HandlerError(error))
     let lastResult: Result.Result<any, any> | undefined
     for (let i = 0; i < entries.length; i++) {
       const { decode, middleware } = entries[i]
@@ -776,6 +785,9 @@ const makeSecurityMiddleware = (
           group: options.group
         })))
       if (Result.isFailure(result)) {
+        if (isHandlerError(result.failure)) {
+          return yield* Effect.fail(result.failure.error)
+        }
         lastResult = result
         continue
       }
@@ -788,6 +800,16 @@ const makeSecurityMiddleware = (
   return middleware
 }
 
+const HandlerErrorTypeId = "~effect/httpapi/HttpApiBuilder/HandlerError" as const
+class HandlerError {
+  readonly [HandlerErrorTypeId] = HandlerErrorTypeId
+  readonly error: unknown
+  constructor(error: unknown) {
+    this.error = error
+  }
+}
+const isHandlerError = (value: unknown): value is HandlerError => hasProperty(value, HandlerErrorTypeId)
+
 const $HttpServerResponse = Schema.declare(Response.isHttpServerResponse)
 
 type StreamEncoder = (response: unknown, context: Context.Context<never>) =>
@@ -807,7 +829,9 @@ function makeStreamEncoder(endpoint: HttpApiEndpoint.AnyWithProps): StreamEncode
   if (HttpApiSchema.isStreamUint8Array(streamSchema)) {
     return (response, context) => {
       if (!Stream.isStream(response)) {
-        return hasBuffered ? undefined : expectedStreamResponse(response)
+        return hasBuffered ? undefined : new Schema.SchemaError(
+          new SchemaIssue.InvalidValue(Option.some(response), { message: "Expected a streaming response" })
+        )
       }
 
       return Effect.succeed(Response.stream(
@@ -824,7 +848,9 @@ function makeStreamEncoder(endpoint: HttpApiEndpoint.AnyWithProps): StreamEncode
 
   return (response, context) => {
     if (!Stream.isStream(response)) {
-      return hasBuffered ? undefined : expectedStreamResponse(response)
+      return hasBuffered ? undefined : new Schema.SchemaError(
+        new SchemaIssue.InvalidValue(Option.some(response), { message: "Expected a streaming response" })
+      )
     }
 
     return Effect.succeed(Response.stream(
@@ -852,16 +878,6 @@ function hasBufferedSuccess(endpoint: HttpApiEndpoint.AnyWithProps): boolean {
   return endpoint.success.size === 0
 }
 
-function expectedStreamResponse(response: unknown) {
-  return Effect.fail(
-    makeSchemaError(
-      new SchemaIssue.InvalidValue(Option.some(response), {
-        message: "Expected a streaming response"
-      })
-    )
-  )
-}
-
 interface SseStreamEncoder {
   readonly sseMode: HttpApiSchema.StreamSseMode
   readonly encodeEvents: (
@@ -922,10 +938,6 @@ function renderSseEvent(event: Sse.EventEncoded) {
   })
 }
 
-function makeSchemaError(issue: SchemaIssue.Issue): Schema.SchemaError {
-  return new Schema.SchemaError(issue)
-}
-
 const toResponseSuccessSchema = toResponseSchema(HttpApiSchema.getStatusSuccess)
 const toResponseErrorSchema = toResponseSchema(HttpApiSchema.getStatusError)