@shivaedev/contract 0.40.0 → 0.42.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 (98) hide show
  1. package/CHANGELOG.md +26 -0
  2. package/README.md +12 -6
  3. package/dist/AutomaticQueryOptions.d.ts +22 -0
  4. package/dist/AutomaticQueryOptions.d.ts.map +1 -0
  5. package/dist/AutomaticQueryOptions.js +2 -0
  6. package/dist/AutomaticQueryOptions.js.map +1 -0
  7. package/dist/adapters/activityState.d.ts.map +1 -1
  8. package/dist/adapters/activityState.js +9 -1
  9. package/dist/adapters/activityState.js.map +1 -1
  10. package/dist/adapters/retainedQueries.d.ts +7 -0
  11. package/dist/adapters/retainedQueries.d.ts.map +1 -0
  12. package/dist/adapters/retainedQueries.js +45 -0
  13. package/dist/adapters/retainedQueries.js.map +1 -0
  14. package/dist/automaticLive.d.ts +1 -1
  15. package/dist/automaticLive.d.ts.map +1 -1
  16. package/dist/automaticLive.js +9 -7
  17. package/dist/automaticLive.js.map +1 -1
  18. package/dist/automaticQuery.d.ts +3 -17
  19. package/dist/automaticQuery.d.ts.map +1 -1
  20. package/dist/automaticQuery.js +12 -7
  21. package/dist/automaticQuery.js.map +1 -1
  22. package/dist/bind.d.ts +1 -2
  23. package/dist/bind.d.ts.map +1 -1
  24. package/dist/bind.js +8 -12
  25. package/dist/bind.js.map +1 -1
  26. package/dist/bindOperations.d.ts +6 -0
  27. package/dist/bindOperations.d.ts.map +1 -0
  28. package/dist/bindOperations.js +10 -0
  29. package/dist/bindOperations.js.map +1 -0
  30. package/dist/changesSuccess.d.ts +2 -3
  31. package/dist/changesSuccess.d.ts.map +1 -1
  32. package/dist/changesSuccess.js +2 -4
  33. package/dist/changesSuccess.js.map +1 -1
  34. package/dist/clientActivities.d.ts +2 -2
  35. package/dist/clientActivities.d.ts.map +1 -1
  36. package/dist/clientActivities.js +28 -12
  37. package/dist/clientActivities.js.map +1 -1
  38. package/dist/clientActivity.d.ts +4 -1
  39. package/dist/clientActivity.d.ts.map +1 -1
  40. package/dist/clientActivity.js +5 -2
  41. package/dist/clientActivity.js.map +1 -1
  42. package/dist/clientOperations.d.ts +1 -1
  43. package/dist/clientOperations.d.ts.map +1 -1
  44. package/dist/clientOperations.js +54 -51
  45. package/dist/clientOperations.js.map +1 -1
  46. package/dist/compareQueries.d.ts +1 -1
  47. package/dist/compareQueries.d.ts.map +1 -1
  48. package/dist/compareQueries.js +10 -4
  49. package/dist/compareQueries.js.map +1 -1
  50. package/dist/live-server/subscribe.js +1 -1
  51. package/dist/live-server/subscribe.js.map +1 -1
  52. package/dist/liveAttempt.d.ts.map +1 -1
  53. package/dist/liveAttempt.js +8 -2
  54. package/dist/liveAttempt.js.map +1 -1
  55. package/dist/publicConfig.d.ts +6 -1
  56. package/dist/publicConfig.d.ts.map +1 -1
  57. package/dist/queryDelivery.d.ts +3 -1
  58. package/dist/queryDelivery.d.ts.map +1 -1
  59. package/dist/queryDelivery.js +18 -5
  60. package/dist/queryDelivery.js.map +1 -1
  61. package/dist/queryHints.js +1 -1
  62. package/dist/queryHints.js.map +1 -1
  63. package/dist/queryRetention.d.ts +8 -0
  64. package/dist/queryRetention.d.ts.map +1 -0
  65. package/dist/queryRetention.js +3 -0
  66. package/dist/queryRetention.js.map +1 -0
  67. package/dist/querySignals.d.ts +1 -0
  68. package/dist/querySignals.d.ts.map +1 -1
  69. package/dist/querySignals.js.map +1 -1
  70. package/dist/retainQuery.d.ts +4 -0
  71. package/dist/retainQuery.d.ts.map +1 -0
  72. package/dist/retainQuery.js +38 -0
  73. package/dist/retainQuery.js.map +1 -0
  74. package/dist/rpcClient.d.ts +1 -1
  75. package/dist/rpcClient.d.ts.map +1 -1
  76. package/dist/rpcClient.js +4 -2
  77. package/dist/rpcClient.js.map +1 -1
  78. package/package.json +8 -8
  79. package/src/AutomaticQueryOptions.ts +22 -0
  80. package/src/adapters/activityState.ts +9 -1
  81. package/src/adapters/retainedQueries.ts +47 -0
  82. package/src/automaticLive.ts +11 -7
  83. package/src/automaticQuery.ts +16 -21
  84. package/src/bind.ts +16 -22
  85. package/src/bindOperations.ts +20 -0
  86. package/src/changesSuccess.ts +11 -14
  87. package/src/clientActivities.ts +29 -12
  88. package/src/clientActivity.ts +8 -2
  89. package/src/clientOperations.ts +79 -82
  90. package/src/compareQueries.ts +10 -4
  91. package/src/live-server/subscribe.ts +1 -1
  92. package/src/liveAttempt.ts +10 -2
  93. package/src/queryDelivery.ts +22 -5
  94. package/src/queryHints.ts +1 -1
  95. package/src/queryRetention.ts +9 -0
  96. package/src/querySignals.ts +1 -0
  97. package/src/retainQuery.ts +39 -0
  98. package/src/rpcClient.ts +6 -2
@@ -6,13 +6,12 @@ export declare const QueryUnchanged: Schema.Struct<{
6
6
  readonly _tag: Schema.Literal<"Unchanged">;
7
7
  readonly queryIndex: Schema.Number;
8
8
  }>;
9
- type Rerun<TQuery extends QueryShape> = TQuery extends QueryShape ? ("rerun-and-compare" extends TQuery["live"] ? TQuery : never) : never;
10
9
  type ResultSchema<TQuery extends QueryShape> = TQuery extends QueryShape ? Schema.Struct<{
11
10
  _tag: Schema.Literal<"Result">;
12
11
  query: Schema.Literal<TQuery["name"]>;
13
12
  queryIndex: Schema.Number;
14
13
  value: TQuery["success"];
15
- }> | typeof QueryUnchanged : never;
16
- export declare function changesSuccess<const TQueries extends readonly QueryShape[]>(queries: TQueries): Schema.Union<readonly [typeof LiveHint, typeof QueryReadDenied, ...ResultSchema<Rerun<TQueries[number]>>[]]>;
14
+ }> | ("rerun-and-compare" extends TQuery["live"] ? typeof QueryUnchanged : never) : never;
15
+ export declare function changesSuccess<const TQueries extends readonly QueryShape[]>(queries: TQueries): Schema.Union<readonly [typeof LiveHint, typeof QueryReadDenied, ...ResultSchema<TQueries[number]>[]]>;
17
16
  export {};
