@typed/fx 1.1.1 → 1.2.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 (166) hide show
  1. package/dist/Subject/Computed.d.ts +12 -0
  2. package/dist/Subject/Computed.d.ts.map +1 -0
  3. package/dist/Subject/Computed.js +54 -0
  4. package/dist/Subject/Computed.js.map +1 -0
  5. package/dist/Subject/RefSubject.d.ts +11 -4
  6. package/dist/Subject/RefSubject.d.ts.map +1 -1
  7. package/dist/Subject/RefSubject.js +68 -24
  8. package/dist/Subject/RefSubject.js.map +1 -1
  9. package/dist/Subject/SynchronizedSubject.d.ts.map +1 -1
  10. package/dist/Subject/SynchronizedSubject.js +5 -6
  11. package/dist/Subject/SynchronizedSubject.js.map +1 -1
  12. package/dist/cjs/Subject/Computed.d.ts +12 -0
  13. package/dist/cjs/Subject/Computed.d.ts.map +1 -0
  14. package/dist/cjs/Subject/Computed.js +80 -0
  15. package/dist/cjs/Subject/Computed.js.map +1 -0
  16. package/dist/cjs/Subject/RefSubject.d.ts +11 -4
  17. package/dist/cjs/Subject/RefSubject.d.ts.map +1 -1
  18. package/dist/cjs/Subject/RefSubject.js +68 -24
  19. package/dist/cjs/Subject/RefSubject.js.map +1 -1
  20. package/dist/cjs/Subject/SynchronizedSubject.d.ts.map +1 -1
  21. package/dist/cjs/Subject/SynchronizedSubject.js +5 -6
  22. package/dist/cjs/Subject/SynchronizedSubject.js.map +1 -1
  23. package/dist/cjs/operator/multicast.d.ts +1 -1
  24. package/dist/cjs/operator/multicast.d.ts.map +1 -1
  25. package/dist/cjs/operator/multicast.js.map +1 -1
  26. package/dist/operator/multicast.d.ts +1 -1
  27. package/dist/operator/multicast.d.ts.map +1 -1
  28. package/dist/operator/multicast.js.map +1 -1
  29. package/dist/tsconfig.cjs.build.tsbuildinfo +1 -1
  30. package/package.json +2 -2
  31. package/src/Subject/HoldSubject.ts +1 -6
  32. package/src/Subject/RefSubject.test.ts +81 -0
  33. package/src/Subject/RefSubject.ts +257 -37
  34. package/src/Subject/SynchronizedSubject.ts +8 -7
  35. package/src/operator/multicast.ts +1 -1
  36. package/tsconfig.build.tsbuildinfo +1 -1
  37. package/coverage/base.css +0 -224
  38. package/coverage/block-navigation.js +0 -87
  39. package/coverage/clover.xml +0 -1483
  40. package/coverage/coverage-final.json +0 -40
  41. package/coverage/favicon.png +0 -0
  42. package/coverage/index.html +0 -191
  43. package/coverage/prettify.css +0 -1
  44. package/coverage/prettify.js +0 -2
  45. package/coverage/sort-arrow-sprite.png +0 -0
  46. package/coverage/sorter.js +0 -196
  47. package/coverage/src/Fx.ts.html +0 -274
  48. package/coverage/src/Subject/Subject.ts.html +0 -214
  49. package/coverage/src/Subject/index.html +0 -116
  50. package/coverage/src/_internal/RefCounter.ts.html +0 -313
  51. package/coverage/src/_internal/earlyExit.ts.html +0 -136
  52. package/coverage/src/_internal/index.html +0 -131
  53. package/coverage/src/constructor/at.ts.html +0 -118
  54. package/coverage/src/constructor/fromArray.ts.html +0 -148
  55. package/coverage/src/constructor/fromEffect.ts.html +0 -148
  56. package/coverage/src/constructor/fromEmitter.ts.html +0 -265
  57. package/coverage/src/constructor/fromIterable.ts.html +0 -172
  58. package/coverage/src/constructor/index.html +0 -236
  59. package/coverage/src/constructor/never.ts.html +0 -133
  60. package/coverage/src/constructor/serviceWith.ts.html +0 -122
  61. package/coverage/src/constructor/succeed.ts.html +0 -138
  62. package/coverage/src/constructor/suspend.ts.html +0 -130
  63. package/coverage/src/index.html +0 -116
  64. package/coverage/src/operator/concatMap.ts.html +0 -112
  65. package/coverage/src/operator/continueWith.ts.html +0 -169
  66. package/coverage/src/operator/delay.ts.html +0 -142
  67. package/coverage/src/operator/filter.ts.html +0 -190
  68. package/coverage/src/operator/filterEffect.ts.html +0 -214
  69. package/coverage/src/operator/filterMap.ts.html +0 -194
  70. package/coverage/src/operator/filterMapEffect.ts.html +0 -217
  71. package/coverage/src/operator/flatMap.ts.html +0 -211
  72. package/coverage/src/operator/flatMapConcurrently.ts.html +0 -141
  73. package/coverage/src/operator/index.html +0 -431
  74. package/coverage/src/operator/loop.ts.html +0 -214
  75. package/coverage/src/operator/map.ts.html +0 -163
  76. package/coverage/src/operator/merge.ts.html +0 -235
  77. package/coverage/src/operator/multicast.ts.html +0 -424
  78. package/coverage/src/operator/provideService.ts.html +0 -154
  79. package/coverage/src/operator/provideServiceEffect.ts.html +0 -190
  80. package/coverage/src/operator/scan.ts.html +0 -146
  81. package/coverage/src/operator/scanEffect.ts.html +0 -283
  82. package/coverage/src/operator/skipRepeats.ts.html +0 -214
  83. package/coverage/src/operator/slice.ts.html +0 -221
  84. package/coverage/src/operator/startWith.ts.html +0 -131
  85. package/coverage/src/operator/switchMap.ts.html +0 -295
  86. package/coverage/src/operator/withPermit.ts.html +0 -139
  87. package/coverage/src/run/collectAll.ts.html +0 -136
  88. package/coverage/src/run/index.html +0 -161
  89. package/coverage/src/run/observe.ts.html +0 -142
  90. package/coverage/src/run/reduce.ts.html +0 -149
  91. package/coverage/src/run/run.ts.html +0 -232
  92. package/coverage/tmp/coverage-13497-1671499520588-32.json +0 -1
  93. package/coverage/tmp/coverage-13497-1671499520647-31.json +0 -1
  94. package/coverage/tmp/coverage-13497-1671499520712-30.json +0 -1
  95. package/coverage/tmp/coverage-13497-1671499520782-26.json +0 -1
  96. package/coverage/tmp/coverage-13497-1671499520842-29.json +0 -1
  97. package/coverage/tmp/coverage-13497-1671499520906-28.json +0 -1
  98. package/coverage/tmp/coverage-13497-1671499520969-27.json +0 -1
  99. package/dist/constructor/fromFxEffectGen.d.ts +0 -5
  100. package/dist/constructor/fromFxEffectGen.d.ts.map +0 -1
  101. package/dist/constructor/fromFxEffectGen.js +0 -6
  102. package/dist/constructor/fromFxEffectGen.js.map +0 -1
  103. package/dist/constructor/genFx.d.ts +0 -5
  104. package/dist/constructor/genFx.d.ts.map +0 -1
  105. package/dist/constructor/genFx.js +0 -6
  106. package/dist/constructor/genFx.js.map +0 -1
  107. package/dist/operator/catch.d.ts +0 -3
  108. package/dist/operator/catch.d.ts.map +0 -1
  109. package/dist/operator/catch.js +0 -9
  110. package/dist/operator/catch.js.map +0 -1
  111. package/dist/operator/duringEffect.d.ts +0 -2
  112. package/dist/operator/duringEffect.d.ts.map +0 -1
  113. package/dist/operator/duringEffect.js +0 -2
  114. package/dist/operator/duringEffect.js.map +0 -1
  115. package/dist/operator/orDie.d.ts +0 -2
  116. package/dist/operator/orDie.d.ts.map +0 -1
  117. package/dist/operator/orDie.js +0 -2
  118. package/dist/operator/orDie.js.map +0 -1
  119. package/dist/operator/orDieWith.d.ts +0 -2
  120. package/dist/operator/orDieWith.d.ts.map +0 -1
  121. package/dist/operator/orDieWith.js +0 -2
  122. package/dist/operator/orDieWith.js.map +0 -1
  123. package/dist/operator/orElseCause.d.ts +0 -2
  124. package/dist/operator/orElseCause.d.ts.map +0 -1
  125. package/dist/operator/orElseCause.js +0 -2
  126. package/dist/operator/orElseCause.js.map +0 -1
  127. package/dist/operator/orElseEither.d.ts +0 -2
  128. package/dist/operator/orElseEither.d.ts.map +0 -1
  129. package/dist/operator/orElseEither.js +0 -2
  130. package/dist/operator/orElseEither.js.map +0 -1
  131. package/dist/operator/orElseFail.d.ts +0 -2
  132. package/dist/operator/orElseFail.d.ts.map +0 -1
  133. package/dist/operator/orElseFail.js +0 -2
  134. package/dist/operator/orElseFail.js.map +0 -1
  135. package/dist/operator/orElseSucceed.d.ts +0 -2
  136. package/dist/operator/orElseSucceed.d.ts.map +0 -1
  137. package/dist/operator/orElseSucceed.js +0 -2
  138. package/dist/operator/orElseSucceed.js.map +0 -1
  139. package/dist/operator/sampleEffect.d.ts +0 -10
  140. package/dist/operator/sampleEffect.d.ts.map +0 -1
  141. package/dist/operator/sampleEffect.js +0 -17
  142. package/dist/operator/sampleEffect.js.map +0 -1
  143. package/dist/operator/skipAfterEffect.d.ts +0 -2
  144. package/dist/operator/skipAfterEffect.d.ts.map +0 -1
  145. package/dist/operator/skipAfterEffect.js +0 -2
  146. package/dist/operator/skipAfterEffect.js.map +0 -1
  147. package/dist/operator/skipUntilEffect.d.ts +0 -2
  148. package/dist/operator/skipUntilEffect.d.ts.map +0 -1
  149. package/dist/operator/skipUntilEffect.js +0 -2
  150. package/dist/operator/skipUntilEffect.js.map +0 -1
  151. package/dist/operator/skipWhileEffect.d.ts +0 -2
  152. package/dist/operator/skipWhileEffect.d.ts.map +0 -1
  153. package/dist/operator/skipWhileEffect.js +0 -2
  154. package/dist/operator/skipWhileEffect.js.map +0 -1
  155. package/dist/operator/suceed.d.ts +0 -2
  156. package/dist/operator/suceed.d.ts.map +0 -1
  157. package/dist/operator/suceed.js +0 -2
  158. package/dist/operator/suceed.js.map +0 -1
  159. package/dist/operator/takeUntilEffect.d.ts +0 -2
  160. package/dist/operator/takeUntilEffect.d.ts.map +0 -1
  161. package/dist/operator/takeUntilEffect.js +0 -2
  162. package/dist/operator/takeUntilEffect.js.map +0 -1
  163. package/dist/operator/takeWhileEffect.d.ts +0 -2
  164. package/dist/operator/takeWhileEffect.d.ts.map +0 -1
  165. package/dist/operator/takeWhileEffect.js +0 -2
  166. package/dist/operator/takeWhileEffect.js.map +0 -1
