@shivaedev/contract 0.40.0 → 0.41.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.
- package/CHANGELOG.md +16 -0
- package/README.md +11 -5
- package/dist/AutomaticQueryOptions.d.ts +22 -0
- package/dist/AutomaticQueryOptions.d.ts.map +1 -0
- package/dist/AutomaticQueryOptions.js +2 -0
- package/dist/AutomaticQueryOptions.js.map +1 -0
- package/dist/adapters/activityState.d.ts.map +1 -1
- package/dist/adapters/activityState.js +9 -1
- package/dist/adapters/activityState.js.map +1 -1
- package/dist/automaticLive.d.ts +1 -1
- package/dist/automaticLive.d.ts.map +1 -1
- package/dist/automaticLive.js +9 -7
- package/dist/automaticLive.js.map +1 -1
- package/dist/automaticQuery.d.ts +3 -17
- package/dist/automaticQuery.d.ts.map +1 -1
- package/dist/automaticQuery.js +12 -7
- package/dist/automaticQuery.js.map +1 -1
- package/dist/changesSuccess.d.ts +2 -3
- package/dist/changesSuccess.d.ts.map +1 -1
- package/dist/changesSuccess.js +2 -4
- package/dist/changesSuccess.js.map +1 -1
- package/dist/clientActivities.d.ts +2 -2
- package/dist/clientActivities.d.ts.map +1 -1
- package/dist/clientActivities.js +28 -12
- package/dist/clientActivities.js.map +1 -1
- package/dist/clientActivity.d.ts +4 -1
- package/dist/clientActivity.d.ts.map +1 -1
- package/dist/clientActivity.js +5 -2
- package/dist/clientActivity.js.map +1 -1
- package/dist/clientOperations.d.ts.map +1 -1
- package/dist/clientOperations.js +1 -1
- package/dist/clientOperations.js.map +1 -1
- package/dist/compareQueries.d.ts +1 -1
- package/dist/compareQueries.d.ts.map +1 -1
- package/dist/compareQueries.js +10 -4
- package/dist/compareQueries.js.map +1 -1
- package/dist/live-server/subscribe.js +1 -1
- package/dist/live-server/subscribe.js.map +1 -1
- package/dist/liveAttempt.d.ts.map +1 -1
- package/dist/liveAttempt.js +8 -2
- package/dist/liveAttempt.js.map +1 -1
- package/dist/publicConfig.d.ts +6 -1
- package/dist/publicConfig.d.ts.map +1 -1
- package/dist/queryDelivery.d.ts +3 -1
- package/dist/queryDelivery.d.ts.map +1 -1
- package/dist/queryDelivery.js +18 -5
- package/dist/queryDelivery.js.map +1 -1
- package/dist/queryHints.js +1 -1
- package/dist/queryHints.js.map +1 -1
- package/dist/rpcClient.d.ts +1 -1
- package/dist/rpcClient.d.ts.map +1 -1
- package/dist/rpcClient.js +4 -2
- package/dist/rpcClient.js.map +1 -1
- package/package.json +8 -8
- package/src/AutomaticQueryOptions.ts +22 -0
- package/src/adapters/activityState.ts +9 -1
- package/src/automaticLive.ts +11 -7
- package/src/automaticQuery.ts +16 -21
- package/src/changesSuccess.ts +11 -14
- package/src/clientActivities.ts +29 -12
- package/src/clientActivity.ts +8 -2
- package/src/clientOperations.ts +4 -2
- package/src/compareQueries.ts +10 -4
- package/src/live-server/subscribe.ts +1 -1
- package/src/liveAttempt.ts +10 -2
- package/src/queryDelivery.ts +22 -5
- package/src/queryHints.ts +1 -1
- package/src/rpcClient.ts +6 -2
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,21 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 0.41.0 - 2026-11-06
|
|
4
|
+
|
|
5
|
+
### Added
|
|
6
|
+
|
|
7
|
+
- Activity reports commands in flight and mounted queries awaiting their first result. `isClientSettled` checks these counts using the contract's command metadata.
|
|
8
|
+
|
|
9
|
+
### Changed
|
|
10
|
+
|
|
11
|
+
- Live query subscriptions deliver their first authorized result after registering read keys, removing the separate initial query request for bound queries and route loaders. Later updates retain hint-then-read or the query's chosen rerun-and-compare behavior.
|
|
12
|
+
|
|
13
|
+
### Breaking
|
|
14
|
+
|
|
15
|
+
- Every contract's `$changes` success type includes typed `Result` values. Custom stream consumers must handle results as well as hints; custom subscription hosts pass their authorized query runner to `subscribe(subscription, read)` to deliver the initial value.
|
|
16
|
+
- Direct `automaticLive().query` callers now supply a result decoder, comparison flag and reactive source factory. Direct `queryDelivery` callers supply the decoder and comparison flag, and `automaticQuery` callers pass the delivery's `version` as `resultVersion` and `updates` as `subscriptionVersion`. Use `bind` or `makeClient` to obtain this wiring automatically.
|
|
17
|
+
- Screen signals from `activityScreenSignal(activity)` now settle on commands and first query results, allowing live queries to remain open or await later refreshes. Code constructing `ClientActivityState` values must supply `commands` and `initialQueries`. To retain full finite-work settling, pass `isClientIdle` as the second argument. Start `nextLiveHint()` before an outside write when a story needs its next live change, then settle through that refresh with the full idle signal.
|
|
18
|
+
|
|
3
19
|
## 0.40.0 - 2026-11-05
|
|
4
20
|
|
|
5
21
|
### Added
|
package/README.md
CHANGED
|
@@ -327,7 +327,11 @@ Use this helper in hosts from `@shivaedev/server`, or a native RPC host wired wi
|
|
|
327
327
|
|
|
328
328
|
### Client activity
|
|
329
329
|
|
|
330
|
-
`clientActivity(client)` from `@shivaedev/contract/clientActivity.ts` returns a native Effect `Stream` with a `current` Effect for a client made by `makeClient`. Its state includes `connectionStatus`, a `"live" | "reconnecting" | "waiting-for-connection"` value aggregated across mounted queries from all bindings of the same client service, with live subscription changes debounced for 300 ms on the client runtime’s Clock and held commands reported immediately. Refused subscriptions do not count as reconnecting. The stream also exposes its native `connectionStatus` atom for React readers.
|
|
330
|
+
`clientActivity(client)` from `@shivaedev/contract/clientActivity.ts` returns a native Effect `Stream` with a `current` Effect for a client made by `makeClient`. Its state includes `connectionStatus`, a `"live" | "reconnecting" | "waiting-for-connection"` value aggregated across mounted queries from all bindings of the same client service, with live subscription changes debounced for 300 ms on the client runtime’s Clock and held commands reported immediately. Refused subscriptions do not count as reconnecting. The stream also exposes its native `connectionStatus` atom for React readers.
|
|
331
|
+
|
|
332
|
+
For screen stories, pass `activityScreenSignal(clientActivity(client))` to a test-story screen driver's `activity` option. By default, `settle()` waits for commands in flight and the first result of each mounted query, then flushes the renderer. Contract identifies commands from its own RPC annotations; kits need no query-name exceptions. The activity state's `commands` count includes commands held for a connection, and `initialQueries` counts mounted queries until their first success or failure. Unmounting releases that query's pending activity. `isClientSettled(state)` checks these two counts. An open live query that has delivered its first result, including one awaiting a later refresh, does not keep a screen story pending.
|
|
333
|
+
|
|
334
|
+
`activityScreenSignal(activity)` projects the stream and its `current` Effect into `{ pending, hints, connectionStatus }`, with `hints` carrying the received live-hint count. The returned shape is structural and carries no test-story dependency. Stories that need a later live change start `nextLiveHint()` before the outside write, then settle with `activityScreenSignal(activity, isClientIdle)` to wait through its refresh. `isClientIdle(state)` retains the full finite-work check: `rpcCalls` for finite calls, `liveInvalidations` for queued live refreshes, and `refreshingAtoms` for mounted query atoms awaiting values must all be zero. Long-lived subscription streams themselves do not count as finite calls.
|
|
331
335
|
|
|
332
336
|
### Query completion
|
|
333
337
|
|
|
@@ -417,6 +421,8 @@ const connection = composeBindings(
|
|
|
417
421
|
|
|
418
422
|
The automatic live connection exposed at `api[LiveConnection]` includes a writable `paused` atom. Set it in the binding’s registry to pause refreshes; clearing it reconciles the mounted queries. Bindings on the same client runtime share this pause state.
|
|
419
423
|
|
|
424
|
+
Opening a live query checks its policies, registers its read keys, then runs the authorized query and sends its first `Result` on the subscription. The screen and route loaders receive data in one RPC request; they do not send an ordinary query after the first signal. Registration precedes the read because PostgreSQL notifications cannot be replayed. Later changes send hints followed by ordinary query reads, unless the query declares `live: "rerun-and-compare"` to push changed results and acknowledge equal values.
|
|
425
|
+
|
|
420
426
|
Database hosts from `@shivaedev/server` serve the contract's reserved `<contract>.$changes` stream automatically. With the native WebSocket protocol, `bind` and a React `SessionBoundary` connect query atoms without an application subscribe operation or `live()` call. The boundary mounts the bindings declared with `composeBindings`, or finds bound APIs returned directly by `connect` or nested in properties such as `client.api.notes`. See [automatic changes](https://github.com/ShivaeDev/platform/blob/main/docs/framework/changes.md) for defaults.
|
|
421
427
|
|
|
422
428
|
Subscribing to the hosted `$changes` stream over HTTP fails with `WebSocketRequired` from `@shivaedev/contract/WebSocketRequired.ts`; its message names the stream and says it needs the WebSocket protocol.
|
|
@@ -452,7 +458,7 @@ const changes = Stream.unwrap(
|
|
|
452
458
|
);
|
|
453
459
|
```
|
|
454
460
|
|
|
455
|
-
The contract includes the reserved stream's payload, `
|
|
461
|
+
The contract includes the reserved stream's payload, hints, typed `Result` values and middleware failures in its native RPC type. The subscription uses the contract's middleware and needs no separate RPC group or cast. The caller owns stream consumption and interruption. References name declared queries and reuse their payload schemas; payloadless queries use `{ query: "list", payload: undefined }`. Custom subscription handlers call `querySubscription(rpc, references, viewer)` with the native changes RPC definition and pass its authorized result and authorized query runner to `subscribe(subscription, read)`. The runner uses the same query handlers and policies as ordinary reads. Omitting the runner keeps an explicit hint-only stream for custom transports. Hosted applications use `resolveChanges` from identity to supply that subscription. Session-scoped bindings track mounted queries per registry and drop their references on unmount or disposal. Ordinary bindings track query references when atoms are created.
|
|
456
462
|
|
|
457
463
|
Custom subscription handlers use `changesHandlerLayer` to derive the reserved handler Layer from the contract:
|
|
458
464
|
|
|
@@ -757,7 +763,7 @@ const client = makeClient(Notes, {
|
|
|
757
763
|
});
|
|
758
764
|
```
|
|
759
765
|
|
|
760
|
-
The URL identifies the client configuration; the in-memory protocol opens no socket. The client's direct calls and bound query atoms use the real handlers, schema decoding and middleware. Live subscriptions
|
|
766
|
+
The URL identifies the client configuration; the in-memory protocol opens no socket. The client's direct calls and bound query atoms use the real handlers, schema decoding and middleware. Live subscriptions use the supplied handlers and change source, and mounted queries refresh from their updates. Closing a subscription interrupts its server stream. The protocol does not add handlers or publish changes: provide the same live handlers and change source that the application serves over WebSocket.
|
|
761
767
|
|
|
762
768
|
### Settled queries in stories
|
|
763
769
|
|
|
@@ -777,7 +783,7 @@ const current = yield* results.latest;
|
|
|
777
783
|
|
|
778
784
|
### Live hints in stories
|
|
779
785
|
|
|
780
|
-
Use `watchHints` and `heard` from `@shivaedev/test-kits/contract/testing.ts` in an application's story kit. Pass each viewer's authenticated live stream to `watchHints`; it starts a scoped subscription and waits for its first
|
|
786
|
+
Use `watchHints` and `heard` from `@shivaedev/test-kits/contract/testing.ts` in an application's story kit. Pass each viewer's authenticated live stream to `watchHints`; it starts a scoped subscription and waits for its first update, including an initial result, before returning the viewer handle.
|
|
781
787
|
|
|
782
788
|
```ts
|
|
783
789
|
const alice = yield* watchHints(aliceChanges);
|
|
@@ -818,7 +824,7 @@ Import the module that defines the name; the package has no root entry.
|
|
|
818
824
|
| `QueryServerReads.ts` | `QueryServerReads<Payload, E, R>`, the server-only resolver type. |
|
|
819
825
|
| `resume.ts` | `resumeSignal({ window?, native? })`, returning a native numeric signal atom. |
|
|
820
826
|
| `querySignals.ts` | `querySignals(query)` exposes completion counts and subscription status as a native atom. |
|
|
821
|
-
| `clientActivity.ts` | `clientActivity(client)` exposes a native activity Stream with a `current` Effect; `isClientIdle(state)` checks finite work; `activityScreenSignal(activity)` projects pending work and hints for screen waits.
|
|
827
|
+
| `clientActivity.ts` | `clientActivity(client)` exposes a native activity Stream with a `current` Effect; `isClientSettled(state)` checks commands and first query results; `isClientIdle(state)` checks all finite work; `activityScreenSignal(activity, settled?)` projects pending work and hints for screen waits. |
|
|
822
828
|
|
|
823
829
|
A query atom takes native query options as its optional second argument, for example `api.get.query({ id: 1 }, { timeToLive: "1 minute" })`. A native resume source receives a callback and returns a cleanup function.
|
|
824
830
|
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
import type { Duration } from "effect";
|
|
2
|
+
import type * as AsyncResult from "effect/reactivity/AsyncResult";
|
|
3
|
+
import type * as Atom from "effect/reactivity/Atom";
|
|
4
|
+
import type { LiveBound, LiveConnection } from "#automaticLive.ts";
|
|
5
|
+
import type { LiveStatus } from "#live.ts";
|
|
6
|
+
import type { QuerySignals } from "#querySignals.ts";
|
|
7
|
+
export interface AutomaticQueryOptions<A, E> {
|
|
8
|
+
readonly atom: Atom.Atom<AsyncResult.AsyncResult<A, E>>;
|
|
9
|
+
readonly clientStatuses: Atom.Writable<ReadonlyMap<object, LiveStatus<unknown>>> | undefined;
|
|
10
|
+
readonly coalesceWindow: Atom.Writable<Duration.Input>;
|
|
11
|
+
readonly equivalent: (left: A, right: A) => boolean;
|
|
12
|
+
readonly paused: Atom.Writable<boolean>;
|
|
13
|
+
readonly pushed: boolean;
|
|
14
|
+
readonly ready: Atom.Writable<boolean>;
|
|
15
|
+
readonly resultVersion: Atom.Atom<number>;
|
|
16
|
+
readonly signals: Atom.Writable<QuerySignals>;
|
|
17
|
+
readonly source: Atom.Atom<AsyncResult.AsyncResult<A, E>>;
|
|
18
|
+
readonly statuses: Atom.Writable<ReadonlyMap<object, LiveStatus<unknown>>>;
|
|
19
|
+
readonly subscription: LiveBound[typeof LiveConnection];
|
|
20
|
+
readonly subscriptionVersion: Atom.Atom<number>;
|
|
21
|
+
}
|
|
22
|
+
//# sourceMappingURL=AutomaticQueryOptions.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"AutomaticQueryOptions.d.ts","sourceRoot":"","sources":["../src/AutomaticQueryOptions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AACvC,OAAO,KAAK,KAAK,WAAW,MAAM,+BAA+B,CAAC;AAClE,OAAO,KAAK,KAAK,IAAI,MAAM,wBAAwB,CAAC;AACpD,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAC3C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAErD,MAAM,WAAW,qBAAqB,CAAC,CAAC,EAAE,CAAC;IAC1C,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IACxD,QAAQ,CAAC,cAAc,EAAE,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,MAAM,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC;IAC7F,QAAQ,CAAC,cAAc,EAAE,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACvD,QAAQ,CAAC,UAAU,EAAE,CAAC,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,KAAK,OAAO,CAAC;IACpD,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IACxC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IACvC,QAAQ,CAAC,aAAa,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC1C,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;IAC9C,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAC1D,QAAQ,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,MAAM,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IAC3E,QAAQ,CAAC,YAAY,EAAE,SAAS,CAAC,OAAO,cAAc,CAAC,CAAC;IACxD,QAAQ,CAAC,mBAAmB,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;CAChD"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"AutomaticQueryOptions.js","sourceRoot":"","sources":["../src/AutomaticQueryOptions.ts"],"names":[],"mappings":""}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"activityState.d.ts","sourceRoot":"","sources":["../../src/adapters/activityState.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAmB,MAAM,QAAQ,CAAC;AACjD,OAAO,KAAK,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEhF,wBAAgB,aAAa;
|
|
1
|
+
{"version":3,"file":"activityState.d.ts","sourceRoot":"","sources":["../../src/adapters/activityState.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAmB,MAAM,QAAQ,CAAC;AACjD,OAAO,KAAK,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEhF,wBAAgB,aAAa;IAqB3B,QAAQ;;;IACR,MAAM,QAAQ,OAAO,CAAC,MAAM,mBAAmB,EAAE,kBAAkB,CAAC,SAAS,MAAM;IAGnF,IAAI;IAQJ,aAAa,qBAAqB,gBAAgB;EAKnD"}
|
|
@@ -2,7 +2,15 @@ import { Effect, SubscriptionRef } from "effect";
|
|
|
2
2
|
export function activityState() {
|
|
3
3
|
let held = 0;
|
|
4
4
|
let connection = "live";
|
|
5
|
-
const state = Effect.runSync(SubscriptionRef.make({
|
|
5
|
+
const state = Effect.runSync(SubscriptionRef.make({
|
|
6
|
+
commands: 0,
|
|
7
|
+
connectionStatus: "live",
|
|
8
|
+
initialQueries: 0,
|
|
9
|
+
liveHints: 0,
|
|
10
|
+
liveInvalidations: 0,
|
|
11
|
+
refreshingAtoms: 0,
|
|
12
|
+
rpcCalls: 0,
|
|
13
|
+
}));
|
|
6
14
|
function publish() {
|
|
7
15
|
const connectionStatus = held > 0 ? "waiting-for-connection" : connection;
|
|
8
16
|
Effect.runSync(SubscriptionRef.update(state, (current) => (current.connectionStatus === connectionStatus ? current : { ...current, connectionStatus })));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"activityState.js","sourceRoot":"","sources":["../../src/adapters/activityState.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,QAAQ,CAAC;AAGjD,MAAM,UAAU,aAAa;IAC5B,IAAI,IAAI,GAAG,CAAC,CAAC;IACb,IAAI,UAAU,GAAqB,MAAM,CAAC;IAC1C,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,CAC3B,eAAe,CAAC,IAAI,CAAsB,EAAE,gBAAgB,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"activityState.js","sourceRoot":"","sources":["../../src/adapters/activityState.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,QAAQ,CAAC;AAGjD,MAAM,UAAU,aAAa;IAC5B,IAAI,IAAI,GAAG,CAAC,CAAC;IACb,IAAI,UAAU,GAAqB,MAAM,CAAC;IAC1C,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,CAC3B,eAAe,CAAC,IAAI,CAAsB;QACzC,QAAQ,EAAE,CAAC;QACX,gBAAgB,EAAE,MAAM;QACxB,cAAc,EAAE,CAAC;QACjB,SAAS,EAAE,CAAC;QACZ,iBAAiB,EAAE,CAAC;QACpB,eAAe,EAAE,CAAC;QAClB,QAAQ,EAAE,CAAC;KACX,CAAC,CACF,CAAC;IACF,SAAS,OAAO;QACf,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,wBAAwB,CAAC,CAAC,CAAC,UAAU,CAAC;QAC1E,MAAM,CAAC,OAAO,CACb,eAAe,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,gBAAgB,KAAK,gBAAgB,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,GAAG,OAAO,EAAE,gBAAgB,EAAE,CAAC,CAAC,CACxI,CAAC;IACH,CAAC;IACD,OAAO;QACN,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,EAAE,OAAO,EAAE,eAAe,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;QAChG,MAAM,EAAE,CAAC,GAA2D,EAAE,KAAa,EAAE,EAAE;YACtF,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,OAAO,EAAE,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC;QAC3G,CAAC;QACD,IAAI,EAAE,GAAG,EAAE;YACV,IAAI,IAAI,CAAC,CAAC;YACV,OAAO,EAAE,CAAC;YACV,OAAO,GAAG,EAAE;gBACX,IAAI,IAAI,CAAC,CAAC;gBACV,OAAO,EAAE,CAAC;YACX,CAAC,CAAC;QACH,CAAC;QACD,aAAa,EAAE,CAAC,gBAAkC,EAAE,EAAE;YACrD,UAAU,GAAG,gBAAgB,CAAC;YAC9B,OAAO,EAAE,CAAC;QACX,CAAC;KACD,CAAC;AACH,CAAC"}
|
package/dist/automaticLive.d.ts
CHANGED
|
@@ -27,7 +27,7 @@ export type ChangesClient = AtomRpc.AtomRpcClient<unknown, string, Rpc.Rpc<`${st
|
|
|
27
27
|
}>>;
|
|
28
28
|
}>, RpcSchema.Stream<Schema.Schema<QueryUpdate>, Schema.Unknown>, Schema.Never>>;
|
|
29
29
|
export declare function automaticLive(service: ChangesClient, name: string, owner?: BindingOwner, resume?: ResumeSource, enabled?: boolean, resumeWindow?: ResumeWindow): {
|
|
30
|
-
query: <A, E>(atom: Atom.Atom<AsyncResult.AsyncResult<A, E>>, reference: QueryReference, keys: readonly Key[], equivalent: (left: A, right: A) => boolean, decode
|
|
30
|
+
query: <A, E>(atom: Atom.Atom<AsyncResult.AsyncResult<A, E>>, reference: QueryReference, keys: readonly Key[], equivalent: (left: A, right: A) => boolean, decode: (value: unknown) => A, compared: boolean, reactive: (source: Atom.Atom<AsyncResult.AsyncResult<A, E>>) => Atom.Atom<AsyncResult.AsyncResult<A, E>>, headers?: Headers.Input) => Atom.Atom<AsyncResult.AsyncResult<A, E>>;
|
|
31
31
|
subscription: {
|
|
32
32
|
coalesceWindow: Atom.Writable<Duration.Input, Duration.Input>;
|
|
33
33
|
connection: Atom.Atom<LiveStatus<unknown>>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"automaticLive.d.ts","sourceRoot":"","sources":["../src/automaticLive.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,QAAQ,EAAU,KAAK,MAAM,EAAU,MAAM,QAAQ,CAAC;AACpE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,KAAK,KAAK,WAAW,MAAM,+BAA+B,CAAC;AAClE,OAAO,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAC/C,OAAO,KAAK,KAAK,OAAO,MAAM,2BAA2B,CAAC;AAC1D,OAAO,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACjD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,4BAA4B,CAAC;AACtD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAI9D,OAAO,EAAE,KAAK,UAAU,EAAQ,MAAM,UAAU,CAAC;AAKjD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,YAAY,EAAgB,MAAM,YAAY,CAAC;AAEhF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAIzD,eAAO,MAAM,cAAc,eAAmD,CAAC;AAC/E,MAAM,WAAW,SAAS;IACzB,QAAQ,CAAC,CAAC,cAAc,CAAC,EAAE;QAC1B,QAAQ,CAAC,cAAc,EAAE,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QACvD,QAAQ,CAAC,UAAU,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACxC,QAAQ,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;QACtD,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QACxC,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC;KAChD,CAAC;CACF;AAID,MAAM,MAAM,aAAa,GAAG,OAAO,CAAC,aAAa,CAChD,OAAO,EACP,MAAM,EACN,GAAG,CAAC,GAAG,CACN,GAAG,MAAM,WAAW,EACpB,MAAM,CAAC,MAAM,CAAC;IAAE,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC,OAAO,CAAA;KAAE,CAAC,CAAC,CAAA;CAAE,CAAC,EAC3G,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC,EAC5D,MAAM,CAAC,KAAK,CACZ,CACD,CAAC;AAEF,wBAAgB,aAAa,CAC5B,OAAO,EAAE,aAAa,EACtB,IAAI,EAAE,MAAM,EACZ,KAAK,CAAC,EAAE,YAAY,EACpB,MAAM,CAAC,EAAE,YAAY,EACrB,OAAO,UAAO,EACd,YAAY,CAAC,EAAE,YAAY;YAkBZ,CAAC,EAAE,CAAC,QACZ,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,aACnC,cAAc,QACnB,SAAS,GAAG,EAAE,cACR,CAAC,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,KAAK,OAAO,
|
|
1
|
+
{"version":3,"file":"automaticLive.d.ts","sourceRoot":"","sources":["../src/automaticLive.ts"],"names":[],"mappings":"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"}
|
package/dist/automaticLive.js
CHANGED
|
@@ -29,20 +29,20 @@ export function automaticLive(service, name, owner, resume, enabled = true, resu
|
|
|
29
29
|
get.mount(service.runtime);
|
|
30
30
|
return get(status);
|
|
31
31
|
}).pipe(Atom.setIdleTTL(0));
|
|
32
|
-
function query(atom, reference, keys, equivalent, decode, headers) {
|
|
32
|
+
function query(atom, reference, keys, equivalent, decode, compared, reactive, headers) {
|
|
33
33
|
if (!enabled) {
|
|
34
|
-
return queryProgress(atom);
|
|
34
|
+
return queryProgress(reactive(atom));
|
|
35
35
|
}
|
|
36
36
|
const ready = Atom.make(false);
|
|
37
37
|
const signals = querySignals(atom);
|
|
38
|
-
const delivery = queryDelivery(atom, decode, paused, signals);
|
|
39
|
-
const source =
|
|
38
|
+
const delivery = queryDelivery(atom, decode, compared, paused, signals);
|
|
39
|
+
const source = compared ? delivery.atom : reactive(delivery.atom.pipe(Atom.setIdleTTL(0)));
|
|
40
40
|
const subscription = live(service.runtime, {
|
|
41
41
|
initialResync: false,
|
|
42
42
|
keyContext: owner?.context,
|
|
43
|
-
reopenOnResume:
|
|
43
|
+
reopenOnResume: compared,
|
|
44
44
|
resume: signal,
|
|
45
|
-
resyncKeys:
|
|
45
|
+
resyncKeys: compared ? [] : localQueryKeys(keys),
|
|
46
46
|
retryKeys: keys,
|
|
47
47
|
stream: Stream.unwrap(service.use((client) => Effect.succeed(client(`${name}.$changes`, { queries: [reference] }, { headers })))).pipe(delivery.stream, Stream.map((hint) => queryHint(hint, [{ keys }]))),
|
|
48
48
|
});
|
|
@@ -53,12 +53,14 @@ export function automaticLive(service, name, owner, resume, enabled = true, resu
|
|
|
53
53
|
coalesceWindow,
|
|
54
54
|
equivalent,
|
|
55
55
|
paused,
|
|
56
|
-
pushed:
|
|
56
|
+
pushed: compared,
|
|
57
57
|
ready,
|
|
58
|
+
resultVersion: delivery.version,
|
|
58
59
|
signals,
|
|
59
60
|
source,
|
|
60
61
|
statuses,
|
|
61
62
|
subscription,
|
|
63
|
+
subscriptionVersion: delivery.updates,
|
|
62
64
|
});
|
|
63
65
|
shareQuerySignals(gated, atom);
|
|
64
66
|
Object.assign(gated, { initialValueTarget: atom });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"automaticLive.js","sourceRoot":"","sources":["../src/automaticLive.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"automaticLive.js","sourceRoot":"","sources":["../src/automaticLive.ts"],"names":[],"mappings":"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"}
|
package/dist/automaticQuery.d.ts
CHANGED
|
@@ -1,23 +1,9 @@
|
|
|
1
|
-
import { type Duration } from "effect";
|
|
2
1
|
import * as AsyncResult from "effect/reactivity/AsyncResult";
|
|
3
2
|
import * as Atom from "effect/reactivity/Atom";
|
|
4
|
-
import type {
|
|
5
|
-
|
|
6
|
-
import type { QuerySignals } from "#querySignals.ts";
|
|
7
|
-
interface GateOptions<A, E> {
|
|
3
|
+
import type { AutomaticQueryOptions } from "#AutomaticQueryOptions.ts";
|
|
4
|
+
interface GateOptions<A, E> extends AutomaticQueryOptions<A, E> {
|
|
8
5
|
readonly assertOwner: (get: Atom.AtomContext) => void;
|
|
9
|
-
readonly atom: Atom.Atom<AsyncResult.AsyncResult<A, E>>;
|
|
10
|
-
readonly clientStatuses: Atom.Writable<ReadonlyMap<object, LiveStatus<unknown>>> | undefined;
|
|
11
|
-
readonly coalesceWindow: Atom.Writable<Duration.Input>;
|
|
12
|
-
readonly equivalent: (left: A, right: A) => boolean;
|
|
13
|
-
readonly paused: Atom.Writable<boolean>;
|
|
14
|
-
readonly pushed: boolean;
|
|
15
|
-
readonly ready: Atom.Writable<boolean>;
|
|
16
|
-
readonly signals: Atom.Writable<QuerySignals>;
|
|
17
|
-
readonly source: Atom.Atom<AsyncResult.AsyncResult<A, E>>;
|
|
18
|
-
readonly statuses: Atom.Writable<ReadonlyMap<object, LiveStatus<unknown>>>;
|
|
19
|
-
readonly subscription: LiveBound[typeof LiveConnection];
|
|
20
6
|
}
|
|
21
|
-
export declare function automaticQuery<A, E>({ atom, assertOwner, coalesceWindow, clientStatuses, equivalent, paused, pushed, ready, signals, source, statuses, subscription, }: GateOptions<A, E>): Atom.Atom<AsyncResult.AsyncResult<A, E>>;
|
|
7
|
+
export declare function automaticQuery<A, E>({ atom, assertOwner, coalesceWindow, clientStatuses, equivalent, paused, pushed, ready, resultVersion, signals, source, statuses, subscription, subscriptionVersion, }: GateOptions<A, E>): Atom.Atom<AsyncResult.AsyncResult<A, E>>;
|
|
22
8
|
export {};
|
|
23
9
|
//# sourceMappingURL=automaticQuery.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"automaticQuery.d.ts","sourceRoot":"","sources":["../src/automaticQuery.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"automaticQuery.d.ts","sourceRoot":"","sources":["../src/automaticQuery.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,WAAW,MAAM,+BAA+B,CAAC;AAC7D,OAAO,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAC/C,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAOvE,UAAU,WAAW,CAAC,CAAC,EAAE,CAAC,CAAE,SAAQ,qBAAqB,CAAC,CAAC,EAAE,CAAC,CAAC;IAC9D,QAAQ,CAAC,WAAW,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC,WAAW,KAAK,IAAI,CAAC;CACtD;AACD,wBAAgB,cAAc,CAAC,CAAC,EAAE,CAAC,EAAE,EACpC,IAAI,EACJ,WAAW,EACX,cAAc,EACd,cAAc,EACd,UAAU,EACV,MAAM,EACN,MAAM,EACN,KAAK,EACL,aAAa,EACb,OAAO,EACP,MAAM,EACN,QAAQ,EACR,YAAY,EACZ,mBAAmB,GACnB,EAAE,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC,4CAoHnB"}
|
package/dist/automaticQuery.js
CHANGED
|
@@ -5,10 +5,14 @@ import { queryCoalesceWindow } from "#queryCoalesceWindow.ts";
|
|
|
5
5
|
import { queryFailure } from "#queryFailure.ts";
|
|
6
6
|
import { recordCompletion, recordSubscription } from "#queryProgress.ts";
|
|
7
7
|
import { queryResult } from "#queryResult.ts";
|
|
8
|
-
export function automaticQuery({ atom, assertOwner, coalesceWindow, clientStatuses, equivalent, paused, pushed, ready, signals, source, statuses, subscription, }) {
|
|
8
|
+
export function automaticQuery({ atom, assertOwner, coalesceWindow, clientStatuses, equivalent, paused, pushed, ready, resultVersion, signals, source, statuses, subscription, subscriptionVersion, }) {
|
|
9
9
|
const gated = Atom.readable((get) => {
|
|
10
10
|
assertOwner(get);
|
|
11
11
|
get.mount(signals);
|
|
12
|
+
get.mount(resultVersion);
|
|
13
|
+
get.mount(subscriptionVersion);
|
|
14
|
+
const openingVersion = get.once(subscriptionVersion);
|
|
15
|
+
get.refresh(subscription.connection);
|
|
12
16
|
const registry = get.registry;
|
|
13
17
|
const dispatcher = registry.schedulerAsync.makeDispatcher();
|
|
14
18
|
let denied = false;
|
|
@@ -17,7 +21,7 @@ export function automaticQuery({ atom, assertOwner, coalesceWindow, clientStatus
|
|
|
17
21
|
get.set(ready, false);
|
|
18
22
|
get.set(signals, { ...get.once(signals), pending: true, subscription: "opening" });
|
|
19
23
|
get.once(queryCoalesceWindow(gated));
|
|
20
|
-
get.subscribe(queryCoalesceWindow(gated), (value) => get.set(queryCoalesceWindow(
|
|
24
|
+
get.subscribe(queryCoalesceWindow(gated), (value) => get.set(queryCoalesceWindow(source), value), { immediate: true });
|
|
21
25
|
const token = {};
|
|
22
26
|
let active = true;
|
|
23
27
|
function observe(value) {
|
|
@@ -29,7 +33,7 @@ export function automaticQuery({ atom, assertOwner, coalesceWindow, clientStatus
|
|
|
29
33
|
}
|
|
30
34
|
}
|
|
31
35
|
}, 0);
|
|
32
|
-
if (value.connection === "live") {
|
|
36
|
+
if (value.connection === "live" && get.once(subscriptionVersion) > openingVersion) {
|
|
33
37
|
denied = false;
|
|
34
38
|
registry.set(ready, true);
|
|
35
39
|
}
|
|
@@ -49,22 +53,22 @@ export function automaticQuery({ atom, assertOwner, coalesceWindow, clientStatus
|
|
|
49
53
|
get.addFinalizer(registry.subscribe(subscription.status, observe, { immediate: true }));
|
|
50
54
|
get.addFinalizer(registry.subscribe(coalesceWindow, (value) => registry.set(subscription.coalesceWindow, value), { immediate: true }));
|
|
51
55
|
let started = false;
|
|
56
|
+
let deniedVersion = 0;
|
|
52
57
|
function start() {
|
|
53
58
|
if (stopSource !== undefined) {
|
|
54
59
|
return;
|
|
55
60
|
}
|
|
56
|
-
|
|
57
|
-
if (!pushed) {
|
|
61
|
+
if (!pushed && get.once(resultVersion) === deniedVersion) {
|
|
58
62
|
get.refresh(source);
|
|
59
63
|
}
|
|
64
|
+
started = true;
|
|
60
65
|
const publish = queryResult(equivalent, (value) => {
|
|
61
66
|
if (!denied) {
|
|
62
67
|
get.setSelf(value);
|
|
63
68
|
get.set(signals, recordCompletion(get.once(signals), value));
|
|
64
69
|
}
|
|
65
70
|
});
|
|
66
|
-
stopSource = registry.subscribe(source, publish);
|
|
67
|
-
publish(get.once(source));
|
|
71
|
+
stopSource = registry.subscribe(source, publish, { immediate: true });
|
|
68
72
|
}
|
|
69
73
|
get.once(ready);
|
|
70
74
|
get.subscribe(ready, (value) => {
|
|
@@ -75,6 +79,7 @@ export function automaticQuery({ atom, assertOwner, coalesceWindow, clientStatus
|
|
|
75
79
|
const failed = queryFailure(() => started && !pushed, (cause) => {
|
|
76
80
|
if (Option.exists(Cause.findErrorOption(cause), Predicate.isTagged("QueryReadDenied"))) {
|
|
77
81
|
denied = true;
|
|
82
|
+
deniedVersion = get.once(resultVersion);
|
|
78
83
|
registry.set(ready, false);
|
|
79
84
|
stopSource?.();
|
|
80
85
|
stopSource = undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"automaticQuery.js","sourceRoot":"","sources":["../src/automaticQuery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,
|
|
1
|
+
{"version":3,"file":"automaticQuery.js","sourceRoot":"","sources":["../src/automaticQuery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAClD,OAAO,KAAK,WAAW,MAAM,+BAA+B,CAAC;AAC7D,OAAO,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAG/C,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACzE,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAK9C,MAAM,UAAU,cAAc,CAAO,EACpC,IAAI,EACJ,WAAW,EACX,cAAc,EACd,cAAc,EACd,UAAU,EACV,MAAM,EACN,MAAM,EACN,KAAK,EACL,aAAa,EACb,OAAO,EACP,MAAM,EACN,QAAQ,EACR,YAAY,EACZ,mBAAmB,GACA;IACnB,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAC1B,CAAC,GAAG,EAAE,EAAE;QACP,WAAW,CAAC,GAAG,CAAC,CAAC;QACjB,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACnB,GAAG,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;QACzB,GAAG,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;QAC/B,MAAM,cAAc,GAAG,GAAG,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;QACrD,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;QACrC,MAAM,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC;QAC9B,MAAM,UAAU,GAAG,QAAQ,CAAC,cAAc,CAAC,cAAc,EAAE,CAAC;QAC5D,IAAI,MAAM,GAAG,KAAK,CAAC;QACnB,IAAI,UAAoC,CAAC;QACzC,GAAG,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;QACvC,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QACtB,GAAG,CAAC,GAAG,CAAC,OAAO,EAAE,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,SAAS,EAAE,CAAC,CAAC;QACnF,GAAG,CAAC,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC,CAAC;QACrC,GAAG,CAAC,SAAS,CAAC,mBAAmB,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,mBAAmB,CAAC,MAAM,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACvH,MAAM,KAAK,GAAG,EAAE,CAAC;QACjB,IAAI,MAAM,GAAG,IAAI,CAAC;QAClB,SAAS,OAAO,CAAC,KAA0B;YAC1C,GAAG,CAAC,GAAG,CAAC,OAAO,EAAE,kBAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC;YAC/D,UAAU,CAAC,YAAY,CAAC,GAAG,EAAE;gBAC5B,IAAI,MAAM,EAAE,CAAC;oBACZ,KAAK,MAAM,KAAK,IAAI,cAAc,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,cAAc,CAAC,EAAE,CAAC;wBAC5F,QAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,OAAO,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;oBAC5E,CAAC;gBACF,CAAC;YACF,CAAC,EAAE,CAAC,CAAC,CAAC;YACN,IAAI,KAAK,CAAC,UAAU,KAAK,MAAM,IAAI,GAAG,CAAC,IAAI,CAAC,mBAAmB,CAAC,GAAG,cAAc,EAAE,CAAC;gBACnF,MAAM,GAAG,KAAK,CAAC;gBACf,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;YAC3B,CAAC;QACF,CAAC;QACD,GAAG,CAAC,YAAY,CAAC,GAAG,EAAE;YACrB,MAAM,GAAG,KAAK,CAAC;YACf,KAAK,MAAM,KAAK,IAAI,cAAc,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,cAAc,CAAC,EAAE,CAAC;gBAC5F,IAAI,QAAQ,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;oBACpC,QAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,OAAO,EAAE,EAAE;wBAClC,MAAM,IAAI,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC;wBAC9B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;wBACnB,OAAO,IAAI,CAAC;oBACb,CAAC,CAAC,CAAC;gBACJ,CAAC;YACF,CAAC;QACF,CAAC,CAAC,CAAC;QACH,GAAG,CAAC,YAAY,CAAC,QAAQ,CAAC,SAAS,CAAC,YAAY,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;QACxF,GAAG,CAAC,YAAY,CAAC,QAAQ,CAAC,SAAS,CAAC,cAAc,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,YAAY,CAAC,cAAc,EAAE,KAAK,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;QACvI,IAAI,OAAO,GAAG,KAAK,CAAC;QACpB,IAAI,aAAa,GAAG,CAAC,CAAC;QACtB,SAAS,KAAK;YACb,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;gBAC9B,OAAO;YACR,CAAC;YACD,IAAI,CAAC,MAAM,IAAI,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,KAAK,aAAa,EAAE,CAAC;gBAC1D,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YACrB,CAAC;YACD,OAAO,GAAG,IAAI,CAAC;YACf,MAAM,OAAO,GAAG,WAAW,CAAO,UAAU,EAAE,CAAC,KAAK,EAAE,EAAE;gBACvD,IAAI,CAAC,MAAM,EAAE,CAAC;oBACb,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;oBACnB,GAAG,CAAC,GAAG,CAAC,OAAO,EAAE,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC;gBAC9D,CAAC;YACF,CAAC,CAAC,CAAC;YACH,UAAU,GAAG,QAAQ,CAAC,SAAS,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACvE,CAAC;QACD,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAChB,GAAG,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE;YAC9B,IAAI,KAAK,EAAE,CAAC;gBACX,KAAK,EAAE,CAAC;YACT,CAAC;QACF,CAAC,CAAC,CAAC;QACH,MAAM,MAAM,GAAG,YAAY,CAC1B,GAAG,EAAE,CAAC,OAAO,IAAI,CAAC,MAAM,EACxB,CAAC,KAAK,EAAE,EAAE;YACT,IAAI,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC,KAAK,CAAC,EAAE,SAAS,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC,EAAE,CAAC;gBACxF,MAAM,GAAG,IAAI,CAAC;gBACd,aAAa,GAAG,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;gBACxC,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;gBAC3B,UAAU,EAAE,EAAE,CAAC;gBACf,UAAU,GAAG,SAAS,CAAC;YACxB,CAAC;YACD,MAAM,MAAM,GAAG,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YAC1C,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YACpB,GAAG,CAAC,GAAG,CAAC,OAAO,EAAE,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;QAC/D,CAAC,CACD,CAAC;QACF,GAAG,CAAC,SAAS,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC3C,GAAG,CAAC,YAAY,CAAC,QAAQ,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,YAAY,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;QACvH,SAAS,MAAM;YACd,IAAI,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,UAAU,KAAK,QAAQ,EAAE,CAAC;gBAC3D,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;YACtC,CAAC;QACF,CAAC;QACD,IAAI,MAAM,EAAE,CAAC;YACZ,GAAG,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE;gBAC/B,IAAI,CAAC,KAAK,EAAE,CAAC;oBACZ,MAAM,EAAE,CAAC;gBACV,CAAC;YACF,CAAC,CAAC,CAAC;QACJ,CAAC;QACD,GAAG,CAAC,KAAK,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;QACnC,IAAI,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;YACrB,KAAK,EAAE,CAAC;YACR,OAAO,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACzB,CAAC;QACD,OAAO,WAAW,CAAC,OAAO,EAAE,CAAC;IAC9B,CAAC,EACD,CAAC,OAAO,EAAE,EAAE;QACX,IAAI,CAAC,MAAM,EAAE,CAAC;YACb,OAAO,CAAC,IAAI,CAAC,CAAC;QACf,CAAC;QACD,OAAO,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;IAClC,CAAC,CACD,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;IAC3B,OAAO,KAAK,CAAC;AACd,CAAC"}
|
package/dist/changesSuccess.d.ts
CHANGED
|
@@ -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<
|
|
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,
|
|
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"}
|
package/dist/changesSuccess.js
CHANGED
|
@@ -6,10 +6,8 @@ export function changesSuccess(queries) {
|
|
|
6
6
|
return Schema.Union([
|
|
7
7
|
LiveHint,
|
|
8
8
|
QueryReadDenied,
|
|
9
|
-
...queries
|
|
10
|
-
|
|
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;
|
|
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
|
|
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
|
|
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;;;;;;;
|
|
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"}
|
package/dist/clientActivities.js
CHANGED
|
@@ -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(() =>
|
|
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
|
-
|
|
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
|
-
|
|
31
|
-
|
|
32
|
-
|
|
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
|
-
|
|
39
|
-
|
|
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":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,KAAK,WAAW,MAAM,+BAA+B,CAAC;AAE7D,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAGzC,MAAM,CAAC,MAAM,gBAAgB,GAAG,IAAI,OAAO,EAA2B,CAAC;AAEvE,MAAM,UAAU,YAAY,CAAC,OAA4B;IACxD,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,GAAG,aAAa,EAAE,CAAC;IAClE,MAAM,UAAU,GAAG,gBAAgB,CAAC,OAAO,EAAE,aAAa,EAAE,QAAQ,CAAC,CAAC;IACtE,SAAS,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"clientActivities.js","sourceRoot":"","sources":["../src/clientActivities.ts"],"names":[],"mappings":"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"}
|
package/dist/clientActivity.d.ts
CHANGED
|
@@ -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
|
|
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;;;;;;;;;;
|
|
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"}
|
package/dist/clientActivity.js
CHANGED
|
@@ -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
|
|
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: !
|
|
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
|
}
|