18
17
  //# sourceMappingURL=changesSuccess.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"changesSuccess.d.ts","sourceRoot":"","sources":["../src/changesSuccess.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AACpC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,eAAO,MAAM,cAAc;;;EAAkF,CAAC;AAE9G,KAAK,KAAK,CAAC,MAAM,SAAS,UAAU,IAAI,MAAM,SAAS,UAAU,GAAG,CAAC,mBAAmB,SAAS,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,GAAG,KAAK,CAAC,GAAG,KAAK,CAAC;AAC1I,KAAK,YAAY,CAAC,MAAM,SAAS,UAAU,IAAI,MAAM,SAAS,UAAU,GAEnE,MAAM,CAAC,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC/B,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;IACtC,UAAU,EAAE,MAAM,CAAC,MAAM,CAAC;IAC1B,KAAK,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC;CACxB,CAAC,GACF,OAAO,cAAc,GACvB,KAAK,CAAC;AAET,wBAAgB,cAAc,CAAC,KAAK,CAAC,QAAQ,SAAS,SAAS,UAAU,EAAE,EAC1E,OAAO,EAAE,QAAQ,GACf,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,OAAO,QAAQ,EAAE,OAAO,eAAe,EAAE,GAAG,YAAY,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"changesSuccess.d.ts","sourceRoot":"","sources":["../src/changesSuccess.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AACpC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,eAAO,MAAM,cAAc;;;EAAkF,CAAC;AAE9G,KAAK,YAAY,CAAC,MAAM,SAAS,UAAU,IAAI,MAAM,SAAS,UAAU,GAEnE,MAAM,CAAC,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC/B,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;IACtC,UAAU,EAAE,MAAM,CAAC,MAAM,CAAC;IAC1B,KAAK,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC;CACxB,CAAC,GACF,CAAC,mBAAmB,SAAS,MAAM,CAAC,MAAM,CAAC,GAAG,OAAO,cAAc,GAAG,KAAK,CAAC,GAC9E,KAAK,CAAC;AAET,wBAAgB,cAAc,CAAC,KAAK,CAAC,QAAQ,SAAS,SAAS,UAAU,EAAE,EAC1E,OAAO,EAAE,QAAQ,GACf,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,OAAO,QAAQ,EAAE,OAAO,eAAe,EAAE,GAAG,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC"}
