effect-app 1.29.0 → 1.30.1

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @effect-app/prelude
 
+## 1.30.1
+
+### Patch Changes
+
+- cleanup
+
+## 1.30.0
+
+### Minor Changes
+
+- c069b8e: add WithOptionalSpan
+
 ## 1.29.0
 
 ### Minor Changes

package/_cjs/client/clientFor.cjs

@@ -14,7 +14,6 @@ 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");
 var _queryString = _interopRequireDefault(require("query-string"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /* eslint-disable @typescript-eslint/no-unsafe-argument */
@@ -66,46 +65,33 @@ function clientFor_(models, layers = _core.Layer.empty) {
     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 ? {
+    prev[cur] = Object.keys(fields).length === 0 ? {
       handler: client.pipe(_core.Effect.andThen(cl => cl(new Request())), _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.withSpan("client.request " + requestName, {
-        captureStackTrace: false,
-        attributes: {
-          "request.name": requestName
-        }
-      }), _core.Effect.provide(layers)),
       ...requestMeta,
-      mapPath: req => req ? makePathWithQuery(path, encodeRequest(req)) : p
-    } : Object.keys(fields).length === 0 ? {
-      handler: client.pipe(_core.Effect.andThen(cl => cl(new Request())), _core.Effect.withSpan("client.request " + requestName, {
-        captureStackTrace: false,
-        attributes: {
-          "request.name": requestName
-        }
-      }), _core.Effect.provide(layers)),
-      ...requestMeta
+      raw: {
+        handler: client.pipe(_core.Effect.andThen(cl => cl(new Request())), _core.Effect.flatMap(res => _effectApp.S.encode(Response)(res)),
+        // 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.withSpan("client.request " + requestName, {
         captureStackTrace: false,
@@ -114,54 +100,18 @@ function clientFor_(models, layers = _core.Layer.empty) {
         }
       }), _core.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(_core.Effect.andThen(cl => cl(new Request())), _core.Effect.flatMap(res => _effectApp.S.encode(Response)(res)),
-      // 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.withSpan("client.request " + requestName, {
-        captureStackTrace: false,
-        attributes: {
-          "request.name": requestName
-        }
-      }), _core.Effect.provide(layers)),
-      ...requestMeta,
-      mapPath: req => req ? 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.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.withSpan("client.request " + requestName, {
-        captureStackTrace: false,
-        attributes: {
-          "request.name": requestName
-        }
-      }), _core.Effect.provide(layers)),
-      ...requestMeta,
-      mapPath: req => req ? requestMeta.method === "DELETE" ? makePathWithQuery(path, encodeRequest(req)) : makePathWithBody(path, encodeRequest(req)) : p
+      raw: {
+        handler: req => client.pipe(_core.Effect.andThen(cl => cl(new Request(req))), _core.Effect.flatMap(res => _effectApp.S.encode(Response)(res)),
+        // TODO,
+        _core.Effect.withSpan("client.request " + requestName, {
+          captureStackTrace: false,
+          attributes: {
+            "request.name": requestName
+          }
+        }), _core.Effect.provide(layers)),
+        ...requestMeta
+      }
     };
-    // generate handler
     return prev;
   }, {});
 }

