effect-app 4.0.0-beta.33 → 4.0.0-beta.331

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 (369) hide show
  1. package/CHANGELOG.md +1628 -0
  2. package/dist/Array.d.ts +2 -1
  3. package/dist/Array.d.ts.map +1 -1
  4. package/dist/Array.js +4 -4
  5. package/dist/Chunk.d.ts.map +1 -1
  6. package/dist/Config/SecretURL.d.ts +3 -1
  7. package/dist/Config/SecretURL.d.ts.map +1 -1
  8. package/dist/Config/SecretURL.js +3 -6
  9. package/dist/Config/internal/configSecretURL.d.ts.map +1 -1
  10. package/dist/Config/internal/configSecretURL.js +2 -2
  11. package/dist/Config.d.ts +2 -0
  12. package/dist/Config.d.ts.map +1 -0
  13. package/dist/Config.js +8 -0
  14. package/dist/ConfigProvider.d.ts +2 -0
  15. package/dist/ConfigProvider.d.ts.map +1 -0
  16. package/dist/ConfigProvider.js +6 -0
  17. package/dist/{ServiceMap.d.ts → Context.d.ts} +18 -20
  18. package/dist/Context.d.ts.map +1 -0
  19. package/dist/Context.js +67 -0
  20. package/dist/DataDependencies.d.ts +136 -0
  21. package/dist/DataDependencies.d.ts.map +1 -0
  22. package/dist/DataDependencies.js +112 -0
  23. package/dist/Effect.d.ts +10 -9
  24. package/dist/Effect.d.ts.map +1 -1
  25. package/dist/Effect.js +6 -9
  26. package/dist/Emailer.d.ts +51 -0
  27. package/dist/Emailer.d.ts.map +1 -0
  28. package/dist/Emailer.js +7 -0
  29. package/dist/Function.d.ts.map +1 -1
  30. package/dist/Layer.d.ts +10 -6
  31. package/dist/Layer.d.ts.map +1 -1
  32. package/dist/Layer.js +3 -2
  33. package/dist/Model/Repository/Registry.d.ts +22 -0
  34. package/dist/Model/Repository/Registry.d.ts.map +1 -0
  35. package/dist/Model/Repository/Registry.js +18 -0
  36. package/dist/Model/Repository/dependency.d.ts +6 -0
  37. package/dist/Model/Repository/dependency.d.ts.map +1 -0
  38. package/dist/Model/Repository/dependency.js +29 -0
  39. package/dist/Model/Repository/ext.d.ts +60 -0
  40. package/dist/Model/Repository/ext.d.ts.map +1 -0
  41. package/dist/Model/Repository/ext.js +124 -0
  42. package/dist/Model/Repository/internal/internal.d.ts +68 -0
  43. package/dist/Model/Repository/internal/internal.d.ts.map +1 -0
  44. package/dist/Model/Repository/internal/internal.js +611 -0
  45. package/dist/Model/Repository/legacy.d.ts +21 -0
  46. package/dist/Model/Repository/legacy.d.ts.map +1 -0
  47. package/dist/Model/Repository/legacy.js +2 -0
  48. package/dist/Model/Repository/makeRepo.d.ts +71 -0
  49. package/dist/Model/Repository/makeRepo.d.ts.map +1 -0
  50. package/dist/Model/Repository/makeRepo.js +30 -0
  51. package/dist/Model/Repository/service.d.ts +121 -0
  52. package/dist/Model/Repository/service.d.ts.map +1 -0
  53. package/dist/Model/Repository/service.js +2 -0
  54. package/dist/Model/Repository/validation.d.ts +72 -0
  55. package/dist/Model/Repository/validation.d.ts.map +1 -0
  56. package/dist/Model/Repository/validation.js +39 -0
  57. package/dist/Model/Repository.d.ts +8 -0
  58. package/dist/Model/Repository.d.ts.map +1 -0
  59. package/dist/Model/Repository.js +8 -0
  60. package/dist/Model/dsl.d.ts +33 -0
  61. package/dist/Model/dsl.d.ts.map +1 -0
  62. package/dist/Model/dsl.js +43 -0
  63. package/dist/Model/filter/filterApi.d.ts +30 -0
  64. package/dist/Model/filter/filterApi.d.ts.map +1 -0
  65. package/dist/Model/filter/filterApi.js +2 -0
  66. package/dist/Model/filter/types/errors.d.ts +29 -0
  67. package/dist/Model/filter/types/errors.d.ts.map +1 -0
  68. package/dist/Model/filter/types/errors.js +2 -0
  69. package/dist/Model/filter/types/fields.d.ts +15 -0
  70. package/dist/Model/filter/types/fields.d.ts.map +1 -0
  71. package/dist/Model/filter/types/fields.js +2 -0
  72. package/dist/Model/filter/types/path/common.d.ts +316 -0
  73. package/dist/Model/filter/types/path/common.d.ts.map +1 -0
  74. package/dist/Model/filter/types/path/common.js +2 -0
  75. package/dist/Model/filter/types/path/eager.d.ts +94 -0
  76. package/dist/Model/filter/types/path/eager.d.ts.map +1 -0
  77. package/dist/Model/filter/types/path/eager.js +36 -0
  78. package/dist/Model/filter/types/path/index.d.ts +4 -0
  79. package/dist/Model/filter/types/path/index.d.ts.map +1 -0
  80. package/dist/Model/filter/types/path/index.js +3 -0
  81. package/dist/Model/filter/types/utils.d.ts +79 -0
  82. package/dist/Model/filter/types/utils.d.ts.map +1 -0
  83. package/dist/Model/filter/types/utils.js +2 -0
  84. package/dist/Model/filter/types/validator.d.ts +30 -0
  85. package/dist/Model/filter/types/validator.d.ts.map +1 -0
  86. package/dist/Model/filter/types/validator.js +2 -0
  87. package/dist/Model/filter/types.d.ts +5 -0
  88. package/dist/Model/filter/types.d.ts.map +1 -0
  89. package/dist/Model/filter/types.js +7 -0
  90. package/dist/Model/query/dsl.d.ts +630 -0
  91. package/dist/Model/query/dsl.d.ts.map +1 -0
  92. package/dist/Model/query/dsl.js +376 -0
  93. package/dist/Model/query/new-kid-interpreter.d.ts +132 -0
  94. package/dist/Model/query/new-kid-interpreter.d.ts.map +1 -0
  95. package/dist/Model/query/new-kid-interpreter.js +370 -0
  96. package/dist/Model/query.d.ts +15 -0
  97. package/dist/Model/query.d.ts.map +1 -0
  98. package/dist/Model/query.js +3 -0
  99. package/dist/Model.d.ts +6 -0
  100. package/dist/Model.d.ts.map +1 -0
  101. package/dist/Model.js +6 -0
  102. package/dist/NonEmptySet.d.ts +3 -1
  103. package/dist/NonEmptySet.d.ts.map +1 -1
  104. package/dist/NonEmptySet.js +2 -2
  105. package/dist/Option.d.ts +1 -0
  106. package/dist/Option.d.ts.map +1 -1
  107. package/dist/Option.js +3 -1
  108. package/dist/Pure.d.ts +7 -5
  109. package/dist/Pure.d.ts.map +1 -1
  110. package/dist/Pure.js +7 -4
  111. package/dist/QueueMaker.d.ts +11 -0
  112. package/dist/QueueMaker.d.ts.map +1 -0
  113. package/dist/QueueMaker.js +11 -0
  114. package/dist/RequestContext.d.ts +87 -0
  115. package/dist/RequestContext.d.ts.map +1 -0
  116. package/dist/RequestContext.js +45 -0
  117. package/dist/RequestScopedDependencies.d.ts +21 -0
  118. package/dist/RequestScopedDependencies.d.ts.map +1 -0
  119. package/dist/RequestScopedDependencies.js +16 -0
  120. package/dist/Schema/Class.d.ts +200 -20
  121. package/dist/Schema/Class.d.ts.map +1 -1
  122. package/dist/Schema/Class.js +268 -17
  123. package/dist/Schema/FastCheck.d.ts.map +1 -1
  124. package/dist/Schema/SchemaParser.d.ts +5 -0
  125. package/dist/Schema/SchemaParser.d.ts.map +1 -0
  126. package/dist/Schema/SchemaParser.js +6 -0
  127. package/dist/Schema/SpecialJsonSchema.d.ts +34 -0
  128. package/dist/Schema/SpecialJsonSchema.d.ts.map +1 -0
  129. package/dist/Schema/SpecialJsonSchema.js +117 -0
  130. package/dist/Schema/SpecialOpenApi.d.ts +32 -0
  131. package/dist/Schema/SpecialOpenApi.d.ts.map +1 -0
  132. package/dist/Schema/SpecialOpenApi.js +123 -0
  133. package/dist/Schema/brand.d.ts +5 -5
  134. package/dist/Schema/brand.d.ts.map +1 -1
  135. package/dist/Schema/brand.js +3 -1
  136. package/dist/Schema/email.d.ts.map +1 -1
  137. package/dist/Schema/email.js +12 -6
  138. package/dist/Schema/ext.d.ts +335 -61
  139. package/dist/Schema/ext.d.ts.map +1 -1
  140. package/dist/Schema/ext.js +388 -63
  141. package/dist/Schema/moreStrings.d.ts +82 -36
  142. package/dist/Schema/moreStrings.d.ts.map +1 -1
  143. package/dist/Schema/moreStrings.js +90 -53
  144. package/dist/Schema/numbers.d.ts +33 -21
  145. package/dist/Schema/numbers.d.ts.map +1 -1
  146. package/dist/Schema/numbers.js +65 -12
  147. package/dist/Schema/phoneNumber.d.ts.map +1 -1
  148. package/dist/Schema/phoneNumber.js +11 -7
  149. package/dist/Schema/schema.d.ts +1 -1
  150. package/dist/Schema/schema.d.ts.map +1 -1
  151. package/dist/Schema/schema.js +2 -2
  152. package/dist/Schema/strings.d.ts +18 -4
  153. package/dist/Schema/strings.d.ts.map +1 -1
  154. package/dist/Schema/strings.js +1 -5
  155. package/dist/Schema.d.ts +225 -7
  156. package/dist/Schema.d.ts.map +1 -1
  157. package/dist/Schema.js +193 -26
  158. package/dist/SchemaAST.d.ts +2 -0
  159. package/dist/SchemaAST.d.ts.map +1 -0
  160. package/dist/SchemaAST.js +2 -0
  161. package/dist/Set.d.ts +4 -1
  162. package/dist/Set.d.ts.map +1 -1
  163. package/dist/Set.js +3 -2
  164. package/dist/Store.d.ts +215 -0
  165. package/dist/Store.d.ts.map +1 -0
  166. package/dist/Store.js +113 -0
  167. package/dist/_ext/Array.d.ts +1 -1
  168. package/dist/_ext/Array.d.ts.map +1 -1
  169. package/dist/_ext/Array.js +4 -2
  170. package/dist/_ext/misc.d.ts +4 -1
  171. package/dist/_ext/misc.d.ts.map +1 -1
  172. package/dist/_ext/misc.js +4 -2
  173. package/dist/_ext/ord.ext.d.ts +2 -1
  174. package/dist/_ext/ord.ext.d.ts.map +1 -1
  175. package/dist/_ext/ord.ext.js +2 -2
  176. package/dist/builtin.d.ts +2 -14
  177. package/dist/builtin.d.ts.map +1 -1
  178. package/dist/builtin.js +1 -1
  179. package/dist/client/InvalidationKeys.d.ts +30 -0
  180. package/dist/client/InvalidationKeys.d.ts.map +1 -0
  181. package/dist/client/InvalidationKeys.js +37 -0
  182. package/dist/client/apiClientFactory.d.ts +19 -31
  183. package/dist/client/apiClientFactory.d.ts.map +1 -1
  184. package/dist/client/apiClientFactory.js +157 -39
  185. package/dist/client/clientFor.d.ts +54 -18
  186. package/dist/client/clientFor.d.ts.map +1 -1
  187. package/dist/client/clientFor.js +9 -1
  188. package/dist/client/errors.d.ts +82 -27
  189. package/dist/client/errors.d.ts.map +1 -1
  190. package/dist/client/errors.js +75 -19
  191. package/dist/client/makeClient.d.ts +490 -34
  192. package/dist/client/makeClient.d.ts.map +1 -1
  193. package/dist/client/makeClient.js +62 -30
  194. package/dist/client.d.ts +2 -0
  195. package/dist/client.d.ts.map +1 -1
  196. package/dist/client.js +3 -1
  197. package/dist/faker.d.ts.map +1 -1
  198. package/dist/http/Request.d.ts +1 -1
  199. package/dist/http/Request.d.ts.map +1 -1
  200. package/dist/http/Request.js +2 -2
  201. package/dist/ids.d.ts +32 -14
  202. package/dist/ids.d.ts.map +1 -1
  203. package/dist/ids.js +38 -6
  204. package/dist/index.d.ts +6 -7
  205. package/dist/index.d.ts.map +1 -1
  206. package/dist/index.js +8 -8
  207. package/dist/middleware.d.ts +13 -7
  208. package/dist/middleware.d.ts.map +1 -1
  209. package/dist/middleware.js +14 -8
  210. package/dist/rpc/Invalidation.d.ts +1124 -0
  211. package/dist/rpc/Invalidation.d.ts.map +1 -0
  212. package/dist/rpc/Invalidation.js +178 -0
  213. package/dist/rpc/MiddlewareMaker.d.ts +11 -7
  214. package/dist/rpc/MiddlewareMaker.d.ts.map +1 -1
  215. package/dist/rpc/MiddlewareMaker.js +59 -38
  216. package/dist/rpc/RpcContextMap.d.ts +3 -3
  217. package/dist/rpc/RpcContextMap.d.ts.map +1 -1
  218. package/dist/rpc/RpcContextMap.js +4 -4
  219. package/dist/rpc/RpcMiddleware.d.ts +14 -10
  220. package/dist/rpc/RpcMiddleware.d.ts.map +1 -1
  221. package/dist/rpc/RpcMiddleware.js +1 -1
  222. package/dist/rpc.d.ts +1 -1
  223. package/dist/rpc.d.ts.map +1 -1
  224. package/dist/rpc.js +2 -2
  225. package/dist/runtime.d.ts +19 -0
  226. package/dist/runtime.d.ts.map +1 -0
  227. package/dist/runtime.js +40 -0
  228. package/dist/setupRequest.d.ts +20 -0
  229. package/dist/setupRequest.d.ts.map +1 -0
  230. package/dist/setupRequest.js +72 -0
  231. package/dist/toast.d.ts +51 -0
  232. package/dist/toast.d.ts.map +1 -0
  233. package/dist/toast.js +34 -0
  234. package/dist/transform.d.ts +1 -1
  235. package/dist/transform.d.ts.map +1 -1
  236. package/dist/transform.js +4 -5
  237. package/dist/utils/effectify.d.ts +1 -1
  238. package/dist/utils/effectify.d.ts.map +1 -1
  239. package/dist/utils/effectify.js +2 -2
  240. package/dist/utils/extend.d.ts.map +1 -1
  241. package/dist/utils/gen.d.ts +4 -4
  242. package/dist/utils/gen.d.ts.map +1 -1
  243. package/dist/utils/logLevel.d.ts +2 -2
  244. package/dist/utils/logLevel.d.ts.map +1 -1
  245. package/dist/utils/logger.d.ts +4 -3
  246. package/dist/utils/logger.d.ts.map +1 -1
  247. package/dist/utils/logger.js +4 -4
  248. package/dist/utils.d.ts +34 -39
  249. package/dist/utils.d.ts.map +1 -1
  250. package/dist/utils.js +33 -37
  251. package/dist/validation/validators.d.ts.map +1 -1
  252. package/dist/validation.d.ts.map +1 -1
  253. package/dist/withToast.d.ts +30 -0
  254. package/dist/withToast.d.ts.map +1 -0
  255. package/dist/withToast.js +64 -0
  256. package/package.json +27 -251
  257. package/src/Array.ts +5 -5
  258. package/src/Chunk.ts +3 -3
  259. package/src/Config/SecretURL.ts +6 -3
  260. package/src/Config/internal/configSecretURL.ts +2 -2
  261. package/src/Config.ts +7 -0
  262. package/src/ConfigProvider.ts +5 -0
  263. package/src/{ServiceMap.ts → Context.ts} +56 -63
  264. package/src/DataDependencies.ts +171 -0
  265. package/src/Effect.ts +15 -17
  266. package/src/Emailer.ts +51 -0
  267. package/src/Inputify.type.ts +1 -1
  268. package/src/Layer.ts +11 -7
  269. package/src/Model/Repository/Registry.ts +35 -0
  270. package/src/Model/Repository/dependency.ts +32 -0
  271. package/src/Model/Repository/ext.ts +374 -0
  272. package/src/Model/Repository/internal/internal.ts +988 -0
  273. package/src/Model/Repository/legacy.ts +29 -0
  274. package/src/Model/Repository/makeRepo.ts +168 -0
  275. package/src/Model/Repository/service.ts +676 -0
  276. package/src/Model/Repository/validation.ts +38 -0
  277. package/src/Model/Repository.ts +7 -0
  278. package/src/Model/dsl.ts +129 -0
  279. package/src/Model/filter/filterApi.ts +78 -0
  280. package/src/Model/filter/types/errors.ts +47 -0
  281. package/src/Model/filter/types/fields.ts +50 -0
  282. package/src/Model/filter/types/path/common.ts +404 -0
  283. package/src/Model/filter/types/path/eager.ts +329 -0
  284. package/src/Model/filter/types/path/index.ts +4 -0
  285. package/src/Model/filter/types/utils.ts +128 -0
  286. package/src/Model/filter/types/validator.ts +46 -0
  287. package/src/Model/filter/types.ts +6 -0
  288. package/src/Model/query/dsl.ts +3092 -0
  289. package/src/Model/query/new-kid-interpreter.ts +532 -0
  290. package/src/Model/query.ts +13 -0
  291. package/src/Model.ts +5 -0
  292. package/src/NonEmptySet.ts +6 -4
  293. package/src/Option.ts +2 -0
  294. package/src/Pure.ts +10 -7
  295. package/src/QueueMaker.ts +11 -0
  296. package/src/RequestContext.ts +48 -0
  297. package/src/RequestScopedDependencies.ts +45 -0
  298. package/src/Schema/Class.ts +648 -60
  299. package/src/Schema/SchemaParser.ts +12 -0
  300. package/src/Schema/SpecialJsonSchema.ts +137 -0
  301. package/src/Schema/SpecialOpenApi.ts +130 -0
  302. package/src/Schema/brand.ts +24 -9
  303. package/src/Schema/email.ts +14 -7
  304. package/src/Schema/ext.ts +508 -102
  305. package/src/Schema/moreStrings.ts +217 -86
  306. package/src/Schema/numbers.ts +107 -28
  307. package/src/Schema/phoneNumber.ts +13 -9
  308. package/src/Schema/schema.ts +1 -1
  309. package/src/Schema/strings.ts +23 -14
  310. package/src/Schema.ts +403 -46
  311. package/src/SchemaAST.ts +1 -0
  312. package/src/Set.ts +6 -2
  313. package/src/Store.ts +325 -0
  314. package/src/_ext/Array.ts +4 -2
  315. package/src/_ext/misc.ts +4 -1
  316. package/src/_ext/ord.ext.ts +2 -1
  317. package/src/builtin-json.d.ts +24 -0
  318. package/src/builtin.ts +16 -21
  319. package/src/client/InvalidationKeys.ts +55 -0
  320. package/src/client/apiClientFactory.ts +301 -141
  321. package/src/client/clientFor.ts +107 -34
  322. package/src/client/errors.ts +100 -29
  323. package/src/client/makeClient.ts +594 -80
  324. package/src/client.ts +6 -4
  325. package/src/http/Request.ts +3 -3
  326. package/src/http.ts +1 -1
  327. package/src/ids.ts +45 -7
  328. package/src/index.ts +20 -23
  329. package/src/middleware.ts +13 -9
  330. package/src/rpc/Invalidation.ts +278 -0
  331. package/src/rpc/MiddlewareMaker.ts +88 -80
  332. package/src/rpc/README.md +2 -2
  333. package/src/rpc/RpcContextMap.ts +7 -6
  334. package/src/rpc/RpcMiddleware.ts +19 -13
  335. package/src/rpc.ts +4 -4
  336. package/src/runtime.ts +57 -0
  337. package/src/setupRequest.ts +138 -0
  338. package/src/toast.ts +54 -0
  339. package/src/transform.ts +4 -4
  340. package/src/utils/effectify.ts +1 -1
  341. package/src/utils/gen.ts +8 -8
  342. package/src/utils/logLevel.ts +1 -1
  343. package/src/utils/logger.ts +4 -3
  344. package/src/utils.ts +85 -158
  345. package/src/validation.ts +2 -2
  346. package/src/withToast.ts +133 -0
  347. package/test/dist/rpc.test.d.ts.map +1 -1
  348. package/test/dist/rpcMiddlewareContext.test.d.ts.map +1 -0
  349. package/test/dist/secretURL.test.d.ts.map +1 -0
  350. package/test/dist/special.test.d.ts.map +1 -0
  351. package/test/moreStrings.test.ts +55 -10
  352. package/test/rpc.test.ts +38 -10
  353. package/test/rpcMiddlewareContext.test.ts +63 -0
  354. package/test/schema.test.ts +505 -26
  355. package/test/secretURL.test.ts +160 -0
  356. package/test/special.test.ts +1261 -0
  357. package/test/utils.test.ts +7 -7
  358. package/tsconfig.base.json +6 -5
  359. package/tsconfig.json +9 -2
  360. package/tsconfig.src.json +29 -29
  361. package/tsconfig.test.json +2 -2
  362. package/dist/Operations.d.ts +0 -123
  363. package/dist/Operations.d.ts.map +0 -1
  364. package/dist/Operations.js +0 -29
  365. package/dist/ServiceMap.d.ts.map +0 -1
  366. package/dist/ServiceMap.js +0 -91
  367. package/eslint.config.mjs +0 -26
  368. package/src/Operations.ts +0 -55
  369. package/tsconfig.json.bak +0 -12
