@effect-app/infra 0.133.0-next.3 → 0.133.0-next.5

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @effect-app/infra
 
+## 0.133.0-next.5
+
+### Patch Changes
+
+- Updated dependencies [fde3e90]
+  - @effect-app/schema@0.150.0-next.2
+  - @effect-app/core@0.97.0-next.1
+  - @effect-app/infra-adapters@0.85.0-next.4
+  - @effect-app/prelude@0.107.0-next.4
+
+## 0.133.0-next.4
+
+### Minor Changes
+
+- eb3bbc2: re-add basic routing
+
 ## 0.133.0-next.3
 
 ### Patch Changes

package/_cjs/api/express/schema/routing.cjs

@@ -0,0 +1,23 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.arrAsRouteDescriptionAny = arrAsRouteDescriptionAny;
+exports.asRouteDescriptionAny = asRouteDescriptionAny;
+exports.makeRouteDescriptor = makeRouteDescriptor;
+function asRouteDescriptionAny(i) {
+  return i;
+}
+function arrAsRouteDescriptionAny(arr) {
+  return arr.map(asRouteDescriptionAny);
+}
+function makeRouteDescriptor(path, method, handler) {
+  return {
+    path,
+    handler,
+    method,
+    _tag: "Schema"
+  };
+}
+//# sourceMappingURL=routing.cjs.map

package/_cjs/api/express/schema/routing.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"routing.cjs","names":["asRouteDescriptionAny","i","arrAsRouteDescriptionAny","arr","map","makeRouteDescriptor","path","method","handler","_tag"],"sources":["../../../../_src/api/express/schema/routing.ts"],"sourcesContent":[null],"mappings":";;;;;;;;AAwCM,SAAUA,qBAAqBA,CAA+BC,CAAI;EACtE,OAAOA,CAAuB;AAChC;AAEM,SAAUC,wBAAwBA,CACtCC,GAAqB;EAErB,OAAOA,GAAG,CAACC,GAAG,CAACJ,qBAAqB,CAAC;AACvC;AAiCM,SAAUK,mBAAmBA,CAWjCC,IAAkB,EAClBC,MAAc,EACdC,OAUC;EAYD,OAAO;IAAEF,IAAI;IAAEE,OAAO;IAAED,MAAM;IAAEE,IAAI,EAAE;EAAQ,CAAE;AAClD"}

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

