@shivaedev/contract 0.31.0 → 0.33.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 (151) hide show
  1. package/CHANGELOG.md +34 -0
  2. package/README.md +85 -17
  3. package/dist/CommandGuard.d.ts +10 -0
  4. package/dist/CommandGuard.d.ts.map +1 -0
  5. package/dist/CommandGuard.js +20 -0
  6. package/dist/CommandGuard.js.map +1 -0
  7. package/dist/LiveServer.d.ts +6 -4
  8. package/dist/LiveServer.d.ts.map +1 -1
  9. package/dist/LiveServer.js +10 -5
  10. package/dist/LiveServer.js.map +1 -1
  11. package/dist/ReadPolicyGuard.d.ts +19 -0
  12. package/dist/ReadPolicyGuard.d.ts.map +1 -0
  13. package/dist/ReadPolicyGuard.js +23 -0
  14. package/dist/ReadPolicyGuard.js.map +1 -0
  15. package/dist/adapters/activityState.d.ts +9 -0
  16. package/dist/adapters/activityState.d.ts.map +1 -0
  17. package/dist/adapters/activityState.js +11 -0
  18. package/dist/adapters/activityState.js.map +1 -0
  19. package/dist/{internal → adapters}/bindingOwner.d.ts +1 -1
  20. package/dist/{internal → adapters}/bindingOwner.d.ts.map +1 -1
  21. package/dist/{internal → adapters}/bindingOwner.js +2 -1
  22. package/dist/adapters/bindingOwner.js.map +1 -0
  23. package/dist/adapters/clientId.d.ts +2 -0
  24. package/dist/adapters/clientId.d.ts.map +1 -0
  25. package/dist/adapters/clientId.js +4 -0
  26. package/dist/adapters/clientId.js.map +1 -0
  27. package/dist/automaticLive.d.ts +1 -1
  28. package/dist/automaticLive.d.ts.map +1 -1
  29. package/dist/automaticLive.js +7 -2
  30. package/dist/automaticLive.js.map +1 -1
  31. package/dist/bind.d.ts.map +1 -1
  32. package/dist/bind.js +1 -1
  33. package/dist/bind.js.map +1 -1
  34. package/dist/changesHandlerLayer.d.ts +19 -0
  35. package/dist/changesHandlerLayer.d.ts.map +1 -0
  36. package/dist/changesHandlerLayer.js +15 -0
  37. package/dist/changesHandlerLayer.js.map +1 -0
  38. package/dist/clientActivity.d.ts +10 -1
  39. package/dist/clientActivity.d.ts.map +1 -1
  40. package/dist/clientActivity.js +7 -0
  41. package/dist/clientActivity.js.map +1 -1
  42. package/dist/clientKeys.d.ts +7 -0
  43. package/dist/clientKeys.d.ts.map +1 -0
  44. package/dist/clientKeys.js +11 -0
  45. package/dist/clientKeys.js.map +1 -0
  46. package/dist/composeBindings.d.ts +8 -0
  47. package/dist/composeBindings.d.ts.map +1 -0
  48. package/dist/composeBindings.js +18 -0
  49. package/dist/composeBindings.js.map +1 -0
  50. package/dist/contract.d.ts +5 -8
  51. package/dist/contract.d.ts.map +1 -1
  52. package/dist/contract.js +11 -7
  53. package/dist/contract.js.map +1 -1
  54. package/dist/internal/automaticQuery.d.ts +3 -1
  55. package/dist/internal/automaticQuery.d.ts.map +1 -1
  56. package/dist/internal/automaticQuery.js +9 -2
  57. package/dist/internal/automaticQuery.js.map +1 -1
  58. package/dist/internal/changesSuccess.d.ts +5 -1
  59. package/dist/internal/changesSuccess.d.ts.map +1 -1
  60. package/dist/internal/changesSuccess.js +10 -6
  61. package/dist/internal/changesSuccess.js.map +1 -1
  62. package/dist/internal/clientActivity.d.ts +5 -6
  63. package/dist/internal/clientActivity.d.ts.map +1 -1
  64. package/dist/internal/clientActivity.js +6 -18
  65. package/dist/internal/clientActivity.js.map +1 -1
  66. package/dist/internal/clientOperations.d.ts +1 -1
  67. package/dist/internal/clientOperations.d.ts.map +1 -1
  68. package/dist/internal/clientOperations.js +7 -4
  69. package/dist/internal/clientOperations.js.map +1 -1
  70. package/dist/internal/compareQueries.d.ts +2 -1
  71. package/dist/internal/compareQueries.d.ts.map +1 -1
  72. package/dist/internal/compareQueries.js +5 -7
  73. package/dist/internal/compareQueries.js.map +1 -1
  74. package/dist/internal/declarationError.d.ts +7 -1
  75. package/dist/internal/declarationError.d.ts.map +1 -1
  76. package/dist/internal/declarationError.js.map +1 -1
  77. package/dist/internal/prependMiddleware.d.ts +10 -0
  78. package/dist/internal/prependMiddleware.d.ts.map +1 -0
  79. package/dist/internal/prependMiddleware.js +12 -0
  80. package/dist/internal/prependMiddleware.js.map +1 -0
  81. package/dist/internal/queryDelivery.d.ts +2 -1
  82. package/dist/internal/queryDelivery.d.ts.map +1 -1
  83. package/dist/internal/queryDelivery.js +8 -1
  84. package/dist/internal/queryDelivery.js.map +1 -1
  85. package/dist/internal/queryReactivity.d.ts.map +1 -1
  86. package/dist/internal/queryReactivity.js +3 -11
  87. package/dist/internal/queryReactivity.js.map +1 -1
  88. package/dist/internal/querySignals.d.ts +8 -0
  89. package/dist/internal/querySignals.d.ts.map +1 -0
  90. package/dist/internal/querySignals.js +42 -0
  91. package/dist/internal/querySignals.js.map +1 -0
  92. package/dist/internal/wrapAtom.d.ts +3 -0
  93. package/dist/internal/wrapAtom.d.ts.map +1 -0
  94. package/dist/internal/wrapAtom.js +15 -0
  95. package/dist/internal/wrapAtom.js.map +1 -0
  96. package/dist/live.d.ts +2 -1
  97. package/dist/live.d.ts.map +1 -1
  98. package/dist/live.js +5 -4
  99. package/dist/live.js.map +1 -1
  100. package/dist/makeLiveServer.d.ts +22 -5
  101. package/dist/makeLiveServer.d.ts.map +1 -1
  102. package/dist/makeLiveServer.js +39 -24
  103. package/dist/makeLiveServer.js.map +1 -1
  104. package/dist/publicConfig.d.ts +19 -3
  105. package/dist/publicConfig.d.ts.map +1 -1
  106. package/dist/querySignals.d.ts +9 -0
  107. package/dist/querySignals.d.ts.map +1 -0
  108. package/dist/querySignals.js +14 -0
  109. package/dist/querySignals.js.map +1 -0
  110. package/dist/querySubscription.d.ts +1 -1
  111. package/dist/querySubscription.d.ts.map +1 -1
  112. package/dist/querySubscription.js +7 -4
  113. package/dist/querySubscription.js.map +1 -1
  114. package/dist/queryUpdate.d.ts +5 -1
  115. package/dist/queryUpdate.d.ts.map +1 -1
  116. package/package.json +11 -10
  117. package/src/CommandGuard.ts +25 -0
  118. package/src/LiveServer.ts +18 -9
  119. package/src/ReadPolicyGuard.ts +31 -0
  120. package/src/adapters/activityState.ts +12 -0
  121. package/src/{internal → adapters}/bindingOwner.ts +3 -2
  122. package/src/adapters/clientId.ts +3 -0
  123. package/src/automaticLive.ts +8 -3
  124. package/src/bind.ts +1 -1
  125. package/src/changesHandlerLayer.ts +51 -0
  126. package/src/clientActivity.ts +8 -1
  127. package/src/clientKeys.ts +17 -0
  128. package/src/composeBindings.ts +27 -0
  129. package/src/contract.ts +14 -20
  130. package/src/internal/automaticQuery.ts +11 -1
  131. package/src/internal/changesSuccess.ts +13 -8
  132. package/src/internal/clientActivity.ts +37 -52
  133. package/src/internal/clientOperations.ts +9 -5
  134. package/src/internal/compareQueries.ts +6 -8
  135. package/src/internal/declarationError.ts +12 -1
  136. package/src/internal/prependMiddleware.ts +15 -0
  137. package/src/internal/queryDelivery.ts +9 -0
  138. package/src/internal/queryReactivity.ts +4 -11
  139. package/src/internal/querySignals.ts +46 -0
  140. package/src/internal/wrapAtom.ts +14 -0
  141. package/src/live.ts +5 -4
  142. package/src/makeLiveServer.ts +64 -57
  143. package/src/querySignals.ts +22 -0
  144. package/src/querySubscription.ts +8 -7
  145. package/src/queryUpdate.ts +5 -1
  146. package/dist/internal/bindingOwner.js.map +0 -1
  147. package/dist/testing.d.ts +0 -17
  148. package/dist/testing.d.ts.map +0 -1
  149. package/dist/testing.js +0 -51
  150. package/dist/testing.js.map +0 -1
  151. package/src/testing.ts +0 -81
