effect-app 3.16.0 → 4.0.0-beta.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 (174) hide show
  1. package/CHANGELOG.md +6 -0
  2. package/dist/Array.js +1 -1
  3. package/dist/Chunk.d.ts +2 -4
  4. package/dist/Chunk.d.ts.map +1 -1
  5. package/dist/Chunk.js +2 -2
  6. package/dist/Config/SecretURL.d.ts +2 -12
  7. package/dist/Config/SecretURL.d.ts.map +1 -1
  8. package/dist/Config/SecretURL.js +2 -4
  9. package/dist/Config/internal/configSecretURL.d.ts.map +1 -1
  10. package/dist/Config/internal/configSecretURL.js +3 -4
  11. package/dist/Effect.d.ts +12 -10
  12. package/dist/Effect.d.ts.map +1 -1
  13. package/dist/Effect.js +6 -15
  14. package/dist/Layer.d.ts +15 -9
  15. package/dist/Layer.d.ts.map +1 -1
  16. package/dist/Layer.js +2 -2
  17. package/dist/Operations.d.ts +37 -47
  18. package/dist/Operations.d.ts.map +1 -1
  19. package/dist/Option.js +3 -3
  20. package/dist/Pure.d.ts +17 -6
  21. package/dist/Pure.d.ts.map +1 -1
  22. package/dist/Pure.js +35 -17
  23. package/dist/Schema/Class.d.ts +13 -16
  24. package/dist/Schema/Class.d.ts.map +1 -1
  25. package/dist/Schema/Class.js +5 -27
  26. package/dist/Schema/brand.d.ts +7 -10
  27. package/dist/Schema/brand.d.ts.map +1 -1
  28. package/dist/Schema/brand.js +3 -2
  29. package/dist/Schema/email.d.ts +1 -1
  30. package/dist/Schema/email.d.ts.map +1 -1
  31. package/dist/Schema/email.js +2 -2
  32. package/dist/Schema/ext.d.ts +42 -45
  33. package/dist/Schema/ext.d.ts.map +1 -1
  34. package/dist/Schema/ext.js +49 -63
  35. package/dist/Schema/moreStrings.d.ts +17 -17
  36. package/dist/Schema/moreStrings.d.ts.map +1 -1
  37. package/dist/Schema/moreStrings.js +10 -10
  38. package/dist/Schema/numbers.d.ts +14 -14
  39. package/dist/Schema/numbers.js +5 -5
  40. package/dist/Schema/phoneNumber.d.ts +1 -1
  41. package/dist/Schema/phoneNumber.d.ts.map +1 -1
  42. package/dist/Schema/phoneNumber.js +2 -2
  43. package/dist/Schema/schema.d.ts +2 -3
  44. package/dist/Schema/schema.d.ts.map +1 -1
  45. package/dist/Schema/schema.js +3 -4
  46. package/dist/Schema/strings.d.ts +4 -4
  47. package/dist/Schema/strings.d.ts.map +1 -1
  48. package/dist/Schema/strings.js +4 -4
  49. package/dist/Schema.d.ts +27 -25
  50. package/dist/Schema.d.ts.map +1 -1
  51. package/dist/Schema.js +22 -21
  52. package/dist/ServiceMap.d.ts +44 -0
  53. package/dist/ServiceMap.d.ts.map +1 -0
  54. package/dist/ServiceMap.js +91 -0
  55. package/dist/Set.d.ts +4 -4
  56. package/dist/Set.d.ts.map +1 -1
  57. package/dist/Set.js +14 -14
  58. package/dist/Struct.d.ts +4 -4
  59. package/dist/Struct.d.ts.map +1 -1
  60. package/dist/_ext/Array.d.ts.map +1 -1
  61. package/dist/_ext/Array.js +4 -4
  62. package/dist/_ext/misc.d.ts +2 -2
  63. package/dist/_ext/misc.js +4 -4
  64. package/dist/_ext/ord.ext.js +2 -2
  65. package/dist/builtin.d.ts +0 -8
  66. package/dist/builtin.d.ts.map +1 -1
  67. package/dist/builtin.js +3 -1
  68. package/dist/client/apiClientFactory.d.ts +14 -16
  69. package/dist/client/apiClientFactory.d.ts.map +1 -1
  70. package/dist/client/apiClientFactory.js +38 -23
  71. package/dist/client/clientFor.d.ts +7 -4
  72. package/dist/client/clientFor.d.ts.map +1 -1
  73. package/dist/client/errors.d.ts +36 -48
  74. package/dist/client/errors.d.ts.map +1 -1
  75. package/dist/client/errors.js +19 -9
  76. package/dist/client/makeClient.d.ts +34 -50
  77. package/dist/client/makeClient.d.ts.map +1 -1
  78. package/dist/client/makeClient.js +28 -18
  79. package/dist/http/Request.d.ts +3 -3
  80. package/dist/http/Request.d.ts.map +1 -1
  81. package/dist/http/Request.js +5 -8
  82. package/dist/http/internal/lib.d.ts +12 -13
  83. package/dist/http/internal/lib.d.ts.map +1 -1
  84. package/dist/http/internal/lib.js +14 -14
  85. package/dist/ids.d.ts +9 -9
  86. package/dist/ids.d.ts.map +1 -1
  87. package/dist/ids.js +1 -1
  88. package/dist/index.d.ts +7 -1
  89. package/dist/index.d.ts.map +1 -1
  90. package/dist/index.js +8 -2
  91. package/dist/logger.d.ts +1 -1
  92. package/dist/middleware.d.ts +2 -2
  93. package/dist/middleware.d.ts.map +1 -1
  94. package/dist/middleware.js +3 -3
  95. package/dist/rpc/MiddlewareMaker.d.ts +17 -16
  96. package/dist/rpc/MiddlewareMaker.d.ts.map +1 -1
  97. package/dist/rpc/MiddlewareMaker.js +27 -18
  98. package/dist/rpc/RpcContextMap.d.ts +4 -4
  99. package/dist/rpc/RpcContextMap.d.ts.map +1 -1
  100. package/dist/rpc/RpcContextMap.js +4 -4
  101. package/dist/rpc/RpcMiddleware.d.ts +24 -40
  102. package/dist/rpc/RpcMiddleware.d.ts.map +1 -1
  103. package/dist/rpc/RpcMiddleware.js +3 -10
  104. package/dist/utils/effectify.js +2 -2
  105. package/dist/utils/gen.d.ts +4 -5
  106. package/dist/utils/gen.d.ts.map +1 -1
  107. package/dist/utils/logLevel.d.ts +1 -1
  108. package/dist/utils/logLevel.d.ts.map +1 -1
  109. package/dist/utils/logLevel.js +6 -7
  110. package/dist/utils/logger.d.ts +4 -3
  111. package/dist/utils/logger.d.ts.map +1 -1
  112. package/dist/utils/logger.js +10 -9
  113. package/dist/utils.d.ts +4 -5
  114. package/dist/utils.d.ts.map +1 -1
  115. package/dist/utils.js +10 -9
  116. package/package.json +12 -21
  117. package/src/Array.ts +1 -1
  118. package/src/Chunk.ts +2 -2
  119. package/src/Config/SecretURL.ts +3 -18
  120. package/src/Config/internal/configSecretURL.ts +2 -3
  121. package/src/Effect.ts +17 -37
  122. package/src/Layer.ts +16 -11
  123. package/src/Option.ts +2 -2
  124. package/src/Pure.ts +60 -26
  125. package/src/Schema/Class.ts +17 -73
  126. package/src/Schema/brand.ts +11 -12
  127. package/src/Schema/email.ts +2 -2
  128. package/src/Schema/ext.ts +114 -167
  129. package/src/Schema/moreStrings.ts +20 -23
  130. package/src/Schema/numbers.ts +4 -4
  131. package/src/Schema/phoneNumber.ts +2 -2
  132. package/src/Schema/schema.ts +2 -3
  133. package/src/Schema/strings.ts +3 -3
  134. package/src/Schema.ts +49 -47
  135. package/src/ServiceMap.ts +187 -0
  136. package/src/Set.ts +19 -19
  137. package/src/Struct.ts +4 -4
  138. package/src/_ext/Array.ts +4 -5
  139. package/src/_ext/misc.ts +4 -4
  140. package/src/_ext/ord.ext.ts +2 -2
  141. package/src/builtin.ts +2 -8
  142. package/src/client/apiClientFactory.ts +74 -59
  143. package/src/client/clientFor.ts +10 -7
  144. package/src/client/errors.ts +28 -22
  145. package/src/client/makeClient.ts +75 -100
  146. package/src/http/Request.ts +5 -8
  147. package/src/http/internal/lib.ts +13 -13
  148. package/src/ids.ts +1 -1
  149. package/src/index.ts +10 -1
  150. package/src/middleware.ts +2 -2
  151. package/src/rpc/MiddlewareMaker.ts +76 -47
  152. package/src/rpc/RpcContextMap.ts +7 -7
  153. package/src/rpc/RpcMiddleware.ts +28 -54
  154. package/src/utils/effectify.ts +1 -1
  155. package/src/utils/gen.ts +8 -6
  156. package/src/utils/logLevel.ts +6 -6
  157. package/src/utils/logger.ts +15 -20
  158. package/src/utils.ts +12 -12
  159. package/test/dist/rpc.test.d.ts.map +1 -1
  160. package/test/schema.test.ts +8 -8
  161. package/test/utils.test.ts +2 -2
  162. package/tsconfig.json +1 -27
  163. package/dist/Context.d.ts +0 -67
  164. package/dist/Context.d.ts.map +0 -1
  165. package/dist/Context.js +0 -207
  166. package/dist/Tag.d.ts +0 -6
  167. package/dist/Tag.d.ts.map +0 -1
  168. package/dist/Tag.js +0 -9
  169. package/dist/Unify.d.ts +0 -27
  170. package/dist/Unify.d.ts.map +0 -1
  171. package/dist/Unify.js +0 -15
  172. package/src/Context.ts +0 -351
  173. package/src/Tag.ts +0 -11
  174. package/src/Unify.ts +0 -40
