@effect-app/infra 1.7.2 → 1.8.0

package/src/api/routing/defaultErrorHandler.ts

@@ -1,6 +1,6 @@
 import { logError } from "@effect-app/infra/errorReporter"
 import type { Schema } from "@effect-app/schema"
-import { setBody, setStatus } from "@effect/platform/Http/ServerResponse"
+import { setBody, setStatus } from "@effect/platform/HttpServerResponse"
 import { Cause, Data, Effect, S, Schedule } from "effect-app"
 import type { SupportedErrors } from "effect-app/client/errors"
 import {
@@ -31,9 +31,9 @@ export class JWTError extends Data.TaggedClass("JWTError")<{
 const logRequestError = logError("Request")
 
 export function defaultBasicErrorHandler<R>(
-  _req: HttpServerRequest.ServerRequest,
-  res: HttpServerResponse.ServerResponse,
-  r2: Effect<HttpServerResponse.ServerResponse, ValidationError, R>
+  _req: HttpServerRequest.HttpServerRequest,
+  res: HttpServerResponse.HttpServerResponse,
+  r2: Effect<HttpServerResponse.HttpServerResponse, ValidationError, R>
 ) {
   const sendError = (code: number) => (body: unknown) =>
     Effect.sync(() => setBody(res, HttpBody.unsafeJson(body)).pipe(setStatus(code)))
@@ -59,9 +59,9 @@ const optimisticConcurrencySchedule = Schedule.once
   && Schedule.recurWhile<SupportedErrors | JWTError>((a) => a._tag === "OptimisticConcurrencyException")
 
 export function defaultErrorHandler<R>(
-  req: HttpServerRequest.ServerRequest,
-  res: HttpServerResponse.ServerResponse,
-  r2: Effect<HttpServerResponse.ServerResponse, SupportedErrors | JWTError, R>
+  req: HttpServerRequest.HttpServerRequest,
+  res: HttpServerResponse.HttpServerResponse,
+  r2: Effect<HttpServerResponse.HttpServerResponse, SupportedErrors | JWTError, R>
 ) {
   const r3 = req.method === "PATCH"
     ? Effect.retry(r2, optimisticConcurrencySchedule)

package/src/api/routing/makeRequestHandler.ts

@@ -111,17 +111,17 @@ export function makeRequestHandler<
     Config
   >,
   errorHandler: <R>(
-    req: HttpServerRequest.ServerRequest,
-    res: HttpServerResponse.ServerResponse,
-    r2: Effect<HttpServerResponse.ServerResponse, ValidationError | ResE | MiddlewareE, R>
-  ) => Effect<HttpServerResponse.ServerResponse, never, RErr | R>,
+    req: HttpServerRequest.HttpServerRequest,
+    res: HttpServerResponse.HttpServerResponse,
+    r2: Effect<HttpServerResponse.HttpServerResponse, ValidationError | ResE | MiddlewareE, R>
+  ) => Effect<HttpServerResponse.HttpServerResponse, never, RErr | R>,
   middlewareLayer?: Layer<PR, MiddlewareE, R2>
 ): Effect<
-  HttpServerResponse.ServerResponse,
+  HttpServerResponse.HttpServerResponse,
   HttpServerError.RequestError,
   | HttpRouter.RouteContext
   | HttpServerRequest.ParsedSearchParams
-  | HttpServerRequest.ServerRequest
+  | HttpServerRequest.HttpServerRequest
   | RequestContextContainer
   | ContextMapContainer
   | RequestFiberSet
@@ -154,7 +154,7 @@ export function makeRequestHandler<
         rcx: HttpRouter.RouteContext,
         searchParms: HttpServerRequest.ParsedSearchParams,
         req: Effect.flatMap(
-          HttpServerRequest.ServerRequest,
+          HttpServerRequest.HttpServerRequest,
           (req) => req.json.pipe(Effect.map((body) => ({ body, headers: req.headers })))
         )
       }),
@@ -171,7 +171,7 @@ export function makeRequestHandler<
 
   return Effect
     .gen(function*($) {
-      const req = yield* $(HttpServerRequest.ServerRequest)
+      const req = yield* $(HttpServerRequest.HttpServerRequest)
       const res = HttpServerResponse
         .empty()
         .pipe((_) => req.method === "GET" ? HttpServerResponse.setHeader(_, "Cache-Control", "no-store") : _)
@@ -247,7 +247,7 @@ export function makeRequestHandler<
                           )
                       )
                     ) as Effect<
-                      HttpServerResponse.ServerResponse,
+                      HttpServerResponse.HttpServerResponse,
                       ValidationError | ResE,
                       Exclude<R, EnforceNonEmptyRecord<M>>
                     >