@@ -0,0 +1,236 @@
+/* eslint-disable @typescript-eslint/ban-types */
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import type { REST } from "@effect-app/prelude/schema"
+
+export type Request<
+  M,
+  PathA,
+  CookieA,
+  QueryA,
+  BodyA,
+  HeaderA,
+  ReqA extends PathA & QueryA & BodyA,
+  PPath extends `/${string}`
+> = REST.ReqRes<unknown, ReqA> & {
+  method: REST.Methods.Rest
+  path: PPath
+  Cookie?: REST.ReqRes<Record<string, string>, CookieA>
+  Path?: REST.ReqRes<Record<string, string>, PathA>
+  Body?: REST.ReqRes<unknown, BodyA>
+  Query?: REST.ReqRes<Record<string, string>, QueryA>
+  Headers?: REST.ReqRes<Record<string, string>, HeaderA>
+  Tag: Tag<M, M>
+}
+
+export interface RouteRequestHandler<
+  M,
+  PathA,
+  CookieA,
+  QueryA,
+  BodyA,
+  HeaderA,
+  ReqA extends PathA & QueryA & BodyA,
+  ResA,
+  PPath extends `/${string}`
+> {
+  Request: Request<M, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA, PPath>
+  Response?: REST.ReqRes<unknown, ResA> // | REST.ReqResSchemed<unknown, ResA>
+  ResponseOpenApi?: any
+}
+
+export function asRouteDescriptionAny<R extends RouteDescriptorAny>(i: R) {
+  return i as RouteDescriptorAny
+}
+
+export function arrAsRouteDescriptionAny<R extends RouteDescriptorAny>(
+  arr: ReadonlyArray<R>
+) {
+  return arr.map(asRouteDescriptionAny)
+}
+
+export interface RouteDescriptor<
+  M,
+  PathA,
+  CookieA,
+  QueryA,
+  BodyA,
+  HeaderA,
+  ReqA extends PathA & QueryA & BodyA,
+  ResA,
+  METHOD extends REST.Methods.Rest = REST.Methods.Rest
+> {
+  _tag: "Schema"
+  path: `/${string}`
+  method: METHOD
+  handler: RouteRequestHandler<M, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA, ResA, `/${string}`>
+  info?: {
+    tags: ReadonlyArray<string>
+  }
+}
+
+export type RouteDescriptorAny = RouteDescriptor<
+  any,
+  any,
+  any,
+  any,
+  any,
+  any,
+  any,
+  any
+>
+
+export function makeRouteDescriptor<
+  M,
+  PathA,
+  CookieA,
+  QueryA,
+  BodyA,
+  HeaderA,
+  ReqA extends PathA & QueryA & BodyA,
+  ResA = void,
+  METHOD extends REST.Methods.Rest = REST.Methods.Rest
+>(
+  path: `/${string}`,
+  method: METHOD,
+  handler: RouteRequestHandler<
+    M,
+    PathA,
+    CookieA,
+    QueryA,
+    BodyA,
+    HeaderA,
+    ReqA,
+    ResA,
+    `/${string}`
+  >
+): RouteDescriptor<
+  M,
+  PathA,
+  CookieA,
+  QueryA,
+  BodyA,
+  HeaderA,
+  ReqA,
+  ResA,
+  METHOD
+> {
+  return { path, handler, method, _tag: "Schema" }
+}
+
+// export function makeFromSchema<ResA>(
+//   e: RouteDescriptor<any, any, any, any, any, any, ResA, any>
+// ) {
+//   const jsonSchema_ = OpenApi.for
+//   const jsonSchema = <E, A>(r: REST.ReqRes<E, A>) => jsonSchema_(r)
+//   const { Request: Req, Response: Res_, ResponseOpenApi } = e.handler
+//   const r = ResponseOpenApi ?? Res_
+//   const Res = r ? S.extractSchema(r) : S.Void
+//   // TODO EffectOption.fromNullable(Req.Headers).flatMapOpt(jsonSchema)
+//   // TODO: use the path vs body etc serialisation also in the Client.
+//   const makeReqQuerySchema = Effect(Option.fromNullable(Req.Query)).flatMap((_) =>
+//     _.match({
+//       onNone: () => Effect(Option.none),
+//       onSome: (_) => jsonSchema(_).map(Option.some)
+//     })
+//   )
+//   const makeReqHeadersSchema = Effect(Option.fromNullable(Req.Headers)).flatMap((_) =>
+//     _.match({
+//       onNone: () => Effect(Option.none),
+//       onSome: (_) => jsonSchema(_).map(Option.some)
+//     })
+//   )
+//   const makeReqCookieSchema = Effect(Option.fromNullable(Req.Cookie)).flatMap((_) =>
+//     _.match({
+//       onNone: () => Effect(Option.none),
+//       onSome: (_) => jsonSchema(_).map(Option.some)
+//     })
+//   )
+//   const makeReqPathSchema = Effect(Option.fromNullable(Req.Path)).flatMap((_) =>
+//     _.match({
+//       onNone: () => Effect(Option.none),
+//       onSome: (_) => jsonSchema(_).map(Option.some)
+//     })
+//   )
+//   const makeReqBodySchema = Effect(Option.fromNullable(Req.Body)).flatMap((_) =>
+//     _.match({
+//       onNone: () => Effect(Option.none),
+//       onSome: (_) => jsonSchema(_).map(Option.some)
+//     })
+//   )
+//   // const makeReqSchema = schema(Req)
+
+//   const makeResSchema = jsonSchema_(Res)
+
+//   function makeParameters(inn: ParameterLocation) {
+//     return (a: Option<JSONSchema | SubSchema>) => {
+//       return a
+//         .flatMap((o) => (isObjectSchema(o) ? Option(o) : Option.none))
+//         .map((x) => {
+//           // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+//           return Object.keys(x.properties!).map((p) => {
+//             // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+//             const schema = x.properties![p]
+//             const required = Boolean(x.required?.includes(p))
+//             return { name: p, in: inn, required, schema }
+//           })
+//         })
+//         .getOrElse(() => [])
+//     }
+//   }
+
+//   return Effect
+//     .all({
+//       req: jsonSchema(Req.Model),
+//       reqQuery: makeReqQuerySchema,
+//       reqHeaders: makeReqHeadersSchema,
+//       reqBody: makeReqBodySchema,
+//       reqPath: makeReqPathSchema,
+//       reqCookie: makeReqCookieSchema,
+//       res: makeResSchema
+//     })
+//     .map((_) => {
+//       // console.log("$$$ REQ", _.req)
+//       const isEmpty = !e.handler.Response || e.handler.Response === S.Void
+//       return {
+//         path: e.path,
+//         method: e.method.toLowerCase(),
+//         tags: e.info?.tags,
+//         description: _.req?.description,
+//         summary: _.req?.summary,
+//         operationId: _.req?.title,
+//         parameters: [
+//           ...makeParameters("path")(_.reqPath),
+//           ...makeParameters("query")(_.reqQuery),
+//           ...makeParameters("header")(_.reqHeaders),
+//           ...makeParameters("cookie")(_.reqCookie)
+//         ],
+//         requestBody: _
+//           .reqBody
+//           .map((schema) => ({
+//             content: { "application/json": { schema } }
+//           }))
+//           .value,
+//         responses: [
+//           isEmpty
+//             ? new Response(204, { description: "Empty" })
+//             : new Response(200, {
+//               description: "OK",
+//               content: { "application/json": { schema: _.res } }
+//             }),
+//           new Response(400, { description: "ValidationError" })
+//         ]
+//           .concat(
+//             e.path.includes(":") && isEmpty
+//               ? [new Response(404, { description: "NotFoundError" })]
+//               : []
+//           )
+//       }
+//     })
+// }
+
+// class Response {
+//   constructor(
+//     public readonly statusCode: number,
+//     public readonly type: any // string | JSONSchema | SubSchema
+//   ) {}
+// }

