effect-app 2.40.0 → 2.41.0

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 +15 -0
  2. package/dist/client/apiClientFactory.d.ts.map +1 -1
  3. package/dist/client/apiClientFactory.js +6 -18
  4. package/package.json +10 -10
  5. package/src/client/apiClientFactory.ts +8 -20
package/CHANGELOG.md CHANGED
@@ -1,5 +1,20 @@
1
1
  # @effect-app/prelude
2
2
 
3
+ ## 2.41.0
4
+
5
+ ### Minor Changes
6
+
7
+ - b1d4af4: housekeeping: update packages
8
+
9
+ ## 2.40.1
10
+
11
+ ### Patch Changes
12
+
13
+ - 0230385: improve: rpc spans
14
+
15
+ - fewer duplicate spans
16
+ - improve name
17
+
3
18
  ## 2.40.0
4
19
 
5
20
  ### Minor 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":"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,UAAU,CAAC,sCAtBvD,CAAC,2FAAD,CAAC,kFAgCL,CAAA;kFAiJoD,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,YAAY,gBAAgB,MAOnG,CAAC,SAAS,QAAQ,UAChB,CAAC;;;;gDARoC,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,YAAY,gBAAgB,MAOnG,CAAC,SAAS,QAAQ,UAChB,CAAC;;;;gFARoC,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;;;;;;AAkBjB;;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,EAAG,UAAU,gBAAgB,MAAM,CAAC,SAAS,QAAQ,EAAE,UAAU,CAAC;;;;2CAG1E;CAChD"}
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,UAAU,CAAC,sCAtBvD,CAAC,2FAAD,CAAC,kFAgCL,CAAA;kFAqIoD,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,YAAY,gBAAgB,MAOnG,CAAC,SAAS,QAAQ,UAChB,CAAC;;;;gDARoC,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,YAAY,gBAAgB,MAOnG,CAAC,SAAS,QAAQ,UAChB,CAAC;;;;gFARoC,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,EAAE,UAAU,CAAC;;;;2CAGa;CAChD"}
package/dist/client/apiClientFactory.js CHANGED
@@ -48,7 +48,7 @@ const makeRpcTag = (resource) => {
48
48
  const rpcs = makeRpcGroup(resource);
49
49
  const meta = getMeta(resource);
50
50
  return class TheClient extends Context.Tag(`RpcClient.${meta.moduleName}`)() {
51
- static layer = Layer.scoped(TheClient, RpcClient.make(rpcs));
51
+ static layer = Layer.scoped(TheClient, RpcClient.make(rpcs, { spanPrefix: "RpcClient." + meta.moduleName }));
52
52
  };
53
53
  };
54
54
  const makeApiClientFactory = Effect
@@ -92,32 +92,20 @@ const makeApiClientFactory = Effect
92
92
  // @ts-expect-error doc
93
93
  prev[cur] = Object.keys(fields).length === 0
94
94
  ? {
95
- handler: TheClient.pipe(Effect.flatMap((client) => client[requestAttr](new Request())), Effect.withSpan("client.request " + requestName, {
96
- captureStackTrace: false,
97
- attributes: { "request.name": requestName }
98
- }), Effect.provide(requestLevelLayers), Effect.provide(mr), Effect.provide(requestNameLayer)),
95
+ handler: TheClient.pipe(Effect.flatMap((client) => client[requestAttr](new Request())), Effect.provide(requestLevelLayers), Effect.provide(mr), Effect.provide(requestNameLayer)),
99
96
  ...requestMeta,
100
97
  raw: {
101
98
  handler: TheClient.pipe(Effect.flatMap((client) => client[requestAttr](new Request())), Effect.flatMap((res) => S.encode(Response)(res)), // TODO,
102
- Effect.withSpan("client.request " + requestName, {
103
- captureStackTrace: false,
104
- attributes: { "request.name": requestName }
105
- }), Effect.provide(requestLevelLayers), Effect.provide(mr), Effect.provide(requestNameLayer)),
99
+ Effect.provide(requestLevelLayers), Effect.provide(mr), Effect.provide(requestNameLayer)),
106
100
  ...requestMeta
107
101
  }
108
102
  }