package/_cjs/client/clientFor.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"clientFor.cjs","names":["_core","require","_rpc","_rpcHttp","_effect","_effectApp","_client","_http","_utils","_pathParser","_queryString","_interopRequireDefault","e","__esModule","default","makePathWithQuery","path","pars","forQs","Record","filter","_","k","params","includes","q","build","ignoreSearch","ignoreConstraints","Object","keys","length","qs","stringify","makePathWithBody","apiClient","Effect","gen","client","HttpClient","config","ApiConfig","Tag","pipe","mapRequest","HttpClientRequest","prependUrl","apiUrl","setHeaders","headers","Option","getOrElse","HashMap","empty","makeClientFor","layers","cache","Map","models","found","get","m","clientFor_","set","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","handler","cl","withSpan","captureStackTrace","attributes","provide","req","flatMap","res","encode"],"sources":["../../src/client/clientFor.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"clientFor.cjs","names":["_core","require","_rpc","_rpcHttp","_effect","_effectApp","_client","_http","_utils","_queryString","_interopRequireDefault","e","__esModule","default","makePathWithQuery","path","pars","forQs","Record","filter","_","k","params","includes","q","build","ignoreSearch","ignoreConstraints","Object","keys","length","qs","stringify","makePathWithBody","apiClient","Effect","gen","client","HttpClient","config","ApiConfig","Tag","pipe","mapRequest","HttpClientRequest","prependUrl","apiUrl","setHeaders","headers","Option","getOrElse","HashMap","empty","makeClientFor","layers","cache","Map","models","found","get","m","clientFor_","set","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","requestName","replaceAll","requestMeta","name","appendUrlParam","fields","Struct","omit","handler","cl","withSpan","captureStackTrace","attributes","provide","raw","flatMap","res","S","encode","req"],"sources":["../../src/client/clientFor.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/_cjs/schema.cjs

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 var _exportNames = {
+  SpanId: true,
   Email: true,
   PhoneNumber: true,
   makeIs: true,
@@ -13,7 +14,7 @@ var _exportNames = {
   ExtendTaggedUnion: true,
   TaggedUnion: true
 };
-exports.tags = exports.taggedUnionMap = exports.makeIsAnyOf = exports.makeIs = exports.TaggedUnion = exports.PhoneNumber = exports.ExtendTaggedUnion = exports.Email = void 0;
+exports.tags = exports.taggedUnionMap = exports.makeIsAnyOf = exports.makeIs = exports.TaggedUnion = exports.SpanId = exports.PhoneNumber = exports.ExtendTaggedUnion = exports.Email = void 0;
 var _core = require("@effect-app/core");
 var S = _interopRequireWildcard(require("@effect-app/schema"));
 Object.keys(S).forEach(function (key) {
@@ -31,6 +32,7 @@ var _faker = require("./faker.cjs");
 var _utils = require("./utils.cjs");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+const SpanId = exports.SpanId = Symbol();
 const Email = exports.Email = S.Email.pipe(S.annotations({
   // eslint-disable-next-line @typescript-eslint/unbound-method
   arbitrary: () => fc => (0, _faker.fakerArb)(faker => faker.internet.exampleEmail)(fc).map(Email)

package/_cjs/schema.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"schema.cjs","names":["_core","require","S","_interopRequireWildcard","Object","keys","forEach","key","prototype","hasOwnProperty","call","_exportNames","exports","defineProperty","enumerable","get","_faker","_utils","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","n","__proto__","a","getOwnPropertyDescriptor","u","i","set","Email","pipe","annotations","arbitrary","fc","fakerArb","faker","internet","exampleEmail","map","withDefaultMake","PhoneNumber","phone","number","makeIs","schema","AST","isUnion","ast","types","reduce","acc","isTransformation","isDeclaration","to","from","isTypeLiteral","tag","Array","findFirst","propertySignatures","_","name","isLiteral","type","Option","some","none","getOrUndefined","String","literal","x","_tag","Error","makeIsAnyOf","includes","taggedUnionMap","self","fields","tags","Literal","ExtendTaggedUnion","extendM","is","isAnyOf","TaggedUnion","Union","tagMap"],"sources":["../src/schema.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"schema.cjs","names":["_core","require","S","_interopRequireWildcard","Object","keys","forEach","key","prototype","hasOwnProperty","call","_exportNames","exports","defineProperty","enumerable","get","_faker","_utils","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","n","__proto__","a","getOwnPropertyDescriptor","u","i","set","SpanId","Symbol","Email","pipe","annotations","arbitrary","fc","fakerArb","faker","internet","exampleEmail","map","withDefaultMake","PhoneNumber","phone","number","makeIs","schema","AST","isUnion","ast","types","reduce","acc","isTransformation","isDeclaration","to","from","isTypeLiteral","tag","Array","findFirst","propertySignatures","_","name","isLiteral","type","Option","some","none","getOrUndefined","String","literal","x","_tag","Error","makeIsAnyOf","includes","taggedUnionMap","self","fields","tags","Literal","ExtendTaggedUnion","extendM","is","isAnyOf","TaggedUnion","Union","tagMap"],"sources":["../src/schema.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/client/clientFor.d.ts

@@ -5,12 +5,11 @@ 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";
-import { Path } from "path-parser";
+import type { Path } from "path-parser";
 export declare function makePathWithQuery(path: Path, pars: Record<string, string | number | boolean | readonly string[] | readonly number[] | readonly boolean[] | null>): string;
 export declare function makePathWithBody(path: Path, pars: Record<string, string | number | boolean | readonly string[] | readonly number[] | readonly boolean[] | null>): string;
 type Requests = Record<string, any>;
 export type Client<M extends Requests> = RequestHandlers<ApiConfig | HttpClient.HttpClient, never, // SupportedErrors | FetchError | ResError,
-M> & RequestHandlersE<ApiConfig | HttpClient.HttpClient, never, // SupportedErrors | FetchError | ResError,
 M>;
 export declare function makeClientFor(layers: Layer.Layer<never, never, never>): <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;
@@ -21,30 +20,16 @@ type RequestHandlers<R, E, M extends Requests> = {
     [K in keyof M]: IsEmpty<Omit<S.Schema.Type<M[K]>, Cruft>> extends true ? {
         handler: Effect<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<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<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<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;
+        raw: {
+            handler: (req: Omit<S.Schema.Type<M[K]>, Cruft>) => Effect<Schema.Encoded<M[K]["success"]>, Schema.Type<M[K]["failure"]> | E, R>;
+            Request: M[K];
+            name: string;
+        };
     };
 };
 export {};

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

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

package/dist/client/clientFor.js

@@ -8,7 +8,6 @@ import { S } from "effect-app";
 import { ApiConfig } from "effect-app/client";
 import { HttpClient, HttpClientRequest } from "effect-app/http";
 import { typedKeysOf } from "effect-app/utils";
-import { Path } from "path-parser";
 import qs from "query-string";
 export function makePathWithQuery(path, pars) {
     const forQs = Record.filter(pars, (_, k) => !path.params.includes(k));
@@ -56,91 +55,24 @@ function clientFor_(models, layers = Layer.empty) {
         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
-                        .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
-                        .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.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.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
-                        .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
-                        .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
-                ? {
+        prev[cur] = Object.keys(fields).length === 0
+            ? {
+                handler: client
+                    .pipe(Effect.andThen((cl) => cl(new Request())), Effect.withSpan("client.request " + requestName, {
+                    captureStackTrace: false,
+                    attributes: { "request.name": requestName }
+                }), Effect.provide(layers)),
+                ...requestMeta,
+                raw: {
                     handler: client
                         .pipe(Effect.andThen((cl) => cl(new Request())), Effect.flatMap((res) => S.encode(Response)(res)), // TODO,
                     Effect.withSpan("client.request " + requestName, {
@@ -149,22 +81,25 @@ function clientFor_(models, layers = Layer.empty) {
                     }), Effect.provide(layers)),
                     ...requestMeta
                 }
-                : {
+            }
+            : {
+                handler: (req) => client
+                    .pipe(Effect.andThen((cl) => cl(new Request(req))), Effect.withSpan("client.request " + requestName, {
+                    captureStackTrace: false,
+                    attributes: { "request.name": requestName }
+                }), Effect.provide(layers)),
+                ...requestMeta,
+                raw: {
                     handler: (req) => client
                         .pipe(Effect.andThen((cl) => cl(new Request(req))), Effect.flatMap((res) => S.encode(Response)(res)), // 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
+                    ...requestMeta
+                }
+            };
         return prev;
     }, {}));
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"clientFor.js","sourceRoot":"","sources":["../../src/client/clientFor.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xpZW50Rm9yLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NsaWVudC9jbGllbnRGb3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsMERBQTBEO0FBQzFELHVEQUF1RDtBQUV2RCxPQUFPLEVBQUUsTUFBTSxFQUFFLElBQUksRUFBRSxPQUFPLEVBQUUsS0FBSyxFQUFFLE1BQU0sRUFBRSxTQUFTLEVBQUUsTUFBTSxFQUFFLE1BQU0sa0JBQWtCLENBQUE7QUFDMUYsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLGFBQWEsQ0FBQTtBQUN6QyxPQUFPLEVBQUUsZUFBZSxFQUFFLE1BQU0sa0JBQWtCLENBQUE7QUFHbEQsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLFFBQVEsQ0FBQTtBQUMvQixPQUFPLEVBQUUsQ0FBQyxFQUFFLE1BQU0sWUFBWSxDQUFBO0FBQzlCLE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQTtBQUM3QyxPQUFPLEVBQUUsVUFBVSxFQUFFLGlCQUFpQixFQUFFLE1BQU0saUJBQWlCLENBQUE7QUFFL0QsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLGtCQUFrQixDQUFBO0FBRzlDLE9BQU8sRUFBRSxNQUFNLGNBQWMsQ0FBQTtBQUU3QixNQUFNLFVBQVUsaUJBQWlCLENBQy9CLElBQVUsRUFDVixJQVNDO0lBRUQsTUFBTSxLQUFLLEdBQUcsTUFBTSxDQUFDLE1BQU0sQ0FBQyxJQUFJLEVBQUUsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUE7SUFDckUsTUFBTSxDQUFDLEdBQUcsS0FBSyxDQUFBLENBQUMscUhBQXFIO0lBQ3JJLE9BQU8sQ0FDTCxJQUFJLENBQUMsS0FBSyxDQUFDLElBQUksRUFBRSxFQUFFLFlBQVksRUFBRSxJQUFJLEVBQUUsaUJBQWlCLEVBQUUsSUFBSSxF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

package/dist/schema.d.ts

@@ -1,8 +1,13 @@
-import type { NonEmptyReadonlyArray } from "@effect-app/core";
+import type { NonEmptyReadonlyArray, Tracer } from "@effect-app/core";
 import { Array } from "@effect-app/core";
 import { type Email as EmailT, type PhoneNumber as PhoneNumberT } from "@effect-app/schema";
 import * as S from "@effect-app/schema";
 export * from "@effect-app/schema";
+export declare const SpanId: unique symbol;
+export type SpanId = typeof SpanId;
+export interface WithOptionalSpan {
+    [SpanId]?: Tracer.Span;
+}
 export declare const Email: S.WithDefaults<S.refine<string & S.EmailBrand, S.Schema<string, string, never>>> & S.refine<string & S.EmailBrand, S.Schema<string, string, never>>;
 export type Email = EmailT;
 export declare const PhoneNumber: S.WithDefaults<S.refine<string & S.PhoneNumberBrand, S.Schema<string, string, never>>> & S.refine<string & S.PhoneNumberBrand, S.Schema<string, string, never>>;

package/dist/schema.d.ts.map

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

package/dist/schema.js

@@ -3,6 +3,7 @@ import * as S from "@effect-app/schema";
 import { fakerArb } from "./faker.js";
 import { extendM } from "./utils.js";
 export * from "@effect-app/schema";
+export const SpanId = Symbol();
 export const Email = S
     .Email
     .pipe(S.annotations({
@@ -69,4 +70,4 @@ export const tags = (self) => S.Literal(...self.map((key) => {
 }));
 export const ExtendTaggedUnion = (schema) => extendM(schema, (_) => ({ is: makeIs(_), isAnyOf: makeIsAnyOf(_) /*, map: taggedUnionMap(a) */ }));
 export const TaggedUnion = (...a) => pipe(S.Union(...a), (_) => extendM(_, (_) => ({ is: makeIs(_), isAnyOf: makeIsAnyOf(_), tagMap: taggedUnionMap(a), tags: tags(a) })));
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2NoZW1hLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL3NjaGVtYS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsS0FBSyxFQUFFLE1BQU0sRUFBRSxJQUFJLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQTtBQUV0RCxPQUFPLEtBQUssQ0FBQyxNQUFNLG9CQUFvQixDQUFBO0FBQ3ZDLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFDckMsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLFlBQVksQ0FBQTtBQUVwQyxjQUFjLG9CQUFvQixDQUFBO0FBRWxDLE1BQU0sQ0FBQyxNQUFNLEtBQUssR0FBRyxDQUFDO0tBQ25CLEtBQUs7S0FDTCxJQUFJLENBQ0gsQ0FBQyxDQUFDLFdBQVcsQ0FBQztJQUNaLDZEQUE2RDtJQUM3RCxTQUFTLEVBQUUsR0FBMkIsRUFBRSxDQUFDLENBQUMsRUFBRSxFQUFFLEVBQUUsQ0FBQyxRQUFRLENBQUMsQ0FBQyxLQUFLLEVBQUUsRUFBRSxDQUFDLEtBQUssQ0FBQyxRQUFRLENBQUMsWUFBWSxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsR0FBRyxDQUFDLEtBQUssQ0FBQztDQUNqSCxDQUFDLEVBQ0YsQ0FBQyxDQUFDLGVBQWUsQ0FDbEIsQ0FBQTtBQUlILE1BQU0sQ0FBQyxNQUFNLFdBQVcsR0FBRyxDQUFDO0tBQ3pCLFdBQVc7S0FDWCxJQUFJLENBQ0gsQ0FBQyxDQUFDLFdBQVcsQ0FBQztJQUNaLFNBQVMsRUFBRSxHQUFpQyxFQUFFLENBQUMsQ0FBQyxFQUFFLEVBQUUsRUFBRTtJQUNwRCw2REFBNkQ7SUFDN0QsUUFBUSxDQUFDLENBQUMsS0FBSyxFQUFFLEVBQUUsQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLE1BQU0sQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxXQUFXLENBQUM7Q0FDL0QsQ0FBQyxFQUNGLENBQUMsQ0FBQyxlQUFlLENBQ2xCLENBQUE7QUFFSCxNQUFNLENBQUMsTUFBTSxNQUFNLEdBQUcsQ0FDcEIsTUFBeUIsRUFDekIsRUFBRTtJQUNGLElBQUksQ0FBQyxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUM7UUFDOUIsT0FBTyxNQUFNLENBQUMsR0FBRyxDQUFDLEtBQUssQ0FBQyxNQUFNLENBQUMsQ0FBQyxHQUFHLEVBQUUsQ0FBQyxFQUFFLEVBQUU7WUFDeEMsSUFBSSxDQUFDLENBQUMsR0FBRyxDQUFDLGdCQUFnQixDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUM7Z0JBQzlCLElBQUksQ0FBQyxDQUFDLEdBQUcsQ0FBQyxhQUFhLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxFQUFFLENBQUM7b0JBQzlCLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBSSxDQUFBO2dCQUNaLENBQUM7cUJBQU0sQ0FBQztvQkFDTixDQUFDLEdBQUcsQ0FBQyxDQUFDLEVBQUUsQ0FBQTtnQkFDVixDQUFDO1lBQ0gsQ0FBQztZQUNELElBQUksQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUFDLGFBQWEsQ0FBQyxDQUFDLENBQUM7Z0JBQUUsT0FBTyxHQUFHLENBQUE7WUFDdkMsTUFBTSxHQUFHLEdBQUcsS0FBSyxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUMsa0JBQWtCLEVBQUUsQ0FBQyxDQUFDLEVBQUUsRUFBRTtnQkFDdEQsSUFBSSxDQUFDLENBQUMsSUFBSSxLQUFLLE1BQU0sSUFBSSxDQUFDLENBQUMsR0FBRyxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQztvQkFDakQsT0FBTyxNQUFNLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQTtnQkFDNUIsQ0FBQztnQkFDRCxPQUFPLE1BQU0sQ0FBQyxJQUFJLEVBQUUsQ0FBQTtZQUN0QixDQUFDLENBQUMsQ0FBQTtZQUNGLE1BQU0sR0FBRyxHQUFHLE1BQU0sQ0FBQyxjQUFjLENBQUMsR0FBRyxDQUFDLENBQUE7WUFDdEMsSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUFDO2dCQUNULE9BQU8sR0FBRyxDQUFBO1lBQ1osQ0FBQztZQUNELE9BQU87Z0JBQ0wsR0FBRyxHQUFHO2dCQUNOLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBbUIsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLElBQUksS0FBSyxHQUFHLENBQUMsT0FBTzthQUN2RSxDQUFBO1FBQ0gsQ0FBQyxFQUFFLEVBQVcsQ0FBQyxDQUFBO0lBQ2pCLENBQUM7SUFDRCxNQUFNLElBQUksS0FBSyxDQUFDLGFBQWEsQ0FBQyxDQUFBO0FBQ2hDLENBQUMsQ0FBQTtBQUVELE1BQU0sQ0FBQyxNQUFNLFdBQVcsR0FBRyxDQUN6QixNQUF5QixFQUNmLEVBQUU7SUFDWixJQUFJLENBQUMsQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDO1FBQzlCLE9BQU8sQ0FBMkIsR0FBRyxJQUFVLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBSSxFQUF3QyxFQUFFLENBQ2pHLElBQUksQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFBO0lBQ3pCLENBQUM7SUFDRCxNQUFNLElBQUksS0FBSyxDQUFDLGFBQWEsQ0FBQyxDQUFBO0FBQ2hDLENBQUMsQ0FBQTtBQVNELE1BQU0sQ0FBQyxNQUFNLGNBQWMsR0FBRyxDQUk1QixJQUFhLEVBQ2IsRUFBRSxDQUNGLElBQUksQ0FBQyxNQUFNLENBQUMsQ0FBQyxHQUFHLEVBQUUsR0FBRyxFQUFFLEVBQUU7SUFDdkIsNkRBQTZEO0lBQzdELE1BQU0sR0FBRyxHQUFHLEdBQUcsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLEdBQXFDLENBQUE7SUFDakUsTUFBTSxHQUFHLEdBQUksR0FBRyxDQUFDLElBQXNCLENBQUMsT0FBaUIsQ0FBQyxtSkFBbUo7S0FDNU07SUFBQyxHQUFXLENBQUMsR0FBRyxDQUFDLEdBQUcsR0FBVSxDQUFBO0lBQy9CLE9BQU8sR0FBRyxDQUFBO0FBQ1osQ0FBQyxFQUFFLEVBQTRGLENBQUMsQ0FBQTtBQUVsRyxNQUFNLENBQUMsTUFBTSxJQUFJLEdBQUcsQ0FJbEIsSUFBYSxFQUNiLEVBQUUsQ0FDRixDQUFDLENBQUMsT0FBTyxDQUFDLEdBQUcsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDLEdBQUcsRUFBRSxFQUFFO0lBQzVCLE1BQU0sR0FBRyxHQUFHLEdBQUcsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLEdBQXFDLENBQUE7SUFDakUsTUFBTSxHQUFHLEdBQUksR0FBRyxDQUFDLElBQXNCLENBQUMsT0FBTyxDQUFBO0lBQy9DLE9BQU8sR0FBRyxDQUFBO0lBQ1YsOERBQThEO0FBQ2hFLENBQUMsQ0FBQyxDQUlELENBQUE7QUFDSCxNQUFNLENBQUMsTUFBTSxpQkFBaUIsR0FBRyxDQUMvQixNQUF5QixFQUN6QixFQUFFLENBQUMsT0FBTyxDQUFDLE1BQU0sRUFBRSxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxFQUFFLEVBQUUsRUFBRSxNQUFNLENBQUMsQ0FBQyxDQUFDLEVBQUUsT0FBTyxFQUFFLFdBQVcsQ0FBQyxDQUFDLENBQUMsQ0FBQyw2QkFBNkIsRUFBRSxDQUFDLENBQUMsQ0FBQTtBQUV2RyxNQUFNLENBQUMsTUFBTSxXQUFXLEdBQUcsQ0FHekIsR0FBRyxDQUFVLEVBQUUsRUFBRSxDQUNqQixJQUFJLENBQ0YsQ0FBQyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQyxFQUNiLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxPQUFPLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLEVBQUUsRUFBRSxFQUFFLE1BQU0sQ0FBQyxDQUFDLENBQUMsRUFBRSxPQUFPLEVBQUUsV0FBVyxDQUFDLENBQUMsQ0FBQyxFQUFFLE1BQU0sRUFBRSxjQUFjLENBQUMsQ0FBQyxDQUFDLEVBQUUsSUFBSSxFQUFFLElBQUksQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FDakgsQ0FBQSJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2NoZW1hLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL3NjaGVtYS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsS0FBSyxFQUFFLE1BQU0sRUFBRSxJQUFJLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQTtBQUV0RCxPQUFPLEtBQUssQ0FBQyxNQUFNLG9CQUFvQixDQUFBO0FBQ3ZDLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFDckMsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLFlBQVksQ0FBQTtBQUVwQyxjQUFjLG9CQUFvQixDQUFBO0FBRWxDLE1BQU0sQ0FBQyxNQUFNLE1BQU0sR0FBRyxNQUFNLEVBQUUsQ0FBQTtBQU85QixNQUFNLENBQUMsTUFBTSxLQUFLLEdBQUcsQ0FBQztLQUNuQixLQUFLO0tBQ0wsSUFBSSxDQUNILENBQUMsQ0FBQyxXQUFXLENBQUM7SUFDWiw2REFBNkQ7SUFDN0QsU0FBUyxFQUFFLEdBQTJCLEVBQUUsQ0FBQyxDQUFDLEVBQUUsRUFBRSxFQUFFLENBQUMsUUFBUSxDQUFDLENBQUMsS0FBSyxFQUFFLEVBQUUsQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLFlBQVksQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUM7Q0FDakgsQ0FBQyxFQUNGLENBQUMsQ0FBQyxlQUFlLENBQ2xCLENBQUE7QUFJSCxNQUFNLENBQUMsTUFBTSxXQUFXLEdBQUcsQ0FBQztLQUN6QixXQUFXO0tBQ1gsSUFBSSxDQUNILENBQUMsQ0FBQyxXQUFXLENBQUM7SUFDWixTQUFTLEVBQUUsR0FBaUMsRUFBRSxDQUFDLENBQUMsRUFBRSxFQUFFLEVBQUU7SUFDcEQsNkRBQTZEO0lBQzdELFFBQVEsQ0FBQyxDQUFDLEtBQUssRUFBRSxFQUFFLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FBQyxNQUFNLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxHQUFHLENBQUMsV0FB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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "effect-app",
-  "version": "1.29.0",
+  "version": "1.30.1",
   "license": "MIT",
   "type": "module",
   "dependencies": {

package/src/client/clientFor.ts

@@ -13,7 +13,7 @@ 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"
+import type { Path } from "path-parser"
 import qs from "query-string"
 
 export function makePathWithQuery(
@@ -68,17 +68,11 @@ const apiClient = Effect.gen(function*() {
   )
 })
 
-export type Client<M extends Requests> =
-  & RequestHandlers<
-    ApiConfig | HttpClient.HttpClient,
-    never, // SupportedErrors | FetchError | ResError,
-    M
-  >
-  & RequestHandlersE<
-    ApiConfig | HttpClient.HttpClient,
-    never, // SupportedErrors | FetchError | ResError,
-    M
-  >
+export type Client<M extends Requests> = RequestHandlers<
+  ApiConfig | HttpClient.HttpClient,
+  never, // SupportedErrors | FetchError | ResError,
+  M
+>
 
 export function makeClientFor(layers: Layer.Layer<never, never, never>) {
   const cache = new Map<any, Client<any>>()
@@ -138,18 +132,11 @@ function clientFor_<M extends Requests>(models: M, layers = Layer.empty) {
       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
       }
 
@@ -159,40 +146,8 @@ function clientFor_<M extends Requests>(models: M, layers = Layer.empty) {
       )
 
       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
-                  .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
-                    .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
+      prev[cur] = Object.keys(fields).length === 0
         ? {
           handler: client
             .pipe(
@@ -203,85 +158,26 @@ function clientFor_<M extends Requests>(models: M, layers = Layer.empty) {
               }),
               Effect.provide(layers)
             ),
-          ...requestMeta
-        }
-        : {
-          handler: (req: any) =>
-            client
-              .pipe(
-                Effect.andThen((cl) => cl(new Request(req))),
-                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
-          ? {
+          raw: {
             handler: client
               .pipe(
                 Effect.andThen((cl) => cl(new Request())),
                 Effect.flatMap((res) => S.encode(Response)(res)), // TODO,
-                Effect
-                  .withSpan("client.request " + requestName, {
-                    captureStackTrace: false,
-                    attributes: { "request.name": requestName }
-                  }),
+                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
-                    .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.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.withSpan("client.request " + requestName, {
                   captureStackTrace: false,
                   attributes: { "request.name": requestName }
@@ -290,14 +186,22 @@ function clientFor_<M extends Requests>(models: M, layers = Layer.empty) {
               ),
 
           ...requestMeta,
-          mapPath: (req: any) =>
-            req
-              ? requestMeta.method === "DELETE"
-                ? makePathWithQuery(path, encodeRequest(req))
-                : makePathWithBody(path, encodeRequest(req))
-              : p
+          raw: {
+            handler: (req: any) =>
+              client
+                .pipe(
+                  Effect.andThen((cl) => cl(new Request(req))),
+                  Effect.flatMap((res) => S.encode(Response)(res)), // TODO,
+                  Effect.withSpan("client.request " + requestName, {
+                    captureStackTrace: false,
+                    attributes: { "request.name": requestName }
+                  }),
+                  Effect.provide(layers)
+                ),
+
+            ...requestMeta
+          }
         }
-      // generate handler
 
       return prev
     }, {} as Client<M>))
@@ -321,8 +225,6 @@ type RequestHandlers<R, E, M extends Requests> = {
   [K in keyof M]: IsEmpty<Omit<S.Schema.Type<M[K]>, Cruft>> extends true ? {
       handler: Effect<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
     }
     : {
@@ -334,38 +236,21 @@ type RequestHandlers<R, E, M extends Requests> = {
         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<
-        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
+      raw: {
+        handler: (
+          req: Omit<
+            S.Schema.Type<M[K]>,
+            Cruft
+          >
+        ) => Effect<
+          Schema.Encoded<M[K]["success"]>,
+          Schema.Type<M[K]["failure"]> | E,
+          R
         >
-      ) => Effect<
-        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
+        Request: M[K]
+        name: string
+      }
     }
 }

package/src/schema.ts

@@ -1,4 +1,4 @@
-import type { NonEmptyReadonlyArray } from "@effect-app/core"
+import type { NonEmptyReadonlyArray, Tracer } from "@effect-app/core"
 import { Array, Option, pipe } from "@effect-app/core"
 import { type A, type Email as EmailT, type PhoneNumber as PhoneNumberT } from "@effect-app/schema"
 import * as S from "@effect-app/schema"
@@ -7,6 +7,13 @@ import { extendM } from "./utils.js"
 
 export * from "@effect-app/schema"
 
+export const SpanId = Symbol()
+export type SpanId = typeof SpanId
+
+export interface WithOptionalSpan {
+  [SpanId]?: Tracer.Span
+}
+
 export const Email = S
   .Email
   .pipe(