@effect-app/infra 0.133.0-next.4 → 0.133.0-next.40

package/_src/RequestContext.ts

@@ -1,19 +1,15 @@
-import { Schema2 } from "@effect-app/prelude"
+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: Schema2.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
 }) {}
 
 /**
@@ -21,14 +17,14 @@ export class RequestContextParent extends TaggedClass<
  * @tsplus companion RequestContext.Ops
  */
 @useClassFeaturesForSchema
-export class RequestContext extends Schema2.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,
@@ -36,6 +32,7 @@ export class RequestContext extends Schema2.TaggedClass<
   //   namespace: NonEmptyString255.optional()
   // })
 }) {
+  // static Tag = Context.Tag<RequestContext>()
   static inherit(
     this: void,
     parent: RequestContext,

package/_src/_ext/Array.ts

@@ -9,14 +9,14 @@ import { NotFoundError } from "../errors.js"
  * @tsplus fluent Array getFirstById
  * @tsplus fluent ReadonlyArray getFirstById
  */
-export function getFirstById_<A extends { id: Id }, Id extends string, Type extends string>(
+export function getFirstById_<A extends { id: unknown }, Type extends string>(
   a: Iterable<A>,
-  id: Id,
+  id: A["id"],
   type: Type
 ) {
   return Chunk
     .fromIterable(a)
-    .findFirst((_) => _.id === id)
+    .findFirst((_) => Equal.equals(_.id, id))
     .encaseInEffect(() => new NotFoundError({ type, id }))
 }
 

package/_src/_global.ext.ts

@@ -14,10 +14,8 @@ import type {} from "@effect-app/infra/services/Operations/live"
  * @tsplus global
  */
 import type {} from "@effect-app/infra/services/QueueMaker/errors"
-// /**
-//  * @tsplus global
-//  */
-// import type {} from "@effect-app/infra/test.arbs"
+
+import "@effect-app/infra/test.arbs"
 /**
  * @tsplus global
  */
@@ -36,26 +34,3 @@ import type {} from "@effect-app/infra/api/setupRequest"
  * @tsplus global
  */
 import {} from "@effect-app/infra/api/reportError"
-import { S } from "@effect-app/schema/schema"
-import type { ParseOptions } from "@effect/schema/AST"
-
-/**
- * @tsplus fluent effect/schema/Schema withDefault
- */
-export const defaultDate = <From>(s: S.Schema<From, Date>) => S.withDefaultConstructor(s, () => new Date())
-
-/**
- * @tsplus fluent effect/schema/Schema withDefault
- */
-export const defaultNullable = <From, To>(s: S.Schema<From, To | null>) => S.withDefaultConstructor(s, () => null)
-
-/**
- * @tsplus fluent effect/schema/Schema withDefault
- */
-export const defaultArray = <From, T>(s: S.Schema<From, ReadonlyArray<T>>) => S.withDefaultConstructor(s, () => [])
-
-/**
- * @tsplus fluent effect/schema/Schema __call
- */
-export const parseSync = <I, A>(self: S.Schema<I, A>, u: I, options?: ParseOptions | undefined) =>
-  S.parseSync(self)(u, options)

package/_src/_global.schema.ts

@@ -5,6 +5,6 @@
 /**
  * @tsplus global
  */
-import { Delete, Get, Patch, Post, Put } from "@effect-app/prelude/schema"
+import { Delete, Get, Patch, Post, Put } from "@effect-app/schema"
 
 import "@effect-app/prelude/_global.schema"

package/_src/api/codec.ts

@@ -1,4 +1,4 @@
-import * as S from "@effect-app/prelude/schema"
+import * as S from "@effect-app/schema"
 
 export function makeCodec<
   To extends { id: Id },

package/_src/api/express/schema/jwt.ts

@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/ban-types */
-import * as S from "@effect-app/prelude/schema"
+import * as S from "@effect-app/schema"
 
 import { jwtDecode } from "jwt-decode"
 

package/_src/api/express/schema/routing.ts

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/ban-types */
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import type { REST } from "@effect-app/prelude/schema"
+import type { REST } from "@effect-app/schema"
 
 export type Request<
   M,

package/_src/api/setupRequest.ts

@@ -3,13 +3,6 @@ import { RequestContext } from "../RequestContext.js"
 import { RequestContextContainer } from "../services/RequestContextContainer.js"
 import { ContextMapContainer } from "../services/Store/ContextMapContainer.js"
 
-/**
- * @tsplus fluent effect/io/Effect setupRequestContextFromName
- */
-export function setupRequestContextFromName<R, E, A>(self: Effect<R, E, A>, name: string) {
-  return makeInternalRequestContext(name).flatMap((rc) => setupRequestContext(self, rc))
-}
-
 function makeInternalRequestContext(name: string) {
   return Effect.sync(() => {
     const id = RequestId.make()
@@ -25,40 +18,52 @@ function makeInternalRequestContext(name: string) {
 const withRequestSpan = <R, E, A>(f: Effect<R, E, A>) =>
   RequestContextContainer
     .get
-    .flatMap((ctx) =>
+    .andThen((ctx) =>
       f
-        .withSpan("request", {
-          attributes: {
-            "request.id": ctx.id,
-            "request.name": ctx.name,
-            "request.locale": ctx.locale,
-            "request.namespace": ctx.namespace,
-            ...ctx.userProfile?.sub
-              ? {
-                "request.user.sub": ctx
-                  .userProfile
-                  .sub,
-                "request.user.roles": "roles" in ctx
-                    .userProfile
-                  ? ctx.userProfile.roles
-                  : undefined
-              }
-              : {}
-          }
-        })
+        .withSpan("request", { attributes: ctx.spanAttributes })
         // request context info is picked up directly in the logger for annotations.
         .withLogSpan("request")
     )
 
-function setupContextMap<R, E, A>(self: Effect<R, E, A>) {
-  return (ContextMapContainer.flatMap((_) => _.start)
-    > self)
-}
+const setupContextMap = ContextMapContainer.andThen((_) => _.start).toLayerDiscard
+
+// const RequestContextLiveFromRequestContext = (requestContext: RequestContext) =>
+//   RequestContext.Tag.makeLayer(requestContext)
+// memoization problem
+// const RequestContextLive = RequestContextContainer.get.toLayer(RequestContext.Tag)
+const RequestContextStartLiveFromRequestContext = (requestContext: RequestContext) =>
+  setupContextMap
+    // .provideMerge(RequestContextLiveFromRequestContext(requestContext))
+    .provideMerge(
+      RequestContextContainer
+        .andThen((_) => _.start(requestContext))
+        .toLayerDiscard
+    )
+
+const RequestContextStartLive = (requestContext: RequestContext | string) =>
+  typeof requestContext === "string"
+    ? makeInternalRequestContext(requestContext)
+      .andThen(RequestContextStartLiveFromRequestContext)
+      .unwrapLayer
+    : RequestContextStartLiveFromRequestContext(requestContext)
 
 /**
  * @tsplus fluent effect/io/Effect setupRequestContext
  */
-export function setupRequestContext<R, E, A>(self: Effect<R, E, A>, requestContext: RequestContext) {
-  return RequestContextContainer.flatMap((_) => _.start(requestContext))
-    > withRequestSpan(setupContextMap(self))
+export function setupRequestContext<R, E, A>(self: Effect<R, E, A>, requestContext: RequestContext | string) {
+  return self
+    .pipe(withRequestSpan)
+    .provide(RequestContextStartLive(requestContext))
+}
+
+const UpdateRequestContextLive = (f: (rc: RequestContext) => RequestContext) =>
+  RequestContextContainer.andThen((rcc) => rcc.update(f)).toLayerDiscard
+
+/**
+ * @tsplus fluent effect/io/Effect updateRequestContext
+ */
+export function updateRequestContext<R, E, A>(self: Effect<R, E, A>, f: (rc: RequestContext) => RequestContext) {
+  return self
+    // .provideServiceEffect(RequestContext.Tag, RequestContextContainer.get)
+    .provide(UpdateRequestContextLive(f))
 }

package/_src/errors.ts

@@ -2,16 +2,20 @@
 import { makeFiberFailure } from "effect/Runtime"
 
 /** @tsplus type NotFoundError */
-export class NotFoundError<T extends string = string>
-  extends Data.TaggedError("NotFoundError")<{ message: string; type: T; id: string }>
+export class NotFoundError<Id, T extends string = string>
+  extends Data.TaggedError("NotFoundError")<{ message: string; type: T; id: Id }>
 {
-  constructor(args: { readonly type: T; readonly id: string }) {
-    super({ ...args, message: `Didn't find ${args.type}#${args.id}` })
+  constructor(args: { readonly type: T; readonly id: Id }) {
+    super({ ...args, message: `Didn't find ${args.type}#${JSON.stringify(args.id)}` })
   }
 }
 
 /** @tsplus type ValidationError */
-export class ValidationError extends Data.TaggedError("ValidationError")<{ errors: ReadonlyArray<unknown> }> {}
+export class ValidationError extends Data.TaggedError("ValidationError")<{ errors: ReadonlyArray<unknown> }> {
+  override get message() {
+    return `Validation failed: ${this.errors.map((e) => JSON.stringify(e)).join(", ")}`
+  }
+}
 
 /** @tsplus type NotLoggedInError */
 export class NotLoggedInError extends Data.TaggedError("NotLoggedInError")<{ message?: string | undefined }> {

package/_src/services/QueueMaker/memQueue.ts

@@ -1,6 +1,6 @@
 import { MemQueue } from "@effect-app/infra-adapters/memQueue"
 import { RequestContext } from "@effect-app/infra/RequestContext"
-import type { Schema2 } from "@effect-app/prelude"
+import type { S } from "@effect-app/prelude"
 import { RequestId } from "@effect-app/prelude/ids"
 import { Tracer } from "effect"
 import { RequestContextContainer } from "../RequestContextContainer.js"
@@ -17,8 +17,8 @@ export function makeMemQueue<
 >(
   queueName: string,
   queueDrainName: string,
-  schema: Schema2.Schema<EvtE, Evt>,
-  drainSchema: Schema2.Schema<unknown, DrainEvt>
+  schema: S.Schema<EvtE, Evt>,
+  drainSchema: S.Schema<unknown, DrainEvt>
 ) {
   return Effect.gen(function*($) {
     const mem = yield* $(MemQueue)

package/_src/services/QueueMaker/sbqueue.ts

@@ -9,7 +9,7 @@ import {
 import type {} from "@azure/service-bus"
 import { captureException } from "@effect-app/infra/errorReporter"
 import { RequestContext } from "@effect-app/infra/RequestContext"
-import type { Schema2 } from "@effect-app/prelude"
+import type { S } from "@effect-app/prelude"
 import { RequestId } from "@effect-app/prelude/ids"
 import { struct } from "@effect-app/schema"
 import { Tracer } from "effect"
@@ -27,8 +27,8 @@ export function makeServiceBusQueue<
 >(
   _queueName: string,
   queueDrainName: string,
-  schema: Schema2.Schema<EvtE, Evt>,
-  drainSchema: Schema2.Schema<unknown, DrainEvt>
+  schema: S.Schema<EvtE, Evt>,
+  drainSchema: S.Schema<unknown, DrainEvt>
 ) {
   const wireSchema = struct({
     body: schema,

package/_src/services/Repository.ts

@@ -14,7 +14,7 @@ import type { QueryBuilder } from "./Store/filterApi/query.js"
  * @tsplus type Repository
  */
 export interface Repository<
-  T extends { id: string },
+  T extends { id: unknown },
   PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string
@@ -36,7 +36,7 @@ export const AnyPureDSL: PureDSL<any, any, any> = {
  * @tsplus fluent Repository get
  */
 export function get<
-  T extends { id: string },
+  T extends { id: unknown },
   PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string
@@ -51,7 +51,7 @@ export function get<
  * @tsplus getter Repository log
  */
 export function log<
-  T extends { id: string },
+  T extends { id: unknown },
   PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string
@@ -64,7 +64,7 @@ export function log<
  * @tsplus fluent Repository projectEffect
  */
 export function projectEffect<
-  T extends { id: string },
+  T extends { id: unknown },
   PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string,
@@ -85,7 +85,7 @@ export function projectEffect<
   >
 ): Effect<R, E, S[]>
 export function projectEffect<
-  T extends { id: string },
+  T extends { id: unknown },
   PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string,
@@ -106,7 +106,7 @@ export function projectEffect<
   >
 ): Effect<R, E, Pick<PM, U>[]>
 export function projectEffect<
-  T extends { id: string },
+  T extends { id: unknown },
   PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string,
@@ -142,7 +142,7 @@ export function projectEffect<
  * @tsplus fluent Repository project
  */
 export function project<
-  T extends { id: string },
+  T extends { id: unknown },
   PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string,
@@ -157,7 +157,7 @@ export function project<
   }
 ): Effect<never, never, S[]>
 export function project<
-  T extends { id: string },
+  T extends { id: unknown },
   PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string,
@@ -172,7 +172,7 @@ export function project<
   }
 ): Effect<never, never, Pick<PM, U>[]>
 export function project<
-  T extends { id: string },
+  T extends { id: unknown },
   PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string,
@@ -196,7 +196,7 @@ export function project<
  * @tsplus fluent Repository project
  */
 export function count<
-  T extends { id: string },
+  T extends { id: unknown },
   PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string
@@ -213,7 +213,7 @@ export function count<
  * @tsplus fluent Repository queryEffect
  */
 export function queryEffect<
-  T extends { id: string },
+  T extends { id: unknown },
   PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string,
@@ -236,7 +236,7 @@ export function queryEffect<
  * @tsplus fluent Repository queryOneEffect
  */
 export function queryOneEffect<
-  T extends { id: string },
+  T extends { id: unknown },
   PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string,
@@ -248,7 +248,7 @@ export function queryOneEffect<
   map: Effect<R, E, { filter?: Filter<PM> }>
 ): Effect<R, E | NotFoundError<ItemType>, T>
 export function queryOneEffect<
-  T extends { id: string },
+  T extends { id: unknown },
   PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string,
@@ -261,7 +261,7 @@ export function queryOneEffect<
   map: Effect<R, E, { filter?: Filter<PM>; collect: (t: T) => Option<S> }>
 ): Effect<R, E | NotFoundError<ItemType>, S>
 export function queryOneEffect<
-  T extends { id: string },
+  T extends { id: unknown },
   PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string,
@@ -272,7 +272,7 @@ export function queryOneEffect<
   self: RepositoryBaseC<T, PM, Evt, ItemType>,
   // TODO: think about collectPM, collectE, and collect(Parsed)
   map: Effect<R, E, { filter?: Filter<PM>; collect?: (t: T) => Option<S> }>
-): Effect<R, E | NotFoundError<ItemType>, S> {
+): Effect<R, E | NotFoundError<T["id"], ItemType>, S> {
   return map.flatMap((f) =>
     (f.filter ? self.utils.filter({ filter: f.filter, limit: 1 }) : self.utils.all)
       .flatMap((_) => self.utils.parseMany(_))
@@ -289,7 +289,7 @@ export function queryOneEffect<
  * @tsplus fluent Repository query
  */
 export function query<
-  T extends { id: string },
+  T extends { id: unknown },
   PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string,
@@ -306,7 +306,7 @@ export function query<
  * @tsplus fluent Repository queryOne
  */
 export function queryOne<
-  T extends { id: string },
+  T extends { id: unknown },
   PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string,
@@ -316,7 +316,7 @@ export function queryOne<
   map: { filter?: Filter<PM>; collect: (t: T) => Option<S> }
 ): Effect<never, NotFoundError<ItemType>, S>
 export function queryOne<
-  T extends { id: string },
+  T extends { id: unknown },
   PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string
@@ -325,7 +325,7 @@ export function queryOne<
   map: { filter?: Filter<PM> }
 ): Effect<never, NotFoundError<ItemType>, T>
 export function queryOne<
-  T extends { id: string },
+  T extends { id: unknown },
   PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string,
@@ -341,7 +341,7 @@ export function queryOne<
  * @tsplus fluent Repository queryAndSaveOnePureEffect
  */
 export function queryAndSaveOnePureEffect<
-  T extends { id: string },
+  T extends { id: unknown },
   PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string,
@@ -360,7 +360,7 @@ export function queryAndSaveOnePureEffect<
   A
 >
 export function queryAndSaveOnePureEffect<
-  T extends { id: string },
+  T extends { id: unknown },
   PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string,
@@ -391,7 +391,7 @@ export function queryAndSaveOnePureEffect(
  */
 
 export function queryAndSaveOnePure<
-  T extends { id: string },
+  T extends { id: unknown },
   PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string,
@@ -407,7 +407,7 @@ export function queryAndSaveOnePure<
   A
 >
 export function queryAndSaveOnePure<
-  T extends { id: string },
+  T extends { id: unknown },
   PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string
@@ -432,7 +432,7 @@ export function queryAndSaveOnePure(
  * @tsplus fluent Repository queryAndSavePureEffect
  */
 export function queryAndSavePureEffect<
-  T extends { id: string },
+  T extends { id: unknown },
   PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string,
@@ -452,7 +452,7 @@ export function queryAndSavePureEffect<
  * @tsplus fluent Repository queryAndSavePure
  */
 export function queryAndSavePure<
-  T extends { id: string },
+  T extends { id: unknown },
   PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string,
@@ -468,7 +468,7 @@ export function queryAndSavePure<
  * @tsplus getter Repository saveManyWithPure
  */
 export function saveManyWithPure<
-  T extends { id: string },
+  T extends { id: unknown },
   PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string
@@ -481,7 +481,7 @@ export function saveManyWithPure<
  * @tsplus fluent Repository byIdAndSaveWithPure
  */
 export function byIdAndSaveWithPure<
-  T extends { id: string },
+  T extends { id: unknown },
   PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string
@@ -495,7 +495,7 @@ export function byIdAndSaveWithPure<
  * @tsplus getter Repository handleByIdAndSaveWithPure
  */
 export function handleByIdAndSaveWithPure<
-  T extends { id: string },
+  T extends { id: unknown },
   PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string
@@ -510,9 +510,8 @@ export function handleByIdAndSaveWithPure<
  * @tsplus fluent Repository saveManyWithPure_
  */
 export function saveManyWithPure_<
-  Id extends string,
   R,
-  T extends { id: Id },
+  T extends { id: unknown },
   PM extends PersistenceModelType<string>,
   A,
   E,
@@ -535,9 +534,8 @@ export function saveManyWithPure_<
  * @tsplus fluent Repository saveWithPure_
  */
 export function saveWithPure_<
-  Id extends string,
   R,
-  T extends { id: Id },
+  T extends { id: unknown },
   PM extends PersistenceModelType<string>,
   A,
   E,
@@ -559,7 +557,7 @@ export function saveWithPure_<
 }
 
 export function saveAllWithEffectInt<
-  T extends { id: string },
+  T extends { id: unknown },
   PM extends PersistenceModelType<string>,
   P extends T,
   Evt,
@@ -581,7 +579,7 @@ export function saveAllWithEffectInt<
  * @tsplus fluent Repository queryAndSavePureEffectBatched
  */
 export function queryAndSavePureEffectBatched<
-  T extends { id: string },
+  T extends { id: unknown },
   PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string,
@@ -603,7 +601,7 @@ export function queryAndSavePureEffectBatched<
  * @tsplus fluent Repository queryAndSavePureBatched
  */
 export function queryAndSavePureBatched<
-  T extends { id: string },
+  T extends { id: unknown },
   PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string,
@@ -621,7 +619,7 @@ export function queryAndSavePureBatched<
  * @tsplus fluent Repository saveManyWithPureBatched
  */
 export function saveManyWithPureBatched<
-  T extends { id: string },
+  T extends { id: unknown },
   PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string
@@ -634,9 +632,8 @@ export function saveManyWithPureBatched<
  * @tsplus fluent Repository saveManyWithPureBatched_
  */
 export function saveManyWithPureBatched_<
-  Id extends string,
   R,
-  T extends { id: Id },
+  T extends { id: unknown },
   PM extends PersistenceModelType<string>,
   A,
   E,
@@ -788,7 +785,7 @@ export function ifAny_<T, R, E, A>(items: Iterable<T>, fn: (items: NonEmptyReado
  * @tsplus getter Repository save
  */
 export function save<
-  T extends { id: string },
+  T extends { id: unknown },
   PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string
@@ -802,7 +799,7 @@ export function save<
  * @tsplus getter Repository saveWithEvents
  */
 export function saveWithEvents<
-  T extends { id: string },
+  T extends { id: unknown },
   PM extends PersistenceModelType<string>,
   Evt,
   ItemType extends string