package/dist/api/express/schema/routing.d.ts

@@ -0,0 +1,31 @@
+import { Tag } from "effect/Context";
+import type { REST } from "@effect-app/prelude/schema";
+export type Request<M, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA extends PathA & QueryA & BodyA, PPath extends `/${string}`> = REST.ReqRes<unknown, ReqA> & {
+    method: REST.Methods.Rest;
+    path: PPath;
+    Cookie?: REST.ReqRes<Record<string, string>, CookieA>;
+    Path?: REST.ReqRes<Record<string, string>, PathA>;
+    Body?: REST.ReqRes<unknown, BodyA>;
+    Query?: REST.ReqRes<Record<string, string>, QueryA>;
+    Headers?: REST.ReqRes<Record<string, string>, HeaderA>;
+    Tag: Tag<M, M>;
+};
+export interface RouteRequestHandler<M, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA extends PathA & QueryA & BodyA, ResA, PPath extends `/${string}`> {
+    Request: Request<M, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA, PPath>;
+    Response?: REST.ReqRes<unknown, ResA>;
+    ResponseOpenApi?: any;
+}
+export declare function asRouteDescriptionAny<R extends RouteDescriptorAny>(i: R): RouteDescriptorAny;
+export declare function arrAsRouteDescriptionAny<R extends RouteDescriptorAny>(arr: ReadonlyArray<R>): RouteDescriptorAny[];
+export interface RouteDescriptor<M, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA extends PathA & QueryA & BodyA, ResA, METHOD extends REST.Methods.Rest = REST.Methods.Rest> {
+    _tag: "Schema";
+    path: `/${string}`;
+    method: METHOD;
+    handler: RouteRequestHandler<M, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA, ResA, `/${string}`>;
+    info?: {
+        tags: ReadonlyArray<string>;
+    };
+}
+export type RouteDescriptorAny = RouteDescriptor<any, any, any, any, any, any, any, any>;
+export declare function makeRouteDescriptor<M, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA extends PathA & QueryA & BodyA, ResA = void, METHOD extends REST.Methods.Rest = REST.Methods.Rest>(path: `/${string}`, method: METHOD, handler: RouteRequestHandler<M, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA, ResA, `/${string}`>): RouteDescriptor<M, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA, ResA, METHOD>;
+//# sourceMappingURL=routing.d.ts.map

package/dist/api/express/schema/routing.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"routing.d.ts","sourceRoot":"","sources":["../../../../_src/api/express/schema/routing.ts"],"names":[],"mappings":"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"}

package/dist/api/express/schema/routing.js

