@shivaedev/contract 0.43.5 → 0.45.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 +43 -0
- package/README.md +265 -45
- package/dist/adapters/activityState.d.ts +3 -2
- package/dist/adapters/activityState.d.ts.map +1 -1
- package/dist/adapters/activityState.js +11 -1
- package/dist/adapters/activityState.js.map +1 -1
- package/dist/adapters/clientConnection.d.ts +1 -0
- package/dist/adapters/clientConnection.d.ts.map +1 -1
- package/dist/adapters/clientConnection.js +18 -10
- package/dist/adapters/clientConnection.js.map +1 -1
- package/dist/adapters/servedHandlers.d.ts +8 -0
- package/dist/adapters/servedHandlers.d.ts.map +1 -0
- package/dist/adapters/servedHandlers.js +51 -0
- package/dist/adapters/servedHandlers.js.map +1 -0
- package/dist/automaticQuery.js +1 -1
- package/dist/automaticQuery.js.map +1 -1
- package/dist/clientActivities.d.ts +2 -0
- package/dist/clientActivities.d.ts.map +1 -1
- package/dist/clientActivities.js +7 -3
- package/dist/clientActivities.js.map +1 -1
- package/dist/clientActivity.d.ts +2 -2
- package/dist/clientActivity.d.ts.map +1 -1
- package/dist/clientActivity.js +1 -1
- package/dist/clientActivity.js.map +1 -1
- package/dist/clientContract.d.ts +51 -0
- package/dist/clientContract.d.ts.map +1 -0
- package/dist/clientContract.js +32 -0
- package/dist/clientContract.js.map +1 -0
- package/dist/clientMatchesModule.d.ts +18 -0
- package/dist/clientMatchesModule.d.ts.map +1 -0
- package/dist/clientMatchesModule.js +2 -0
- package/dist/clientMatchesModule.js.map +1 -0
- package/dist/contract.d.ts +23 -1
- package/dist/contract.d.ts.map +1 -1
- package/dist/contract.js +9 -6
- package/dist/contract.js.map +1 -1
- package/dist/declarationError.d.ts +1 -2
- package/dist/declarationError.d.ts.map +1 -1
- package/dist/declarationError.js +3 -1
- package/dist/declarationError.js.map +1 -1
- package/dist/defineModule.d.ts +41 -0
- package/dist/defineModule.d.ts.map +1 -0
- package/dist/defineModule.js +17 -0
- package/dist/defineModule.js.map +1 -0
- package/dist/live-server/subscribe.d.ts.map +1 -1
- package/dist/live-server/subscribe.js +64 -6
- package/dist/live-server/subscribe.js.map +1 -1
- package/dist/live.d.ts +1 -0
- package/dist/live.d.ts.map +1 -1
- package/dist/live.js +5 -0
- package/dist/live.js.map +1 -1
- package/dist/liveAnswers.d.ts +9 -0
- package/dist/liveAnswers.d.ts.map +1 -0
- package/dist/liveAnswers.js +12 -0
- package/dist/liveAnswers.js.map +1 -0
- package/dist/moduleHandlers.d.ts +15 -0
- package/dist/moduleHandlers.d.ts.map +1 -0
- package/dist/moduleHandlers.js +5 -0
- package/dist/moduleHandlers.js.map +1 -0
- package/dist/moduleProof.d.ts +79 -0
- package/dist/moduleProof.d.ts.map +1 -0
- package/dist/moduleProof.js +2 -0
- package/dist/moduleProof.js.map +1 -0
- package/dist/operation.d.ts +14 -12
- package/dist/operation.d.ts.map +1 -1
- package/dist/operation.js +10 -4
- package/dist/operation.js.map +1 -1
- package/dist/operationDeclaration.d.ts +9 -1
- package/dist/operationDeclaration.d.ts.map +1 -1
- package/dist/operationDeclaration.js.map +1 -1
- package/dist/queryDelivery.js +1 -1
- package/dist/queryDelivery.js.map +1 -1
- package/dist/querySubscription.d.ts +1 -1
- package/dist/querySubscription.d.ts.map +1 -1
- package/dist/querySubscription.js +6 -4
- package/dist/querySubscription.js.map +1 -1
- package/dist/readPolicy.d.ts +2 -1
- package/dist/readPolicy.d.ts.map +1 -1
- package/dist/readPolicy.js +9 -5
- package/dist/readPolicy.js.map +1 -1
- package/dist/retainQuery.d.ts +1 -0
- package/dist/retainQuery.d.ts.map +1 -1
- package/dist/retainQuery.js +5 -0
- package/dist/retainQuery.js.map +1 -1
- package/dist/rpcClient.d.ts +1 -0
- package/dist/rpcClient.d.ts.map +1 -1
- package/dist/runProof.d.ts +69 -0
- package/dist/runProof.d.ts.map +1 -0
- package/dist/runProof.js +2 -0
- package/dist/runProof.js.map +1 -0
- package/dist/servedOperation.d.ts +72 -0
- package/dist/servedOperation.d.ts.map +1 -0
- package/dist/servedOperation.js +11 -0
- package/dist/servedOperation.js.map +1 -0
- package/dist/servedReadPolicy.d.ts +11 -0
- package/dist/servedReadPolicy.d.ts.map +1 -0
- package/dist/servedReadPolicy.js +9 -0
- package/dist/servedReadPolicy.js.map +1 -0
- package/dist/serverMetadata.d.ts +1 -4
- package/dist/serverMetadata.d.ts.map +1 -1
- package/dist/serverMetadata.js +3 -6
- package/dist/serverMetadata.js.map +1 -1
- package/dist/successProof.d.ts +51 -0
- package/dist/successProof.d.ts.map +1 -0
- package/dist/successProof.js +2 -0
- package/dist/successProof.js.map +1 -0
- package/dist/wire.d.ts +25 -0
- package/dist/wire.d.ts.map +1 -0
- package/dist/wire.js +13 -0
- package/dist/wire.js.map +1 -0
- package/package.json +16 -16
- package/src/adapters/activityState.ts +12 -3
- package/src/adapters/clientConnection.ts +24 -16
- package/src/adapters/servedHandlers.ts +69 -0
- package/src/automaticQuery.ts +1 -1
- package/src/clientActivities.ts +7 -3
- package/src/clientActivity.ts +3 -1
- package/src/clientContract.ts +128 -0
- package/src/clientMatchesModule.ts +24 -0
- package/src/contract.ts +24 -17
- package/src/declarationError.ts +5 -2
- package/src/defineModule.ts +112 -0
- package/src/live-server/subscribe.ts +74 -6
- package/src/live.ts +7 -0
- package/src/liveAnswers.ts +13 -0
- package/src/moduleHandlers.ts +23 -0
- package/src/moduleProof.ts +101 -0
- package/src/operation.ts +47 -33
- package/src/operationDeclaration.ts +19 -1
- package/src/queryDelivery.ts +1 -1
- package/src/querySubscription.ts +6 -4
- package/src/readPolicy.ts +15 -5
- package/src/retainQuery.ts +7 -0
- package/src/runProof.ts +96 -0
- package/src/servedOperation.ts +145 -0
- package/src/servedReadPolicy.ts +19 -0
- package/src/serverMetadata.ts +3 -6
- package/src/successProof.ts +120 -0
- package/src/wire.ts +45 -0
|
@@ -1,10 +1,13 @@
|
|
|
1
1
|
import { Effect, SubscriptionRef } from "effect";
|
|
2
|
+
import { isClientSettled } from "#clientActivity.ts";
|
|
2
3
|
export function activityState() {
|
|
3
4
|
let held = 0;
|
|
5
|
+
let answered = false;
|
|
4
6
|
let connection = "live";
|
|
5
7
|
const state = Effect.runSync(SubscriptionRef.make({
|
|
6
8
|
commands: 0,
|
|
7
9
|
connectionStatus: "live",
|
|
10
|
+
firstSettled: false,
|
|
8
11
|
initialQueries: 0,
|
|
9
12
|
liveHints: 0,
|
|
10
13
|
refreshingAtoms: 0,
|
|
@@ -14,10 +17,17 @@ export function activityState() {
|
|
|
14
17
|
const connectionStatus = held > 0 ? "waiting-for-connection" : connection;
|
|
15
18
|
Effect.runSync(SubscriptionRef.update(state, (current) => (current.connectionStatus === connectionStatus ? current : { ...current, connectionStatus })));
|
|
16
19
|
}
|
|
20
|
+
function latched(current) {
|
|
21
|
+
return answered && !current.firstSettled && isClientSettled(current) ? { ...current, firstSettled: true } : current;
|
|
22
|
+
}
|
|
17
23
|
return {
|
|
18
24
|
activity: Object.assign(SubscriptionRef.changes(state), { current: SubscriptionRef.get(state) }),
|
|
25
|
+
answered: () => {
|
|
26
|
+
answered = true;
|
|
27
|
+
Effect.runSync(SubscriptionRef.update(state, latched));
|
|
28
|
+
},
|
|
19
29
|
change: (key, delta) => {
|
|
20
|
-
Effect.runSync(SubscriptionRef.update(state, (current) => ({ ...current, [key]: current[key] + delta })));
|
|
30
|
+
Effect.runSync(SubscriptionRef.update(state, (current) => latched({ ...current, [key]: current[key] + delta })));
|
|
21
31
|
},
|
|
22
32
|
hold: () => {
|
|
23
33
|
held += 1;
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"activityState.js","sourceRoot":"","sources":["../../src/adapters/activityState.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,QAAQ,CAAC;AACjD,OAAO,EAAmD,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAEtG,MAAM,UAAU,aAAa;IAC5B,IAAI,IAAI,GAAG,CAAC,CAAC;IACb,IAAI,QAAQ,GAAG,KAAK,CAAC;IACrB,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,YAAY,EAAE,KAAK;QACnB,cAAc,EAAE,CAAC;QACjB,SAAS,EAAE,CAAC;QACZ,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,SAAS,OAAO,CAAC,OAA4B;QAC5C,OAAO,QAAQ,IAAI,CAAC,OAAO,CAAC,YAAY,IAAI,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;IACrH,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,QAAQ,EAAE,GAAG,EAAE;YACd,QAAQ,GAAG,IAAI,CAAC;YAChB,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC;QACxD,CAAC;QACD,MAAM,EAAE,CAAC,GAA4E,EAAE,KAAa,EAAE,EAAE;YACvG,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,GAAG,OAAO,EAAE,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC;QAClH,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"}
|
|
@@ -5,6 +5,7 @@ import type { LiveStatus } from "#live.ts";
|
|
|
5
5
|
export declare function clientConnection(factory: Atom.RuntimeFactory, publish: (status: ConnectionStatus) => void, activity: Stream.Stream<ClientActivityState> & {
|
|
6
6
|
readonly current: Effect.Effect<ClientActivityState>;
|
|
7
7
|
}): {
|
|
8
|
+
firstSettled: Atom.Atom<boolean>;
|
|
8
9
|
status: Atom.Atom<ConnectionStatus>;
|
|
9
10
|
statuses: Atom.Writable<ReadonlyMap<object, LiveStatus<unknown>>, ReadonlyMap<object, LiveStatus<unknown>>>;
|
|
10
11
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clientConnection.d.ts","sourceRoot":"","sources":["../../src/adapters/clientConnection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAiB,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEvD,OAAO,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAC/C,OAAO,KAAK,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAChF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAE3C,wBAAgB,gBAAgB,CAC/B,OAAO,EAAE,IAAI,CAAC,cAAc,EAC5B,OAAO,EAAE,CAAC,MAAM,EAAE,gBAAgB,KAAK,IAAI,EAC3C,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,mBAAmB,CAAC,GAAG;IAAE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAA;CAAE
|
|
1
|
+
{"version":3,"file":"clientConnection.d.ts","sourceRoot":"","sources":["../../src/adapters/clientConnection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAiB,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEvD,OAAO,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAC/C,OAAO,KAAK,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAChF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAE3C,wBAAgB,gBAAgB,CAC/B,OAAO,EAAE,IAAI,CAAC,cAAc,EAC5B,OAAO,EAAE,CAAC,MAAM,EAAE,gBAAgB,KAAK,IAAI,EAC3C,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,mBAAmB,CAAC,GAAG;IAAE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAA;CAAE;;;;EAsDvG"}
|
|
@@ -17,15 +17,23 @@ export function clientConnection(factory, publish, activity) {
|
|
|
17
17
|
get.addFinalizer(cancel);
|
|
18
18
|
return "live";
|
|
19
19
|
});
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
20
|
+
function follow(select, mounts = []) {
|
|
21
|
+
return Atom.make((get) => {
|
|
22
|
+
for (const mounted of mounts) {
|
|
23
|
+
get.mount(mounted);
|
|
24
|
+
}
|
|
25
|
+
const context = AsyncResult.value(get(runtime));
|
|
26
|
+
if (Option.isSome(context)) {
|
|
27
|
+
const cancel = Effect.runCallbackWith(context.value)(activity.pipe(Stream.map(select), Stream.changes, Stream.runForEach((value) => Effect.sync(() => get.setSelf(value)))));
|
|
28
|
+
get.addFinalizer(cancel);
|
|
29
|
+
}
|
|
30
|
+
return select(Effect.runSync(activity.current));
|
|
31
|
+
});
|
|
32
|
+
}
|
|
33
|
+
return {
|
|
34
|
+
firstSettled: follow((state) => state.firstSettled),
|
|
35
|
+
status: follow((state) => state.connectionStatus, [debounced]),
|
|
36
|
+
statuses,
|
|
37
|
+
};
|
|
30
38
|
}
|
|
31
39
|
//# sourceMappingURL=clientConnection.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clientConnection.js","sourceRoot":"","sources":["../../src/adapters/clientConnection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACvD,OAAO,KAAK,WAAW,MAAM,+BAA+B,CAAC;AAC7D,OAAO,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAI/C,MAAM,UAAU,gBAAgB,CAC/B,OAA4B,EAC5B,OAA2C,EAC3C,QAAuG;IAEvG,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAA2C,IAAI,GAAG,EAAE,CAAC,CAAC;IAChF,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CACvB,QAAQ,EACR,CAAC,MAAM,EAAoB,EAAE,CAC5B,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,UAAU,KAAK,YAAY,IAAI,UAAU,KAAK,cAAc,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,MAAM,CACtI,CAAC;IACF,MAAM,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACrC,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,EAAoB,EAAE;QACrD,MAAM,OAAO,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC;QAChD,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;YAC5B,OAAO,MAAM,CAAC;QACf,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,CAAC,eAAe,CAAC,OAAO,CAAC,KAAK,CAAC,CACnD,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CACvB,MAAM,CAAC,OAAO,EACd,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,EAC7B,MAAM,CAAC,UAAU,CAAC,CAAC,KAAK,EAAE,EAAE,CAC3B,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE;YAChB,OAAO,CAAC,KAAK,CAAC,CAAC;YACf,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACpB,CAAC,CAAC,CACF,EACD,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CACnD,CACD,CAAC;QACF,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;QACzB,OAAO,MAAM,CAAC;IACf,CAAC,CAAC,CAAC;IACH,MAAM,MAAM,
|
|
1
|
+
{"version":3,"file":"clientConnection.js","sourceRoot":"","sources":["../../src/adapters/clientConnection.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { Layer } from "effect";
|
|
2
|
+
import { Rpc } from "effect/rpc";
|
|
3
|
+
import type { Declared } from "#contract.ts";
|
|
4
|
+
import type { CommandShape, QueryShape, StreamShape } from "#operation.ts";
|
|
5
|
+
export declare function servedHandlers(application: {
|
|
6
|
+
readonly requests: ReadonlyMap<string, Rpc.Any>;
|
|
7
|
+
}, declaration: Declared<string, readonly QueryShape[], readonly CommandShape[], readonly StreamShape[], "session" | undefined>): Layer.Layer<Rpc.Handler<string>, never, unknown>;
|
|
8
|
+
//# sourceMappingURL=servedHandlers.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"servedHandlers.d.ts","sourceRoot":"","sources":["../../src/adapters/servedHandlers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,KAAK,EAAe,MAAM,QAAQ,CAAC;AACpD,OAAO,EAAE,GAAG,EAAuB,MAAM,YAAY,CAAC;AAItD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AA6C3E,wBAAgB,cAAc,CAC7B,WAAW,EAAE;IAAE,QAAQ,CAAC,QAAQ,EAAE,WAAW,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,CAAC,CAAA;CAAE,EAChE,WAAW,EAAE,QAAQ,CAAC,MAAM,EAAE,SAAS,UAAU,EAAE,EAAE,SAAS,YAAY,EAAE,EAAE,SAAS,WAAW,EAAE,EAAE,SAAS,GAAG,SAAS,CAAC,GAC1H,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,CAclD"}
|
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
import { Effect, Layer } from "effect";
|
|
2
|
+
import { Rpc, RpcGroup, RpcSchema } from "effect/rpc";
|
|
3
|
+
import { ReadRecorder } from "@shivaedev/changes/readRecorder.ts";
|
|
4
|
+
import { rpcBoundary } from "@shivaedev/errors/boundary.ts";
|
|
5
|
+
import { InternalServerError } from "@shivaedev/errors/taxonomy.ts";
|
|
6
|
+
import { CurrentViewer, checkPolicy } from "#readPolicy.ts";
|
|
7
|
+
import { ServedReadPolicy } from "#servedReadPolicy.ts";
|
|
8
|
+
function runOf(operation) {
|
|
9
|
+
const run = Reflect.get(operation, "run");
|
|
10
|
+
return typeof run === "function" ? (payload) => Reflect.apply(run, operation, [payload]) : undefined;
|
|
11
|
+
}
|
|
12
|
+
function spanOwner(name) {
|
|
13
|
+
return `${name.charAt(0).toUpperCase()}${name.slice(1)}`;
|
|
14
|
+
}
|
|
15
|
+
function guarded(rpc) {
|
|
16
|
+
return rpcBoundary(rpc.errorSchema, { unexpected: (message) => new InternalServerError({ message }) });
|
|
17
|
+
}
|
|
18
|
+
function served(rpc, operation, run, span) {
|
|
19
|
+
const boundary = guarded(rpc);
|
|
20
|
+
return (payload) => Effect.gen(function* () {
|
|
21
|
+
if (operation.kind === "query") {
|
|
22
|
+
yield* checkPolicy(operation, operation.readPolicy, payload, yield* CurrentViewer).pipe(Effect.provideService(ReadRecorder, ReadRecorder.defaultValue()));
|
|
23
|
+
}
|
|
24
|
+
return yield* run(payload);
|
|
25
|
+
}).pipe(Effect.withSpan(span), boundary);
|
|
26
|
+
}
|
|
27
|
+
// Live subscriptions check the policy outside the handler, so the policy carries the handler's failure mapping.
|
|
28
|
+
function servedPolicy(rpc, policy) {
|
|
29
|
+
const boundary = guarded(rpc);
|
|
30
|
+
return (payload, viewer) => boundary(Effect.suspend(() => policy(payload, viewer)));
|
|
31
|
+
}
|
|
32
|
+
// An erased Rpc's `any` success schema selects the stream branch of Rpc.ResultFrom, which an Effect handler cannot satisfy.
|
|
33
|
+
function isEffectRpc(rpc) {
|
|
34
|
+
return Rpc.isRpc(rpc) && !RpcSchema.isStreamSchema(rpc.successSchema);
|
|
35
|
+
}
|
|
36
|
+
export function servedHandlers(application, declaration) {
|
|
37
|
+
const layers = [...declaration.queries, ...declaration.commands].map((operation) => {
|
|
38
|
+
const tag = `${declaration.name}.${operation.name}`;
|
|
39
|
+
const rpc = application.requests.get(tag);
|
|
40
|
+
const run = runOf(operation);
|
|
41
|
+
if (!isEffectRpc(rpc) || run === undefined) {
|
|
42
|
+
return Layer.effectContext(Effect.die(new Error(`Module ${declaration.name} cannot serve ${tag}: it has no RPC or no run`)));
|
|
43
|
+
}
|
|
44
|
+
const handler = RpcGroup.make(rpc).toLayerHandler(tag, served(rpc, operation, run, `${spanOwner(declaration.name)}.${operation.name}`));
|
|
45
|
+
return operation.kind === "query" && operation.readPolicy !== undefined
|
|
46
|
+
? handler.pipe(Layer.provide(Layer.succeed(ServedReadPolicy, { check: servedPolicy(rpc, operation.readPolicy) })))
|
|
47
|
+
: handler;
|
|
48
|
+
});
|
|
49
|
+
return Layer.mergeAll(Layer.empty, ...layers);
|
|
50
|
+
}
|
|
51
|
+
//# sourceMappingURL=servedHandlers.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"servedHandlers.js","sourceRoot":"","sources":["../../src/adapters/servedHandlers.ts"],"names":[],"mappings":"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"}
|
package/dist/automaticQuery.js
CHANGED
|
@@ -108,7 +108,7 @@ export function automaticQuery({ clientStatuses, equivalent, ownerFailure, pause
|
|
|
108
108
|
start();
|
|
109
109
|
return get.once(source);
|
|
110
110
|
}
|
|
111
|
-
return AsyncResult.initial();
|
|
111
|
+
return AsyncResult.initial(true);
|
|
112
112
|
}, (refresh) => {
|
|
113
113
|
refresh(ready);
|
|
114
114
|
refresh(subscription.connection);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"automaticQuery.js","sourceRoot":"","sources":["../src/automaticQuery.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"automaticQuery.js","sourceRoot":"","sources":["../src/automaticQuery.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,7 @@ export declare const clientActivities: WeakMap<object, {
|
|
|
6
6
|
current: Effect.Effect<import("./clientActivity.ts").ClientActivityState, never, never>;
|
|
7
7
|
} & {
|
|
8
8
|
connectionStatus: Atom.Atom<import("./clientActivity.ts").ConnectionStatus>;
|
|
9
|
+
firstSettled: Atom.Atom<boolean>;
|
|
9
10
|
};
|
|
10
11
|
hint: () => void;
|
|
11
12
|
hold: <A, E, R>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A, E, R>;
|
|
@@ -18,6 +19,7 @@ export declare function makeActivity(factory: Atom.RuntimeFactory): {
|
|
|
18
19
|
current: Effect.Effect<import("./clientActivity.ts").ClientActivityState, never, never>;
|
|
19
20
|
} & {
|
|
20
21
|
connectionStatus: Atom.Atom<import("./clientActivity.ts").ConnectionStatus>;
|
|
22
|
+
firstSettled: Atom.Atom<boolean>;
|
|
21
23
|
};
|
|
22
24
|
hint: () => void;
|
|
23
25
|
hold: <A, E, R>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A, E, R>;
|
|
@@ -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;AAMpD,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;AAMpD,eAAO,MAAM,gBAAgB;;;;;;;;WA4EpB,CAAC,EAAE,CAAC,EAAE,CAAC,UAAU,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;;YAnEhC,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;;;;;;;;WA0EhD,CAAC,EAAE,CAAC,EAAE,CAAC,UAAU,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;;YAnEhC,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;EAwDnE"}
|
package/dist/clientActivities.js
CHANGED
|
@@ -5,7 +5,7 @@ import { clientConnection } from "#adapters/clientConnection.ts";
|
|
|
5
5
|
import { wrapAtom } from "#wrapAtom.ts";
|
|
6
6
|
export const clientActivities = new WeakMap();
|
|
7
7
|
export function makeActivity(factory) {
|
|
8
|
-
const { activity, change, hold, setConnection } = activityState();
|
|
8
|
+
const { activity, answered, change, hold, setConnection } = activityState();
|
|
9
9
|
const connection = clientConnection(factory, setConnection, activity);
|
|
10
10
|
function begin(key) {
|
|
11
11
|
change(key, 1);
|
|
@@ -43,9 +43,13 @@ export function makeActivity(factory) {
|
|
|
43
43
|
if (!active) {
|
|
44
44
|
return;
|
|
45
45
|
}
|
|
46
|
-
received
|
|
46
|
+
const first = !(received || AsyncResult.isInitial(result));
|
|
47
|
+
received ||= first;
|
|
47
48
|
initial.set(!received);
|
|
48
49
|
refreshing.set(result.waiting || AsyncResult.isInitial(result));
|
|
50
|
+
if (first) {
|
|
51
|
+
answered();
|
|
52
|
+
}
|
|
49
53
|
}
|
|
50
54
|
get.addFinalizer(() => {
|
|
51
55
|
active = false;
|
|
@@ -68,7 +72,7 @@ export function makeActivity(factory) {
|
|
|
68
72
|
return watched;
|
|
69
73
|
}
|
|
70
74
|
return {
|
|
71
|
-
activity: Object.assign(activity, { connectionStatus: connection.status }),
|
|
75
|
+
activity: Object.assign(activity, { connectionStatus: connection.status, firstSettled: connection.firstSettled }),
|
|
72
76
|
hint: () => change("liveHints", 1),
|
|
73
77
|
hold: (effect) => track(Effect.acquireUseRelease(Effect.sync(hold), () => effect, (end) => Effect.sync(end)), true),
|
|
74
78
|
statuses: connection.statuses,
|
|
@@ -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,QAAQ,EAAE,MAAM,cAAc,CAAC;AAGxC,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;
|
|
1
|
+
{"version":3,"file":"clientActivities.js","sourceRoot":"","sources":["../src/clientActivities.ts"],"names":[],"mappings":"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"}
|
package/dist/clientActivity.d.ts
CHANGED
|
@@ -4,6 +4,7 @@ export type ConnectionStatus = "live" | "reconnecting" | "waiting-for-connection
|
|
|
4
4
|
export interface ClientActivityState {
|
|
5
5
|
readonly commands: number;
|
|
6
6
|
readonly connectionStatus: ConnectionStatus;
|
|
7
|
+
readonly firstSettled: boolean;
|
|
7
8
|
readonly initialQueries: number;
|
|
8
9
|
readonly liveHints: number;
|
|
9
10
|
readonly refreshingAtoms: number;
|
|
@@ -12,6 +13,7 @@ export interface ClientActivityState {
|
|
|
12
13
|
export type ClientActivity = Stream.Stream<ClientActivityState> & {
|
|
13
14
|
readonly connectionStatus: Atom.Atom<ConnectionStatus>;
|
|
14
15
|
readonly current: Effect.Effect<ClientActivityState>;
|
|
16
|
+
readonly firstSettled: Atom.Atom<boolean>;
|
|
15
17
|
};
|
|
16
18
|
export declare const Activity: unique symbol;
|
|
17
19
|
export interface ActiveClient {
|
|
@@ -22,12 +24,10 @@ export declare function isClientIdle(state: ClientActivityState): boolean;
|
|
|
22
24
|
export declare function isClientSettled(state: ClientActivityState): boolean;
|
|
23
25
|
export declare function activityScreenSignal(activity: ClientActivity, settled?: typeof isClientSettled): Stream.Stream<{
|
|
24
26
|
connectionStatus: ConnectionStatus;
|
|
25
|
-
hints: number;
|
|
26
27
|
pending: boolean;
|
|
27
28
|
}, never, never> & {
|
|
28
29
|
current: Effect.Effect<{
|
|
29
30
|
connectionStatus: ConnectionStatus;
|
|
30
|
-
hints: number;
|
|
31
31
|
pending: boolean;
|
|
32
32
|
}, never, never>;
|
|
33
33
|
};
|
|
@@ -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,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,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;
|
|
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,YAAY,EAAE,OAAO,CAAC;IAC/B,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,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;IACrD,QAAQ,CAAC,YAAY,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;CAC1C,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
|
@@ -11,7 +11,7 @@ export function isClientSettled(state) {
|
|
|
11
11
|
}
|
|
12
12
|
export function activityScreenSignal(activity, settled = isClientSettled) {
|
|
13
13
|
function screenState(state) {
|
|
14
|
-
return { connectionStatus: state.connectionStatus,
|
|
14
|
+
return { connectionStatus: state.connectionStatus, pending: !settled(state) };
|
|
15
15
|
}
|
|
16
16
|
return Object.assign(Stream.map(activity, screenState), { current: Effect.map(activity.current, screenState) });
|
|
17
17
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clientActivity.js","sourceRoot":"","sources":["../src/clientActivity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"clientActivity.js","sourceRoot":"","sources":["../src/clientActivity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAqBxC,MAAM,CAAC,MAAM,QAAQ,GAAG,MAAM,CAAC,GAAG,CAAC,oCAAoC,CAAC,CAAC;AAMzE,MAAM,UAAU,cAAc,CAAC,MAAoB;IAClD,OAAO,MAAM,CAAC,QAAQ,CAAC,CAAC;AACzB,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,KAA0B;IACtD,OAAO,KAAK,CAAC,QAAQ,KAAK,CAAC,IAAI,KAAK,CAAC,eAAe,KAAK,CAAC,CAAC;AAC5D,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,KAA0B;IACzD,OAAO,KAAK,CAAC,QAAQ,KAAK,CAAC,IAAI,KAAK,CAAC,cAAc,KAAK,CAAC,CAAC;AAC3D,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,QAAwB,EAAE,OAAO,GAAG,eAAe;IACvF,SAAS,WAAW,CAAC,KAA0B;QAC9C,OAAO,EAAE,gBAAgB,EAAE,KAAK,CAAC,gBAAgB,EAAE,OAAO,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;IAC/E,CAAC;IACD,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,WAAW,CAAC,EAAE,EAAE,OAAO,EAAE,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,OAAO,EAAE,WAAW,CAAC,EAAE,CAAC,CAAC;AACjH,CAAC"}
|
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
import type { Option, Schema } from "effect";
|
|
2
|
+
import type { RpcMiddleware } from "effect/rpc";
|
|
3
|
+
import type { Key } from "@shivaedev/changes/keys.ts";
|
|
4
|
+
import type { ModuleContract } from "#defineModule.ts";
|
|
5
|
+
import type { Command, Operation, PayloadSchema } from "#operation.ts";
|
|
6
|
+
import type { Viewer } from "#readPolicy.ts";
|
|
7
|
+
import type { RejectionSpecs } from "#rejection.ts";
|
|
8
|
+
import type { SpecsOf } from "#runProof.ts";
|
|
9
|
+
import type { SubjectDeclaration } from "#subject.ts";
|
|
10
|
+
import { type Wire, type WireEntry } from "#wire.ts";
|
|
11
|
+
export interface ClientQuery<TName extends string, TPayload extends Schema.Top, TSuccess extends Schema.Top, TSpecs extends RejectionSpecs> extends Operation<TName, TPayload, TSuccess, TSpecs> {
|
|
12
|
+
readonly kind: "query";
|
|
13
|
+
reads: (payload: TPayload["Type"], viewer: Option.Option<Viewer>) => readonly Key[];
|
|
14
|
+
}
|
|
15
|
+
type Payloads<TWire> = {
|
|
16
|
+
readonly [TOperation in keyof TWire]?: Schema.Top | Schema.Struct.Fields;
|
|
17
|
+
};
|
|
18
|
+
type PayloadOf<TPayloads, TOperation> = PayloadSchema<TOperation extends keyof TPayloads ? NonNullable<TPayloads[TOperation]> : Schema.Void>;
|
|
19
|
+
type EntryOf<TWire, TOperation> = TOperation extends keyof TWire ? (TWire[TOperation] extends WireEntry ? TWire[TOperation] : never) : never;
|
|
20
|
+
interface QueryKeys<TPayload> {
|
|
21
|
+
readonly reads: (payload: TPayload, viewer: Option.Option<Viewer>) => readonly Key[];
|
|
22
|
+
readonly readsCollections?: readonly {
|
|
23
|
+
readonly name: string;
|
|
24
|
+
}[];
|
|
25
|
+
}
|
|
26
|
+
interface CommandKeys<TPayload, TResult> {
|
|
27
|
+
readonly invalidates?: (payload: TPayload, result: TResult, viewer?: Option.Option<Viewer>) => readonly Key[];
|
|
28
|
+
}
|
|
29
|
+
type ClientQueries<TWire, TPayloads, TQueries extends string> = {
|
|
30
|
+
readonly [TOperation in TQueries]: ClientQuery<TOperation, PayloadOf<TPayloads, TOperation>, EntryOf<TWire, TOperation>["success"], SpecsOf<EntryOf<TWire, TOperation>["rejections"]>>;
|
|
31
|
+
}[TQueries];
|
|
32
|
+
type ClientCommands<TWire, TPayloads, TCommands extends string> = {
|
|
33
|
+
readonly [TOperation in TCommands]: Command<TOperation, PayloadOf<TPayloads, TOperation>, EntryOf<TWire, TOperation>["success"], SpecsOf<EntryOf<TWire, TOperation>["rejections"]>>;
|
|
34
|
+
}[TCommands];
|
|
35
|
+
export interface ClientContractDefinition<TName extends string, TWire extends Wire, TPayloads extends Payloads<TWire>, TQueries extends keyof TWire & string, TCommands extends keyof TWire & string, TMiddleware extends RpcMiddleware.AnyService, TSubject extends SubjectDeclaration | undefined, TScope extends "session" | undefined> {
|
|
36
|
+
readonly commands?: {
|
|
37
|
+
readonly [TOperation in TCommands]: CommandKeys<PayloadOf<TPayloads, TOperation>["Type"], EntryOf<TWire, TOperation>["success"]["Type"]>;
|
|
38
|
+
};
|
|
39
|
+
readonly keyScope?: TScope;
|
|
40
|
+
readonly middleware?: TMiddleware;
|
|
41
|
+
readonly name: TName;
|
|
42
|
+
readonly payloads?: TPayloads;
|
|
43
|
+
readonly queries?: {
|
|
44
|
+
readonly [TOperation in TQueries]: QueryKeys<PayloadOf<TPayloads, TOperation>["Type"]>;
|
|
45
|
+
};
|
|
46
|
+
readonly subject?: TSubject;
|
|
47
|
+
readonly wire: TWire;
|
|
48
|
+
}
|
|
49
|
+
export declare function clientContract<const TName extends string, const TWire extends Wire, const TPayloads extends Payloads<TWire> = Record<never, never>, TQueries extends keyof TWire & string = never, TCommands extends keyof TWire & string = never, TMiddleware extends RpcMiddleware.AnyService = never, const TSubject extends SubjectDeclaration | undefined = undefined, const TScope extends "session" | undefined = undefined>(definition: ClientContractDefinition<TName, TWire, TPayloads, TQueries, TCommands, TMiddleware, TSubject, TScope>): ModuleContract<TName, readonly (ClientQueries<TWire, TPayloads, TQueries> | ClientCommands<TWire, TPayloads, TCommands>)[], TMiddleware, TSubject, TScope>;
|
|
50
|
+
export {};
|
|
51
|
+
//# sourceMappingURL=clientContract.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"clientContract.d.ts","sourceRoot":"","sources":["../src/clientContract.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
import { declaredGroup } from "#contract.ts";
|
|
2
|
+
import { operation } from "#operationDeclaration.ts";
|
|
3
|
+
import { wireRejections } from "#wire.ts";
|
|
4
|
+
export function clientContract(definition) {
|
|
5
|
+
function declared(name) {
|
|
6
|
+
const entry = definition.wire[name];
|
|
7
|
+
const payload = definition.payloads?.[name];
|
|
8
|
+
return {
|
|
9
|
+
...(payload === undefined ? {} : { payload }),
|
|
10
|
+
...(entry === undefined ? {} : { rejections: wireRejections(entry.rejections), success: entry.success }),
|
|
11
|
+
};
|
|
12
|
+
}
|
|
13
|
+
const queries = Object.entries(definition.queries ?? {}).map(([name, { reads, readsCollections = [] }]) => {
|
|
14
|
+
const collections = readsCollections.map((collection) => ({ _tag: "List", collection: collection.name }));
|
|
15
|
+
return {
|
|
16
|
+
...operation("query", name, declared(name)),
|
|
17
|
+
reads: (payload, viewer) => [...reads(payload, viewer), ...collections],
|
|
18
|
+
};
|
|
19
|
+
});
|
|
20
|
+
const commands = Object.entries(definition.commands ?? {}).map(([name, { invalidates }]) => ({
|
|
21
|
+
...operation("command", name, declared(name)),
|
|
22
|
+
invalidates: invalidates ?? (() => []),
|
|
23
|
+
}));
|
|
24
|
+
const group = declaredGroup(definition.name, {
|
|
25
|
+
commands,
|
|
26
|
+
queries,
|
|
27
|
+
...(definition.keyScope === undefined ? {} : { keyScope: definition.keyScope }),
|
|
28
|
+
...(definition.subject === undefined ? {} : { subject: definition.subject }),
|
|
29
|
+
});
|
|
30
|
+
return definition.middleware?.key === undefined ? group : group.middleware(definition.middleware);
|
|
31
|
+
}
|
|
32
|
+
//# sourceMappingURL=clientContract.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"clientContract.js","sourceRoot":"","sources":["../src/clientContract.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAG7C,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAKrD,OAAO,EAA6B,cAAc,EAAE,MAAM,UAAU,CAAC;AAgFrE,MAAM,UAAU,cAAc,CAAC,UAS9B;IACA,SAAS,QAAQ,CAAC,IAAY;QAC7B,MAAM,KAAK,GAAG,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpC,MAAM,OAAO,GAAG,UAAU,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,CAAC;QAC5C,OAAO;YACN,GAAG,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC;YAC7C,GAAG,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,cAAc,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC;SACxG,CAAC;IACH,CAAC;IACD,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,gBAAgB,GAAG,EAAE,EAAE,CAAC,EAAE,EAAE;QACzG,MAAM,WAAW,GAAmB,gBAAgB,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;QAC1H,OAAO;YACN,GAAG,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;YAC3C,KAAK,EAAE,CAAC,OAAgB,EAAE,MAA6B,EAAE,EAAE,CAAC,CAAC,GAAG,KAAK,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE,GAAG,WAAW,CAAC;SACvG,CAAC;IACH,CAAC,CAAC,CAAC;IACH,MAAM,QAAQ,GAAG,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,WAAW,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;QAC5F,GAAG,SAAS,CAAC,SAAS,EAAE,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;QAC7C,WAAW,EAAE,WAAW,IAAI,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC;KACtC,CAAC,CAAC,CAAC;IACJ,MAAM,KAAK,GAAG,aAAa,CAAC,UAAU,CAAC,IAAI,EAAE;QAC5C,QAAQ;QACR,OAAO;QACP,GAAG,CAAC,UAAU,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,UAAU,CAAC,QAAQ,EAAE,CAAC;QAC/E,GAAG,CAAC,UAAU,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,UAAU,CAAC,OAAO,EAAE,CAAC;KAC5E,CAAC,CAAC;IACH,OAAO,UAAU,CAAC,UAAU,EAAE,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;AACnG,CAAC"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import type { RpcGroup } from "effect/rpc";
|
|
2
|
+
type Rpcs<TGroup> = TGroup extends RpcGroup.RpcGroup<infer TRpcs> ? TRpcs : never;
|
|
3
|
+
type Same<TLeft, TRight> = [TLeft] extends [TRight] ? ([TRight] extends [TLeft] ? true : false) : false;
|
|
4
|
+
type OperationOf<TTag> = TTag extends `${string}.${infer TOperation}` ? TOperation : TTag;
|
|
5
|
+
type Differing<TClient, TModule> = {
|
|
6
|
+
readonly [TTag in Rpcs<TClient>["_tag"] | Rpcs<TModule>["_tag"]]: Same<Extract<Rpcs<TClient>, {
|
|
7
|
+
readonly _tag: TTag;
|
|
8
|
+
}>, Extract<Rpcs<TModule>, {
|
|
9
|
+
readonly _tag: TTag;
|
|
10
|
+
}>> extends true ? never : OperationOf<TTag>;
|
|
11
|
+
}[Rpcs<TClient>["_tag"] | Rpcs<TModule>["_tag"]];
|
|
12
|
+
export interface ClientDiffersFromModule<TOperations, TFix extends string> {
|
|
13
|
+
readonly fix: TFix;
|
|
14
|
+
readonly operations: TOperations;
|
|
15
|
+
}
|
|
16
|
+
export type ClientMatchesModule<TClient, TModule> = [Differing<TClient, TModule>] extends [never] ? true : ClientDiffersFromModule<Differing<TClient, TModule>, "the generated file is stale; run pnpm generate">;
|
|
17
|
+
export {};
|
|
18
|
+
//# sourceMappingURL=clientMatchesModule.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"clientMatchesModule.d.ts","sourceRoot":"","sources":["../src/clientMatchesModule.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAE3C,KAAK,IAAI,CAAC,MAAM,IAAI,MAAM,SAAS,QAAQ,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,GAAG,KAAK,GAAG,KAAK,CAAC;AAClF,KAAK,IAAI,CAAC,KAAK,EAAE,MAAM,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,IAAI,GAAG,KAAK,CAAC,GAAG,KAAK,CAAC;AACxG,KAAK,WAAW,CAAC,IAAI,IAAI,IAAI,SAAS,GAAG,MAAM,IAAI,MAAM,UAAU,EAAE,GAAG,UAAU,GAAG,IAAI,CAAC;AAE1F,KAAK,SAAS,CAAC,OAAO,EAAE,OAAO,IAAI;IAClC,QAAQ,EAAE,IAAI,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,GAAG,IAAI,CACrE,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;QAAE,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAA;KAAE,CAAC,EAC/C,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;QAAE,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAA;KAAE,CAAC,CAC/C,SAAS,IAAI,GACX,KAAK,GACL,WAAW,CAAC,IAAI,CAAC;CACpB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;AAEjD,MAAM,WAAW,uBAAuB,CAAC,WAAW,EAAE,IAAI,SAAS,MAAM;IACxE,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC;IACnB,QAAQ,CAAC,UAAU,EAAE,WAAW,CAAC;CACjC;AAGD,MAAM,MAAM,mBAAmB,CAAC,OAAO,EAAE,OAAO,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,GAC9F,IAAI,GACJ,uBAAuB,CAAC,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,gDAAgD,CAAC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"clientMatchesModule.js","sourceRoot":"","sources":["../src/clientMatchesModule.ts"],"names":[],"mappings":""}
|
package/dist/contract.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { Context } from "effect";
|
|
1
2
|
import { Rpc, RpcGroup, type RpcMiddleware } from "effect/rpc";
|
|
2
3
|
import { type Unique } from "#declarationError.ts";
|
|
3
4
|
import type { CommandShape, QueryShape, StreamShape } from "#operation.ts";
|
|
@@ -20,11 +21,32 @@ export interface Contract<TName extends string, TQueries extends readonly QueryS
|
|
|
20
21
|
readonly declaration: Declared<TName, TQueries, TCommands, TStreams, TScope>;
|
|
21
22
|
middleware: <TM extends RpcMiddleware.AnyService>(middleware: TM) => Contract<TName, TQueries, TCommands, Rpc.AddMiddleware<TRpcs, TM>, TStreams, TScope>;
|
|
22
23
|
}
|
|
23
|
-
|
|
24
|
+
type AnyDeclared = Declared<string, readonly QueryShape[], readonly CommandShape[], readonly StreamShape[], "session" | undefined>;
|
|
25
|
+
interface Group {
|
|
26
|
+
middleware: (middleware: RpcMiddleware.AnyService) => Group;
|
|
27
|
+
}
|
|
28
|
+
interface DeclaredGroup extends Group {
|
|
29
|
+
readonly application: unknown;
|
|
30
|
+
readonly declaration: AnyDeclared;
|
|
31
|
+
}
|
|
32
|
+
type PolicedQuery = QueryShape & {
|
|
33
|
+
readonly readPolicy: NonNullable<QueryShape["readPolicy"]>;
|
|
34
|
+
};
|
|
35
|
+
export declare function contract<const TName extends string, const TQueries extends readonly PolicedQuery[] = readonly [], const TCommands extends readonly CommandShape[] = readonly [], const TStreams extends readonly StreamShape[] = readonly [], const TScope extends "session" | undefined = undefined, const TSubject extends SubjectDeclaration | undefined = undefined>(name: TName, operations: {
|
|
24
36
|
readonly keyScope?: TScope;
|
|
25
37
|
readonly subject?: TSubject;
|
|
26
38
|
readonly queries?: TQueries & Unique<TQueries>;
|
|
27
39
|
readonly commands?: TCommands & Unique<[...TQueries, ...TCommands]>;
|
|
28
40
|
readonly streams?: TStreams & Unique<[...TQueries, ...TCommands, ...TStreams]>;
|
|
29
41
|
}): Contract<TName, TQueries, TCommands, WithSubject<OperationRpc<TName, TQueries[number] | TCommands[number] | TStreams[number]> | Rpc.AddMiddleware<ReturnType<typeof changesRpc<TName, TQueries>>, typeof ReadPolicyGuard>, TSubject>, TStreams, TScope>;
|
|
42
|
+
interface Operations {
|
|
43
|
+
readonly annotations?: Context.Context<never>;
|
|
44
|
+
readonly commands?: readonly CommandShape[];
|
|
45
|
+
readonly keyScope?: "session";
|
|
46
|
+
readonly queries?: readonly QueryShape[];
|
|
47
|
+
readonly streams?: readonly StreamShape[];
|
|
48
|
+
readonly subject?: SubjectDeclaration;
|
|
49
|
+
}
|
|
50
|
+
export declare function declaredGroup(name: string, operations: Operations): DeclaredGroup;
|
|
51
|
+
export {};
|
|
30
52
|
//# sourceMappingURL=contract.d.ts.map
|
package/dist/contract.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contract.d.ts","sourceRoot":"","sources":["../src/contract.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"contract.d.ts","sourceRoot":"","sources":["../src/contract.ts"],"names":[],"mappings":"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"}
|
package/dist/contract.js
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import { Schema } from "effect";
|
|
1
|
+
import { Context, Schema } from "effect";
|
|
2
2
|
import { Rpc, RpcGroup } from "effect/rpc";
|
|
3
3
|
import { DeclarationError, declarationError } from "#declarationError.ts";
|
|
4
4
|
import { ReadPolicyGuard } from "#ReadPolicyGuard.ts";
|
|
5
5
|
import { QueryReadDenied } from "#readPolicyErrors.ts";
|
|
6
|
-
import { changesRpc,
|
|
6
|
+
import { changesRpc, operationAnnotations } from "#serverMetadata.ts";
|
|
7
7
|
import { subjectMiddleware } from "#subjectMiddleware.ts";
|
|
8
8
|
function assertValid(name, operations) {
|
|
9
9
|
return declarationError(name, operations);
|
|
@@ -17,7 +17,10 @@ function withDeclaration(group, application, declaration) {
|
|
|
17
17
|
});
|
|
18
18
|
}
|
|
19
19
|
export function contract(name, operations) {
|
|
20
|
-
|
|
20
|
+
return declaredGroup(name, operations);
|
|
21
|
+
}
|
|
22
|
+
export function declaredGroup(name, operations) {
|
|
23
|
+
const { queries = [], commands = [], streams = [], keyScope, annotations = Context.empty() } = operations;
|
|
21
24
|
const error = assertValid(name, [...queries, ...commands, ...streams]);
|
|
22
25
|
const rpcs = [...queries, ...commands, ...streams].map((operation) => {
|
|
23
26
|
const rpc = Rpc.make(`${name}.${operation.name}`, {
|
|
@@ -25,14 +28,14 @@ export function contract(name, operations) {
|
|
|
25
28
|
payload: operation.payload,
|
|
26
29
|
stream: operation.kind === "stream",
|
|
27
30
|
success: operation.success,
|
|
28
|
-
}).annotateMerge(operationAnnotations(operation,
|
|
31
|
+
}).annotateMerge(Context.merge(operationAnnotations(operation), annotations));
|
|
29
32
|
const guarded = operation.kind === "query" ? rpc.middleware(ReadPolicyGuard) : rpc;
|
|
30
33
|
return operations.subject === undefined ? guarded : guarded.middleware(subjectMiddleware(`${name}.${operation.name}`, operations.subject));
|
|
31
34
|
});
|
|
32
35
|
const application = RpcGroup.make(...rpcs);
|
|
33
|
-
const changes = changesRpc(name, queries).middleware(ReadPolicyGuard);
|
|
36
|
+
const changes = changesRpc(name, queries).annotateMerge(annotations).middleware(ReadPolicyGuard);
|
|
34
37
|
const subjectChanges = operations.subject === undefined ? changes : changes.middleware(subjectMiddleware(`${name}.$changes`, operations.subject));
|
|
35
|
-
const built = application.add(
|
|
38
|
+
const built = application.add(subjectChanges);
|
|
36
39
|
const group = error === undefined ? built : built.annotate(DeclarationError, error);
|
|
37
40
|
return withDeclaration(group, application, {
|
|
38
41
|
commands,
|