@effect-app/infra 1.1.10 → 1.1.12

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @effect-app/infra
 
+## 1.1.12
+
+### Patch Changes
+
+- Updated dependencies [f202812]
+  - @effect-app/schema@1.0.9
+  - @effect-app/infra-adapters@1.0.14
+  - effect-app@1.0.10
+
+## 1.1.11
+
+### Patch Changes
+
+- Updated dependencies [83f19e1]
+  - effect-app@1.0.9
+  - @effect-app/schema@1.0.8
+  - @effect-app/infra-adapters@1.0.13
+
 ## 1.1.10
 
 ### Patch Changes

package/dist/RequestContext.d.ts

@@ -5,10 +5,10 @@ declare const RequestContextParent_base: S.EnhancedClass<RequestContextParent, {
 } & {
     id: S.WithDefaults<S.Schema<NonEmptyString255, string, never> & {
         make: () => NonEmptyString255;
-        withDefault: S.PropertySignature<":", NonEmptyString255, never, ":", string, true, never>;
+        withDefault: S.PropertySignature<":", string & S.NonEmptyString255Brand, never, ":", string, true, never>;
     }> & S.Schema<NonEmptyString255, string, never> & {
         make: () => NonEmptyString255;
-        withDefault: S.PropertySignature<":", NonEmptyString255, never, ":", string, true, never>;
+        withDefault: S.PropertySignature<":", string & S.NonEmptyString255Brand, never, ":", string, true, never>;
     };
     name: S.WithDefaults<S.Schema<string & S.NonEmptyString255Brand, string, never>> & S.Schema<string & S.NonEmptyString255Brand, string, never>;
     userProfile: S.PropertySignature<"?:", {
@@ -30,10 +30,10 @@ declare const RequestContextParent_base: S.EnhancedClass<RequestContextParent, {
 }, RequestContextParent.From, never, {
     readonly id: NonEmptyString255;
     readonly name: string & S.NonEmptyString255Brand;
-    readonly locale: "en" | "de";
     readonly userProfile?: {
         readonly sub: string & import("effect-app/ids").UserProfileIdBrand;
     } | undefined;
+    readonly locale: "en" | "de";
     readonly createdAt?: Date;
 }, {}, {}>;
 export declare class RequestContextParent extends RequestContextParent_base {
@@ -41,13 +41,13 @@ export declare class RequestContextParent extends RequestContextParent_base {
 declare const RequestContext_base: S.EnhancedClass<RequestContext, {
     readonly _tag: S.Literal<["RequestContext"]>;
 } & {
-    id: S.PropertySignature<":", NonEmptyString255, never, ":", string, true, never>;
+    id: S.PropertySignature<":", string & S.NonEmptyString255Brand, never, ":", string, true, never>;
     rootId: S.WithDefaults<S.Schema<NonEmptyString255, string, never> & {
         make: () => NonEmptyString255;
-        withDefault: S.PropertySignature<":", NonEmptyString255, never, ":", string, true, never>;
+        withDefault: S.PropertySignature<":", string & S.NonEmptyString255Brand, never, ":", string, true, never>;
     }> & S.Schema<NonEmptyString255, string, never> & {
         make: () => NonEmptyString255;
-        withDefault: S.PropertySignature<":", NonEmptyString255, never, ":", string, true, never>;
+        withDefault: S.PropertySignature<":", string & S.NonEmptyString255Brand, never, ":", string, true, never>;
     };
     sourceId: S.PropertySignature<"?:", (string & S.NonEmptyString255Brand) | undefined, never, "?:", string | undefined, false, never>;
     parent: S.PropertySignature<"?:", RequestContextParent | undefined, never, "?:", RequestContextParent.From | undefined, false, never>;
@@ -62,7 +62,7 @@ declare const RequestContext_base: S.EnhancedClass<RequestContext, {
     createdAt: S.PropertySignature<":", Date, never, ":", string, true, never>;
 }, {
     readonly _tag: "RequestContext";
-    readonly id: NonEmptyString255;
+    readonly id: string & S.NonEmptyString255Brand;
     readonly name: string & S.NonEmptyString255Brand;
     readonly userProfile?: {
         readonly sub: string & import("effect-app/ids").UserProfileIdBrand;
@@ -74,17 +74,17 @@ declare const RequestContext_base: S.EnhancedClass<RequestContext, {
     readonly parent?: RequestContextParent | undefined;
     readonly namespace?: (string & S.NonEmptyString255Brand) | undefined;
 }, RequestContext.From, never, {
+    readonly id?: string & S.NonEmptyString255Brand;
     readonly name: string & S.NonEmptyString255Brand;
-    readonly locale: "en" | "de";
-    readonly rootId: NonEmptyString255;
     readonly userProfile?: {
         readonly sub: string & import("effect-app/ids").UserProfileIdBrand;
     } | undefined;
+    readonly locale: "en" | "de";
+    readonly createdAt?: Date;
+    readonly rootId: NonEmptyString255;
     readonly sourceId?: (string & S.NonEmptyString255Brand) | undefined;
     readonly parent?: RequestContextParent | undefined;
     readonly namespace?: (string & S.NonEmptyString255Brand) | undefined;
-    readonly id?: NonEmptyString255;
-    readonly createdAt?: Date;
 }, {}, {}>;
 /**
  * @tsplus type RequestContext
@@ -103,7 +103,7 @@ export declare const spanAttributes: (ctx: RequestContext) => {
     "request.user.sub"?: string & import("effect-app/ids").UserProfileIdBrand;
     "request.user.roles"?: unknown;
     "request.source.id"?: string & S.NonEmptyString255Brand;
-    "request.id": NonEmptyString255;
+    "request.id": string & S.NonEmptyString255Brand;
     "request.root.id": NonEmptyString255;
     "request.name": string & S.NonEmptyString255Brand;
     "request.locale": "en" | "de";

package/dist/api/reportError.d.ts

@@ -9,7 +9,7 @@ import { Effect } from "effect-app";
  *
  * @tsplus getter effect/io/Effect forkDaemonReportRequest
  */
-export declare function forkDaemonReportRequest<R, E, A>(self: Effect<A, E, R>): Effect.Effect<import("effect/Fiber").RuntimeFiber<A, E>, never, Exclude<R, import("effect/Tracer").ParentSpan> | RequestFiberSet>;
+export declare function forkDaemonReportRequest<R, E, A>(self: Effect<A, E, R>): Effect.Effect<import("effect/Fiber").RuntimeFiber<A, E>, never, RequestFiberSet | Exclude<R, import("effect/Tracer").ParentSpan>>;
 /**
  * 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
@@ -19,5 +19,5 @@ export declare function forkDaemonReportRequest<R, E, A>(self: Effect<A, E, R>):
  *
  * @tsplus getter effect/io/Effect forkDaemonReportRequestUnexpected
  */
-export declare function forkDaemonReportRequestUnexpected<R, E, A>(self: Effect<A, E, R>): Effect.Effect<import("effect/Fiber").RuntimeFiber<A, E>, never, RequestFiberSet | Exclude<R, import("effect/Tracer").ParentSpan>>;
+export declare function forkDaemonReportRequestUnexpected<R, E, A>(self: Effect<A, E, R>): Effect.Effect<import("effect/Fiber").RuntimeFiber<A, E>, never, Exclude<R, import("effect/Tracer").ParentSpan> | RequestFiberSet>;
 //# sourceMappingURL=reportError.d.ts.map

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

@@ -8,5 +8,5 @@ import type { HttpServerRequest, HttpServerResponse } from "effect-app/http";
 import type { RequestHandler } from "./base.js";
 import type { Middleware } from "./makeRequestHandler.js";
 export declare const RouteDescriptors: Context.Tag<Ref<RouteDescriptorAny[]>, Ref<RouteDescriptorAny[]>>;
-export declare function match<R, M, PathA extends Struct.Fields, CookieA extends Struct.Fields, QueryA extends Struct.Fields, BodyA extends Struct.Fields, HeaderA extends Struct.Fields, ReqA extends PathA & QueryA & BodyA, ResA extends Struct.Fields, ResE, MiddlewareE, PPath extends `/${string}`, R2, PR, RErr, CTX, Context, Config>(requestHandler: RequestHandler<R, M, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA, ResA, ResE, PPath, CTX, Context, Config>, errorHandler: <R>(req: HttpServerRequest.ServerRequest, res: HttpServerResponse.ServerResponse, r2: Effect<HttpServerResponse.ServerResponse, ValidationError | MiddlewareE | ResE, R>) => Effect<HttpServerResponse.ServerResponse, never, Exclude<RErr | R, HttpServerRequest.ServerRequest | HttpRouter.RouteContext | Scope>>, middleware?: Middleware<R, M, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA, ResA, ResE, MiddlewareE, PPath, R2, PR, CTX, Context, Config>): Effect.Effect<HttpRouter.Route<import("@effect/platform/Http/ServerError").RequestError, import("../../services/RequestContextContainer.js").RequestContextContainer | import("../../services/Store/ContextMapContainer.js").ContextMapContainer | import("@effect-app/infra-adapters/RequestFiberSet").RequestFiberSet | Exclude<R2, Scope.Scope | HttpServerRequest.ServerRequest | HttpRouter.RouteContext> | Exclude<RErr, Scope.Scope | HttpServerRequest.ServerRequest | HttpRouter.RouteContext> | Exclude<Exclude<Exclude<R, import("effect-app/utils").EnforceNonEmptyRecord<M>>, PR>, Scope.Scope | HttpServerRequest.ServerRequest | HttpRouter.RouteContext>>, never, never>;
+export declare function match<R, M, PathA extends Struct.Fields, CookieA extends Struct.Fields, QueryA extends Struct.Fields, BodyA extends Struct.Fields, HeaderA extends Struct.Fields, ReqA extends PathA & QueryA & BodyA, ResA extends Struct.Fields, ResE, MiddlewareE, PPath extends `/${string}`, R2, PR, RErr, CTX, Context, Config>(requestHandler: RequestHandler<R, M, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA, ResA, ResE, PPath, CTX, Context, Config>, errorHandler: <R>(req: HttpServerRequest.ServerRequest, res: HttpServerResponse.ServerResponse, r2: Effect<HttpServerResponse.ServerResponse, ValidationError | MiddlewareE | ResE, R>) => Effect<HttpServerResponse.ServerResponse, never, Exclude<RErr | R, HttpServerRequest.ServerRequest | HttpRouter.RouteContext | Scope>>, middleware?: Middleware<R, M, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA, ResA, ResE, MiddlewareE, PPath, R2, PR, CTX, Context, Config>): Effect.Effect<HttpRouter.Route<import("@effect/platform/Http/ServerError").RequestError, import("../../services/Store/ContextMapContainer.js").ContextMapContainer | import("../../services/RequestContextContainer.js").RequestContextContainer | import("@effect-app/infra-adapters/RequestFiberSet").RequestFiberSet | Exclude<R2, Scope.Scope | HttpServerRequest.ServerRequest | HttpRouter.RouteContext> | Exclude<RErr, Scope.Scope | HttpServerRequest.ServerRequest | HttpRouter.RouteContext> | Exclude<Exclude<Exclude<R, import("effect-app/utils").EnforceNonEmptyRecord<M>>, PR>, Scope.Scope | HttpServerRequest.ServerRequest | HttpRouter.RouteContext>>, never, never>;
 //# sourceMappingURL=match.d.ts.map

package/dist/api/setupRequest.d.ts

@@ -2,8 +2,8 @@ import { Effect } from "effect-app";
 import { RequestContext } from "../RequestContext.js";
 import { RequestContextContainer } from "../services/RequestContextContainer.js";
 import { ContextMapContainer } from "../services/Store/ContextMapContainer.js";
-export declare function setupRequestContext<R, E, A>(self: Effect<A, E, R>, requestContext: RequestContext | string): Effect.Effect<A, E, RequestContextContainer | ContextMapContainer | Exclude<Exclude<R, import("effect/Tracer").ParentSpan>, never>>;
-export declare function setupExistingRequestContext<R, E, A>(self: Effect<A, E, R>, requestContext: RequestContext | string): Effect.Effect<A, E, RequestContextContainer | ContextMapContainer | Exclude<R, never>>;
+export declare function setupRequestContext<R, E, A>(self: Effect<A, E, R>, requestContext: RequestContext | string): Effect.Effect<A, E, ContextMapContainer | RequestContextContainer | Exclude<Exclude<R, import("effect/Tracer").ParentSpan>, never>>;
+export declare function setupExistingRequestContext<R, E, A>(self: Effect<A, E, R>, requestContext: RequestContext | string): Effect.Effect<A, E, ContextMapContainer | RequestContextContainer | Exclude<R, never>>;
 /**
  * @tsplus fluent effect/io/Effect updateRequestContext
  */

package/dist/services/Operations.d.ts

@@ -47,7 +47,7 @@ declare const Operations_base: (abstract new (service: {
         all: Effect.Effect<Operation[], never, never>;
         find: (id: StringId) => Effect.Effect<Option.Option<Operation>, never, never>;
         update: (id: StringId, progress: OperationProgress) => Effect.Effect<void, never, never>;
-    }) => X) => X extends Effect<infer A_3, infer E_5, infer R_5> ? Effect<A_3, E_5, R_5 | Operations> : Effect<X, never, Operations>;
+    }) => X) => X extends Effect<infer A_3, infer E_5, infer R_5> ? Effect<A_3, E_5, Operations | R_5> : Effect<X, never, Operations>;
 };
 export declare class Operations extends Operations_base {
     private static readonly CleanupLive;

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

@@ -13,6 +13,6 @@ export declare function makeMemQueue<Evt extends {
     _tag: string;
 }, EvtE, DrainEvtE>(queueName: string, queueDrainName: string, schema: S.Schema<Evt, EvtE>, drainSchema: S.Schema<DrainEvt, DrainEvtE>): Effect.Effect<{
     publish: (messages_0: Evt, ...messages_1: Evt[]) => Effect.Effect<void, never, never>;
-    drain: <DrainE, DrainR>(handleEvent: (ks: DrainEvt) => Effect<void, DrainE, DrainR>, sessionId?: string) => Effect.Effect<never, never, RequestContextContainer | import("../Store/ContextMapContainer.js").ContextMapContainer | Exclude<Exclude<Exclude<DrainR, Tracer.ParentSpan>, never>, Tracer.ParentSpan>>;
+    drain: <DrainE, DrainR>(handleEvent: (ks: DrainEvt) => Effect<void, DrainE, DrainR>, sessionId?: string) => Effect.Effect<never, never, import("../Store/ContextMapContainer.js").ContextMapContainer | RequestContextContainer | Exclude<Exclude<Exclude<DrainR, Tracer.ParentSpan>, never>, Tracer.ParentSpan>>;
 }, never, RequestContextContainer | MemQueue>;
 //# sourceMappingURL=memQueue.d.ts.map

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

@@ -13,7 +13,7 @@ export declare function makeServiceBusQueue<Evt extends {
     id: StringId;
     _tag: string;
 }, EvtE, DrainEvtE>(queueName: string, queueDrainName: string, schema: S.Schema<Evt, EvtE>, drainSchema: S.Schema<DrainEvt, DrainEvtE>): Effect.Effect<{
-    drain: <DrainE, DrainR>(handleEvent: (ks: DrainEvt) => Effect<void, DrainE, DrainR>, sessionId?: string) => Effect.Effect<never, never, import("effect/Scope").Scope | RequestContextContainer | import("../Store/ContextMapContainer.js").ContextMapContainer | Exclude<Exclude<Exclude<Exclude<DrainR, Tracer.ParentSpan>, never>, Tracer.ParentSpan>, ServiceBusReceiverFactory>>;
+    drain: <DrainE, DrainR>(handleEvent: (ks: DrainEvt) => Effect<void, DrainE, DrainR>, sessionId?: string) => Effect.Effect<never, never, import("../Store/ContextMapContainer.js").ContextMapContainer | import("effect/Scope").Scope | RequestContextContainer | Exclude<Exclude<Exclude<Exclude<DrainR, Tracer.ParentSpan>, never>, Tracer.ParentSpan>, ServiceBusReceiverFactory>>;
     publish: (messages_0: Evt, ...messages_1: Evt[]) => Effect.Effect<void, never, never>;
 }, never, RequestContextContainer | ServiceBusReceiverFactory | import("@azure/service-bus").ServiceBusSender>;
 /**

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

@@ -16,13 +16,13 @@ export declare const QueueMaker: QueueMakerOps;
 export declare const QueueMeta: import("@effect/schema/Schema").Struct<{
     requestContext: typeof RequestContext;
     span: S.PropertySignature<"?:", {
+        readonly sampled: boolean;
         readonly spanId: string;
         readonly traceId: string;
-        readonly sampled: boolean;
     } | undefined, never, "?:", {
+        readonly sampled: boolean;
         readonly spanId: string;
         readonly traceId: string;
-        readonly sampled: boolean;
     } | undefined, false, never>;
 }>;
 //# sourceMappingURL=service.d.ts.map

package/dist/services/RequestContextContainer.d.ts

@@ -25,7 +25,7 @@ declare const RequestContextContainer_base: (abstract new (service: {
         requestContext: Effect<RequestContext>;
         update: (f: (rc: RequestContext) => RequestContext) => Effect<RequestContext>;
         start: (f: RequestContext) => Effect<void>;
-    }) => X) => X extends Effect<infer A_3, infer E_4, infer R_4> ? Effect<A_3, E_4, RequestContextContainer | R_4> : Effect<X, never, RequestContextContainer>;
+    }) => X) => X extends Effect<infer A_3, infer E_4, infer R_4> ? Effect<A_3, E_4, R_4 | RequestContextContainer> : Effect<X, never, RequestContextContainer>;
 };
 /**
  * @tsplus type RequestContextContainer

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/infra",
-  "version": "1.1.10",
+  "version": "1.1.12",
   "license": "MIT",
   "type": "module",
   "dependencies": {
@@ -19,9 +19,9 @@
     "pure-rand": "6.1.0",
     "redlock": "^4.2.0",
     "@effect-app/core": "1.0.5",
-    "@effect-app/schema": "1.0.7",
-    "@effect-app/infra-adapters": "1.0.12",
-    "effect-app": "1.0.8"
+    "@effect-app/infra-adapters": "1.0.14",
+    "effect-app": "1.0.10",
+    "@effect-app/schema": "1.0.9"
   },
   "devDependencies": {
     "@babel/cli": "^7.24.1",
@@ -38,7 +38,7 @@
     "redis": "^3.1.2",
     "ts-node": "^10.9.2",
     "typescript": "^5.4.5",
-    "vitest": "^1.5.1"
+    "vitest": "^1.5.2"
   },
   "peerDependencies": {
     "express": "^4.19.2",