@effect-app/infra 0.198.1 → 0.199.0

package/_cjs/services/Store/utils.cjs

@@ -12,16 +12,12 @@ exports.lowerThan = lowerThan;
 exports.lowerThanExclusive = lowerThanExclusive;
 exports.lowercaseIfString = lowercaseIfString;
 exports.makeUpdateETag = exports.makeETag = void 0;
-var tsplus_module_1 = _interopRequireWildcard(require("effect-app/_ext/misc"));
-var tsplus_module_2 = _interopRequireWildcard(require("effect/Option"));
-var tsplus_module_3 = _interopRequireWildcard(require("effect/Effect"));
+var _effectApp = require("effect-app");
 var _utils = require("effect-app/utils");
-var _errors = require("../../errors.cjs");
 var _objectHash = _interopRequireDefault(require("object-hash"));
+var _errors = require("../../errors.cjs");
 var _codeFilter = require("./codeFilter.cjs");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 const makeETag = ({
   _etag,
   ...e
@@ -30,16 +26,16 @@ const makeETag = ({
   _etag: (0, _objectHash.default)(e)
 });
 exports.makeETag = makeETag;
-const makeUpdateETag = type => (e, current) => tsplus_module_3.gen(function* ($) {
+const makeUpdateETag = type => (e, current) => _effectApp.Effect.gen(function* ($) {
   if (e._etag) {
-    yield* $(tsplus_module_1.encaseMaybeInEffect_(current, () => new _errors.OptimisticConcurrencyException({
+    yield* $(_effectApp.Effect.mapError(current, () => new _errors.OptimisticConcurrencyException({
       type,
       id: e.id,
       current: "",
       found: e._etag
     })));
   }
-  if (tsplus_module_2.isSome(current) && current.value._etag !== e._etag) {
+  if (_effectApp.Option.isSome(current) && current.value._etag !== e._etag) {
     return yield* $(new _errors.OptimisticConcurrencyException({
       type,
       id: current.value.id,
@@ -52,18 +48,18 @@ const makeUpdateETag = type => (e, current) => tsplus_module_3.gen(function* ($)
 });
 exports.makeUpdateETag = makeUpdateETag;
 function codeFilter(filter) {
-  return x => filter.type === "new-kid" ? (0, _codeFilter.codeFilter3_)(filter.build(), x) ? tsplus_module_2.some(x) : tsplus_module_2.none() : filter.type === "startsWith"
+  return x => filter.type === "new-kid" ? (0, _codeFilter.codeFilter3_)(filter.build(), x) ? _effectApp.Option.some(x) : _effectApp.Option.none() : filter.type === "startsWith"
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  ? lowercaseIfString(x[filter.by]).startsWith(filter.value.toLowerCase()) ? tsplus_module_2.some(x) : tsplus_module_2.none() : filter.type === "endsWith"
+  ? lowercaseIfString(x[filter.by]).startsWith(filter.value.toLowerCase()) ? _effectApp.Option.some(x) : _effectApp.Option.none() : filter.type === "endsWith"
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  ? lowercaseIfString(x[filter.by]).endsWith(filter.value.toLowerCase()) ? tsplus_module_2.some(x) : tsplus_module_2.none() : filter.type === "contains"
+  ? lowercaseIfString(x[filter.by]).endsWith(filter.value.toLowerCase()) ? _effectApp.Option.some(x) : _effectApp.Option.none() : filter.type === "contains"
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   // eslint-disable-next-line @typescript-eslint/no-unsafe-call
-  ? lowercaseIfString(x[filter.by]).includes(filter.value.toLowerCase()) ? tsplus_module_2.some(x) : tsplus_module_2.none() : filter.type === "join_find" ? filter.keys.some(k => {
+  ? lowercaseIfString(x[filter.by]).includes(filter.value.toLowerCase()) ? _effectApp.Option.some(x) : _effectApp.Option.none() : filter.type === "join_find" ? filter.keys.some(k => {
     const value = (0, _utils.get)(x, k);
     // we mimic the behavior of cosmosdb; if the shape in db does not match what we're looking for, we imagine false hit
     return value && value.some(v => compare(v[filter.valueKey], filter.value));
-  }) ? tsplus_module_2.some(x) : tsplus_module_2.none()
+  }) ? _effectApp.Option.some(x) : _effectApp.Option.none()
   // TODO: support mixed or/and
   : filter.mode === "or" ? filter.where.some(p => {
     const k = (0, _utils.get)(x, p.key);
@@ -102,7 +98,7 @@ function codeFilter(filter) {
       case undefined:
         return compare(k, p.value);
     }
-  }) ? tsplus_module_2.some(x) : tsplus_module_2.none() : filter.where.every(p => {
+  }) ? _effectApp.Option.some(x) : _effectApp.Option.none() : filter.where.every(p => {
     const k = (0, _utils.get)(x, p.key);
     switch (p.t) {
       case "in":
@@ -143,18 +139,18 @@ function codeFilter(filter) {
         // TODO: or vs and
         .some(_ => compare((0, _utils.get)(_, p.key.split(".-1.")[1]), p.value)) : compare(k, p.value);
     }
-  }) ? tsplus_module_2.some(x) : tsplus_module_2.none();
+  }) ? _effectApp.Option.some(x) : _effectApp.Option.none();
 }
 function codeFilterJoinSelect(filter) {
-  return x => filter.keys.filterMap(k => {
+  return x => _effectApp.ReadonlyArray.filterMap(filter.keys, k => {
     const value = (0, _utils.get)(x, k);
     // we mimic the behavior of cosmosdb; if the shape in db does not match what we're looking for, we imagine false hit
-    return value ? tsplus_module_2.some(value.filterMap(v =>
+    return value ? _effectApp.Option.some(_effectApp.ReadonlyArray.filterMap(value, v =>
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    compare(v[filter.valueKey], filter.value) ? tsplus_module_2.some({
+    compare(v[filter.valueKey], filter.value) ? _effectApp.Option.some({
       ...v,
       _rootId: x.id
-    }) : tsplus_module_2.none())) : tsplus_module_2.none();
+    }) : _effectApp.Option.none())) : _effectApp.Option.none();
   }).flatMap(_ => _);
 }
 function lowercaseIfString(val) {

package/_cjs/services/Store/utils.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"utils.cjs","names":["_utils","require","_errors","_objectHash","_interopRequireDefault","_codeFilter","obj","__esModule","default","_getRequireWildcardCache","e","WeakMap","r","t","_interopRequireWildcard","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","makeETag","_etag","objectHash","exports","makeUpdateETag","type","current","tsplus_module_3","gen","$","tsplus_module_1","encaseMaybeInEffect_","OptimisticConcurrencyException","id","found","tsplus_module_2","isSome","value","newE","codeFilter","filter","x","codeFilter3_","build","some","none","lowercaseIfString","by","startsWith","toLowerCase","endsWith","includes","keys","k","v","compare","valueKey","mode","where","p","key","lowerThan","lowerThanExclusive","greaterThan","greaterThanExclusive","undefined","every","split","_","codeFilterJoinSelect","filterMap","_rootId","flatMap","val","valA","valB"],"sources":["../../../src/services/Store/utils.ts"],"sourcesContent":[null],"mappings":"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"}
+{"version":3,"file":"utils.cjs","names":["_effectApp","require","_utils","_objectHash","_interopRequireDefault","_errors","_codeFilter","obj","__esModule","default","makeETag","_etag","e","objectHash","exports","makeUpdateETag","type","current","Effect","gen","$","mapError","OptimisticConcurrencyException","id","found","Option","isSome","value","newE","codeFilter","filter","x","codeFilter3_","build","some","none","lowercaseIfString","by","startsWith","toLowerCase","endsWith","includes","keys","k","get","v","compare","valueKey","mode","where","p","key","t","lowerThan","lowerThanExclusive","greaterThan","greaterThanExclusive","undefined","every","split","_","codeFilterJoinSelect","ReadonlyArray","filterMap","_rootId","flatMap","val","valA","valB"],"sources":["../../../src/services/Store/utils.ts"],"sourcesContent":[null],"mappings":"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"}

package/_cjs/services/query.cjs

@@ -4,7 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.where = exports.query = exports.project = exports.page = exports.order = exports.or = exports.make = exports.and = exports.Where = exports.Project = exports.Page = exports.Order = exports.Or = exports.Initial = exports.And = void 0;
+var _Array = require("@effect-app/core/Array");
 var _effectApp = require("effect-app");
+/* eslint-disable @typescript-eslint/no-explicit-any */
+
 class Initial extends _effectApp.Data.TaggedClass("value") {
   _id;
   args;
@@ -157,7 +160,6 @@ const interpret = _ => {
       current
     }) => {
       upd(interpret(current));
-      console.log("missing order implementation");
     },
     page: v => {
       upd(interpret(v.current));
@@ -195,7 +197,7 @@ const query = (repo, q) => {
   return (0, _effectApp.pipe)(a.filter.length === 0 ? repo.utils.all : repo.utils.filter({
     limit: a.limit,
     skip: a.skip,
-    select: select.toNonEmpty.value ?? undefined,
+    select: _effectApp.Option.getOrUndefined((0, _Array.toNonEmptyArray)(select)),
     filter: a.filter.length ? {
       type: "new-kid",
       build: () => a.filter

package/_cjs/services/query.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"query.cjs","names":["_effectApp","require","Initial","Data","TaggedClass","_id","args","constructor","value","exports","Where","_id2","And","Or","Page","_id3","Order","Project","_id4","wh","operation","current","where","and","or","order","field","desc","direction","page","limit","skip","project","schema","make","interpret","_","values","a","undefined","upd","v","push","filter","pipe","Match","valueTags","t","path","op","length","result","console","log","query","repo","q","select","ast","S","AST","isTransform","from","isTypeLiteral","propertySignatures","map","name","utils","all","toNonEmpty","type","build","Effect","flatMap","Unify","unify","parseMany2","parseMany"],"sources":["../../src/services/query.ts"],"sourcesContent":[null],"mappings":"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"}
+{"version":3,"file":"query.cjs","names":["_Array","require","_effectApp","Initial","Data","TaggedClass","_id","args","constructor","value","exports","Where","_id2","And","Or","Page","_id3","Order","Project","_id4","wh","operation","current","where","and","or","order","field","desc","direction","page","limit","skip","project","schema","make","interpret","_","values","a","undefined","upd","v","push","filter","pipe","Match","valueTags","t","path","op","length","result","query","repo","q","select","ast","S","AST","isTransform","from","isTypeLiteral","propertySignatures","map","name","utils","all","Option","getOrUndefined","toNonEmptyArray","type","build","Effect","flatMap","Unify","unify","parseMany2","parseMany"],"sources":["../../src/services/query.ts"],"sourcesContent":[null],"mappings":"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"}

package/_cjs/test.arbs.cjs

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.generate = void 0;
+exports.generate = generate;
 exports.generateFromArbitrary = generateFromArbitrary;
 var _faker = require("@faker-js/faker");
 var _faker2 = require("effect-app/faker");
@@ -12,7 +12,6 @@ var fc = _fastCheck;
 var rand = _interopRequireWildcard(require("pure-rand"));
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
-const generate = exports.generate = generate_1;
 // Do not import to frontend
 
 const rnd = new _fastCheck.Random(rand.congruential32(5));
@@ -20,13 +19,13 @@ const rnd = new _fastCheck.Random(rand.congruential32(5));
 /**
  * @tsplus getter FastCheck generateRandom
  */
-function generate_1(arb) {
+function generate(arb) {
   return arb.generate(rnd, undefined);
 }
 /**
  * @tsplus getter effect/schema/Arbitrary generate
  */
 function generateFromArbitrary(arb) {
-  return generate_1(arb(fc));
+  return generate(arb(fc));
 }
 //# sourceMappingURL=test.arbs.cjs.map

package/_cjs/test.arbs.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"test.arbs.cjs","names":["_faker","require","_faker2","_fastCheck","_interopRequireWildcard","fc","rand","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","generate","exports","generate_1","rnd","Random","congruential32","setFaker","faker","arb","undefined","generateFromArbitrary"],"sources":["../src/test.arbs.ts"],"sourcesContent":[null],"mappings":";;;;;;;AAEA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,OAAA,GAAAD,OAAA;AAEA,IAAAE,UAAA,GAAAC,uBAAA,CAAAH,OAAA;AAAmC,IAAAI,EAAA,GAAAF,UAAA;AAEnC,IAAAG,IAAA,GAAAF,uBAAA,CAAAH,OAAA;AAAiC,SAAAM,yBAAAC,CAAA,6BAAAC,OAAA,mBAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,CAAA,WAAAA,CAAA,GAAAG,CAAA,GAAAD,CAAA,KAAAF,CAAA;AAAA,SAAAJ,wBAAAI,CAAA,EAAAE,CAAA,SAAAA,CAAA,IAAAF,CAAA,IAAAA,CAAA,CAAAI,UAAA,SAAAJ,CAAA,eAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,WAAAK,OAAA,EAAAL,CAAA,QAAAG,CAAA,GAAAJ,wBAAA,CAAAG,CAAA,OAAAC,CAAA,IAAAA,CAAA,CAAAG,GAAA,CAAAN,CAAA,UAAAG,CAAA,CAAAI,GAAA,CAAAP,CAAA,OAAAQ,CAAA,KAAAC,SAAA,UAAAC,CAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,CAAA,IAAAd,CAAA,oBAAAc,CAAA,IAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAjB,CAAA,EAAAc,CAAA,SAAAI,CAAA,GAAAR,CAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAb,CAAA,EAAAc,CAAA,UAAAI,CAAA,KAAAA,CAAA,CAAAX,GAAA,IAAAW,CAAA,CAAAC,GAAA,IAAAR,MAAA,CAAAC,cAAA,CAAAJ,CAAA,EAAAM,CAAA,EAAAI,CAAA,IAAAV,CAAA,CAAAM,CAAA,IAAAd,CAAA,CAAAc,CAAA,YAAAN,CAAA,CAAAH,OAAA,GAAAL,CAAA,EAAAG,CAAA,IAAAA,CAAA,CAAAgB,GAAA,CAAAnB,CAAA,EAAAQ,CAAA,GAAAA,CAAA;MASjBY,QAAQ,GAAAC,OAAA,CAAAD,QAAA,GAAAE,UAAA;AAhBxB;;AASA,MAAMC,GAAG,GAAG,IAAIC,iBAAM,CAAC1B,IAAI,CAAC2B,cAAc,CAAC,CAAC,CAAC,CAAC;AAE9C,IAAAC,gBAAQ,EAACC,YAAK,CAAC;AAEf;;;AAGA,SAAAL,WAA4BM,GAAoB;EAC9C,OAAOA,GAAG,CAACR,QAAQ,CAACG,GAAG,EAAEM,SAAS,CAAC;AACrC;AAEA;;;AAGM,SAAUC,qBAAqBA,CAAIF,GAAmB;EAC1D,OAAON,UAAA,CAASM,GAAG,CAAC/B,EAAE,CAAC,CAAC;AAC1B"}
+{"version":3,"file":"test.arbs.cjs","names":["_faker","require","_faker2","_fastCheck","_interopRequireWildcard","fc","rand","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","rnd","Random","congruential32","setFaker","faker","generate","arb","undefined","generateFromArbitrary"],"sources":["../src/test.arbs.ts"],"sourcesContent":[null],"mappings":";;;;;;;AAEA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,OAAA,GAAAD,OAAA;AAEA,IAAAE,UAAA,GAAAC,uBAAA,CAAAH,OAAA;AAAmC,IAAAI,EAAA,GAAAF,UAAA;AAEnC,IAAAG,IAAA,GAAAF,uBAAA,CAAAH,OAAA;AAAiC,SAAAM,yBAAAC,CAAA,6BAAAC,OAAA,mBAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,CAAA,WAAAA,CAAA,GAAAG,CAAA,GAAAD,CAAA,KAAAF,CAAA;AAAA,SAAAJ,wBAAAI,CAAA,EAAAE,CAAA,SAAAA,CAAA,IAAAF,CAAA,IAAAA,CAAA,CAAAI,UAAA,SAAAJ,CAAA,eAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,WAAAK,OAAA,EAAAL,CAAA,QAAAG,CAAA,GAAAJ,wBAAA,CAAAG,CAAA,OAAAC,CAAA,IAAAA,CAAA,CAAAG,GAAA,CAAAN,CAAA,UAAAG,CAAA,CAAAI,GAAA,CAAAP,CAAA,OAAAQ,CAAA,KAAAC,SAAA,UAAAC,CAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,CAAA,IAAAd,CAAA,oBAAAc,CAAA,IAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAjB,CAAA,EAAAc,CAAA,SAAAI,CAAA,GAAAR,CAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAb,CAAA,EAAAc,CAAA,UAAAI,CAAA,KAAAA,CAAA,CAAAX,GAAA,IAAAW,CAAA,CAAAC,GAAA,IAAAR,MAAA,CAAAC,cAAA,CAAAJ,CAAA,EAAAM,CAAA,EAAAI,CAAA,IAAAV,CAAA,CAAAM,CAAA,IAAAd,CAAA,CAAAc,CAAA,YAAAN,CAAA,CAAAH,OAAA,GAAAL,CAAA,EAAAG,CAAA,IAAAA,CAAA,CAAAgB,GAAA,CAAAnB,CAAA,EAAAQ,CAAA,GAAAA,CAAA;AAPjC;;AASA,MAAMY,GAAG,GAAG,IAAIC,iBAAM,CAACvB,IAAI,CAACwB,cAAc,CAAC,CAAC,CAAC,CAAC;AAE9C,IAAAC,gBAAQ,EAACC,YAAK,CAAC;AAEf;;;AAGM,SAAUC,QAAQA,CAAIC,GAAoB;EAC9C,OAAOA,GAAG,CAACD,QAAQ,CAACL,GAAG,EAAEO,SAAS,CAAC;AACrC;AAEA;;;AAGM,SAAUC,qBAAqBA,CAAIF,GAAmB;EAC1D,OAAOD,QAAQ,CAACC,GAAG,CAAC7B,EAAE,CAAC,CAAC;AAC1B"}

package/dist/RequestContext.d.ts

@@ -1,8 +1,8 @@
-import { TaggedClass, NonEmptyString255, struct, literal } from "effect-app/schema";
+import { NonEmptyString255 } from "@effect-app/schema";
 import { S } from "effect-app";
 declare const RequestContextParent_base: S.EnhancedClass<{
     readonly _tag: "RequestContext";
-    readonly id: S.NonEmptyString255;
+    readonly id: NonEmptyString255;
     readonly name: string & S.NonEmptyString255Brand;
     readonly locale: "en" | "de";
     readonly createdAt: Date;
@@ -19,7 +19,7 @@ declare const RequestContextParent_base: S.EnhancedClass<{
         readonly sub: string;
     } | undefined;
 }, never, {
-    readonly id: S.NonEmptyString255;
+    readonly id: NonEmptyString255;
     readonly name: string & S.NonEmptyString255Brand;
     readonly locale: "en" | "de";
     readonly userProfile?: {
@@ -27,12 +27,12 @@ declare const RequestContextParent_base: S.EnhancedClass<{
     } | undefined;
     readonly createdAt?: Date;
 }, RequestContextParent, {
-    id: S.WithDefaults<S.Schema<S.NonEmptyString255, string, never> & {
-        make: () => S.NonEmptyString255;
-        withDefault: S.Schema<S.NonEmptyString255, string, never> & S.ConstructorPropertyDescriptor<S.NonEmptyString255, string, never>;
-    }> & S.Schema<S.NonEmptyString255, string, never> & {
-        make: () => S.NonEmptyString255;
-        withDefault: S.Schema<S.NonEmptyString255, string, never> & S.ConstructorPropertyDescriptor<S.NonEmptyString255, string, never>;
+    id: S.WithDefaults<S.Schema<NonEmptyString255, string, never> & {
+        make: () => NonEmptyString255;
+        withDefault: S.Schema<NonEmptyString255, string, never> & S.ConstructorPropertyDescriptor<NonEmptyString255, string, never>;
+    }> & S.Schema<NonEmptyString255, string, never> & {
+        make: () => NonEmptyString255;
+        withDefault: S.Schema<NonEmptyString255, string, never> & S.ConstructorPropertyDescriptor<NonEmptyString255, string, never>;
     };
     name: S.WithDefaults<S.Schema<string & S.NonEmptyString255Brand, string, never>> & S.Schema<string & S.NonEmptyString255Brand, string, never>;
     userProfile: S.PropertySignature<{
@@ -49,11 +49,11 @@ export declare class RequestContextParent extends RequestContextParent_base {
 }
 declare const RequestContext_base: S.EnhancedClass<{
     readonly _tag: "RequestContext";
-    readonly id: S.NonEmptyString255;
+    readonly id: NonEmptyString255;
     readonly name: string & S.NonEmptyString255Brand;
     readonly locale: "en" | "de";
     readonly createdAt: Date;
-    readonly rootId: S.NonEmptyString255;
+    readonly rootId: NonEmptyString255;
     readonly userProfile?: {
         readonly sub: string & import("effect-app/ids").UserProfileIdBrand;
     } | undefined;
@@ -83,22 +83,22 @@ declare const RequestContext_base: S.EnhancedClass<{
 }, never, {
     readonly name: string & S.NonEmptyString255Brand;
     readonly locale: "en" | "de";
-    readonly rootId: S.NonEmptyString255;
+    readonly rootId: NonEmptyString255;
     readonly userProfile?: {
         readonly sub: string & import("effect-app/ids").UserProfileIdBrand;
     } | undefined;
     readonly parent?: RequestContextParent | undefined;
     readonly namespace?: (string & S.NonEmptyString255Brand) | undefined;
-    readonly id?: S.NonEmptyString255;
+    readonly id?: NonEmptyString255;
     readonly createdAt?: Date;
 }, RequestContext, {
-    id: S.Schema<S.NonEmptyString255, string, never> & S.ConstructorPropertyDescriptor<S.NonEmptyString255, string, never>;
-    rootId: S.WithDefaults<S.Schema<S.NonEmptyString255, string, never> & {
-        make: () => S.NonEmptyString255;
-        withDefault: S.Schema<S.NonEmptyString255, string, never> & S.ConstructorPropertyDescriptor<S.NonEmptyString255, string, never>;
-    }> & S.Schema<S.NonEmptyString255, string, never> & {
-        make: () => S.NonEmptyString255;
-        withDefault: S.Schema<S.NonEmptyString255, string, never> & S.ConstructorPropertyDescriptor<S.NonEmptyString255, string, never>;
+    id: S.Schema<NonEmptyString255, string, never> & S.ConstructorPropertyDescriptor<NonEmptyString255, string, never>;
+    rootId: S.WithDefaults<S.Schema<NonEmptyString255, string, never> & {
+        make: () => NonEmptyString255;
+        withDefault: S.Schema<NonEmptyString255, string, never> & S.ConstructorPropertyDescriptor<NonEmptyString255, string, never>;
+    }> & S.Schema<NonEmptyString255, string, never> & {
+        make: () => NonEmptyString255;
+        withDefault: S.Schema<NonEmptyString255, string, never> & S.ConstructorPropertyDescriptor<NonEmptyString255, string, never>;
     };
     parent: S.PropertySignature<{
         readonly _tag: "RequestContext";

package/dist/RequestContext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RequestContext.d.ts","sourceRoot":"","sources":["../src/RequestContext.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,YAAY,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAG9B,qBAAa,oBAAqB,SAAQ,yBAQxC;CAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEL;;;GAGG;AACH,qBAAa,cAAe,SAAQ,mBAclC;IAEA,MAAM,CAAC,OAAO,CACZ,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,qBAAqB,CAAC,OAAO,oBAAoB,CAAC,CAAC,CAAC,CAAC;IAUhE,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc;;;;;;CASrD"}
+{"version":3,"file":"RequestContext.d.ts","sourceRoot":"","sources":["../src/RequestContext.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,iBAAiB,EAAuB,MAAM,oBAAoB,CAAA;AACpF,OAAO,EAAE,CAAC,EAAE,MAAM,YAAY,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAG9B,qBAAa,oBAAqB,SAAQ,yBAQxC;CAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEL;;;GAGG;AACH,qBAAa,cAAe,SAAQ,mBAclC;IAEA,MAAM,CAAC,OAAO,CACZ,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,qBAAqB,CAAC,OAAO,oBAAoB,CAAC,CAAC,CAAC,CAAC;IAUhE,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc;;;;;;CASrD"}

package/dist/RequestContext.js

@@ -1,11 +1,11 @@
-import * as tsplus_module_1 from "effect-app/schema";
+import { literal, NonEmptyString255, struct, TaggedClass } from "@effect-app/schema";
 import { S } from "effect-app";
 import { RequestId, UserProfileId } from "effect-app/ids";
-export class RequestContextParent extends tsplus_module_1.TaggedClass()("RequestContext", {
+export class RequestContextParent extends TaggedClass()("RequestContext", {
     id: RequestId,
-    name: tsplus_module_1.NonEmptyString255,
-    userProfile: S.optional(tsplus_module_1.struct({ sub: UserProfileId })),
-    locale: tsplus_module_1.literal("en", "de"),
+    name: NonEmptyString255,
+    userProfile: S.optional(struct({ sub: UserProfileId })),
+    locale: literal("en", "de"),
     createdAt: S.Date.withDefault
 }) {
 }
@@ -13,12 +13,12 @@ export class RequestContextParent extends tsplus_module_1.TaggedClass()("Request
  * @tsplus type RequestContext
  * @tsplus companion RequestContext.Ops
  */
-export class RequestContext extends tsplus_module_1.TaggedClass()("RequestContext", {
+export class RequestContext extends TaggedClass()("RequestContext", {
     ...RequestContextParent.omit("id"),
     id: RequestId.withDefault,
     rootId: RequestId,
     parent: S.optional(RequestContextParent),
-    namespace: S.optional(tsplus_module_1.NonEmptyString255)
+    namespace: S.optional(NonEmptyString255)
     // ...RequestContextParent.omit("id").extend({
     //   id: RequestId.withDefault,
     //   rootId: RequestId,
@@ -45,4 +45,11 @@ export class RequestContext extends tsplus_module_1.TaggedClass()("RequestContex
         };
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVxdWVzdENvbnRleHQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvUmVxdWVzdENvbnRleHQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLE9BQU8sRUFBRSxDQUFDLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFDOUIsT0FBTyxFQUFFLFNBQVMsRUFBRSxhQUFhLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQTtBQUV6RCxNQUFNLE9BQU8sb0JBQXFCLFNBQVEsZ0JBQUEsV0FBVyxFQUVsRCxDQUFDLGdCQUFnQixFQUFFO0lBQ3BCLEVBQUUsRUFBRSxTQUFTO0lBQ2IsSUFBSSxrQkFBRSxpQkFBaUI7SUFDdkIsV0FBVyxFQUFFLENBQUMsQ0FBQyxRQUFRLENBQUMsZ0JBQUEsTUFBTSxDQUFDLEVBQUUsR0FBRyxFQUFFLGFBQWEsRUFBRSxDQUFDLENBQUM7SUFDdkQsTUFBTSxFQUFFLGdCQUFBLE9BQU8sQ0FBQyxJQUFJLEVBQUUsSUFBSSxDQUFDO0lBQzNCLFNBQVMsRUFBRSxDQUFDLENBQUMsSUFBSSxDQUFDLFdBQVc7Q0FDOUIsQ0FBQztDQUFHO0FBRUw7OztHQUdHO0FBQ0gsTUFBTSxPQUFPLGNBQWUsU0FBUSxnQkFBQSxXQUFXLEVBRTVDLENBQUMsZ0JBQWdCLEVBQUU7SUFDcEIsR0FBRyxvQkFBb0IsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDO0lBQ2xDLEVBQUUsRUFBRSxTQUFTLENBQUMsV0FBVztJQUN6QixNQUFNLEVBQUUsU0FBUztJQUNqQixNQUFNLEVBQUUsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxvQkFBb0IsQ0FBQztJQUN4QyxTQUFTLEVBQUUsQ0FBQyxDQUFDLFFBQVEsaUJBQUMsaUJBQWlCLENBQUM7SUFDeEMsOENBQThDO0lBQzlDLCtCQUErQjtJQUMvQix1QkFBdUI7SUFDdkIsNkNBQTZDO0lBQzdDLDRDQUE0QztJQUM1QyxLQUFLO0NBQ04sQ0FBQztJQUNBLDZDQUE2QztJQUM3QyxNQUFNLENBQUMsT0FBTyxDQUVaLE1BQXNCLEVBQ3RCLE9BQThEO1FBRTlELE9BQU8sSUFBSSxjQUFjLENBQUM7WUFDeEIsU0FBUyxFQUFFLE1BQU0sRUFBRSxTQUFTO1lBQzVCLEdBQUcsT0FBTztZQUNWLE1BQU0sRUFBRSxNQUFNLENBQUMsTUFBTTtZQUNyQixNQUFNO1NBQ1AsQ0FBQyxDQUFBO0lBQ0osQ0FBQztJQUVELE1BQU0sQ0FBQyxZQUFZLENBQWEsSUFBb0I7UUFDbEQsT0FBTztZQUNMLGFBQWEsRUFBRSxJQUFJLENBQUMsSUFBSTtZQUN4QixNQUFNLEVBQUUsSUFBSSxDQUFDLE1BQU07WUFDbkIsR0FBRyxDQUFDLElBQUksQ0FBQyxNQUFNO2dCQUNiLENBQUMsQ0FBQyxFQUFFLG1CQUFtQixFQUFFLElBQUksQ0FBQyxNQUFNLENBQUMsSUFBSSxFQUFFLFlBQVksRUFBRSxJQUFJLENBQUMsTUFBTSxDQUFDLE1BQU0sRUFBRTtnQkFDN0UsQ0FBQyxDQUFDLEVBQUUsQ0FBQztTQUNSLENBQUE7SUFDSCxDQUFDO0NBQ0YifQ==
+// codegen:start {preset: model}
+//
+/* eslint-disable */
+/* eslint-enable */
+//
+// codegen:end
+//
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVxdWVzdENvbnRleHQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvUmVxdWVzdENvbnRleHQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLEVBQUUsV0FBVyxFQUFFLE1BQU0sb0JBQW9CLENBQUE7QUFDcEYsT0FBTyxFQUFFLENBQUMsRUFBRSxNQUFNLFlBQVksQ0FBQTtBQUM5QixPQUFPLEVBQUUsU0FBUyxFQUFFLGFBQWEsRUFBRSxNQUFNLGdCQUFnQixDQUFBO0FBRXpELE1BQU0sT0FBTyxvQkFBcUIsU0FBUSxXQUFXLEVBRWxELENBQUMsZ0JBQWdCLEVBQUU7SUFDcEIsRUFBRSxFQUFFLFNBQVM7SUFDYixJQUFJLEVBQUUsaUJBQWlCO0lBQ3ZCLFdBQVcsRUFBRSxDQUFDLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxFQUFFLEdBQUcsRUFBRSxhQUFhLEVBQUUsQ0FBQyxDQUFDO0lBQ3ZELE1BQU0sRUFBRSxPQUFPLENBQUMsSUFBSSxFQUFFLElBQUksQ0FBQztJQUMzQixTQUFTLEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FBQyxXQUFXO0NBQzlCLENBQUM7Q0FBRztBQUVMOzs7R0FHRztBQUNILE1BQU0sT0FBTyxjQUFlLFNBQVEsV0FBVyxFQUU1QyxDQUFDLGdCQUFnQixFQUFFO0lBQ3BCLEdBQUcsb0JBQW9CLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQztJQUNsQyxFQUFFLEVBQUUsU0FBUyxDQUFDLFdBQVc7SUFDekIsTUFBTSxFQUFFLFNBQVM7SUFDakIsTUFBTSxFQUFFLENBQUMsQ0FBQyxRQUFRLENBQUMsb0JBQW9CLENBQUM7SUFDeEMsU0FBUyxFQUFFLENBQUMsQ0FBQyxRQUFRLENBQUMsaUJBQWlCLENBQUM7SUFDeEMsOENBQThDO0lBQzlDLCtCQUErQjtJQUMvQix1QkFBdUI7SUFDdkIsNkNBQTZDO0lBQzdDLDRDQUE0QztJQUM1QyxLQUFLO0NBQ04sQ0FBQztJQUNBLDZDQUE2QztJQUM3QyxNQUFNLENBQUMsT0FBTyxDQUVaLE1BQXNCLEVBQ3RCLE9BQThEO1FBRTlELE9BQU8sSUFBSSxjQUFjLENBQUM7WUFDeEIsU0FBUyxFQUFFLE1BQU0sRUFBRSxTQUFTO1lBQzVCLEdBQUcsT0FBTztZQUNWLE1BQU0sRUFBRSxNQUFNLENBQUMsTUFBTTtZQUNyQixNQUFNO1NBQ1AsQ0FBQyxDQUFBO0lBQ0osQ0FBQztJQUVELE1BQU0sQ0FBQyxZQUFZLENBQWEsSUFBb0I7UUFDbEQsT0FBTztZQUNMLGFBQWEsRUFBRSxJQUFJLENBQUMsSUFBSTtZQUN4QixNQUFNLEVBQUUsSUFBSSxDQUFDLE1BQU07WUFDbkIsR0FBRyxDQUFDLElBQUksQ0FBQyxNQUFNO2dCQUNiLENBQUMsQ0FBQyxFQUFFLG1CQUFtQixFQUFFLElBQUksQ0FBQyxNQUFNLENBQUMsSUFBSSxFQUFFLFlBQVksRUFBRSxJQUFJLENBQUMsTUFBTSxDQUFDLE1BQU0sRUFBRTtnQkFDN0UsQ0FBQyxDQUFDLEVBQUUsQ0FBQztTQUNSLENBQUE7SUFDSCxDQUFDO0NBQ0Y7QUFFRCxnQ0FBZ0M7QUFDaEMsRUFBRTtBQUNGLG9CQUFvQjtBQUNwQixtQkFBbUI7QUFDbkIsRUFBRTtBQUNGLGNBQWM7QUFDZCxFQUFFIn0=

package/dist/_ext/Array.d.ts

@@ -1,3 +1,4 @@
+import { Effect } from "effect-app";
 import type { ObjectOps } from "effect-app/utils";
 import { NotFoundError } from "../errors.js";
 /**
@@ -6,14 +7,12 @@ import { NotFoundError } from "../errors.js";
  * @tsplus fluent ets/Set getFirstById
  * @tsplus fluent Array getFirstById
  * @tsplus fluent ReadonlyArray getFirstById
- * @tsplus location "@effect-app/infra/_ext/Array"
  */
 export declare function getFirstById<A extends {
     id: unknown;
-}, Type extends string>(a: Iterable<A>, id: A["id"], type: Type): import("effect/Effect").Effect<A, NotFoundError<Type>, never>;
+}, Type extends string>(a: Iterable<A>, id: A["id"], type: Type): Effect.Effect<A, NotFoundError<Type>, never>;
 /**
  * @tsplus fluent Object.Ops inspect
- * @tsplus location "@effect-app/infra/_ext/Array"
  */
 export declare function RecordInspect<TT extends object>(o: ObjectOps<TT>, showHidden?: boolean | undefined, depth?: number | null | undefined, color?: boolean | undefined): string;
 //# sourceMappingURL=Array.d.ts.map

package/dist/_ext/Array.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Array.d.ts","sourceRoot":"","sources":["../../src/_ext/Array.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAEjD,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;;;;;;;;;AAS5C,wBAAgB,YAAY,CAAC,CAAC,SAAS;IAAE,EAAE,EAAE,OAAO,CAAA;CAAE,EAAE,IAAI,SAAS,MAAM,EACzE,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,EACd,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,EACX,IAAI,EAAE,IAAI,iEAMX;;;;;AAKD,wBAAgB,aAAa,CAAC,EAAE,SAAS,MAAM,EAC7C,CAAC,EAAE,SAAS,CAAC,EAAE,CAAC,EAChB,UAAU,CAAC,EAAE,OAAO,GAAG,SAAS,EAChC,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EACjC,KAAK,CAAC,EAAE,OAAO,GAAG,SAAS,UAG5B"}
+{"version":3,"file":"Array.d.ts","sourceRoot":"","sources":["../../src/_ext/Array.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,MAAM,EAAS,MAAM,YAAY,CAAA;AACjD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAEjD,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AAE5C;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,CAAC,SAAS;IAAE,EAAE,EAAE,OAAO,CAAA;CAAE,EAAE,IAAI,SAAS,MAAM,EACzE,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,EACd,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,EACX,IAAI,EAAE,IAAI,gDAQX;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,EAAE,SAAS,MAAM,EAC7C,CAAC,EAAE,SAAS,CAAC,EAAE,CAAC,EAChB,UAAU,CAAC,EAAE,OAAO,GAAG,SAAS,EAChC,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EACjC,KAAK,CAAC,EAAE,OAAO,GAAG,SAAS,UAG5B"}

package/dist/_ext/Array.js

@@ -1,6 +1,4 @@
-import * as tsplus_module_1 from "effect/Equal";
-import * as tsplus_module_2 from "effect/Chunk";
-import * as tsplus_module_3 from "effect-app/_ext/misc";
+import { Chunk, Effect, Equal } from "effect-app";
 import { inspect } from "util";
 import { NotFoundError } from "../errors.js";
 /**
@@ -11,7 +9,9 @@ import { NotFoundError } from "../errors.js";
  * @tsplus fluent ReadonlyArray getFirstById
  */
 export function getFirstById(a, id, type) {
-    return tsplus_module_3.encaseMaybeInEffect_(tsplus_module_2.findFirst(tsplus_module_2.fromIterable(a), (_) => tsplus_module_1.equals(_.id, id)), () => new NotFoundError({ type, id }));
+    return Chunk
+        .fromIterable(a)
+        .pipe(Chunk.findFirst((_) => Equal.equals(_.id, id)), Effect.mapError(() => new NotFoundError({ type, id })));
 }
 /**
  * @tsplus fluent Object.Ops inspect
@@ -19,4 +19,4 @@ export function getFirstById(a, id, type) {
 export function RecordInspect(o, showHidden, depth, color) {
     return inspect(o.subject, showHidden, depth, color);
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQXJyYXkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvX2V4dC9BcnJheS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFDQSxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sTUFBTSxDQUFBO0FBQzlCLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxjQUFjLENBQUE7QUFFNUM7Ozs7OztHQU1HO0FBQ0gsTUFBTSxVQUFVLFlBQVksQ0FDMUIsQ0FBYyxFQUNkLEVBQVcsRUFDWCxJQUFVO0lBRVYsT0FBTyxxQ0FBQSwwQkFBQSw2QkFDUyxDQUFDLENBQUMsRUFDTCxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsdUJBQWEsQ0FBQyxDQUFDLEVBQUUsRUFBRSxFQUFFLENBQUMsQ0FBQyxFQUN6QixHQUFHLEVBQUUsQ0FBQyxJQUFJLGFBQWEsQ0FBTyxFQUFFLElBQUksRUFBRSxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUE7QUFDaEUsQ0FBQztBQUVEOztHQUVHO0FBQ0gsTUFBTSxVQUFVLGFBQWEsQ0FDM0IsQ0FBZ0IsRUFDaEIsVUFBZ0MsRUFDaEMsS0FBaUMsRUFDakMsS0FBMkI7SUFFM0IsT0FBTyxPQUFPLENBQUMsQ0FBQyxDQUFDLE9BQU8sRUFBRSxVQUFVLEVBQUUsS0FBSyxFQUFFLEtBQUssQ0FBQyxDQUFBO0FBQ3JELENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQXJyYXkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvX2V4dC9BcnJheS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsS0FBSyxFQUFFLE1BQU0sRUFBRSxLQUFLLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFFakQsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLE1BQU0sQ0FBQTtBQUM5QixPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sY0FBYyxDQUFBO0FBRTVDOzs7Ozs7R0FNRztBQUNILE1BQU0sVUFBVSxZQUFZLENBQzFCLENBQWMsRUFDZCxFQUFXLEVBQ1gsSUFBVTtJQUVWLE9BQU8sS0FBSztTQUNULFlBQVksQ0FBQyxDQUFDLENBQUM7U0FDZixJQUFJLENBQ0gsS0FBSyxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsS0FBSyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLEVBQUUsQ0FBQyxDQUFDLEVBQzlDLE1BQU0sQ0FBQyxRQUFRLENBQUMsR0FBRyxFQUFFLENBQUMsSUFBSSxhQUFhLENBQU8sRUFBRSxJQUFJLEVBQUUsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUM3RCxDQUFBO0FBQ0wsQ0FBQztBQUVEOztHQUVHO0FBQ0gsTUFBTSxVQUFVLGFBQWEsQ0FDM0IsQ0FBZ0IsRUFDaEIsVUFBZ0MsRUFDaEMsS0FBaUMsRUFDakMsS0FBMkI7SUFFM0IsT0FBTyxPQUFPLENBQUMsQ0FBQyxDQUFDLE9BQU8sRUFBRSxVQUFVLEVBQUUsS0FBSyxFQUFFLEtBQUssQ0FBQyxDQUFBO0FBQ3JELENBQUMifQ==

package/dist/api/reportError.d.ts

@@ -1,22 +1,22 @@
-import { Effect } from "effect/Effect";
+import { Effect } from "effect-app";
 /**
  * Forks the effect into a new fiber attached to the global scope. Because the
  * new fiber is attached to the global scope, when the fiber executing the
  * returned effect terminates, the forked fiber will continue running.
  *
  * Reports errors.
+ *
  * @tsplus getter effect/io/Effect forkDaemonReportRequest
- * @tsplus location "@effect-app/infra/api/reportError"
  */
-export declare function forkDaemonReportRequest<R, E, A>(self: Effect<A, E, R>): import("effect/Effect").Effect<import("effect/Fiber").RuntimeFiber<A, E>, never, R>;
+export declare function forkDaemonReportRequest<R, E, A>(self: Effect<A, E, R>): Effect.Effect<import("effect/Fiber").RuntimeFiber<A, E>, never, R>;
 /**
  * Forks the effect into a new fiber attached to the global scope. Because the
  * new fiber is attached to the global scope, when the fiber executing the
  * returned effect terminates, the forked fiber will continue running.
  *
  * Reports errors.
+ *
  * @tsplus getter effect/io/Effect forkDaemonReportRequestUnexpected
- * @tsplus location "@effect-app/infra/api/reportError"
  */
-export declare function forkDaemonReportRequestUnexpected<R, E, A>(self: Effect<A, E, R>): import("effect/Effect").Effect<import("effect/Fiber").RuntimeFiber<A, E>, never, R>;
+export declare function forkDaemonReportRequestUnexpected<R, E, A>(self: Effect<A, E, R>): Effect.Effect<import("effect/Fiber").RuntimeFiber<A, E>, never, R>;
 //# sourceMappingURL=reportError.d.ts.map

package/dist/api/reportError.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reportError.d.ts","sourceRoot":"","sources":["../../src/api/reportError.ts"],"names":[],"mappings":";;;;;;;;;;AAWA,wBAAgB,uBAAuB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,uFAKrE;;;;;;;;;;AAWD,wBAAgB,iCAAiC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,uFAS/E"}
+{"version":3,"file":"reportError.d.ts","sourceRoot":"","sources":["../../src/api/reportError.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,MAAM,EAAE,MAAM,YAAY,CAAA;AAG1C;;;;;;;;GAQG;AACH,wBAAgB,uBAAuB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,sEAMrE;AAED;;;;;;;;GAQG;AACH,wBAAgB,iCAAiC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,sEAW/E"}

package/dist/api/reportError.js

@@ -1,5 +1,4 @@
-import * as tsplus_module_1 from "effect/Effect";
-import * as tsplus_module_2 from "effect/Cause";
+import { Cause, Effect } from "effect-app";
 import { logError, reportError } from "../errorReporter.js";
 /**
  * Forks the effect into a new fiber attached to the global scope. Because the
@@ -11,7 +10,7 @@ import { logError, reportError } from "../errorReporter.js";
  * @tsplus getter effect/io/Effect forkDaemonReportRequest
  */
 export function forkDaemonReportRequest(self) {
-    return tsplus_module_1.daemonChildren(tsplus_module_1.fork(tsplus_module_1.tapErrorCause(self, reportError("Request"))));
+    return self.pipe(Effect.tapErrorCause(reportError("Request")), Effect.fork, Effect.daemonChildren);
 }
 /**
  * Forks the effect into a new fiber attached to the global scope. Because the
@@ -23,8 +22,9 @@ export function forkDaemonReportRequest(self) {
  * @tsplus getter effect/io/Effect forkDaemonReportRequestUnexpected
  */
 export function forkDaemonReportRequestUnexpected(self) {
-    return tsplus_module_1.daemonChildren(tsplus_module_1.fork(tsplus_module_1.tapErrorCause(self, (cause) => tsplus_module_2.isInterruptedOnly(cause) || tsplus_module_2.isDie(cause)
+    return self
+        .pipe(Effect.tapErrorCause((cause) => Cause.isInterruptedOnly(cause) || Cause.isDie(cause)
         ? reportError("request")(cause)
-        : logError("request")(cause))));
+        : logError("request")(cause)), Effect.fork, Effect.daemonChildren);
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVwb3J0RXJyb3IuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYXBpL3JlcG9ydEVycm9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsT0FBTyxFQUFFLFFBQVEsRUFBRSxXQUFXLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQTtBQUUzRDs7Ozs7Ozs7R0FRRztBQUNILE1BQU0sVUFBVSx1QkFBdUIsQ0FBVSxJQUFxQjtJQUNwRSwyREFBTyw4QkFBQSxJQUFJLEVBQ00sV0FBVyxDQUFDLFNBQVMsQ0FBQyxDQUFDLEdBRXZCO0FBQ25CLENBQUM7QUFFRDs7Ozs7Ozs7R0FRRztBQUNILE1BQU0sVUFBVSxpQ0FBaUMsQ0FBVSxJQUFxQjtJQUM5RSwyREFBTyw4QkFBQSxJQUFJLEVBQ00sQ0FBQyxLQUFLLEVBQUUsRUFBRSxDQUN2QixrQ0FBQSxLQUFLLENBQW9CLElBQUksc0JBQUEsS0FBSyxDQUFRO1FBQ3hDLENBQUMsQ0FBQyxXQUFXLENBQUMsU0FBUyxDQUFDLENBQUMsS0FBSyxDQUFDO1FBQy9CLENBQUMsQ0FBQyxRQUFRLENBQUMsU0FBUyxDQUFDLENBQUMsS0FBSyxDQUFDLENBQy9CLEdBRWM7QUFDbkIsQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVwb3J0RXJyb3IuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYXBpL3JlcG9ydEVycm9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sWUFBWSxDQUFBO0FBQzFDLE9BQU8sRUFBRSxRQUFRLEVBQUUsV0FBVyxFQUFFLE1BQU0scUJBQXFCLENBQUE7QUFFM0Q7Ozs7Ozs7O0dBUUc7QUFDSCxNQUFNLFVBQVUsdUJBQXVCLENBQVUsSUFBcUI7SUFDcEUsT0FBTyxJQUFJLENBQUMsSUFBSSxDQUNkLE1BQU0sQ0FBQyxhQUFhLENBQUMsV0FBVyxDQUFDLFNBQVMsQ0FBQyxDQUFDLEVBQzVDLE1BQU0sQ0FBQyxJQUFJLEVBQ1gsTUFBTSxDQUFDLGNBQWMsQ0FDdEIsQ0FBQTtBQUNILENBQUM7QUFFRDs7Ozs7Ozs7R0FRRztBQUNILE1BQU0sVUFBVSxpQ0FBaUMsQ0FBVSxJQUFxQjtJQUM5RSxPQUFPLElBQUk7U0FDUixJQUFJLENBQ0gsTUFBTSxDQUFDLGFBQWEsQ0FBQyxDQUFDLEtBQUssRUFBRSxFQUFFLENBQzdCLEtBQUssQ0FBQyxpQkFBaUIsQ0FBQyxLQUFLLENBQUMsSUFBSSxLQUFLLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FBQztRQUNsRCxDQUFDLENBQUMsV0FBVyxDQUFDLFNBQVMsQ0FBQyxDQUFDLEtBQUssQ0FBQztRQUMvQixDQUFDLENBQUMsUUFBUSxDQUFDLFNBQVMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUMvQixFQUNELE1BQU0sQ0FBQyxJQUFJLEVBQ1gsTUFBTSxDQUFDLGNBQWMsQ0FDdEIsQ0FBQTtBQUNMLENBQUMifQ==

package/dist/api/routing/base.d.ts

@@ -1,14 +1,11 @@
-import { Effect } from "effect/Effect";
-import { Schema } from "effect-app/schema";
-import { Option } from "@effect-app/core/Option";
-import { Tag } from "effect/Context";
 import * as S from "effect-app/schema";
 import type { EnforceNonEmptyRecord } from "@effect-app/core/utils";
 import { ValidationError } from "@effect-app/infra/errors";
+import type { Context } from "effect-app";
+import { Effect, Option } from "effect-app";
+import type { HttpRouter, HttpServerError } from "effect-app/http";
 import type { REST, StructFields } from "effect-app/schema";
 import type { Simplify } from "effect/Types";
-import type express from "express";
-import type { HttpRequestError, HttpRoute } from "../http.js";
 export type Flatten<T extends object> = object extends T ? object : {
     [K in keyof T]-?: (x: NonNullable<T[K]> extends infer V ? V extends object ? V extends readonly any[] ? Pick<T, K> : FlattenLVL1<V> extends infer FV ? ({
         [P in keyof FV as `${Extract<K, string | number>}.${Extract<P, string | number>}`]: FV[P];
@@ -21,7 +18,7 @@ type FlattenLVL1<T extends object> = object extends T ? object : {
 } extends Record<keyof T, (y: infer O) => void> ? O extends unknown ? {
     [K in keyof O]: O[K];
 } : never : never;
-export type RouteMatch<R, M, PR = never> = Effect<HttpRoute<Exclude<Exclude<R, EnforceNonEmptyRecord<M>>, PR>, HttpRequestError>>;
+export type RouteMatch<R, M, PR = never> = Effect<HttpRouter.Route<Exclude<Exclude<R, EnforceNonEmptyRecord<M>>, PR>, HttpServerError.RequestError>>;
 export interface ReqHandler<Req, R, E, Res, ReqSchema extends S.Schema<any, any, any>, ResSchema extends S.Schema<any, any, any>, CTX = any, Context = any> {
     h: (r: Req, ctx: CTX) => Effect<Res, E, R>;
     Request: ReqSchema;
@@ -50,14 +47,13 @@ export declare function parseRequestParams<PathA extends StructFields, CookieA e
     headers: unknown;
     params: unknown;
     query: unknown;
-}) => import("effect/Effect").Effect<{
-    body: import("effect/Option").Option<Simplify<S.ToStruct<BodyA>>>;
-    cookie: import("effect/Option").Option<Simplify<S.ToStruct<CookieA>>>;
-    headers: import("effect/Option").Option<Simplify<S.ToStruct<HeaderA>>>;
-    path: import("effect/Option").Option<Simplify<S.ToStruct<PathA>>>;
-    query: import("effect/Option").Option<Simplify<S.ToStruct<QueryA>>>;
+}) => Effect.Effect<{
+    body: Option<Simplify<S.ToStruct<BodyA>>>;
+    cookie: Option<Simplify<S.ToStruct<CookieA>>>;
+    headers: Option<Simplify<S.ToStruct<HeaderA>>>;
+    path: Option<Simplify<S.ToStruct<PathA>>>;
+    query: Option<Simplify<S.ToStruct<QueryA>>>;
 }, ValidationError, never>;
-export declare function respondSuccess<ReqA, A, E>(encodeResponse: (req: ReqA) => Encode<A, E>): (req: ReqA, res: express.Response) => (a: A) => import("effect/Effect").Effect<void, never, never>;
 export declare function makeRequestParsers<R, M, PathA extends StructFields, CookieA extends StructFields, QueryA extends StructFields, BodyA extends StructFields, HeaderA extends StructFields, ReqA extends PathA & QueryA & BodyA, ResA extends StructFields, Errors, PPath extends `/${string}`, CTX, Context, Config>(Request: RequestHandler<R, M, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA, ResA, Errors, PPath, CTX, Context, Config>["Request"]): RequestParsers<PathA, CookieA, QueryA, BodyA, HeaderA>;
 type Decode<A> = (u: unknown) => Effect<A, unknown>;
 export interface RequestParsers<PathA extends StructFields, CookieA extends StructFields, QueryA extends StructFields, BodyA extends StructFields, HeaderA extends StructFields> {
@@ -78,7 +74,7 @@ export type Request<M, PathA extends StructFields, CookieA extends StructFields,
     Body?: BodyA;
     Query?: QueryA;
     Headers?: HeaderA;
-    Tag: Tag<M, M>;
+    Tag: Context.Tag<M, M>;
     ReqA?: ReqA;
 };
 export interface RequestHandlerBase<R, M, PathA extends StructFields, CookieA extends StructFields, QueryA extends StructFields, BodyA extends StructFields, HeaderA extends StructFields, ReqA extends PathA & QueryA & BodyA, ResA extends StructFields, ResE, PPath extends `/${string}`, Config> {