@@ -1,100 +1,97 @@
1
- import { Effect, ParseResult, type SchemaAST } from "effect";
2
- import type { Tag } from "effect/Context";
3
- import type { Schema } from "effect/Schema";
1
+ import { Effect, Schema, type SchemaAST, SchemaIssue, type ServiceMap } from "effect";
4
2
  import * as S from "effect/Schema";
5
3
  import { type NonEmptyReadonlyArray } from "../Array.js";
6
- import * as Context from "../Context.js";
7
4
  import { type AST } from "./schema.js";
8
- export declare const withDefaultConstructor: <A, I, R>(makeDefault: () => NoInfer<A>) => (self: Schema<A, I, R>) => S.PropertySignature<":", A, never, ":", I, true, R>;
5
+ export declare const withDefaultConstructor: <A>(makeDefault: () => NoInfer<A>) => <Self extends S.Top>(self: Self) => S.withConstructorDefault<Self & S.WithoutConstructorDefault>;
9
6
  /**
10
- * Like the default Schema `Date` but with `withDefault` => now
7
+ * Like the default Schema `Date` but from String with `withDefault` => now
11
8
  */
12
- export declare const Date: typeof S.Date & {
13
- withDefault: S.PropertySignature<":", Date, never, ":", string, true, never>;
9
+ export declare const Date: Schema.decodeTo<Schema.Date, Schema.String, never, never> & {
10
+ withDefault: Schema.withConstructorDefault<Schema.decodeTo<Schema.Date, Schema.String, never, never> & Schema.WithoutConstructorDefault>;
14
11
  };
15
12
  /**
16
13
  * Like the default Schema `Boolean` but with `withDefault` => false
17
14
  */
18
- export declare const Boolean: typeof S.Boolean & {
19
- withDefault: S.PropertySignature<":", boolean, never, ":", boolean, true, never>;
15
+ export declare const Boolean: Schema.Boolean & {
16
+ withDefault: Schema.withConstructorDefault<Schema.Boolean & Schema.WithoutConstructorDefault>;
20
17
  };
21
18
  /**
22
19
  * Like the default Schema `Number` but with `withDefault` => 0
23
20
  */
24
- export declare const Number: typeof S.Number & {
25
- withDefault: S.PropertySignature<":", number, never, ":", number, true, never>;
21
+ export declare const Number: Schema.Number & {
22
+ withDefault: Schema.withConstructorDefault<Schema.Number & Schema.WithoutConstructorDefault>;
26
23
  };
27
24
  /**
28
25
  * Like the default Schema `Literal` but with `withDefault` => literals[0]
29
26
  */
30
- export declare const Literal: <Literals extends NonEmptyReadonlyArray<AST.LiteralValue>>(...literals: Literals) => S.Literal<[...Literals]> & {
31
- changeDefault: <A extends Literals[number]>(a: A) => S.Literal<[...Literals]> & {
27
+ export declare const Literal: <Literals extends NonEmptyReadonlyArray<AST.LiteralValue>>(...literals: Literals) => Schema.Literals<Literals> & {
28
+ changeDefault: <A extends Literals[number]>(a: A) => Schema.Literals<Literals> & {
32
29
  Default: A;
33
- withDefault: S.PropertySignature<":", [...Literals][number], never, ":", [...Literals][number], true, never>;
30
+ withDefault: Schema.withConstructorDefault<Schema.Literals<Literals> & Schema.WithoutConstructorDefault>;
34
31
  };
35
32
  Default: (typeof literals)[0];
36
- withDefault: S.PropertySignature<":", [...Literals][number], never, ":", [...Literals][number], true, never>;
33
+ withDefault: Schema.withConstructorDefault<Schema.Literals<Literals> & Schema.WithoutConstructorDefault>;
37
34
  };
38
35
  /**
39
36
  * Like the default Schema `Array` but with `withDefault` => []
40
37
  */
41
- export declare function Array<Value extends Schema.Any>(value: Value): S.Array$<Value> & {
42
- withDefault: S.PropertySignature<":", readonly Schema.Type<Value>[], never, ":", readonly Schema.Encoded<Value>[], true, Schema.Context<Value>>;
38
+ export declare function Array<Value extends S.Top>(value: Value): Schema.$Array<Value> & {
39
+ withDefault: Schema.withConstructorDefault<Schema.$Array<Value> & Schema.WithoutConstructorDefault>;
43
40
  };
44
41
  /**
45
42
  * Like the default Schema `Map` but with `withDefault` => []
46
43
  */
47
- declare function Map_<Key extends Schema.Any, Value extends Schema.Any>(input: {
44
+ declare function Map_<Key extends S.Top, Value extends S.Top>(input: {
48
45
  key: Key;
49
46
  value: Value;
50
- }): S.Map$<Key, Value> & {
51
- withDefault: S.PropertySignature<":", Map<Schema.Type<Key>, Schema.Type<Value>>, never, ":", readonly (readonly [Schema.Encoded<Key>, Schema.Encoded<Value>])[], true, Schema.Context<Key> | Schema.Context<Value>>;
47
+ }): Schema.$ReadonlyMap<Key, Value> & {
48
+ withDefault: Schema.withConstructorDefault<Schema.$ReadonlyMap<Key, Value> & Schema.WithoutConstructorDefault>;
52
49
  };
53
50
  export { Map_ as Map };
54
51
  /**
55
52
  * Like the default Schema `ReadonlySet` but with `withDefault` => new Set()
56
53
  */
57
- export declare const ReadonlySet: <Value extends Schema.Any>(value: Value) => S.ReadonlySet$<Value> & {
58
- withDefault: S.PropertySignature<":", ReadonlySet<Schema.Type<Value>>, never, ":", readonly Schema.Encoded<Value>[], true, Schema.Context<Value>>;
54
+ export declare const ReadonlySet: <Value extends S.Top>(value: Value) => Schema.$ReadonlySet<Value> & {
55
+ withDefault: Schema.withConstructorDefault<Schema.$ReadonlySet<Value> & Schema.WithoutConstructorDefault>;
59
56
  };
60
57
  /**
61
58
  * Like the default Schema `ReadonlyMap` but with `withDefault` => new Map()
62
59
  */
63
- export declare const ReadonlyMap: <K extends Schema.Any, V extends Schema.Any>(pair: {
60
+ export declare const ReadonlyMap: <K extends S.Top, V extends S.Top>(pair: {
64
61
  readonly key: K;
65
62
  readonly value: V;
66
- }) => S.ReadonlyMap$<K, V> & {
67
- withDefault: S.PropertySignature<":", ReadonlyMap<Schema.Type<K>, Schema.Type<V>>, never, ":", readonly (readonly [Schema.Encoded<K>, Schema.Encoded<V>])[], true, Schema.Context<K> | Schema.Context<V>>;
63
+ }) => Schema.$ReadonlyMap<K, V> & {
64
+ withDefault: Schema.withConstructorDefault<Schema.$ReadonlyMap<K, V> & Schema.WithoutConstructorDefault>;
68
65
  };
69
66
  /**
70
67
  * Like the default Schema `NullOr` but with `withDefault` => null
71
68
  */
72
- export declare const NullOr: <S extends Schema.Any>(self: S) => S.NullOr<S> & {
73
- withDefault: S.PropertySignature<":", Schema.Type<S> | null, never, ":", Schema.Encoded<S> | null, true, Schema.Context<S>>;
69
+ export declare const NullOr: <S extends S.Top>(self: S) => Schema.NullOr<S> & {
70
+ withDefault: Schema.withConstructorDefault<Schema.NullOr<S> & Schema.WithoutConstructorDefault>;
74
71
  };
75
- export declare const defaultDate: <I, R>(s: Schema<Date, I, R>) => S.PropertySignature<":", Date, never, ":", I, true, R>;
76
- export declare const defaultBool: <I, R>(s: Schema<boolean, I, R>) => S.PropertySignature<":", boolean, never, ":", I, true, R>;
77
- export declare const defaultNullable: <A, I, R>(s: Schema<A | null, I, R>) => S.PropertySignature<":", A | null, never, ":", I, true, R>;
78
- export declare const defaultArray: <A, I, R>(s: Schema<ReadonlyArray<A>, I, R>) => S.PropertySignature<":", readonly A[], never, ":", I, true, R>;
79
- export declare const defaultMap: <A, A2, I, R>(s: Schema<ReadonlyMap<A, A2>, I, R>) => S.PropertySignature<":", ReadonlyMap<A, A2>, never, ":", I, true, R>;
80
- export declare const defaultSet: <A, I, R>(s: Schema<ReadonlySet<A>, I, R>) => S.PropertySignature<":", ReadonlySet<A>, never, ":", I, true, R>;
81
- export declare const withDefaultMake: <Self extends S.Schema<any, any, never>>(s: Self) => WithDefaults<Self> & Self;
82
- export type WithDefaults<Self extends S.Schema<any, any, never>> = (i: S.Schema.Encoded<Self>, options?: SchemaAST.ParseOptions) => S.Schema.Type<Self>;
83
- export declare const inputDate: S.Union<[typeof S.ValidDateFromSelf, typeof S.Date]> & {
84
- withDefault: S.PropertySignature<":", Date, never, ":", string | Date, true, never>;
72
+ export declare const defaultDate: (s: S.Top) => Schema.withConstructorDefault<Schema.Top & Schema.WithoutConstructorDefault>;
73
+ export declare const defaultBool: (s: S.Top) => Schema.withConstructorDefault<Schema.Top & Schema.WithoutConstructorDefault>;
74
+ export declare const defaultNullable: (s: S.Top) => Schema.withConstructorDefault<Schema.Top & Schema.WithoutConstructorDefault>;
75
+ export declare const defaultArray: (s: S.Top) => Schema.withConstructorDefault<Schema.Top & Schema.WithoutConstructorDefault>;
76
+ export declare const defaultMap: (s: S.Top) => Schema.withConstructorDefault<Schema.Top & Schema.WithoutConstructorDefault>;
77
+ export declare const defaultSet: (s: S.Top) => Schema.withConstructorDefault<Schema.Top & Schema.WithoutConstructorDefault>;
78
+ export declare const withDefaultMake: <Self extends S.Top>(s: Self) => WithDefaults<Self> & Self;
79
+ export type WithDefaults<Self extends S.Top> = (i: Self["Encoded"], options?: SchemaAST.ParseOptions) => Self["Type"];
80
+ export declare const inputDate: Schema.Union<readonly [Schema.Date, Schema.Date]> & {
81
+ withDefault: Schema.withConstructorDefault<Schema.Union<readonly [Schema.Date, Schema.Date]> & Schema.WithoutConstructorDefault>;
85
82
  };
86
83
  export interface UnionBrand {
87
84
  }
88
- export declare function makeOptional<NER extends S.Struct.Fields | S.PropertySignature.Any>(t: NER): {
89
- [K in keyof NER]: S.PropertySignature<"?:", Schema.Type<NER[K]> | undefined, never, "?:", Schema.Encoded<NER[K]> | undefined, NER[K] extends S.PropertySignature<any, any, any, any, any, infer Z, any> ? Z : false, Schema.Context<NER[K]>>;
85
+ export declare function makeOptional<NER extends S.Struct.Fields>(t: NER): {
86
+ [K in keyof NER]: NER[K] extends S.Top ? ReturnType<typeof S.optional<NER[K] & S.Top>> : any;
90
87
  };
91
88
  export declare function makeExactOptional<NER extends S.Struct.Fields>(t: NER): {
92
- [K in keyof NER]: S.PropertySignature<"?:", Schema.Type<NER[K]>, never, "?:", Schema.Encoded<NER[K]>, NER[K] extends S.PropertySignature<any, any, any, any, any, infer Z, any> ? Z : false, Schema.Context<NER[K]>>;
89
+ [K in keyof NER]: NER[K] extends S.Top ? ReturnType<typeof S.optionalKey<NER[K] & S.Top>> : any;
93
90
  };
94
91
  /** A version of transform which is only a one way mapping of From->To */
95
- export declare const transformTo: <To extends Schema.Any, From extends Schema.Any>(from: From, to: To, decode: (fromA: Schema.Type<From>, options: SchemaAST.ParseOptions, ast: SchemaAST.Transformation, fromI: Schema.Encoded<From>) => Schema.Encoded<To>) => S.transformOrFail<From, To, never>;
92
+ export declare const transformTo: <To extends S.Top, From extends S.Top>(from: From, to: To, decode: (fromA: From["Type"], options: SchemaAST.ParseOptions) => To["Encoded"]) => Schema.decodeTo<To, From, never, never>;
96
93
  /** A version of transformOrFail which is only a one way mapping of From->To */
97
- export declare const transformToOrFail: <To extends Schema.Any, From extends Schema.Any, RD>(from: From, to: To, decode: (fromA: Schema.Type<From>, options: SchemaAST.ParseOptions, ast: SchemaAST.Transformation) => Effect.Effect<Schema.Encoded<To>, ParseResult.ParseIssue, RD>) => S.transformOrFail<From, To, RD>;
98
- export declare const provide: <Self extends S.Schema.Any, R>(self: Self, context: Context.Context<R>) => S.SchemaClass<S.Schema.Type<Self>, S.Schema.Encoded<Self>, Exclude<S.Schema.Context<Self>, R>>;
99
- export declare const contextFromServices: <Self extends S.Schema.Any, Tags extends readonly Tag<any, any>[]>(self: Self, ...services: Tags) => Effect.Effect<S.SchemaClass<S.Schema.Type<Self>, S.Schema.Encoded<Self>, Exclude<S.Schema.Context<Self>, { [K in keyof Tags]: Tag.Identifier<Tags[K]>; }[number]>>, never, { [K in keyof Tags]: Tag.Identifier<Tags[K]>; }[number]>;
94
+ export declare const transformToOrFail: <To extends S.Top, From extends S.Top, RD>(from: From, to: To, decode: (fromA: From["Type"], options: SchemaAST.ParseOptions) => Effect.Effect<To["Encoded"], SchemaIssue.Issue, RD>) => Schema.decodeTo<To, From, never, never>;
95
+ export declare const provide: <Self extends S.Top, R>(self: Self, context: ServiceMap.ServiceMap<R>) => any;
96
+ export declare const contextFromServices: <Self extends S.Top, Tags extends readonly any[]>(_self: Self, ..._services: Tags) => any;
100
97
  //# sourceMappingURL=ext.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"ext.d.ts","sourceRoot":"","sources":["../../src/Schema/ext.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ext.d.ts","sourceRoot":"","sources":["../../src/Schema/ext.ts"],"names":[],"mappings":"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"}
@@ -1,15 +1,25 @@
1
1
  /* eslint-disable @typescript-eslint/no-explicit-any */
2
2
  /* eslint-disable @typescript-eslint/no-unsafe-return */
3
- import { Effect, ParseResult, pipe } from "effect";
3
+ import { Effect, Option, pipe, Schema, SchemaGetter, SchemaIssue, SchemaParser, SchemaTransformation } from "effect";
4
4
  import * as S from "effect/Schema";
5
- import * as Context from "../Context.js";
6
5
  import { extendM, typedKeysOf } from "../utils.js";
7
- export const withDefaultConstructor = (makeDefault) => (self) => S.propertySignature(self).pipe(S.withConstructorDefault(makeDefault));
6
+ // TODO: v4 migration withConstructorDefault signature changed, propertySignature removed
7
+ // Constraint relaxed from `Self extends S.Top & S.WithoutConstructorDefault` to `Self extends S.Top`
8
+ // because `.pipe()` widens the schema type to `Top` which doesn't satisfy `WithoutConstructorDefault`.
9
+ // The narrowing assertions below are safe — we're asserting "this schema hasn't had a default applied yet".
10
+ export const withDefaultConstructor = (makeDefault) => (self) => {
11
+ return S.withConstructorDefault(() => Option.some(makeDefault()))(self);
12
+ };
13
+ // TODO: v4 migration - Date is no longer by default encoded to string.
14
+ const DateFromString = Schema.Date.pipe(Schema.encodeTo(Schema.String, {
15
+ decode: SchemaGetter.Date(),
16
+ encode: SchemaGetter.transform((_) => _.toISOString())
17
+ }));
8
18
  /**
9
- * Like the default Schema `Date` but with `withDefault` => now
19
+ * Like the default Schema `Date` but from String with `withDefault` => now
10
20
  */
11
- export const Date = Object.assign(S.Date, {
12
- withDefault: S.Date.pipe(withDefaultConstructor(() => new global.Date()))
21
+ export const Date = Object.assign(DateFromString, {
22
+ withDefault: DateFromString.pipe(withDefaultConstructor(() => new global.Date()))
13
23
  });
14
24
  /**
15
25
  * Like the default Schema `Boolean` but with `withDefault` => false
@@ -24,9 +34,9 @@ export const Number = Object.assign(S.Number, { withDefault: S.Number.pipe(withD
24
34
  /**
25
35
  * Like the default Schema `Literal` but with `withDefault` => literals[0]
26
36
  */
27
- export const Literal = (...literals) => pipe(S.Literal(...literals), (s) => Object.assign(s, {
37
+ export const Literal = (...literals) => pipe(S.Literals(literals), (s) => Object.assign(s, {
28
38
  changeDefault: (a) => {
29
- return Object.assign(S.Literal(...literals), {
39
+ return Object.assign(S.Literals(literals), {
30
40
  Default: a,
31
41
  withDefault: s.pipe(withDefaultConstructor(() => a))
32
42
  }); // todo: copy annotations from original?
@@ -44,7 +54,7 @@ export function Array(value) {
44
54
  * Like the default Schema `Map` but with `withDefault` => []
45
55
  */
46
56
  function Map_(input) {
47
- return pipe(S.Map(input), (s) => Object.assign(s, { withDefault: s.pipe(withDefaultConstructor(() => new global.Map())) }));
57
+ return pipe(S.ReadonlyMap(input.key, input.value), (s) => Object.assign(s, { withDefault: s.pipe(withDefaultConstructor(() => new global.Map())) }));
48
58
  }
49
59
  export { Map_ as Map };
50
60
  /**
@@ -54,7 +64,7 @@ export const ReadonlySet = (value) => pipe(S.ReadonlySet(value), (s) => Object.a
54
64
  /**
55
65
  * Like the default Schema `ReadonlyMap` but with `withDefault` => new Map()
56
66
  */
57
- export const ReadonlyMap = (pair) => pipe(S.ReadonlyMap(pair), (s) => Object.assign(s, { withDefault: s.pipe(withDefaultConstructor(() => new Map())) }));
67
+ export const ReadonlyMap = (pair) => pipe(S.ReadonlyMap(pair.key, pair.value), (s) => Object.assign(s, { withDefault: s.pipe(withDefaultConstructor(() => new Map())) }));
58
68
  /**
59
69
  * Like the default Schema `NullOr` but with `withDefault` => null
60
70
  */
@@ -83,68 +93,44 @@ export const withDefaultMake = (s) => {
83
93
  // }[keyof P[B.BrandTypeId]]
84
94
  // export type UnionToIntersection3<U> = (U extends any ? (k: U) => void : never) extends ((k: infer I) => void) ? I
85
95
  // : never
86
- export const inputDate = extendM(S.Union(S.ValidDateFromSelf, S.Date), (s) => ({ withDefault: s.pipe(withDefaultConstructor(() => new globalThis.Date())) }));
87
- const makeOpt = (self, exact) => {
88
- const ast = self.ast;
89
- switch (ast._tag) {
90
- case "PropertySignatureDeclaration": {
91
- return S.makePropertySignature(new S.PropertySignatureDeclaration(exact ? ast.type : S.UndefinedOr(S.make(ast.type)).ast, true, ast.isReadonly, ast.annotations, ast.defaultValue));
92
- }
93
- case "PropertySignatureTransformation": {
94
- return S.makePropertySignature(new S.PropertySignatureTransformation(new S.FromPropertySignature(exact ? ast.from.type : S.UndefinedOr(S.make(ast.from.type)).ast, true, ast.from.isReadonly, ast.from.annotations), new S.ToPropertySignature(exact ? ast.to.type : S.UndefinedOr(S.make(ast.to.type)).ast, true, ast.to.isReadonly, ast.to.annotations, ast.to.defaultValue), ast.decode, ast.encode));
95
- }
96
- }
97
- };
98
- export function makeOptional(t // TODO: enforce non empty
99
- ) {
96
+ export const inputDate = extendM(S.Union([S.DateValid, S.Date]), (s) => ({ withDefault: s.pipe(withDefaultConstructor(() => new globalThis.Date())) }));
97
+ // TODO: v4 migration — makeOpt used internal PropertySignature types that are removed in v4
98
+ // Simplified to use v4's S.optional / S.optionalKey directly
99
+ export function makeOptional(t) {
100
100
  return typedKeysOf(t).reduce((prev, cur) => {
101
- if (S.isSchema(t[cur])) {
102
- prev[cur] = S.optional(t[cur]);
103
- }
104
- else {
105
- prev[cur] = makeOpt(t[cur]);
106
- }
101
+ prev[cur] = S.optional(t[cur]);
107
102
  return prev;
108
103
  }, {});
109
104
  }
110
- export function makeExactOptional(t // TODO: enforce non empty
111
- ) {
105
+ export function makeExactOptional(t) {
112
106
  return typedKeysOf(t).reduce((prev, cur) => {
113
- if (S.isSchema(t[cur])) {
114
- prev[cur] = S.optionalWith(t[cur], { exact: true });
115
- }
116
- else {
117
- prev[cur] = makeOpt(t[cur]);
118
- }
107
+ prev[cur] = S.optionalKey(t[cur]);
119
108
  return prev;
120
109
  }, {});
121
110
  }
122
111
  /** A version of transform which is only a one way mapping of From->To */
123
- export const transformTo = (from, to, decode) => S.transformOrFail(from, to, {
124
- decode: (...args) => Effect.sync(() => decode(...args)),
125
- encode: (i, _, ast) => ParseResult.fail(new ParseResult.Forbidden(ast, i, "One way schema transformation, encoding is not allowed"))
126
- });
112
+ export const transformTo = (from, to, decode) => from.pipe(S.decodeTo(to, SchemaTransformation.transformOrFail({
113
+ decode: (input, options) => Effect.sync(() => decode(input, options)),
114
+ encode: (i) => Effect.fail(new SchemaIssue.Forbidden(Option.some(i), { message: "One way schema transformation, encoding is not allowed" }))
115
+ })));
127
116
  /** A version of transformOrFail which is only a one way mapping of From->To */
128
- export const transformToOrFail = (from, to, decode) => S.transformOrFail(from, to, {
129
- decode,
130
- encode: (i, _, ast) => ParseResult.fail(new ParseResult.Forbidden(ast, i, "One way schema transformation, encoding is not allowed"))
131
- });
132
- export const provide = (self, context // TODO: support Layers?
133
- ) => {
134
- const provide = Effect.provide(context);
117
+ export const transformToOrFail = (from, to, decode) => from.pipe(S.decodeTo(to, SchemaTransformation.transformOrFail({
118
+ decode: decode,
119
+ encode: (i) => Effect.fail(new SchemaIssue.Forbidden(Option.some(i), { message: "One way schema transformation, encoding is not allowed" }))
120
+ })));
121
+ // TODO: v4 migration — S.declare API changed (no [self] + decode/encode pattern)
122
+ // Need to find v4 equivalent for contextual schema wrapping
123
+ export const provide = (self, context) => {
124
+ const prov = Effect.provide(context);
135
125
  return S
136
- .declare([self], {
137
- decode: (t) => (n) => provide(ParseResult.decodeUnknown(t)(n)),
138
- encode: (t) => (n) => provide(ParseResult.encodeUnknown(t)(n))
139
- });
126
+ .declare((_u) => true) // placeholder — needs proper v4 declare
127
+ .pipe(S.decodeTo(self, SchemaTransformation.transformOrFail({
128
+ decode: (n) => prov(SchemaParser.decodeUnknownEffect(self)(n)),
129
+ encode: (n) => prov(SchemaParser.encodeUnknownEffect(self)(n))
130
+ })));
140
131
  };
141
- export const contextFromServices = (self, ...services) => Effect.gen(function* () {
142
- const context = Context.pick(...services)(yield* Effect.context());
143
- const provide = Effect.provide(context);
144
- return S
145
- .declare([self], {
146
- decode: (t) => (n) => provide(ParseResult.decodeUnknown(t)(n)),
147
- encode: (t) => (n) => provide(ParseResult.encodeUnknown(t)(n))
148
- });
149
- });
150
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ext.js","sourceRoot":"","sources":["../../src/Schema/ext.ts"],"names":[],"mappings":"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"}
132
+ // TODO: v4 migration ServiceMap.pick and S.declare pattern removed
133
+ export const contextFromServices = (_self, ..._services) => {
134
+ throw new Error("contextFromServices: not yet migrated to v4");
135
+ };
136
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ext.js","sourceRoot":"","sources":["../../src/Schema/ext.ts"],"names":[],"mappings":"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"}
@@ -15,7 +15,7 @@ export type NonEmptyString50 = string & NonEmptyString50Brand;
15
15
  /**
16
16
  * A string that is at least 1 character long and a maximum of 50.
17
17
  */
18
- export declare const NonEmptyString50: WithDefaults<S.Schema<string & NonEmptyString50Brand, string, never>> & S.Schema<string & NonEmptyString50Brand, string, never>;
18
+ export declare const NonEmptyString50: WithDefaults<S.brand<S.String, "NonEmptyString" | "NonEmptyString64k" | "NonEmptyString2k" | "NonEmptyString255" | "NonEmptyString50" | "NonEmptyString64" | "NonEmptyString80" | "NonEmptyString100">> & S.brand<S.String, "NonEmptyString" | "NonEmptyString64k" | "NonEmptyString2k" | "NonEmptyString255" | "NonEmptyString50" | "NonEmptyString64" | "NonEmptyString80" | "NonEmptyString100">;
19
19
  /**
20
20
  * A string that is at least 1 character long and a maximum of 64.
21
21
  */
@@ -28,7 +28,7 @@ export type NonEmptyString64 = string & NonEmptyString64Brand;
28
28
  /**
29
29
  * A string that is at least 1 character long and a maximum of 64.
30
30
  */
31
- export declare const NonEmptyString64: WithDefaults<S.Schema<string & NonEmptyString64Brand, string, never>> & S.Schema<string & NonEmptyString64Brand, string, never>;
31
+ export declare const NonEmptyString64: WithDefaults<S.brand<S.String, "NonEmptyString" | "NonEmptyString64k" | "NonEmptyString2k" | "NonEmptyString255" | "NonEmptyString64" | "NonEmptyString80" | "NonEmptyString100">> & S.brand<S.String, "NonEmptyString" | "NonEmptyString64k" | "NonEmptyString2k" | "NonEmptyString255" | "NonEmptyString64" | "NonEmptyString80" | "NonEmptyString100">;
32
32
  /**
33
33
  * A string that is at least 1 character long and a maximum of 80.
34
34
  */
@@ -41,7 +41,7 @@ export type NonEmptyString80 = string & NonEmptyString80Brand;
41
41
  /**
42
42
  * A string that is at least 1 character long and a maximum of 80.
43
43
  */
44
- export declare const NonEmptyString80: WithDefaults<S.Schema<string & NonEmptyString80Brand, string, never>> & S.Schema<string & NonEmptyString80Brand, string, never>;
44
+ export declare const NonEmptyString80: WithDefaults<S.brand<S.String, "NonEmptyString" | "NonEmptyString64k" | "NonEmptyString2k" | "NonEmptyString255" | "NonEmptyString80" | "NonEmptyString100">> & S.brand<S.String, "NonEmptyString" | "NonEmptyString64k" | "NonEmptyString2k" | "NonEmptyString255" | "NonEmptyString80" | "NonEmptyString100">;
45
45
  /**
46
46
  * A string that is at least 1 character long and a maximum of 100.
47
47
  */
@@ -54,7 +54,7 @@ export type NonEmptyString100 = string & NonEmptyString100Brand;
54
54
  /**
55
55
  * A string that is at least 1 character long and a maximum of 100.
56
56
  */
57
- export declare const NonEmptyString100: WithDefaults<S.Schema<string & NonEmptyString100Brand, string, never>> & S.Schema<string & NonEmptyString100Brand, string, never>;
57
+ export declare const NonEmptyString100: WithDefaults<S.brand<S.String, "NonEmptyString" | "NonEmptyString64k" | "NonEmptyString2k" | "NonEmptyString255" | "NonEmptyString100">> & S.brand<S.String, "NonEmptyString" | "NonEmptyString64k" | "NonEmptyString2k" | "NonEmptyString255" | "NonEmptyString100">;
58
58
  /**
59
59
  * A string that is at least 3 character long and a maximum of 255.
60
60
  */
@@ -67,7 +67,7 @@ export type Min3String255 = string & Min3String255Brand;
67
67
  /**
68
68
  * A string that is at least 3 character long and a maximum of 255.
69
69
  */
70
- export declare const Min3String255: WithDefaults<S.Schema<string & Min3String255Brand, string, never>> & S.Schema<string & Min3String255Brand, string, never>;
70
+ export declare const Min3String255: WithDefaults<S.brand<S.String, "NonEmptyString" | "NonEmptyString64k" | "NonEmptyString2k" | "NonEmptyString255" | "Min3String255">> & S.brand<S.String, "NonEmptyString" | "NonEmptyString64k" | "NonEmptyString2k" | "NonEmptyString255" | "Min3String255">;
71
71
  /**
72
72
  * A string that is at least 6 characters long and a maximum of 50.
73
73
  */
@@ -80,30 +80,30 @@ export type StringId = string & StringIdBrand;
80
80
  /**
81
81
  * A string that is at least 6 characters long and a maximum of 50.
82
82
  */
83
- export declare const StringId: WithDefaults<S.Schema<string & StringIdBrand, string, never> & {
83
+ export declare const StringId: WithDefaults<S.brand<S.String, "NonEmptyString" | "NonEmptyString64k" | "NonEmptyString2k" | "NonEmptyString255" | "NonEmptyString50" | "NonEmptyString64" | "NonEmptyString80" | "NonEmptyString100" | "StringId"> & {
84
84
  make: () => StringId;
85
- withDefault: S.PropertySignature<":", string & StringIdBrand, never, ":", string, true, never>;
86
- }> & S.Schema<string & StringIdBrand, string, never> & {
85
+ withDefault: S.withConstructorDefault<S.brand<S.String, "NonEmptyString" | "NonEmptyString64k" | "NonEmptyString2k" | "NonEmptyString255" | "NonEmptyString50" | "NonEmptyString64" | "NonEmptyString80" | "NonEmptyString100" | "StringId"> & S.WithoutConstructorDefault>;
86
+ }> & S.brand<S.String, "NonEmptyString" | "NonEmptyString64k" | "NonEmptyString2k" | "NonEmptyString255" | "NonEmptyString50" | "NonEmptyString64" | "NonEmptyString80" | "NonEmptyString100" | "StringId"> & {
87
87
  make: () => StringId;
88
- withDefault: S.PropertySignature<":", string & StringIdBrand, never, ":", string, true, never>;
88
+ withDefault: S.withConstructorDefault<S.brand<S.String, "NonEmptyString" | "NonEmptyString64k" | "NonEmptyString2k" | "NonEmptyString255" | "NonEmptyString50" | "NonEmptyString64" | "NonEmptyString80" | "NonEmptyString100" | "StringId"> & S.WithoutConstructorDefault>;
89
89
  };
90
- export declare function prefixedStringId<Brand extends StringId>(): <Prefix extends string, Separator extends string = "-">(prefix: Prefix, name: string, separator?: Separator) => WithDefaults<S.Schema<string & Brand, string, never>> & S.Schema<string & Brand, string, never> & PrefixedStringUtils<Brand, Prefix, Separator>;
91
- export declare const brandedStringId: <Brand extends StringIdBrand>() => WithDefaults<S.Schema<string & Brand, string, never> & {
90
+ export declare function prefixedStringId<Brand extends StringId>(): <Prefix extends string, Separator extends string = "-">(prefix: Prefix, name: string, separator?: Separator) => WithDefaults<S.Schema<string & Brand>> & S.Schema<string & Brand> & PrefixedStringUtils<Brand, Prefix, Separator>;
91
+ export declare const brandedStringId: <Brand extends StringIdBrand>() => WithDefaults<S.Schema<string & Brand> & {
92
92
  make: () => string & Brand;
93
- withDefault: S.PropertySignature<":", string & Brand, never, ":", string, true, never>;
94
- } & WithDefaults<S.Schema<string & Brand, string, never>>> & S.Schema<string & Brand, string, never> & {
93
+ withDefault: any;
94
+ } & WithDefaults<S.Schema<string & Brand>>> & S.Schema<string & Brand> & {
95
95
  make: () => string & Brand;
96
- withDefault: S.PropertySignature<":", string & Brand, never, ":", string, true, never>;
97
- } & WithDefaults<S.Schema<string & Brand, string, never>>;
96
+ withDefault: any;
97
+ } & WithDefaults<S.Schema<string & Brand>>;
98
98
  export interface PrefixedStringUtils<Brand extends StringId, Prefix extends string, Separator extends string> {
99
99
  readonly make: () => Brand;
100
100
  readonly unsafeFrom: (str: string) => Brand;
101
101
  prefixSafe: <REST extends string>(str: `${Prefix}${Separator}${REST}`) => Brand;
102
102
  readonly prefix: Prefix;
103
- readonly withDefault: S.PropertySignature<":", Brand, never, ":", string, true, never>;
103
+ readonly withDefault: any;
104
104
  }
105
105
  export interface UrlBrand extends Simplify<B.Brand<"Url"> & NonEmptyStringBrand> {
106
106
  }
107
107
  export type Url = string & UrlBrand;
108
- export declare const Url: WithDefaults<S.refine<string & UrlBrand, S.Schema<string, string, never>>> & S.refine<string & UrlBrand, S.Schema<string, string, never>>;
108
+ export declare const Url: WithDefaults<S.refine<Url, S.String>> & S.refine<Url, S.String>;
109
109
  //# sourceMappingURL=moreStrings.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"moreStrings.d.ts","sourceRoot":"","sources":["../../src/Schema/moreStrings.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"moreStrings.d.ts","sourceRoot":"","sources":["../../src/Schema/moreStrings.ts"],"names":[],"mappings":"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"}
@@ -5,11 +5,11 @@ import { customRandom, nanoid, urlAlphabet } from "nanoid";
5
5
  import validator from "validator";
6
6
  import { fromBrand, nominal } from "./brand.js";
7
7
  import { withDefaultConstructor, withDefaultMake } from "./ext.js";
8
- const nonEmptyString = S.String.pipe(S.nonEmptyString());
8
+ const nonEmptyString = S.NonEmptyString;
9
9
  /**
10
10
  * A string that is at least 1 character long and a maximum of 50.
11
11
  */
12
- export const NonEmptyString50 = nonEmptyString.pipe(S.maxLength(50), fromBrand(nominal(), {
12
+ export const NonEmptyString50 = nonEmptyString.pipe(S.check(S.isMaxLength(50)), fromBrand(nominal(), {
13
13
  identifier: "NonEmptyString50",
14
14
  title: "NonEmptyString50",
15
15
  jsonSchema: {}
@@ -17,7 +17,7 @@ export const NonEmptyString50 = nonEmptyString.pipe(S.maxLength(50), fromBrand(n
17
17
  /**
18
18
  * A string that is at least 1 character long and a maximum of 64.
19
19
  */
20
- export const NonEmptyString64 = nonEmptyString.pipe(S.maxLength(64), fromBrand(nominal(), {
20
+ export const NonEmptyString64 = nonEmptyString.pipe(S.check(S.isMaxLength(64)), fromBrand(nominal(), {
21
21
  identifier: "NonEmptyString64",
22
22
  title: "NonEmptyString64",
23
23
  jsonSchema: {}
@@ -25,7 +25,7 @@ export const NonEmptyString64 = nonEmptyString.pipe(S.maxLength(64), fromBrand(n
25
25
  /**
26
26
  * A string that is at least 1 character long and a maximum of 80.
27
27
  */
28
- export const NonEmptyString80 = nonEmptyString.pipe(S.maxLength(80), fromBrand(nominal(), {
28
+ export const NonEmptyString80 = nonEmptyString.pipe(S.check(S.isMaxLength(80)), fromBrand(nominal(), {
29
29
  identifier: "NonEmptyString80",
30
30
  title: "NonEmptyString80",
31
31
  jsonSchema: {}
@@ -33,7 +33,7 @@ export const NonEmptyString80 = nonEmptyString.pipe(S.maxLength(80), fromBrand(n
33
33
  /**
34
34
  * A string that is at least 1 character long and a maximum of 100.
35
35
  */
36
- export const NonEmptyString100 = nonEmptyString.pipe(S.maxLength(100), fromBrand(nominal(), {
36
+ export const NonEmptyString100 = nonEmptyString.pipe(S.check(S.isMaxLength(100)), fromBrand(nominal(), {
37
37
  identifier: "NonEmptyString100",
38
38
  title: "NonEmptyString100",
39
39
  jsonSchema: {}
@@ -41,7 +41,7 @@ export const NonEmptyString100 = nonEmptyString.pipe(S.maxLength(100), fromBrand
41
41
  /**
42
42
  * A string that is at least 3 character long and a maximum of 255.
43
43
  */
44
- export const Min3String255 = pipe(S.String, S.minLength(3), S.maxLength(255), fromBrand(nominal(), { identifier: "Min3String255", title: "Min3String255", jsonSchema: {} }), withDefaultMake);
44
+ export const Min3String255 = pipe(S.String, S.check(S.isMinLength(3), S.isMaxLength(255)), fromBrand(nominal(), { identifier: "Min3String255", title: "Min3String255", jsonSchema: {} }), withDefaultMake);
45
45
  const makeStringId = () => nanoid();
46
46
  const minLength = 6;
47
47
  const maxLength = 50;
@@ -53,7 +53,7 @@ const StringIdArb = () => (fc) => fc
53
53
  /**
54
54
  * A string that is at least 6 characters long and a maximum of 50.
55
55
  */
56
- export const StringId = extendM(pipe(S.String, S.minLength(minLength), S.maxLength(maxLength), fromBrand(nominal(), {
56
+ export const StringId = extendM(pipe(S.String, S.check(S.isMinLength(minLength), S.isMaxLength(maxLength)), fromBrand(nominal(), {
57
57
  identifier: "StringId",
58
58
  title: "StringId",
59
59
  arbitrary: StringIdArb,
@@ -71,7 +71,7 @@ export function prefixedStringId() {
71
71
  const arb = () => (fc) => StringIdArb()(fc).map((x) => (pref + x.substring(0, 50 - pref.length)));
72
72
  // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
73
73
  const s = StringId
74
- .pipe(S.filter((x) => x.startsWith(pref), {
74
+ .pipe(S.refine((x) => x.startsWith(pref), {
75
75
  arbitrary: arb,
76
76
  identifier: name,
77
77
  title: name
@@ -99,10 +99,10 @@ const isUrl = (s) => {
99
99
  };
100
100
  export const Url = S
101
101
  .String
102
- .pipe(S.filter(isUrl, {
102
+ .pipe(S.refine(isUrl, {
103
103
  arbitrary: () => (fc) => fc.webUrl().map((_) => _),
104
104
  identifier: "Url",
105
105
  title: "Url",
106
106
  jsonSchema: { format: "uri" }
107
107
  }), withDefaultMake);
108
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9yZVN0cmluZ3MuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvU2NoZW1hL21vcmVTdHJpbmdzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxJQUFJLEVBQUUsTUFBTSxRQUFRLENBQUE7QUFFN0IsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLGtCQUFrQixDQUFBO0FBRTFDLE9BQU8sS0FBSyxDQUFDLE1BQU0sZUFBZSxDQUFBO0FBRWxDLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxFQUFFLFdBQVcsRUFBRSxNQUFNLFFBQVEsQ0FBQTtBQUMxRCxPQUFPLFNBQVMsTUFBTSxXQUFXLENBQUE7QUFDakMsT0FBTyxFQUFFLFNBQVMsRUFBRSxPQUFPLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFDL0MsT0FBTyxFQUFFLHNCQUFzQixFQUFFLGVBQWUsRUFBcUIsTUFBTSxVQUFVLENBQUE7QUFJckYsTUFBTSxjQUFjLEdBQUcsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLGNBQWMsRUFBRSxDQUFDLENBQUE7QUFZeEQ7O0dBRUc7QUFDSCxNQUFNLENBQUMsTUFBTSxnQkFBZ0IsR0FBRyxjQUFjLENBQUMsSUFBSSxDQUNqRCxDQUFDLENBQUMsU0FBUyxDQUFDLEVBQUUsQ0FBQyxFQUNmLFNBQVMsQ0FBQyxPQUFPLEVBQW9CLEVBQUU7SUFDckMsVUFBVSxFQUFFLGtCQUFrQjtJQUM5QixLQUFLLEVBQUUsa0JBQWtCO0lBQ3pCLFVBQVUsRUFBRSxFQUFFO0NBQ2YsQ0FBQyxFQUNGLGVBQWUsQ0FDaEIsQ0FBQTtBQVlEOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sZ0JBQWdCLEdBQUcsY0FBYyxDQUFDLElBQUksQ0FDakQsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxFQUFFLENBQUMsRUFDZixTQUFTLENBQUMsT0FBTyxFQUFvQixFQUFFO0lBQ3JDLFVBQVUsRUFBRSxrQkFBa0I7SUFDOUIsS0FB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
108
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9yZVN0cmluZ3MuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvU2NoZW1hL21vcmVTdHJpbmdzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxJQUFJLEVBQUUsTUFBTSxRQUFRLENBQUE7QUFFN0IsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLGtCQUFrQixDQUFBO0FBQzFDLE9BQU8sS0FBSyxDQUFDLE1BQU0sZUFBZSxDQUFBO0FBRWxDLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxFQUFFLFdBQVcsRUFBRSxNQUFNLFFBQVEsQ0FBQTtBQUMxRCxPQUFPLFNBQVMsTUFBTSxXQUFXLENBQUE7QUFDakMsT0FBTyxFQUFFLFNBQVMsRUFBRSxPQUFPLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFDL0MsT0FBTyxFQUFFLHNCQUFzQixFQUFFLGVBQWUsRUFBcUIsTUFBTSxVQUFVLENBQUE7QUFJckYsTUFBTSxjQUFjLEdBQUcsQ0FBQyxDQUFDLGNBQWMsQ0FBQTtBQVl2Qzs7R0FFRztBQUNILE1BQU0sQ0FBQyxNQUFNLGdCQUFnQixHQUFHLGNBQWMsQ0FBQyxJQUFJLENBQ2pELENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLFdBQVcsQ0FBQyxFQUFFLENBQUMsQ0FBQyxFQUMxQixTQUFTLENBQUMsT0FBTyxFQUFvQixFQUFFO0lBQ3JDLFVBQVUsRUFBRSxrQkFBa0I7SUFDOUIsS0FBSyxFQUFFLGtCQUFrQjtJQUN6QixVQUFVLEVBQUUsRUFBRTtDQUNmLENBQUMsRUFDRixlQUFlLENBQ2hCLENBQUE7QUFZRDs7R0FFRztBQUNILE1BQU0sQ0FBQyxNQUFNLGdCQUFnQixHQUFHLGNBQWMsQ0FBQyxJQUFJLENBQ2pELENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLFdBQVcsQ0FBQyxFQUFFLENBQUMsQ0FBQyxFQUMxQixTQUFTLENBQUMsT0FBTyxFQUFvQixFQUFFO0lBQ3JDLFVBQVUsRUFBRSxrQkFBa0I7SUFDOUIsS0FBSyxFQUFFLGtCQUFrQjtJQUN6QixVQUFVLEVBQUUsRUFBRTtDQUNmLENBQUMsRUFDRixlQUFlLENBQ2hCLENBQUE7QUFZRDs7R0FFRztBQUVILE1BQU0sQ0FBQyxNQUFNLGdCQUFnQixHQUFHLGNBQWMsQ0FBQyxJQUFJLENBQ2pELENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLFdBQVcsQ0FBQyxFQUFFLENBQUMsQ0FBQyxFQUMxQixTQUFTLENBQUMsT0FBTyxFQUFvQixFQUFFO0lBQ3JDLFVBQVUsRUFBRSxrQkFBa0I7SUFDOUIsS0FBSyxFQUFFLGtCQUFrQjtJQUN6QixVQUFVLEVBQUUsRUFBRTtDQUNmLENBQUMsRUFDRixlQUFlLENBQ2hCLENBQUE7QUFZRDs7R0FFRztBQUNILE1BQU0sQ0FBQyxNQUFNLGlCQUFpQixHQUFHLGNBQWMsQ0FBQyxJQUFJLENBQ2xELENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLFdBQVcsQ0FBQyxHQUFHLENBQUMsQ0FBQyxFQUMzQixTQUFTLENBQUMsT0FBTyxFQUFxQixFQUFFO0lBQ3RDLFVBQVUsRUFBRSxtQkFBbUI7SUFDL0IsS0FBSyxFQUFFLG1CQUFtQjtJQUMxQixVQUFVLEVBQUUsRUFBRTtDQUNmLENBQUMsRUFDRixlQUFlLENBQ2hCLENBQUE7QUFZRDs7R0FFRztBQUNILE1BQU0sQ0FBQyxNQUFNLGFBQWEsR0FBRyxJQUFJLENBQy9CLENBQUMsQ0FBQyxNQUFNLEVBQ1IsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxXQUFXLENBQUMsR0FBRyxDQUFDLENBQUMsRUFDN0MsU0FBUyxDQUFDLE9BQU8sRUFBaUIsRUFBRSxFQUFFLFVBQVUsRUFBRSxlQUFlLEVBQUUsS0FBSyxFQUFFLGVBQWUsRUFBRSxVQUFVLEVBQUUsRUFBRSxFQUFFLENBQUMsRUFDNUcsZUFBZSxDQUNoQixDQUFBO0FBWUQsTUFBTSxZQUFZLEdBQUcsR0FBYSxFQUFFLENBQUMsTUFBTSxFQUF5QixDQUFBO0FBQ3BFLE1BQU0sU0FBUyxHQUFHLENBQUMsQ0FBQTtBQUNuQixNQUFNLFNBQVMsR0FBRyxFQUFFLENBQUE7QUFDcEIsTUFBTSxJQUFJLEdBQUcsRUFBRSxDQUFBO0FBQ2YsTUFBTSxNQUFNLEdBQUcsRUFBRSxHQUFHLElBQUksQ0FBQTtBQUN4QixNQUFNLFdBQVcsR0FBRyxHQUFRLEVBQUUsQ0FBQyxDQUFDLEVBQU8sRUFBRSxFQUFFLENBQ3pDLEVBQUU7S0FDQyxVQUFVLENBQUMsRUFBRSxTQUFTLEVBQUUsTUFBTSxFQUFFLFNBQVMsRUFBRSxNQUFNLEVBQUUsQ0FBQztLQUNwRCxHQUFHLENBQUMsQ0FBQyxDQUFNLEVBQUUsRUFBRSxDQUFDLFlBQVksQ0FBQyxXQUFXLEVBQUUsSUFBSSxFQUFFLENBQUMsSUFBWSxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsUUFBUSxDQUFDLENBQUMsRUFBRSxJQUFJLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQTtBQUU5Rjs7R0FFRztBQUNILE1BQU0sQ0FBQyxNQUFNLFFBQVEsR0FBRyxPQUFPLENBQzdCLElBQUksQ0FDRixDQUFDLENBQUMsTUFBTSxFQUNSLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLFdBQVcsQ0FBQyxTQUFTLENBQUMsRUFBRSxDQUFDLENBQUMsV0FBVyxDQUFDLFNBQVMsQ0FBQyxDQUFDLEVBQzNELFNBQVMsQ0FBQyxPQUFPLEVBQVksRUFBRTtJQUM3QixVQUFVLEVBQUUsVUFBVTtJQUN0QixLQUFLLEVBQUUsVUFBVTtJQUNqQixTQUFTLEVBQUUsV0FBVztJQUN0QixVQUFVLEVBQUUsRUFBRTtDQUNmLENBQUMsQ0FDSCxFQUNELENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDO0lBQ04sSUFBSSxFQUFFLFlBQVk7SUFDbEIsV0FBVyxFQUFFLENBQUMsQ0FBQyxJQUFJLENBQUMsc0JBQXNCLENBQUMsWUFBWSxDQUFDLENBQUM7Q0FDMUQsQ0FBQyxDQUNIO0tBQ0UsSUFBSSxDQUFDLGVBQWUsQ0FBQyxDQUFBO0FBRXhCLHdGQUF3RjtBQUV4RiwrRkFBK0Y7QUFFL0YsTUFBTSxVQUFVLGdCQUFnQjtJQUM5QixPQUFPLENBQ0wsTUFBYyxFQUNkLElBQVksRUFDWixTQUFxQixFQUNyQixFQUFFO1FBRUYsTUFBTSxJQUFJLEdBQUcsR0FBRyxNQUFNLEdBQUcsU0FBUyxJQUFJLEdBQUcsRUFBZ0IsQ0FBQTtRQUN6RCxNQUFNLEdBQUcsR0FBRyxHQUFRLEVBQUUsQ0FBQyxDQUFDLEVBQU8sRUFBRSxFQUFFLENBQ2pDLFdBQVcsRUFBRSxDQUFDLEVBQUUsQ0FBQyxDQUFDLEdBQUcsQ0FDbkIsQ0FBQyxDQUFNLEVBQUUsRUFBRSxDQUFDLENBQUMsSUFBSSxHQUFHLENBQUMsQ0FBQyxTQUFTLENBQUMsQ0FBQyxFQUFFLEVBQUUsR0FBRyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQVUsQ0FDL0QsQ0FBQTtRQUNILG1FQUFtRTtRQUNuRSxNQUFNLENBQUMsR0FBNkIsUUFBUTthQUN6QyxJQUFJLENBQ0gsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQVMsRUFBdUIsRUFBRSxDQUFDLENBQUMsQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLEVBQUU7WUFDL0QsU0FBUyxFQUFFLEdBQUc7WUFDZCxVQUFVLEVBQUUsSUFBSTtZQUNoQixLQUFLLEVBQUUsSUFBSTtTQUNaLENBQUMsQ0FDSSxDQUFBO1FBQ1YsTUFBTSxNQUFNLEdBQUcsQ0FBQyxDQUFDLElBQUksQ0FBQyxlQUFlLENBQUMsQ0FBQTtRQUN0QyxNQUFNLElBQUksR0FBRyxHQUFHLEVBQUUsQ0FBQyxDQUFDLElBQUksR0FBRyxRQUFRLENBQUMsSUFBSSxFQUFFLENBQUMsU0FBUyxDQUFDLENBQUMsRUFBRSxFQUFFLEdBQUcsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFVLENBQUE7UUFFbkYsT0FBTyxPQUFPLENBQ1osTUFBTSxFQUNOLENBQUMsRUFBRSxFQUFpRCxFQUFFLENBQUMsQ0FBQztZQUN0RCxJQUFJO1lBQ0o7O2VBRUc7WUFDSCxVQUFVLEVBQUUsQ0FBQyxHQUFXLEVBQUUsRUFBRSxDQUFDLEVBQUUsQ0FBQyxJQUFJLEdBQUcsR0FBRyxDQUFDO1lBQzNDOztlQUVHO1lBQ0gsVUFBVSxFQUFFLENBQXNCLEdBQW1DLEVBQUUsRUFBRSxDQUFDLEVBQUUsQ0FBQyxHQUFHLENBQUM7WUFDakYsTUFBTTtZQUNOLFdBQVcsRUFBRSxNQUFNLENBQUMsSUFBSSxDQUFDLHNCQUFzQixDQUFDLElBQUksQ0FBQyxDQUFDO1NBQ3ZELENBQUMsQ0FDSCxDQUFBO0lBQ0gsQ0FBQyxDQUFBO0FBQ0gsQ0FBQztBQUVELE1BQU0sQ0FBQyxNQUFNLGVBQWUsR0FBRyxHQUUzQixFQUFFLENBQ0osZUFBZSxDQUNiLE1BQU0sQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUMsRUFBRSxRQUFRLENBR0wsQ0FDM0MsQ0FBQTtBQWtCSCxNQUFNLEtBQUssR0FBNEIsQ0FBQyxDQUFTLEVBQVksRUFBRTtJQUM3RCxPQUFPLFNBQVMsQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLENBQUMsRUFBRSxFQUFFLFdBQVcsRUFBRSxLQUFLLEVBQUUsQ0FBQyxDQUFBO0FBQzNELENBQUMsQ0FBQTtBQUVELE1BQU0sQ0FBQyxNQUFNLEdBQUcsR0FBRyxDQUFDO0tBQ2pCLE1BQU07S0FDTixJQUFJLENBQ0gsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxLQUFLLEVBQUU7SUFDZCxTQUFTLEVBQUUsR0FBUSxFQUFFLENBQUMsQ0FBQyxFQUFPLEVBQUUsRUFBRSxDQUFDLEVBQUUsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFNLEVBQUUsRUFBRSxDQUFDLENBQVEsQ0FBQztJQUN4RSxVQUFVLEVBQUUsS0FBSztJQUNqQixLQUFLLEVBQUUsS0FBSztJQUNaLFVBQVUsRUFBRSxFQUFFLE1BQU0sRUFBRSxLQUFLLEVBQUU7Q0FDOUIsQ0FBQyxFQUNGLGVBQWUsQ0FDaEIsQ0FBQSJ9