effect-app 1.17.5 → 1.18.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @effect-app/prelude
 
+## 1.18.0
+
+### Minor Changes
+
+- b670052: feat: followup rpc client side
+
 ## 1.17.5
 
 ### Patch Changes

package/_cjs/client/clientFor2.cjs

@@ -0,0 +1,195 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.clientFor2 = clientFor2;
+var _core = require("@effect-app/core");
+var _rpc = require("@effect/rpc");
+var _rpcHttp = require("@effect/rpc-http");
+var _effectApp = require("effect-app");
+var _client = require("effect-app/client");
+var _http = require("effect-app/http");
+var _utils = require("effect-app/utils");
+var _pathParser = require("path-parser");
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
+/* eslint-disable @typescript-eslint/no-explicit-any */
+
+const cache = new Map();
+const apiClient = _core.Effect.gen(function* () {
+  const client = yield* _http.HttpClient.HttpClient;
+  const config = yield* _client.ApiConfig.Tag;
+  return client.pipe(_http.HttpClient.mapRequest(_http.HttpClientRequest.prependUrl(config.apiUrl + "/rpc")), _http.HttpClient.mapRequest(_http.HttpClientRequest.setHeaders(config.headers.pipe(_core.Option.getOrElse(() => _core.HashMap.empty())))));
+});
+function clientFor2(models) {
+  const found = cache.get(models);
+  if (found) {
+    return found;
+  }
+  const m = clientFor_(models);
+  cache.set(models, m);
+  return m;
+}
+function clientFor_(models, layers = _core.Layer.empty) {
+  const filtered = (0, _utils.typedKeysOf)(models).reduce((acc, cur) => {
+    if (_core.Predicate.isObject(models[cur]) && models[cur].success) {
+      acc[cur] = models[cur];
+    }
+    return acc;
+  }, {});
+  const meta = models.meta;
+  if (!meta) throw new Error("No meta defined in Resource!");
+  const resolver = (0, _core.flow)(_rpcHttp.HttpRpcResolver.make, _ => _rpc.RpcResolver.toClient(_));
+  const baseClient = apiClient.pipe(_core.Effect.andThen(_http.HttpClient.mapRequest(_http.HttpClientRequest.appendUrl("/" + meta.moduleName))));
+  return (0, _utils.typedKeysOf)(filtered).reduce((prev, cur) => {
+    const h = filtered[cur];
+    const Request = h;
+    const Response = h.success;
+    const encodeRequest = _effectApp.S.encodeSync(Request);
+    const requestName = `${meta.moduleName}.${cur}`.replaceAll(".js", "");
+    const requestMeta = {
+      method: "POST",
+      // TODO
+      Request,
+      Response,
+      mapPath: requestName,
+      name: requestName
+    };
+    const client = baseClient.pipe(_core.Effect.andThen(_http.HttpClient.mapRequest(_http.HttpClientRequest.appendUrlParam("action", cur))), _core.Effect.andThen(resolver));
+    const fields = _core.Struct.omit(Request.fields, "_tag");
+    const p = requestName;
+    const path = new _pathParser.Path(p); // TODO
+    // @ts-expect-error doc
+    prev[cur] = requestMeta.method === "GET" ? Object.keys(fields).length === 0 ? {
+      handler: client.pipe(_core.Effect.andThen(cl => cl(new Request())), _core.Effect.map(_ => ({
+        body: _,
+        status: 200,
+        headers: {}
+      })),
+      // TODO
+      _core.Effect.withSpan("client.request " + requestName, {
+        captureStackTrace: false,
+        attributes: {
+          "request.name": requestName
+        }
+      }), _core.Effect.provide(layers)),
+      ...requestMeta
+    } : {
+      handler: req => client.pipe(_core.Effect.andThen(cl => cl(new Request(req))), _core.Effect.map(_ => ({
+        body: _,
+        status: 200,
+        headers: {}
+      })),
+      // TODO
+      _core.Effect.withSpan("client.request " + requestName, {
+        captureStackTrace: false,
+        attributes: {
+          "request.name": requestName
+        }
+      }), _core.Effect.provide(layers)),
+      ...requestMeta,
+      mapPath: req => req ? (0, _client.makePathWithQuery)(path, encodeRequest(req)) : p
+    } : Object.keys(fields).length === 0 ? {
+      handler: client.pipe(_core.Effect.andThen(cl => cl(new Request())), _core.Effect.map(_ => ({
+        body: _,
+        status: 200,
+        headers: {}
+      })),
+      // TODO
+      _core.Effect.withSpan("client.request " + requestName, {
+        captureStackTrace: false,
+        attributes: {
+          "request.name": requestName
+        }
+      }), _core.Effect.provide(layers)),
+      ...requestMeta
+    } : {
+      handler: req => client.pipe(_core.Effect.andThen(cl => cl(new Request(req))), _core.Effect.map(_ => ({
+        body: _,
+        status: 200,
+        headers: {}
+      })),
+      // TODO
+      _core.Effect.withSpan("client.request " + requestName, {
+        captureStackTrace: false,
+        attributes: {
+          "request.name": requestName
+        }
+      }), _core.Effect.provide(layers)),
+      ...requestMeta,
+      mapPath: req => req ? requestMeta.method === "DELETE" ? (0, _client.makePathWithQuery)(path, encodeRequest(req)) : (0, _client.makePathWithBody)(path, encodeRequest(req)) : p
+    };
+    // generate handler
+    // @ts-expect-error doc
+    prev[`${cur}E`] = requestMeta.method === "GET" ? Object.keys(fields).length === 0 ? {
+      handler: client.pipe(_core.Effect.andThen(cl => cl(new Request())), _core.Effect.flatMap(res => _effectApp.S.encode(Response)(res)),
+      // TODO
+      _core.Effect.map(_ => ({
+        body: _,
+        status: 200,
+        headers: {}
+      })),
+      // TODO,
+      _core.Effect.withSpan("client.request " + requestName, {
+        captureStackTrace: false,
+        attributes: {
+          "request.name": requestName
+        }
+      }), _core.Effect.provide(layers)),
+      ...requestMeta
+    } : {
+      handler: req => client.pipe(_core.Effect.andThen(cl => cl(new Request(req))), _core.Effect.flatMap(res => _effectApp.S.encode(Response)(res)),
+      // TODO
+      _core.Effect.map(_ => ({
+        body: _,
+        status: 200,
+        headers: {}
+      })),
+      // TODO,
+      _core.Effect.withSpan("client.request " + requestName, {
+        captureStackTrace: false,
+        attributes: {
+          "request.name": requestName
+        }
+      }), _core.Effect.provide(layers)),
+      ...requestMeta,
+      mapPath: req => req ? (0, _client.makePathWithQuery)(path, encodeRequest(req)) : p
+    } : Object.keys(fields).length === 0 ? {
+      handler: client.pipe(_core.Effect.andThen(cl => cl(new Request())), _core.Effect.flatMap(res => _effectApp.S.encode(Response)(res)),
+      // TODO
+      _core.Effect.map(_ => ({
+        body: _,
+        status: 200,
+        headers: {}
+      })),
+      // TODO,
+      _core.Effect.withSpan("client.request " + requestName, {
+        captureStackTrace: false,
+        attributes: {
+          "request.name": requestName
+        }
+      }), _core.Effect.provide(layers)),
+      ...requestMeta
+    } : {
+      handler: req => client.pipe(_core.Effect.andThen(cl => cl(new Request(req))), _core.Effect.flatMap(res => _effectApp.S.encode(Response)(res)),
+      // TODO
+      _core.Effect.map(_ => ({
+        body: _,
+        status: 200,
+        headers: {}
+      })),
+      // TODO,
+      _core.Effect.withSpan("client.request " + requestName, {
+        captureStackTrace: false,
+        attributes: {
+          "request.name": requestName
+        }
+      }), _core.Effect.provide(layers)),
+      ...requestMeta,
+      mapPath: req => req ? requestMeta.method === "DELETE" ? (0, _client.makePathWithQuery)(path, encodeRequest(req)) : (0, _client.makePathWithBody)(path, encodeRequest(req)) : p
+    };
+    // generate handler
+    return prev;
+  }, {});
+}
+//# sourceMappingURL=clientFor2.cjs.map