@@ -256,7 +256,7 @@ export function makeRequestHandler<
                     ? Effect.provide(handleRequest, middlewareLayer)
                     // PR is not relevant here
                     : (handleRequest as Effect<
-                      HttpServerResponse.ServerResponse,
+                      HttpServerResponse.HttpServerResponse,
                       ResE | MiddlewareE | ValidationError,
                       Exclude<Exclude<R, EnforceNonEmptyRecord<M>>, PR>
                     >)

package/src/api/routing/match.ts

@@ -51,13 +51,13 @@ export function match<
     Config
   >,
   errorHandler: <R>(
-    req: HttpServerRequest.ServerRequest,
-    res: HttpServerResponse.ServerResponse,
-    r2: Effect<HttpServerResponse.ServerResponse, ValidationError | MiddlewareE | ResE, R>
+    req: HttpServerRequest.HttpServerRequest,
+    res: HttpServerResponse.HttpServerResponse,
+    r2: Effect<HttpServerResponse.HttpServerResponse, ValidationError | MiddlewareE | ResE, R>
   ) => Effect<
-    HttpServerResponse.ServerResponse,
+    HttpServerResponse.HttpServerResponse,
     never,
-    Exclude<RErr | R, HttpServerRequest.ServerRequest | HttpRouter.RouteContext | Scope>
+    Exclude<RErr | R, HttpServerRequest.HttpServerRequest | HttpRouter.RouteContext | Scope>
   >,
   middleware?: Middleware<
     R,
@@ -115,8 +115,7 @@ export function match<
       requestHandler.Request.method,
       requestHandler.Request.path,
       handler,
-      undefined,
-      requestHandler.Request.method !== "GET" // we don't want commands to be interruptible
+      { uninterruptible: requestHandler.Request.method !== "GET" } // we don't want commands to be interruptible
     )
     // TODO
     // rdesc.push(makeRouteDescriptor(

package/src/errorReporter.ts

@@ -42,7 +42,8 @@ export function reportError(
               __cause__: tryToJson(error),
               __error_name__: name
             })),
-            Effect.catchAll(() => Effect.logError("Failed to log error"))
+            Effect.catchAllCause((cause) => Effect.logError("Failed to log error", cause)),
+            Effect.catchAllCause(() => Effect.logError("Failed to log error cause"))
           )
       )
       error[ErrorReported] = true
@@ -83,7 +84,8 @@ export function logError<E>(
               __cause__: tryToJson(error),
               __error_name__: name
             })),
-            Effect.catchAll(() => Effect.logError("Failed to log error"))
+            Effect.catchAllCause((cause) => Effect.logError("Failed to log error", cause)),
+            Effect.catchAllCause(() => Effect.logError("Failed to log error cause"))
           )
       )
     })

package/vitest.config.ts.timestamp-1711744615239-dcf257a844e01.mjs

