@shivaedev/contract 0.39.0 → 0.40.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 (94) hide show
  1. package/CHANGELOG.md +10 -0
  2. package/README.md +29 -28
  3. package/dist/adapters/LiveDispatcher.d.ts +9 -0
  4. package/dist/adapters/LiveDispatcher.d.ts.map +1 -0
  5. package/dist/adapters/LiveDispatcher.js +5 -0
  6. package/dist/adapters/LiveDispatcher.js.map +1 -0
  7. package/dist/adapters/liveHintStream.d.ts +30 -0
  8. package/dist/adapters/liveHintStream.d.ts.map +1 -0
  9. package/dist/adapters/liveHintStream.js +10 -0
  10. package/dist/adapters/liveHintStream.js.map +1 -0
  11. package/dist/adapters/openLiveHints.d.ts +30 -0
  12. package/dist/adapters/openLiveHints.d.ts.map +1 -0
  13. package/dist/adapters/openLiveHints.js +59 -0
  14. package/dist/adapters/openLiveHints.js.map +1 -0
  15. package/dist/adapters/refreshSubscription.d.ts +4 -0
  16. package/dist/adapters/refreshSubscription.d.ts.map +1 -0
  17. package/dist/adapters/refreshSubscription.js +5 -0
  18. package/dist/adapters/refreshSubscription.js.map +1 -0
  19. package/dist/adapters/standaloneLiveServer.d.ts +32 -0
  20. package/dist/adapters/standaloneLiveServer.d.ts.map +1 -0
  21. package/dist/adapters/standaloneLiveServer.js +13 -0
  22. package/dist/adapters/standaloneLiveServer.js.map +1 -0
  23. package/dist/adapters/withClientProtocol.d.ts +4 -0
  24. package/dist/adapters/withClientProtocol.d.ts.map +1 -0
  25. package/dist/adapters/withClientProtocol.js +6 -0
  26. package/dist/adapters/withClientProtocol.js.map +1 -0
  27. package/dist/adapters/withPolicyContext.d.ts +4 -0
  28. package/dist/adapters/withPolicyContext.d.ts.map +1 -0
  29. package/dist/adapters/withPolicyContext.js +7 -0
  30. package/dist/adapters/withPolicyContext.js.map +1 -0
  31. package/dist/live-server/initialize.d.ts +6 -0
  32. package/dist/live-server/initialize.d.ts.map +1 -0
  33. package/dist/live-server/initialize.js +7 -0
  34. package/dist/live-server/initialize.js.map +1 -0
  35. package/dist/live-server/layer.d.ts +3 -0
  36. package/dist/live-server/layer.d.ts.map +1 -0
  37. package/dist/live-server/layer.js +5 -0
  38. package/dist/live-server/layer.js.map +1 -0
  39. package/dist/live-server/register.d.ts +26 -0
  40. package/dist/live-server/register.d.ts.map +1 -0
  41. package/dist/live-server/register.js +8 -0
  42. package/dist/live-server/register.js.map +1 -0
  43. package/dist/live-server/resync.d.ts +4 -3
  44. package/dist/live-server/resync.d.ts.map +1 -1
  45. package/dist/live-server/resync.js +8 -2
  46. package/dist/live-server/resync.js.map +1 -1
  47. package/dist/live-server/service.d.ts +49 -0
  48. package/dist/live-server/service.d.ts.map +1 -0
  49. package/dist/live-server/service.js +19 -0
  50. package/dist/live-server/service.js.map +1 -0
  51. package/dist/live-server/stream.d.ts +4 -4
  52. package/dist/live-server/stream.d.ts.map +1 -1
  53. package/dist/live-server/stream.js +6 -3
  54. package/dist/live-server/stream.js.map +1 -1
  55. package/dist/live-server/subscribe.d.ts +3 -4
  56. package/dist/live-server/subscribe.d.ts.map +1 -1
  57. package/dist/live-server/subscribe.js +28 -6
  58. package/dist/live-server/subscribe.js.map +1 -1
  59. package/dist/makeLiveServer.d.ts +5 -10
  60. package/dist/makeLiveServer.d.ts.map +1 -1
  61. package/dist/makeLiveServer.js +3 -90
  62. package/dist/makeLiveServer.js.map +1 -1
  63. package/dist/querySubscription.js +5 -11
  64. package/dist/querySubscription.js.map +1 -1
  65. package/dist/readPolicy.d.ts.map +1 -1
  66. package/dist/readPolicy.js +2 -3
  67. package/dist/readPolicy.js.map +1 -1
  68. package/dist/rpcClient.d.ts.map +1 -1
  69. package/dist/rpcClient.js +2 -1
  70. package/dist/rpcClient.js.map +1 -1
  71. package/package.json +8 -8
  72. package/src/adapters/LiveDispatcher.ts +10 -0
  73. package/src/adapters/liveHintStream.ts +15 -0
  74. package/src/adapters/openLiveHints.ts +62 -0
  75. package/src/adapters/refreshSubscription.ts +6 -0
  76. package/src/adapters/standaloneLiveServer.ts +19 -0
  77. package/src/adapters/withClientProtocol.ts +10 -0
  78. package/src/adapters/withPolicyContext.ts +8 -0
  79. package/src/live-server/initialize.ts +7 -0
  80. package/src/live-server/layer.ts +5 -0
  81. package/src/live-server/register.ts +10 -0
  82. package/src/live-server/resync.ts +9 -4
  83. package/src/live-server/service.ts +19 -0
  84. package/src/live-server/stream.ts +7 -4
  85. package/src/live-server/subscribe.ts +43 -12
  86. package/src/makeLiveServer.ts +3 -104
  87. package/src/querySubscription.ts +8 -11
  88. package/src/readPolicy.ts +2 -3
  89. package/src/rpcClient.ts +4 -6
  90. package/dist/LiveServer.d.ts +0 -27
  91. package/dist/LiveServer.d.ts.map +0 -1
  92. package/dist/LiveServer.js +0 -18
  93. package/dist/LiveServer.js.map +0 -1
  94. package/src/LiveServer.ts +0 -18