package/_cjs/client/clientFor2.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"clientFor2.cjs","names":["_core","require","_rpc","_rpcHttp","_effectApp","_client","_http","_utils","_pathParser","cache","Map","apiClient","Effect","gen","client","HttpClient","config","ApiConfig","Tag","pipe","mapRequest","HttpClientRequest","prependUrl","apiUrl","setHeaders","headers","Option","getOrElse","HashMap","empty","clientFor2","models","found","get","m","clientFor_","set","layers","Layer","filtered","typedKeysOf","reduce","acc","cur","Predicate","isObject","success","meta","Error","resolver","flow","HttpRpcResolver","make","_","RpcResolver","toClient","baseClient","andThen","appendUrl","moduleName","prev","h","Request","Response","encodeRequest","S","encodeSync","requestName","replaceAll","requestMeta","method","mapPath","name","appendUrlParam","fields","Struct","omit","p","path","Path","Object","keys","length","handler","cl","map","body","status","withSpan","captureStackTrace","attributes","provide","req","makePathWithQuery","makePathWithBody","flatMap","res","encode"],"sources":["../../src/client/clientFor2.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/client/clientFor2.d.ts

@@ -0,0 +1,49 @@
+import { Effect } from "@effect-app/core";
+import type * as Serializable from "@effect/schema/Serializable";
+import { S } from "effect-app";
+import type { FetchResponse } from "effect-app/client";
+import { ApiConfig } from "effect-app/client";
+import { HttpClient } from "effect-app/http";
+import type { Schema } from "effect-app/schema";
+import type * as Request from "effect/Request";
+type Requests = Record<string, any>;
+export type Client<M extends Requests> = RequestHandlers<ApiConfig | HttpClient.HttpClient.Service, never, // SupportedErrors | FetchError | ResError,
+M> & RequestHandlersE<ApiConfig | HttpClient.HttpClient.Service, never, // SupportedErrors | FetchError | ResError,
+M>;
+export declare function clientFor2<M extends Requests>(models: M): Client<Omit<M, "meta">>;
+export type ExtractResponse<T> = T extends Schema<any, any, any> ? Schema.Type<T> : T extends unknown ? void : never;
+export type ExtractEResponse<T> = T extends Schema<any, any, any> ? Schema.Encoded<T> : T extends unknown ? void : never;
+type IsEmpty<T> = keyof T extends never ? true : false;
+type Cruft = "_tag" | Request.RequestTypeId | typeof Serializable.symbol | typeof Serializable.symbolResult;
+type RequestHandlers<R, E, M extends Requests> = {
+    [K in keyof M]: IsEmpty<Omit<S.Schema.Type<M[K]>, Cruft>> extends true ? {
+        handler: Effect<FetchResponse<Schema.Type<M[K]["success"]>>, Schema.Type<M[K]["failure"]> | E, R>;
+        Request: M[K];
+        Reponse: Schema.Type<M[K]["success"]>;
+        mapPath: string;
+        name: string;
+    } : {
+        handler: (req: Omit<S.Schema.Type<M[K]>, Cruft>) => Effect<FetchResponse<Schema.Type<M[K]["success"]>>, Schema.Type<M[K]["failure"]> | E, R>;
+        Request: M[K];
+        Reponse: Schema.Type<M[K]["success"]>;
+        mapPath: (req: Omit<S.Schema.Type<M[K]>, Cruft>) => string;
+        name: string;
+    };
+};
+type RequestHandlersE<R, E, M extends Requests> = {
+    [K in keyof M & string as `${K}E`]: IsEmpty<Omit<S.Schema.Type<M[K]>, Cruft>> extends true ? {
+        handler: Effect<FetchResponse<Schema.Encoded<M[K]["success"]>>, Schema.Type<M[K]["failure"]> | E, R>;
+        Request: M[K];
+        Reponse: Schema.Type<M[K]["success"]>;
+        mapPath: string;
+        name: string;
+    } : {
+        handler: (req: Omit<S.Schema.Type<M[K]>, Cruft>) => Effect<FetchResponse<Schema.Encoded<M[K]["success"]>>, Schema.Type<M[K]["failure"]> | E, R>;
+        Request: M[K];
+        Reponse: Schema.Type<M[K]["success"]>;
+        mapPath: (req: Omit<S.Schema.Type<M[K]>, Cruft>) => string;
+        name: string;
+    };
+};
+export {};
+//# sourceMappingURL=clientFor2.d.ts.map

package/dist/client/clientFor2.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"clientFor2.d.ts","sourceRoot":"","sources":["../../src/client/clientFor2.ts"],"names":[],"mappings":"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"}