109
103
  : {
110
- handler: (req) => TheClient.pipe(Effect.flatMap((client) => client[requestAttr](new Request(req))), Effect.withSpan("client.request " + requestName, {
111
- captureStackTrace: false,
112
- attributes: { "request.name": requestName }
113
- }), Effect.provide(requestLevelLayers), Effect.provide(mr), Effect.provide(requestNameLayer)),
104
+ handler: (req) => TheClient.pipe(Effect.flatMap((client) => client[requestAttr](new Request(req))), Effect.provide(requestLevelLayers), Effect.provide(mr), Effect.provide(requestNameLayer)),
114
105
  ...requestMeta,
115
106
  raw: {
116
107
  handler: (req) => TheClient.pipe(Effect.flatMap((client) => client[requestAttr](new Request(req))), Effect.flatMap((res) => S.encode(Response)(res)), // TODO,
117
- Effect.withSpan("client.request " + requestName, {
118
- captureStackTrace: false,
119
- attributes: { "request.name": requestName }
120
- }), Effect.provide(requestLevelLayers), Effect.provide(mr), Effect.provide(requestNameLayer)),
108
+ Effect.provide(requestLevelLayers), Effect.provide(mr), Effect.provide(requestNameLayer)),
121
109
  ...requestMeta
122
110
  }
123
111
  };
@@ -157,4 +145,4 @@ export class ApiClientFactory extends Context.TagId("ApiClientFactory")() {
157
145
  .use((apiClientFactory) => apiClientFactory(requestLevelLayers, options))
158
146
  .pipe(Effect.flatMap((f) => f(resource))); // don't rename f to clientFor or integration in vue project linked fucks up
159
147
  }
