effect-app 1.20.0 → 1.21.1

package/dist/client/clientFor.js

@@ -1,160 +1,178 @@
 /* eslint-disable @typescript-eslint/no-unsafe-argument */
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import { Effect, flow, Predicate } from "@effect-app/core";
-import { REST } from "effect-app/schema";
+import { Effect, flow, HashMap, Layer, Option, Predicate, Struct } from "@effect-app/core";
+import { RpcResolver } from "@effect/rpc";
+import { HttpRpcResolver } from "@effect/rpc-http";
+import { Record } from "effect";
+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 { S } from "../lib.js";
-import { typedKeysOf } from "../utils.js";
-import { fetchApi, fetchApi3S, fetchApi3SE, makePathWithBody, makePathWithQuery, mapResponseM, ResError } from "./fetch.js";
-export * from "./config.js";
-const cache = new Map();
-export function clientFor(models) {
-    const found = cache.get(models);
-    if (found) {
-        return found;
-    }
-    const m = clientFor_(models);
-    cache.set(models, m);
-    return m;
+import qs from "query-string";
+export function makePathWithQuery(path, pars) {
+    const forQs = Record.filter(pars, (_, k) => !path.params.includes(k));
+    const q = forQs; // { ...forQs, _: JSON.stringify(forQs) } // TODO: drop completely individual keys from query?, sticking to json only
+    return (path.build(pars, { ignoreSearch: true, ignoreConstraints: true })
+        + (Object.keys(q).length
+            ? "?" + qs.stringify(q)
+            : ""));
 }
-function clientFor_(models) {
+export function makePathWithBody(path, pars) {
+    return path.build(pars, { ignoreSearch: true, ignoreConstraints: true });
+}
+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 makeClientFor(layers) {
+    const cache = new Map();
+    return (models) => {
+        const found = cache.get(models);
+        if (found) {
+            return found;
+        }
+        const m = clientFor_(models, layers);
+        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].Request || Object.keys(models[cur]).some((_) => _.endsWith("Request")) /* bwc */)) {
+            && (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)
-        // ignore module interop with automatic default exports..
-        .filter((x) => x !== "default" && x !== "meta")
         .reduce((prev, cur) => {
         const h = filtered[cur];
-        const Request_ = REST.extractRequest(h);
-        const Response = REST.extractResponse(h);
-        const m = models.meta;
-        if (!m)
-            throw new Error("No meta defined in Resource!");
-        const requestName = `${m.moduleName}.${cur}`
+        const Request = h;
+        const Response = h.success;
+        const encodeRequest = S.encodeSync(Request);
+        const requestName = `${meta.moduleName}.${cur}`
             .replaceAll(".js", "");
-        const Request = class extends Request_ {
-            static path = "/" + requestName + (Request_.path === "/" ? "" : Request_.path);
-            static method = Request_.method === "AUTO"
-                ? REST.determineMethod(cur, Request_)
-                : Request_.method;
-        };
-        if (Request_.method === "AUTO") {
-            Object.assign(Request, {
-                [Request.method === "GET" || Request.method === "DELETE" ? "Query" : "Body"]: Request_.Auto
-            });
-        }
-        const b = Object.assign({}, h, { Request, Response });
-        const meta = {
+        const requestMeta = {
+            method: "POST", // TODO
             Request,
             Response,
-            mapPath: Request.path,
+            mapPath: requestName,
             name: requestName
         };
-        const res = Response;
-        const parseResponse = flow(S.decodeUnknown(res), (_) => Effect.mapError(_, (err) => new ResError(err)));
-        const parseResponseE = flow(S.decodeUnknown(S.encodedSchema(res)), (_) => Effect.mapError(_, (err) => new ResError(err)));
-        const path = new Path(Request.path);
-        const parse = mapResponseM(parseResponse);
-        const parseE = mapResponseM(parseResponseE);
-        // TODO: look into ast, look for propertySignatures, etc.
-        // TODO: and fix type wise
-        // if we don't need fields, then also dont require an argument.
-        const fields = [Request.Body, Request.Query, Request.Path]
-            .filter((x) => x)
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-            .flatMap((x) => x.ast.propertySignatures);
+        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] = Request.method === "GET"
-            ? fields.length === 0
+        prev[cur] = requestMeta.method === "GET"
+            ? Object.keys(fields).length === 0
                 ? {
-                    handler: fetchApi(Request.method, Request.path, undefined, Request.errors)
-                        .pipe(Effect.flatMap(parse), Effect
+                    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 }
-                    })),
-                    ...meta
+                    }), Effect.provide(layers)),
+                    ...requestMeta
                 }
                 : {
-                    handler: (req) => fetchApi(Request.method, makePathWithQuery(path, S.encodeSync(Request)(req)), undefined, Request.errors)
-                        .pipe(Effect.flatMap(parse), Effect
+                    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 }
-                    })),
-                    ...meta,
-                    mapPath: (req) => req ? makePathWithQuery(path, S.encodeSync(Request)(req)) : Request.path
+                    }), Effect.provide(layers)),
+                    ...requestMeta,
+                    mapPath: (req) => req ? makePathWithQuery(path, encodeRequest(req)) : p
                 }
-            : fields.length === 0
+            : Object.keys(fields).length === 0
                 ? {
-                    handler: fetchApi3S(b)({}).pipe(Effect.withSpan("client.request " + requestName, {
+                    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 }
-                    })),
-                    ...meta
+                    }), Effect.provide(layers)),
+                    ...requestMeta
                 }
                 : {
-                    handler: (req) => fetchApi3S(b)(req).pipe(Effect.withSpan("client.request " + requestName, {
+                    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 }
-                    })),
-                    ...meta,
+                    }), Effect.provide(layers)),
+                    ...requestMeta,
                     mapPath: (req) => req