@@ -1,16 +1,33 @@
1
1
  import { Effect, Stream } from "effect";
2
2
  import * as Reactivity from "effect/reactivity/Reactivity";
3
- import { type Key, type KeyContext } from "@shivaedev/changes/keys.ts";
4
- import type { LiveHint } from "#live.ts";
3
+ import { type Key } from "@shivaedev/changes/keys.ts";
5
4
  import type { QueryRerun, QuerySubscription } from "#querySubscription.ts";
6
5
  import type { QueryUpdate, SubscriptionHint } from "#queryUpdate.ts";
7
6
  import { QueryReadDenied } from "#readPolicyErrors.ts";
8
7
  export declare const makeLiveServer: Effect.Effect<{
9
8
  resync: Effect.Effect<number, never, never>;
10
- stream: (keys: readonly Key[], context?: KeyContext, globalKeys?: readonly Key[]) => Stream.Stream<LiveHint>;
9
+ stream: (keys: readonly Key[]) => Stream.Stream<{
10
+ readonly _tag: "Changed";
11
+ readonly keys: readonly ({
12
+ readonly _tag: "Bucket";
13
+ readonly collection: string;
14
+ readonly field: string;
15
+ readonly value: string | number;
16
+ } | {
17
+ readonly _tag: "List";
18
+ readonly collection: string;
19
+ } | {
20
+ readonly _tag: "Item";
21
+ readonly collection: string;
22
+ readonly id: string | number;
23
+ })[];
24
+ readonly queryIndexes?: readonly number[] | undefined;
25
+ } | {
26
+ readonly _tag: "Resync";
27
+ }, never, never>;
11
28
  subscribe: {
12
- <E, R>(subscription: QuerySubscription<E, R>, context?: KeyContext): Stream.Stream<SubscriptionHint, E | QueryReadDenied, R>;
13
- <E, R>(subscription: QuerySubscription<E, R>, context: KeyContext | undefined, read: QueryRerun<E, R>): Stream.Stream<QueryUpdate, E | QueryReadDenied, R>;
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>;
14
31
  };
15
32
  }, never, Reactivity.Reactivity>;