@@ -0,0 +1,10 @@
+export function asRouteDescriptionAny(i) {
+    return i;
+}
+export function arrAsRouteDescriptionAny(arr) {
+    return arr.map(asRouteDescriptionAny);
+}
+export function makeRouteDescriptor(path, method, handler) {
+    return { path, handler, method, _tag: "Schema" };
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGluZy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL19zcmMvYXBpL2V4cHJlc3Mvc2NoZW1hL3JvdXRpbmcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBd0NBLE1BQU0sVUFBVSxxQkFBcUIsQ0FBK0IsQ0FBSTtJQUN0RSxPQUFPLENBQXVCLENBQUE7QUFDaEMsQ0FBQztBQUVELE1BQU0sVUFBVSx3QkFBd0IsQ0FDdEMsR0FBcUI7SUFFckIsT0FBTyxHQUFHLENBQUMsR0FBRyxDQUFDLHFCQUFxQixDQUFDLENBQUE7QUFDdkMsQ0FBQztBQWlDRCxNQUFNLFVBQVUsbUJBQW1CLENBV2pDLElBQWtCLEVBQ2xCLE1BQWMsRUFDZCxPQVVDO0lBWUQsT0FBTyxFQUFFLElBQUksRUFBRSxPQUFPLEVBQUUsTUFBTSxFQUFFLElBQUksRUFBRSxRQUFRLEVBQUUsQ0FBQTtBQUNsRCxDQUFDIn0=

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?: "and" | "or" | undefined) => Filter<PM>;
+    }) => Where | readonly [Where, ...Where[]], mode?: "or" | "and" | 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/simpledb/cosmosdb.d.ts

@@ -7,8 +7,8 @@ import type { DBRecord } from "./shared.js";
 import { OptimisticLockException } from "./shared.js";
 import * as simpledb from "./simpledb.js";
 export declare function createContext<TKey extends string, EA, A extends DBRecord<TKey>>(): <REncode, RDecode, EDecode>(type: string, encode: (record: A) => Effect<REncode, never, EA>, decode: (d: EA) => Effect<RDecode, EDecode, A>, indexes: IndexingPolicy) => import("effect/Effect").Effect<Cosmos.CosmosClient, import("effect/Cause").UnknownException, {
-    find: (id: string) => import("effect/Effect").Effect<RDecode | Cosmos.CosmosClient | simpledb.RecordCache, import("effect/Cause").UnknownException | simpledb.InvalidStateError, import("effect/Option").Option<A>>;
+    find: (id: string) => import("effect/Effect").Effect<Cosmos.CosmosClient | simpledb.RecordCache | RDecode, import("effect/Cause").UnknownException | simpledb.InvalidStateError, import("effect/Option").Option<A>>;
     findBy: (parameters: Record<string, string>) => import("effect/Effect").Effect<Cosmos.CosmosClient, import("effect/Cause").UnknownException, import("effect/Option").Option<any>>;
-    save: (record: A) => import("effect/Effect").Effect<REncode | Cosmos.CosmosClient | simpledb.RecordCache, OptimisticLockException, A>;
+    save: (record: A) => import("effect/Effect").Effect<Cosmos.CosmosClient | simpledb.RecordCache | REncode, OptimisticLockException, A>;
 }>;
 //# sourceMappingURL=cosmosdb.d.ts.map

package/dist/services/simpledb/diskdb.d.ts

@@ -4,9 +4,9 @@ import type { DBRecord, Index } from "./shared.js";
 import { CouldNotAquireDbLockException } from "./shared.js";
 import * as simpledb from "./simpledb.js";
 export declare function createContext<TKey extends string, EA, A extends DBRecord<TKey>>(): <REncode, RDecode, EDecode>(type: string, encode: (record: A) => Effect<REncode, never, EA>, decode: (d: EA) => Effect<RDecode, EDecode, A>, schemaVersion: string, makeIndexKey: (r: A) => Index, dir?: string) => {
-    find: (id: string) => import("effect/Effect").Effect<RDecode | simpledb.RecordCache, simpledb.InvalidStateError, import("effect/Option").Option<A>>;
+    find: (id: string) => import("effect/Effect").Effect<simpledb.RecordCache | RDecode, simpledb.InvalidStateError, import("effect/Option").Option<A>>;
     findByIndex: (index: Index) => import("effect/Effect").Effect<never, never, import("effect/Option").Option<TKey & {}>>;
-    save: (record: A) => import("effect/Effect").Effect<REncode | simpledb.RecordCache, CouldNotAquireDbLockException | import("./shared.js").OptimisticLockException | simpledb.InvalidStateError, A>;
+    save: (record: A) => import("effect/Effect").Effect<simpledb.RecordCache | REncode, CouldNotAquireDbLockException | import("./shared.js").OptimisticLockException | simpledb.InvalidStateError, A>;
 };
 export declare function initialise(dir: string): void;
 //# sourceMappingURL=diskdb.d.ts.map

