effect-app 2.54.2 → 2.54.3

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @effect-app/prelude
 
+## 2.54.3
+
+### Patch Changes
+
+- dd30471: improve
+
 ## 2.54.2
 
 ### Patch Changes

package/dist/client/apiClientFactory.d.ts

@@ -22,7 +22,28 @@ type RpcHandlers<M extends Requests> = {
     [K in keyof M]: Rpc.Rpc<M[K]["_tag"], M[K], M[K]["success"], M[K]["failure"]>;
 };
 export declare const getMeta: <M extends Requests>(resource: M) => M["meta"];
-export declare const makeRpcGroup: <M extends Requests, const ModuleName extends string>(resource: M, moduleName: ModuleName) => RpcGroup.RpcGroup<RpcHandlers<{ [K in keyof M as M[K] extends Req ? K : never]: M[K] extends Req ? M[K] : never; }>[keyof { [K in keyof M as M[K] extends Req ? K : never]: M[K] extends Req ? M[K] : never; }]>;
+export declare const makeRpcGroupFromRequestsAndModuleName: <M extends Requests, const ModuleName extends string>(resource: M, moduleName: ModuleName) => RpcGroup.RpcGroup<Rpc.Prefixed<RpcHandlers<{ [K in keyof M as M[K] extends Req ? K : never]: M[K] extends Req ? M[K] : never; }>[keyof { [K in keyof M as M[K] extends Req ? K : never]: M[K] extends Req ? M[K] : never; }], `${ModuleName}.`>>;
+export declare const makeRpcGroup: <M extends Requests, const ModuleName extends string>(resource: M & {
+    meta: {
+        moduleName: ModuleName;
+    };
+}) => RpcGroup.RpcGroup<Rpc.Prefixed<RpcHandlers<M & {
+    meta: {
+        moduleName: ModuleName;
+    };
+} extends infer T extends Requests ? { [K in keyof T as (M & {
+    meta: {
+        moduleName: ModuleName;
+    };
+})[K] extends Req ? K : never]: T[K] extends Req ? T[K] : never; } : never>[keyof (M & {
+    meta: {
+        moduleName: ModuleName;
+    };
+} extends infer T_1 extends Requests ? { [K in keyof T_1 as (M & {
+    meta: {
+        moduleName: ModuleName;
+    };
+})[K] extends Req ? K : never]: T_1[K] extends Req ? T_1[K] : never; } : never)], `${ModuleName}.`>>;
 declare const ApiClientFactory_base: (abstract new (service: (requestLevelLayers: Layer.Layer<never, never, never>, options?: ClientForOptions) => <M extends Requests>(models: M) => Effect<import("./clientFor.js").RequestHandlers<never, never, Omit<M, "meta">>>) => Readonly<(requestLevelLayers: Layer.Layer<never, never, never>, options?: ClientForOptions) => <M extends Requests>(models: M) => Effect<import("./clientFor.js").RequestHandlers<never, never, Omit<M, "meta">>>> & Context.TagClassShape<"ApiClientFactory", (requestLevelLayers: Layer.Layer<never, never, never>, options?: ClientForOptions) => <M extends Requests>(models: M) => Effect<import("./clientFor.js").RequestHandlers<never, never, Omit<M, "meta">>>>) & {
     toLayer: <E, R>(eff: Effect.Effect<Omit<ApiClientFactory, keyof Context.TagClassShape<any, any>>, E, R>) => Layer.Layer<ApiClientFactory, E, R>;
     toLayerScoped: <E, R>(eff: Effect.Effect<Omit<ApiClientFactory, keyof Context.TagClassShape<any, any>>, E, R>) => Layer.Layer<ApiClientFactory, E, Exclude<R, import("effect/Scope").Scope>>;

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

@@ -1 +1 @@
-{"version":3,"file":"apiClientFactory.d.ts","sourceRoot":"","sources":["../../src/client/apiClientFactory.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAa,QAAQ,EAAoB,MAAM,aAAa,CAAA;AACxE,OAAO,EAAE,UAAU,EAAqB,MAAM,YAAY,CAAA;AAC1D,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAQ,OAAO,EAAE,KAAK,EAAkB,MAAM,EAAa,CAAC,EAAU,MAAM,oBAAoB,CAAA;AAEhI,OAAO,KAAK,EAAU,gBAAgB,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAExE,MAAM,WAAW,SAAS;IACxB,GAAG,EAAE,MAAM,CAAA;IACX,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAA;CACzC;AAED,eAAO,MAAM,gBAAgB;;;EAQ3B,CAAA;AAEF,KAAK,GAAG,GAAG,CAAC,CAAC,MAAM,CAAC,GAAG,GAAG;IACxB,KAAI,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,GAAG,CAAA;IACxB,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM,CAAA;IACvB,OAAO,EAAE,CAAC,CAAC,MAAM,CAAC,GAAG,CAAA;IACrB,OAAO,EAAE,CAAC,CAAC,MAAM,CAAC,GAAG,CAAA;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;CAC7B,CAAA;AAkCD,KAAK,WAAW,CAAC,CAAC,SAAS,QAAQ,IAAI;KACpC,CAAC,IAAI,MAAM,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;CAC9E,CAAA;AAoBD,eAAO,MAAM,OAAO,GAAI,CAAC,SAAS,QAAQ,EAAE,UAAU,CAAC,KAGtC,CAAC,CAAC,MAAM,CACxB,CAAA;AAED,eAAO,MAAM,YAAY,GAAI,CAAC,SAAS,QAAQ,EAAE,KAAK,CAAC,UAAU,SAAS,MAAM,EAC9E,UAAU,CAAC,EACX,YAAY,UAAU,sCAxBnB,CAAC,2FAAD,CAAC,kFAqCL,CAAA;kFA4IoD,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,YAAY,gBAAgB,MAOnG,CAAC,SAAS,QAAQ,UAChB,CAAC,uHARoC,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,YAAY,gBAAgB,MAOnG,CAAC,SAAS,QAAQ,UAChB,CAAC,uJARoC,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,YAAY,gBAAgB,MAOnG,CAAC,SAAS,QAAQ,UAChB,CAAC;;;;;4CARoC,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,YAAY,gBAAgB,MAOnG,CAAC,SAAS,QAAQ,UAChB,CAAC;;AAiBjB;;GAEG;AACH,qBAAa,gBACX,SAAQ,qBAAkG;IAE1G,MAAM,CAAC,QAAQ,CAAC,KAAK,GAAI,QAAQ,SAAS,iEAC0C;IACpF,MAAM,CAAC,QAAQ,CAAC,eAAe,iGAAoE;IAEnG,MAAM,CAAC,QAAQ,CAAC,OAAO,GACpB,oBAAoB,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,UAAU,gBAAgB,MAChF,CAAC,SAAS,QAAQ,EACjB,UAAU,CAAC,qHAMR;CACR"}
+{"version":3,"file":"apiClientFactory.d.ts","sourceRoot":"","sources":["../../src/client/apiClientFactory.ts"],"names":[],"mappings":"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"}

package/dist/client/apiClientFactory.js

@@ -37,7 +37,7 @@ export const getMeta = (resource) => {
         throw new Error("No meta defined in Resource!");
     return meta;
 };
-export const makeRpcGroup = (resource, moduleName) => {
+export const makeRpcGroupFromRequestsAndModuleName = (resource, moduleName) => {
     const filtered = getFiltered(resource);
     const rpcs = RpcGroup
         .make(...typedValuesOf(filtered).map((_) => {
@@ -46,9 +46,10 @@ export const makeRpcGroup = (resource, moduleName) => {
         .prefix(`${moduleName}.`);
     return rpcs;
 };
+export const makeRpcGroup = (resource) => makeRpcGroupFromRequestsAndModuleName(resource, resource.meta.moduleName);
 const makeRpcTag = (resource) => {
     const meta = getMeta(resource);
-    const rpcs = makeRpcGroup(resource, meta.moduleName);
+    const rpcs = makeRpcGroupFromRequestsAndModuleName(resource, meta.moduleName);
     return class TheClient extends Context.Tag(`RpcClient.${meta.moduleName}`)() {
         static layer = Layer.scoped(TheClient, Effect.map(RpcClient.make(rpcs, { spanPrefix: "RpcClient." + meta.moduleName }), (cl) => cl[meta.moduleName]));
     };
@@ -149,4 +150,4 @@ export class ApiClientFactory extends Context.TagId("ApiClientFactory")() {
         .use((apiClientFactory) => apiClientFactory(requestLevelLayers, options))
         .pipe(Effect.flatMap((f) => f(resource))); // don't rename f to clientFor or integration in vue project linked fucks up
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"apiClientFactory.js","sourceRoot":"","sources":["../../src/client/apiClientFactory.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"apiClientFactory.js","sourceRoot":"","sources":["../../src/client/apiClientFactory.ts"],"names":[],"mappings":"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"}

package/package.json

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

package/src/client/apiClientFactory.ts

@@ -89,26 +89,34 @@ export const getMeta = <M extends Requests>(resource: M) => {
   return meta as M["meta"]
 }
 
-export const makeRpcGroup = <M extends Requests, const ModuleName extends string>(
+export const makeRpcGroupFromRequestsAndModuleName = <M extends Requests, const ModuleName extends string>(
   resource: M,
   moduleName: ModuleName
 ) => {
   const filtered = getFiltered(resource)
   type newM = typeof filtered
-
   const rpcs = RpcGroup
     .make(
       ...typedValuesOf(filtered).map((_) => {
         return Rpc.fromTaggedRequest(_ as any)
       })
     )
-    .prefix(`${moduleName}.`) as RpcGroup.RpcGroup<RpcHandlers<newM>[keyof newM]>
+    .prefix(`${moduleName}.`) as unknown as RpcGroup.RpcGroup<
+      Rpc.Prefixed<RpcHandlers<newM>[keyof newM], `${ModuleName}.`>
+    >
   return rpcs
 }
 
+export const makeRpcGroup = <
+  M extends Requests,
+  const ModuleName extends string
+>(
+  resource: M & { meta: { moduleName: ModuleName } }
+) => makeRpcGroupFromRequestsAndModuleName(resource, resource.meta.moduleName)
+
 const makeRpcTag = <M extends Requests>(resource: M) => {
   const meta = getMeta(resource)
-  const rpcs = makeRpcGroup(resource, meta.moduleName)
+  const rpcs = makeRpcGroupFromRequestsAndModuleName(resource, meta.moduleName)
 
   return class TheClient extends Context.Tag(`RpcClient.${meta.moduleName}`)<
     TheClient,