@effect-app/infra 0.133.0-next.26 → 0.133.0-next.29

package/CHANGELOG.md

@@ -1,5 +1,31 @@
 # @effect-app/infra
 
+## 0.133.0-next.29
+
+### Patch Changes
+
+- Updated dependencies [65696a6]
+  - @effect-app/prelude@0.107.0-next.27
+  - @effect-app/infra-adapters@0.85.0-next.27
+
+## 0.133.0-next.28
+
+### Patch Changes
+
+- 777162f: improve
+- Updated dependencies [777162f]
+  - @effect-app/prelude@0.107.0-next.26
+  - @effect-app/schema@0.150.0-next.20
+  - @effect-app/infra-adapters@0.85.0-next.26
+
+## 0.133.0-next.27
+
+### Patch Changes
+
+- Updated dependencies [0776693]
+  - @effect-app/prelude@0.107.0-next.25
+  - @effect-app/infra-adapters@0.85.0-next.25
+
 ## 0.133.0-next.26
 
 ### Patch Changes

package/_cjs/RequestContext.cjs

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.RequestContextParent = exports.RequestContext = void 0;
 var tsplus_module_1 = _interopRequireWildcard(require("@effect-app/schema"));
 var tsplus_module_2 = _interopRequireWildcard(require("@effect/schema/Schema"));
+var tsplus_module_3 = _interopRequireWildcard(require("@effect-app/prelude/utils"));
 var _prelude = require("@effect-app/prelude");
 var _ids = require("@effect-app/prelude/ids");
 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); }