package/dist/services/simpledb/memdb.d.ts

@@ -4,8 +4,8 @@ import { Option } from "@effect-app/core/Option";
 import type { DBRecord } from "./shared.js";
 import * as simpledb from "./simpledb.js";
 export declare function createContext<TKey extends string, EA, A extends DBRecord<TKey>>(): <REncode, RDecode, EDecode>(type: string, encode: (record: A) => Effect<REncode, never, EA>, decode: (d: EA) => Effect<RDecode, EDecode, A>) => {
-    find: (id: string) => import("effect/Effect").Effect<RDecode | simpledb.RecordCache, import("@effect/schema/ParseResult").ParseError | simpledb.InvalidStateError, import("effect/Option").Option<A>>;
+    find: (id: string) => import("effect/Effect").Effect<simpledb.RecordCache | RDecode, import("@effect/schema/ParseResult").ParseError | simpledb.InvalidStateError, import("effect/Option").Option<A>>;
     findBy: <V extends Partial<A>>(keys: V, eq: Equivalence<V>) => import("effect/Effect").Effect<RDecode, import("@effect/schema/ParseResult").ParseError, import("effect/Option").Option<A & {}>>;
-    save: (record: A) => import("effect/Effect").Effect<REncode | simpledb.RecordCache, import("@effect/schema/ParseResult").ParseError | import("./shared.js").OptimisticLockException | simpledb.InvalidStateError, A>;
+    save: (record: A) => import("effect/Effect").Effect<simpledb.RecordCache | REncode, import("@effect/schema/ParseResult").ParseError | import("./shared.js").OptimisticLockException | simpledb.InvalidStateError, A>;
 };
 //# sourceMappingURL=memdb.d.ts.map

package/dist/services/simpledb/mongodb.d.ts

@@ -6,8 +6,8 @@ import type { DBRecord } from "./shared.js";
 import { OptimisticLockException } from "./shared.js";
 import * as simpledb from "./simpledb.js";
 export declare function createContext<TKey extends string, EA, A extends DBRecord<TKey>>(): <REncode, RDecode, EDecode>(type: string, encode: (record: A) => Effect<REncode, never, EA>, decode: (d: EA) => Effect<RDecode, EDecode, A>, indexes: IndexDescription[]) => import("effect/Effect").Effect<MongoClient, import("effect/Cause").UnknownException, {
-    find: (id: string) => import("effect/Effect").Effect<RDecode | MongoClient | simpledb.RecordCache, import("effect/Cause").UnknownException | simpledb.InvalidStateError, import("effect/Option").Option<A>>;
+    find: (id: string) => import("effect/Effect").Effect<simpledb.RecordCache | RDecode | MongoClient, import("effect/Cause").UnknownException | simpledb.InvalidStateError, import("effect/Option").Option<A>>;
     findBy: (keys: Record<string, string>) => import("effect/Effect").Effect<MongoClient, import("effect/Cause").UnknownException, import("effect/Option").Option<TKey>>;
-    save: (record: A) => import("effect/Effect").Effect<REncode | MongoClient | simpledb.RecordCache, OptimisticLockException, A>;
+    save: (record: A) => import("effect/Effect").Effect<simpledb.RecordCache | REncode | MongoClient, OptimisticLockException, A>;
 }>;
 //# sourceMappingURL=mongodb.d.ts.map

package/dist/services/simpledb/redisdb.d.ts