@@ -1,85 +1,362 @@
1
1
  /* eslint-disable @typescript-eslint/no-explicit-any */
2
2
  /* eslint-disable @typescript-eslint/no-unsafe-return */
3
- import { Effect, Option, pipe, Schema, SchemaGetter, SchemaIssue, SchemaTransformation, ServiceMap } from "effect";
3
+ /**
4
+ * # `withConstructorDefault` policy
5
+ *
6
+ * The `withConstructorDefault` properties exported throughout this module
7
+ * (and from `numbers.ts`, `moreStrings.ts`, `ids.ts`) attach a default value
8
+ * that is **only** applied during construction — i.e. when the field is
9
+ * omitted from the input to a Schema constructor / `.make(...)` call.
10
+ *
11
+ * They are **NOT** applied during `decode` (JSON, database rows, RPC payloads,
12
+ * etc.). Decoding a payload with a missing field will still fail with a parse
13
+ * error, exactly as if the default were not present.
14
+ *
15
+ * Concretely this means `withConstructorDefault` MUST NOT be relied on as a
16
+ * just-in-time migration mechanism for database fields. If a stored record is
17
+ * missing a newly added field, the constructor default will not fill it in on
18
+ * read — decoding will fail.
19
+ *
20
+ * ## Don't reach for `withDecodingDefault*` either
21
+ *
22
+ * The sibling `withDecodingDefaultType` (and `withDecodingDefault`) extensions
23
+ * exist, but they are discouraged for migrating persisted data. A missing
24
+ * field in a stored record is just as likely to be data corruption as it is
25
+ * an old-shape document; silently substituting a default hides the problem
26
+ * and can poison downstream aggregates.
27
+ *
28
+ * Prefer an **explicit, preferably versioned** migration of database data
29
+ * (a schema-version field, a one-shot backfill, or a transform on read that
30
+ * is gated on an explicit version marker) over shoving missing fields under
31
+ * the rug with a decode-time default.
32
+ */
33
+ import * as Config from "effect/Config";
34
+ import * as Effect from "effect/Effect";
35
+ import { pipe } from "effect/Function";
36
+ import * as Function from "effect/Function";
37
+ import * as Option from "effect/Option";
38
+ import * as Order from "effect/Order";
4
39
  import * as S from "effect/Schema";