@@ -6,10 +6,8 @@ export function changesSuccess(queries) {
6
6
  return Schema.Union([
7
7
  LiveHint,
8
8
  QueryReadDenied,
9
- ...queries
10
- .filter((query) => query.live === "rerun-and-compare")
11
- .flatMap((query) => [
12
- QueryUnchanged,
9
+ ...queries.flatMap((query) => [
10
+ ...(query.live === "rerun-and-compare" ? [QueryUnchanged] : []),
13
11
  Schema.Struct({
14
12
  _tag: Schema.Literal("Result"),
15
13
  query: Schema.Literal(query.name),
@@ -1 +1 @@
1
- {"version":3,"file":"changesSuccess.js","sourceRoot":"","sources":["../src/changesSuccess.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAEpC,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,MAAM,CAAC,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;AAiB9G,MAAM,UAAU,cAAc,CAAC,OAA8B;IAC5D,OAAO,MAAM,CAAC,KAAK,CAAC;QACnB,QAAQ;QACR,eAAe;QACf,GAAG,OAAO;aACR,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,mBAAmB,CAAC;aACrD,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC;YACnB,cAAc;YACd,MAAM,CAAC,MAAM,CAAC;gBACb,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC;gBAC9B,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC;gBACjC,UAAU,EAAE,MAAM,CAAC,MAAM;gBACzB,KAAK,EAAE,KAAK,CAAC,OAAO;aACpB,CAAC;SACF,CAAC;KACH,CAAC,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"changesSuccess.js","sourceRoot":"","sources":["../src/changesSuccess.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAEpC,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,MAAM,CAAC,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;AAgB9G,MAAM,UAAU,cAAc,CAAC,OAA8B;IAC5D,OAAO,MAAM,CAAC,KAAK,CAAC;QACnB,QAAQ;QACR,eAAe;QACf,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC;YAC7B,GAAG,CAAC,KAAK,CAAC,IAAI,KAAK,mBAAmB,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YAC/D,MAAM,CAAC,MAAM,CAAC;gBACb,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC;gBAC9B,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC;gBACjC,UAAU,EAAE,MAAM,CAAC,MAAM;gBACzB,KAAK,EAAE,KAAK,CAAC,OAAO;aACpB,CAAC;SACF,CAAC;KACF,CAAC,CAAC;AACJ,CAAC"}
@@ -11,7 +11,7 @@ export declare const clientActivities: WeakMap<object, {
11
11
  hold: <A, E, R>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A, E, R>;
12
12
  queued: () => () => void;
13
13
  statuses: Atom.Writable<ReadonlyMap<object, import("./live.ts").LiveStatus<unknown>>, ReadonlyMap<object, import("./live.ts").LiveStatus<unknown>>>;
14
- track: <A, E, R>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A, E, R>;
14
+ track: <A, E, R>(effect: Effect.Effect<A, E, R>, command?: boolean) => Effect.Effect<A, E, R>;
15
15
  watch: <A, E>(atom: Atom.Atom<AsyncResult.AsyncResult<A, E>>) => Atom.Atom<AsyncResult.AsyncResult<A, E>>;
16
16
  }>;
17
17
  export declare function makeActivity(factory: Atom.RuntimeFactory): {
@@ -24,7 +24,7 @@ export declare function makeActivity(factory: Atom.RuntimeFactory): {
24
24
  hold: <A, E, R>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A, E, R>;
25
25
  queued: () => () => void;
26
26
  statuses: Atom.Writable<ReadonlyMap<object, import("./live.ts").LiveStatus<unknown>>, ReadonlyMap<object, import("./live.ts").LiveStatus<unknown>>>;
27
- track: <A, E, R>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A, E, R>;
27
+ track: <A, E, R>(effect: Effect.Effect<A, E, R>, command?: boolean) => Effect.Effect<A, E, R>;
28
28
  watch: <A, E>(atom: Atom.Atom<AsyncResult.AsyncResult<A, E>>) => Atom.Atom<AsyncResult.AsyncResult<A, E>>;
29
29
  };
30
30
  //# sourceMappingURL=clientActivities.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"clientActivities.d.ts","sourceRoot":"","sources":["../src/clientActivities.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,KAAK,WAAW,MAAM,+BAA+B,CAAC;AAC7D,OAAO,KAAK,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAOpD,eAAO,MAAM,gBAAgB;;;;;;;WA0DpB,CAAC,EAAE,CAAC,EAAE,CAAC,UAAU,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;;;YAjDhC,CAAC,EAAE,CAAC,EAAE,CAAC,UAAU,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;YAOvC,CAAC,EAAE,CAAC,QAAQ,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;EAhBE,CAAC;AAEvE,wBAAgB,YAAY,CAAC,OAAO,EAAE,IAAI,CAAC,cAAc;;;;;;;WAwDhD,CAAC,EAAE,CAAC,EAAE,CAAC,UAAU,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;;;YAjDhC,CAAC,EAAE,CAAC,EAAE,CAAC,UAAU,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;YAOvC,CAAC,EAAE,CAAC,QAAQ,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;EAuDnE"}
1
+ {"version":3,"file":"clientActivities.d.ts","sourceRoot":"","sources":["../src/clientActivities.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,KAAK,WAAW,MAAM,+BAA+B,CAAC;AAC7D,OAAO,KAAK,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAOpD,eAAO,MAAM,gBAAgB;;;;;;;WA0EpB,CAAC,EAAE,CAAC,EAAE,CAAC,UAAU,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;;;YAjEhC,CAAC,EAAE,CAAC,EAAE,CAAC,UAAU,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;YAwBvC,CAAC,EAAE,CAAC,QAAQ,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;EAjCE,CAAC;AAEvE,wBAAgB,YAAY,CAAC,OAAO,EAAE,IAAI,CAAC,cAAc;;;;;;;WAwEhD,CAAC,EAAE,CAAC,EAAE,CAAC,UAAU,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;;;YAjEhC,CAAC,EAAE,CAAC,EAAE,CAAC,UAAU,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;YAwBvC,CAAC,EAAE,CAAC,QAAQ,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;EAuDnE"}
@@ -12,32 +12,48 @@ export function makeActivity(factory) {
12
12
  change(key, 1);
13
13
  return () => change(key, -1);
14
14
  }
15
- function track(effect) {
16
- return Effect.acquireUseRelease(Effect.sync(() => begin("rpcCalls")), () => effect, (end) => Effect.sync(end));
15
+ function track(effect, command = false) {
16
+ return Effect.acquireUseRelease(Effect.sync(() => {
17
+ const endCall = begin("rpcCalls");
18
+ const endCommand = command ? begin("commands") : undefined;
19
+ return () => {
20
+ endCall();
21
+ endCommand?.();
22
+ };
23
+ }), () => effect, (end) => Effect.sync(end));
24
+ }
25
+ function counter(key) {
26
+ let pending = false;
27
+ function set(next) {
28
+ if (pending !== next) {
29
+ pending = next;
30
+ change(key, next ? 1 : -1);
31
+ }
32
+ }
33
+ return { release: () => set(false), set };
17
34
  }
18
35
  function watch(atom) {
19
36
  const watched = wrapAtom(atom, (get) => {
20
37
  get.mount(connection.status);
21
38
  get.once(queryCoalesceWindow(watched));
22
39
  get.subscribe(queryCoalesceWindow(watched), (duration) => get.set(queryCoalesceWindow(atom), duration), { immediate: true });
23
- let busy = false;
40
+ const refreshing = counter("refreshingAtoms");
41
+ const initial = counter("initialQueries");
42
+ let received = false;
24
43
  let active = true;
25
44
  let published = false;
26
45
  function observe(result) {
27
46
  if (!active) {
28
47
  return;
29
48
  }
30
- const next = result.waiting || AsyncResult.isInitial(result);
31
- if (busy !== next) {
32
- busy = next;
33
- change("refreshingAtoms", next ? 1 : -1);
34
- }
49
+ received ||= !AsyncResult.isInitial(result);
50
+ initial.set(!received);
51
+ refreshing.set(result.waiting || AsyncResult.isInitial(result));
35
52
  }
36
53
  get.addFinalizer(() => {
37
54
  active = false;
38
- if (busy) {
39
- change("refreshingAtoms", -1);
40
- }
55
+ refreshing.release();
56
+ initial.release();
41
57
  });
42
58
  function publish(result) {
43
59
  published = true;
@@ -57,7 +73,7 @@ export function makeActivity(factory) {
57
73
  return {
58
74
  activity: Object.assign(activity, { connectionStatus: connection.status }),
59
75
  hint: () => change("liveHints", 1),
60
- hold: (effect) => track(Effect.acquireUseRelease(Effect.sync(hold), () => effect, (end) => Effect.sync(end))),
76
+ hold: (effect) => track(Effect.acquireUseRelease(Effect.sync(hold), () => effect, (end) => Effect.sync(end)), true),
61
77
  queued: () => begin("liveInvalidations"),
62
78
  statuses: connection.statuses,
63
79
  track,
@@ -1 +1 @@
1
- {"version":3,"file":"clientActivities.js","sourceRoot":"","sources":["../src/clientActivities.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"clientActivities.js","sourceRoot":"","sources":["../src/clientActivities.ts"],"names":[],"mappings":"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"}
@@ -2,7 +2,9 @@ import { Effect, Stream } from "effect";
2
2
  import type * as Atom from "effect/reactivity/Atom";
3
3
  export type ConnectionStatus = "live" | "reconnecting" | "waiting-for-connection";
4
4
  export interface ClientActivityState {
5
+ readonly commands: number;
5
6
  readonly connectionStatus: ConnectionStatus;
7
+ readonly initialQueries: number;
6
8
  readonly liveHints: number;
7
9
  readonly liveInvalidations: number;
8
10
  readonly refreshingAtoms: number;
@@ -18,7 +20,8 @@ export interface ActiveClient {
18
20
  }
19
21
  export declare function clientActivity(client: ActiveClient): ClientActivity;
20
22
  export declare function isClientIdle(state: ClientActivityState): boolean;
21
- export declare function activityScreenSignal(activity: ClientActivity): Stream.Stream<{
23
+ export declare function isClientSettled(state: ClientActivityState): boolean;
24
+ export declare function activityScreenSignal(activity: ClientActivity, settled?: typeof isClientSettled): Stream.Stream<{
22
25
  connectionStatus: ConnectionStatus;
23
26
  hints: number;
24
27
  pending: boolean;
@@ -1 +1 @@
1
- {"version":3,"file":"clientActivity.d.ts","sourceRoot":"","sources":["../src/clientActivity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,KAAK,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAEpD,MAAM,MAAM,gBAAgB,GAAG,MAAM,GAAG,cAAc,GAAG,wBAAwB,CAAC;AAElF,MAAM,WAAW,mBAAmB;IACnC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAC5C,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,iBAAiB,EAAE,MAAM,CAAC;IACnC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,CAAC,mBAAmB,CAAC,GAAG;IACjE,QAAQ,CAAC,gBAAgB,EAAE,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;IACvD,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC;CACrD,CAAC;AAEF,eAAO,MAAM,QAAQ,eAAmD,CAAC;AAEzE,MAAM,WAAW,YAAY;IAC5B,QAAQ,CAAC,CAAC,QAAQ,CAAC,EAAE,cAAc,CAAC;CACpC;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,YAAY,GAAG,cAAc,CAEnE;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE,mBAAmB,GAAG,OAAO,CAEhE;AAED,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,cAAc;;;;;;;;;;EAK5D"}
1
+ {"version":3,"file":"clientActivity.d.ts","sourceRoot":"","sources":["../src/clientActivity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,KAAK,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAEpD,MAAM,MAAM,gBAAgB,GAAG,MAAM,GAAG,cAAc,GAAG,wBAAwB,CAAC;AAElF,MAAM,WAAW,mBAAmB;IACnC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAC5C,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,iBAAiB,EAAE,MAAM,CAAC;IACnC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,CAAC,mBAAmB,CAAC,GAAG;IACjE,QAAQ,CAAC,gBAAgB,EAAE,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;IACvD,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC;CACrD,CAAC;AAEF,eAAO,MAAM,QAAQ,eAAmD,CAAC;AAEzE,MAAM,WAAW,YAAY;IAC5B,QAAQ,CAAC,CAAC,QAAQ,CAAC,EAAE,cAAc,CAAC;CACpC;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,YAAY,GAAG,cAAc,CAEnE;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE,mBAAmB,GAAG,OAAO,CAEhE;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,mBAAmB,GAAG,OAAO,CAEnE;AAED,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,cAAc,EAAE,OAAO,yBAAkB;;;;;;;;;;EAKvF"}
@@ -6,9 +6,12 @@ export function clientActivity(client) {
6
6
  export function isClientIdle(state) {
7
7
  return state.rpcCalls === 0 && state.liveInvalidations === 0 && state.refreshingAtoms === 0;
8
8
  }
9
- export function activityScreenSignal(activity) {
9
+ export function isClientSettled(state) {
10
+ return state.commands === 0 && state.initialQueries === 0;
11
+ }
12
+ export function activityScreenSignal(activity, settled = isClientSettled) {
10
13
  function screenState(state) {
11
- return { connectionStatus: state.connectionStatus, hints: state.liveHints, pending: !isClientIdle(state) };
14
+ return { connectionStatus: state.connectionStatus, hints: state.liveHints, pending: !settled(state) };
12
15
  }
13
16
  return Object.assign(Stream.map(activity, screenState), { current: Effect.map(activity.current, screenState) });
14
17
  }
@@ -1 +1 @@
1
- {"version":3,"file":"clientActivity.js","sourceRoot":"","sources":["../src/clientActivity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAkBxC,MAAM,CAAC,MAAM,QAAQ,GAAG,MAAM,CAAC,GAAG,CAAC,oCAAoC,CAAC,CAAC;AAMzE,MAAM,UAAU,cAAc,CAAC,MAAoB;IAClD,OAAO,MAAM,CAAC,QAAQ,CAAC,CAAC;AACzB,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,KAA0B;IACtD,OAAO,KAAK,CAAC,QAAQ,KAAK,CAAC,IAAI,KAAK,CAAC,iBAAiB,KAAK,CAAC,IAAI,KAAK,CAAC,eAAe,KAAK,CAAC,CAAC;AAC7F,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,QAAwB;IAC5D,SAAS,WAAW,CAAC,KAA0B;QAC9C,OAAO,EAAE,gBAAgB,EAAE,KAAK,CAAC,gBAAgB,EAAE,KAAK,EAAE,KAAK,CAAC,SAAS,EAAE,OAAO,EAAE,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC;IAC5G,CAAC;IACD,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,WAAW,CAAC,EAAE,EAAE,OAAO,EAAE,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,OAAO,EAAE,WAAW,CAAC,EAAE,CAAC,CAAC;AACjH,CAAC"}
1
+ {"version":3,"file":"clientActivity.js","sourceRoot":"","sources":["../src/clientActivity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAoBxC,MAAM,CAAC,MAAM,QAAQ,GAAG,MAAM,CAAC,GAAG,CAAC,oCAAoC,CAAC,CAAC;AAMzE,MAAM,UAAU,cAAc,CAAC,MAAoB;IAClD,OAAO,MAAM,CAAC,QAAQ,CAAC,CAAC;AACzB,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,KAA0B;IACtD,OAAO,KAAK,CAAC,QAAQ,KAAK,CAAC,IAAI,KAAK,CAAC,iBAAiB,KAAK,CAAC,IAAI,KAAK,CAAC,eAAe,KAAK,CAAC,CAAC;AAC7F,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,KAA0B;IACzD,OAAO,KAAK,CAAC,QAAQ,KAAK,CAAC,IAAI,KAAK,CAAC,cAAc,KAAK,CAAC,CAAC;AAC3D,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,QAAwB,EAAE,OAAO,GAAG,eAAe;IACvF,SAAS,WAAW,CAAC,KAA0B;QAC9C,OAAO,EAAE,gBAAgB,EAAE,KAAK,CAAC,gBAAgB,EAAE,KAAK,EAAE,KAAK,CAAC,SAAS,EAAE,OAAO,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;IACvG,CAAC;IACD,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,WAAW,CAAC,EAAE,EAAE,OAAO,EAAE,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,OAAO,EAAE,WAAW,CAAC,EAAE,CAAC,CAAC;AACjH,CAAC"}
@@ -11,7 +11,7 @@ export declare function clientOperations(service: AtomRpc.AtomRpcClient<unknown,
11
11
  run: (payload: unknown) => Effect.Effect<unknown, unknown, unknown>;
12
12
  };
13
13
  query: (tag: string, query: QueryShape) => {
14
- query: (payload: unknown, options?: QueryOptions) => Atom.Atom<import("effect/reactivity/AsyncResult").AsyncResult<unknown, unknown>>;
14
+ query: (payload: unknown, options?: QueryOptions) => Atom.Atom<import("effect/reactivity/AsyncResult").AsyncResult<any, any> | import("effect/reactivity/AsyncResult").AsyncResult<unknown, unknown>>;
15
15
  run: (payload: unknown) => Effect.Effect<unknown, unknown, unknown>;
16
16
  };
17
17
  stream: (tag: string) => {
@@ -1 +1 @@
1
- {"version":3,"file":"clientOperations.d.ts","sourceRoot":"","sources":["../src/clientOperations.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAkB,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxD,OAAO,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAE/C,OAAO,KAAK,KAAK,OAAO,MAAM,2BAA2B,CAAC;AAE1D,OAAO,KAAK,EAAE,GAAG,EAAa,MAAM,YAAY,CAAC;AAEjD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAE9D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAK7C,OAAO,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AA2F9D,wBAAgB,gBAAgB,CAC/B,OAAO,EAAE,OAAO,CAAC,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,GAAG,CAAC,EACxD,SAAS,EAAE,UAAU,CAAC,OAAO,aAAa,CAAC,EAC3C,KAAK,CAAC,EAAE,YAAY;IAGnB,OAAO,QAAQ,MAAM,WAAW,YAAY;uBAnC7B,OAAO;;IAoCtB,KAAK,QAAQ,MAAM,SAAS,UAAU;yBA9ErB,OAAO,YAAW,YAAY;uBAwBhC,OAAO;;IAuDtB,MAAM,QAAQ,MAAM;uBApBL,OAAO;;EAsBvB"}
1
+ {"version":3,"file":"clientOperations.d.ts","sourceRoot":"","sources":["../src/clientOperations.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAkB,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxD,OAAO,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAE/C,OAAO,KAAK,KAAK,OAAO,MAAM,2BAA2B,CAAC;AAE1D,OAAO,KAAK,EAAE,GAAG,EAAa,MAAM,YAAY,CAAC;AAEjD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAE9D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAK7C,OAAO,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAY9D,wBAAgB,gBAAgB,CAC/B,OAAO,EAAE,OAAO,CAAC,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,GAAG,CAAC,EACxD,SAAS,EAAE,UAAU,CAAC,OAAO,aAAa,CAAC,EAC3C,KAAK,CAAC,EAAE,YAAY;IA+EnB,OAAO,QAAQ,MAAM,WAAW,YAAY;uBA5B5B,OAAO;;IA6BvB,KAAK,QAAQ,MAAM,SAAS,UAAU;yBApEpB,OAAO,YAAW,YAAY;uBA0BhC,OAAO;;IA2CvB,MAAM,QAAQ,MAAM;uBAfJ,OAAO;;EAiBxB"}
@@ -9,59 +9,62 @@ import { commandPayload } from "#commandPayload.ts";
9
9
  import { waitForConnection } from "#connectionReadiness.ts";
10
10
  import { queryReactivity } from "#queryReactivity.ts";
11
11
  import { shareQuerySignals } from "#querySignals.ts";
12
- function run(service, effect, owner) {
13
- return owner === undefined ? effect : Effect.suspend(() => AtomRegistry.getResult(owner.registry, service.runtime.atom(effect)));
14
- }
15
- function boundQuery(service, tag, query, automatic, owner) {
16
- const reactive = queryReactivity(service.runtime, clientActivities.get(service)?.queued);
17
- const cached = new WeakMap();
18
- return {
19
- query: (payload, options = {}) => {
20
- const atom = service.query(tag, payload, options);
21
- const existing = cached.get(atom);
22
- if (existing !== undefined) {
23
- return existing;
24
- }
25
- const local = query.reads(payload, Option.none());
26
- const keys = [...local, { _tag: "List", collection: `@query/${tag}/${clientId()}` }];
27
- const dependencies = local.length === 0 ? [...keys, { _tag: "List", collection: `@query/${tag.slice(0, tag.lastIndexOf("."))}` }] : keys;
28
- const reference = { payload, query: query.name };
29
- const result = automatic.query(reactive(atom, clientReadKeys(dependencies, owner?.context), owner?.registry), reference, keys, Schema.toEquivalence(query.success), query.live === "rerun-and-compare" ? Schema.decodeUnknownSync(Schema.toType(query.success)) : undefined, options.headers);
30
- const tracked = clientActivities.get(service)?.watch(result) ?? result;
31
- shareQuerySignals(tracked, result);
32
- cached.set(atom, tracked);
33
- return tracked;
34
- },
35
- run: (payload) => run(service, service.use((client) => client(tag, payload)), owner),
36
- };
37
- }
38
- function boundCommand(service, tag, command, owner) {
39
- function invalidate(payload, result) {
40
- const keys = [
41
- ...command.invalidates(payload, result),
42
- { _tag: "List", collection: `@query/${tag.slice(0, tag.lastIndexOf("."))}` },
43
- ];
44
- return Reactivity.invalidate(clientInvalidationKeys(keys, owner?.context));
45
- }
46
- return {
47
- run: (payload) => run(service, service.use((client) => commandPayload(command, payload).pipe(Effect.tap(() => waitForConnection(client)), Effect.flatMap((validated) => client(tag, validated)), Effect.tap((result) => invalidate(payload, result)))), owner),
48
- };
49
- }
50
- function boundStream(service, tag, owner) {
51
- return {
52
- run: (payload) => {
53
- const stream = Stream.unwrap(service.use((client) => Effect.succeed(client(tag, payload))));
54
- return owner === undefined
55
- ? stream
56
- : Stream.callback((queue) => AtomRegistry.getResult(owner.registry, service.runtime.atom(Stream.runIntoQueue(stream, queue)).pipe(Atom.setIdleTTL(0))), { bufferSize: 1 });
57
- },
58
- };
59
- }
12
+ import { retainQuery } from "#retainQuery.ts";
60
13
  export function clientOperations(service, automatic, owner) {
14
+ const ordinaryClient = service;
15
+ const streaming = service;
16
+ function run(effect) {
17
+ return owner === undefined ? effect : Effect.suspend(() => AtomRegistry.getResult(owner.registry, ordinaryClient.runtime.atom(effect)));
18
+ }
19
+ function boundQuery(tag, query) {
20
+ const reactive = queryReactivity(ordinaryClient.runtime, clientActivities.get(ordinaryClient)?.queued);
21
+ const cached = new WeakMap();
22
+ return {
23
+ query: (payload, options = {}) => {
24
+ const atom = ordinaryClient.query(tag, payload, { ...options, timeToLive: 0 });
25
+ const existing = cached.get(atom);
26
+ if (existing !== undefined) {
27
+ return existing;
28
+ }
29
+ const local = query.reads(payload, Option.none());
30
+ const keys = [...local, { _tag: "List", collection: `@query/${tag}/${clientId()}` }];
31
+ const dependencies = local.length === 0 ? [...keys, { _tag: "List", collection: `@query/${tag.slice(0, tag.lastIndexOf("."))}` }] : keys;
32
+ const reference = { payload, query: query.name };
33
+ const result = automatic.query(atom, reference, keys, Schema.toEquivalence(query.success), Schema.decodeUnknownSync(Schema.toType(query.success)), query.live === "rerun-and-compare", (source) => reactive(source, clientReadKeys(dependencies, owner?.context), owner?.registry), options.headers);
34
+ const tracked = retainQuery(ordinaryClient.runtime, clientActivities.get(ordinaryClient)?.watch(result) ?? result);
35
+ shareQuerySignals(tracked, result);
36
+ cached.set(atom, tracked);
37
+ return tracked;
38
+ },
39
+ run: (payload) => run(ordinaryClient.use((client) => client(tag, payload))),
40
+ };
41
+ }
42
+ function boundCommand(tag, command) {
43
+ function invalidate(payload, result) {
44
+ const keys = [
45
+ ...command.invalidates(payload, result),
46
+ { _tag: "List", collection: `@query/${tag.slice(0, tag.lastIndexOf("."))}` },
47
+ ];
48
+ return Reactivity.invalidate(clientInvalidationKeys(keys, owner?.context));
49
+ }
50
+ return {
51
+ run: (payload) => run(ordinaryClient.use((client) => commandPayload(command, payload).pipe(Effect.tap(() => waitForConnection(client)), Effect.flatMap((validated) => client(tag, validated)), Effect.tap((result) => invalidate(payload, result))))),
52
+ };
53
+ }
54
+ function boundStream(tag) {
55
+ return {
56
+ run: (payload) => {
57
+ const stream = Stream.unwrap(streaming.use((client) => Effect.succeed(client(tag, payload))));
58
+ return owner === undefined
59
+ ? stream
60
+ : Stream.callback((queue) => AtomRegistry.getResult(owner.registry, streaming.runtime.atom(Stream.runIntoQueue(stream, queue)).pipe(Atom.setIdleTTL(0))), { bufferSize: 1 });
61
+ },
62
+ };
63
+ }
61
64
  return {
62
- command: (tag, command) => boundCommand(service, tag, command, owner),
63
- query: (tag, query) => boundQuery(service, tag, query, automatic, owner),
64
- stream: (tag) => boundStream(service, tag, owner),
65
+ command: (tag, command) => boundCommand(tag, command),
66
+ query: (tag, query) => boundQuery(tag, query),
67
+ stream: (tag) => boundStream(tag),
65
68
  };
66
69
  }
67
70
  //# sourceMappingURL=clientOperations.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"clientOperations.js","sourceRoot":"","sources":["../src/clientOperations.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"clientOperations.js","sourceRoot":"","sources":["../src/clientOperations.ts"],"names":[],"mappings":"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"}
@@ -2,7 +2,7 @@ import { Effect } from "effect";
2
2
  import type { Key } from "@shivaedev/changes/keys.ts";
3
3
  import type { QueryRerun, QuerySubscription } from "#querySubscription.ts";
4
4
  import type { QueryUpdate } from "#queryUpdate.ts";
5
- export declare function compareQueries<E, R>(subscription: QuerySubscription<unknown, unknown>, read?: QueryRerun<E, R>): (hint: {
5
+ export declare function compareQueries<E, R>(subscription: QuerySubscription<unknown, unknown>, read?: QueryRerun<E, R>, initialRead?: boolean): (hint: {
6
6
  readonly _tag: "Changed";
7
7
  readonly keys: readonly ({
8
8
  readonly _tag: "Bucket";
@@ -1 +1 @@
1
- {"version":3,"file":"compareQueries.d.ts","sourceRoot":"","sources":["../src/compareQueries.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAU,MAAM,QAAQ,CAAC;AAExC,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,4BAA4B,CAAC;AAGtD,OAAO,KAAK,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC3E,OAAO,KAAK,EAA+B,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAuBhF,wBAAgB,cAAc,CAAC,CAAC,EAAE,CAAC,EAAE,YAAY,EAAE,iBAAiB,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,IAAI,CAAC,EAAE,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC;;;;;;;;;;;;;;;;;;iGAgC9G"}
1
+ {"version":3,"file":"compareQueries.d.ts","sourceRoot":"","sources":["../src/compareQueries.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAU,MAAM,QAAQ,CAAC;AAExC,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,4BAA4B,CAAC;AAGtD,OAAO,KAAK,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC3E,OAAO,KAAK,EAA+B,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAuBhF,wBAAgB,cAAc,CAAC,CAAC,EAAE,CAAC,EAAE,YAAY,EAAE,iBAAiB,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,IAAI,CAAC,EAAE,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,WAAW,UAAO;;;;;;;;;;;;;;;;;;iGAsClI"}
@@ -20,14 +20,18 @@ function hintsFor(hint, subscription) {
20
20
  const visible = hint.keys.filter((key) => keys.has(JSON.stringify(key)));
21
21
  return visible.length === 0 ? [] : [changedHint(visible, scopes)];
22
22
  }
23
- export function compareQueries(subscription, read) {
23
+ export function compareQueries(subscription, read, initialRead = true) {
24
24
  const queries = subscription.queries ?? [];
25
25
  const hashes = new Map();
26
+ let initial = initialRead && read !== undefined && queries.length > 0;
26
27
  const resultFor = Effect.fnUntraced(function* (request, index) {
27
28
  if (read === undefined) {
28
- return yield* Effect.die(new Error("Rerun-and-compare subscriptions require an authorized query runner"));
29
+ return yield* Effect.die(new Error("Result subscriptions require an authorized query runner"));
29
30
  }
30
31
  const value = yield* read(request);
32
+ if (request.query.live !== "rerun-and-compare") {
33
+ return { _tag: "Result", query: request.query.name, queryIndex: index, value };
34
+ }
31
35
  const encoded = yield* Schema.encodeUnknownEffect(Schema.toCodecJson(request.query.success))(value).pipe(Effect.orDie);
32
36
  const digest = yield* Digest.Digest;
33
37
  const hash = yield* digest.digestHex(Digest.sha256, new TextEncoder().encode(JSON.stringify(encoded)));
@@ -42,12 +46,14 @@ export function compareQueries(subscription, read) {
42
46
  const affected = hint._tag === "Resync" ? undefined : changedHint(hint.keys, scopes);
43
47
  const matching = queries
44
48
  .map((request, index) => ({ index, request }))
45
- .filter(({ index, request }) => request.query.live === "rerun-and-compare" && (affected?._tag !== "Changed" || affected.queryIndexes?.includes(index)));
49
+ .filter(({ index, request }) => initial || (request.query.live === "rerun-and-compare" && (affected?._tag !== "Changed" || affected.queryIndexes?.includes(index))));
46
50
  for (const { index, request } of matching) {
47
51
  const result = yield* resultFor(request, index);
48
52
  updates.push(result);
49
53
  }
50
- return [...updates, ...hintsFor(hint, { ...subscription, scopes })];
54
+ const hints = initial ? [] : hintsFor(hint, { ...subscription, scopes });
55
+ initial = false;
56
+ return [...updates, ...hints];
51
57
  });
52
58
  }
53
59
  //# sourceMappingURL=compareQueries.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"compareQueries.js","sourceRoot":"","sources":["../src/compareQueries.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"compareQueries.js","sourceRoot":"","sources":["../src/compareQueries.ts"],"names":[],"mappings":"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"}
@@ -12,7 +12,7 @@ function subscribeQueries(subscription, read) {
12
12
  let compare = compareQueries(subscription, read);
13
13
  const next = Effect.fnUntraced(function* (hint) {
14
14
  if (!(yield* subscription.authorized)) {
15
- compare = compareQueries(subscription, read);
15
+ compare = compareQueries(subscription, read, false);
16
16
  return [new QueryReadDenied({ message: "Read no longer allowed for subscribed queries" })];
17
17
  }
18
18
  const updates = yield* compare(hint, scopes);
@@ -1 +1 @@
1
- {"version":3,"file":"subscribe.js","sourceRoot":"","sources":["../../src/live-server/subscribe.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AACvE,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAIpD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAU1C,SAAS,gBAAgB,CAAO,YAAqC,EAAE,IAAuB;IAC7F,OAAO,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC;QACjC,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,UAAU,CAAC;QACjC,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QACxD,OAAO,KAAK,CAAC,IAAI,CAChB,MAAM,CAAC,OAAO,CAAC,CAAC,YAAY,EAAE,EAAE;YAC/B,IAAI,MAAM,GAAG,YAAY,CAAC,MAAM,CAAC;YACjC,IAAI,OAAO,GAAG,cAAc,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;YACjD,MAAM,IAAI,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,IAAc;gBACvD,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,YAAY,CAAC,UAAU,CAAC,EAAE,CAAC;oBACvC,OAAO,GAAG,cAAc,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;oBAC7C,OAAO,CAAC,IAAI,eAAe,CAAC,EAAE,OAAO,EAAE,+CAA+C,EAAE,CAAC,CAAC,CAAC;gBAC5F,CAAC;gBACD,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;gBAC7C,IAAI,YAAY,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;oBAC3C,MAAM,GAAG,KAAK,CAAC,CAAC,YAAY,CAAC,UAAU,CAAC;oBACxC,YAAY,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;gBACzC,CAAC;gBACD,OAAO,OAAO,CAAC;YAChB,CAAC,CAAC,CAAC;YACH,OAAO,YAAY,CAAC,MAAM,CAAC,IAAI,CAC9B,MAAM,CAAC,SAAS,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,mBAAmB,CAAC,YAAY,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EACzE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,CACnC,CAAC;QACH,CAAC,CAAC,CACF,CAAC;IACH,CAAC,CAAC,EAAE,CAAC;AACN,CAAC;AAED,MAAM,CAAC,MAAM,SAAS,GAAG,MAAM,CAAC,EAAE,CAAC,sBAAsB,CAAC,CAAC,gBAAgB,CAAC,CAAC"}
1
+ {"version":3,"file":"subscribe.js","sourceRoot":"","sources":["../../src/live-server/subscribe.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AACvE,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAIpD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAU1C,SAAS,gBAAgB,CAAO,YAAqC,EAAE,IAAuB;IAC7F,OAAO,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC;QACjC,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,UAAU,CAAC;QACjC,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QACxD,OAAO,KAAK,CAAC,IAAI,CAChB,MAAM,CAAC,OAAO,CAAC,CAAC,YAAY,EAAE,EAAE;YAC/B,IAAI,MAAM,GAAG,YAAY,CAAC,MAAM,CAAC;YACjC,IAAI,OAAO,GAAG,cAAc,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;YACjD,MAAM,IAAI,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,IAAc;gBACvD,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,YAAY,CAAC,UAAU,CAAC,EAAE,CAAC;oBACvC,OAAO,GAAG,cAAc,CAAC,YAAY,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;oBACpD,OAAO,CAAC,IAAI,eAAe,CAAC,EAAE,OAAO,EAAE,+CAA+C,EAAE,CAAC,CAAC,CAAC;gBAC5F,CAAC;gBACD,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;gBAC7C,IAAI,YAAY,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;oBAC3C,MAAM,GAAG,KAAK,CAAC,CAAC,YAAY,CAAC,UAAU,CAAC;oBACxC,YAAY,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;gBACzC,CAAC;gBACD,OAAO,OAAO,CAAC;YAChB,CAAC,CAAC,CAAC;YACH,OAAO,YAAY,CAAC,MAAM,CAAC,IAAI,CAC9B,MAAM,CAAC,SAAS,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,mBAAmB,CAAC,YAAY,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EACzE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,CACnC,CAAC;QACH,CAAC,CAAC,CACF,CAAC;IACH,CAAC,CAAC,EAAE,CAAC;AACN,CAAC;AAED,MAAM,CAAC,MAAM,SAAS,GAAG,MAAM,CAAC,EAAE,CAAC,sBAAsB,CAAC,CAAC,gBAAgB,CAAC,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"liveAttempt.d.ts","sourceRoot":"","sources":["../src/liveAttempt.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,4BAA4B,CAAC;AACtD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAE5D,wBAAgB,WAAW,CAAC,CAAC,EAAE,CAAC,EAC/B,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,gBAAgB,EAAE,CAAC,EAAE,CAAC,CAAC,EAC7C,OAAO,EAAE;IACR,QAAQ,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,SAAS,GAAG,EAAE,KAAK,IAAI,CAAC;IACjD,QAAQ,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,eAAe,KAAK,IAAI,CAAC;IACnD,QAAQ,CAAC,IAAI,EAAE,MAAM,IAAI,CAAC;IAC1B,QAAQ,CAAC,MAAM,EAAE,MAAM,OAAO,CAAC;IAC/B,QAAQ,CAAC,MAAM,EAAE,MAAM,IAAI,CAAC;IAC5B,QAAQ,CAAC,SAAS,EAAE,CAAC,SAAS,EAAE,OAAO,KAAK,IAAI,CAAC;CACjD,oEA6BD"}
1
+ {"version":3,"file":"liveAttempt.d.ts","sourceRoot":"","sources":["../src/liveAttempt.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,4BAA4B,CAAC;AACtD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAU5D,wBAAgB,WAAW,CAAC,CAAC,EAAE,CAAC,EAC/B,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,gBAAgB,EAAE,CAAC,EAAE,CAAC,CAAC,EAC7C,OAAO,EAAE;IACR,QAAQ,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,SAAS,GAAG,EAAE,KAAK,IAAI,CAAC;IACjD,QAAQ,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,eAAe,KAAK,IAAI,CAAC;IACnD,QAAQ,CAAC,IAAI,EAAE,MAAM,IAAI,CAAC;IAC1B,QAAQ,CAAC,MAAM,EAAE,MAAM,OAAO,CAAC;IAC/B,QAAQ,CAAC,MAAM,EAAE,MAAM,IAAI,CAAC;IAC5B,QAAQ,CAAC,SAAS,EAAE,CAAC,SAAS,EAAE,OAAO,KAAK,IAAI,CAAC;CACjD,oEA6BD"}
@@ -1,4 +1,10 @@
1
1
  import { Effect, Stream } from "effect";
2
+ function deliveredResult(hint) {
3
+ return hint._tag === "Changed" && hint.keys.length === 0 && hint.queryIndexes?.length === 0;
4
+ }
5
+ function needsRead(hint, connected) {
6
+ return connected && !deliveredResult(hint);
7
+ }
2
8
  export function liveAttempt(stream, observe) {
3
9
  let connected = false;
4
10
  return Effect.suspend(() => {
@@ -14,8 +20,8 @@ export function liveAttempt(stream, observe) {
14
20
  if (observe.paused()) {
15
21
  observe.queued();
16
22
  }
17
- else if (first || hint._tag === "Resync") {
18
- observe.reconcile(connected);
23
+ else if (first || hint._tag === "Resync" || deliveredResult(hint)) {
24
+ observe.reconcile(needsRead(hint, connected));
19
25
  }
20
26
  else {
21
27
  observe.changed(hint.keys);
@@ -1 +1 @@
1
- {"version":3,"file":"liveAttempt.js","sourceRoot":"","sources":["../src/liveAttempt.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAKxC,MAAM,UAAU,WAAW,CAC1B,MAA6C,EAC7C,OAOC;IAED,IAAI,SAAS,GAAG,KAAK,CAAC;IACtB,OAAO,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE;QAC1B,IAAI,KAAK,GAAG,IAAI,CAAC;QACjB,OAAO,MAAM,CAAC,IAAI,CACjB,MAAM,CAAC,UAAU,CAAC,CAAC,IAAI,EAAE,EAAE,CAC1B,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE;YAChB,IAAI,IAAI,CAAC,IAAI,KAAK,iBAAiB,EAAE,CAAC;gBACrC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;gBACrB,SAAS,GAAG,IAAI,CAAC;gBACjB,KAAK,GAAG,IAAI,CAAC;gBACb,OAAO;YACR,CAAC;YACD,OAAO,CAAC,IAAI,EAAE,CAAC;YACf,IAAI,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;gBACtB,OAAO,CAAC,MAAM,EAAE,CAAC;YAClB,CAAC;iBAAM,IAAI,KAAK,IAAI,IAAI,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;gBAC5C,OAAO,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;YAC9B,CAAC;iBAAM,CAAC;gBACP,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC5B,CAAC;YACD,SAAS,GAAG,IAAI,CAAC;YACjB,KAAK,GAAG,KAAK,CAAC;QACf,CAAC,CAAC,CACF,EACD,MAAM,CAAC,MAAM,CACb,CAAC;IACH,CAAC,CAAC,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"liveAttempt.js","sourceRoot":"","sources":["../src/liveAttempt.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAKxC,SAAS,eAAe,CAAC,IAAsB;IAC9C,OAAO,IAAI,CAAC,IAAI,KAAK,SAAS,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,IAAI,IAAI,CAAC,YAAY,EAAE,MAAM,KAAK,CAAC,CAAC;AAC7F,CAAC;AAED,SAAS,SAAS,CAAC,IAAsB,EAAE,SAAkB;IAC5D,OAAO,SAAS,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;AAC5C,CAAC;AAED,MAAM,UAAU,WAAW,CAC1B,MAA6C,EAC7C,OAOC;IAED,IAAI,SAAS,GAAG,KAAK,CAAC;IACtB,OAAO,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE;QAC1B,IAAI,KAAK,GAAG,IAAI,CAAC;QACjB,OAAO,MAAM,CAAC,IAAI,CACjB,MAAM,CAAC,UAAU,CAAC,CAAC,IAAI,EAAE,EAAE,CAC1B,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE;YAChB,IAAI,IAAI,CAAC,IAAI,KAAK,iBAAiB,EAAE,CAAC;gBACrC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;gBACrB,SAAS,GAAG,IAAI,CAAC;gBACjB,KAAK,GAAG,IAAI,CAAC;gBACb,OAAO;YACR,CAAC;YACD,OAAO,CAAC,IAAI,EAAE,CAAC;YACf,IAAI,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;gBACtB,OAAO,CAAC,MAAM,EAAE,CAAC;YAClB,CAAC;iBAAM,IAAI,KAAK,IAAI,IAAI,CAAC,IAAI,KAAK,QAAQ,IAAI,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC;gBACrE,OAAO,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC;YAC/C,CAAC;iBAAM,CAAC;gBACP,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC5B,CAAC;YACD,SAAS,GAAG,IAAI,CAAC;YACjB,KAAK,GAAG,KAAK,CAAC;QACf,CAAC,CAAC,CACF,EACD,MAAM,CAAC,MAAM,CACb,CAAC;IACH,CAAC,CAAC,CAAC;AACJ,CAAC"}
@@ -22,7 +22,12 @@ export declare function publicConfig<T, E>(schema: Schema.Codec<T, E>): import("
22
22
  readonly queryIndexes: Schema.optional<Schema.$Array<Schema.Number>>;
23
23
  }>, Schema.Struct<{
24
24
  readonly _tag: Schema.Literal<"Resync">;
25
- }>]>, typeof import("./readPolicyErrors.ts").QueryReadDenied, ...never[]]>, Schema.Union<readonly [typeof import("./readPolicyErrors.ts").MissingReadPolicy, typeof import("./readPolicyErrors.ts").QueryReadDenied, typeof import("./WebSocketRequired.ts").WebSocketRequired, ...Schema.Never[]]>>, Schema.Never, import("effect/Context").Reference<<A, E_1, R>(effect: Effect.Effect<A, E_1, R>, request: {
25
+ }>]>, typeof import("./readPolicyErrors.ts").QueryReadDenied, ...Schema.Struct<{
26
+ _tag: Schema.Literal<"Result">;
27
+ query: Schema.Literal<"get">;
28
+ queryIndex: Schema.Number;
29
+ value: Schema.Codec<T, E, never, never>;
30
+ }>[]]>, Schema.Union<readonly [typeof import("./readPolicyErrors.ts").MissingReadPolicy, typeof import("./readPolicyErrors.ts").QueryReadDenied, typeof import("./WebSocketRequired.ts").WebSocketRequired, ...Schema.Never[]]>>, Schema.Never, import("effect/Context").Reference<<A, E_1, R>(effect: Effect.Effect<A, E_1, R>, request: {
26
31
  readonly rpc: import("effect/rpc/Rpc").Any;
27
32
  readonly payload: unknown;
28
33
  }) => Effect.Effect<A, E_1 | import("./readPolicyErrors.ts").MissingReadPolicy | import("./readPolicyErrors.ts").QueryReadDenied | import("./WebSocketRequired.ts").WebSocketRequired | import("effect/Types").unhandled, R>> & {
@@ -1 +1 @@
1
- {"version":3,"file":"publicConfig.d.ts","sourceRoot":"","sources":["../src/publicConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,MAAM,EAAE,MAAM,QAAQ,CAAC;AAI7C,wBAAgB,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;mCAI5D"}
1
+ {"version":3,"file":"publicConfig.d.ts","sourceRoot":"","sources":["../src/publicConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,MAAM,EAAE,MAAM,QAAQ,CAAC;AAI7C,wBAAgB,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;mCAI5D"}
@@ -4,8 +4,10 @@ import * as Atom from "effect/reactivity/Atom";
4
4
  import * as AtomRegistry from "effect/reactivity/AtomRegistry";
5
5
  import type { QuerySignals } from "#querySignals.ts";
6
6
  import type { QueryUpdate, SubscriptionHint } from "#queryUpdate.ts";
7
- export declare function queryDelivery<A, E>(atom: Atom.Atom<AsyncResult.AsyncResult<A, E>>, decode: ((value: unknown) => A) | undefined, paused: Atom.Atom<boolean>, signals: Atom.Writable<QuerySignals>): {
7
+ export declare function queryDelivery<A, E>(atom: Atom.Atom<AsyncResult.AsyncResult<A, E>>, decode: (value: unknown) => A, compared: boolean, paused: Atom.Atom<boolean>, signals: Atom.Writable<QuerySignals>): {
8
8
  atom: Atom.Atom<AsyncResult.AsyncResult<A, E>>;
9
9
  stream: <TError, R>(stream: Stream.Stream<QueryUpdate, TError, R>) => Stream.Stream<SubscriptionHint, TError, R | AtomRegistry.AtomRegistry>;
10
+ updates: Atom.Writable<number, number>;
11
+ version: Atom.Writable<number, number>;
10
12
  };
11
13
  //# sourceMappingURL=queryDelivery.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"queryDelivery.d.ts","sourceRoot":"","sources":["../src/queryDelivery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,KAAK,WAAW,MAAM,+BAA+B,CAAC;AAC7D,OAAO,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAC/C,OAAO,KAAK,YAAY,MAAM,gCAAgC,CAAC;AAC/D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,KAAK,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAErE,wBAAgB,aAAa,CAAC,CAAC,EAAE,CAAC,EACjC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAC9C,MAAM,EAAE,CAAC,CAAC,KAAK,EAAE,OAAO,KAAK,CAAC,CAAC,GAAG,SAAS,EAC3C,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAC1B,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC;IAqBnC,IAAI;IACJ,MAAM,GAAG,MAAM,EAAE,CAAC,UAAU,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,MAAM,EAAE,CAAC,CAAC;EAElE"}
1
+ {"version":3,"file":"queryDelivery.d.ts","sourceRoot":"","sources":["../src/queryDelivery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,KAAK,WAAW,MAAM,+BAA+B,CAAC;AAC7D,OAAO,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAC/C,OAAO,KAAK,YAAY,MAAM,gCAAgC,CAAC;AAC/D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,KAAK,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAErE,wBAAgB,aAAa,CAAC,CAAC,EAAE,CAAC,EACjC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAC9C,MAAM,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,CAAC,EAC7B,QAAQ,EAAE,OAAO,EACjB,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAC1B,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC;;aAoC1B,MAAM,EAAE,CAAC,UAAU,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,MAAM,EAAE,CAAC,CAAC;;;EAIlE"}
@@ -2,11 +2,14 @@ import { Effect, Stream } from "effect";
2
2
  import * as AsyncResult from "effect/reactivity/AsyncResult";
3
3
  import * as Atom from "effect/reactivity/Atom";
4
4
  import * as AtomRegistry from "effect/reactivity/AtomRegistry";
5
- export function queryDelivery(atom, decode, paused, signals) {
5
+ export function queryDelivery(atom, decode, compared, paused, signals) {
6
+ const version = Atom.make(0);
7
+ const updates = Atom.make(0);
6
8
  const pushed = Atom.make(AsyncResult.initial());
7
9
  const deliver = Effect.fnUntraced(function* (update) {
10
+ const registry = yield* AtomRegistry.AtomRegistry;
11
+ registry.update(updates, (current) => current + 1);
8
12
  if (update._tag === "Unchanged") {
9
- const registry = yield* AtomRegistry.AtomRegistry;
10
13
  if (!registry.get(paused)) {
11
14
  registry.update(signals, (current) => ({ ...current, completed: current.completed + 1, pending: false }));
12
15
  }
@@ -15,15 +18,25 @@ export function queryDelivery(atom, decode, paused, signals) {
15
18
  if (update._tag !== "Result") {
16
19
  return update;
17
20
  }
18
- const registry = yield* AtomRegistry.AtomRegistry;
19
- if (decode !== undefined && !registry.get(paused)) {
21
+ if (!registry.get(paused)) {
20
22
  registry.set(pushed, AsyncResult.success(decode(update.value)));
23
+ registry.update(version, (current) => current + 1);
21
24
  }
22
25
  return { _tag: "Changed", keys: [], queryIndexes: [] };
23
26
  });
24
27
  return {
25
- atom: decode === undefined ? atom : pushed,
28
+ atom: compared
29
+ ? pushed
30
+ : Atom.readable((get) => {
31
+ const initial = get(pushed);
32
+ return AsyncResult.isInitial(initial) ? get(atom) : initial;
33
+ }, (refresh) => {
34
+ refresh(atom);
35
+ refresh(pushed);
36
+ }),
26
37
  stream: (stream) => Stream.mapEffect(stream, deliver),
38
+ updates,
39
+ version,
27
40
  };
28
41
  }
29
42
  //# sourceMappingURL=queryDelivery.js.map