effect-app 4.0.0-beta.6 → 4.0.0-beta.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/CHANGELOG.md +12 -0
  2. package/dist/client/apiClientFactory.d.ts.map +1 -1
  3. package/dist/client/apiClientFactory.js +4 -5
  4. package/package.json +1 -1
  5. package/src/client/apiClientFactory.ts +5 -9
package/CHANGELOG.md CHANGED
@@ -1,5 +1,17 @@
1
1
  # @effect-app/prelude
2
2
 
3
+ ## 4.0.0-beta.8
4
+
5
+ ### Patch Changes
6
+
7
+ - 1f336bc: fix RequestName
8
+
9
+ ## 4.0.0-beta.7
10
+
11
+ ### Patch Changes
12
+
13
+ - 62b4989: fix request attr
14
+
3
15
  ## 4.0.0-beta.6
4
16
 
5
17
  ### Patch Changes
package/dist/client/apiClientFactory.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"apiClientFactory.d.ts","sourceRoot":"","sources":["../../src/client/apiClientFactory.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"apiClientFactory.d.ts","sourceRoot":"","sources":["../../src/client/apiClientFactory.ts"],"names":[],"mappings":"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"}
package/dist/client/apiClientFactory.js CHANGED
@@ -25,8 +25,7 @@ class RequestName extends ServiceMap.Reference("RequestName", {
25
25
  export const HttpClientLayer = (config) => Layer.effect(HttpClient.HttpClient, Effect
26
26
  .gen(function* () {
27
27
  const baseClient = yield* HttpClient.HttpClient;
28
- const ctx = yield* RequestName;
29
- const client = baseClient.pipe(HttpClient.mapRequest(HttpClientRequest.prependUrl(config.url + "/rpc")), HttpClient.mapRequest(HttpClientRequest.setHeaders(config.headers.pipe(Option.getOrElse(() => ({}))))), HttpClient.mapRequest((req) => flow(HttpClientRequest.appendUrlParam("action", ctx.requestName), HttpClientRequest.appendUrl("/" + ctx.moduleName))(req)));
28
+ const client = baseClient.pipe(HttpClient.mapRequest(HttpClientRequest.prependUrl(config.url + "/rpc")), HttpClient.mapRequest(HttpClientRequest.setHeaders(config.headers.pipe(Option.getOrElse(() => ({}))))), HttpClient.mapRequestEffect((req) => Effect.map(RequestName.asEffect(), ctx => flow(HttpClientRequest.appendUrlParam("action", ctx.requestName), HttpClientRequest.appendUrl("/" + ctx.moduleName))(req))));
30
29
  return client;
31
30
  }));
32
31
  export const HttpClientFromConfigLayer = Layer.unwrap(Effect.gen(function* () {
@@ -68,7 +67,7 @@ const makeRpcTag = (resource) => {
68
67
  // The first type arg is `any` because this is a dynamically created tag — its identity is the string key.
69
68
  const TheClient = ServiceMap.Opaque()(`RpcClient.${meta.moduleName}`);
70
69
  // Use Layer.effect directly (not TheClient.toLayer) so TypeScript properly excludes Scope
71
- const layer = Layer.effect(TheClient, Effect.map(RpcClient.make(rpcs, { spanPrefix: "RpcClient." + meta.moduleName }), (cl) => cl[meta.moduleName]));
70
+ const layer = Layer.effect(TheClient, RpcClient.make(rpcs, { spanPrefix: "RpcClient." + meta.moduleName }));
72
71
  return Object.assign(TheClient, { layer });
73
72
  };
74
73
  const makeApiClientFactory = Effect
@@ -108,7 +107,7 @@ const makeApiClientFactory = Effect
108
107
  });
109
108
  const layers = requestLevelLayers.pipe(Layer.provideMerge(requestNameLayer));
110
109
  const fields = Struct.omit(Request.fields, ["_tag"]);
111
- const requestAttr = h._tag;
110
+ const requestAttr = `${meta.moduleName}.${h._tag}`;
112
111
  // @ts-expect-error doc
113
112
  prev[cur] = Object.keys(fields).length === 0
114
113
  ? {
@@ -163,4 +162,4 @@ export class ApiClientFactory extends ServiceMap.Opaque()("ApiClientFactory") {
163
162
  return f(resource);
164
163
  });
165
164
  }
166
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"apiClientFactory.js","sourceRoot":"","sources":["../../src/client/apiClientFactory.ts"],"names":[],"mappings":"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"}
165
+ //# 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 CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "effect-app",
3
- "version": "4.0.0-beta.6",
3
+ "version": "4.0.0-beta.8",
4
4
  "license": "MIT",
5
5
  "type": "module",
6
6
  "dependencies": {
package/src/client/apiClientFactory.ts CHANGED
@@ -50,17 +50,16 @@ export const HttpClientLayer = (config: ApiConfig) =>
50
50
  Effect
51
51
  .gen(function*() {
52
52
  const baseClient = yield* HttpClient.HttpClient
53
- const ctx = yield* RequestName
54
53
  const client = baseClient.pipe(
55
54
  HttpClient.mapRequest(HttpClientRequest.prependUrl(config.url + "/rpc")),
56
55
  HttpClient.mapRequest(
57
56
  HttpClientRequest.setHeaders(config.headers.pipe(Option.getOrElse(() => ({}))))
58
57
  ),
59
- HttpClient.mapRequest((req) =>
60
- flow(
58
+ HttpClient.mapRequestEffect((req) =>
59
+ Effect.map(RequestName.asEffect(), ctx => flow(
61
60
  HttpClientRequest.appendUrlParam("action", ctx.requestName),
62
61
  HttpClientRequest.appendUrl("/" + ctx.moduleName)
63
- )(req)
62
+ )(req))
64
63
  )
65
64
  )
66
65
  return client
@@ -146,10 +145,7 @@ const makeRpcTag = <M extends Requests>(resource: M) => {
146
145
  // Use Layer.effect directly (not TheClient.toLayer) so TypeScript properly excludes Scope
147
146
  const layer = Layer.effect(
148
147
  TheClient,
149
- Effect.map(
150
- RpcClient.make(rpcs, { spanPrefix: "RpcClient." + meta.moduleName }),
151
- (cl) => (cl as any)[meta.moduleName]
152
- )
148
+ RpcClient.make(rpcs, { spanPrefix: "RpcClient." + meta.moduleName })
153
149
  )
154
150
  return Object.assign(TheClient, { layer })
155
151
  }
@@ -211,7 +207,7 @@ const makeApiClientFactory = Effect
211
207
  const layers = requestLevelLayers.pipe(Layer.provideMerge(requestNameLayer))
212
208
 
213
209
  const fields = Struct.omit(Request.fields, ["_tag"] as const)
214
- const requestAttr = h._tag
210
+ const requestAttr = `${meta.moduleName}.${h._tag}`
215
211
  // @ts-expect-error doc
216
212
  prev[cur] = Object.keys(fields).length === 0
217
213
  ? {