16
33
  //# 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,EAAiB,MAAM,EAAE,MAAM,QAAQ,CAAC;AACvD,OAAO,KAAK,UAAU,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,KAAK,GAAG,EAAE,KAAK,UAAU,EAAY,MAAM,4BAA4B,CAAC;AAGjF,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AACzC,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;;mBAIN,SAAS,GAAG,EAAE,YAAY,UAAU,eAAc,SAAS,GAAG,EAAE,KAAQ,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC;;SAwDhG,CAAC,EAAE,CAAC,gBAAgB,iBAAiB,CAAC,CAAC,EAAE,CAAC,CAAC,YAAY,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,gBAAgB,EAAE,CAAC,GAAG,eAAe,EAAE,CAAC,CAAC;SAC3H,CAAC,EAAE,CAAC,gBACR,iBAAiB,CAAC,CAAC,EAAE,CAAC,CAAC,WAC5B,UAAU,GAAG,SAAS,QACzB,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,GACpB,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,GAAG,eAAe,EAAE,CAAC,CAAC;;gCAsBpD,CAAC"}
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,4 +1,4 @@
1
- import { Effect, Queue, Random, Stream } from "effect";
1
+ import { Effect, Queue, Random, Scheduler, Stream } from "effect";
2
2
  import * as Reactivity from "effect/reactivity/Reactivity";
3
3
  import { readKeys } from "@shivaedev/changes/keys.ts";
4
4
  import { compareQueries } from "#internal/compareQueries.ts";
@@ -6,71 +6,86 @@ import { liveHintQueue } from "#internal/liveHintQueue.ts";
6
6
  import { QueryReadDenied } from "#readPolicyErrors.ts";