-                        ? Request.method === "DELETE"
-                            ? makePathWithQuery(path, S.encodeSync(Request)(req))
-                            : makePathWithBody(path, S.encodeSync(Request)(req))
-                        : Request.path
+                        ? requestMeta.method === "DELETE"
+                            ? makePathWithQuery(path, encodeRequest(req))
+                            : makePathWithBody(path, encodeRequest(req))
+                        : p
                 };
         // generate handler
         // @ts-expect-error doc
-        prev[`${cur}E`] = Request.method === "GET"
-            ? fields.length === 0
+        prev[`${cur}E`] = requestMeta.method === "GET"
+            ? Object.keys(fields).length === 0
                 ? {
-                    handler: fetchApi(Request.method, Request.path)
-                        .pipe(Effect.flatMap(parseE), Effect
+                    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 }
-                    })),
-                    ...meta
+                    }), Effect.provide(layers)),
+                    ...requestMeta
                 }
                 : {
-                    handler: (req) => fetchApi(Request.method, makePathWithQuery(path, S.encodeSync(Request)(req)))
-                        .pipe(Effect.flatMap(parseE), Effect
+                    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 }
-                    })),
-                    ...meta,
-                    mapPath: (req) => req ? makePathWithQuery(path, S.encodeSync(Request)(req)) : Request.path
+                    }), Effect.provide(layers)),
+                    ...requestMeta,
+                    mapPath: (req) => req ? makePathWithQuery(path, encodeRequest(req)) : p
                 }
-            : fields.length === 0
+            : Object.keys(fields).length === 0
                 ? {
-                    handler: fetchApi3SE(b)({}).pipe(Effect.withSpan("client.request " + requestName, {
+                    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 }
-                    })),
-                    ...meta
+                    }), Effect.provide(layers)),
+                    ...requestMeta
                 }
                 : {
-                    handler: (req) => fetchApi3SE(b)(req).pipe(Effect.withSpan("client.request " + requestName, {
+                    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 }
-                    })),
-                    ...meta,
+                    }), Effect.provide(layers)),
+                    ...requestMeta,
                     mapPath: (req) => req
-                        ? Request.method === "DELETE"
-                            ? makePathWithQuery(path, S.encodeSync(Request)(req))
-                            : makePathWithBody(path, S.encodeSync(Request)(req))
-                        : Request.path
+                        ? requestMeta.method === "DELETE"
+                            ? makePathWithQuery(path, encodeRequest(req))
+                            : makePathWithBody(path, encodeRequest(req))
+                        : p
                 };
         // generate handler
         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,{"version":3,"file":"clientFor.js","sourceRoot":"","sources":["../../src/client/clientFor.ts"],"names":[],"mappings":"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"}

package/dist/client.d.ts

@@ -1,5 +1,4 @@
 export * from "./client/clientFor.js";
 export * from "./client/config.js";
 export * from "./client/errors.js";
-export * from "./client/fetch.js";
 //# sourceMappingURL=client.d.ts.map

package/dist/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AACA,cAAc,uBAAuB,CAAA;AACrC,cAAc,oBAAoB,CAAA;AAClC,cAAc,oBAAoB,CAAA;AAClC,cAAc,mBAAmB,CAAA"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AACA,cAAc,uBAAuB,CAAA;AACrC,cAAc,oBAAoB,CAAA;AAClC,cAAc,oBAAoB,CAAA"}

package/dist/client.js

@@ -2,6 +2,5 @@
 export * from "./client/clientFor.js";
 export * from "./client/config.js";
 export * from "./client/errors.js";
-export * from "./client/fetch.js";
 // codegen:end
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xpZW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2NsaWVudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSx5REFBeUQ7QUFDekQsY0FBYyx1QkFBdUIsQ0FBQTtBQUNyQyxjQUFjLG9CQUFvQixDQUFBO0FBQ2xDLGNBQWMsb0JBQW9CLENBQUE7QUFDbEMsY0FBYyxtQkFBbUIsQ0FBQTtBQUNqQyxjQUFjIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xpZW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2NsaWVudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSx5REFBeUQ7QUFDekQsY0FBYyx1QkFBdUIsQ0FBQTtBQUNyQyxjQUFjLG9CQUFvQixDQUFBO0FBQ2xDLGNBQWMsb0JBQW9CLENBQUE7QUFDbEMsY0FBYyJ9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "effect-app",
-  "version": "1.20.0",
+  "version": "1.21.1",
   "license": "MIT",
   "type": "module",
   "dependencies": {
@@ -15,7 +15,7 @@
     "uuid": "^10.0.0",
     "validator": "^13.12.0",
     "@effect-app/core": "1.12.0",
-    "@effect-app/schema": "1.14.0"
+    "@effect-app/schema": "1.15.0"
   },
   "devDependencies": {
     "@babel/cli": "^7.25.7",
@@ -151,16 +151,6 @@
         "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",
@@ -181,26 +171,6 @@
         "default": "./_cjs/client/errors.cjs"
       }
     },
-    "./client/fetch": {
-      "import": {
-        "types": "./dist/client/fetch.d.ts",
-        "default": "./dist/client/fetch.js"
-      },
-      "require": {
-        "types": "./dist/client/fetch.d.ts",
-        "default": "./_cjs/client/fetch.cjs"
-      }
-    },
-    "./client/router": {
-      "import": {
-        "types": "./dist/client/router.d.ts",
-        "default": "./dist/client/router.js"
-      },
-      "require": {
-        "types": "./dist/client/router.d.ts",
-        "default": "./_cjs/client/router.cjs"
-      }
-    },
     "./faker": {
       "import": {
         "types": "./dist/faker.d.ts",