@@ -6,9 +6,9 @@ import type { DBRecord, Index } from "./shared.js";
 import { CouldNotAquireDbLockException } from "./shared.js";
 import * as simpledb from "./simpledb.js";
 export declare function createContext<TKey extends string, EA, A extends DBRecord<TKey>>(): <REncode, RDecode, EDecode>(type: string, encode: (record: A) => Effect<REncode, never, EA>, decode: (d: EA) => Effect<RDecode, EDecode, A>, schemaVersion: string, makeIndexKey: (r: A) => Index) => {
-    find: (id: string) => import("effect/Effect").Effect<RDecode | RedisClient | simpledb.RecordCache, simpledb.InvalidStateError, import("effect/Option").Option<A>>;
+    find: (id: string) => import("effect/Effect").Effect<RedisClient | simpledb.RecordCache | RDecode, simpledb.InvalidStateError, import("effect/Option").Option<A>>;
     findByIndex: (index: Index) => import("effect/Effect").Effect<RedisClient, import("@effect-app/infra-adapters/redis-client").ConnectionException, import("effect/Option").Option<TKey>>;
-    save: (record: A) => import("effect/Effect").Effect<REncode | RedisClient | simpledb.RecordCache, CouldNotAquireDbLockException | import("./shared.js").OptimisticLockException | simpledb.InvalidStateError, A>;
+    save: (record: A) => import("effect/Effect").Effect<RedisClient | simpledb.RecordCache | REncode, CouldNotAquireDbLockException | import("./shared.js").OptimisticLockException | simpledb.InvalidStateError, A>;
 };
 declare const RedisSerializedDBRecord_base: S.Class<{
     readonly data: string;

package/dist/services/simpledb/simpledb.d.ts

@@ -17,7 +17,7 @@ export interface RecordCache extends ReturnType<typeof makeLiveRecordCache> {
 }
 export declare const RecordCache: import("effect/Context").Tag<RecordCache, RecordCache>;
 export declare const LiveRecordCache: import("effect/Layer").Layer<never, never, RecordCache>;
-export declare function find<R, RDecode, EDecode, E, EA, A>(tryRead: (id: string) => Effect<R, E, Option<CachedRecord<EA>>>, decode: (d: EA) => Effect<RDecode, EDecode, A>, type: string): (id: string) => import("effect/Effect").Effect<R | RDecode | RecordCache, E | InvalidStateError, import("effect/Option").Option<A>>;
-export declare function storeDirectly<R, E, TKey extends string, A extends DBRecord<TKey>>(save: (r: A, version: Option<Version>) => Effect<R, E, CachedRecord<A>>, type: string): (record: A) => import("effect/Effect").Effect<R | RecordCache, E, A>;
-export declare function store<R, E, R2, E2, TKey extends string, EA, A extends DBRecord<TKey>>(tryRead: (id: string) => Effect<R, E, Option<CachedRecord<EA>>>, save: (r: A, version: Option<Version>) => Effect<R, E, CachedRecord<A>>, lock: (id: string) => Effect<R2 | Scope, E2, unknown>, type: string): (record: A) => import("effect/Effect").Effect<R | RecordCache | Exclude<R2, import("effect/Scope").Scope>, E | E2 | OptimisticLockException | InvalidStateError, A>;
+export declare function find<R, RDecode, EDecode, E, EA, A>(tryRead: (id: string) => Effect<R, E, Option<CachedRecord<EA>>>, decode: (d: EA) => Effect<RDecode, EDecode, A>, type: string): (id: string) => import("effect/Effect").Effect<RecordCache | R | RDecode, InvalidStateError | E, import("effect/Option").Option<A>>;
+export declare function storeDirectly<R, E, TKey extends string, A extends DBRecord<TKey>>(save: (r: A, version: Option<Version>) => Effect<R, E, CachedRecord<A>>, type: string): (record: A) => import("effect/Effect").Effect<RecordCache | R, E, A>;
+export declare function store<R, E, R2, E2, TKey extends string, EA, A extends DBRecord<TKey>>(tryRead: (id: string) => Effect<R, E, Option<CachedRecord<EA>>>, save: (r: A, version: Option<Version>) => Effect<R, E, CachedRecord<A>>, lock: (id: string) => Effect<R2 | Scope, E2, unknown>, type: string): (record: A) => import("effect/Effect").Effect<RecordCache | R | Exclude<R2, import("effect/Scope").Scope>, OptimisticLockException | InvalidStateError | E | E2, A>;
 //# sourceMappingURL=simpledb.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/infra",
-  "version": "0.133.0-next.3",
+  "version": "0.133.0-next.5",
   "license": "MIT",
   "type": "module",
   "dependencies": {
@@ -19,10 +19,10 @@
     "proper-lockfile": "^4.1.2",
     "pure-rand": "6.0.4",
     "redlock": "^4.2.0",
-    "@effect-app/core": "0.97.0-next.0",
-    "@effect-app/prelude": "0.107.0-next.3",
-    "@effect-app/infra-adapters": "0.85.0-next.3",
-    "@effect-app/schema": "0.150.0-next.1"
+    "@effect-app/core": "0.97.0-next.1",
+    "@effect-app/prelude": "0.107.0-next.4",
+    "@effect-app/infra-adapters": "0.85.0-next.4",
+    "@effect-app/schema": "0.150.0-next.2"
   },
   "devDependencies": {
     "@babel/cli": "^7.23.4",
@@ -143,6 +143,16 @@
         "default": "./_cjs/api/express/schema/jwt.cjs"
       }
     },
