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

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@effect-app/infra",
-  "version": "0.133.0-next.3",
+  "version": "0.133.0-next.30",
   "license": "MIT",
   "type": "module",
   "dependencies": {
     "@azure/cosmos": "^4.0.0",
     "@azure/service-bus": "^7.9.3",
-    "@effect/schema": "^0.56.1",
+    "@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",
@@ -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.4",
+    "@effect-app/prelude": "0.107.0-next.28",
+    "@effect-app/infra-adapters": "0.85.0-next.28",
+    "@effect-app/schema": "0.150.0-next.20"
   },
   "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",
@@ -672,6 +682,16 @@
         "types": "./dist/services/simpledb/simpledb.d.ts",
         "default": "./_cjs/services/simpledb/simpledb.cjs"
       }
+    },
+    "./test.arbs": {
+      "import": {
+        "types": "./dist/test.arbs.d.ts",
+        "default": "./dist/test.arbs.js"
+      },
+      "require": {
+        "types": "./dist/test.arbs.d.ts",
+        "default": "./_cjs/test.arbs.cjs"
+      }
     }
   },
   "gitHead": "bd8e27eea3eff97db8739d577d67e7336c078d28",

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
-  ) {}
-}

package/_src/test.arbs.ts.bak

@@ -1,27 +0,0 @@
-// Do not import to frontend
-
-import { setFaker } from "@effect-app/prelude/faker"
-import type { Arbitrary } from "@effect-app/prelude/schema"
-import { faker } from "@faker-js/faker"
-import { Random } from "fast-check"
-import * as fc from "fast-check"
-import * as rand from "pure-rand"
-
-const rnd = new Random(rand.congruential32(5))
-
-setFaker(faker)
-
-/**
- * @tsplus getter FastCheck generate
- */
-export function generate<T>(arb: fc.Arbitrary<T>) {
-  return arb.generate(rnd, undefined)
-}
-
-/**
- * @tsplus getter ets/Schema/Arbitrary/Gen generate
- */
-
-export function generateFromArbitrary<T>(arb: Arbitrary.Gen<T>) {
-  return generate(arb(fc))
-}