package/dist/client/clientFor2.js

@@ -0,0 +1,163 @@
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import { Effect, flow, HashMap, Layer, Option, Predicate, Struct } from "@effect-app/core";
+import { RpcResolver } from "@effect/rpc";
+import { HttpRpcResolver } from "@effect/rpc-http";
+import { S } from "effect-app";
+import { ApiConfig, makePathWithBody, makePathWithQuery } from "effect-app/client";
+import { HttpClient, HttpClientRequest } from "effect-app/http";
+import { typedKeysOf } from "effect-app/utils";
+import { Path } from "path-parser";
+const cache = new Map();
+const apiClient = Effect.gen(function* () {
+    const client = yield* HttpClient.HttpClient;
+    const config = yield* ApiConfig.Tag;
+    return client.pipe(HttpClient.mapRequest(HttpClientRequest.prependUrl(config.apiUrl + "/rpc")), HttpClient.mapRequest(HttpClientRequest.setHeaders(config.headers.pipe(Option.getOrElse(() => HashMap.empty())))));
+});
+export function clientFor2(models) {
+    const found = cache.get(models);
+    if (found) {
+        return found;
+    }
+    const m = clientFor_(models);
+    cache.set(models, m);
+    return m;
+}
+function clientFor_(models, layers = Layer.empty) {
+    const filtered = typedKeysOf(models).reduce((acc, cur) => {
+        if (Predicate.isObject(models[cur])
+            && (models[cur].success)) {
+            acc[cur] = models[cur];
+        }
+        return acc;
+    }, {});
+    const meta = models.meta;
+    if (!meta)
+        throw new Error("No meta defined in Resource!");
+    const resolver = flow((HttpRpcResolver.make), (_) => RpcResolver.toClient(_));
+    const baseClient = apiClient.pipe(Effect.andThen(HttpClient.mapRequest(HttpClientRequest.appendUrl("/" + meta.moduleName))));
+    return (typedKeysOf(filtered)
+        .reduce((prev, cur) => {
+        const h = filtered[cur];
+        const Request = h;
+        const Response = h.success;
+        const encodeRequest = S.encodeSync(Request);
+        const requestName = `${meta.moduleName}.${cur}`
+            .replaceAll(".js", "");
+        const requestMeta = {
+            method: "POST", // TODO
+            Request,
+            Response,
+            mapPath: requestName,
+            name: requestName
+        };
+        const client = baseClient.pipe(Effect.andThen(HttpClient.mapRequest(HttpClientRequest.appendUrlParam("action", cur))), Effect.andThen(resolver));
+        const fields = Struct.omit(Request.fields, "_tag");
+        const p = requestName;
+        const path = new Path(p); // TODO
+        // @ts-expect-error doc
+        prev[cur] = requestMeta.method === "GET"
+            ? Object.keys(fields).length === 0
+                ? {
+                    handler: client
+                        .pipe(Effect.andThen((cl) => cl(new Request())), Effect.map((_) => ({ body: _, status: 200, headers: {} })), // TODO
+                    Effect
+                        .withSpan("client.request " + requestName, {
+                        captureStackTrace: false,
+                        attributes: { "request.name": requestName }
+                    }), Effect.provide(layers)),
+                    ...requestMeta
+                }
+                : {
+                    handler: (req) => client
+                        .pipe(Effect.andThen((cl) => cl(new Request(req))), Effect.map((_) => ({ body: _, status: 200, headers: {} })), // TODO
+                    Effect
+                        .withSpan("client.request " + requestName, {
+                        captureStackTrace: false,
+                        attributes: { "request.name": requestName }
+                    }), Effect.provide(layers)),
+                    ...requestMeta,
+                    mapPath: (req) => req ? makePathWithQuery(path, encodeRequest(req)) : p
+                }
+            : Object.keys(fields).length === 0
+                ? {
+                    handler: client
+                        .pipe(Effect.andThen((cl) => cl(new Request())), Effect.map((_) => ({ body: _, status: 200, headers: {} })), // TODO
+                    Effect.withSpan("client.request " + requestName, {
+                        captureStackTrace: false,
+                        attributes: { "request.name": requestName }
+                    }), Effect.provide(layers)),
+                    ...requestMeta
+                }
+                : {
+                    handler: (req) => client
+                        .pipe(Effect.andThen((cl) => cl(new Request(req))), Effect.map((_) => ({ body: _, status: 200, headers: {} })), // TODO
+                    Effect.withSpan("client.request " + requestName, {
+                        captureStackTrace: false,
+                        attributes: { "request.name": requestName }
+                    }), Effect.provide(layers)),
+                    ...requestMeta,
+                    mapPath: (req) => req
+                        ? requestMeta.method === "DELETE"
+                            ? makePathWithQuery(path, encodeRequest(req))
+                            : makePathWithBody(path, encodeRequest(req))
+                        : p
+                };
+        // generate handler
+        // @ts-expect-error doc
+        prev[`${cur}E`] = requestMeta.method === "GET"
+            ? Object.keys(fields).length === 0
+                ? {
+                    handler: client
+                        .pipe(Effect.andThen((cl) => cl(new Request())), Effect.flatMap((res) => S.encode(Response)(res)), // TODO
+                    Effect.map((_) => ({ body: _, status: 200, headers: {} })), // TODO,
+                    Effect
+                        .withSpan("client.request " + requestName, {
+                        captureStackTrace: false,
+                        attributes: { "request.name": requestName }
+                    }), Effect.provide(layers)),
+                    ...requestMeta
+                }
+                : {
+                    handler: (req) => client
+                        .pipe(Effect.andThen((cl) => cl(new Request(req))), Effect.flatMap((res) => S.encode(Response)(res)), // TODO
+                    Effect.map((_) => ({ body: _, status: 200, headers: {} })), // TODO,
+                    Effect
+                        .withSpan("client.request " + requestName, {
+                        captureStackTrace: false,
+                        attributes: { "request.name": requestName }
+                    }), Effect.provide(layers)),
+                    ...requestMeta,
+                    mapPath: (req) => req ? makePathWithQuery(path, encodeRequest(req)) : p
+                }
+            : Object.keys(fields).length === 0
+                ? {
+                    handler: client
+                        .pipe(Effect.andThen((cl) => cl(new Request())), Effect.flatMap((res) => S.encode(Response)(res)), // TODO
+                    Effect.map((_) => ({ body: _, status: 200, headers: {} })), // TODO,
+                    Effect.withSpan("client.request " + requestName, {
+                        captureStackTrace: false,
+                        attributes: { "request.name": requestName }
+                    }), Effect.provide(layers)),
+                    ...requestMeta
+                }
+                : {
+                    handler: (req) => client
+                        .pipe(Effect.andThen((cl) => cl(new Request(req))), Effect.flatMap((res) => S.encode(Response)(res)), // TODO
+                    Effect.map((_) => ({ body: _, status: 200, headers: {} })), // TODO,
+                    Effect.withSpan("client.request " + requestName, {
+                        captureStackTrace: false,
+                        attributes: { "request.name": requestName }
+                    }), Effect.provide(layers)),
+                    ...requestMeta,
+                    mapPath: (req) => req
+                        ? requestMeta.method === "DELETE"
+                            ? makePathWithQuery(path, encodeRequest(req))
+                            : makePathWithBody(path, encodeRequest(req))
+                        : p
+                };
+        // generate handler
+        return prev;
+    }, {}));
+}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"clientFor2.js","sourceRoot":"","sources":["../../src/client/clientFor2.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,9 +1,11 @@
 {
   "name": "effect-app",
-  "version": "1.17.5",
+  "version": "1.18.0",
   "license": "MIT",
   "type": "module",
   "dependencies": {
+    "@effect/rpc": "^0.40.2",
+    "@effect/rpc-http": "^0.38.3",
     "@tsconfig/strictest": "^2.0.5",
     "date-fns": "^4.1.0",
     "nanoid": "^5.0.7",
@@ -149,6 +151,16 @@
         "default": "./_cjs/client/clientFor.cjs"
       }
     },
+    "./client/clientFor2": {
+      "import": {
+        "types": "./dist/client/clientFor2.d.ts",
+        "default": "./dist/client/clientFor2.js"
+      },
+      "require": {
+        "types": "./dist/client/clientFor2.d.ts",
+        "default": "./_cjs/client/clientFor2.cjs"
+      }
+    },
     "./client/config": {
       "import": {
         "types": "./dist/client/config.d.ts",

package/src/client/clientFor2.ts

@@ -0,0 +1,337 @@
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
+/* eslint-disable @typescript-eslint/no-explicit-any */
+
+import { Effect, flow, HashMap, Layer, Option, Predicate, Struct } from "@effect-app/core"
+import { RpcResolver } from "@effect/rpc"
+import { HttpRpcResolver } from "@effect/rpc-http"
+import type { RpcRouter } from "@effect/rpc/RpcRouter"
+import type * as Serializable from "@effect/schema/Serializable"
+import { S } from "effect-app"
+import type { FetchResponse } from "effect-app/client"
+import { ApiConfig, makePathWithBody, makePathWithQuery } from "effect-app/client"
+import { HttpClient, HttpClientRequest } from "effect-app/http"
+import type { Schema } from "effect-app/schema"
+import { typedKeysOf } from "effect-app/utils"
+import type * as Request from "effect/Request"
+import { Path } from "path-parser"
+
+type Requests = Record<string, any>
+
+const cache = new Map<any, Client<any>>()
+
+const apiClient = Effect.gen(function*() {
+  const client = yield* HttpClient.HttpClient
+  const config = yield* ApiConfig.Tag
+  return client.pipe(
+    HttpClient.mapRequest(HttpClientRequest.prependUrl(config.apiUrl + "/rpc")),
+    HttpClient.mapRequest(
+      HttpClientRequest.setHeaders(config.headers.pipe(Option.getOrElse(() => HashMap.empty())))
+    )
+  )
+})
+
+export type Client<M extends Requests> =
+  & RequestHandlers<
+    ApiConfig | HttpClient.HttpClient.Service,
+    never, // SupportedErrors | FetchError | ResError,
+    M
+  >
+  & RequestHandlersE<
+    ApiConfig | HttpClient.HttpClient.Service,
+    never, // SupportedErrors | FetchError | ResError,
+    M
+  >
+
+export function clientFor2<M extends Requests>(
+  models: M
+): Client<Omit<M, "meta">> {
+  const found = cache.get(models)
+  if (found) {
+    return found
+  }
+  const m = clientFor_(models)
+  cache.set(models, m)
+  return m
+}
+
+type Req = S.Schema.All & {
+  new(...args: any[]): any
+  _tag: string
+  fields: S.Struct.Fields
+  success: S.Schema.Any
+  failure: S.Schema.Any
+  config?: Record<string, any>
+}
+
+function clientFor_<M extends Requests>(models: M, layers = Layer.empty) {
+  type Filtered = {
+    [K in keyof Requests as Requests[K] extends Req ? K : never]: Requests[K] extends Req ? Requests[K] : never
+  }
+  const filtered = typedKeysOf(models).reduce((acc, cur) => {
+    if (
+      Predicate.isObject(models[cur])
+      && (models[cur].success)
+    ) {
+      acc[cur as keyof Filtered] = models[cur]
+    }
+    return acc
+  }, {} as Record<keyof Filtered, Req>)
+
+  const meta = (models as any).meta as { moduleName: string }
+  if (!meta) throw new Error("No meta defined in Resource!")
+
+  const resolver = flow(
+    HttpRpcResolver.make<RpcRouter<any, any>>,
+    (_) => RpcResolver.toClient(_ as any)
+  )
+
+  const baseClient = apiClient.pipe(
+    Effect.andThen(HttpClient.mapRequest(HttpClientRequest.appendUrl("/" + meta.moduleName)))
+  )
+
+  return (typedKeysOf(filtered)
+    .reduce((prev, cur) => {
+      const h = filtered[cur]!
+
+      const Request = h
+      const Response = h.success
+
+      const encodeRequest = S.encodeSync(
+        Request as unknown as S.Schema<any, any>
+      )
+
+      const requestName = `${meta.moduleName}.${cur as string}`
+        .replaceAll(".js", "")
+
+      const requestMeta = {
+        method: "POST", // TODO
+        Request,
+        Response,
+        mapPath: requestName,
+        name: requestName
+      }
+
+      const client = baseClient.pipe(
+        Effect.andThen(HttpClient.mapRequest(HttpClientRequest.appendUrlParam("action", cur as string))),
+        Effect.andThen(resolver)
+      )
+
+      const fields = Struct.omit(Request.fields, "_tag")
+      const p = requestName
+      const path = new Path(p) // TODO
+      // @ts-expect-error doc
+      prev[cur] = requestMeta.method === "GET"
+        ? Object.keys(fields).length === 0
+          ? {
+            handler: client
+              .pipe(
+                Effect.andThen((cl) => cl(new Request())),
+                Effect.map((_) => ({ body: _, status: 200, headers: {} })), // TODO
+                Effect
+                  .withSpan("client.request " + requestName, {
+                    captureStackTrace: false,
+                    attributes: { "request.name": requestName }
+                  }),
+                Effect.provide(layers)
+              ),
+            ...requestMeta
+          }
+          : {
+            handler: (req: any) =>
+              client
+                .pipe(
+                  Effect.andThen((cl) => cl(new Request(req))),
+                  Effect.map((_) => ({ body: _, status: 200, headers: {} })), // TODO
+                  Effect
+                    .withSpan("client.request " + requestName, {
+                      captureStackTrace: false,
+                      attributes: { "request.name": requestName }
+                    }),
+                  Effect.provide(layers)
+                ),
+            ...requestMeta,
+            mapPath: (req: any) => req ? makePathWithQuery(path, encodeRequest(req)) : p
+          }
+        : Object.keys(fields).length === 0
+        ? {
+          handler: client
+            .pipe(
+              Effect.andThen((cl) => cl(new Request())),
+              Effect.map((_) => ({ body: _, status: 200, headers: {} })), // TODO
+              Effect.withSpan("client.request " + requestName, {
+                captureStackTrace: false,
+                attributes: { "request.name": requestName }
+              }),
+              Effect.provide(layers)
+            ),
+          ...requestMeta
+        }
+        : {
+          handler: (req: any) =>
+            client
+              .pipe(
+                Effect.andThen((cl) => cl(new Request(req))),
+                Effect.map((_) => ({ body: _, status: 200, headers: {} })), // TODO
+                Effect.withSpan("client.request " + requestName, {
+                  captureStackTrace: false,
+                  attributes: { "request.name": requestName }
+                }),
+                Effect.provide(layers)
+              ),
+
+          ...requestMeta,
+          mapPath: (req: any) =>
+            req
+              ? requestMeta.method === "DELETE"
+                ? makePathWithQuery(path, encodeRequest(req))
+                : makePathWithBody(path, encodeRequest(req))
+              : p
+        }
+
+      // generate handler
+
+      // @ts-expect-error doc
+      prev[`${cur}E`] = requestMeta.method === "GET"
+        ? Object.keys(fields).length === 0
+          ? {
+            handler: client
+              .pipe(
+                Effect.andThen((cl) => cl(new Request())),
+                Effect.flatMap((res) => S.encode(Response)(res)), // TODO
+                Effect.map((_) => ({ body: _, status: 200, headers: {} })), // TODO,
+                Effect
+                  .withSpan("client.request " + requestName, {
+                    captureStackTrace: false,
+                    attributes: { "request.name": requestName }
+                  }),
+                Effect.provide(layers)
+              ),
+            ...requestMeta
+          }
+          : {
+            handler: (req: any) =>
+              client
+                .pipe(
+                  Effect.andThen((cl) => cl(new Request(req))),
+                  Effect.flatMap((res) => S.encode(Response)(res)), // TODO
+                  Effect.map((_) => ({ body: _, status: 200, headers: {} })), // TODO,
+                  Effect
+                    .withSpan("client.request " + requestName, {
+                      captureStackTrace: false,
+                      attributes: { "request.name": requestName }
+                    }),
+                  Effect.provide(layers)
+                ),
+
+            ...requestMeta,
+            mapPath: (req: any) => req ? makePathWithQuery(path, encodeRequest(req)) : p
+          }
+        : Object.keys(fields).length === 0
+        ? {
+          handler: client
+            .pipe(
+              Effect.andThen((cl) => cl(new Request())),
+              Effect.flatMap((res) => S.encode(Response)(res)), // TODO
+              Effect.map((_) => ({ body: _, status: 200, headers: {} })), // TODO,
+              Effect.withSpan("client.request " + requestName, {
+                captureStackTrace: false,
+                attributes: { "request.name": requestName }
+              }),
+              Effect.provide(layers)
+            ),
+          ...requestMeta
+        }
+        : {
+          handler: (req: any) =>
+            client
+              .pipe(
+                Effect.andThen((cl) => cl(new Request(req))),
+                Effect.flatMap((res) => S.encode(Response)(res)), // TODO
+                Effect.map((_) => ({ body: _, status: 200, headers: {} })), // TODO,
+                Effect.withSpan("client.request " + requestName, {
+                  captureStackTrace: false,
+                  attributes: { "request.name": requestName }
+                }),
+                Effect.provide(layers)
+              ),
+
+          ...requestMeta,
+          mapPath: (req: any) =>
+            req
+              ? requestMeta.method === "DELETE"
+                ? makePathWithQuery(path, encodeRequest(req))
+                : makePathWithBody(path, encodeRequest(req))
+              : p
+        }
+      // generate handler
+
+      return prev
+    }, {} as Client<M>))
+}
+
+export type ExtractResponse<T> = T extends Schema<any, any, any> ? Schema.Type<T>
+  : T extends unknown ? void
+  : never
+
+export type ExtractEResponse<T> = T extends Schema<any, any, any> ? Schema.Encoded<T>
+  : T extends unknown ? void
+  : never
+
+type IsEmpty<T> = keyof T extends never ? true
+  : false
+
+type Cruft = "_tag" | Request.RequestTypeId | typeof Serializable.symbol | typeof Serializable.symbolResult
+
+// TODO: refactor to new Request pattern, then filter out non-requests similar to the runtime changes in clientFor, and matchFor (boilerplate)
+type RequestHandlers<R, E, M extends Requests> = {
+  [K in keyof M]: IsEmpty<Omit<S.Schema.Type<M[K]>, Cruft>> extends true ? {
+      handler: Effect<FetchResponse<Schema.Type<M[K]["success"]>>, Schema.Type<M[K]["failure"]> | E, R>
+      Request: M[K]
+      Reponse: Schema.Type<M[K]["success"]>
+      mapPath: string
+      name: string
+    }
+    : {
+      handler: (
+        req: Omit<S.Schema.Type<M[K]>, Cruft>
+      ) => Effect<
+        FetchResponse<Schema.Type<M[K]["success"]>>,
+        Schema.Type<M[K]["failure"]> | E,
+        R
+      >
+      Request: M[K]
+      Reponse: Schema.Type<M[K]["success"]>
+      mapPath: (req: Omit<S.Schema.Type<M[K]>, Cruft>) => string
+      name: string
+    }
+}
+
+type RequestHandlersE<R, E, M extends Requests> = {
+  [K in keyof M & string as `${K}E`]: IsEmpty<Omit<S.Schema.Type<M[K]>, Cruft>> extends true ? {
+      handler: Effect<
+        FetchResponse<Schema.Encoded<M[K]["success"]>>,
+        Schema.Type<M[K]["failure"]> | E,
+        R
+      >
+      Request: M[K]
+      Reponse: Schema.Type<M[K]["success"]>
+      mapPath: string
+      name: string
+    }
+    : {
+      handler: (
+        req: Omit<
+          S.Schema.Type<M[K]>,
+          Cruft
+        >
+      ) => Effect<
+        FetchResponse<Schema.Encoded<M[K]["success"]>>,
+        Schema.Type<M[K]["failure"]> | E,
+        R
+      >
+      Request: M[K]
+      Reponse: Schema.Type<M[K]["success"]>
+      mapPath: (req: Omit<S.Schema.Type<M[K]>, Cruft>) => string
+      name: string
+    }
+}

package/tsconfig.src.json

@@ -6,7 +6,6 @@
         ],
         "tsBuildInfoFile": "./dist/.tsbuildinfo",
         "esModuleInterop": true,
-        "baseUrl": "./",
         "rootDir": "./src",
         // keep in here, cause madge can't detect it from extended tsconfig
         "moduleResolution": "Node16",

package/tsconfig.test.json

@@ -2,7 +2,6 @@
   "extends": "./tsconfig.src.json",
   "compilerOptions": {
     "rootDir": "./test",
-    "baseUrl": "./test",
     "outDir": "./test/dist",
     "tsBuildInfoFile": "./test/dist/.tsbuildinfo",
     // "types": [