@@ -18,17 +19,14 @@ var __decorate = void 0 && (void 0).__decorate || function (decorators, target,
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 var RequestContext_1;
-const fields = {
+let RequestContextParent = exports.RequestContextParent = class RequestContextParent extends tsplus_module_1.TaggedClass()("RequestContext", {
+  id: _ids.RequestId,
   name: tsplus_module_1.NonEmptyString255,
   userProfile: tsplus_module_2.optional(tsplus_module_1.struct({
     sub: _ids.UserProfileId
   })),
   locale: tsplus_module_1.literal("en", "de"),
   createdAt: tsplus_module_2.withDefaultConstructor(_prelude.S.Date, () => new Date()) // TODO
-};
-let RequestContextParent = exports.RequestContextParent = class RequestContextParent extends tsplus_module_1.TaggedClass()("RequestContext", {
-  id: _ids.RequestId,
-  ...fields
 }) {};
 exports.RequestContextParent = RequestContextParent = __decorate([tsplus_module_1.useClassFeaturesForSchema], RequestContextParent);
 /**
@@ -36,11 +34,11 @@ exports.RequestContextParent = RequestContextParent = __decorate([tsplus_module_
  * @tsplus companion RequestContext.Ops
  */
 let RequestContext = exports.RequestContext = RequestContext_1 = class RequestContext extends _prelude.S.TaggedClass()("RequestContext", {
+  ...tsplus_module_3.RecordOmitold(tsplus_module_3.object$(RequestContextParent.fields), "id"),
   id: _ids.RequestId.withDefault(),
   rootId: _ids.RequestId,
   parent: tsplus_module_2.optional(RequestContextParent),
-  namespace: tsplus_module_2.optional(tsplus_module_1.NonEmptyString255),
-  ...fields
+  namespace: tsplus_module_2.optional(tsplus_module_1.NonEmptyString255)
   // ...RequestContextParent.omit("id").extend({
   //   id: RequestId.withDefault(),
   //   rootId: RequestId,

package/_cjs/RequestContext.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"RequestContext.cjs","names":["_prelude","require","_ids","_getRequireWildcardCache","e","WeakMap","r","t","_interopRequireWildcard","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","fields","name","tsplus_module_1","NonEmptyString255","userProfile","tsplus_module_2","optional","struct","sub","UserProfileId","locale","literal","createdAt","withDefaultConstructor","S","Date","RequestContextParent","exports","TaggedClass","id","RequestId","__decorate","useClassFeaturesForSchema","RequestContext","RequestContext_1","withDefault","rootId","parent","namespace","inherit","newSelf","toMonitoring","self","operationName","parentOperationName","parentLocale","From","FromClass"],"sources":["../_src/RequestContext.ts"],"sourcesContent":[null],"mappings":"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"}
+{"version":3,"file":"RequestContext.cjs","names":["_prelude","require","_ids","_getRequireWildcardCache","e","WeakMap","r","t","_interopRequireWildcard","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","RequestContextParent","exports","tsplus_module_1","TaggedClass","id","RequestId","name","NonEmptyString255","userProfile","tsplus_module_2","optional","struct","sub","UserProfileId","locale","literal","createdAt","withDefaultConstructor","S","Date","__decorate","useClassFeaturesForSchema","RequestContext","RequestContext_1","tsplus_module_3","RecordOmitold","object$","fields","withDefault","rootId","parent","namespace","inherit","newSelf","toMonitoring","self","operationName","parentOperationName","parentLocale","From","FromClass"],"sources":["../_src/RequestContext.ts"],"sourcesContent":[null],"mappings":"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"}

package/_src/RequestContext.ts

@@ -1,19 +1,15 @@
 import { S } from "@effect-app/prelude"
 import { RequestId, UserProfileId } from "@effect-app/prelude/ids"
 
-const fields = {
-  name: NonEmptyString255,
-  userProfile: struct({ sub: UserProfileId }).optional(),
-  locale: literal("en", "de"),
-  createdAt: S.Date.withDefaultMake(() => new Date()) // TODO
-} as const
-
 @useClassFeaturesForSchema
 export class RequestContextParent extends TaggedClass<
   RequestContextParent
 >()("RequestContext", {
   id: RequestId,
-  ...fields
+  name: NonEmptyString255,
+  userProfile: struct({ sub: UserProfileId }).optional(),
+  locale: literal("en", "de"),
+  createdAt: S.Date.withDefaultMake(() => new Date()) // TODO
 }) {}
 
 /**
@@ -24,11 +20,11 @@ export class RequestContextParent extends TaggedClass<
 export class RequestContext extends S.TaggedClass<
   RequestContext
 >()("RequestContext", {
+  ...RequestContextParent.fields.$$.omit("id"),
   id: RequestId.withDefault(),
   rootId: RequestId,
   parent: RequestContextParent.optional(),
-  namespace: NonEmptyString255.optional(),
-  ...fields
+  namespace: NonEmptyString255.optional()
   // ...RequestContextParent.omit("id").extend({
   //   id: RequestId.withDefault(),
   //   rootId: RequestId,

package/dist/RequestContext.d.ts

@@ -1,4 +1,4 @@
-import { useClassFeaturesForSchema, TaggedClass, NonEmptyString255, FromClass } from "@effect-app/schema";
+import { useClassFeaturesForSchema, TaggedClass, NonEmptyString255, struct, literal, FromClass } from "@effect-app/schema";
 import { S } from "@effect-app/prelude";
 declare const RequestContextParent_base: S.Class<{
     readonly _tag: "RequestContext";
@@ -11,7 +11,7 @@ declare const RequestContextParent_base: S.Class<{
     } | undefined;
 }, {
     readonly _tag: "RequestContext";
-    readonly id: string & S.StringIdBrand;
+    readonly id: S.NonEmptyString255;
     readonly name: string & S.NonEmptyString255Brand;
     readonly locale: "en" | "de";
     readonly createdAt: Date;
@@ -24,34 +24,36 @@ declare const RequestContextParent_base: S.Class<{
     readonly userProfile?: {
         readonly sub: string & import("@effect-app/prelude/ids").UserProfileIdBrand;
     } | undefined;
-    readonly id?: string & S.StringIdBrand;
+    readonly id?: S.NonEmptyString255;
     readonly createdAt?: Date;
 }, RequestContextParent, {
+    id: S.WithDefaults<S.Schema<string, S.NonEmptyString255> & {
+        make: () => S.NonEmptyString255;
+        withDefault: () => S.Schema<string, S.NonEmptyString255> & S.ConstructorPropertyDescriptor<string, S.NonEmptyString255>;
+    }> & S.Schema<string, S.NonEmptyString255> & {
+        make: () => S.NonEmptyString255;
+        withDefault: () => S.Schema<string, S.NonEmptyString255> & S.ConstructorPropertyDescriptor<string, S.NonEmptyString255>;
+    };
     name: S.WithDefaults<S.Schema<string, string & S.NonEmptyString255Brand>> & S.Schema<string, string & S.NonEmptyString255Brand>;
     userProfile: S.PropertySignature<{
         readonly sub: string;
     } | undefined, true, {
         readonly sub: string & import("@effect-app/prelude/ids").UserProfileIdBrand;
     } | undefined, true>;
-    locale: S.Schema<"en" | "de", "en" | "de">;
-    createdAt: S.Schema<string, Date> & S.ConstructorPropertyDescriptor<string, Date>;
-    id: S.WithDefaults<S.Schema<string, string & S.StringIdBrand> & {
-        make: () => S.StringId;
-        withDefault: () => S.Schema<string, string & S.StringIdBrand> & S.ConstructorPropertyDescriptor<string, string & S.StringIdBrand>;
-    }> & S.Schema<string, string & S.StringIdBrand> & {
-        make: () => S.StringId;
-        withDefault: () => S.Schema<string, string & S.StringIdBrand> & S.ConstructorPropertyDescriptor<string, string & S.StringIdBrand>;
+    locale: S.Schema<"en" | "de", "en" | "de"> & {
+        literals: ["en", "de"];
     };
+    createdAt: S.Schema<string, Date> & S.ConstructorPropertyDescriptor<string, Date>;
 }, import("effect/Data").Case>;
 export declare class RequestContextParent extends RequestContextParent_base {
 }
 declare const RequestContext_base: S.Class<{
     readonly _tag: "RequestContext";
     readonly id: string;
-    readonly rootId: string;
     readonly name: string;
     readonly locale: "en" | "de";
     readonly createdAt: string;
+    readonly rootId: string;
     readonly userProfile?: {
         readonly sub: string;
     } | undefined;
@@ -68,11 +70,11 @@ declare const RequestContext_base: S.Class<{
     readonly namespace?: string | undefined;
 }, {
     readonly _tag: "RequestContext";
-    readonly id: string & S.StringIdBrand;
-    readonly rootId: string & S.StringIdBrand;
+    readonly id: S.NonEmptyString255;
     readonly name: string & S.NonEmptyString255Brand;
     readonly locale: "en" | "de";
     readonly createdAt: Date;
+    readonly rootId: S.NonEmptyString255;
     readonly userProfile?: {
         readonly sub: string & import("@effect-app/prelude/ids").UserProfileIdBrand;
     } | undefined;
@@ -86,25 +88,17 @@ declare const RequestContext_base: S.Class<{
     } | undefined;
     readonly parent?: RequestContextParent | undefined;
     readonly namespace?: (string & S.NonEmptyString255Brand) | undefined;
-    readonly id?: string & S.StringIdBrand;
-    readonly rootId?: string & S.StringIdBrand;
+    readonly id?: S.NonEmptyString255;
     readonly createdAt?: Date;
+    readonly rootId?: S.NonEmptyString255;
 }, RequestContext, {
-    name: S.WithDefaults<S.Schema<string, string & S.NonEmptyString255Brand>> & S.Schema<string, string & S.NonEmptyString255Brand>;
-    userProfile: S.PropertySignature<{
-        readonly sub: string;
-    } | undefined, true, {
-        readonly sub: string & import("@effect-app/prelude/ids").UserProfileIdBrand;
-    } | undefined, true>;
-    locale: S.Schema<"en" | "de", "en" | "de">;
-    createdAt: S.Schema<string, Date> & S.ConstructorPropertyDescriptor<string, Date>;
-    id: S.Schema<string, string & S.StringIdBrand> & S.ConstructorPropertyDescriptor<string, string & S.StringIdBrand>;
-    rootId: S.WithDefaults<S.Schema<string, string & S.StringIdBrand> & {
-        make: () => S.StringId;
-        withDefault: () => S.Schema<string, string & S.StringIdBrand> & S.ConstructorPropertyDescriptor<string, string & S.StringIdBrand>;
-    }> & S.Schema<string, string & S.StringIdBrand> & {
-        make: () => S.StringId;
-        withDefault: () => S.Schema<string, string & S.StringIdBrand> & S.ConstructorPropertyDescriptor<string, string & S.StringIdBrand>;
+    id: S.Schema<string, S.NonEmptyString255> & S.ConstructorPropertyDescriptor<string, S.NonEmptyString255>;
+    rootId: S.WithDefaults<S.Schema<string, S.NonEmptyString255> & {
+        make: () => S.NonEmptyString255;
+        withDefault: () => S.Schema<string, S.NonEmptyString255> & S.ConstructorPropertyDescriptor<string, S.NonEmptyString255>;
+    }> & S.Schema<string, S.NonEmptyString255> & {
+        make: () => S.NonEmptyString255;
+        withDefault: () => S.Schema<string, S.NonEmptyString255> & S.ConstructorPropertyDescriptor<string, S.NonEmptyString255>;
     };
     parent: S.PropertySignature<{
         readonly _tag: "RequestContext";
@@ -117,6 +111,16 @@ declare const RequestContext_base: S.Class<{
         } | undefined;
     } | undefined, true, RequestContextParent | undefined, true>;
     namespace: S.PropertySignature<string | undefined, true, (string & S.NonEmptyString255Brand) | undefined, true>;
+    name: S.WithDefaults<S.Schema<string, string & S.NonEmptyString255Brand>> & S.Schema<string, string & S.NonEmptyString255Brand>;
+    userProfile: S.PropertySignature<{
+        readonly sub: string;
+    } | undefined, true, {
+        readonly sub: string & import("@effect-app/prelude/ids").UserProfileIdBrand;
+    } | undefined, true>;
+    locale: S.Schema<"en" | "de", "en" | "de"> & {
+        literals: ["en", "de"];
+    };
+    createdAt: S.Schema<string, Date> & S.ConstructorPropertyDescriptor<string, Date>;
 }, import("effect/Data").Case>;
 /**
  * @tsplus type RequestContext
@@ -154,10 +158,10 @@ export declare namespace RequestContext {
     const From_base_1: S.FromClass<{
         readonly _tag: "RequestContext";
         readonly id: string;
-        readonly rootId: string;
         readonly name: string;
         readonly locale: "en" | "de";
         readonly createdAt: string;
+        readonly rootId: string;
         readonly userProfile?: {
             readonly sub: string;
         } | undefined;

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,qBAAqB,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAUvC,qBACa,oBAAqB,SAAQ,yBAKxC;CAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEL;;;GAGG;AACH,qBACa,cAAe,SAAQ,mBAclC;IACA,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;AAKD,yBAAiB,oBAAoB,CAAC;;;;;;;;;;;IACpC;;;OAGG;IACH,MAAM,OAAO,IAAK,SAAQ,SAAwC;KAAG;;CACtE;AACD,yBAAiB,cAAc,CAAC;;;;;;;;;;;;;;;;;;;;;;;IAC9B;;;OAGG;IACH,MAAM,OAAO,IAAK,SAAQ,WAAkC;KAAG;;CAChE"}
+{"version":3,"file":"RequestContext.d.ts","sourceRoot":"","sources":["../_src/RequestContext.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,qBAAqB,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGvC,qBACa,oBAAqB,SAAQ,yBAQxC;CAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEL;;;GAGG;AACH,qBACa,cAAe,SAAQ,mBAclC;IACA,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;AAKD,yBAAiB,oBAAoB,CAAC;;;;;;;;;;;IACpC;;;OAGG;IACH,MAAM,OAAO,IAAK,SAAQ,SAAwC;KAAG;;CACtE;AACD,yBAAiB,cAAc,CAAC;;;;;;;;;;;;;;;;;;;;;;;IAC9B;;;OAGG;IACH,MAAM,OAAO,IAAK,SAAQ,WAAkC;KAAG;;CAChE"}

package/dist/RequestContext.js

@@ -7,17 +7,15 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var RequestContext_1;
 import * as tsplus_module_1 from "@effect-app/schema";
 import * as tsplus_module_2 from "@effect/schema/Schema";
+import * as tsplus_module_3 from "@effect-app/prelude/utils";
 import { S } from "@effect-app/prelude";
 import { RequestId, UserProfileId } from "@effect-app/prelude/ids";
-const fields = {
+let RequestContextParent = class RequestContextParent extends tsplus_module_1.TaggedClass()("RequestContext", {
+    id: RequestId,
     name: tsplus_module_1.NonEmptyString255,
     userProfile: tsplus_module_2.optional(tsplus_module_1.struct({ sub: UserProfileId })),
     locale: tsplus_module_1.literal("en", "de"),
     createdAt: tsplus_module_2.withDefaultConstructor(S.Date, () => new Date()) // TODO
-};
-let RequestContextParent = class RequestContextParent extends tsplus_module_1.TaggedClass()("RequestContext", {
-    id: RequestId,
-    ...fields
 }) {
 };
 RequestContextParent = __decorate([
@@ -29,11 +27,11 @@ export { RequestContextParent };
  * @tsplus companion RequestContext.Ops
  */
 let RequestContext = RequestContext_1 = class RequestContext extends S.TaggedClass()("RequestContext", {
+    ...tsplus_module_3.RecordOmitold(tsplus_module_3.object$(RequestContextParent.fields), "id"),
     id: RequestId.withDefault(),
     rootId: RequestId,
     parent: tsplus_module_2.optional(RequestContextParent),
-    namespace: tsplus_module_2.optional(tsplus_module_1.NonEmptyString255),
-    ...fields
+    namespace: tsplus_module_2.optional(tsplus_module_1.NonEmptyString255)
     // ...RequestContextParent.omit("id").extend({
     //   id: RequestId.withDefault(),
     //   rootId: RequestId,
@@ -84,4 +82,4 @@ export { RequestContext };
     }
     RequestContext.From = From;
 })(RequestContext || (RequestContext = {}));
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVxdWVzdENvbnRleHQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9fc3JjL1JlcXVlc3RDb250ZXh0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7OztBQUFBLE9BQU8sRUFBRSxDQUFDLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQTtBQUN2QyxPQUFPLEVBQUUsU0FBUyxFQUFFLGFBQWEsRUFBRSxNQUFNLHlCQUF5QixDQUFBO0FBRWxFLE1BQU0sTUFBTSxHQUFHO0lBQ2IsSUFBSSxrQkFBRSxpQkFBaUI7SUFDdkIsV0FBVyxFQUFFLHlCQUFBLGdCQUFBLE1BQU0sQ0FBQyxFQUFFLEdBQUcsRUFBRSxhQUFhLEVBQUUsQ0FBQyxDQUFXO0lBQ3RELE1BQU0sRUFBRSxnQkFBQSxPQUFPLENBQUMsSUFBSSxFQUFFLElBQUksQ0FBQztJQUMzQixTQUFTLEVBQUUsdUNBQUEsQ0FBQyxDQUFDLElBQUksRUFBaUIsR0FBRyxFQUFFLENBQUMsSUFBSSxJQUFJLEVBQUUsQ0FBQyxDQUFDLE9BQU87Q0FDbkQsQ0FBQTtBQUdILElBQU0sb0JBQW9CLEdBQTFCLE1BQU0sb0JBQXFCLFNBQVEsZ0JBQUEsV0FBVyxFQUVsRCxDQUFDLGdCQUFnQixFQUFFO0lBQ3BCLEVBQUUsRUFBRSxTQUFTO0lBQ2IsR0FBRyxNQUFNO0NBQ1YsQ0FBQztDQUFHLENBQUE7QUFMUSxvQkFBb0I7b0JBRGhDLHlCQUF5QjtHQUNiLG9CQUFvQixDQUs1Qjs7QUFFTDs7O0dBR0c7QUFFSSxJQUFNLGNBQWMsc0JBQXBCLE1BQU0sY0FBZSxTQUFRLENBQUMsQ0FBQyxXQUFXLEVBRTlDLENBQUMsZ0JBQWdCLEVBQUU7SUFDcEIsRUFBRSxFQUFFLFNBQVMsQ0FBQyxXQUFXLEVBQUU7SUFDM0IsTUFBTSxFQUFFLFNBQVM7SUFDakIsTUFBTSxFQUFFLHlCQUFBLG9CQUFvQixDQUFXO0lBQ3ZDLFNBQVMsRUFBRSx5Q0FBQSxpQkFBaUIsQ0FBVztJQUN2QyxHQUFHLE1BQU07SUFDVCw4Q0FBOEM7SUFDOUMsaUNBQWlDO0lBQ2pDLHVCQUF1QjtJQUN2Qiw2Q0FBNkM7SUFDN0MsNENBQTRDO0lBQzVDLEtBQUs7Q0FDTixDQUFDO0lBQ0EsTUFBTSxDQUFDLE9BQU8sQ0FFWixNQUFzQixFQUN0QixPQUE4RDtRQUU5RCxPQUFPLElBQUksZ0JBQWMsQ0FBQztZQUN4QixTQUFTLEVBQUUsTUFBTSxFQUFFLFNBQVM7WUFDNUIsR0FBRyxPQUFPO1lBQ1YsTUFBTSxFQUFFLE1BQU0sQ0FBQyxNQUFNO1lBQ3JCLE1BQU07U0FDUCxDQUFDLENBQUE7SUFDSixDQUFDO0lBRUQsTUFBTSxDQUFDLFlBQVksQ0FBYSxJQUFvQjtRQUNsRCxPQUFPO1lBQ0wsYUFBYSxFQUFFLElBQUksQ0FBQyxJQUFJO1lBQ3hCLE1BQU0sRUFBRSxJQUFJLENBQUMsTUFBTTtZQUNuQixHQUFHLENBQUMsSUFBSSxDQUFDLE1BQU07Z0JBQ2IsQ0FBQyxDQUFDLEVBQUUsbUJBQW1CLEVBQUUsSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLEVBQUUsWUFBWSxFQUFFLElBQUksQ0FBQyxNQUFNLENBQUMsTUFBTSxFQUFFO2dCQUM3RSxDQUFDLENBQUMsRUFBRSxDQUFDO1NBQ1IsQ0FBQTtJQUNILENBQUM7Q0FDRixDQUFBO0FBckNZLGNBQWM7b0JBRDFCLHlCQUF5QjtHQUNiLGNBQWMsQ0FxQzFCOztBQUVELGdDQUFnQztBQUNoQyxFQUFFO0FBQ0Ysb0JBQW9CO0FBQ3BCLFdBQWlCLG9CQUFvQjtJQUNuQzs7O09BR0c7SUFDSCxNQUFhLElBQUssU0FBUSxnQkFBQSxTQUFTLEVBQStCO0tBQUc7SUFBeEQseUJBQUksT0FBb0QsQ0FBQTtBQUN2RSxDQUFDLEVBTmdCLG9CQUFvQixLQUFwQixvQkFBb0IsUUFNcEM7QUFDRCxXQUFpQixjQUFjO0lBQzdCOzs7T0FHRztJQUNILE1BQWEsSUFBSyxTQUFRLGdCQUFBLFNBQVMsRUFBeUI7S0FBRztJQUFsRCxtQkFBSSxPQUE4QyxDQUFBO0FBQ2pFLENBQUMsRUFOZ0IsY0FBYyxLQUFkLGNBQWMsUUFNOUIifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVxdWVzdENvbnRleHQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9fc3JjL1JlcXVlc3RDb250ZXh0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFBQSxPQUFPLEVBQUUsQ0FBQyxFQUFFLE1BQU0scUJBQXFCLENBQUE7QUFDdkMsT0FBTyxFQUFFLFNBQVMsRUFBRSxhQUFhLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQTtBQUczRCxJQUFNLG9CQUFvQixHQUExQixNQUFNLG9CQUFxQixTQUFRLGdCQUFBLFdBQVcsRUFFbEQsQ0FBQyxnQkFBZ0IsRUFBRTtJQUNwQixFQUFFLEVBQUUsU0FBUztJQUNiLElBQUksa0JBQUUsaUJBQWlCO0lBQ3ZCLFdBQVcsRUFBRSx5QkFBQSxnQkFBQSxNQUFNLENBQUMsRUFBRSxHQUFHLEVBQUUsYUFBYSxFQUFFLENBQUMsQ0FBVztJQUN0RCxNQUFNLEVBQUUsZ0JBQUEsT0FBTyxDQUFDLElBQUksRUFBRSxJQUFJLENBQUM7SUFDM0IsU0FBUyxFQUFFLHVDQUFBLENBQUMsQ0FBQyxJQUFJLEVBQWlCLEdBQUcsRUFBRSxDQUFDLElBQUksSUFBSSxFQUFFLENBQUMsQ0FBQyxPQUFPO0NBQzVELENBQUM7Q0FBRyxDQUFBO0FBUlEsb0JBQW9CO29CQURoQyx5QkFBeUI7R0FDYixvQkFBb0IsQ0FRNUI7O0FBRUw7OztHQUdHO0FBRUksSUFBTSxjQUFjLHNCQUFwQixNQUFNLGNBQWUsU0FBUSxDQUFDLENBQUMsV0FBVyxFQUU5QyxDQUFDLGdCQUFnQixFQUFFO0lBQ3BCLEdBQUcsc0RBQUEsb0JBQW9CLENBQUMsTUFBTSxHQUFTLElBQUksQ0FBQztJQUM1QyxFQUFFLEVBQUUsU0FBUyxDQUFDLFdBQVcsRUFBRTtJQUMzQixNQUFNLEVBQUUsU0FBUztJQUNqQixNQUFNLEVBQUUseUJBQUEsb0JBQW9CLENBQVc7SUFDdkMsU0FBUyxFQUFFLHlDQUFBLGlCQUFpQixDQUFXO0lBQ3ZDLDhDQUE4QztJQUM5QyxpQ0FBaUM7SUFDakMsdUJBQXVCO0lBQ3ZCLDZDQUE2QztJQUM3Qyw0Q0FBNEM7SUFDNUMsS0FBSztDQUNOLENBQUM7SUFDQSxNQUFNLENBQUMsT0FBTyxDQUVaLE1BQXNCLEVBQ3RCLE9BQThEO1FBRTlELE9BQU8sSUFBSSxnQkFBYyxDQUFDO1lBQ3hCLFNBQVMsRUFBRSxNQUFNLEVBQUUsU0FBUztZQUM1QixHQUFHLE9BQU87WUFDVixNQUFNLEVBQUUsTUFBTSxDQUFDLE1BQU07WUFDckIsTUFBTTtTQUNQLENBQUMsQ0FBQTtJQUNKLENBQUM7SUFFRCxNQUFNLENBQUMsWUFBWSxDQUFhLElBQW9CO1FBQ2xELE9BQU87WUFDTCxhQUFhLEVBQUUsSUFBSSxDQUFDLElBQUk7WUFDeEIsTUFBTSxFQUFFLElBQUksQ0FBQyxNQUFNO1lBQ25CLEdBQUcsQ0FBQyxJQUFJLENBQUMsTUFBTTtnQkFDYixDQUFDLENBQUMsRUFBRSxtQkFBbUIsRUFBRSxJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksRUFBRSxZQUFZLEVBQUUsSUFBSSxDQUFDLE1BQU0sQ0FBQyxNQUFNLEVBQUU7Z0JBQzdFLENBQUMsQ0FBQyxFQUFFLENBQUM7U0FDUixDQUFBO0lBQ0gsQ0FBQztDQUNGLENBQUE7QUFyQ1ksY0FBYztvQkFEMUIseUJBQXlCO0dBQ2IsY0FBYyxDQXFDMUI7O0FBRUQsZ0NBQWdDO0FBQ2hDLEVBQUU7QUFDRixvQkFBb0I7QUFDcEIsV0FBaUIsb0JBQW9CO0lBQ25DOzs7T0FHRztJQUNILE1BQWEsSUFBSyxTQUFRLGdCQUFBLFNBQVMsRUFBK0I7S0FBRztJQUF4RCx5QkFBSSxPQUFvRCxDQUFBO0FBQ3ZFLENBQUMsRUFOZ0Isb0JBQW9CLEtBQXBCLG9CQUFvQixRQU1wQztBQUNELFdBQWlCLGNBQWM7SUFDN0I7OztPQUdHO0lBQ0gsTUFBYSxJQUFLLFNBQVEsZ0JBQUEsU0FBUyxFQUF5QjtLQUFHO0lBQWxELG1CQUFJLE9BQThDLENBQUE7QUFDakUsQ0FBQyxFQU5nQixjQUFjLEtBQWQsY0FBYyxRQU05QiJ9

package/dist/services/QueueMaker/service.d.ts

@@ -18,10 +18,10 @@ export declare const QueueMeta: import("@effect-app/schema").Schema<{
     readonly requestContext: {
         readonly _tag: "RequestContext";
         readonly id: string;
-        readonly rootId: string;
         readonly name: string;
         readonly locale: "en" | "de";
         readonly createdAt: string;
+        readonly rootId: string;
         readonly userProfile?: {
             readonly sub: string;
         } | undefined;

package/dist/services/RepositoryBase.d.ts

@@ -99,7 +99,7 @@ export declare function makeRepo<PM extends {
             value: A_1;
             readonly S: PM;
         };
-    }) => Where | readonly [Where, ...Where[]], mode?: "or" | "and" | undefined) => Filter<PM>;
+    }) => Where | readonly [Where, ...Where[]], mode?: "and" | "or" | undefined) => Filter<PM>;
     query: (fn: (f: import("./Store/filterApi/query.js").FilterTest<PM>, fields: import("./Store/filterApi/proxy.js").Filter<PM, never>) => QueryBuilder<PM>) => QueryBuilder<PM>;
 };
 /**

package/dist/services/RequestContextContainer.d.ts

@@ -37,7 +37,7 @@ export declare const RCTag: import("effect/Context").Tag<RequestContext, Request
 export declare const spanAttributes: (ctx: RequestContext) => {
     "request.user.sub"?: string & import("@effect-app/prelude/ids").UserProfileIdBrand;
     "request.user.roles"?: unknown;
-    "request.id": string & import("@effect-app/schema").StringIdBrand;
+    "request.id": import("@effect-app/schema").NonEmptyString255;
     "request.name": string & import("@effect-app/schema").NonEmptyString255Brand;
     "request.locale": "en" | "de";
     "request.namespace": (string & import("@effect-app/schema").NonEmptyString255Brand) | undefined;

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@effect-app/infra",
-  "version": "0.133.0-next.26",
+  "version": "0.133.0-next.29",
   "license": "MIT",
   "type": "module",
   "dependencies": {
     "@azure/cosmos": "^4.0.0",
     "@azure/service-bus": "^7.9.3",
-    "@effect/schema": "npm:@effect-app/schema-fork@0.0.0-20231227181939",
+    "@effect/schema": "npm:@effect-app/schema-fork@0.0.0-20231227184201",
     "effect": "^2.0.0-next.62",
     "@faker-js/faker": "^8.3.1",
     "@sendgrid/helpers": "^8.0.0",
@@ -20,9 +20,9 @@
     "pure-rand": "6.0.4",
     "redlock": "^4.2.0",
     "@effect-app/core": "0.97.0-next.4",
-    "@effect-app/prelude": "0.107.0-next.24",
-    "@effect-app/infra-adapters": "0.85.0-next.24",
-    "@effect-app/schema": "0.150.0-next.19"
+    "@effect-app/infra-adapters": "0.85.0-next.27",
+    "@effect-app/prelude": "0.107.0-next.27",
+    "@effect-app/schema": "0.150.0-next.20"
   },
   "devDependencies": {
     "@babel/cli": "^7.23.4",