7
7
  export const makeLiveServer = Effect.gen(function* () {
8
8
  const reactivity = yield* Reactivity.Reactivity;
9
+ const dispatcher = (yield* Scheduler.Scheduler).makeDispatcher();
9
10
  let openStreams = 0;
10
11
  const resyncKey = `@shivaedev/contract/resync/${yield* Random.nextInt}`;
11
- function open(keys, context, globalKeys = []) {
12
- return Stream.unwrap(Effect.gen(function* () {
12
+ function open(keys) {
13
+ return Effect.gen(function* () {
13
14
  const { offer, queue } = yield* liveHintQueue;
14
15
  const pending = new Map();
15
16
  let scheduled = false;
16
17
  let resync = false;
17
18
  let active = true;
18
- const global = new Set(readKeys(globalKeys));
19
19
  function flush() {
20
20
  if (scheduled) {
21
21
  return;
22
22
  }
23
23
  scheduled = true;
24
- queueMicrotask(() => {
24
+ dispatcher.scheduleTask(() => {
25
25
  scheduled = false;
26
26
  if (active) {
27
27
  offer(resync ? { _tag: "Resync" } : { _tag: "Changed", keys: [...pending.values()] });
28
28
  }
29
29
  pending.clear();
30
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
+ });
31
44
  });
32
45
  }
33
- const cancel = keys.map((key) => {
34
- const bare = readKeys([key]);
35
- const own = global.has(bare[0] ?? "") ? bare : readKeys([key], context);
36
- return reactivity.registerUnsafe(own, () => {
37
- pending.set(own[0] ?? "", key);
46
+ replaceKeys(keys);
47
+ const cancel = [
48
+ reactivity.registerUnsafe([resyncKey], () => {
49
+ resync = true;
38
50
  flush();
39
- });
40
- });
41
- cancel.push(reactivity.registerUnsafe([resyncKey], () => {
42
- resync = true;
43
- flush();
44
- }));
51
+ }),
52
+ ];
45
53
  openStreams += 1;
46
54
  yield* Effect.addFinalizer(() => Effect.sync(() => {
47
55
  active = false;
48
56
  openStreams -= 1;
49
- for (const stop of cancel) {
57
+ for (const stop of [...cancelKeys, ...cancel]) {
50
58
  stop();
51
59
  }
52
60
  }));
53
61
  yield* Queue.offer(queue, { _tag: "Resync" });
54
- return Stream.fromQueue(queue);
55
- }));
62
+ return { replaceKeys, stream: Stream.fromQueue(queue) };
63
+ });
56
64
  }
57
65
  const resync = Effect.sync(() => {
58
66
  reactivity.invalidateUnsafe([resyncKey]);
59
67
  return openStreams;
60
68
  });
61
- function subscribe(subscription, context, read) {
62
- return Stream.unwrap(Effect.sync(() => {
69
+ function subscribe(subscription, read) {
70
+ return Stream.unwrap(Effect.gen(function* () {
71
+ const registration = yield* open(subscription.keys);
72
+ let scopes = subscription.scopes;
63
73
  let compare = compareQueries(subscription, read);
64
74
  const next = Effect.fnUntraced(function* (hint) {
65
75
  if (!(yield* subscription.authorized)) {
66
76
  compare = compareQueries(subscription, read);
67
77
  return [new QueryReadDenied({ message: "Read no longer allowed for subscribed queries" })];
68
78
  }
69
- return yield* compare(hint);
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;
70
85
  });
71
- return open(subscription.keys, context, subscription.globalKeys).pipe(Stream.mapEffect((hint) => Effect.flatMap(subscription.refresh ?? Effect.context(), (current) => Effect.provideContext(next(hint), current))), Stream.flatMap(Stream.fromIterable));
86
+ return registration.stream.pipe(Stream.mapEffect((hint) => Effect.flatMap(subscription.refresh ?? Effect.context(), (current) => Effect.provideContext(next(hint), current))), Stream.flatMap(Stream.fromIterable));
72
87
  }));
73
88
  }
74
- return { resync, stream: open, subscribe };
89
+ return { resync, stream: (keys) => Stream.unwrap(Effect.map(open(keys), ({ stream }) => stream)), subscribe };
75
90
  });
76
91
  //# 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":"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"}
@@ -1,5 +1,5 @@
1
- import { type Schema } from "effect";
2
- export declare function publicConfig<T, E>(schema: Schema.Codec<T, E>): import("#contract.ts").Contract<"platform.publicConfig", readonly [NoInfer<import("#operation.ts").Query<"get", Schema.Void, Schema.Codec<T, E, never, never>, {}, never, undefined>>], readonly [], import("effect/rpc/Rpc").Rpc<"platform.publicConfig.get", Schema.Void, Schema.Codec<T, E, never, never>, Schema.Union<readonly [Schema.Never, typeof import("./readPolicyErrors.ts").QueryReadDenied]>, never, never> | import("effect/rpc/Rpc").Rpc<"platform.publicConfig.$changes", Schema.Struct<{
1
+ import { Effect, type Schema } from "effect";
2
+ export declare function publicConfig<T, E>(schema: Schema.Codec<T, E>): import("#contract.ts").Contract<"platform.publicConfig", readonly [NoInfer<import("#operation.ts").Query<"get", Schema.Void, Schema.Codec<T, E, never, never>, {}, never, undefined>>], readonly [], import("effect/rpc/Rpc").Rpc<"platform.publicConfig.$changes", Schema.Struct<{
3
3
  queries: Schema.$Array<Schema.Union<readonly Schema.Struct<{
4
4
  query: Schema.Literal<"get">;
5
5
  payload: Schema.Void;
@@ -22,5 +22,21 @@ export declare function publicConfig<T, E>(schema: Schema.Codec<T, E>): import("
22
22
  readonly queryIndexes: Schema.optional<Schema.$Array<Schema.Number>>;
23
23
  }>, Schema.Struct<{
24
24
  readonly _tag: Schema.Literal<"Resync">;
25
- }>]>, typeof import("./readPolicyErrors.ts").QueryReadDenied, ...never[]]>, Schema.Union<readonly [typeof import("./readPolicyErrors.ts").MissingReadPolicy, typeof import("./readPolicyErrors.ts").QueryReadDenied, typeof import("./WebSocketRequired.ts").WebSocketRequired, ...Schema.Never[]]>>, Schema.Never, never, never>, readonly [], undefined>;
25
+ }>]>, typeof import("./readPolicyErrors.ts").QueryReadDenied, ...never[]]>, Schema.Union<readonly [typeof import("./readPolicyErrors.ts").MissingReadPolicy, typeof import("./readPolicyErrors.ts").QueryReadDenied, typeof import("./WebSocketRequired.ts").WebSocketRequired, ...Schema.Never[]]>>, Schema.Never, import("effect/Context").Reference<<A, E_1, R>(effect: Effect.Effect<A, E_1, R>, request: {
26
+ readonly rpc: import("effect/rpc/Rpc").Any;
27
+ readonly payload: unknown;
28
+ }) => Effect.Effect<A, E_1 | import("./readPolicyErrors.ts").MissingReadPolicy | import("./readPolicyErrors.ts").QueryReadDenied | import("./WebSocketRequired.ts").WebSocketRequired | import("effect/Types").unhandled, R>> & {
29
+ "~effect/rpc/RpcMiddleware": "~effect/rpc/RpcMiddleware";
30
+ "~ClientError": never;
31
+ error: Schema.Union<readonly [typeof import("./readPolicyErrors.ts").MissingReadPolicy, typeof import("./readPolicyErrors.ts").QueryReadDenied, typeof import("./WebSocketRequired.ts").WebSocketRequired]>;
32
+ requiredForClient: false;
33
+ }, never> | import("effect/rpc/Rpc").Rpc<"platform.publicConfig.get", Schema.Void, Schema.Codec<T, E, never, never>, Schema.Union<readonly [Schema.Never, typeof import("./readPolicyErrors.ts").QueryReadDenied]>, import("effect/Context").Reference<<A, E_1, R>(effect: Effect.Effect<A, E_1, R>, request: {
34
+ readonly rpc: import("effect/rpc/Rpc").Any;
35
+ readonly payload: unknown;
36
+ }) => Effect.Effect<A, E_1 | import("./readPolicyErrors.ts").MissingReadPolicy | import("./readPolicyErrors.ts").QueryReadDenied | import("./WebSocketRequired.ts").WebSocketRequired | import("effect/Types").unhandled, R>> & {
37
+ "~effect/rpc/RpcMiddleware": "~effect/rpc/RpcMiddleware";
38
+ "~ClientError": never;
39
+ error: Schema.Union<readonly [typeof import("./readPolicyErrors.ts").MissingReadPolicy, typeof import("./readPolicyErrors.ts").QueryReadDenied, typeof import("./WebSocketRequired.ts").WebSocketRequired]>;
40
+ requiredForClient: false;
41
+ }, never>, readonly [], undefined>;
26
42
  //# sourceMappingURL=publicConfig.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"publicConfig.d.ts","sourceRoot":"","sources":["../src/publicConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,KAAK,MAAM,EAAE,MAAM,QAAQ,CAAC;AAI7C,wBAAgB,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;;;;;;;;;;;;;;;;;;;;;;;2VAI5D"}
1
+ {"version":3,"file":"publicConfig.d.ts","sourceRoot":"","sources":["../src/publicConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,MAAM,EAAE,MAAM,QAAQ,CAAC;AAI7C,wBAAgB,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;mCAI5D"}
@@ -0,0 +1,9 @@
1
+ import * as Atom from "effect/reactivity/Atom";
2
+ export interface QuerySignals {
3
+ readonly completed: number;
4
+ readonly pending: boolean;
5
+ readonly subscription: "disabled" | "opening" | "open" | "refused";
6
+ }
7
+ export declare function querySignals(query: Atom.Atom<unknown>): Atom.Writable<QuerySignals>;
8
+ export declare function shareQuerySignals(query: Atom.Atom<unknown>, source: Atom.Atom<unknown>): void;
9
+ //# sourceMappingURL=querySignals.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"querySignals.d.ts","sourceRoot":"","sources":["../src/querySignals.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAE/C,MAAM,WAAW,YAAY;IAC5B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,YAAY,EAAE,UAAU,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAAC;CACnE;AAID,wBAAgB,YAAY,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAOnF;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,QAEtF"}
@@ -0,0 +1,14 @@
1
+ import * as Atom from "effect/reactivity/Atom";
2
+ const states = new WeakMap();
3
+ export function querySignals(query) {
4
+ let state = states.get(query);
5
+ if (state === undefined) {
6
+ state = Atom.make({ completed: 0, pending: true, subscription: "disabled" });
7
+ states.set(query, state);
8
+ }
9
+ return state;
10
+ }
11
+ export function shareQuerySignals(query, source) {
12
+ states.set(query, querySignals(source));
13
+ }
14
+ //# sourceMappingURL=querySignals.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"querySignals.js","sourceRoot":"","sources":["../src/querySignals.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAQ/C,MAAM,MAAM,GAAG,IAAI,OAAO,EAAmD,CAAC;AAE9E,MAAM,UAAU,YAAY,CAAC,KAAyB;IACrD,IAAI,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAC9B,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QACzB,KAAK,GAAG,IAAI,CAAC,IAAI,CAAe,EAAE,SAAS,EAAE,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,UAAU,EAAE,CAAC,CAAC;QAC3F,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IAC1B,CAAC;IACD,OAAO,KAAK,CAAC;AACd,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,KAAyB,EAAE,MAA0B;IACtF,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC;AACzC,CAAC"}
@@ -7,9 +7,9 @@ import { type QueryReference, type QueryRequest } from "#serverMetadata.ts";
7
7
  export type QueryRerun<E = unknown, R = never> = (request: QueryRequest) => Effect.Effect<unknown, E, R>;
8
8
  export interface QuerySubscription<E = never, R = never> {
9
9
  readonly authorized: Effect.Effect<boolean, E, R>;
10
- readonly globalKeys?: readonly Key[];
11
10
  readonly keys: readonly Key[];
12
11
  readonly queries?: readonly QueryRequest[];
12
+ readonly readScopes?: Effect.Effect<readonly (readonly Key[])[], E, R>;
13
13
  readonly refresh?: Effect.Effect<Context.Context<never>, E, R>;
14
14
  readonly scopes: readonly (readonly Key[])[];
15
15
  }
@@ -1 +1 @@
1
- {"version":3,"file":"querySubscription.d.ts","sourceRoot":"","sources":["../src/querySubscription.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,MAAM,EAAE,MAAM,QAAQ,CAAC;AACtD,OAAO,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,4BAA4B,CAAC;AAGtD,OAAO,EAAc,KAAK,cAAc,EAAE,KAAK,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAC9E,OAAO,KAAK,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC/E,OAAO,EAAkB,KAAK,cAAc,EAAE,KAAK,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAE5F,MAAM,MAAM,UAAU,CAAC,CAAC,GAAG,OAAO,EAAE,CAAC,GAAG,KAAK,IAAI,CAAC,OAAO,EAAE,YAAY,KAAK,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;AAEzG,MAAM,WAAW,iBAAiB,CAAC,CAAC,GAAG,KAAK,EAAE,CAAC,GAAG,KAAK;IACtD,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IAClD,QAAQ,CAAC,UAAU,CAAC,EAAE,SAAS,GAAG,EAAE,CAAC;IACrC,QAAQ,CAAC,IAAI,EAAE,SAAS,GAAG,EAAE,CAAC;IAC9B,QAAQ,CAAC,OAAO,CAAC,EAAE,SAAS,YAAY,EAAE,CAAC;IAC3C,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IAC/D,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC,SAAS,GAAG,EAAE,CAAC,EAAE,CAAC;CAC7C;AAED,wBAAgB,iBAAiB,CAAC,IAAI,SAAS,GAAG,CAAC,GAAG,EACrD,GAAG,EAAE,IAAI,EACT,UAAU,EAAE,SAAS,cAAc,EAAE,EACrC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,GAC3B,MAAM,CAAC,MAAM,CACf,iBAAiB,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,EAAE,cAAc,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,CAAC,EAClF,cAAc,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,GAAG,iBAAiB,GAAG,eAAe,EACnE,cAAc,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,CAChC,CAAC"}
1
+ {"version":3,"file":"querySubscription.d.ts","sourceRoot":"","sources":["../src/querySubscription.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,MAAM,EAAE,MAAM,QAAQ,CAAC;AACtD,OAAO,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,4BAA4B,CAAC;AAGtD,OAAO,EAAc,KAAK,cAAc,EAAE,KAAK,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAC9E,OAAO,KAAK,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC/E,OAAO,EAAkB,KAAK,cAAc,EAAE,KAAK,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAE5F,MAAM,MAAM,UAAU,CAAC,CAAC,GAAG,OAAO,EAAE,CAAC,GAAG,KAAK,IAAI,CAAC,OAAO,EAAE,YAAY,KAAK,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;AAEzG,MAAM,WAAW,iBAAiB,CAAC,CAAC,GAAG,KAAK,EAAE,CAAC,GAAG,KAAK;IACtD,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IAClD,QAAQ,CAAC,IAAI,EAAE,SAAS,GAAG,EAAE,CAAC;IAC9B,QAAQ,CAAC,OAAO,CAAC,EAAE,SAAS,YAAY,EAAE,CAAC;IAC3C,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,SAAS,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IACvE,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IAC/D,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC,SAAS,GAAG,EAAE,CAAC,EAAE,CAAC;CAC7C;AAED,wBAAgB,iBAAiB,CAAC,IAAI,SAAS,GAAG,CAAC,GAAG,EACrD,GAAG,EAAE,IAAI,EACT,UAAU,EAAE,SAAS,cAAc,EAAE,EACrC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,GAC3B,MAAM,CAAC,MAAM,CACf,iBAAiB,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,EAAE,cAAc,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,CAAC,EAClF,cAAc,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,GAAG,iBAAiB,GAAG,eAAe,EACnE,cAAc,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,CAChC,CAAC"}
@@ -12,7 +12,10 @@ export function querySubscription(rpc, references, viewer) {
12
12
  const context = yield* policyContext(Rpc.make(`${prefix}${query.name}`));
13
13
  return {
14
14
  check: Effect.provideContext(checkQuery(query, payload, viewer), context),
15
- keys: queryReadKeys(query, payload, viewer).pipe(Effect.provideContext(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
+ }),
16
19
  permitted: Effect.gen(function* () {
17
20
  const current = yield* policyContext(Rpc.make(`${prefix}${query.name}`));
18
21
  return yield* Effect.suspend(() => query.readPolicy?.(payload, viewer) ?? Effect.succeed(false)).pipe(Effect.provideContext(current));
@@ -20,10 +23,10 @@ export function querySubscription(rpc, references, viewer) {
20
23
  };
21
24
  }));
22
25
  yield* Effect.forEach(policies, ({ check }) => check);
23
- const scopes = yield* Effect.forEach(policies, ({ keys }) => keys);
26
+ const readScopes = Effect.forEach(policies, ({ keys }) => keys);
27
+ const scopes = yield* readScopes;
24
28
  const authorized = Effect.map(Effect.forEach(policies, ({ permitted }) => permitted), (permissions) => permissions.every(Boolean));
25
- const globalKeys = queries.flatMap(({ query }) => query.readsCollections?.map((collection) => ({ _tag: "List", collection: collection.name })) ?? []);
26
- return { authorized, globalKeys, keys: scopes.flat(), queries, scopes };
29
+ return { authorized, keys: scopes.flat(), queries, readScopes, scopes };
27
30
  })();
28
31
  }
29
32
  //# sourceMappingURL=querySubscription.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"querySubscription.js","sourceRoot":"","sources":["../src/querySubscription.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"querySubscription.js","sourceRoot":"","sources":["../src/querySubscription.ts"],"names":[],"mappings":"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"}
@@ -6,6 +6,10 @@ export interface QueryResult {
6
6
  readonly queryIndex: number;
7
7
  readonly value: unknown;
8
8
  }
9
+ export interface QueryUnchanged {
10
+ readonly _tag: "Unchanged";
11
+ readonly queryIndex: number;
12
+ }
9
13
  export type SubscriptionHint = LiveHint | QueryReadDenied;
10
- export type QueryUpdate = SubscriptionHint | QueryResult;
14
+ export type QueryUpdate = SubscriptionHint | QueryResult | QueryUnchanged;
11
15
  //# sourceMappingURL=queryUpdate.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"queryUpdate.d.ts","sourceRoot":"","sources":["../src/queryUpdate.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAE5D,MAAM,WAAW,WAAW;IAC3B,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;IACxB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;CACxB;AACD,MAAM,MAAM,gBAAgB,GAAG,QAAQ,GAAG,eAAe,CAAC;AAC1D,MAAM,MAAM,WAAW,GAAG,gBAAgB,GAAG,WAAW,CAAC"}
1
+ {"version":3,"file":"queryUpdate.d.ts","sourceRoot":"","sources":["../src/queryUpdate.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAE5D,MAAM,WAAW,WAAW;IAC3B,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;IACxB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;CACxB;AACD,MAAM,WAAW,cAAc;IAC9B,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAC3B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC5B;AACD,MAAM,MAAM,gBAAgB,GAAG,QAAQ,GAAG,eAAe,CAAC;AAC1D,MAAM,MAAM,WAAW,GAAG,gBAAgB,GAAG,WAAW,GAAG,cAAc,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@shivaedev/contract",
3
- "version": "0.31.0",
3
+ "version": "0.33.0",
4
4
  "description": "Typed query and command contracts over native Effect RPC and reactivity",
5
5
  "keywords": [
6
6
  "effect"
@@ -43,21 +43,22 @@
43
43
  "README.md"
44
44
  ],
45
45
  "dependencies": {
46
- "@shivaedev/changes": "0.8.0",
46
+ "@shivaedev/changes": "0.9.0",
47
47
  "@shivaedev/service": "0.6.1",
48
48
  "@shivaedev/types": "0.3.0"
49
49
  },
50
50
  "devDependencies": {
51
51
  "@effect/platform-node": "4.0.6",
52
52
  "@effect/vitest": "4.0.6",
53
- "@shivaedev/errors": "0.5.0",
54
- "@shivaedev/identity": "0.19.0",
55
- "@shivaedev/quality": "0.56.0",
56
- "@shivaedev/server": "0.19.0",
57
- "@shivaedev/sql": "0.33.0",
58
- "@shivaedev/test": "0.13.0",
59
- "@shivaedev/test-sql": "0.16.2",
60
- "@shivaedev/test-story": "0.34.0",
53
+ "@shivaedev/errors": "0.7.0",
54
+ "@shivaedev/identity": "0.21.0",
55
+ "@shivaedev/quality": "0.57.1",
56
+ "@shivaedev/server": "0.20.1",
57
+ "@shivaedev/sql": "0.35.0",
58
+ "@shivaedev/test": "0.14.0",
59
+ "@shivaedev/test-kits": "0.1.0",
60
+ "@shivaedev/test-sql": "0.18.0",
61
+ "@shivaedev/test-story": "0.36.0",
61
62
  "@types/node": "24.19.2",
62
63
  "effect": "4.0.6",
63
64
  "esbuild": "0.28.2",
@@ -0,0 +1,25 @@
1
+ import { Context, Effect, Layer, Option } from "effect";
2
+ import { type Rpc, type RpcGroup, RpcMiddleware } from "effect/rpc";
3
+ import { invalidationKeys } from "@shivaedev/changes/keys.ts";
4
+ import { prependMiddleware } from "#internal/prependMiddleware.ts";
5
+ import { CurrentViewer } from "#readPolicy.ts";
6
+ import { CommandInvalidation } from "#serverMetadata.ts";
7
+
8
+ export type CommandBoundary = <A, E, R>(effect: Effect.Effect<A, E, R>, keys: (result: A) => readonly unknown[]) => Effect.Effect<A, E, R>;
9
+
10
+ export class CommandGuard extends RpcMiddleware.Service<CommandGuard>()("@shivaedev/contract/CommandGuard") {}
11
+
12
+ export function commandGuardLayer(boundary: CommandBoundary): Layer.Layer<CommandGuard> {
13
+ return Layer.succeed(CommandGuard, (effect, { rpc, payload }) => {
14
+ const declaration = Context.getOption(rpc.annotations, CommandInvalidation);
15
+ return Option.isNone(declaration)
16
+ ? effect
17
+ : Effect.flatMap(CurrentViewer, (viewer) =>
18
+ boundary(effect, (result) => invalidationKeys(declaration.value.invalidates(payload, result, viewer))),
19
+ );
20
+ });
21
+ }
22
+
23
+ export function guardCommands<R extends Rpc.Any>(group: RpcGroup.RpcGroup<R>) {
24
+ return prependMiddleware(group.middleware(CommandGuard), CommandGuard.key);
25
+ }
package/src/LiveServer.ts CHANGED
@@ -1,20 +1,29 @@
1
- import { Effect } from "effect";
1
+ import { Effect, type Stream } from "effect";
2
2
  import * as Reactivity from "effect/reactivity/Reactivity";
3
- import type { Key, KeyContext } from "@shivaedev/changes/keys.ts";
3
+ import type { Key } from "@shivaedev/changes/keys.ts";
4
4
  import { defineService } from "@shivaedev/service/defineService.ts";
5
5
  import { genericMethod } from "@shivaedev/service/genericMethod.ts";
6
6
  import { makeLiveServer } from "#makeLiveServer.ts";
7
7
  import type { QueryRerun, QuerySubscription } from "#querySubscription.ts";
8
+ import type { QueryUpdate, SubscriptionHint } from "#queryUpdate.ts";
9
+ import type { QueryReadDenied } from "#readPolicyErrors.ts";
8
10
 
9
11
  export const LiveServer = defineService({
10
12
  id: "@shivaedev/contract/LiveServer",
11
13
  initialize: makeLiveServer,
12
- methods: (server) => ({
13
- resync: () => server.resync,
14
- stream: (keys: readonly Key[], context?: KeyContext) => Effect.succeed(server.stream(keys, context)),
15
- subscribe: genericMethod(<E, R>(subscription: QuerySubscription<E, R>, context?: KeyContext, read?: QueryRerun<E, R>) =>
16
- Effect.succeed(read === undefined ? server.subscribe(subscription, context) : server.subscribe(subscription, context, read)),
17
- ),
18
- }),
14
+ methods: (server) => {
15
+ function subscribe<E, R, TRead extends QueryRerun<unknown, unknown> | undefined = undefined>(
16
+ subscription: QuerySubscription<E, R>,
17
+ read?: TRead & (QueryRerun<E, R> | undefined),
18
+ ): Effect.Effect<Stream.Stream<TRead extends undefined ? SubscriptionHint : QueryUpdate, E | QueryReadDenied, R>>;
19
+ function subscribe<E, R>(subscription: QuerySubscription<E, R>, read?: QueryRerun<E, R>) {
20
+ return Effect.succeed(read === undefined ? server.subscribe(subscription) : server.subscribe(subscription, read));
21
+ }
22
+ return {
23
+ resync: () => server.resync,
24
+ stream: (keys: readonly Key[]) => Effect.succeed(server.stream(keys)),
25
+ subscribe: genericMethod(subscribe),
26
+ };
27
+ },
19
28
  requires: [Reactivity.Reactivity],
20
29
  });
@@ -0,0 +1,31 @@
1
+ import { Context, Effect, Layer, Schema, type Types } from "effect";
2
+ import { type Rpc, RpcMiddleware } from "effect/rpc";
3
+ import { authorizeReads, CurrentViewer } from "#readPolicy.ts";
4
+ import { MissingReadPolicy, QueryReadDenied } from "#readPolicyErrors.ts";
5
+ import { WebSocketRequired } from "#WebSocketRequired.ts";
6
+
7
+ function readPolicyGuard<A, E, R>(
8
+ effect: Effect.Effect<A, E, R>,
9
+ request: { readonly rpc: Rpc.Any; readonly payload: unknown },
10
+ ): Effect.Effect<A, E | MissingReadPolicy | QueryReadDenied | WebSocketRequired | Types.unhandled, R> {
11
+ return Effect.flatMap(CurrentViewer, (viewer) => authorizeReads(effect, request, viewer));
12
+ }
13
+
14
+ const middleware = RpcMiddleware.Service<never>()("@shivaedev/contract/ReadPolicyGuard", {
15
+ error: Schema.Union([MissingReadPolicy, QueryReadDenied, WebSocketRequired]),
16
+ });
17
+
18
+ export const ReadPolicyGuard = Object.assign(Context.Reference("@shivaedev/contract/ReadPolicyGuard", { defaultValue: () => readPolicyGuard }), {
19
+ [RpcMiddleware.TypeId]: middleware[RpcMiddleware.TypeId],
20
+ "~ClientError": middleware["~ClientError"],
21
+ error: middleware.error,
22
+ requiredForClient: middleware.requiredForClient,
23
+ });
24
+
25
+ export function readPolicyGuardLayer(options: { readonly websocket?: boolean } = {}) {
26
+ return Layer.succeed(ReadPolicyGuard, (effect, request) =>
27
+ !options.websocket && request.rpc._tag.endsWith(".$changes")
28
+ ? Effect.fail(new WebSocketRequired({ message: `${request.rpc._tag} needs the WebSocket protocol` }))
29
+ : readPolicyGuard(effect, request),
30
+ );
31
+ }
@@ -0,0 +1,12 @@
1
+ import { Effect, SubscriptionRef } from "effect";
2
+ import type { ClientActivityState } from "#clientActivity.ts";
3
+
4
+ export function activityState() {
5
+ const state = Effect.runSync(SubscriptionRef.make<ClientActivityState>({ liveHints: 0, liveInvalidations: 0, refreshingAtoms: 0, rpcCalls: 0 }));
6
+ return {
7
+ activity: Object.assign(SubscriptionRef.changes(state), { current: SubscriptionRef.get(state) }),
8
+ change: (key: keyof ClientActivityState, delta: number) => {
9
+ Effect.runSync(SubscriptionRef.update(state, (current) => ({ ...current, [key]: current[key] + delta })));
10
+ },
11
+ };
12
+ }
@@ -1,5 +1,6 @@
1
1
  import type * as AtomRegistry from "effect/reactivity/AtomRegistry";
2
- import type { KeyContext } from "@shivaedev/changes/keys.ts";
2
+ import type { KeyContext } from "#clientKeys.ts";
3
+ import { clientId } from "./clientId.ts";
3
4
 
4
5
  export interface BindingOwner {
5
6
  readonly context: KeyContext;
@@ -17,7 +18,7 @@ export function bindingOwner(scope: "session" | undefined, registry?: AtomRegist
17
18
  }
18
19
  let context = contexts.get(registry);
19
20
  if (context === undefined) {
20
- context = { scope: crypto.randomUUID() };
21
+ context = { scope: clientId() };
21
22
  contexts.set(registry, context);
22
23
  }
23
24
  return { context, registry };
@@ -0,0 +1,3 @@
1
+ export function clientId(): string {
2
+ return crypto.randomUUID();
3
+ }
@@ -5,13 +5,15 @@ import * as Atom from "effect/reactivity/Atom";
5
5
  import type * as AtomRpc from "effect/reactivity/AtomRpc";
6
6
  import type { Rpc, RpcSchema } from "effect/rpc";
7
7
  import type { Key } from "@shivaedev/changes/keys.ts";
8
+ import type { BindingOwner } from "#adapters/bindingOwner.ts";
8
9
  import { aggregateLiveStatus } from "#internal/aggregateLiveStatus.ts";
9
10
  import { automaticQuery } from "#internal/automaticQuery.ts";
10
- import type { BindingOwner } from "#internal/bindingOwner.ts";
11
11
  import { queryDelivery } from "#internal/queryDelivery.ts";
12
12
  import { localQueryKeys, queryHint } from "#internal/queryHints.ts";
13
+ import { queryProgress } from "#internal/querySignals.ts";
13
14
  import { socketIdentity } from "#internal/rpcClient.ts";
14
15
  import { type LiveStatus, live } from "#live.ts";
16
+ import { querySignals, shareQuerySignals } from "#querySignals.ts";
15
17
  import type { QueryUpdate } from "#queryUpdate.ts";
16
18
  import { type ResumeSource, type ResumeWindow, resumeSignal } from "#resume.ts";
17
19
  import type { QueryReference } from "#serverMetadata.ts";
@@ -75,10 +77,11 @@ export function automaticLive(
75
77
  headers?: Headers.Input,
76
78
  ) {
77
79
  if (!enabled) {
78
- return atom;
80
+ return queryProgress(atom);
79
81
  }
80
82
  const ready = Atom.make(false);
81
- const delivery = queryDelivery(atom, decode, paused);
83
+ const signals = querySignals(atom);
84
+ const delivery = queryDelivery(atom, decode, paused, signals);
82
85
  const source = decode === undefined ? delivery.atom.pipe(Atom.setIdleTTL(0)) : delivery.atom;
83
86
  const subscription = live(service.runtime, {
84
87
  initialResync: false,
@@ -100,10 +103,12 @@ export function automaticLive(
100
103
  pushed: decode !== undefined,
101
104
  ready,
102
105
  signal,
106
+ signals,
103
107
  source,
104
108
  statuses,
105
109
  subscription,
106
110
  });
111
+ shareQuerySignals(gated, atom);
107
112
  Object.assign(gated, { initialValueTarget: atom });
108
113
  if (Atom.isSerializable(atom)) {
109
114
  Object.assign(gated, { [Atom.SerializableTypeId]: atom[Atom.SerializableTypeId] });
package/src/bind.ts CHANGED
@@ -7,10 +7,10 @@ import type * as AtomRpc from "effect/reactivity/AtomRpc";
7
7
  import type * as Reactivity from "effect/reactivity/Reactivity";
8
8
  import type { Rpc, RpcGroup } from "effect/rpc";
9
9
  import type { RpcClientError } from "effect/rpc/RpcClientError";
10
+ import { bindingOwner } from "#adapters/bindingOwner.ts";
10
11
  import { automaticLive, type LiveBound, LiveConnection } from "#automaticLive.ts";
11
12
  import type { ClientOptions, MadeClient } from "#clientOptions.ts";
12
13
  import type { Contract, Declared, Tag } from "#contract.ts";
13
- import { bindingOwner } from "#internal/bindingOwner.ts";
14
14
  import { clientOperations } from "#internal/clientOperations.ts";
15
15
  import { type RpcSource, rpcClient } from "#internal/rpcClient.ts";
16
16
  import type { CommandShape, QueryShape, StreamShape } from "#operation.ts";