effect-app 4.0.0-beta.24 → 4.0.0-beta.241
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.
- package/CHANGELOG.md +1060 -0
- package/dist/Array.d.ts +3 -2
- package/dist/Array.d.ts.map +1 -1
- package/dist/Array.js +4 -4
- package/dist/Chunk.d.ts +1 -1
- package/dist/Chunk.d.ts.map +1 -1
- package/dist/Config/SecretURL.d.ts +4 -2
- package/dist/Config/SecretURL.d.ts.map +1 -1
- package/dist/Config/SecretURL.js +3 -6
- package/dist/Config/internal/configSecretURL.d.ts +1 -1
- package/dist/Config/internal/configSecretURL.d.ts.map +1 -1
- package/dist/Config/internal/configSecretURL.js +2 -2
- package/dist/Config.d.ts +7 -0
- package/dist/Config.d.ts.map +1 -0
- package/dist/Config.js +6 -0
- package/dist/ConfigProvider.d.ts +39 -0
- package/dist/ConfigProvider.d.ts.map +1 -0
- package/dist/ConfigProvider.js +42 -0
- package/dist/Context.d.ts +42 -0
- package/dist/Context.d.ts.map +1 -0
- package/dist/Context.js +67 -0
- package/dist/Effect.d.ts +11 -10
- package/dist/Effect.d.ts.map +1 -1
- package/dist/Effect.js +5 -7
- package/dist/Function.d.ts +1 -1
- package/dist/Function.d.ts.map +1 -1
- package/dist/Inputify.type.d.ts +1 -1
- package/dist/Layer.d.ts +11 -7
- package/dist/Layer.d.ts.map +1 -1
- package/dist/Layer.js +3 -2
- package/dist/NonEmptySet.d.ts +4 -2
- package/dist/NonEmptySet.d.ts.map +1 -1
- package/dist/NonEmptySet.js +2 -2
- package/dist/Option.d.ts +2 -1
- package/dist/Option.d.ts.map +1 -1
- package/dist/Option.js +3 -1
- package/dist/Pure.d.ts +8 -6
- package/dist/Pure.d.ts.map +1 -1
- package/dist/Pure.js +17 -14
- package/dist/Schema/Class.d.ts +66 -20
- package/dist/Schema/Class.d.ts.map +1 -1
- package/dist/Schema/Class.js +192 -23
- package/dist/Schema/FastCheck.d.ts +1 -1
- package/dist/Schema/FastCheck.d.ts.map +1 -1
- package/dist/Schema/Methods.d.ts +1 -1
- package/dist/Schema/SchemaParser.d.ts +5 -0
- package/dist/Schema/SchemaParser.d.ts.map +1 -0
- package/dist/Schema/SchemaParser.js +6 -0
- package/dist/Schema/SpecialJsonSchema.d.ts +34 -0
- package/dist/Schema/SpecialJsonSchema.d.ts.map +1 -0
- package/dist/Schema/SpecialJsonSchema.js +118 -0
- package/dist/Schema/SpecialOpenApi.d.ts +32 -0
- package/dist/Schema/SpecialOpenApi.d.ts.map +1 -0
- package/dist/Schema/SpecialOpenApi.js +123 -0
- package/dist/Schema/brand.d.ts +5 -3
- package/dist/Schema/brand.d.ts.map +1 -1
- package/dist/Schema/brand.js +3 -1
- package/dist/Schema/email.d.ts +1 -1
- package/dist/Schema/email.d.ts.map +1 -1
- package/dist/Schema/email.js +7 -4
- package/dist/Schema/ext.d.ts +339 -56
- package/dist/Schema/ext.d.ts.map +1 -1
- package/dist/Schema/ext.js +358 -53
- package/dist/Schema/moreStrings.d.ts +108 -26
- package/dist/Schema/moreStrings.d.ts.map +1 -1
- package/dist/Schema/moreStrings.js +45 -16
- package/dist/Schema/numbers.d.ts +55 -15
- package/dist/Schema/numbers.d.ts.map +1 -1
- package/dist/Schema/numbers.js +60 -12
- package/dist/Schema/phoneNumber.d.ts +1 -1
- package/dist/Schema/phoneNumber.d.ts.map +1 -1
- package/dist/Schema/phoneNumber.js +6 -3
- package/dist/Schema/schema.d.ts +1 -1
- package/dist/Schema/strings.d.ts +5 -5
- package/dist/Schema/strings.d.ts.map +1 -1
- package/dist/Schema/strings.js +1 -5
- package/dist/Schema.d.ts +214 -8
- package/dist/Schema.d.ts.map +1 -1
- package/dist/Schema.js +190 -11
- package/dist/Set.d.ts +5 -2
- package/dist/Set.d.ts.map +1 -1
- package/dist/Set.js +3 -2
- package/dist/TypeTest.d.ts +1 -1
- package/dist/Types.d.ts +1 -1
- package/dist/Widen.type.d.ts +1 -1
- package/dist/_ext/Array.d.ts +2 -2
- package/dist/_ext/Array.d.ts.map +1 -1
- package/dist/_ext/Array.js +4 -2
- package/dist/_ext/date.d.ts +1 -1
- package/dist/_ext/misc.d.ts +5 -2
- package/dist/_ext/misc.d.ts.map +1 -1
- package/dist/_ext/misc.js +4 -2
- package/dist/_ext/ord.ext.d.ts +3 -2
- package/dist/_ext/ord.ext.d.ts.map +1 -1
- package/dist/_ext/ord.ext.js +2 -2
- package/dist/builtin.d.ts +1 -1
- package/dist/builtin.d.ts.map +1 -1
- package/dist/client/InvalidationKeys.d.ts +29 -0
- package/dist/client/InvalidationKeys.d.ts.map +1 -0
- package/dist/client/InvalidationKeys.js +33 -0
- package/dist/client/apiClientFactory.d.ts +20 -32
- package/dist/client/apiClientFactory.d.ts.map +1 -1
- package/dist/client/apiClientFactory.js +104 -34
- package/dist/client/clientFor.d.ts +51 -17
- package/dist/client/clientFor.d.ts.map +1 -1
- package/dist/client/clientFor.js +9 -1
- package/dist/client/errors.d.ts +49 -25
- package/dist/client/errors.d.ts.map +1 -1
- package/dist/client/errors.js +43 -17
- package/dist/client/makeClient.d.ts +481 -33
- package/dist/client/makeClient.d.ts.map +1 -1
- package/dist/client/makeClient.js +66 -24
- package/dist/client.d.ts +6 -5
- package/dist/client.d.ts.map +1 -1
- package/dist/client.js +2 -1
- package/dist/faker.d.ts +1 -1
- package/dist/faker.d.ts.map +1 -1
- package/dist/http/Request.d.ts +2 -2
- package/dist/http/Request.d.ts.map +1 -1
- package/dist/http/Request.js +2 -2
- package/dist/http/internal/lib.d.ts +1 -1
- package/dist/http.d.ts +1 -1
- package/dist/ids.d.ts +40 -12
- package/dist/ids.d.ts.map +1 -1
- package/dist/ids.js +25 -3
- package/dist/index.d.ts +5 -8
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +6 -8
- package/dist/logger.d.ts +1 -1
- package/dist/middleware.d.ts +14 -8
- package/dist/middleware.d.ts.map +1 -1
- package/dist/middleware.js +14 -8
- package/dist/rpc/Invalidation.d.ts +402 -0
- package/dist/rpc/Invalidation.d.ts.map +1 -0
- package/dist/rpc/Invalidation.js +150 -0
- package/dist/rpc/MiddlewareMaker.d.ts +11 -7
- package/dist/rpc/MiddlewareMaker.d.ts.map +1 -1
- package/dist/rpc/MiddlewareMaker.js +59 -38
- package/dist/rpc/RpcContextMap.d.ts +4 -4
- package/dist/rpc/RpcContextMap.d.ts.map +1 -1
- package/dist/rpc/RpcContextMap.js +4 -4
- package/dist/rpc/RpcMiddleware.d.ts +14 -10
- package/dist/rpc/RpcMiddleware.d.ts.map +1 -1
- package/dist/rpc/RpcMiddleware.js +1 -1
- package/dist/rpc.d.ts +2 -2
- package/dist/rpc.d.ts.map +1 -1
- package/dist/rpc.js +2 -2
- package/dist/transform.d.ts +2 -2
- package/dist/transform.d.ts.map +1 -1
- package/dist/transform.js +4 -5
- package/dist/utils/effectify.d.ts +2 -2
- package/dist/utils/effectify.d.ts.map +1 -1
- package/dist/utils/effectify.js +2 -2
- package/dist/utils/extend.d.ts +1 -1
- package/dist/utils/extend.d.ts.map +1 -1
- package/dist/utils/gen.d.ts +5 -5
- package/dist/utils/gen.d.ts.map +1 -1
- package/dist/utils/logLevel.d.ts +3 -3
- package/dist/utils/logLevel.d.ts.map +1 -1
- package/dist/utils/logger.d.ts +5 -4
- package/dist/utils/logger.d.ts.map +1 -1
- package/dist/utils/logger.js +4 -4
- package/dist/utils.d.ts +40 -45
- package/dist/utils.d.ts.map +1 -1
- package/dist/utils.js +19 -27
- package/dist/validation/validators.d.ts +1 -1
- package/dist/validation/validators.d.ts.map +1 -1
- package/dist/validation.d.ts +1 -1
- package/dist/validation.d.ts.map +1 -1
- package/package.json +46 -24
- package/src/Array.ts +3 -3
- package/src/Config/SecretURL.ts +5 -2
- package/src/Config/internal/configSecretURL.ts +1 -1
- package/src/Config.ts +14 -0
- package/src/ConfigProvider.ts +48 -0
- package/src/{ServiceMap.ts → Context.ts} +56 -63
- package/src/Effect.ts +13 -14
- package/src/Layer.ts +10 -6
- package/src/NonEmptySet.ts +3 -1
- package/src/Option.ts +2 -0
- package/src/Pure.ts +21 -19
- package/src/Schema/Class.ts +274 -64
- package/src/Schema/SchemaParser.ts +12 -0
- package/src/Schema/SpecialJsonSchema.ts +139 -0
- package/src/Schema/SpecialOpenApi.ts +130 -0
- package/src/Schema/brand.ts +22 -2
- package/src/Schema/email.ts +7 -2
- package/src/Schema/ext.ts +443 -88
- package/src/Schema/moreStrings.ts +93 -37
- package/src/Schema/numbers.ts +64 -16
- package/src/Schema/phoneNumber.ts +5 -1
- package/src/Schema/strings.ts +4 -8
- package/src/Schema.ts +374 -10
- package/src/Set.ts +5 -1
- package/src/_ext/Array.ts +3 -1
- package/src/_ext/misc.ts +4 -1
- package/src/_ext/ord.ext.ts +2 -1
- package/src/client/InvalidationKeys.ts +50 -0
- package/src/client/apiClientFactory.ts +230 -131
- package/src/client/clientFor.ts +95 -29
- package/src/client/errors.ts +52 -26
- package/src/client/makeClient.ts +572 -71
- package/src/client.ts +5 -4
- package/src/http/Request.ts +1 -1
- package/src/ids.ts +25 -3
- package/src/index.ts +5 -10
- package/src/middleware.ts +13 -9
- package/src/rpc/Invalidation.ts +226 -0
- package/src/rpc/MiddlewareMaker.ts +82 -74
- package/src/rpc/README.md +2 -2
- package/src/rpc/RpcContextMap.ts +6 -5
- package/src/rpc/RpcMiddleware.ts +14 -11
- package/src/rpc.ts +1 -1
- package/src/transform.ts +3 -3
- package/src/utils/effectify.ts +1 -1
- package/src/utils/gen.ts +8 -8
- package/src/utils/logLevel.ts +1 -1
- package/src/utils/logger.ts +4 -3
- package/src/utils.ts +62 -139
- package/test/dist/rpc.test.d.ts.map +1 -1
- package/test/dist/secretURL.test.d.ts.map +1 -0
- package/test/dist/special.test.d.ts.map +1 -0
- package/test/dist/stream-error.types.d.ts +2 -0
- package/test/dist/stream-error.types.d.ts.map +1 -0
- package/test/dist/stream-error.types.js +27 -0
- package/test/moreStrings.test.ts +1 -1
- package/test/rpc.test.ts +46 -6
- package/test/schema.test.ts +459 -30
- package/test/secretURL.test.ts +160 -0
- package/test/special.test.ts +1026 -0
- package/test/utils.test.ts +7 -7
- package/tsconfig.base.json +6 -5
- package/tsconfig.json +2 -1
- package/tsconfig.json.bak +2 -2
- package/tsconfig.src.json +29 -29
- package/tsconfig.test.json +2 -2
- package/dist/Operations.d.ts +0 -123
- package/dist/Operations.d.ts.map +0 -1
- package/dist/Operations.js +0 -29
- package/dist/ServiceMap.d.ts +0 -44
- package/dist/ServiceMap.d.ts.map +0 -1
- package/dist/ServiceMap.js +0 -91
- package/eslint.config.mjs +0 -26
- package/src/Operations.ts +0 -55
package/dist/utils.js
CHANGED
|
@@ -1,9 +1,14 @@
|
|
|
1
1
|
/* eslint-disable @typescript-eslint/no-unsafe-function-type */
|
|
2
2
|
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
3
3
|
/* eslint-disable @typescript-eslint/no-redundant-type-constituents */
|
|
4
|
-
import
|
|
4
|
+
import * as Cause from "effect/Cause";
|
|
5
|
+
import * as Effect from "effect/Effect";
|
|
6
|
+
import * as Exit from "effect/Exit";
|
|
7
|
+
import * as Fiber from "effect/Fiber";
|
|
5
8
|
import { dual } from "effect/Function";
|
|
6
|
-
import
|
|
9
|
+
import * as Option from "effect/Option";
|
|
10
|
+
import { isFunction } from "effect/Predicate";
|
|
11
|
+
import * as Record from "effect/Record";
|
|
7
12
|
import * as Result from "effect/Result";
|
|
8
13
|
import { identity, pipe } from "./Function.js";
|
|
9
14
|
// codegen:start {preset: barrel, include: ./utils/*.ts, nodir: false }
|
|
@@ -15,24 +20,6 @@ export * from "./utils/logLevel.js";
|
|
|
15
20
|
// codegen:end
|
|
16
21
|
export * from "effect/Utils";
|
|
17
22
|
export const cloneTrait = Symbol.for("clone-trait");
|
|
18
|
-
function get(obj, path, defaultValue = undefined) {
|
|
19
|
-
// https://github.com/you-dont-need/You-Dont-Need-Lodash-Underscore?tab=readme-ov-file#_get
|
|
20
|
-
const travel = (regexp) => String
|
|
21
|
-
.prototype
|
|
22
|
-
.split
|
|
23
|
-
.call(path, regexp)
|
|
24
|
-
.filter(Boolean)
|
|
25
|
-
.reduce((res, key) => (res !== null && res !== undefined ? res[key] : res), obj);
|
|
26
|
-
const result = travel(/[,[\]]+?/) || travel(/[,[\].]+?/);
|
|
27
|
-
return result === undefined || result === obj ? defaultValue : result;
|
|
28
|
-
}
|
|
29
|
-
// codegen:start {preset: barrel, include: ./utils/*.ts }
|
|
30
|
-
export * from "./utils/effectify.js";
|
|
31
|
-
export * from "./utils/extend.js";
|
|
32
|
-
export * from "./utils/gen.js";
|
|
33
|
-
export * from "./utils/logger.js";
|
|
34
|
-
export * from "./utils/logLevel.js";
|
|
35
|
-
// codegen:end
|
|
36
23
|
export const unsafeRight = (ei) => {
|
|
37
24
|
if (Result.isFailure(ei)) {
|
|
38
25
|
console.error(ei.failure);
|
|
@@ -94,7 +81,7 @@ export function pretty(o) {
|
|
|
94
81
|
return JSON.stringify(o, undefined, 2) ?? "undefined";
|
|
95
82
|
}
|
|
96
83
|
export function intersect(...as) {
|
|
97
|
-
return as.reduce((a, b) => (
|
|
84
|
+
return as.reduce((a, b) => Object.assign(a, b), {});
|
|
98
85
|
}
|
|
99
86
|
export const unifyIndex = Symbol();
|
|
100
87
|
function decorateNew(inp, setProto, makeNonConfigurable, resultSelector) {
|
|
@@ -102,7 +89,7 @@ function decorateNew(inp, setProto, makeNonConfigurable, resultSelector) {
|
|
|
102
89
|
if (out.descriptor) {
|
|
103
90
|
out.descriptor = Object.assign({}, out.descriptor);
|
|
104
91
|
}
|
|
105
|
-
const actualDesc =
|
|
92
|
+
const actualDesc = out.descriptor || /* istanbul ignore next */ out;
|
|
106
93
|
const originalMethod = validateAndExtractMethodFromDescriptor(actualDesc);
|
|
107
94
|
const isStatic = inp.placement === "static";
|
|
108
95
|
actualDesc.get = function () {
|
|
@@ -279,7 +266,13 @@ export const clone = dual(2, (self, f) => {
|
|
|
279
266
|
});
|
|
280
267
|
export const copy = dual(2, (self, f) => clone(self, { ...self, ...(isFunction(f) ? f(self) : f) }));
|
|
281
268
|
// just one input param: the convention is that the ctor takes an object
|
|
282
|
-
// containing the properties of the
|
|
269
|
+
// containing the properties of the value (I can't put object there as type because of contravariance)
|
|
270
|
+
/**
|
|
271
|
+
* By design this does not return `Self` directly.
|
|
272
|
+
*
|
|
273
|
+
* The return type is computed from `Self` and the update payload so callers can
|
|
274
|
+
* expose an explicit structural return type that remains assignable to `Self`.
|
|
275
|
+
*/
|
|
283
276
|
export const copyOrigin = (ctor) => dual(2, (self, f) => {
|
|
284
277
|
const o = { ...self, ...(isFunction(f) ? f(self) : f) };
|
|
285
278
|
if (cloneTrait in self) {
|
|
@@ -348,7 +341,6 @@ export function arMoveElDropUndefined(el, newIndex) {
|
|
|
348
341
|
export function setMoveElDropUndefined(el, newIndex) {
|
|
349
342
|
return (arrInput) => pipe([...arrInput], arMoveElDropUndefined(el, newIndex), Option.map((ar) => new Set(ar)));
|
|
350
343
|
}
|
|
351
|
-
export { get };
|
|
352
344
|
export function isNativeTuple(a) {
|
|
353
345
|
return Array.isArray(a);
|
|
354
346
|
}
|
|
@@ -391,7 +383,7 @@ const genConstructor = (function* () { }).constructor;
|
|
|
391
383
|
/**
|
|
392
384
|
* @example
|
|
393
385
|
* ```ts
|
|
394
|
-
* import
|
|
386
|
+
* import * as Utils from "effect/Utils"
|
|
395
387
|
*
|
|
396
388
|
* function* generatorFn() {
|
|
397
389
|
* yield 1
|
|
@@ -405,5 +397,5 @@ const genConstructor = (function* () { }).constructor;
|
|
|
405
397
|
* @category predicates
|
|
406
398
|
* @since 3.11.0
|
|
407
399
|
*/
|
|
408
|
-
export const isGeneratorFunction = (u) =>
|
|
409
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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"}
|
|
400
|
+
export const isGeneratorFunction = (u) => isFunction(u) && u.constructor === genConstructor;
|
|
401
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,4 +8,4 @@ export declare const isValidEmail: (str: string, options?: IsEmailOptions) => bo
|
|
|
8
8
|
* Allowed characters are [0-1] "/", "+", "-", " .js"
|
|
9
9
|
*/
|
|
10
10
|
export declare const isValidPhone: (phone: string) => boolean;
|
|
11
|
-
//# sourceMappingURL=
|
|
11
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmFsaWRhdG9ycy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3ZhbGlkYXRpb24vdmFsaWRhdG9ycy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFnQixFQUFFLEtBQUssY0FBYyxFQUFFLE1BQU0sMEJBQTBCLENBQUE7QUFXdkU7O0dBRUc7QUFFSCxlQUFPLE1BQU0sWUFBWSxFQUFxQixDQUFDLEdBQUcsRUFBRSxNQUFNLEVBQUUsT0FBTyxDQUFDLEVBQUUsY0FBYyxLQUFLLE9BQU8sQ0FBQTtBQUVoRzs7O0dBR0c7QUFDSCxlQUFPLE1BQU0sWUFBWSxVQUFXLE1BQU0sS0FBRyxPQVE1QyxDQUFBIn0=
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validators.d.ts","sourceRoot":"","sources":["../../src/validation/validators.ts"],"names":[],"mappings":"AACA,OAAgB,EAAE,KAAK,cAAc,EAAE,MAAM,0BAA0B,CAAA;AAWvE;;GAEG;AAEH,eAAO,MAAM,YAAY,EAAqB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,cAAc,KAAK,OAAO,CAAA;AAEhG;;;GAGG;AACH,eAAO,MAAM,YAAY,
|
|
1
|
+
{"version":3,"file":"validators.d.ts","sourceRoot":"","sources":["../../src/validation/validators.ts"],"names":[],"mappings":"AACA,OAAgB,EAAE,KAAK,cAAc,EAAE,MAAM,0BAA0B,CAAA;AAWvE;;GAEG;AAEH,eAAO,MAAM,YAAY,EAAqB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,cAAc,KAAK,OAAO,CAAA;AAEhG;;;GAGG;AACH,eAAO,MAAM,YAAY,UAAW,MAAM,KAAG,OAQ5C,CAAA"}
|
package/dist/validation.d.ts
CHANGED
|
@@ -10,4 +10,4 @@ export declare const min: (min: number) => (v: {
|
|
|
10
10
|
length: number;
|
|
11
11
|
}) => boolean;
|
|
12
12
|
export * from "./validation/validators.js";
|
|
13
|
-
//# sourceMappingURL=
|
|
13
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmFsaWRhdGlvbi5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL3ZhbGlkYXRpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sZUFBZSxDQUFBO0FBRTlDLGVBQU8sTUFBTSxJQUFJLEdBQUksQ0FBQyxLQUFLLENBQUMsUUFBUSxTQUFTLENBQUMsQ0FBQyxDQUFDLEVBQUUsWUFBMEIsQ0FBQTtBQUM1RSxlQUFPLE1BQU0sR0FBRyxHQUFJLENBQUMsUUFBUSxTQUFTLENBQUMsQ0FBQyxDQUFDLEVBQUUsU0FBUyxDQUFDLFlBQWtCLENBQUE7QUFFdkUsZUFBTyxNQUFNLElBQUksUUFBUyxNQUFNLFNBQVMsTUFBTSxZQUFhLENBQUE7QUFDNUQsZUFBTyxNQUFNLElBQUksUUFBUyxNQUFNLFNBQVMsTUFBTSxZQUFhLENBQUE7QUFFNUQsZUFBTyxNQUFNLEdBQUcsUUFBUyxNQUFNLFNBRWxCO0lBQUUsTUFBTSxFQUFFLE1BQU0sQ0FBQTtDQUFFLFlBQzlCLENBQUE7QUFDRCxlQUFPLE1BQU0sR0FBRyxRQUFTLE1BQU0sU0FFbEI7SUFBRSxNQUFNLEVBQUUsTUFBTSxDQUFBO0NBQUUsWUFDOUIsQ0FBQTtBQUVELGNBQWMsNEJBQTRCLENBQUEifQ==
|
package/dist/validation.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../src/validation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAE9C,eAAO,MAAM,IAAI,GAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../src/validation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAE9C,eAAO,MAAM,IAAI,GAAI,CAAC,KAAK,CAAC,QAAQ,SAAS,CAAC,CAAC,CAAC,EAAE,YAA0B,CAAA;AAC5E,eAAO,MAAM,GAAG,GAAI,CAAC,QAAQ,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC,YAAkB,CAAA;AAEvE,eAAO,MAAM,IAAI,QAAS,MAAM,SAAS,MAAM,YAAa,CAAA;AAC5D,eAAO,MAAM,IAAI,QAAS,MAAM,SAAS,MAAM,YAAa,CAAA;AAE5D,eAAO,MAAM,GAAG,QAAS,MAAM,SAElB;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,YAC9B,CAAA;AACD,eAAO,MAAM,GAAG,QAAS,MAAM,SAElB;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,YAC9B,CAAA;AAED,cAAc,4BAA4B,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,31 +1,30 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "effect-app",
|
|
3
|
-
"version": "4.0.0-beta.
|
|
3
|
+
"version": "4.0.0-beta.241",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"dependencies": {
|
|
7
7
|
"@tsconfig/strictest": "^2.0.8",
|
|
8
8
|
"date-fns": "^4.1.0",
|
|
9
|
-
"nanoid": "^5.1.
|
|
9
|
+
"nanoid": "^5.1.11",
|
|
10
10
|
"path-parser": "^6.1.0",
|
|
11
11
|
"query-string": "^9.3.1",
|
|
12
12
|
"ts-pattern": "^5.9.0",
|
|
13
13
|
"ts-toolbelt": "^9.6.0",
|
|
14
|
-
"uuid": "^
|
|
15
|
-
"validator": "^13.15.
|
|
14
|
+
"uuid": "^14.0.0",
|
|
15
|
+
"validator": "^13.15.35"
|
|
16
16
|
},
|
|
17
17
|
"devDependencies": {
|
|
18
18
|
"@faker-js/faker": "^8.4.1",
|
|
19
|
-
"@types/node": "25.
|
|
19
|
+
"@types/node": "25.6.0",
|
|
20
20
|
"@types/uuid": "^11.0.0",
|
|
21
21
|
"@types/validator": "^13.15.10",
|
|
22
|
-
"fast-check": "~4.
|
|
23
|
-
"typescript": "~
|
|
24
|
-
"vitest": "^4.
|
|
25
|
-
"@effect-app/eslint-shared-config": "0.5.7-beta.2"
|
|
22
|
+
"fast-check": "~4.7.0",
|
|
23
|
+
"typescript": "~6.0.3",
|
|
24
|
+
"vitest": "^4.1.5"
|
|
26
25
|
},
|
|
27
26
|
"peerDependencies": {
|
|
28
|
-
"effect": "^4.0.0-beta.
|
|
27
|
+
"effect": "^4.0.0-beta.68"
|
|
29
28
|
},
|
|
30
29
|
"typesVersions": {
|
|
31
30
|
"*": {
|
|
@@ -47,10 +46,22 @@
|
|
|
47
46
|
"types": "./dist/Chunk.d.ts",
|
|
48
47
|
"default": "./dist/Chunk.js"
|
|
49
48
|
},
|
|
49
|
+
"./Config": {
|
|
50
|
+
"types": "./dist/Config.d.ts",
|
|
51
|
+
"default": "./dist/Config.js"
|
|
52
|
+
},
|
|
50
53
|
"./Config/SecretURL": {
|
|
51
54
|
"types": "./dist/Config/SecretURL.d.ts",
|
|
52
55
|
"default": "./dist/Config/SecretURL.js"
|
|
53
56
|
},
|
|
57
|
+
"./ConfigProvider": {
|
|
58
|
+
"types": "./dist/ConfigProvider.d.ts",
|
|
59
|
+
"default": "./dist/ConfigProvider.js"
|
|
60
|
+
},
|
|
61
|
+
"./Context": {
|
|
62
|
+
"types": "./dist/Context.d.ts",
|
|
63
|
+
"default": "./dist/Context.js"
|
|
64
|
+
},
|
|
54
65
|
"./Effect": {
|
|
55
66
|
"types": "./dist/Effect.d.ts",
|
|
56
67
|
"default": "./dist/Effect.js"
|
|
@@ -71,10 +82,6 @@
|
|
|
71
82
|
"types": "./dist/NonEmptySet.d.ts",
|
|
72
83
|
"default": "./dist/NonEmptySet.js"
|
|
73
84
|
},
|
|
74
|
-
"./Operations": {
|
|
75
|
-
"types": "./dist/Operations.d.ts",
|
|
76
|
-
"default": "./dist/Operations.js"
|
|
77
|
-
},
|
|
78
85
|
"./Option": {
|
|
79
86
|
"types": "./dist/Option.d.ts",
|
|
80
87
|
"default": "./dist/Option.js"
|
|
@@ -99,6 +106,18 @@
|
|
|
99
106
|
"types": "./dist/Schema/Methods.d.ts",
|
|
100
107
|
"default": "./dist/Schema/Methods.js"
|
|
101
108
|
},
|
|
109
|
+
"./Schema/SchemaParser": {
|
|
110
|
+
"types": "./dist/Schema/SchemaParser.d.ts",
|
|
111
|
+
"default": "./dist/Schema/SchemaParser.js"
|
|
112
|
+
},
|
|
113
|
+
"./Schema/SpecialJsonSchema": {
|
|
114
|
+
"types": "./dist/Schema/SpecialJsonSchema.d.ts",
|
|
115
|
+
"default": "./dist/Schema/SpecialJsonSchema.js"
|
|
116
|
+
},
|
|
117
|
+
"./Schema/SpecialOpenApi": {
|
|
118
|
+
"types": "./dist/Schema/SpecialOpenApi.d.ts",
|
|
119
|
+
"default": "./dist/Schema/SpecialOpenApi.js"
|
|
120
|
+
},
|
|
102
121
|
"./Schema/brand": {
|
|
103
122
|
"types": "./dist/Schema/brand.d.ts",
|
|
104
123
|
"default": "./dist/Schema/brand.js"
|
|
@@ -131,10 +150,6 @@
|
|
|
131
150
|
"types": "./dist/Schema/strings.d.ts",
|
|
132
151
|
"default": "./dist/Schema/strings.js"
|
|
133
152
|
},
|
|
134
|
-
"./ServiceMap": {
|
|
135
|
-
"types": "./dist/ServiceMap.d.ts",
|
|
136
|
-
"default": "./dist/ServiceMap.js"
|
|
137
|
-
},
|
|
138
153
|
"./Set": {
|
|
139
154
|
"types": "./dist/Set.d.ts",
|
|
140
155
|
"default": "./dist/Set.js"
|
|
@@ -175,6 +190,10 @@
|
|
|
175
190
|
"types": "./dist/client.d.ts",
|
|
176
191
|
"default": "./dist/client.js"
|
|
177
192
|
},
|
|
193
|
+
"./client/InvalidationKeys": {
|
|
194
|
+
"types": "./dist/client/InvalidationKeys.d.ts",
|
|
195
|
+
"default": "./dist/client/InvalidationKeys.js"
|
|
196
|
+
},
|
|
178
197
|
"./client/apiClientFactory": {
|
|
179
198
|
"types": "./dist/client/apiClientFactory.d.ts",
|
|
180
199
|
"default": "./dist/client/apiClientFactory.js"
|
|
@@ -219,6 +238,10 @@
|
|
|
219
238
|
"types": "./dist/rpc.d.ts",
|
|
220
239
|
"default": "./dist/rpc.js"
|
|
221
240
|
},
|
|
241
|
+
"./rpc/Invalidation": {
|
|
242
|
+
"types": "./dist/rpc/Invalidation.d.ts",
|
|
243
|
+
"default": "./dist/rpc/Invalidation.js"
|
|
244
|
+
},
|
|
222
245
|
"./rpc/MiddlewareMaker": {
|
|
223
246
|
"types": "./dist/rpc/MiddlewareMaker.d.ts",
|
|
224
247
|
"default": "./dist/rpc/MiddlewareMaker.js"
|
|
@@ -280,20 +303,19 @@
|
|
|
280
303
|
"scripts": {
|
|
281
304
|
"watch": "pnpm build:tsc -w",
|
|
282
305
|
"build:tsc": "pnpm clean-dist && effect-app-cli packagejson && pnpm check",
|
|
283
|
-
"check": "
|
|
306
|
+
"check": "tsgo --build",
|
|
284
307
|
"build:tsc-src": "pnpm clean-dist && effect-app-cli packagejson tsc --build ./tsconfig.src.json",
|
|
285
308
|
"build:src": "pnpm build:tsc-src",
|
|
286
309
|
"build": "pnpm build:tsc",
|
|
287
|
-
"watch2": "pnpm clean-dist && NODE_OPTIONS=--max-old-space-size=6144
|
|
310
|
+
"watch2": "pnpm clean-dist && NODE_OPTIONS=--max-old-space-size=6144 tsgo -w",
|
|
288
311
|
"clean": "rm -rf dist",
|
|
289
312
|
"clean-dist": "sh ../../scripts/clean-dist.sh",
|
|
290
313
|
"circular": "pnpm circular:src && pnpm circular:dist",
|
|
291
314
|
"circular:src": "madge --circular --ts-config ./tsconfig.json --extensions ts ./src",
|
|
292
315
|
"circular:dist": "madge --circular --extensions js ./dist",
|
|
293
|
-
"compile": "NODE_OPTIONS=--max-old-space-size=6144
|
|
294
|
-
"lint": "
|
|
295
|
-
"lint
|
|
296
|
-
"lint-fix": "pnpm lint --fix",
|
|
316
|
+
"compile": "NODE_OPTIONS=--max-old-space-size=6144 tsgo --noEmit",
|
|
317
|
+
"lint": "oxlint --type-aware ./src && pnpm exec dprint check --config ../../dprint.jsonc .",
|
|
318
|
+
"lint-fix": "oxlint --type-aware --fix ./src && pnpm exec dprint fmt --config ../../dprint.jsonc .",
|
|
297
319
|
"test": "vitest",
|
|
298
320
|
"test:run": "pnpm run test run --passWithNoTests",
|
|
299
321
|
"testsuite": "pnpm lint && pnpm circular && pnpm run test:run",
|
package/src/Array.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { Chunk, Effect } from "effect"
|
|
2
1
|
import type { NonEmptyArray, NonEmptyReadonlyArray } from "effect/Array"
|
|
3
2
|
import * as Array from "effect/Array"
|
|
4
|
-
import * as
|
|
3
|
+
import * as Chunk from "effect/Chunk"
|
|
4
|
+
import * as Effect from "effect/Effect"
|
|
5
5
|
import { dual, type Predicate } from "./Function.js"
|
|
6
6
|
import * as Option from "./Option.js"
|
|
7
7
|
|
|
@@ -104,7 +104,7 @@ export function chunk_<T>(items_: Iterable<T>, size: number) {
|
|
|
104
104
|
}
|
|
105
105
|
|
|
106
106
|
export function forEachEffectNA<A, R, E, B>(as: NonEmptyReadonlyArray<A>, f: (a: A) => Effect.Effect<B, E, R>) {
|
|
107
|
-
return Effect.map(
|
|
107
|
+
return Effect.map(Effect.forEach(as, f), (_) => Option.getOrNull(toNonEmptyArray(_)))
|
|
108
108
|
}
|
|
109
109
|
|
|
110
110
|
export * from "effect/Array"
|
package/src/Config/SecretURL.ts
CHANGED
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* @since 1.0.0
|
|
3
3
|
*/
|
|
4
|
-
import { Config, type Equal, type Redacted } from "effect"
|
|
5
4
|
import type * as Chunk from "effect/Chunk"
|
|
5
|
+
import * as Config from "effect/Config"
|
|
6
|
+
import type * as Equal from "effect/Equal"
|
|
7
|
+
import type * as Redacted from "effect/Redacted"
|
|
6
8
|
import * as internal from "./internal/configSecretURL.js"
|
|
7
9
|
|
|
8
10
|
// /**
|
|
@@ -21,6 +23,7 @@ import * as internal from "./internal/configSecretURL.js"
|
|
|
21
23
|
* @since 1.0.0
|
|
22
24
|
* @category models
|
|
23
25
|
*/
|
|
26
|
+
// eslint-disable-next-line import/namespace
|
|
24
27
|
export interface SecretURL extends Redacted.Redacted, Equal.Equal {
|
|
25
28
|
/** @internal */
|
|
26
29
|
readonly raw: Array<number>
|
|
@@ -73,5 +76,5 @@ export const value: (self: SecretURL) => string = internal.value
|
|
|
73
76
|
export const unsafeWipe: (self: SecretURL) => void = internal.unsafeWipe
|
|
74
77
|
|
|
75
78
|
export const secretURL = (name?: string): Config.Config<SecretURL> => {
|
|
76
|
-
return Config.map(Config.
|
|
79
|
+
return Config.map(Config.nonEmptyString(name), fromString)
|
|
77
80
|
}
|
package/src/Config.ts
ADDED
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import { type Config, make } from "effect/Config"
|
|
2
|
+
import { dual } from "effect/Function"
|
|
3
|
+
|
|
4
|
+
import * as ConfigProvider from "./ConfigProvider.js"
|
|
5
|
+
|
|
6
|
+
export const nested: {
|
|
7
|
+
(name: string): <A>(self: Config<A>) => Config<A>
|
|
8
|
+
<A>(self: Config<A>, name: string): Config<A>
|
|
9
|
+
} = dual(
|
|
10
|
+
2,
|
|
11
|
+
<A>(self: Config<A>, name: string): Config<A> => make((provider) => self.parse(ConfigProvider.nested(provider, name)))
|
|
12
|
+
)
|
|
13
|
+
|
|
14
|
+
export * from "effect/Config"
|
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
import { type ConfigProvider, make, type Path } from "effect/ConfigProvider"
|
|
2
|
+
import { dual } from "effect/Function"
|
|
3
|
+
|
|
4
|
+
/**
|
|
5
|
+
* Scopes a provider so that all lookups are prefixed with the given path
|
|
6
|
+
* segments.
|
|
7
|
+
*
|
|
8
|
+
* When to use:
|
|
9
|
+
* - Namespacing config under a prefix like `"app"` or `"database"`.
|
|
10
|
+
* - Reusing the same provider shape for multiple sub-configs.
|
|
11
|
+
*
|
|
12
|
+
* Accepts a single string or a full `Path` array. The prefix is prepended
|
|
13
|
+
* *after* any `mapInput` transformation runs, so ordering matters when
|
|
14
|
+
* composing with {@link mapInput} or {@link constantCase}.
|
|
15
|
+
*
|
|
16
|
+
* Supports both data-last and data-first calling conventions.
|
|
17
|
+
*
|
|
18
|
+
* **Example** (Nesting under a prefix)
|
|
19
|
+
*
|
|
20
|
+
* ```ts
|
|
21
|
+
* import * as ConfigProvider from "effect/ConfigProvider"
|
|
22
|
+
*
|
|
23
|
+
* const provider = ConfigProvider.fromEnv({
|
|
24
|
+
* env: { APP_HOST: "localhost", APP_PORT: "3000" }
|
|
25
|
+
* })
|
|
26
|
+
*
|
|
27
|
+
* // Lookups for ["HOST"] now resolve to ["APP", "HOST"]
|
|
28
|
+
* const scoped = ConfigProvider.nested(provider, "APP")
|
|
29
|
+
* ```
|
|
30
|
+
*
|
|
31
|
+
* @see {@link mapInput} – for arbitrary path transformations
|
|
32
|
+
*
|
|
33
|
+
* @category Combinators
|
|
34
|
+
* @since 4.0.0
|
|
35
|
+
*/
|
|
36
|
+
export const nested: {
|
|
37
|
+
(prefix: string | Path): (self: ConfigProvider) => ConfigProvider
|
|
38
|
+
(self: ConfigProvider, prefix: string | Path): ConfigProvider
|
|
39
|
+
} = dual(
|
|
40
|
+
2,
|
|
41
|
+
(self: ConfigProvider, prefix: string | Path): ConfigProvider => {
|
|
42
|
+
let path: Path = typeof prefix === "string" ? [prefix] : prefix
|
|
43
|
+
if (self.mapInput) path = self.mapInput(path)
|
|
44
|
+
return make(self.get, self.mapInput, self.prefix ? [...self.prefix, ...path] : path)
|
|
45
|
+
}
|
|
46
|
+
)
|
|
47
|
+
|
|
48
|
+
export * from "effect/ConfigProvider"
|
|
@@ -1,21 +1,17 @@
|
|
|
1
1
|
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
2
|
-
|
|
3
|
-
* We're doing the long way around here with assignTag, TagBase & TagBaseTagged,
|
|
4
|
-
* because there's a typescript compiler issue where it will complain about Equal.symbol, and Hash.symbol not being accessible.
|
|
5
|
-
* https://github.com/microsoft/TypeScript/issues/52644
|
|
6
|
-
*/
|
|
2
|
+
/* eslint-disable import/namespace */
|
|
7
3
|
|
|
8
|
-
import
|
|
9
|
-
import * as
|
|
10
|
-
import
|
|
4
|
+
import * as CTX from "effect/Context"
|
|
5
|
+
import type * as Effect from "effect/Effect"
|
|
6
|
+
import * as Layer from "effect/Layer"
|
|
7
|
+
import type * as Scope from "effect/Scope"
|
|
8
|
+
import type * as Types from "effect/Types"
|
|
11
9
|
|
|
12
|
-
export * from "effect/
|
|
10
|
+
export * from "effect/Context"
|
|
13
11
|
|
|
14
|
-
export interface Opaque<Self extends object, in out Shape extends object>
|
|
15
|
-
extends ServiceMap.Key<Self, Self>, Yieldable<Opaque<Self, Shape>, Self, never, Self>
|
|
16
|
-
{
|
|
12
|
+
export interface Opaque<Self extends object, in out Shape extends object> extends CTX.Key<Self, Self> {
|
|
17
13
|
of(this: void, self: Shape): Self
|
|
18
|
-
|
|
14
|
+
context(self: Shape): CTX.Context<Self>
|
|
19
15
|
// a version that leverages the Shape -> Self conversion
|
|
20
16
|
toLayer: <E, R>(
|
|
21
17
|
eff: Effect.Effect<Shape, E, R>
|
|
@@ -25,11 +21,11 @@ export interface Opaque<Self extends object, in out Shape extends object>
|
|
|
25
21
|
}
|
|
26
22
|
|
|
27
23
|
// export interface OpaqueMake<Self extends object, in out Shape extends object, E, R>
|
|
28
|
-
// extends
|
|
24
|
+
// extends CTX.Service<Self, Self>
|
|
29
25
|
// {
|
|
30
26
|
// // temp while sorting out https://github.com/Effect-TS/effect-smol/pull/1534
|
|
31
27
|
// of(self: Shape): Self
|
|
32
|
-
//
|
|
28
|
+
// contextMap2(self: Shape): CTX.Context<Self>
|
|
33
29
|
// // a version that leverages the Shape -> Self conversion
|
|
34
30
|
// toLayer: {
|
|
35
31
|
// <E, R>(
|
|
@@ -44,7 +40,7 @@ export function assignTag<Identifier extends object, Shape extends object = Iden
|
|
|
44
40
|
creationError?: Error
|
|
45
41
|
) {
|
|
46
42
|
return <S extends object>(cls: S): S & Opaque<Identifier, Shape> => {
|
|
47
|
-
const tag =
|
|
43
|
+
const tag = CTX.Service<Identifier, Shape>(key)
|
|
48
44
|
let fields = tag
|
|
49
45
|
if (Reflect.ownKeys(cls).includes("key")) {
|
|
50
46
|
const { key, ...rest } = tag
|
|
@@ -67,54 +63,51 @@ export function assignTag<Identifier extends object, Shape extends object = Iden
|
|
|
67
63
|
}
|
|
68
64
|
}
|
|
69
65
|
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
: Effect.Effect<Type[k], never, Self>
|
|
81
|
-
}
|
|
82
|
-
: {}
|
|
66
|
+
/** Accessor for a service method that returns a plain value. Wraps via `useSync`. */
|
|
67
|
+
export const accessFn = <
|
|
68
|
+
Self extends object,
|
|
69
|
+
Shape extends Record<PropertyKey, any>,
|
|
70
|
+
K extends keyof Shape
|
|
71
|
+
>(
|
|
72
|
+
Tag: Opaque<Self, Shape>,
|
|
73
|
+
key: K
|
|
74
|
+
): Shape[K] extends (...args: [...infer Args]) => infer A ? (...args: Readonly<Args>) => Effect.Effect<A, never, Self>
|
|
75
|
+
: never => ((...args: Array<any>) => Tag.useSync((s: any) => s[key](...args))) as any
|
|
83
76
|
|
|
84
|
-
/**
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
77
|
+
/** Accessor for a service method that returns an Effect. Delegates via `use`. */
|
|
78
|
+
export const accessEffectFn = <
|
|
79
|
+
Self extends object,
|
|
80
|
+
Shape extends Record<PropertyKey, any>,
|
|
81
|
+
K extends keyof Shape
|
|
82
|
+
>(
|
|
83
|
+
Tag: Opaque<Self, Shape>,
|
|
84
|
+
key: K
|
|
85
|
+
): Shape[K] extends (...args: [...infer Args]) => Effect.Effect<infer A, infer E, infer R>
|
|
86
|
+
? (...args: Readonly<Args>) => Effect.Effect<A, E, Self | R>
|
|
87
|
+
: never => ((...args: Array<any>) => Tag.use((s: any) => s[key](...args))) as any
|
|
88
|
+
|
|
89
|
+
/** Accessor for a service property (constant). Wraps via `useSync`. */
|
|
90
|
+
export const accessCn = <
|
|
91
|
+
Self extends object,
|
|
92
|
+
Shape extends Record<PropertyKey, any>,
|
|
93
|
+
K extends keyof Shape
|
|
94
|
+
>(
|
|
95
|
+
Tag: Opaque<Self, Shape>,
|
|
96
|
+
key: K
|
|
97
|
+
): Effect.Effect<Shape[K], never, Self> => Tag.useSync((s) => s[key])
|
|
98
|
+
|
|
99
|
+
/** Accessor for a service property that is an Effect. Delegates via `use`. */
|
|
100
|
+
export const accessEffectCn = <
|
|
101
|
+
Self extends object,
|
|
102
|
+
Shape extends Record<PropertyKey, any>,
|
|
103
|
+
K extends keyof Shape
|
|
104
|
+
>(
|
|
105
|
+
Tag: Opaque<Self, Shape>,
|
|
106
|
+
key: K
|
|
107
|
+
): Shape[K] extends Effect.Effect<infer A, infer E, infer R> ? Effect.Effect<A, E, Self | R>
|
|
108
|
+
: never => Tag.use((s: any) => s[key]) as any
|
|
116
109
|
|
|
117
|
-
export const TypeId = "~
|
|
110
|
+
export const TypeId = "~Context.Opaque"
|
|
118
111
|
|
|
119
112
|
// export function Opaque<const Key extends string>(key: Key) {
|
|
120
113
|
// return <Identifier extends object, Shape extends object>() => {
|
|
@@ -179,7 +172,7 @@ export const Opaque: {
|
|
|
179
172
|
>
|
|
180
173
|
& { readonly make: Make }
|
|
181
174
|
} = () => (id: string, options: any) => {
|
|
182
|
-
const svc =
|
|
175
|
+
const svc = CTX.Service()(id, options) as any
|
|
183
176
|
return Object.assign(svc, {
|
|
184
177
|
toLayer: (eff: Effect.Effect<any, any, any>) => {
|
|
185
178
|
return Layer.effect(svc, eff)
|