+    "./api/express/schema/routing": {
+      "import": {
+        "types": "./dist/api/express/schema/routing.d.ts",
+        "default": "./dist/api/express/schema/routing.js"
+      },
+      "require": {
+        "types": "./dist/api/express/schema/routing.d.ts",
+        "default": "./_cjs/api/express/schema/routing.cjs"
+      }
+    },
     "./api/reportError": {
       "import": {
         "types": "./dist/api/reportError.d.ts",

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

@@ -1,241 +0,0 @@
-/* eslint-disable @typescript-eslint/ban-types */
-/* eslint-disable @typescript-eslint/no-explicit-any */
-import * as S from "@effect-app/prelude/schema"
-import type { Methods } from "@effect-app/schema"
-
-import type { JSONSchema, ParameterLocation, SubSchema } from "@effect-app/infra-adapters/Openapi/atlas-plutus"
-import { isObjectSchema } from "@effect-app/infra-adapters/Openapi/atlas-plutus"
-import * as OpenApi from "@effect-app/infra-adapters/Openapi/index"
-
-export type Request<
-  M,
-  PathA,
-  CookieA,
-  QueryA,
-  BodyA,
-  HeaderA,
-  ReqA extends PathA & QueryA & BodyA,
-  PPath extends `/${string}`
-> = S.REST.ReqRes<unknown, ReqA> & {
-  method: Methods.Rest
-  path: PPath
-  Cookie?: S.REST.ReqRes<Record<string, string>, CookieA>
-  Path?: S.REST.ReqRes<Record<string, string>, PathA>
-  Body?: S.REST.ReqRes<unknown, BodyA>
-  Query?: S.REST.ReqRes<Record<string, string>, QueryA>
-  Headers?: S.REST.ReqRes<Record<string, string>, HeaderA>
-  Tag: Tag<M, M>
-}
-
-export interface RouteRequestHandler<
-  M,
-  PathA,
-  CookieA,
-  QueryA,
-  BodyA,
-  HeaderA,
-  ReqA extends PathA & QueryA & BodyA,
-  ResA,
-  PPath extends `/${string}`
-> {
-  Request: Request<M, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA, PPath>
-  Response?: S.REST.ReqRes<unknown, ResA> // | S.REST.ReqResSchemed<unknown, ResA>
-  ResponseOpenApi?: any
-}
-
-export function asRouteDescriptionAny<R extends RouteDescriptorAny>(i: R) {
-  return i as RouteDescriptorAny
-}
-
-export function arrAsRouteDescriptionAny<R extends RouteDescriptorAny>(
-  arr: ReadonlyArray<R>
-) {
-  return arr.map(asRouteDescriptionAny)
-}
-
-export interface RouteDescriptor<
-  M,
-  PathA,
-  CookieA,
-  QueryA,
-  BodyA,
-  HeaderA,
-  ReqA extends PathA & QueryA & BodyA,
-  ResA,
-  METHOD extends Methods.Rest = Methods.Rest
-> {
-  _tag: "Schema"
-  path: `/${string}`
-  method: METHOD
-  handler: RouteRequestHandler<M, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA, ResA, `/${string}`>
-  info?: {
-    tags: ReadonlyArray<string>
-  }
-}
-
-export type RouteDescriptorAny = RouteDescriptor<
-  any,
-  any,
-  any,
-  any,
-  any,
-  any,
-  any,
-  any
->
-
-export function makeRouteDescriptor<
-  M,
-  PathA,
-  CookieA,
-  QueryA,
-  BodyA,
-  HeaderA,
-  ReqA extends PathA & QueryA & BodyA,
-  ResA = void,
-  METHOD extends Methods.Rest = Methods.Rest
->(
-  path: `/${string}`,
-  method: METHOD,
-  handler: RouteRequestHandler<
-    M,
-    PathA,
-    CookieA,
-    QueryA,
-    BodyA,
-    HeaderA,
-    ReqA,
-    ResA,
-    `/${string}`
-  >
-): RouteDescriptor<
-  M,
-  PathA,
-  CookieA,
-  QueryA,
-  BodyA,
-  HeaderA,
-  ReqA,
-  ResA,
-  METHOD
-> {
-  return { path, handler, method, _tag: "Schema" }
-}
-
-export function makeFromSchema<ResA>(
-  e: RouteDescriptor<any, any, any, any, any, any, ResA, any>
-) {
-  const jsonSchema_ = OpenApi.for
-  const jsonSchema = <E, A>(r: S.REST.ReqRes<E, A>) => jsonSchema_(r)
-  const { Request: Req, Response: Res_, ResponseOpenApi } = e.handler
-  const r = ResponseOpenApi ?? Res_
-  const Res = r ? S.extractSchema(r) : S.Void
-  // TODO EffectOption.fromNullable(Req.Headers).flatMapOpt(jsonSchema)
-  // TODO: use the path vs body etc serialisation also in the Client.
-  const makeReqQuerySchema = Effect(Option.fromNullable(Req.Query)).flatMap((_) =>
-    _.match({
-      onNone: () => Effect(Option.none),
-      onSome: (_) => jsonSchema(_).map(Option.some)
-    })
-  )
-  const makeReqHeadersSchema = Effect(Option.fromNullable(Req.Headers)).flatMap((_) =>
-    _.match({
-      onNone: () => Effect(Option.none),
-      onSome: (_) => jsonSchema(_).map(Option.some)
-    })
-  )
-  const makeReqCookieSchema = Effect(Option.fromNullable(Req.Cookie)).flatMap((_) =>
-    _.match({
-      onNone: () => Effect(Option.none),
-      onSome: (_) => jsonSchema(_).map(Option.some)
-    })
-  )
-  const makeReqPathSchema = Effect(Option.fromNullable(Req.Path)).flatMap((_) =>
-    _.match({
-      onNone: () => Effect(Option.none),
-      onSome: (_) => jsonSchema(_).map(Option.some)
-    })
-  )
-  const makeReqBodySchema = Effect(Option.fromNullable(Req.Body)).flatMap((_) =>
-    _.match({
-      onNone: () => Effect(Option.none),
-      onSome: (_) => jsonSchema(_).map(Option.some)
-    })
-  )
-  // const makeReqSchema = schema(Req)
-
-  const makeResSchema = jsonSchema_(Res)
-
-  function makeParameters(inn: ParameterLocation) {
-    return (a: Option<JSONSchema | SubSchema>) => {
-      return a
-        .flatMap((o) => (isObjectSchema(o) ? Option(o) : Option.none))
-        .map((x) => {
-          // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-          return Object.keys(x.properties!).map((p) => {
-            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-            const schema = x.properties![p]
-            const required = Boolean(x.required?.includes(p))
-            return { name: p, in: inn, required, schema }
-          })
-        })
-        .getOrElse(() => [])
-    }
-  }
-
-  return Effect
-    .all({
-      req: jsonSchema(Req.Model),
-      reqQuery: makeReqQuerySchema,
-      reqHeaders: makeReqHeadersSchema,
-      reqBody: makeReqBodySchema,
-      reqPath: makeReqPathSchema,
-      reqCookie: makeReqCookieSchema,
-      res: makeResSchema
-    })
-    .map((_) => {
-      // console.log("$$$ REQ", _.req)
-      const isEmpty = !e.handler.Response || e.handler.Response === S.Void
-      return {
-        path: e.path,
-        method: e.method.toLowerCase(),
-        tags: e.info?.tags,
-        description: _.req?.description,
-        summary: _.req?.summary,
-        operationId: _.req?.title,
-        parameters: [
-          ...makeParameters("path")(_.reqPath),
-          ...makeParameters("query")(_.reqQuery),
-          ...makeParameters("header")(_.reqHeaders),
-          ...makeParameters("cookie")(_.reqCookie)
-        ],
-        requestBody: _
-          .reqBody
-          .map((schema) => ({
-            content: { "application/json": { schema } }
-          }))
-          .value,
-        responses: [
-          isEmpty
-            ? new Response(204, { description: "Empty" })
-            : new Response(200, {
-              description: "OK",
-              content: { "application/json": { schema: _.res } }
-            }),
-          new Response(400, { description: "ValidationError" })
-        ]
-          .concat(
-            e.path.includes(":") && isEmpty
-              ? [new Response(404, { description: "NotFoundError" })]
-              : []
-          )
-      }
-    })
-}
-
-class Response {
-  constructor(
-    public readonly statusCode: number,
-    public readonly type: any // string | JSONSchema | SubSchema
-  ) {}
-}