@@ -0,0 +1,12 @@
1
+ import * as Effect from '@effect/io/Effect';
2
+ import type * as Scope from '@effect/io/Scope';
3
+ import { Fx } from '../Fx.js';
4
+ import type { RefSubject } from './RefSubject.js';
5
+ export interface Computed<E, A> extends Fx<never, E, A> {
6
+ readonly get: Effect.Effect<never, E, A>;
7
+ }
8
+ export declare const makeComputed: {
9
+ <A, R, E, B>(input: RefSubject<A>, compute: (a: A) => Effect.Effect<R, E, B>): Effect.Effect<R | Scope.Scope, never, Computed<E, B>>;
10
+ <A, R, E, B>(compute: (a: A) => Effect.Effect<R, E, B>): (input: RefSubject<A>) => Effect.Effect<R | Scope.Scope, never, Computed<E, B>>;
11
+ };
12
+ //# sourceMappingURL=Computed.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"Computed.d.ts","sourceRoot":"","sources":["../../src/Subject/Computed.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAA;AAE3C,OAAO,KAAK,KAAK,KAAK,MAAM,kBAAkB,CAAA;AAE9C,OAAO,EAAE,EAAE,EAAQ,MAAM,UAAU,CAAA;AAKnC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAEjD,MAAM,WAAW,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAE,SAAQ,EAAE,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;IACrD,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA;CACzC;AAED,eAAO,MAAM,YAAY,EAAE;IACzB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,CAC1F,CAAC,GAAG,KAAK,CAAC,KAAK,EACf,KAAK,EACL,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,CACf,CAAA;IAED,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,GAAG,CACvD,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,KACjB,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;CAClC,CAAA"}
@@ -0,0 +1,54 @@
1
+ import * as MutableRef from '@effect/data/MutableRef';
2
+ import { dual, flow } from '@effect/data/function';
3
+ import * as Effect from '@effect/io/Effect';
4
+ import { Fx, Sink } from '../Fx.js';
5
+ import { flatMapEffect } from '../operator/flatMapEffect.js';
6
+ import { MulticastFx } from '../operator/multicast.js';
7
+ import { observeSync } from '../run/observe.js';
8
+ export const makeComputed = dual(2, makeComputed_);
9
+ function makeComputed_(input, compute) {
10
+ return Effect.gen(function* ($) {
11
+ const current = MutableRef.make(yield* $(Effect.exit(compute(yield* $(input.get)))));
12
+ const dirty = MutableRef.make(false);
13
+ const computed = new ComputedImpl(input, flow(compute, Effect.provideContext(yield* $(Effect.context()))), current, dirty);
14
+ // When the underlying subject changes, mark the computed value as dirty
15
+ yield* $(Effect.forkScoped(observeSync(() => {
16
+ // Only mark the value as dirty if there are no observers which will
17
+ // automatically trigger a recomputation
18
+ if (computed.fx.observers.length === 0) {
19
+ dirty.set(true);
20
+ }
21
+ })(input)));
22
+ return computed;
23
+ });
24
+ }
25
+ class ComputedImpl extends Fx.Variance {
26
+ constructor(input, compute, current, dirty) {
27
+ super();
28
+ this.input = input;
29
+ this.compute = compute;
30
+ this.current = current;
31
+ this.dirty = dirty;
32
+ this.get = Effect.suspendSucceed(() => {
33
+ const { current, dirty } = this;
34
+ if (dirty.get()) {
35
+ return Effect.flatMap(this.input.get, (a) => this.update(a));
36
+ }
37
+ return Effect.done(current.get());
38
+ });
39
+ this.fx = new MulticastFx(flatMapEffect((a) => this.update(a))(this.input));
40
+ }
41
+ run(sink) {
42
+ return this.fx.run(sink);
43
+ }
44
+ update(a) {
45
+ const { compute, current, dirty } = this;
46
+ return Effect.gen(function* ($) {
47
+ const computed = yield* $(Effect.exit(compute(a)));
48
+ current.set(computed);
49
+ dirty.set(false);
50
+ return yield* $(Effect.done(computed));
51
+ });
52
+ }
53
+ }
54
+ //# sourceMappingURL=Computed.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"Computed.js","sourceRoot":"","sources":["../../src/Subject/Computed.ts"],"names":[],"mappings":"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"}
@@ -1,16 +1,23 @@
1
- import * as Option from '@effect/data/Option';
1
+ import { type NonEmptyReadonlyArray } from '@effect/data/ReadonlyArray';
2
+ import * as Equivalence from '@effect/data/typeclass/Equivalence';
2
3
  import * as Effect from '@effect/io/Effect';