40
+ import * as SchemaIssue from "effect/SchemaIssue";
41
+ import * as SchemaTransformation from "effect/SchemaTransformation";
42
+ import * as Struct from "effect/Struct";
43
+ import * as Context from "../Context.js";
44
+ import * as SchemaAST from "../SchemaAST.js";
5
45
  import { extendM, typedKeysOf } from "../utils.js";
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);
46
+ const concurrencySetting = Effect.runSync(Config
47
+ .Literal("unbounded", "SCHEMA_CONCURRENCY")
48
+ .pipe(Config.orElse(() => Config.Number("SCHEMA_CONCURRENCY")), Config.option));
49
+ export const DefaultParseOptions = {
50
+ concurrency: Option.getOrElse(concurrencySetting, () => "unbounded")
12
51
  };
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
- }));
18
52
  /**
19
- * Like the default Schema `Date` but from String with `withDefault` => now
53
+ * Parse-options annotation used on schema constructors for decode paths where callers
54
+ * cannot currently pass parse options (notably some RPC / HttpApi integration paths).
55
+ *
56
+ * Keep this annotation in place so those framework-managed decodes still run with
57
+ * unbounded concurrency by default.
20
58
  */
21
- export const Date = Object.assign(DateFromString, {
22
- withDefault: DateFromString.pipe(withDefaultConstructor(() => new global.Date()))
59
+ export const concurrencyUnbounded = { parseOptions: DefaultParseOptions };
60
+ export const withDefaultParseOptions = (decode, defaultParseOptions = DefaultParseOptions) => ((schema) => {
61
+ const run = decode(schema);
62
+ return (input, options) => run(input, { ...defaultParseOptions, ...options });
23
63
  });
24
- /**
25
- * Like the default Schema `Boolean` but with `withDefault` => false
26
- */
27
- export const Boolean = Object.assign(S.Boolean, {
28
- withDefault: S.Boolean.pipe(withDefaultConstructor(() => false))
64
+ const DateString = S.String.annotate({
65
+ identifier: "DateOrInvalid",
66
+ description: "an ISO 8601 date string that will be decoded as a Date (may be invalid)",
67
+ format: "date-time"
29
68
  });
30
69
  /**
31
- * You probably want to use `Finite` instead of this.
32
- * Like the default Schema `Number` but with `withDefault` => 0
70
+ * A transformation schema that parses an ISO 8601 string into a `Date`.
71
+ *
72
+ * Decoding:
73
+ * - A `string` is decoded as a `Date`.
74
+ *
75
+ * Encoding:
76
+ * - A `Date` is encoded as a `string`.
77
+ *
78
+ * Use this when the Encoded form must be JSON (`string`). Domain models should
79
+ * prefer {@link Date}, whose Encoded form is `Date`; JSON stores convert via
80
+ * `Schema.toCodecJson`.
81
+ *
82
+ * @since 4.0.0
33
83
  */
34
- export const Number = Object.assign(S.Number, { withDefault: S.Number.pipe(withDefaultConstructor(() => 0)) });
84
+ export const DateFromString = DateString.pipe(S.decodeTo(S.Date, SchemaTransformation.dateFromString));
85
+ const dateHelpers = (s) => ({
86
+ /**
87
+ * Construction-only default `new Date()`. Applied only when the field is
88
+ * omitted from `.make(...)` input. NOT applied during decode — cannot be
89
+ * used to JIT-migrate database fields. See file-level note.
90
+ */
91
+ withConstructorDefault: s.pipe(S.withConstructorDefault(Effect.sync(() => new globalThis.Date()))),
92
+ /**
93
+ * Decode-time default `new Date()`. **Discouraged for persisted data:** a
94
+ * missing field may be data corruption, not an old-shape document; silently
95
+ * substituting `new Date()` hides the problem. Prefer an explicit,
96
+ * preferably versioned migration over a decode-time fallback. See
97
+ * file-level note.
98
+ */
99
+ withDecodingDefaultType: s.pipe(S.withDecodingDefaultType(Effect.sync(() => new globalThis.Date())))
100
+ });
101
+ /** Like the default Schema `Date` (Encoded is `Date`) with default helpers. */
102
+ export const Date = extendM(S.Date, dateHelpers);
35
103
  /**
36
- * Like the default Schema `Finite` but with `withDefault` => 0
104
+ * Alias of {@link Date}. Core `Schema.Date` already rejects invalid Dates.
105
+ *
106
+ * @deprecated Use {@link Date}.
37
107
  */
38
- export const Finite = Object.assign(S.Finite, { withDefault: S.Finite.pipe(withDefaultConstructor(() => 0)) });
108
+ export const DateValid = Date;
109
+ /** Like the default Schema `Boolean` but with default helpers. */
110
+ export const Boolean = Object.assign(S.Boolean, {
111
+ /**
112
+ * Construction-only default `false`. Applied only when the field is
113
+ * omitted from `.make(...)` input. NOT applied during decode — cannot be
114
+ * used to JIT-migrate database fields. See file-level note.
115
+ */
116
+ withConstructorDefault: S.Boolean.pipe(S.withConstructorDefault(Effect.succeed(false))),
117
+ /**
118
+ * Decode-time default `false`. **Discouraged for persisted data:** a
119
+ * missing field may be data corruption, not an old-shape document; silently
120
+ * substituting `false` hides the problem. Prefer an explicit, preferably
121
+ * versioned migration over a decode-time fallback. See file-level note.
122
+ */
123
+ withDecodingDefaultType: S.Boolean.pipe(S.withDecodingDefaultType(Effect.succeed(false)))
124
+ });
39
125
  /**
40
- * Like the default Schema `Literal` but with `withDefault` => literals[0]
126
+ * You probably want to use `Finite` instead of this. Like the default Schema
127
+ * `Number` but with default helpers.
41
128
  */
42
- export const Literal = (...literals) => pipe(S.Literals(literals), (s) => Object.assign(s, {
129
+ export const Number = Object.assign(S.Number, {
130
+ /**
131
+ * Construction-only default `0`. Applied only when the field is omitted
132
+ * from `.make(...)` input. NOT applied during decode — cannot be used to
133
+ * JIT-migrate database fields. See file-level note.
134
+ */
135
+ withConstructorDefault: S.Number.pipe(S.withConstructorDefault(Effect.succeed(0))),
136
+ /**
137
+ * Decode-time default `0`. **Discouraged for persisted data:** a missing
138
+ * field may be data corruption, not an old-shape document; silently
139
+ * substituting `0` hides the problem. Prefer an explicit, preferably
140
+ * versioned migration over a decode-time fallback. See file-level note.
141
+ */
142
+ withDecodingDefaultType: S.Number.pipe(S.withDecodingDefaultType(Effect.succeed(0)))
143
+ });
144
+ // Generation-only: native Arbitrary otherwise samples up to ±Number.MAX_VALUE, so
145
+ // derived totals overflow to Infinity. Validation and JSON Schema are unaffected.
146
+ const realisticFiniteSamples = S.makeFilter(() => undefined, {
147
+ arbitraryConstraint: { order: Order.Number, minimum: -1_000_000, maximum: 1_000_000 }
148
+ });
149
+ const FiniteSchema = S.Finite.pipe(S.check(realisticFiniteSamples));
150
+ /** Like the default Schema `Finite` but with default helpers. */
151
+ export const Finite = Object.assign(FiniteSchema, {
152
+ /**
153
+ * Construction-only default `0`. Applied only when the field is omitted
154
+ * from `.make(...)` input. NOT applied during decode — cannot be used to
155
+ * JIT-migrate database fields. See file-level note.
156
+ */
157
+ withConstructorDefault: FiniteSchema.pipe(S.withConstructorDefault(Effect.succeed(0))),
158
+ /**
159
+ * Decode-time default `0`. **Discouraged for persisted data:** a missing
160
+ * field may be data corruption, not an old-shape document; silently
161
+ * substituting `0` hides the problem. Prefer an explicit, preferably
162
+ * versioned migration over a decode-time fallback. See file-level note.
163
+ */
164
+ withDecodingDefaultType: FiniteSchema.pipe(S.withDecodingDefaultType(Effect.succeed(0)))
165
+ });
166
+ /** Like the default Schema `Literals` but with default helpers. Default value is `literals[0]`. */
167
+ export const Literals = (literals) => pipe(S.Literals(literals), (s) => Object.assign(s, {
168
+ /** Override the default literal value used by `withConstructorDefault` / `withDecodingDefaultType`. */
43
169
  changeDefault: (a) => {
44
170
  return Object.assign(S.Literals(literals), {
45
171
  Default: a,
46
- withDefault: s.pipe(withDefaultConstructor(() => a))
172
+ /**
173
+ * Construction-only default. Applied only when the field is
174
+ * omitted from `.make(...)` input. NOT applied during decode —
175
+ * cannot be used to JIT-migrate database fields. See file-level
176
+ * note.
177
+ */
178
+ withConstructorDefault: s.pipe(S.withConstructorDefault(Effect.succeed(a))),
179
+ /**
180
+ * Decode-time default. **Discouraged for persisted data:** a
181
+ * missing field may be data corruption, not an old-shape
182
+ * document; silently substituting hides the problem. Prefer an
183
+ * explicit, preferably versioned migration over a decode-time
184
+ * fallback. See file-level note.
185
+ */
186
+ withDecodingDefaultType: s.pipe(S.withDecodingDefaultType(Effect.succeed(a)))
47
187
  }); // todo: copy annotations from original?
48
188
  },
189
+ // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion -- load-bearing: Object.assign widens the field type without it, breaking `expectTypeOf(l.Default).toEqualTypeOf<"a">()` in tests
49
190
  Default: literals[0],
50
- withDefault: s.pipe(withDefaultConstructor(() => literals[0]))
191
+ /**
192
+ * Construction-only default `literals[0]`. Applied only when the
193
+ * field is omitted from `.make(...)` input. NOT applied during
194
+ * decode — cannot be used to JIT-migrate database fields. See
195
+ * file-level note.
196
+ */
197
+ withConstructorDefault: s.pipe(S.withConstructorDefault(Effect.succeed(literals[0]))),
198
+ /**
199
+ * Decode-time default `literals[0]`. **Discouraged for persisted
200
+ * data:** a missing field may be data corruption, not an old-shape
201
+ * document; silently substituting hides the problem. Prefer an
202
+ * explicit, preferably versioned migration over a decode-time
203
+ * fallback. See file-level note.
204
+ */
205
+ withDecodingDefaultType: s.pipe(S.withDecodingDefaultType(Effect.succeed(literals[0])))
51
206
  }));
52
- /**
53
- * Like the default Schema `Array` but with `withDefault` => []
54
- */
207
+ /** Like the default Schema `Array` but with default helpers. */
55
208
  export function Array(value) {
56
- return pipe(S.Array(value), (s) => Object.assign(s, { withDefault: s.pipe(withDefaultConstructor(() => [])) }));
209
+ return pipe(S.Array(value).annotate(concurrencyUnbounded), (s) => Object.assign(s, {
210
+ /**
211
+ * Construction-only default `[]`. Applied only when the field is
212
+ * omitted from `.make(...)` input. NOT applied during decode —
213
+ * cannot be used to JIT-migrate database fields. See file-level
214
+ * note.
215
+ */
216
+ withConstructorDefault: s.pipe(S.withConstructorDefault(Effect.sync(() => []))),
217
+ /**
218
+ * Decode-time default `[]`. **Discouraged for persisted data:** a
219
+ * missing field may be data corruption, not an old-shape document;
220
+ * silently substituting `[]` hides the problem. Prefer an explicit,
221
+ * preferably versioned migration over a decode-time fallback. See
222
+ * file-level note.
223
+ */
224
+ withDecodingDefaultType: s.pipe(S.withDecodingDefaultType(Effect.sync(() => [])))
225
+ }));
57
226
  }
58
227
  /**
59
- * Like the default Schema `Map` but with `withDefault` => []
228
+ * An annotated `S.Array` of unique items that decodes to a `ReadonlySet`.
60
229
  */
61
- function Map_(input) {
62
- return pipe(S.ReadonlyMap(input.key, input.value), (s) => Object.assign(s, { withDefault: s.pipe(withDefaultConstructor(() => new global.Map())) }));
63
- }
64
- export { Map_ as Map };
230
+ export const ReadonlySetFromArray = (value) => {
231
+ const from = S
232
+ .Array(value)
233
+ .annotate({ ...concurrencyUnbounded, expected: "an array of unique items that will be decoded as a ReadonlySet" });
234
+ const to = S.instanceOf(Set);
235
+ const schema = from.pipe(S.decodeTo(to, SchemaTransformation.transform({
236
+ decode: (arr) => new Set(arr),
237
+ encode: (set) => [...set]
238
+ })));
239
+ return schema;
240
+ };
241
+ /**
242
+ * An annotated `S.Array` of key-value tuples that decodes to a `ReadonlyMap`.
243
+ */
244
+ export const ReadonlyMapFromArray = (pair) => {
245
+ const from = S
246
+ .Array(S.Tuple([pair.key, pair.value]))
247
+ .annotate({
248
+ ...concurrencyUnbounded,
249
+ expected: "an array of key-value tuples that will be decoded as a ReadonlyMap"
250
+ });
251
+ const to = S.instanceOf(Map);
252
+ const schema = from.pipe(S.decodeTo(to, SchemaTransformation.transform({
253
+ decode: (arr) => new Map(arr),
254
+ encode: (map) => [...map.entries()] // fu
255
+ })));
256
+ return schema;
257
+ };
258
+ /** Like the default Schema `ReadonlySet` (Encoded is `Set`) with default helpers. */
259
+ export const ReadonlySet = (value) => pipe(S.ReadonlySet(value), (s) => Object.assign(s, {
260
+ /**
261
+ * Construction-only default `new Set()`. Applied only when the field
262
+ * is omitted from `.make(...)` input. NOT applied during decode —
263
+ * cannot be used to JIT-migrate database fields. See file-level
264
+ * note.
265
+ */
266
+ withConstructorDefault: s.pipe(S.withConstructorDefault(Effect.sync(() => new Set()))),
267
+ /**
268
+ * Decode-time default `new Set()`. **Discouraged for persisted
269
+ * data:** a missing field may be data corruption, not an old-shape
270
+ * document; silently substituting an empty set hides the problem.
271
+ * Prefer an explicit, preferably versioned migration over a
272
+ * decode-time fallback. See file-level note.
273
+ */
274
+ withDecodingDefaultType: s.pipe(S.withDecodingDefaultType(Effect.sync(() => new Set())))
275
+ }));
276
+ /** Like the default Schema `ReadonlyMap` (Encoded is `Map`) with default helpers. */
277
+ export const ReadonlyMap = (pair) => pipe(S.ReadonlyMap(pair.key, pair.value), (s) => Object.assign(s, {
278
+ /**
279
+ * Construction-only default `new Map()`. Applied only when the field
280
+ * is omitted from `.make(...)` input. NOT applied during decode —
281
+ * cannot be used to JIT-migrate database fields. See file-level
282
+ * note.
283
+ */
284
+ withConstructorDefault: s.pipe(S.withConstructorDefault(Effect.sync(() => new Map()))),
285
+ /**
286
+ * Decode-time default `new Map()`. **Discouraged for persisted
287
+ * data:** a missing field may be data corruption, not an old-shape
288
+ * document; silently substituting an empty map hides the problem.
289
+ * Prefer an explicit, preferably versioned migration over a
290
+ * decode-time fallback. See file-level note.
291
+ */
292
+ withDecodingDefaultType: s.pipe(S.withDecodingDefaultType(Effect.sync(() => new Map())))
293
+ }));
294
+ /** Like the default Schema `NullOr` but with default helpers. */
295
+ export const NullOr = (self) => pipe(S.NullOr(self), (s) => Object.assign(s, {
296
+ /**
297
+ * Construction-only default `null`. Applied only when the field is
298
+ * omitted from `.make(...)` input. NOT applied during decode —
299
+ * cannot be used to JIT-migrate database fields. See file-level
300
+ * note.
301
+ */
302
+ withConstructorDefault: s.pipe(S.withConstructorDefault(Effect.succeed(null))),
303
+ /**
304
+ * Decode-time default `null`. **Discouraged for persisted data:** a
305
+ * missing field may be data corruption, not an old-shape document;
306
+ * silently substituting `null` hides the problem. Prefer an
307
+ * explicit, preferably versioned migration over a decode-time
308
+ * fallback. See file-level note.
309
+ */
310
+ withDecodingDefaultType: s.pipe(S.withDecodingDefaultType(Effect.succeed(null)))
311
+ }));
312
+ /**
313
+ * Attach a `withConstructorDefault` of `new Date()` to any schema.
314
+ *
315
+ * **Construction-only.** Applied only when the field is omitted from
316
+ * `.make(...)` input. NOT applied during decode — cannot be used to
317
+ * JIT-migrate database fields. See file-level note.
318
+ */
319
+ export const defaultDate = (schema) => schema.pipe(S.withConstructorDefault(Effect.sync(() => new global.Date())));
320
+ /**
321
+ * Attach a `withConstructorDefault` of `false` to any schema.
322
+ *
323
+ * **Construction-only.** Applied only when the field is omitted from
324
+ * `.make(...)` input. NOT applied during decode — cannot be used to
325
+ * JIT-migrate database fields. See file-level note.
326
+ */
327
+ export const defaultBool = (schema) => schema.pipe(S.withConstructorDefault(Effect.succeed(false)));
65
328
  /**
66
- * Like the default Schema `ReadonlySet` but with `withDefault` => new Set()
329
+ * Attach a `withConstructorDefault` of `null` to any schema.
330
+ *
331
+ * **Construction-only.** Applied only when the field is omitted from
332
+ * `.make(...)` input. NOT applied during decode — cannot be used to
333
+ * JIT-migrate database fields. See file-level note.
67
334
  */
68
- export const ReadonlySet = (value) => pipe(S.ReadonlySet(value), (s) => Object.assign(s, { withDefault: s.pipe(withDefaultConstructor(() => new Set())) }));
335
+ export const defaultNullable = (schema) => schema.pipe(S.withConstructorDefault(Effect.succeed(null)));
69
336
  /**
70
- * Like the default Schema `ReadonlyMap` but with `withDefault` => new Map()
337
+ * Attach a `withConstructorDefault` of `[]` to any schema.
338
+ *
339
+ * **Construction-only.** Applied only when the field is omitted from
340
+ * `.make(...)` input. NOT applied during decode — cannot be used to
341
+ * JIT-migrate database fields. See file-level note.
71
342
  */
72
- export const ReadonlyMap = (pair) => pipe(S.ReadonlyMap(pair.key, pair.value), (s) => Object.assign(s, { withDefault: s.pipe(withDefaultConstructor(() => new Map())) }));
343
+ export const defaultArray = (schema) => schema.pipe(S.withConstructorDefault(Effect.sync(() => [])));
73
344
  /**
74
- * Like the default Schema `NullOr` but with `withDefault` => null
345
+ * Attach a `withConstructorDefault` of `new Map()` to any schema.
346
+ *
347
+ * **Construction-only.** Applied only when the field is omitted from
348
+ * `.make(...)` input. NOT applied during decode — cannot be used to
349
+ * JIT-migrate database fields. See file-level note.
75
350
  */
76
- export const NullOr = (self) => pipe(S.NullOr(self), (s) => Object.assign(s, { withDefault: s.pipe(withDefaultConstructor(() => null)) }));
77
- export const defaultDate = (schema) => schema.pipe(withDefaultConstructor(() => new global.Date()));
78
- export const defaultBool = (schema) => schema.pipe(withDefaultConstructor(() => false));
79
- export const defaultNullable = (schema) => schema.pipe(withDefaultConstructor(() => null));
80
- export const defaultArray = (schema) => schema.pipe(withDefaultConstructor(() => []));
81
- export const defaultMap = (schema) => schema.pipe(withDefaultConstructor(() => new Map()));
82
- export const defaultSet = (schema) => schema.pipe(withDefaultConstructor(() => new Set()));
351
+ export const defaultMap = (schema) => schema.pipe(S.withConstructorDefault(Effect.sync(() => new Map())));
352
+ /**
353
+ * Attach a `withConstructorDefault` of `new Set()` to any schema.
354
+ *
355
+ * **Construction-only.** Applied only when the field is omitted from
356
+ * `.make(...)` input. NOT applied during decode — cannot be used to
357
+ * JIT-migrate database fields. See file-level note.
358
+ */
359
+ export const defaultSet = (schema) => schema.pipe(S.withConstructorDefault(Effect.sync(() => new Set())));
83
360
  export const withDefaultMake = (s) => {
84
361
  const a = Object.assign(S.decodeSync(s), s);
85
362
  Object.setPrototypeOf(a, s);
@@ -98,7 +375,23 @@ export const withDefaultMake = (s) => {
98
375
  // }[keyof P[B.BrandTypeId]]
99
376
  // export type UnionToIntersection3<U> = (U extends any ? (k: U) => void : never) extends ((k: infer I) => void) ? I
100
377
  // : never
101
- export const inputDate = extendM(S.Union([S.DateValid, S.Date]), (s) => ({ withDefault: s.pipe(withDefaultConstructor(() => new globalThis.Date())) }));
378
+ /** Union of core `Schema.Date` (Date objects) and string-encoded `DateFromString`, with default helpers. */
379
+ export const inputDate = extendM(S.Union([S.Date, DateFromString]), (s) => ({
380
+ /**
381
+ * Construction-only default `new Date()`. Applied only when the field is
382
+ * omitted from `.make(...)` input. NOT applied during decode — cannot be
383
+ * used to JIT-migrate database fields. See file-level note.
384
+ */
385
+ withConstructorDefault: s.pipe(S.withConstructorDefault(Effect.sync(() => new globalThis.Date()))),
386
+ /**
387
+ * Decode-time default `new Date()`. **Discouraged for persisted data:** a
388
+ * missing field may be data corruption, not an old-shape document;
389
+ * silently substituting `new Date()` hides the problem. Prefer an
390
+ * explicit, preferably versioned migration over a decode-time fallback.
391
+ * See file-level note.
392
+ */
393
+ withDecodingDefaultType: s.pipe(S.withDecodingDefaultType(Effect.sync(() => new globalThis.Date())))
394
+ }));
102
395
  // TODO: v4 migration — makeOpt used internal PropertySignature types that are removed in v4
103
396
  // Simplified to use v4's S.optional / S.optionalKey directly
104
397
  export function makeOptional(t) {
@@ -107,28 +400,60 @@ export function makeOptional(t) {
107
400
  return prev;
108
401
  }, {});
109
402
  }
403
+ // `replaceContext` is `@internal` in `effect/SchemaAST` (stripped from its public types, though the
404
+ // export itself still ships in the compiled JS). Effect's own `withConstructorDefault` goes through the
405
+ // same function internally, so this mirrors an existing code path rather than reaching for something
406
+ // novel, but it's still an internal API that could move or disappear without a signal.
407
+ const SchemaASTInternal = SchemaAST;
408
+ /**
409
+ * A `Struct.Lambda` that removes a field's `withConstructorDefault`, if any.
410
+ * Compose with `Struct.pick`/`Struct.omit` via `Struct.map` to derive a
411
+ * partial-update schema from a "create" schema without inheriting defaults
412
+ * that would resurrect omitted fields in `.make(...)` output:
413
+ *
414
+ * ```ts
415
+ * import { flow } from "effect/Function"
416
+ * import * as Struct from "effect/Struct"
417
+ * import * as S from "effect-app/Schema"
418
+ *
419
+ * const Person = S.Struct({
420
+ * id: S.String,
421
+ * name: S.String.pipe(S.optionalKey, S.withConstructorDefault(() => ""))
422
+ * })
423
+ *
424
+ * const UpdatePerson = Person.mapFields(
425
+ * flow(Struct.omit(["id"]), Struct.map(S.dropConstructorDefault))
426
+ * )
427
+ * ```
428
+ */
429
+ export const dropConstructorDefault = Struct.lambda((schema) => {
430
+ const context = schema.ast.context;
431
+ if (!context?.constructorDefault)
432
+ return schema;
433
+ return schema.rebuild(SchemaASTInternal.replaceContext(schema.ast, new SchemaAST.Context(context.isOptional, context.isMutable, undefined, context.annotations)));
434
+ });
110
435
  export function makeExactOptional(t) {
111
436
  return typedKeysOf(t).reduce((prev, cur) => {
112
- prev[cur] = S.optionalKey(t[cur]);
437
+ prev[cur] = dropConstructorDefault(S.optionalKey(t[cur]));
113
438
  return prev;
114
439
  }, {});
115
440
  }
116
441
  /** A version of transform which is only a one way mapping of From->To */
117
- export const transformTo = (from, to, decode) => from.pipe(S.decodeTo(to, SchemaTransformation.transformOrFail({
442
+ export const transformTo = (from, to, decode) => from.pipe(S.decodeTo(to, SchemaTransformation.transformEffect({
118
443
  decode: (input, options) => Effect.sync(() => decode(input, options)),
119
- encode: (i) => Effect.fail(new SchemaIssue.Forbidden(Option.some(i), { message: "One way schema transformation, encoding is not allowed" }))
444
+ encode: (i) => Effect.fail(new SchemaIssue.Forbidden({ message: "One way schema transformation, encoding is not allowed" }, i))
120
445
  })));
121
- /** A version of transformOrFail which is only a one way mapping of From->To */
122
- export const transformToOrFail = (from, to, decode) => from.pipe(S.decodeTo(to, SchemaTransformation.transformOrFail({
123
- decode: decode,
124
- encode: (i) => Effect.fail(new SchemaIssue.Forbidden(Option.some(i), { message: "One way schema transformation, encoding is not allowed" }))
446
+ /** A version of transformEffect which is only a one way mapping of From->To */
447
+ export const transformToOrFail = (from, to, decode) => from.pipe(S.decodeTo(to, SchemaTransformation.transformEffect({
448
+ decode,
449
+ encode: (i) => Effect.fail(new SchemaIssue.Forbidden({ message: "One way schema transformation, encoding is not allowed" }, i))
125
450
  })));
126
- export const provide = (self, context) => {
451
+ export const provide = Function.dual(2, (self, context) => {
127
452
  const prov = Effect.provide(context);
128
453
  return self.pipe(S.middlewareDecoding((effect) => prov(effect)), S.middlewareEncoding((effect) => prov(effect)));
129
- };
130
- export const contextFromServices = (self, ...services) => Effect.gen(function* () {
131
- const context = ServiceMap.pick(...services)(yield* Effect.services());
454
+ });
455
+ export const contextFromServices = Effect.fnUntraced(function* (self, ...services) {
456
+ const context = Context.pick(...services)(yield* Effect.context());
132
457
  return provide(self, context);
133
458
  });
134
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ext.js","sourceRoot":"","sources":["../../src/Schema/ext.ts"],"names":[],"mappings":"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"}
459
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ext.js","sourceRoot":"","sources":["../../src/Schema/ext.ts"],"names":[],"mappings":"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"}