160
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"apiClientFactory.js","sourceRoot":"","sources":["../../src/client/apiClientFactory.ts"],"names":[],"mappings":"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"}
148
+ //# 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,33 +1,33 @@
1
1
  {
2
2
  "name": "effect-app",
3
- "version": "2.40.0",
3
+ "version": "2.41.0",
4
4
  "license": "MIT",
5
5
  "type": "module",
6
6
  "dependencies": {
7
- "@effect/rpc": "^0.56.2",
7
+ "@effect/rpc": "^0.62.4",
8
8
  "@effect/rpc-http": "^0.52.4",
9
9
  "@tsconfig/strictest": "^2.0.5",
10
10
  "date-fns": "^4.1.0",
11
11
  "nanoid": "^5.1.5",
12
12
  "path-parser": "^6.1.0",
13
- "query-string": "^9.1.1",
14
- "ts-pattern": "^5.7.0",
13
+ "query-string": "^9.2.1",
14
+ "ts-pattern": "^5.7.1",
15
15
  "ts-toolbelt": "^9.6.0",
16
16
  "uuid": "^11.1.0",
17
- "validator": "^13.15.0"
17
+ "validator": "^13.15.15"
18
18
  },
19
19
  "devDependencies": {
20
20
  "@faker-js/faker": "^8.4.1",
21
- "@types/node": "~22.14.1",
21
+ "@types/node": "~24.0.3",
22
22
  "@types/uuid": "^10.0.0",
23
- "@types/validator": "^13.15.0",
23
+ "@types/validator": "^13.15.2",
24
24
  "fast-check": "~4.1.1",
25
25
  "typescript": "^5.8.3",
26
- "vitest": "^3.1.2"
26
+ "vitest": "^3.2.4"
27
27
  },
28
28
  "peerDependencies": {
29
- "@effect/platform": "^0.80.14",
30
- "effect": "^3.14.14"
29
+ "@effect/platform": "^0.85.2",
30
+ "effect": "^3.16.8"
31
31
  },
32
32
  "typesVersions": {
33
33
  "*": {
package/src/client/apiClientFactory.ts CHANGED
@@ -109,14 +109,18 @@ const makeRpcTag = <M extends Requests>(resource: M) => {
109
109
  TheClient,
110
110
  RpcClient.RpcClient<RpcGroup.Rpcs<typeof rpcs>>
111
111
  >() {
112
- static layer = Layer.scoped(TheClient, RpcClient.make(rpcs))
112
+ static layer = Layer.scoped(TheClient, RpcClient.make(rpcs, { spanPrefix: "RpcClient." + meta.moduleName }))
113
113
  }
114
114
  }
115
115
 
116
116
  const makeApiClientFactory = Effect
117
117
  .gen(function*() {
118
118
  const ctx = yield* Effect.context<RpcSerialization.RpcSerialization | HttpClient.HttpClient>()
119
- const makeClientFor = <M extends Requests>(resource: M, requestLevelLayers = Layer.empty, options?: ClientForOptions) =>
119
+ const makeClientFor = <M extends Requests>(
120
+ resource: M,
121
+ requestLevelLayers = Layer.empty,
122
+ options?: ClientForOptions
123
+ ) =>
120
124
  Effect.gen(function*() {
121
125
  const TheClient = makeRpcTag(resource)
122
126
 
@@ -171,10 +175,6 @@ const makeApiClientFactory = Effect
171
175
  ? {
172
176
  handler: TheClient.pipe(
173
177
  Effect.flatMap((client) => (client as any)[requestAttr]!(new Request()) as Effect<any, any, never>),
174
- Effect.withSpan("client.request " + requestName, {
175
- captureStackTrace: false,
176
- attributes: { "request.name": requestName }
177
- }),
178
178
  Effect.provide(requestLevelLayers),
179
179
  Effect.provide(mr),
180
180
  Effect.provide(requestNameLayer)
@@ -186,10 +186,6 @@ const makeApiClientFactory = Effect
186
186
  (client as any)[requestAttr]!(new Request()) as Effect<any, any, never>
187
187
  ),
188
188
  Effect.flatMap((res) => S.encode(Response)(res)), // TODO,
189
- Effect.withSpan("client.request " + requestName, {
190
- captureStackTrace: false,
191
- attributes: { "request.name": requestName }
192
- }),
193
189
  Effect.provide(requestLevelLayers),
194
190
  Effect.provide(mr),
195
191
  Effect.provide(requestNameLayer)
@@ -204,10 +200,6 @@ const makeApiClientFactory = Effect
204
200
  Effect.flatMap((client) =>
205
201
  (client as any)[requestAttr]!(new Request(req)) as Effect<any, any, never>
206
202
  ),
207
- Effect.withSpan("client.request " + requestName, {
208
- captureStackTrace: false,
209
- attributes: { "request.name": requestName }
210
- }),
211
203
  Effect.provide(requestLevelLayers),
212
204
  Effect.provide(mr),
213
205
  Effect.provide(requestNameLayer)
@@ -221,10 +213,6 @@ const makeApiClientFactory = Effect
221
213
  (client as any)[requestAttr]!(new Request(req)) as Effect<any, any, never>
222
214
  ),
223
215
  Effect.flatMap((res) => S.encode(Response)(res)), // TODO,
224
- Effect.withSpan("client.request " + requestName, {
225
- captureStackTrace: false,
226
- attributes: { "request.name": requestName }
227
- }),
228
216
  Effect.provide(requestLevelLayers),
229
217
  Effect.provide(mr),
230
218
  Effect.provide(requestNameLayer)
@@ -269,7 +257,6 @@ const makeApiClientFactory = Effect
269
257
  return makeClientForCached
270
258
  })
271
259
 
272
-
273
260
  /**
274
261
  * Used to create clients for resource modules.
275
262
  */
@@ -281,7 +268,8 @@ export class ApiClientFactory
281
268
  static readonly layerFromConfig = DefaultApiConfig.pipe(Effect.map(this.layer), Layer.unwrapEffect)
282
269
 
283
270
  static readonly makeFor =
284
- (requestLevelLayers: Layer.Layer<never, never, never>, options?: ClientForOptions) => <M extends Requests>(resource: M) =>
271
+ (requestLevelLayers: Layer.Layer<never, never, never>, options?: ClientForOptions) =>
272
+ <M extends Requests>(resource: M) =>
285
273
  this
286
274
  .use((apiClientFactory) => apiClientFactory(requestLevelLayers, options))
287
275
  .pipe(Effect.flatMap((f) => f(resource))) // don't rename f to clientFor or integration in vue project linked fucks up