3
4
  import * as Ref from '@effect/io/Ref';
5
+ import type * as Scope from '@effect/io/Scope';
4
6
  import { HoldSubject } from './HoldSubject.js';
5
7
  export interface RefSubject<A> extends HoldSubject<never, A>, Ref.Ref<A> {
8
+ readonly eq: Equivalence.Equivalence<A>;
6
9
  readonly get: Effect.Effect<never, never, A>;
7
10
  readonly set: (a: A) => Effect.Effect<never, never, A>;
8
11
  readonly update: (f: (a: A) => A) => Effect.Effect<never, never, A>;
9
- readonly delete: Effect.Effect<never, never, Option.Option<A>>;
12
+ readonly delete: Effect.Effect<never, never, A>;
10
13
  }
11
- export declare function makeRef<A>(initial: () => A, eq?: (a: A, b: A) => boolean): Effect.Effect<never, never, RefSubject<A>>;
14
+ export declare function makeRef<A>(initial: () => A, eq?: Equivalence.Equivalence<A>): Effect.Effect<never, never, RefSubject<A>>;
12
15
  export declare namespace RefSubject {
13
- function unsafeMake<A>(initial: () => A, eq?: (a: A, b: A) => boolean): RefSubject<A>;
16
+ type ValueOf<T> = T extends RefSubject<infer A> ? A : never;
17
+ function unsafeMake<A>(initial: () => A, eq?: Equivalence.Equivalence<A>): RefSubject<A>;
18
+ function tuple<Subjects extends NonEmptyReadonlyArray<RefSubject<any>>>(...subjects: Subjects): Effect.Effect<Scope.Scope, never, RefSubject<{
19
+ readonly [K in keyof Subjects]: ValueOf<Subjects[K]>;
20
+ }>>;
14
21
  }
15
22
  export declare function isRefSubject<A>(u: unknown): u is RefSubject<A>;
