effect-app 2.54.0 → 2.54.2

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 +3 -3
  4. package/package.json +2 -2
  5. package/src/client/apiClientFactory.ts +8 -2
package/CHANGELOG.md CHANGED
@@ -1,5 +1,17 @@
1
1
  # @effect-app/prelude
2
2
 
3
+ ## 2.54.2
4
+
5
+ ### Patch Changes
6
+
7
+ - 79ffd88: updates
8
+
9
+ ## 2.54.1
10
+
11
+ ### Patch Changes
12
+
13
+ - 9f90266: fix prefix namespace
14
+
3
15
  ## 2.54.0
4
16
 
5
17
  ### 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,KAAK,CAAC,UAAU,SAAS,MAAM,EAC9E,UAAU,CAAC,EACX,YAAY,UAAU,sCAxBnB,CAAC,2FAAD,CAAC,kFAqCL,CAAA;kFAsIoD,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"}
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"}
package/dist/client/apiClientFactory.js CHANGED
@@ -50,7 +50,7 @@ const makeRpcTag = (resource) => {
50
50
  const meta = getMeta(resource);
51
51
  const rpcs = makeRpcGroup(resource, meta.moduleName);
52
52
  return class TheClient extends Context.Tag(`RpcClient.${meta.moduleName}`)() {
53
- static layer = Layer.scoped(TheClient, RpcClient.make(rpcs, { spanPrefix: "RpcClient." + meta.moduleName }));
53
+ static layer = Layer.scoped(TheClient, Effect.map(RpcClient.make(rpcs, { spanPrefix: "RpcClient." + meta.moduleName }), (cl) => cl[meta.moduleName]));
54
54
  };
55
55
  };
56
56
  const makeApiClientFactory = Effect
@@ -90,7 +90,7 @@ const makeApiClientFactory = Effect
90
90
  moduleName: meta.moduleName
91
91
  });
92
92
  const fields = Struct.omit(Request.fields, "_tag");
93
- const requestAttr = `${meta.moduleName}.${h._tag}`;
93
+ const requestAttr = h._tag;
94
94
  // @ts-expect-error doc
95
95
  prev[cur] = Object.keys(fields).length === 0
96
96
  ? {
@@ -149,4 +149,4 @@ export class ApiClientFactory extends Context.TagId("ApiClientFactory")() {
149
149
  .use((apiClientFactory) => apiClientFactory(requestLevelLayers, options))
150
150
  .pipe(Effect.flatMap((f) => f(resource))); // don't rename f to clientFor or integration in vue project linked fucks up
151
151
  }
152
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"apiClientFactory.js","sourceRoot":"","sources":["../../src/client/apiClientFactory.ts"],"names":[],"mappings":"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"}
152
+ //# 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,10 +1,10 @@
1
1
  {
2
2
  "name": "effect-app",
3
- "version": "2.54.0",
3
+ "version": "2.54.2",
4
4
  "license": "MIT",
5
5
  "type": "module",
6
6
  "dependencies": {
7
- "@effect/rpc": "^0.68.2",
7
+ "@effect/rpc": "^0.68.3",
8
8
  "@tsconfig/strictest": "^2.0.5",
9
9
  "date-fns": "^4.1.0",
10
10
  "nanoid": "^5.1.5",
package/src/client/apiClientFactory.ts CHANGED
@@ -114,7 +114,13 @@ const makeRpcTag = <M extends Requests>(resource: M) => {
114
114
  TheClient,
115
115
  RpcClient.RpcClient<RpcGroup.Rpcs<typeof rpcs>>
116
116
  >() {
117
- static layer = Layer.scoped(TheClient, RpcClient.make(rpcs, { spanPrefix: "RpcClient." + meta.moduleName }))
117
+ static layer = Layer.scoped(
118
+ TheClient,
119
+ Effect.map(
120
+ RpcClient.make(rpcs, { spanPrefix: "RpcClient." + meta.moduleName }),
121
+ (cl) => (cl as any)[meta.moduleName] as any
122
+ )
123
+ )
118
124
  }
119
125
  }
120
126
 
@@ -174,7 +180,7 @@ const makeApiClientFactory = Effect
174
180
  })
175
181
 
176
182
  const fields = Struct.omit(Request.fields, "_tag")
177
- const requestAttr = `${meta.moduleName}.${h._tag}`
183
+ const requestAttr = h._tag
178
184
  // @ts-expect-error doc
179
185
  prev[cur] = Object.keys(fields).length === 0
180
186
  ? {