@@ -0,0 +1,49 @@
1
+ import * as Reactivity from "effect/reactivity/Reactivity";
2
+ import { LiveDispatcher } from "#adapters/LiveDispatcher.ts";
3
+ export declare const LiveServer: import("effect/Context").Service<"@shivaedev/contract/LiveServer", Readonly<{
4
+ readonly register: (keys: readonly import("@shivaedev/changes/keys.ts").Key[]) => import("effect/Effect").Effect<import("effect/Stream").Stream<{
5
+ replaceKeys: (current: readonly import("@shivaedev/changes/keys.ts").Key[]) => void;
6
+ stream: import("effect/Stream").Stream<{
7
+ readonly _tag: "Changed";
8
+ readonly keys: readonly ({
9
+ readonly _tag: "Bucket";
10
+ readonly collection: string;
11
+ readonly field: string;
12
+ readonly value: string | number;
13
+ } | {
14
+ readonly _tag: "List";
15
+ readonly collection: string;
16
+ } | {
17
+ readonly _tag: "Item";
18
+ readonly collection: string;
19
+ readonly id: string | number;
20
+ })[];
21
+ readonly queryIndexes?: readonly number[] | undefined;
22
+ } | {
23
+ readonly _tag: "Resync";
24
+ }, never, never>;
25
+ }, never, never>, never, never>;
26
+ readonly resync: () => import("effect/Effect").Effect<number, never, never>;
27
+ readonly stream: (keys: readonly import("@shivaedev/changes/keys.ts").Key[]) => import("effect/Effect").Effect<import("effect/Stream").Stream<{
28
+ readonly _tag: "Changed";
29
+ readonly keys: readonly ({
30
+ readonly _tag: "Bucket";
31
+ readonly collection: string;
32
+ readonly field: string;
33
+ readonly value: string | number;
34
+ } | {
35
+ readonly _tag: "List";
36
+ readonly collection: string;
37
+ } | {
38
+ readonly _tag: "Item";
39
+ readonly collection: string;
40
+ readonly id: string | number;
41
+ })[];
42
+ readonly queryIndexes?: readonly number[] | undefined;
43
+ } | {
44
+ readonly _tag: "Resync";
45
+ }, never, never>, never, never>;
46
+ }>> & {
47
+ readonly layer: import("effect/Layer").Layer<"@shivaedev/contract/LiveServer", never, LiveDispatcher | Reactivity.Reactivity>;
48
+ };
49
+ //# sourceMappingURL=service.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../src/live-server/service.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,UAAU,MAAM,8BAA8B,CAAC;AAE3D,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAM7D,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CASrB,CAAC"}
@@ -0,0 +1,19 @@
1
+ import { Random } from "effect";
2
+ import * as Reactivity from "effect/reactivity/Reactivity";
3
+ import { defineService } from "@shivaedev/service/defineService.ts";
4
+ import { LiveDispatcher } from "#adapters/LiveDispatcher.ts";
5
+ import { initialize } from "./initialize.js";
6
+ import { register } from "./register.js";
7
+ import { resync } from "./resync.js";
8
+ import { stream } from "./stream.js";
9
+ export const LiveServer = defineService({
10
+ id: "@shivaedev/contract/LiveServer",
11
+ initialize,
12
+ methods: (state) => ({
13
+ register: register(state),
14
+ resync: resync(state),
15
+ stream: stream(state),
16
+ }),
17
+ requires: [Reactivity.Reactivity, LiveDispatcher, Random.Random],
18
+ });
19
+ //# sourceMappingURL=service.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"service.js","sourceRoot":"","sources":["../../src/live-server/service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,KAAK,UAAU,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC,MAAM,CAAC,MAAM,UAAU,GAAG,aAAa,CAAC;IACvC,EAAE,EAAE,gCAAgC;IACpC,UAAU;IACV,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QACpB,QAAQ,EAAE,QAAQ,CAAC,KAAK,CAAC;QACzB,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC;QACrB,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC;KACrB,CAAC;IACF,QAAQ,EAAE,CAAC,UAAU,CAAC,UAAU,EAAE,cAAc,EAAE,MAAM,CAAC,MAAM,CAAC;CAChE,CAAC,CAAC"}
@@ -1,7 +1,7 @@
1
- import { Effect } from "effect";
1
+ import { Effect, Stream } from "effect";
2
2
  import type { Key } from "@shivaedev/changes/keys.ts";