16
23
  //# sourceMappingURL=RefSubject.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"RefSubject.d.ts","sourceRoot":"","sources":["../../src/Subject/RefSubject.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,MAAM,MAAM,qBAAqB,CAAA;AAC7C,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAA;AAC3C,OAAO,KAAK,GAAG,MAAM,gBAAgB,CAAA;AAIrC,OAAO,EAAE,WAAW,EAAiB,MAAM,kBAAkB,CAAA;AAG7D,MAAM,WAAW,UAAU,CAAC,CAAC,CAAE,SAAQ,WAAW,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;IACtE,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,CAAA;IAC5C,QAAQ,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,CAAA;IACtD,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,KAAK,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,CAAA;IACnE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAA;CAC/D;AAED,wBAAgB,OAAO,CAAC,CAAC,EACvB,OAAO,EAAE,MAAM,CAAC,EAChB,EAAE,GAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,OAAgB,GACnC,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,CAE5C;AAED,yBAAiB,UAAU,CAAC;IAC1B,SAAgB,UAAU,CAAC,CAAC,EAC1B,OAAO,EAAE,MAAM,CAAC,EAChB,EAAE,GAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,OAAgB,GACnC,UAAU,CAAC,CAAC,CAAC,CA+Df;CACF;AAED,wBAAgB,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,OAAO,GAAG,CAAC,IAAI,UAAU,CAAC,CAAC,CAAC,CAE9D"}
1
+ {"version":3,"file":"RefSubject.d.ts","sourceRoot":"","sources":["../../src/Subject/RefSubject.ts"],"names":[],"mappings":"AAIA,OAAO,EAAe,KAAK,qBAAqB,EAAE,MAAM,4BAA4B,CAAA;AACpF,OAAO,KAAK,WAAW,MAAM,oCAAoC,CAAA;AACjE,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAA;AAC3C,OAAO,KAAK,GAAG,MAAM,gBAAgB,CAAA;AACrC,OAAO,KAAK,KAAK,KAAK,MAAM,kBAAkB,CAAA;AAK9C,OAAO,EAAE,WAAW,EAAiB,MAAM,kBAAkB,CAAA;AAG7D,MAAM,WAAW,UAAU,CAAC,CAAC,CAAE,SAAQ,WAAW,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;IACtE,QAAQ,CAAC,EAAE,EAAE,WAAW,CAAC,WAAW,CAAC,CAAC,CAAC,CAAA;IAEvC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,CAAA;IAC5C,QAAQ,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,CAAA;IACtD,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,KAAK,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,CAAA;IACnE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,CAAA;CAChD;AAED,wBAAgB,OAAO,CAAC,CAAC,EACvB,OAAO,EAAE,MAAM,CAAC,EAChB,EAAE,GAAE,WAAW,CAAC,WAAW,CAAC,CAAC,CAAU,GACtC,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,CAE5C;AAED,yBAAiB,UAAU,CAAC;IAC1B,KAAY,OAAO,CAAC,CAAC,IAAI,CAAC,SAAS,UAAU,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,CAAA;IAElE,SAAgB,UAAU,CAAC,CAAC,EAC1B,OAAO,EAAE,MAAM,CAAC,EAChB,EAAE,GAAE,WAAW,CAAC,WAAW,CAAC,CAAC,CAAU,GACtC,UAAU,CAAC,CAAC,CAAC,CA6Cf;IAED,SAAgB,KAAK,CAAC,QAAQ,SAAS,qBAAqB,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,EAC3E,GAAG,QAAQ,EAAE,QAAQ,GACpB,MAAM,CAAC,MAAM,CACd,KAAK,CAAC,KAAK,EACX,KAAK,EACL,UAAU,CAAC;QAAE,QAAQ,EAAE,CAAC,IAAI,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;KAAE,CAAC,CACrE,CA0DA;CAkBF;AAED,wBAAgB,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,OAAO,GAAG,CAAC,IAAI,UAAU,CAAC,CAAC,CAAC,CAE9D"}
@@ -2,9 +2,12 @@ import { equals } from '@effect/data/Equal';
2
2
  import { identity, pipe } from '@effect/data/Function';
3
3
  import * as MutableRef from '@effect/data/MutableRef';
4
4
  import * as Option from '@effect/data/Option';
5
+ import { mapNonEmpty } from '@effect/data/ReadonlyArray';
6
+ import * as Equivalence from '@effect/data/typeclass/Equivalence';
5
7
  import * as Effect from '@effect/io/Effect';
6
8
  import * as Ref from '@effect/io/Ref';
7
9
  import { Fx } from '../Fx.js';
10
+ import { observe } from '../run/observe.js';
8
11
  import { HoldSubject, isHoldSubject } from './HoldSubject.js';
9
12
  import { Subject } from './Subject.js';