@@ -0,0 +1,37 @@
+// packages/infra/vitest.config.ts
+import { defineConfig } from "file:///Users/patrickroza/pj/effect-app/libs/node_modules/.pnpm/vite@5.2.6_@types+node@20.11.30/node_modules/vite/dist/node/index.js";
+
+// vite.config.base.ts
+import path from "path";
+import fs from "fs";
+var __vite_injected_original_dirname = "/Users/patrickroza/pj/effect-app/libs";
+function makeConfig(dirName) {
+  const prefix = path.resolve(__vite_injected_original_dirname, "packages");
+  const packages = fs.readdirSync(prefix).map((f) => prefix + "/" + f).filter((f) => fs.lstatSync(f).isDirectory());
+  const cfg = {
+    // eslint-disable-next-line @typescript-eslint/no-var-requires
+    //plugins: [autoImport],
+    test: {
+      include: ["./test/**/*.test.{js,mjs,cjs,ts,mts,cts,jsx,tsx}"],
+      reporters: "verbose",
+      globals: true
+    },
+    resolve: {
+      alias: packages.reduce((acc, cur) => {
+        acc[JSON.parse(fs.readFileSync(cur + "/package.json", "utf-8")).name] = path.resolve(cur, cur.endsWith("core") ? "dist" : "src");
+        return acc;
+      }, {})
+      // "@effect-app/core/Prelude": path.join(__dirname, "packages/core/src/Prelude.code.ts")
+    }
+  };
+  console.log(cfg);
+  return cfg;
+}
+
+// packages/infra/vitest.config.ts
+var __vite_injected_original_dirname2 = "/Users/patrickroza/pj/effect-app/libs/packages/infra";
+var vitest_config_default = defineConfig(makeConfig(__vite_injected_original_dirname2));
+export {
+  vitest_config_default as default
+};
+//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsicGFja2FnZXMvaW5mcmEvdml0ZXN0LmNvbmZpZy50cyIsICJ2aXRlLmNvbmZpZy5iYXNlLnRzIl0sCiAgInNvdXJjZXNDb250ZW50IjogWyJjb25zdCBfX3ZpdGVfaW5qZWN0ZWRfb3JpZ2luYWxfZGlybmFtZSA9IFwiL1VzZXJzL3BhdHJpY2tyb3phL3BqL2VmZmVjdC1hcHAvbGlicy9wYWNrYWdlcy9pbmZyYVwiO2NvbnN0IF9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9maWxlbmFtZSA9IFwiL1VzZXJzL3BhdHJpY2tyb3phL3BqL2VmZmVjdC1hcHAvbGlicy9wYWNrYWdlcy9pbmZyYS92aXRlc3QuY29uZmlnLnRzXCI7Y29uc3QgX192aXRlX2luamVjdGVkX29yaWdpbmFsX2ltcG9ydF9tZXRhX3VybCA9IFwiZmlsZTovLy9Vc2Vycy9wYXRyaWNrcm96YS9wai9lZmZlY3QtYXBwL2xpYnMvcGFja2FnZXMvaW5mcmEvdml0ZXN0LmNvbmZpZy50c1wiOy8vLyA8cmVmZXJlbmNlIHR5cGVzPVwidml0ZXN0XCIgLz5cbmltcG9ydCB7IGRlZmluZUNvbmZpZyB9IGZyb20gXCJ2aXRlXCJcbmltcG9ydCBtYWtlQ29uZmlnIGZyb20gXCIuLi8uLi92aXRlLmNvbmZpZy5iYXNlXCJcblxuZXhwb3J0IGRlZmF1bHQgZGVmaW5lQ29uZmlnKG1ha2VDb25maWcoX19kaXJuYW1lKSlcbiIsICJjb25zdCBfX3ZpdGVfaW5qZWN0ZWRfb3JpZ2luYWxfZGlybmFtZSA9IFwiL1VzZXJzL3BhdHJpY2tyb3phL3BqL2VmZmVjdC1hcHAvbGlic1wiO2NvbnN0IF9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9maWxlbmFtZSA9IFwiL1VzZXJzL3BhdHJpY2tyb3phL3BqL2VmZmVjdC1hcHAvbGlicy92aXRlLmNvbmZpZy5iYXNlLnRzXCI7Y29uc3QgX192aXRlX2luamVjdGVkX29yaWdpbmFsX2ltcG9ydF9tZXRhX3VybCA9IFwiZmlsZTovLy9Vc2Vycy9wYXRyaWNrcm96YS9wai9lZmZlY3QtYXBwL2xpYnMvdml0ZS5jb25maWcuYmFzZS50c1wiOy8vLyA8cmVmZXJlbmNlIHR5cGVzPVwidml0ZXN0XCIgLz5cbmltcG9ydCBwYXRoIGZyb20gXCJwYXRoXCJcbmltcG9ydCBmcyBmcm9tIFwiZnNcIlxuaW1wb3J0IEF1dG9JbXBvcnQgZnJvbSBcInVucGx1Z2luLWF1dG8taW1wb3J0L3ZpdGVcIlxuaW1wb3J0IHsgZGVmaW5lQ29uZmlnIH0gZnJvbSBcInZpdGVzdC9jb25maWdcIlxuXG4vLyBjb25zdCBhdXRvSW1wb3J0ID0gQXV0b0ltcG9ydCh7XG4vLyAgIGR0czogXCIuL3Rlc3QvYXV0by1pbXBvcnRzLmQudHNcIixcbi8vICAgLy8gaW5jbHVkZTogW1xuLy8gICAvLyAgIC9cXC50ZXN0XFwuW3RqXXN4PyQvIC8vIC50cywgLnRzeCwgLmpzLCAuanN4XG4vLyAgIC8vIF0sXG4vLyAgIGltcG9ydHM6IFtcbi8vICAgICBcInZpdGVzdFwiXG4vLyAgIF1cbi8vIH0pXG5cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uIG1ha2VDb25maWcoZGlyTmFtZT86IHN0cmluZykge1xuICBjb25zdCBwcmVmaXggPSBwYXRoLnJlc29sdmUoX19kaXJuYW1lLCBcInBhY2thZ2VzXCIpXG4gIGNvbnN0IHBhY2thZ2VzID0gZnMucmVhZGRpclN5bmMocHJlZml4KS5tYXAoZiA9PiBwcmVmaXggKyBcIi9cIiArIGYpLmZpbHRlcihmID0+IGZzLmxzdGF0U3luYyhmKS5pc0RpcmVjdG9yeSgpIClcbiAgY29uc3QgY2ZnID0ge1xuICAgIC8vIGVzbGludC1kaXNhYmxlLW5leHQtbGluZSBAdHlwZXNjcmlwdC1lc2xpbnQvbm8tdmFyLXJlcXVpcmVzXG4gICAgLy9wbHVnaW5zOiBbYXV0b0ltcG9ydF0sXG4gICAgdGVzdDoge1xuICAgICAgaW5jbHVkZTogIFtcIi4vdGVzdC8qKi8qLnRlc3Que2pzLG1qcyxjanMsdHMsbXRzLGN0cyxqc3gsdHN4fVwiXSxcbiAgICAgIHJlcG9ydGVyczogXCJ2ZXJib3NlXCIsXG4gICAgICBnbG9iYWxzOiB0cnVlXG4gICAgfSxcbiAgICByZXNvbHZlOiB7XG4gICAgICBhbGlhczogcGFja2FnZXMucmVkdWNlKChhY2MsIGN1cikgPT4geyAvLyB3b3JrYXJvdW5kIGZvciAvUHJlbHVkZSBpc3N1ZVxuICAgICAgYWNjW0pTT04ucGFyc2UoZnMucmVhZEZpbGVTeW5jKGN1ciArIFwiL3BhY2thZ2UuanNvblwiLCBcInV0Zi04XCIpKS5uYW1lXSA9IHBhdGgucmVzb2x2ZShjdXIsIGN1ci5lbmRzV2l0aChcImNvcmVcIikgPyBcImRpc3RcIiA6IFwic3JjXCIpXG4gICAgICByZXR1cm4gYWNjXG4gICAgfSwgeyB9KSAvLyBcIkBlZmZlY3QtYXBwL2NvcmUvUHJlbHVkZVwiOiBwYXRoLmpvaW4oX19kaXJuYW1lLCBcInBhY2thZ2VzL2NvcmUvc3JjL1ByZWx1ZGUuY29kZS50c1wiKVxuICB9XG4gIH1cbiAgY29uc29sZS5sb2coY2ZnKVxuICByZXR1cm4gY2ZnXG59XG4iXSwKICAibWFwcGluZ3MiOiAiO0FBQ0EsU0FBUyxvQkFBb0I7OztBQ0E3QixPQUFPLFVBQVU7QUFDakIsT0FBTyxRQUFRO0FBRmYsSUFBTSxtQ0FBbUM7QUFnQjFCLFNBQVIsV0FBNEIsU0FBa0I7QUFDbkQsUUFBTSxTQUFTLEtBQUssUUFBUSxrQ0FBVyxVQUFVO0FBQ2pELFFBQU0sV0FBVyxHQUFHLFlBQVksTUFBTSxFQUFFLElBQUksT0FBSyxTQUFTLE1BQU0sQ0FBQyxFQUFFLE9BQU8sT0FBSyxHQUFHLFVBQVUsQ0FBQyxFQUFFLFlBQVksQ0FBRTtBQUM3RyxRQUFNLE1BQU07QUFBQTtBQUFBO0FBQUEsSUFHVixNQUFNO0FBQUEsTUFDSixTQUFVLENBQUMsa0RBQWtEO0FBQUEsTUFDN0QsV0FBVztBQUFBLE1BQ1gsU0FBUztBQUFBLElBQ1g7QUFBQSxJQUNBLFNBQVM7QUFBQSxNQUNQLE9BQU8sU0FBUyxPQUFPLENBQUMsS0FBSyxRQUFRO0FBQ3JDLFlBQUksS0FBSyxNQUFNLEdBQUcsYUFBYSxNQUFNLGlCQUFpQixPQUFPLENBQUMsRUFBRSxJQUFJLElBQUksS0FBSyxRQUFRLEtBQUssSUFBSSxTQUFTLE1BQU0sSUFBSSxTQUFTLEtBQUs7QUFDL0gsZUFBTztBQUFBLE1BQ1QsR0FBRyxDQUFFLENBQUM7QUFBQTtBQUFBLElBQ1I7QUFBQSxFQUNBO0FBQ0EsVUFBUSxJQUFJLEdBQUc7QUFDZixTQUFPO0FBQ1Q7OztBRHBDQSxJQUFNQSxvQ0FBbUM7QUFJekMsSUFBTyx3QkFBUSxhQUFhLFdBQVdDLGlDQUFTLENBQUM7IiwKICAibmFtZXMiOiBbIl9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9kaXJuYW1lIiwgIl9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9kaXJuYW1lIl0KfQo=