3
- import type { makeLiveServer } from "#makeLiveServer.ts";
4
- export declare function stream(server: Effect.Success<typeof makeLiveServer>): (keys: readonly Key[]) => Effect.Effect<import("effect/Stream").Stream<{
3
+ import type { initialize } from "./initialize.ts";
4
+ export declare function stream(state: Effect.Success<typeof initialize>): (keys: readonly Key[]) => Effect.Effect<Stream.Stream<{
5
5
  readonly _tag: "Changed";
6
6
  readonly keys: readonly ({
7
7
  readonly _tag: "Bucket";
@@ -19,5 +19,5 @@ export declare function stream(server: Effect.Success<typeof makeLiveServer>): (
19
19
  readonly queryIndexes?: readonly number[] | undefined;
20
20
  } | {
21
21
  readonly _tag: "Resync";
22
- }, never, never>, never, never>;
22
+ }, never, never>, never, import("../adapters/LiveDispatcher.ts").LiveDispatcher | import("effect/reactivity/Reactivity").Reactivity>;
23
23
  //# sourceMappingURL=stream.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"stream.d.ts","sourceRoot":"","sources":["../../src/live-server/stream.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,4BAA4B,CAAC;AACtD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEzD,wBAAgB,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,OAAO,cAAc,CAAC,UACrD,SAAS,GAAG,EAAE;;;;;;;;;;;;;;;;;;gCAC5B"}
1
+ {"version":3,"file":"stream.d.ts","sourceRoot":"","sources":["../../src/live-server/stream.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,4BAA4B,CAAC;AAEtD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAElD,wBAAgB,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,OAAO,UAAU,CAAC;;;;;;;;;;;;;;;;;;qIAI9D"}
@@ -1,5 +1,8 @@
1
- import { Effect } from "effect";
2
- export function stream(server) {
3
- return (keys) => Effect.succeed(server.stream(keys));
1
+ import { Effect, Stream } from "effect";
2
+ import { liveHintStream } from "#adapters/liveHintStream.ts";
3
+ export function stream(state) {
4
+ return Effect.fn("LiveServer.stream")(function* (keys) {
5
+ return (yield* liveHintStream(state, keys)).pipe(Stream.flatMap((registration) => registration.stream));
6
+ });
4
7
  }
5
8
  //# sourceMappingURL=stream.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"stream.js","sourceRoot":"","sources":["../../src/live-server/stream.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAIhC,MAAM,UAAU,MAAM,CAAC,MAA6C;IACnE,OAAO,CAAC,IAAoB,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;AACtE,CAAC"}
1
+ {"version":3,"file":"stream.js","sourceRoot":"","sources":["../../src/live-server/stream.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAExC,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAG7D,MAAM,UAAU,MAAM,CAAC,KAAwC;IAC9D,OAAO,MAAM,CAAC,EAAE,CAAC,mBAAmB,CAAC,CAAC,QAAQ,CAAC,EAAE,IAAoB;QACpE,OAAO,CAAC,KAAK,CAAC,CAAC,cAAc,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,YAAY,EAAE,EAAE,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC;IACzG,CAAC,CAAC,CAAC;AACJ,CAAC"}
@@ -1,7 +1,6 @@
1
- import { Effect, type Stream } from "effect";
2
- import type { makeLiveServer } from "#makeLiveServer.ts";
1
+ import { Effect, Stream } from "effect";
3
2
  import type { QueryRerun, QuerySubscription } from "#querySubscription.ts";
4
3
  import type { QueryUpdate, SubscriptionHint } from "#queryUpdate.ts";
5
- import type { QueryReadDenied } from "#readPolicyErrors.ts";
6
- export declare function subscribe(server: Effect.Success<typeof makeLiveServer>): <E, R, TRead extends QueryRerun<unknown, unknown> | undefined = undefined>(subscription: QuerySubscription<E, R>, read?: (TRead & (QueryRerun<E, R> | undefined)) | undefined) => Effect.Effect<Stream.Stream<TRead extends undefined ? SubscriptionHint : QueryUpdate, E | QueryReadDenied, R>>;
4
+ import { QueryReadDenied } from "#readPolicyErrors.ts";
5
+ export declare const subscribe: <E, R, TRead extends QueryRerun<unknown, unknown> | undefined = undefined>(subscription: QuerySubscription<E, R>, read?: (TRead & (QueryRerun<E, R> | undefined)) | undefined) => Effect.Effect<Stream.Stream<TRead extends undefined ? SubscriptionHint : QueryUpdate, E | QueryReadDenied, R>, never, "@shivaedev/contract/LiveServer">;
7
6
  //# sourceMappingURL=subscribe.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"subscribe.d.ts","sourceRoot":"","sources":["../../src/live-server/subscribe.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC7C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,KAAK,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC3E,OAAO,KAAK,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACrE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAE5D,wBAAgB,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,OAAO,cAAc,CAAC,IAC1C,CAAC,EAAE,CAAC,EAAE,KAAK,SAAS,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG,SAAS,4BACzE,iBAAiB,CAAC,CAAC,EAAE,CAAC,CAAC,kEAEnC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,SAAS,SAAS,GAAG,gBAAgB,GAAG,WAAW,EAAE,CAAC,GAAG,eAAe,EAAE,CAAC,CAAC,CAAC,CAKjH"}
1
+ {"version":3,"file":"subscribe.d.ts","sourceRoot":"","sources":["../../src/live-server/subscribe.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAIxC,OAAO,KAAK,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC3E,OAAO,KAAK,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACrE,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAwCvD,eAAO,MAAM,SAAS,GArCI,CAAC,EAAE,CAAC,EAAE,KAAK,SAAS,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG,SAAS,4QAqCV,CAAC"}
@@ -1,8 +1,30 @@
1
- import { Effect } from "effect";
2
- export function subscribe(server) {
3
- function subscribeToQueries(subscription, read) {
4
- return Effect.succeed(read === undefined ? server.subscribe(subscription) : server.subscribe(subscription, read));
5
- }
6
- return subscribeToQueries;
1
+ import { Effect, Stream } from "effect";
2
+ import { refreshSubscription } from "#adapters/refreshSubscription.ts";
3
+ import { compareQueries } from "#compareQueries.ts";
4
+ import { QueryReadDenied } from "#readPolicyErrors.ts";
5
+ import { LiveServer } from "./service.js";
6
+ function subscribeQueries(subscription, read) {
7
+ return Effect.fnUntraced(function* () {
8
+ const server = yield* LiveServer;
9
+ const hints = yield* server.register(subscription.keys);
10
+ return hints.pipe(Stream.flatMap((registration) => {
11
+ let scopes = subscription.scopes;
12
+ let compare = compareQueries(subscription, read);
13
+ const next = Effect.fnUntraced(function* (hint) {
14
+ if (!(yield* subscription.authorized)) {
15
+ compare = compareQueries(subscription, read);
16
+ return [new QueryReadDenied({ message: "Read no longer allowed for subscribed queries" })];
17
+ }
18
+ const updates = yield* compare(hint, scopes);
19
+ if (subscription.readScopes !== undefined) {
20
+ scopes = yield* subscription.readScopes;
21
+ registration.replaceKeys(scopes.flat());
22
+ }
23
+ return updates;
24
+ });
25
+ return registration.stream.pipe(Stream.mapEffect((hint) => refreshSubscription(subscription, next(hint))), Stream.flatMap(Stream.fromIterable));
26
+ }));
27
+ })();
7
28
  }
29
+ export const subscribe = Effect.fn("LiveServer.subscribe")(subscribeQueries);
8
30
  //# sourceMappingURL=subscribe.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"subscribe.js","sourceRoot":"","sources":["../../src/live-server/subscribe.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAe,MAAM,QAAQ,CAAC;AAM7C,MAAM,UAAU,SAAS,CAAC,MAA6C;IAKtE,SAAS,kBAAkB,CAAO,YAAqC,EAAE,IAAuB;QAC/F,OAAO,MAAM,CAAC,OAAO,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC,CAAC;IACnH,CAAC;IACD,OAAO,kBAAkB,CAAC;AAC3B,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,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,12 +1,7 @@
1
- import { Effect, Stream } from "effect";
2
- import * as Reactivity from "effect/reactivity/Reactivity";
3
- import { type Key } from "@shivaedev/changes/keys.ts";
4
- import type { QueryRerun, QuerySubscription } from "#querySubscription.ts";
5
- import type { QueryUpdate, SubscriptionHint } from "#queryUpdate.ts";
6
- import { QueryReadDenied } from "#readPolicyErrors.ts";
1
+ import { Effect } from "effect";
7
2
  export declare const makeLiveServer: Effect.Effect<{
8
3
  resync: Effect.Effect<number, never, never>;
9
- stream: (keys: readonly Key[]) => Stream.Stream<{
4
+ stream: (keys: readonly import("@shivaedev/changes/keys.ts").Key[]) => import("effect/Stream").Stream<{
10
5
  readonly _tag: "Changed";
11
6
  readonly keys: readonly ({
12
7
  readonly _tag: "Bucket";
@@ -26,8 +21,8 @@ export declare const makeLiveServer: Effect.Effect<{
26
21
  readonly _tag: "Resync";
27
22
  }, never, never>;
28
23
  subscribe: {
29
- <E, R>(subscription: QuerySubscription<E, R>): Stream.Stream<SubscriptionHint, E | QueryReadDenied, R>;
30
- <E, R>(subscription: QuerySubscription<E, R>, read: QueryRerun<E, R>): Stream.Stream<QueryUpdate, E | QueryReadDenied, R>;
24
+ <E, R>(subscription: import("./querySubscription.ts").QuerySubscription<E, R>): import("effect/Stream").Stream<import("./queryUpdate.ts").SubscriptionHint, E | import("./readPolicyErrors.ts").QueryReadDenied, R>;
25
+ <E, R>(subscription: import("./querySubscription.ts").QuerySubscription<E, R>, read: import("./querySubscription.ts").QueryRerun<E, R>): import("effect/Stream").Stream<import("./queryUpdate.ts").QueryUpdate, E | import("./readPolicyErrors.ts").QueryReadDenied, R>;
31
26
  };
32
- }, never, Reactivity.Reactivity>;
27
+ }, never, import("effect/reactivity/Reactivity").Reactivity>;
33
28
  //# sourceMappingURL=makeLiveServer.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"makeLiveServer.d.ts","sourceRoot":"","sources":["../src/makeLiveServer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAA4B,MAAM,EAAE,MAAM,QAAQ,CAAC;AAClE,OAAO,KAAK,UAAU,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,KAAK,GAAG,EAAY,MAAM,4BAA4B,CAAC;AAIhE,OAAO,KAAK,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC3E,OAAO,KAAK,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACrE,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,eAAO,MAAM,cAAc;;mBA6FM,SAAS,GAAG,EAAE;;;;;;;;;;;;;;;;;;;;SA7B3B,CAAC,EAAE,CAAC,gBAAgB,iBAAiB,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,gBAAgB,EAAE,CAAC,GAAG,eAAe,EAAE,CAAC,CAAC;SACrG,CAAC,EAAE,CAAC,gBAAgB,iBAAiB,CAAC,CAAC,EAAE,CAAC,CAAC,QAAQ,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,GAAG,eAAe,EAAE,CAAC,CAAC;;gCA6B1I,CAAC"}
1
+ {"version":3,"file":"makeLiveServer.d.ts","sourceRoot":"","sources":["../src/makeLiveServer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAGhC,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;4DAAuE,CAAC"}
@@ -1,91 +1,4 @@
1
- import { Effect, Queue, Random, Scheduler, Stream } from "effect";
2
- import * as Reactivity from "effect/reactivity/Reactivity";
3
- import { readKeys } from "@shivaedev/changes/keys.ts";
4
- import { compareQueries } from "#compareQueries.ts";
5
- import { liveHintQueue } from "#liveHintQueue.ts";
6
- import { QueryReadDenied } from "#readPolicyErrors.ts";
7
- export const makeLiveServer = Effect.gen(function* () {
8
- const reactivity = yield* Reactivity.Reactivity;
9
- const dispatcher = (yield* Scheduler.Scheduler).makeDispatcher();
10
- let openStreams = 0;
11
- const resyncKey = `@shivaedev/contract/resync/${yield* Random.nextInt}`;
12
- function open(keys) {
13
- return Effect.gen(function* () {
14
- const { offer, queue } = yield* liveHintQueue;
15
- const pending = new Map();
16
- let scheduled = false;
17
- let resync = false;
18
- let active = true;
19
- function flush() {
20
- if (scheduled) {
21
- return;
22
- }
23
- scheduled = true;
24
- dispatcher.scheduleTask(() => {
25
- scheduled = false;
26
- if (active) {
27
- offer(resync ? { _tag: "Resync" } : { _tag: "Changed", keys: [...pending.values()] });
28
- }
29
- pending.clear();
30
- resync = false;
31
- }, 0);
32
- }
33
- let cancelKeys = [];
34
- function replaceKeys(current) {
35
- for (const stop of cancelKeys) {
36
- stop();
37
- }
38
- cancelKeys = current.map((key) => {
39
- const own = readKeys([key]);
40
- return reactivity.registerUnsafe(own, () => {
41
- pending.set(own[0] ?? "", key);
42
- flush();
43
- });
44
- });
45
- }
46
- replaceKeys(keys);
47
- const cancel = [
48
- reactivity.registerUnsafe([resyncKey], () => {
49
- resync = true;
50
- flush();
51
- }),
52
- ];
53
- openStreams += 1;
54
- yield* Effect.addFinalizer(() => Effect.sync(() => {
55
- active = false;
56
- openStreams -= 1;
57
- for (const stop of [...cancelKeys, ...cancel]) {
58
- stop();
59
- }
60
- }));
61
- yield* Queue.offer(queue, { _tag: "Resync" });
62
- return { replaceKeys, stream: Stream.fromQueue(queue) };
63
- });
64
- }
65
- const resync = Effect.sync(() => {
66
- reactivity.invalidateUnsafe([resyncKey]);
67
- return openStreams;
68
- });
69
- function subscribe(subscription, read) {
70
- return Stream.unwrap(Effect.gen(function* () {
71
- const registration = yield* open(subscription.keys);
72
- let scopes = subscription.scopes;
73
- let compare = compareQueries(subscription, read);
74
- const next = Effect.fnUntraced(function* (hint) {
75
- if (!(yield* subscription.authorized)) {
76
- compare = compareQueries(subscription, read);
77
- return [new QueryReadDenied({ message: "Read no longer allowed for subscribed queries" })];
78
- }
79
- const updates = yield* compare(hint, scopes);
80
- if (subscription.readScopes !== undefined) {
81
- scopes = yield* subscription.readScopes;
82
- registration.replaceKeys(scopes.flat());
83
- }
84
- return updates;
85
- });
86
- return registration.stream.pipe(Stream.mapEffect((hint) => Effect.flatMap(subscription.refresh ?? Effect.context(), (current) => Effect.provideContext(next(hint), current))), Stream.flatMap(Stream.fromIterable));
87
- }));
88
- }
89
- return { resync, stream: (keys) => Stream.unwrap(Effect.map(open(keys), ({ stream }) => stream)), subscribe };
90
- });
1
+ import { Effect } from "effect";
2
+ import { standaloneLiveServer } from "#adapters/standaloneLiveServer.ts";
3
+ export const makeLiveServer = Effect.fn("LiveServer.makeLiveServer")(() => standaloneLiveServer)();
91
4
  //# sourceMappingURL=makeLiveServer.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"makeLiveServer.js","sourceRoot":"","sources":["../src/makeLiveServer.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"makeLiveServer.js","sourceRoot":"","sources":["../src/makeLiveServer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAEzE,MAAM,CAAC,MAAM,cAAc,GAAG,MAAM,CAAC,EAAE,CAAC,2BAA2B,CAAC,CAAC,GAAG,EAAE,CAAC,oBAAoB,CAAC,EAAE,CAAC"}
@@ -1,6 +1,6 @@
1
1
  import { Context, Effect } from "effect";
2
2
  import { Rpc } from "effect/rpc";
3
- import { policyContext } from "#policyContext.ts";
3
+ import { withPolicyContext } from "#adapters/withPolicyContext.ts";
4
4
  import { queryReadKeys } from "#queryReadKeys.ts";
5
5
  import { checkQuery } from "#readPolicy.ts";
6
6
  import { ChangesQueries } from "#serverMetadata.ts";
@@ -9,17 +9,11 @@ export function querySubscription(rpc, references, viewer) {
9
9
  const queries = yield* Context.getUnsafe(rpc.annotations, ChangesQueries).resolve(references);
10
10
  const prefix = rpc._tag.slice(0, -"$changes".length);
11
11
  const policies = yield* Effect.forEach(queries, Effect.fnUntraced(function* ({ query, payload }) {
12
- const context = yield* policyContext(Rpc.make(`${prefix}${query.name}`));
12
+ const policyRpc = Rpc.make(`${prefix}${query.name}`);
13
13
  return {
14
- check: Effect.provideContext(checkQuery(query, payload, viewer), context),
15
- keys: Effect.gen(function* () {
16
- const current = yield* policyContext(Rpc.make(`${prefix}${query.name}`));
17
- return yield* queryReadKeys(query, payload, viewer).pipe(Effect.provideContext(current));
18
- }),
19
- permitted: Effect.gen(function* () {
20
- const current = yield* policyContext(Rpc.make(`${prefix}${query.name}`));
21
- return yield* Effect.suspend(() => query.readPolicy?.(payload, viewer) ?? Effect.succeed(false)).pipe(Effect.provideContext(current));
22
- }),
14
+ check: withPolicyContext(policyRpc, checkQuery(query, payload, viewer)),
15
+ keys: withPolicyContext(policyRpc, queryReadKeys(query, payload, viewer)),
16
+ permitted: withPolicyContext(policyRpc, Effect.suspend(() => query.readPolicy?.(payload, viewer) ?? Effect.succeed(false))),
23
17
  };
24
18
  }));
25
19
  yield* Effect.forEach(policies, ({ check }) => check);
@@ -1 +1 @@
1
- {"version":3,"file":"querySubscription.js","sourceRoot":"","sources":["../src/querySubscription.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAe,MAAM,QAAQ,CAAC;AACtD,OAAO,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AAEjC,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAoC,MAAM,gBAAgB,CAAC;AAE9E,OAAO,EAAE,cAAc,EAA0C,MAAM,oBAAoB,CAAC;AAsB5F,MAAM,UAAU,iBAAiB,CAAC,GAAY,EAAE,UAAqC,EAAE,MAA6B;IACnH,OAAO,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC;QACjC,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAC9F,MAAM,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QACrD,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CACrC,OAAO,EACP,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE;YAC9C,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,MAAM,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;YACzE,OAAO;gBACN,KAAK,EAAE,MAAM,CAAC,cAAc,CAAC,UAAU,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC;gBACzE,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;oBACzB,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,MAAM,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;oBACzE,OAAO,KAAK,CAAC,CAAC,aAAa,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC;gBAC1F,CAAC,CAAC;gBACF,SAAS,EAAE,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;oBAC9B,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,MAAM,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;oBACzE,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC;gBACvI,CAAC,CAAC;aACF,CAAC;QACH,CAAC,CAAC,CACF,CAAC;QACF,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC;QACtD,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;QAChE,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,UAAU,CAAC;QACjC,MAAM,UAAU,GAAG,MAAM,CAAC,GAAG,CAC5B,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,SAAS,CAAC,EACtD,CAAC,WAAW,EAAE,EAAE,CAAC,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,CAC3C,CAAC;QACF,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,EAAgD,CAAC;IACvH,CAAC,CAAC,EAAE,CAAC;AACN,CAAC"}
1
+ {"version":3,"file":"querySubscription.js","sourceRoot":"","sources":["../src/querySubscription.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAe,MAAM,QAAQ,CAAC;AACtD,OAAO,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AAEjC,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAoC,MAAM,gBAAgB,CAAC;AAE9E,OAAO,EAAE,cAAc,EAA0C,MAAM,oBAAoB,CAAC;AAsB5F,MAAM,UAAU,iBAAiB,CAAC,GAAY,EAAE,UAAqC,EAAE,MAA6B;IACnH,OAAO,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC;QACjC,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAC9F,MAAM,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QACrD,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CACrC,OAAO,EACP,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE;YAC9C,MAAM,SAAS,GAAG,GAAG,CAAC,IAAI,CAAC,GAAG,MAAM,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;YACrD,OAAO;gBACN,KAAK,EAAE,iBAAiB,CAAC,SAAS,EAAE,UAAU,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;gBACvE,IAAI,EAAE,iBAAiB,CAAC,SAAS,EAAE,aAAa,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;gBACzE,SAAS,EAAE,iBAAiB,CAC3B,SAAS,EACT,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAClF;aACD,CAAC;QACH,CAAC,CAAC,CACF,CAAC;QACF,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC;QACtD,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;QAChE,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,UAAU,CAAC;QACjC,MAAM,UAAU,GAAG,MAAM,CAAC,GAAG,CAC5B,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,SAAS,CAAC,EACtD,CAAC,WAAW,EAAE,EAAE,CAAC,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,CAC3C,CAAC;QACF,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,EAAgD,CAAC;IACvH,CAAC,CAAC,EAAE,CAAC;AACN,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"readPolicy.d.ts","sourceRoot":"","sources":["../src/readPolicy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,MAAM,EAAE,KAAK,KAAK,EAAE,MAAM,QAAQ,CAAC;AAC1E,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAGhD,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAG1E,MAAM,WAAW,MAAM;IACtB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;CACpB;AACD,MAAM,MAAM,eAAe,CAAC,QAAQ,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,GAAG,KAAK,IAAI,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;AAEjJ,eAAO,MAAM,aAAa,0CAA+G,CAAC;AAC1I,eAAO,MAAM,QAAQ,EAAE,eAAe,CAAC,OAAO,CAA+D,CAAC;AAE9G,eAAO,MAAM,UAAU,GAAgC,CAAC,EAAE,CAAC,mJAUzD,CAAC;AAGH,MAAM,MAAM,cAAc,CAAC,IAAI,IAAI,IAAI,SAAS;IAC/C,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;IAC7B,QAAQ,CAAC,WAAW,EAAE;QAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;KAAE,CAAC;IACjD,QAAQ,CAAC,aAAa,EAAE;QAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,QAAQ,CAAA;KAAE,CAAC;IAC1D,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;CAC9B,GACE;IAAE,QAAQ,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,QAAQ,SAAS,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,GAAG,KAAK,CAAC,CAAC;IAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAA;CAAE,GAC/H;IAAE,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,SAAS,CAAC;IAAC,QAAQ,CAAC,QAAQ,EAAE,KAAK,CAAA;CAAE,CAAC;AAEjE,wBAAgB,cAAc,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,SAAS,GAAG,CAAC,GAAG,EAC3D,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAC9B,OAAO,EAAE;IAAE,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAA;CAAE,EAC1D,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,GAC3B,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,GAAG,iBAAiB,GAAG,eAAe,EAAE,CAAC,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"readPolicy.d.ts","sourceRoot":"","sources":["../src/readPolicy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,MAAM,EAAE,KAAK,KAAK,EAAE,MAAM,QAAQ,CAAC;AAC1E,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AAEtC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAEhD,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAG1E,MAAM,WAAW,MAAM;IACtB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;CACpB;AACD,MAAM,MAAM,eAAe,CAAC,QAAQ,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,GAAG,KAAK,IAAI,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;AAEjJ,eAAO,MAAM,aAAa,0CAA+G,CAAC;AAC1I,eAAO,MAAM,QAAQ,EAAE,eAAe,CAAC,OAAO,CAA+D,CAAC;AAE9G,eAAO,MAAM,UAAU,GAAgC,CAAC,EAAE,CAAC,mJAUzD,CAAC;AAGH,MAAM,MAAM,cAAc,CAAC,IAAI,IAAI,IAAI,SAAS;IAC/C,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;IAC7B,QAAQ,CAAC,WAAW,EAAE;QAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;KAAE,CAAC;IACjD,QAAQ,CAAC,aAAa,EAAE;QAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,QAAQ,CAAA;KAAE,CAAC;IAC1D,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;CAC9B,GACE;IAAE,QAAQ,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,QAAQ,SAAS,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,GAAG,KAAK,CAAC,CAAC;IAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAA;CAAE,GAC/H;IAAE,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,SAAS,CAAC;IAAC,QAAQ,CAAC,QAAQ,EAAE,KAAK,CAAA;CAAE,CAAC;AAEjE,wBAAgB,cAAc,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,SAAS,GAAG,CAAC,GAAG,EAC3D,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAC9B,OAAO,EAAE;IAAE,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAA;CAAE,EAC1D,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,GAC3B,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,GAAG,iBAAiB,GAAG,eAAe,EAAE,CAAC,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC"}
@@ -1,6 +1,6 @@
1
1
  import { Context, Effect, Option } from "effect";
2
+ import { withPolicyContext } from "#adapters/withPolicyContext.ts";
2
3
  import { isPermissionReadPolicy } from "#permissionReadPolicy.ts";
3
- import { policyContext } from "#policyContext.ts";
4
4
  import { MissingReadPolicy, QueryReadDenied } from "#readPolicyErrors.ts";
5
5
  import { QueryDefinition } from "#serverMetadata.ts";
6
6
  export const CurrentViewer = Context.Reference("@shivaedev/contract/CurrentViewer", { defaultValue: Option.none });
@@ -20,8 +20,7 @@ export function authorizeReads(effect, request, viewer) {
20
20
  return Effect.fnUntraced(function* () {
21
21
  const definition = Context.getOption(request.rpc.annotations, QueryDefinition);
22
22
  if (Option.isSome(definition)) {
23
- const context = yield* policyContext(request.rpc);
24
- yield* checkQuery(definition.value.definition, request.payload, viewer).pipe(Effect.provideContext(context));
23
+ yield* withPolicyContext(request.rpc, checkQuery(definition.value.definition, request.payload, viewer));
25
24
  }
26
25
  return yield* Effect.provideService(effect, CurrentViewer, viewer);
27
26
  })();
@@ -1 +1 @@
1
- {"version":3,"file":"readPolicy.js","sourceRoot":"","sources":["../src/readPolicy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAA2B,MAAM,QAAQ,CAAC;AAG1E,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC1E,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAOrD,MAAM,CAAC,MAAM,aAAa,GAAG,OAAO,CAAC,SAAS,CAAwB,mCAAmC,EAAE,EAAE,YAAY,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;AAC1I,MAAM,CAAC,MAAM,QAAQ,GAA6B,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;AAE9G,MAAM,CAAC,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAQ,KAAuB,EAAE,OAAgB,EAAE,MAA6B;IACpI,IAAI,KAAK,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;QACpC,OAAO,KAAK,CAAC,CAAC,IAAI,iBAAiB,CAAC,EAAE,OAAO,EAAE,iCAAiC,KAAK,CAAC,IAAI,mCAAmC,EAAE,CAAC,CAAC;IAClI,CAAC;IACD,IAAI,KAAK,CAAC,gBAAgB,KAAK,SAAS,IAAI,CAAC,sBAAsB,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,CAAC;QACvF,OAAO,KAAK,CAAC,CAAC,IAAI,eAAe,CAAC,EAAE,OAAO,EAAE,yDAAyD,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IACvH,CAAC;IACD,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC;QACjD,OAAO,KAAK,CAAC,CAAC,IAAI,eAAe,CAAC,EAAE,OAAO,EAAE,8BAA8B,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IAC5F,CAAC;AACF,CAAC,CAAC,CAAC;AAiBH,MAAM,UAAU,cAAc,CAC7B,MAAgD,EAChD,OAA6D,EAC7D,MAA6B;IAE7B,OAAO,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC;QACjC,MAAM,UAAU,GAAG,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;QAC/E,IAAI,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC;YAC/B,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YAClD,KAAK,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC,KAAK,CAAC,UAAU,EAAE,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC;QAC9G,CAAC;QACD,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,aAAa,EAAE,MAAM,CAAC,CAAC;IACpE,CAAC,CAAC,EAAE,CAAC;AACN,CAAC"}
1
+ {"version":3,"file":"readPolicy.js","sourceRoot":"","sources":["../src/readPolicy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAA2B,MAAM,QAAQ,CAAC;AAE1E,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AAEnE,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC1E,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAOrD,MAAM,CAAC,MAAM,aAAa,GAAG,OAAO,CAAC,SAAS,CAAwB,mCAAmC,EAAE,EAAE,YAAY,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;AAC1I,MAAM,CAAC,MAAM,QAAQ,GAA6B,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;AAE9G,MAAM,CAAC,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAQ,KAAuB,EAAE,OAAgB,EAAE,MAA6B;IACpI,IAAI,KAAK,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;QACpC,OAAO,KAAK,CAAC,CAAC,IAAI,iBAAiB,CAAC,EAAE,OAAO,EAAE,iCAAiC,KAAK,CAAC,IAAI,mCAAmC,EAAE,CAAC,CAAC;IAClI,CAAC;IACD,IAAI,KAAK,CAAC,gBAAgB,KAAK,SAAS,IAAI,CAAC,sBAAsB,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,CAAC;QACvF,OAAO,KAAK,CAAC,CAAC,IAAI,eAAe,CAAC,EAAE,OAAO,EAAE,yDAAyD,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IACvH,CAAC;IACD,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC;QACjD,OAAO,KAAK,CAAC,CAAC,IAAI,eAAe,CAAC,EAAE,OAAO,EAAE,8BAA8B,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IAC5F,CAAC;AACF,CAAC,CAAC,CAAC;AAiBH,MAAM,UAAU,cAAc,CAC7B,MAAgD,EAChD,OAA6D,EAC7D,MAA6B;IAE7B,OAAO,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC;QACjC,MAAM,UAAU,GAAG,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;QAC/E,IAAI,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC;YAC/B,KAAK,CAAC,CAAC,iBAAiB,CAAC,OAAO,CAAC,GAAG,EAAE,UAAU,CAAC,UAAU,CAAC,KAAK,CAAC,UAAU,EAAE,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC;QACzG,CAAC;QACD,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,aAAa,EAAE,MAAM,CAAC,CAAC;IACpE,CAAC,CAAC,EAAE,CAAC;AACN,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"rpcClient.d.ts","sourceRoot":"","sources":["../src/rpcClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC7D,OAAO,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAC/C,OAAO,KAAK,OAAO,MAAM,2BAA2B,CAAC;AACrD,OAAO,EAAE,KAAK,GAAG,EAAuB,MAAM,YAAY,CAAC;AAE3D,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AASvD,MAAM,WAAW,SAAS;IACzB,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAC7C,QAAQ,CAAC,QAAQ,EAAE,WAAW,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC;CAChD;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,aAAa;;;;;;;;+BA4DF,KAAK,eAAe,KAAK;;;EAOvG;AAED,eAAO,MAAM,cAAc,uDAA2C,CAAC"}
1
+ {"version":3,"file":"rpcClient.d.ts","sourceRoot":"","sources":["../src/rpcClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC7D,OAAO,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAC/C,OAAO,KAAK,OAAO,MAAM,2BAA2B,CAAC;AACrD,OAAO,EAAE,KAAK,GAAG,EAAuB,MAAM,YAAY,CAAC;AAG3D,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AASvD,MAAM,WAAW,SAAS;IACzB,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAC7C,QAAQ,CAAC,QAAQ,EAAE,WAAW,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC;CAChD;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,aAAa;;;;;;;;+BA2DH,KAAK,eAAe,KAAK;;;EAKtG;AAED,eAAO,MAAM,cAAc,uDAA2C,CAAC"}
package/dist/rpcClient.js CHANGED
@@ -2,6 +2,7 @@ import { Effect, Layer, Stream } from "effect";
2
2
  import * as Atom from "effect/reactivity/Atom";
3
3
  import * as AtomRpc from "effect/reactivity/AtomRpc";
4
4
  import { RpcClient, RpcGroup } from "effect/rpc";
5
+ import { withClientProtocol } from "#adapters/withClientProtocol.ts";
5
6
  import { Activity } from "#clientActivity.ts";
6
7
  import { clientActivities, makeActivity } from "./clientActivities.js";
7
8
  import { connectionProtocol, protocolConnections } from "./connectionProtocol.js";
@@ -62,7 +63,7 @@ export function rpcClient(name, source, options) {
62
63
  runtime: options.runtime,
63
64
  });
64
65
  clientActivities.set(Client, activity);
65
- const directClient = Effect.flatMap(Layer.build(protocol), (context) => make.pipe(Effect.map((flat) => Object.fromEntries([...group.requests.keys()].map((tag) => [tag, (payload, callOptions) => flat(tag, payload, callOptions)]))), Effect.provideContext(context)));
66
+ const directClient = withClientProtocol(protocol, make).pipe(Effect.map((flat) => Object.fromEntries([...group.requests.keys()].map((tag) => [tag, (payload, callOptions) => flat(tag, payload, callOptions)]))));
66
67
  const layer = Layer.effect(Client, make).pipe(Layer.provide(protocol));
67
68
  return Object.assign(layer, { [Activity]: activity.activity, Client, client: directClient, runtime: Client.runtime });
68
69
  }
@@ -1 +1 @@
1
- {"version":3,"file":"rpcClient.js","sourceRoot":"","sources":["../src/rpcClient.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"rpcClient.js","sourceRoot":"","sources":["../src/rpcClient.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@shivaedev/contract",
3
- "version": "0.39.0",
3
+ "version": "0.40.0",
4
4
  "description": "Typed query and command contracts over native Effect RPC and reactivity",
5
5
  "keywords": [
6
6
  "effect"
@@ -51,13 +51,13 @@
51
51
  "@effect/platform-node": "4.1.0",
52
52
  "@effect/vitest": "4.1.0",
53
53
  "@shivaedev/errors": "0.10.0",
54
- "@shivaedev/identity": "0.27.0",
55
- "@shivaedev/quality": "0.65.0",
56
- "@shivaedev/server": "0.27.0",
57
- "@shivaedev/sql": "0.42.0",
58
- "@shivaedev/test-kits": "0.8.0",
59
- "@shivaedev/test-sql": "0.24.0",
60
- "@shivaedev/test-story": "0.42.0",
54
+ "@shivaedev/identity": "0.28.0",
55
+ "@shivaedev/quality": "0.66.0",
56
+ "@shivaedev/server": "0.28.0",
57
+ "@shivaedev/sql": "0.43.0",
58
+ "@shivaedev/test-kits": "0.8.1",
59
+ "@shivaedev/test-sql": "0.24.1",
60
+ "@shivaedev/test-story": "0.42.1",
61
61
  "@types/node": "24.19.2",
62
62
  "effect": "4.1.0",
63
63
  "esbuild": "0.28.2",
@@ -0,0 +1,10 @@
1
+ import { Context, Effect, Layer, Scheduler } from "effect";
2
+
3
+ export class LiveDispatcher extends Context.Service<LiveDispatcher, { readonly dispatcher: Scheduler.SchedulerDispatcher }>()(
4
+ "@shivaedev/contract/LiveDispatcher",
5
+ ) {
6
+ static readonly layer = Layer.effect(
7
+ this,
8
+ Effect.map(Scheduler.Scheduler, (scheduler) => ({ dispatcher: scheduler.makeDispatcher() })),
9
+ );
10
+ }
@@ -0,0 +1,15 @@
1
+ import { Effect, Stream } from "effect";
2
+ import * as Reactivity from "effect/reactivity/Reactivity";
3
+ import type { Key } from "@shivaedev/changes/keys.ts";
4
+ import type { initialize } from "#live-server/initialize.ts";
5
+ import { LiveDispatcher } from "./LiveDispatcher.ts";
6
+ import { openLiveHints } from "./openLiveHints.ts";
7
+
8
+ export const liveHintStream = Effect.fn("LiveServer.liveHintStream")(function* (state: Effect.Success<typeof initialize>, keys: readonly Key[]) {
9
+ const reactivity = yield* Reactivity.Reactivity;
10
+ const dispatcher = yield* LiveDispatcher;
11
+ return Stream.unwrap(Effect.map(openLiveHints(state, keys), Stream.succeed)).pipe(
12
+ Stream.provideService(Reactivity.Reactivity, reactivity),
13
+ Stream.provideService(LiveDispatcher, dispatcher),
14
+ );
15
+ });
@@ -0,0 +1,62 @@
1
+ import { Effect, Queue, Ref, Stream } from "effect";
2
+ import * as Reactivity from "effect/reactivity/Reactivity";
3
+ import { type Key, readKeys } from "@shivaedev/changes/keys.ts";
4
+ import type { initialize } from "#live-server/initialize.ts";
5
+ import { liveHintQueue } from "#liveHintQueue.ts";
6
+ import { LiveDispatcher } from "./LiveDispatcher.ts";
7
+
8
+ export const openLiveHints = Effect.fn("LiveServer.openLiveHints")(function* (state: Effect.Success<typeof initialize>, keys: readonly Key[]) {
9
+ const reactivity = yield* Reactivity.Reactivity;
10
+ const { openStreams, resyncKey } = state;
11
+ const { dispatcher } = yield* LiveDispatcher;
12
+ const { offer, queue } = yield* liveHintQueue;
13
+ const pending = new Map<string, Key>();
14
+ let scheduled = false;
15
+ let resync = false;
16
+ let active = true;
17
+ function flush() {
18
+ if (scheduled) {
19
+ return;
20
+ }
21
+ scheduled = true;
22
+ dispatcher.scheduleTask(() => {
23
+ scheduled = false;
24
+ if (active) {
25
+ offer(resync ? { _tag: "Resync" } : { _tag: "Changed", keys: [...pending.values()] });
26
+ }
27
+ pending.clear();
28
+ resync = false;
29
+ }, 0);
30
+ }
31
+ let cancelKeys: (() => void)[] = [];
32
+ function replaceKeys(current: readonly Key[]) {
33
+ for (const stop of cancelKeys) {
34
+ stop();
35
+ }
36
+ cancelKeys = current.map((key) => {
37
+ const own = readKeys([key]);
38
+ return reactivity.registerUnsafe(own, () => {
39
+ pending.set(own[0] ?? "", key);
40
+ flush();
41
+ });
42
+ });
43
+ }
44
+ replaceKeys(keys);
45
+ const cancel = [
46
+ reactivity.registerUnsafe([resyncKey], () => {
47
+ resync = true;
48
+ flush();
49
+ }),
50
+ ];
51
+ yield* Ref.update(openStreams, (count) => count + 1);
52
+ yield* Effect.addFinalizer(() =>
53
+ Effect.sync(() => {
54
+ active = false;
55
+ for (const stop of [...cancelKeys, ...cancel]) {
56
+ stop();
57
+ }
58
+ }).pipe(Effect.andThen(Ref.update(openStreams, (count) => count - 1))),
59
+ );
60
+ yield* Queue.offer(queue, { _tag: "Resync" });
61
+ return { replaceKeys, stream: Stream.fromQueue(queue) };
62
+ });
@@ -0,0 +1,6 @@
1
+ import { Effect } from "effect";
2
+ import type { QuerySubscription } from "#querySubscription.ts";
3
+
4
+ export function refreshSubscription<A, E, R>(subscription: QuerySubscription<E, R>, next: Effect.Effect<A, E, R>) {
5
+ return Effect.flatMap(subscription.refresh ?? Effect.context<never>(), (current) => Effect.provideContext(next, current));
6
+ }
@@ -0,0 +1,19 @@
1
+ import { Context, Effect, Layer, Stream } from "effect";
2
+ import type { Key } from "@shivaedev/changes/keys.ts";
3
+ import { liveServerLayer } from "#live-server/layer.ts";
4
+ import { LiveServer } from "#live-server/service.ts";
5
+ import { subscribe as subscribeQueries } from "#live-server/subscribe.ts";
6
+ import type { QueryRerun, QuerySubscription } from "#querySubscription.ts";
7
+ import type { QueryUpdate, SubscriptionHint } from "#queryUpdate.ts";
8
+ import type { QueryReadDenied } from "#readPolicyErrors.ts";
9
+
10
+ export const standaloneLiveServer = Effect.gen(function* () {
11
+ const context = yield* Effect.scoped(Layer.build(liveServerLayer));
12
+ const server = Context.get(context, LiveServer);
13
+ function subscribe<E, R>(subscription: QuerySubscription<E, R>): Stream.Stream<SubscriptionHint, E | QueryReadDenied, R>;
14
+ function subscribe<E, R>(subscription: QuerySubscription<E, R>, read: QueryRerun<E, R>): Stream.Stream<QueryUpdate, E | QueryReadDenied, R>;
15
+ function subscribe<E, R>(subscription: QuerySubscription<E, R>, read?: QueryRerun<E, R>) {
16
+ return Stream.unwrap(Effect.provideContext(subscribeQueries(subscription, read), context));
17
+ }
18
+ return { resync: server.resync(), stream: (keys: readonly Key[]) => Stream.unwrap(server.stream(keys)), subscribe };
19
+ });