10
13
  export function makeRef(initial, eq = equals) {
@@ -13,18 +16,14 @@ export function makeRef(initial, eq = equals) {
13
16
  export var RefSubject;
14
17
  (function (RefSubject) {
15
18
  function unsafeMake(initial, eq = equals) {
16
- const mutableRef = MutableRef.make(Option.some(initial()));
17
- const subject = HoldSubject.unsafeMake(mutableRef);
18
- const getValue = () => pipe(mutableRef.get(), Option.getOrElse(() => {
19
- const a = initial();
20
- mutableRef.set(Option.some(a));
21
- return a;
22
- }));
19
+ const current = MutableRef.make(Option.some(initial()));
20
+ const subject = HoldSubject.unsafeMake(current);
21
+ const getValue = () => pipe(current.get(), Option.getOrElse(initial));
23
22
  const modify = (f) => Effect.suspendSucceed(() => {
24
- const current = getValue();
25
- const [b, a] = f(current);
26
- mutableRef.set(Option.some(a));
27
- if (eq(current, a)) {
23
+ const currentValue = getValue();
24
+ const [b, a] = f(currentValue);
25
+ current.set(Option.some(a));
26
+ if (eq(currentValue, a)) {
28
27
  return Effect.succeed(b);
29
28
  }
30
29
  return pipe(subject.event(a), Effect.as(b));
@@ -41,26 +40,71 @@ export var RefSubject;
41
40
  error: subject.error.bind(subject),
42
41
  end: subject.end,
43
42
  value: subject.value,
43
+ eq,
44
44
  modify,
45
- get get() {
46
- return Ref.get(refSubject);
47
- },
48
- set(a) {
49
- return Ref.updateAndGet(() => a)(refSubject);
50
- },
51
- update(f) {
52
- return Ref.updateAndGet(f)(refSubject);
53
- },
45
+ ...makeDerivations(modify),
54
46
  delete: Effect.sync(() => {
55
- const option = mutableRef.get();
56
- // Next pull should recompute the initial value
57
- mutableRef.set(Option.none());
58
- return option;
47
+ const option = current.get();
48
+ const reset = initial();
49
+ current.set(Option.some(reset));
50
+ return Option.getOrElse(option, () => reset);
59
51
  }),
60
52
  };
61
53
  return refSubject;
62
54
  }
63
55
  RefSubject.unsafeMake = unsafeMake;
56
+ function tuple(...subjects) {
57
+ const length = subjects.length;
58
+ const getCurrent = Effect.tuple(...mapNonEmpty(subjects, (s) => s.get));
59
+ const eq = Equivalence.tuple(...mapNonEmpty(subjects, (s) => s.eq));
60
+ return Effect.gen(function* ($) {
61
+ const initial = yield* $(getCurrent);
62
+ const refSubject = unsafeMake(() => initial, eq);
63
+ const updateAtIndex = (i) => (a) => Effect.gen(function* ($) {
64
+ const current = yield* $(getCurrent);
65
+ const next = current.slice();
66
+ next[i] = a;
67
+ yield* $(refSubject.set(next));
68
+ });
69
+ // Override event to replicate events into underlying subjects
70
+ const event = (val) => Effect.tuple(...mapNonEmpty(subjects, (s, i) => s.event(val[i])));
71
+ // Override modify to replicate events into underlying subjects
72
+ const modify = (f) => Effect.gen(function* ($) {
73
+ const current = yield* $(getCurrent);
74
+ const [b, a] = f(current);
75
+ if (!eq(current, a)) {
76
+ // Will update this RefSubject using observe below
77
+ yield* $(event(a));
78
+ }
79
+ return b;
80
+ });
81
+ // Listen to changes to each subject and update the derived subject
82
+ for (let i = 0; i < length; i++) {
83
+ yield* $(observe(updateAtIndex(i))(subjects[i]));
84
+ }
85
+ return {
86
+ ...refSubject,
87
+ event,
88
+ modify,
89
+ ...makeDerivations(modify),
90
+ };
91
+ });
92
+ }
93
+ RefSubject.tuple = tuple;
94
+ const makeDerivations = (modify) => {
95
+ return {
96
+ get: modify((a) => [a, a]),
97
+ set(a) {
98
+ return modify(() => [a, a]);
99
+ },
100
+ update(f) {
101
+ return modify((a) => {
102
+ const a2 = f(a);
103
+ return [a2, a2];
104
+ });
105
+ },
106
+ };
107
+ };
64
108
  })(RefSubject || (RefSubject = {}));
65
109
  export function isRefSubject(u) {
66
110
  return isHoldSubject(u) && Ref.RefTypeId in u;
@@ -1 +1 @@
1
- {"version":3,"file":"RefSubject.js","sourceRoot":"","sources":["../../src/Subject/RefSubject.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"RefSubject.js","sourceRoot":"","sources":["../../src/Subject/RefSubject.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"SynchronizedSubject.d.ts","sourceRoot":"","sources":["../../src/Subject/SynchronizedSubject.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAA;AAE3C,OAAO,KAAK,YAAY,MAAM,6BAA6B,CAAA;AAK3D,OAAO,EAAgB,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAG1D,MAAM,WAAW,mBAAmB,CAAC,CAAC,CAAE,SAAQ,UAAU,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,YAAY,CAAC,CAAC,CAAC;IACzF,QAAQ,CAAC,YAAY,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,KAAK,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,CAAA;CACnG;AAED,wBAAgB,gBAAgB,CAAC,CAAC,EAChC,OAAO,EAAE,MAAM,CAAC,EAChB,EAAE,GAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,OAAgB,GACnC,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,mBAAmB,CAAC,CAAC,CAAC,CAAC,CAErD;AAED,yBAAiB,mBAAmB,CAAC;IACnC,SAAgB,UAAU,CAAC,CAAC,EAC1B,OAAO,EAAE,MAAM,CAAC,EAChB,EAAE,GAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,OAAgB,GACnC,mBAAmB,CAAC,CAAC,CAAC,CAiFxB;CACF;AAED,wBAAgB,qBAAqB,CAAC,CAAC,EAAE,CAAC,EAAE,OAAO,GAAG,CAAC,IAAI,mBAAmB,CAAC,CAAC,CAAC,CAEhF"}
1
+ {"version":3,"file":"SynchronizedSubject.d.ts","sourceRoot":"","sources":["../../src/Subject/SynchronizedSubject.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAA;AAE3C,OAAO,KAAK,YAAY,MAAM,6BAA6B,CAAA;AAK3D,OAAO,EAAgB,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAG1D,MAAM,WAAW,mBAAmB,CAAC,CAAC,CAAE,SAAQ,UAAU,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,YAAY,CAAC,CAAC,CAAC;IACzF,QAAQ,CAAC,YAAY,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,KAAK,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,CAAA;CACnG;AAED,wBAAgB,gBAAgB,CAAC,CAAC,EAChC,OAAO,EAAE,MAAM,CAAC,EAChB,EAAE,GAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,OAAgB,GACnC,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,mBAAmB,CAAC,CAAC,CAAC,CAAC,CAErD;AAED,yBAAiB,mBAAmB,CAAC;IACnC,SAAgB,UAAU,CAAC,CAAC,EAC1B,OAAO,EAAE,MAAM,CAAC,EAChB,EAAE,GAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,OAAgB,GACnC,mBAAmB,CAAC,CAAC,CAAC,CAgFxB;CACF;AAED,wBAAgB,qBAAqB,CAAC,CAAC,EAAE,CAAC,EAAE,OAAO,GAAG,CAAC,IAAI,mBAAmB,CAAC,CAAC,CAAC,CAEhF"}
@@ -17,8 +17,7 @@ export var SynchronizedSubject;
17
17
  function unsafeMake(initial, eq = equals) {
18
18
  const mutableRef = MutableRef.make(Option.some(initial()));
19
19
  const subject = HoldSubject.unsafeMake(mutableRef);
20
- const semaphore = Effect.unsafeMakeSemaphore(1);
21
- const locked = semaphore.withPermits(1);
20
+ const locked = Effect.unsafeMakeSemaphore(1).withPermits(1);
22
21
  const getValue = () => pipe(mutableRef.get(), Option.getOrElse(() => {
23
22
  const a = initial();
24
23
  mutableRef.set(Option.some(a));
@@ -50,6 +49,7 @@ export var SynchronizedSubject;
50
49
  error: subject.error.bind(subject),
51
50
  end: subject.end,
52
51
  value: subject.value,
52
+ eq,
53
53
  modify,
54
54
  modifyEffect,
55
55
  get get() {
@@ -65,10 +65,9 @@ export var SynchronizedSubject;
65
65
  return Synchronized.updateAndGetEffect(f)(synchronizedSubject);
66
66
  },
67
67
  delete: Effect.sync(() => {
68
- const option = mutableRef.get();
69
- // Next pull should recompute the initial value
70
- mutableRef.set(Option.none());
71
- return option;
68
+ const value = getValue();
69
+ mutableRef.set(Option.some(value));
70
+ return value;
72
71
  }),
73
72
  };
74
73
  return synchronizedSubject;
@@ -1 +1 @@
1
- {"version":3,"file":"SynchronizedSubject.js","sourceRoot":"","sources":["../../src/Subject/SynchronizedSubject.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"SynchronizedSubject.js","sourceRoot":"","sources":["../../src/Subject/SynchronizedSubject.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,12 @@
1
+ import * as Effect from '@effect/io/Effect';
2
+ import type * as Scope from '@effect/io/Scope';
3
+ import { Fx } from '../Fx.js';
4
+ import type { RefSubject } from './RefSubject.js';
5
+ export interface Computed<E, A> extends Fx<never, E, A> {
6
+ readonly get: Effect.Effect<never, E, A>;
7
+ }
8
+ export declare const makeComputed: {
9
+ <A, R, E, B>(input: RefSubject<A>, compute: (a: A) => Effect.Effect<R, E, B>): Effect.Effect<R | Scope.Scope, never, Computed<E, B>>;
10
+ <A, R, E, B>(compute: (a: A) => Effect.Effect<R, E, B>): (input: RefSubject<A>) => Effect.Effect<R | Scope.Scope, never, Computed<E, B>>;
11
+ };
12
+ //# sourceMappingURL=Computed.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"Computed.d.ts","sourceRoot":"","sources":["../../../src/Subject/Computed.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAA;AAE3C,OAAO,KAAK,KAAK,KAAK,MAAM,kBAAkB,CAAA;AAE9C,OAAO,EAAE,EAAE,EAAQ,MAAM,UAAU,CAAA;AAKnC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAEjD,MAAM,WAAW,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAE,SAAQ,EAAE,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;IACrD,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA;CACzC;AAED,eAAO,MAAM,YAAY,EAAE;IACzB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,CAC1F,CAAC,GAAG,KAAK,CAAC,KAAK,EACf,KAAK,EACL,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,CACf,CAAA;IAED,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,GAAG,CACvD,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,KACjB,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;CAClC,CAAA"}
@@ -0,0 +1,80 @@
1
+ "use strict";
2
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
+ if (k2 === undefined) k2 = k;
4
+ var desc = Object.getOwnPropertyDescriptor(m, k);
5
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
+ desc = { enumerable: true, get: function() { return m[k]; } };
7
+ }
8
+ Object.defineProperty(o, k2, desc);
9
+ }) : (function(o, m, k, k2) {
10
+ if (k2 === undefined) k2 = k;
11
+ o[k2] = m[k];
12
+ }));
13
+ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
+ Object.defineProperty(o, "default", { enumerable: true, value: v });
15
+ }) : function(o, v) {
16
+ o["default"] = v;
17
+ });
18
+ var __importStar = (this && this.__importStar) || function (mod) {
19
+ if (mod && mod.__esModule) return mod;
20
+ var result = {};
21
+ if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
+ __setModuleDefault(result, mod);
23
+ return result;
24
+ };
25
+ Object.defineProperty(exports, "__esModule", { value: true });
26
+ exports.makeComputed = void 0;
27
+ const MutableRef = __importStar(require("@effect/data/MutableRef"));
28
+ const function_1 = require("@effect/data/function");
29
+ const Effect = __importStar(require("@effect/io/Effect"));
30
+ const Fx_js_1 = require("../Fx.js");
31
+ const flatMapEffect_js_1 = require("../operator/flatMapEffect.js");
32
+ const multicast_js_1 = require("../operator/multicast.js");
33
+ const observe_js_1 = require("../run/observe.js");
34
+ exports.makeComputed = (0, function_1.dual)(2, makeComputed_);
35
+ function makeComputed_(input, compute) {
36
+ return Effect.gen(function* ($) {
37
+ const current = MutableRef.make(yield* $(Effect.exit(compute(yield* $(input.get)))));
38
+ const dirty = MutableRef.make(false);
39
+ const computed = new ComputedImpl(input, (0, function_1.flow)(compute, Effect.provideContext(yield* $(Effect.context()))), current, dirty);
40
+ // When the underlying subject changes, mark the computed value as dirty
41
+ yield* $(Effect.forkScoped((0, observe_js_1.observeSync)(() => {
42
+ // Only mark the value as dirty if there are no observers which will
43
+ // automatically trigger a recomputation
44
+ if (computed.fx.observers.length === 0) {
45
+ dirty.set(true);
46
+ }
47
+ })(input)));
48
+ return computed;
49
+ });
50
+ }
51
+ class ComputedImpl extends Fx_js_1.Fx.Variance {
52
+ constructor(input, compute, current, dirty) {
53
+ super();
54
+ this.input = input;
55
+ this.compute = compute;
56
+ this.current = current;
57
+ this.dirty = dirty;
58
+ this.get = Effect.suspendSucceed(() => {
59
+ const { current, dirty } = this;
60
+ if (dirty.get()) {
61
+ return Effect.flatMap(this.input.get, (a) => this.update(a));
62
+ }
63
+ return Effect.done(current.get());
64
+ });
65
+ this.fx = new multicast_js_1.MulticastFx((0, flatMapEffect_js_1.flatMapEffect)((a) => this.update(a))(this.input));
66
+ }
67
+ run(sink) {
68
+ return this.fx.run(sink);
69
+ }
70
+ update(a) {
71
+ const { compute, current, dirty } = this;
72
+ return Effect.gen(function* ($) {
73
+ const computed = yield* $(Effect.exit(compute(a)));
74
+ current.set(computed);
75
+ dirty.set(false);
76
+ return yield* $(Effect.done(computed));
77
+ });
78
+ }
79
+ }
80
+ //# sourceMappingURL=Computed.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"Computed.js","sourceRoot":"","sources":["../../../src/Subject/Computed.ts"],"names":[],"mappings":"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"}
@@ -1,16 +1,23 @@
1
- import * as Option from '@effect/data/Option';
1
+ import { type NonEmptyReadonlyArray } from '@effect/data/ReadonlyArray';
2
+ import * as Equivalence from '@effect/data/typeclass/Equivalence';
2
3
  import * as Effect from '@effect/io/Effect';
3
4
  import * as Ref from '@effect/io/Ref';
5
+ import type * as Scope from '@effect/io/Scope';
4
6
  import { HoldSubject } from './HoldSubject.js';
5
7
  export interface RefSubject<A> extends HoldSubject<never, A>, Ref.Ref<A> {
8
+ readonly eq: Equivalence.Equivalence<A>;
6
9
  readonly get: Effect.Effect<never, never, A>;
7
10
  readonly set: (a: A) => Effect.Effect<never, never, A>;
8
11
  readonly update: (f: (a: A) => A) => Effect.Effect<never, never, A>;
9
- readonly delete: Effect.Effect<never, never, Option.Option<A>>;
12
+ readonly delete: Effect.Effect<never, never, A>;
10
13
  }
11
- export declare function makeRef<A>(initial: () => A, eq?: (a: A, b: A) => boolean): Effect.Effect<never, never, RefSubject<A>>;
14
+ export declare function makeRef<A>(initial: () => A, eq?: Equivalence.Equivalence<A>): Effect.Effect<never, never, RefSubject<A>>;
12
15
  export declare namespace RefSubject {
13
- function unsafeMake<A>(initial: () => A, eq?: (a: A, b: A) => boolean): RefSubject<A>;
16
+ type ValueOf<T> = T extends RefSubject<infer A> ? A : never;
17
+ function unsafeMake<A>(initial: () => A, eq?: Equivalence.Equivalence<A>): RefSubject<A>;
18
+ function tuple<Subjects extends NonEmptyReadonlyArray<RefSubject<any>>>(...subjects: Subjects): Effect.Effect<Scope.Scope, never, RefSubject<{
19
+ readonly [K in keyof Subjects]: ValueOf<Subjects[K]>;
20
+ }>>;
14
21
  }
15
22
  export declare function isRefSubject<A>(u: unknown): u is RefSubject<A>;
16
23
  //# sourceMappingURL=RefSubject.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"RefSubject.d.ts","sourceRoot":"","sources":["../../../src/Subject/RefSubject.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,MAAM,MAAM,qBAAqB,CAAA;AAC7C,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAA;AAC3C,OAAO,KAAK,GAAG,MAAM,gBAAgB,CAAA;AAIrC,OAAO,EAAE,WAAW,EAAiB,MAAM,kBAAkB,CAAA;AAG7D,MAAM,WAAW,UAAU,CAAC,CAAC,CAAE,SAAQ,WAAW,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;IACtE,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,CAAA;IAC5C,QAAQ,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,CAAA;IACtD,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,KAAK,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,CAAA;IACnE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAA;CAC/D;AAED,wBAAgB,OAAO,CAAC,CAAC,EACvB,OAAO,EAAE,MAAM,CAAC,EAChB,EAAE,GAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,OAAgB,GACnC,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,CAE5C;AAED,yBAAiB,UAAU,CAAC;IAC1B,SAAgB,UAAU,CAAC,CAAC,EAC1B,OAAO,EAAE,MAAM,CAAC,EAChB,EAAE,GAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,OAAgB,GACnC,UAAU,CAAC,CAAC,CAAC,CA+Df;CACF;AAED,wBAAgB,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,OAAO,GAAG,CAAC,IAAI,UAAU,CAAC,CAAC,CAAC,CAE9D"}
1
+ {"version":3,"file":"RefSubject.d.ts","sourceRoot":"","sources":["../../../src/Subject/RefSubject.ts"],"names":[],"mappings":"AAIA,OAAO,EAAe,KAAK,qBAAqB,EAAE,MAAM,4BAA4B,CAAA;AACpF,OAAO,KAAK,WAAW,MAAM,oCAAoC,CAAA;AACjE,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAA;AAC3C,OAAO,KAAK,GAAG,MAAM,gBAAgB,CAAA;AACrC,OAAO,KAAK,KAAK,KAAK,MAAM,kBAAkB,CAAA;AAK9C,OAAO,EAAE,WAAW,EAAiB,MAAM,kBAAkB,CAAA;AAG7D,MAAM,WAAW,UAAU,CAAC,CAAC,CAAE,SAAQ,WAAW,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;IACtE,QAAQ,CAAC,EAAE,EAAE,WAAW,CAAC,WAAW,CAAC,CAAC,CAAC,CAAA;IAEvC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,CAAA;IAC5C,QAAQ,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,CAAA;IACtD,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,KAAK,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,CAAA;IACnE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,CAAA;CAChD;AAED,wBAAgB,OAAO,CAAC,CAAC,EACvB,OAAO,EAAE,MAAM,CAAC,EAChB,EAAE,GAAE,WAAW,CAAC,WAAW,CAAC,CAAC,CAAU,GACtC,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,CAE5C;AAED,yBAAiB,UAAU,CAAC;IAC1B,KAAY,OAAO,CAAC,CAAC,IAAI,CAAC,SAAS,UAAU,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,CAAA;IAElE,SAAgB,UAAU,CAAC,CAAC,EAC1B,OAAO,EAAE,MAAM,CAAC,EAChB,EAAE,GAAE,WAAW,CAAC,WAAW,CAAC,CAAC,CAAU,GACtC,UAAU,CAAC,CAAC,CAAC,CA6Cf;IAED,SAAgB,KAAK,CAAC,QAAQ,SAAS,qBAAqB,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,EAC3E,GAAG,QAAQ,EAAE,QAAQ,GACpB,MAAM,CAAC,MAAM,CACd,KAAK,CAAC,KAAK,EACX,KAAK,EACL,UAAU,CAAC;QAAE,QAAQ,EAAE,CAAC,IAAI,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;KAAE,CAAC,CACrE,CA0DA;CAkBF;AAED,wBAAgB,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,OAAO,GAAG,CAAC,IAAI,UAAU,CAAC,CAAC,CAAC,CAE9D"}
@@ -28,9 +28,12 @@ const Equal_1 = require("@effect/data/Equal");
28
28
  const Function_1 = require("@effect/data/Function");
29
29
  const MutableRef = __importStar(require("@effect/data/MutableRef"));
30
30
  const Option = __importStar(require("@effect/data/Option"));
31
+ const ReadonlyArray_1 = require("@effect/data/ReadonlyArray");
32
+ const Equivalence = __importStar(require("@effect/data/typeclass/Equivalence"));
31
33
  const Effect = __importStar(require("@effect/io/Effect"));
32
34
  const Ref = __importStar(require("@effect/io/Ref"));
33
35
  const Fx_js_1 = require("../Fx.js");
36
+ const observe_js_1 = require("../run/observe.js");
34
37
  const HoldSubject_js_1 = require("./HoldSubject.js");
35
38
  const Subject_js_1 = require("./Subject.js");
36
39
  function makeRef(initial, eq = Equal_1.equals) {
@@ -40,18 +43,14 @@ exports.makeRef = makeRef;
40
43
  var RefSubject;
41
44
  (function (RefSubject) {
42
45
  function unsafeMake(initial, eq = Equal_1.equals) {
43
- const mutableRef = MutableRef.make(Option.some(initial()));
44
- const subject = HoldSubject_js_1.HoldSubject.unsafeMake(mutableRef);
45
- const getValue = () => (0, Function_1.pipe)(mutableRef.get(), Option.getOrElse(() => {
46
- const a = initial();
47
- mutableRef.set(Option.some(a));
48
- return a;
49
- }));
46
+ const current = MutableRef.make(Option.some(initial()));
47
+ const subject = HoldSubject_js_1.HoldSubject.unsafeMake(current);
48
+ const getValue = () => (0, Function_1.pipe)(current.get(), Option.getOrElse(initial));
50
49
  const modify = (f) => Effect.suspendSucceed(() => {
51
- const current = getValue();
52
- const [b, a] = f(current);
53
- mutableRef.set(Option.some(a));
54
- if (eq(current, a)) {
50
+ const currentValue = getValue();
51
+ const [b, a] = f(currentValue);
52
+ current.set(Option.some(a));
53
+ if (eq(currentValue, a)) {
55
54
  return Effect.succeed(b);
56
55
  }
57
56
  return (0, Function_1.pipe)(subject.event(a), Effect.as(b));
@@ -68,26 +67,71 @@ var RefSubject;
68
67
  error: subject.error.bind(subject),
69
68
  end: subject.end,
70
69
  value: subject.value,
70
+ eq,
71
71
  modify,
72
- get get() {
73
- return Ref.get(refSubject);
74
- },
75
- set(a) {
76
- return Ref.updateAndGet(() => a)(refSubject);
77
- },
78
- update(f) {
79
- return Ref.updateAndGet(f)(refSubject);
80
- },
72
+ ...makeDerivations(modify),
81
73
  delete: Effect.sync(() => {
82
- const option = mutableRef.get();
83
- // Next pull should recompute the initial value
84
- mutableRef.set(Option.none());
85
- return option;
74
+ const option = current.get();
75
+ const reset = initial();
76
+ current.set(Option.some(reset));
77
+ return Option.getOrElse(option, () => reset);
86
78
  }),
87
79
  };
88
80
  return refSubject;
89
81
  }
90
82
  RefSubject.unsafeMake = unsafeMake;
83
+ function tuple(...subjects) {
84
+ const length = subjects.length;
85
+ const getCurrent = Effect.tuple(...(0, ReadonlyArray_1.mapNonEmpty)(subjects, (s) => s.get));
86
+ const eq = Equivalence.tuple(...(0, ReadonlyArray_1.mapNonEmpty)(subjects, (s) => s.eq));
87
+ return Effect.gen(function* ($) {
88
+ const initial = yield* $(getCurrent);
89
+ const refSubject = unsafeMake(() => initial, eq);
90
+ const updateAtIndex = (i) => (a) => Effect.gen(function* ($) {
91
+ const current = yield* $(getCurrent);
92
+ const next = current.slice();
93
+ next[i] = a;
94
+ yield* $(refSubject.set(next));
95
+ });
96
+ // Override event to replicate events into underlying subjects
97
+ const event = (val) => Effect.tuple(...(0, ReadonlyArray_1.mapNonEmpty)(subjects, (s, i) => s.event(val[i])));
98
+ // Override modify to replicate events into underlying subjects
99
+ const modify = (f) => Effect.gen(function* ($) {
100
+ const current = yield* $(getCurrent);
101
+ const [b, a] = f(current);
102
+ if (!eq(current, a)) {
103
+ // Will update this RefSubject using observe below
104
+ yield* $(event(a));
105
+ }
106
+ return b;
107
+ });
108
+ // Listen to changes to each subject and update the derived subject
109
+ for (let i = 0; i < length; i++) {
110
+ yield* $((0, observe_js_1.observe)(updateAtIndex(i))(subjects[i]));
111
+ }
112
+ return {
113
+ ...refSubject,
114
+ event,
115
+ modify,
116
+ ...makeDerivations(modify),
117
+ };
118
+ });
119
+ }
120
+ RefSubject.tuple = tuple;
121
+ const makeDerivations = (modify) => {
122
+ return {
123
+ get: modify((a) => [a, a]),
124
+ set(a) {
125
+ return modify(() => [a, a]);
126
+ },
127
+ update(f) {
128
+ return modify((a) => {
129
+ const a2 = f(a);
130
+ return [a2, a2];
131
+ });
132
+ },
133
+ };
134
+ };
91
135
  })(RefSubject = exports.RefSubject || (exports.RefSubject = {}));
92
136
  function isRefSubject(u) {
93
137
  return (0, HoldSubject_js_1.isHoldSubject)(u) && Ref.RefTypeId in u;
@@ -1 +1 @@
1
- {"version":3,"file":"RefSubject.js","sourceRoot":"","sources":["../../../src/Subject/RefSubject.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"RefSubject.js","sourceRoot":"","sources":["../../../src/Subject/RefSubject.ts"],"names":[],"mappings":"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"}