@effect-app/infra 4.0.0-beta.256 → 4.0.0-beta.257
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 +7 -0
- package/dist/WorkflowEngineCosmos.d.ts +29 -0
- package/dist/WorkflowEngineCosmos.d.ts.map +1 -0
- package/dist/WorkflowEngineCosmos.js +521 -0
- package/package.json +2 -2
- package/test/dist/_check-agg-infer.test-d.d.ts +2 -0
- package/test/dist/_check-agg-infer.test-d.d.ts.map +1 -0
- package/test/dist/_check-agg-infer.test-d.js +19 -0
- package/test/dist/_check-proj-infer.test-d.d.ts +2 -0
- package/test/dist/_check-proj-infer.test-d.d.ts.map +1 -0
- package/test/dist/_check-proj-infer.test-d.js +16 -0
- package/test/dist/_check-tighten.test-d.d.ts +2 -0
- package/test/dist/_check-tighten.test-d.d.ts.map +1 -0
- package/test/dist/_check-tighten.test-d.js +21 -0
package/CHANGELOG.md
CHANGED
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
import * as Layer from "effect-app/Layer";
|
|
2
|
+
import * as Duration from "effect/Duration";
|
|
3
|
+
import * as Redacted from "effect/Redacted";
|
|
4
|
+
import { WorkflowEngine } from "effect/unstable/workflow/WorkflowEngine";
|
|
5
|
+
export interface WorkflowEngineCosmosConfig {
|
|
6
|
+
readonly url: Redacted.Redacted<string>;
|
|
7
|
+
readonly dbName: string;
|
|
8
|
+
readonly prefix?: string;
|
|
9
|
+
/** Lease duration before claim considered stale. Default 30s. */
|
|
10
|
+
readonly leaseTtl?: Duration.Duration;
|
|
11
|
+
/** Renewal cadence — should be < leaseTtl. Default 10s. */
|
|
12
|
+
readonly heartbeatInterval?: Duration.Duration;
|
|
13
|
+
/** Cadence for scanning stale leases. Default 15s. Set to `Duration.zero` to disable. */
|
|
14
|
+
readonly recoveryInterval?: Duration.Duration;
|
|
15
|
+
/** Cadence for scanning due clocks. Default 5s. Set to `Duration.zero` to disable. */
|
|
16
|
+
readonly clockPollInterval?: Duration.Duration;
|
|
17
|
+
/** Stable worker identity; defaults to a random UUID per process. */
|
|
18
|
+
readonly workerId?: string;
|
|
19
|
+
}
|
|
20
|
+
/**
|
|
21
|
+
* Cosmos DB backed `WorkflowEngine` layer.
|
|
22
|
+
*
|
|
23
|
+
* Per-execution writes share a partition key (TransactionalBatch-eligible) and
|
|
24
|
+
* use OCC via `_etag`/IfMatch, giving first-writer-wins semantics for activity
|
|
25
|
+
* results, durable-deferred completions, and exec-state transitions. All
|
|
26
|
+
* persisted payloads/results/exits are round-tripped through schema codecs.
|
|
27
|
+
*/
|
|
28
|
+
export declare const layerCosmos: (cfg: WorkflowEngineCosmosConfig) => Layer.Layer<WorkflowEngine>;
|
|
29
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiV29ya2Zsb3dFbmdpbmVDb3Ntb3MuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9Xb3JrZmxvd0VuZ2luZUNvc21vcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFpQ0EsT0FBTyxLQUFLLEtBQUssTUFBTSxrQkFBa0IsQ0FBQTtBQUd6QyxPQUFPLEtBQUssUUFBUSxNQUFNLGlCQUFpQixDQUFBO0FBSTNDLE9BQU8sS0FBSyxRQUFRLE1BQU0saUJBQWlCLENBQUE7QUFJM0MsT0FBTyxFQUE0QixjQUFjLEVBQW9CLE1BQU0seUNBQXlDLENBQUE7QUFNcEgsTUFBTSxXQUFXLDBCQUEwQjtJQUN6QyxRQUFRLENBQUMsR0FBRyxFQUFFLFFBQVEsQ0FBQyxRQUFRLENBQUMsTUFBTSxDQUFDLENBQUE7SUFDdkMsUUFBUSxDQUFDLE1BQU0sRUFBRSxNQUFNLENBQUE7SUFDdkIsUUFBUSxDQUFDLE1BQU0sQ0FBQyxFQUFFLE1BQU0sQ0FBQTtJQUN4QixpRUFBaUU7SUFDakUsUUFBUSxDQUFDLFFBQVEsQ0FBQyxFQUFFLFFBQVEsQ0FBQyxRQUFRLENBQUE7SUFDckMsMkRBQTJEO0lBQzNELFFBQVEsQ0FBQyxpQkFBaUIsQ0FBQyxFQUFFLFFBQVEsQ0FBQyxRQUFRLENBQUE7SUFDOUMseUZBQXlGO0lBQ3pGLFFBQVEsQ0FBQyxnQkFBZ0IsQ0FBQyxFQUFFLFFBQVEsQ0FBQyxRQUFRLENBQUE7SUFDN0Msc0ZBQXNGO0lBQ3RGLFFBQVEsQ0FBQyxpQkFBaUIsQ0FBQyxFQUFFLFFBQVEsQ0FBQyxRQUFRLENBQUE7SUFDOUMscUVBQXFFO0lBQ3JFLFFBQVEsQ0FBQyxRQUFRLENBQUMsRUFBRSxNQUFNLENBQUE7Q0FDM0I7QUFtb0JEOzs7Ozs7O0dBT0c7QUFDSCxlQUFPLE1BQU0sV0FBVyxRQUFTLDBCQUEwQixLQUFHLEtBQUssQ0FBQyxLQUFLLENBQUMsY0FBYyxDQUdSLENBQUEifQ==
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"WorkflowEngineCosmos.d.ts","sourceRoot":"","sources":["../src/WorkflowEngineCosmos.ts"],"names":[],"mappings":"AAiCA,OAAO,KAAK,KAAK,MAAM,kBAAkB,CAAA;AAGzC,OAAO,KAAK,QAAQ,MAAM,iBAAiB,CAAA;AAI3C,OAAO,KAAK,QAAQ,MAAM,iBAAiB,CAAA;AAI3C,OAAO,EAA4B,cAAc,EAAoB,MAAM,yCAAyC,CAAA;AAMpH,MAAM,WAAW,0BAA0B;IACzC,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;IACvC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;IACxB,iEAAiE;IACjE,QAAQ,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC,QAAQ,CAAA;IACrC,2DAA2D;IAC3D,QAAQ,CAAC,iBAAiB,CAAC,EAAE,QAAQ,CAAC,QAAQ,CAAA;IAC9C,yFAAyF;IACzF,QAAQ,CAAC,gBAAgB,CAAC,EAAE,QAAQ,CAAC,QAAQ,CAAA;IAC7C,sFAAsF;IACtF,QAAQ,CAAC,iBAAiB,CAAC,EAAE,QAAQ,CAAC,QAAQ,CAAA;IAC9C,qEAAqE;IACrE,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAC3B;AAmoBD;;;;;;;GAOG;AACH,eAAO,MAAM,WAAW,QAAS,0BAA0B,KAAG,KAAK,CAAC,KAAK,CAAC,cAAc,CAGR,CAAA"}
|
|
@@ -0,0 +1,521 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Cosmos DB backed {@link WorkflowEngine} implementation.
|
|
3
|
+
*
|
|
4
|
+
* Persists workflow state in a single container partitioned by `executionId`
|
|
5
|
+
* so per-execution writes share a partition key (eligible for Cosmos
|
|
6
|
+
* TransactionalBatch). Optimistic concurrency is enforced with `_etag` +
|
|
7
|
+
* `IfMatch` on Replace, and create-only batch ops give first-writer-wins
|
|
8
|
+
* semantics for activity results and durable-deferred completions.
|
|
9
|
+
*
|
|
10
|
+
* Durability — everything that crosses the storage boundary is round-tripped
|
|
11
|
+
* through schema codecs (`S.fromJsonString(S.toCodecJson(...))`), exactly like
|
|
12
|
+
* the cluster engine, instead of dumping live runtime objects as JSON:
|
|
13
|
+
*
|
|
14
|
+
* - The workflow payload and the top-level workflow result are encoded with the
|
|
15
|
+
* workflow's own `payloadSchema` / `successSchema` / `errorSchema`, so typed
|
|
16
|
+
* values (dates, branded ids, schema classes) survive a restart.
|
|
17
|
+
* - Activity results flow through the engine already encoded, so they are
|
|
18
|
+
* persisted with an opaque `Workflow.Result({ success: AnyOrVoid, error:
|
|
19
|
+
* AnyOrVoid })` codec — same trick the cluster `ActivityRpc` uses.
|
|
20
|
+
* - Durable-deferred exits and clock completions use an opaque `Exit` codec.
|
|
21
|
+
*
|
|
22
|
+
* Crash recovery: each driver holds a time-bound lease (`worker` +
|
|
23
|
+
* `leaseExpiresAt`) on the exec doc and renews it via a heartbeat fiber. A
|
|
24
|
+
* scope-bound recovery poller queries for exec docs whose lease has lapsed and
|
|
25
|
+
* re-drives them in the local process, decoding the persisted payload and
|
|
26
|
+
* picking up persisted activity results from where the crashed driver left off.
|
|
27
|
+
*
|
|
28
|
+
* Durable clocks: `scheduleClock` writes a clock doc (`fireAt`, `deferredName`)
|
|
29
|
+
* and arms an in-process timer. A cross-partition clock poller fires any clock
|
|
30
|
+
* whose `fireAt` is due, completing the deferred idempotently (create-only) and
|
|
31
|
+
* deleting the doc. Survives restarts.
|
|
32
|
+
*/
|
|
33
|
+
import * as Effect from "effect-app/Effect";
|
|
34
|
+
import * as Layer from "effect-app/Layer";
|
|
35
|
+
import * as Option from "effect-app/Option";
|
|
36
|
+
import * as S from "effect-app/Schema";
|
|
37
|
+
import * as Duration from "effect/Duration";
|
|
38
|
+
import * as Exit from "effect/Exit";
|
|
39
|
+
import * as Fiber from "effect/Fiber";
|
|
40
|
+
import * as FiberMap from "effect/FiberMap";
|
|
41
|
+
import * as Redacted from "effect/Redacted";
|
|
42
|
+
import * as Schedule from "effect/Schedule";
|
|
43
|
+
import * as Workflow from "effect/unstable/workflow/Workflow";
|
|
44
|
+
import { makeUnsafe, WorkflowEngine, WorkflowInstance } from "effect/unstable/workflow/WorkflowEngine";
|
|
45
|
+
import { randomUUID } from "node:crypto";
|
|
46
|
+
import { CosmosClient, CosmosClientLayer } from "./cosmos-client.js";
|
|
47
|
+
import { OptimisticConcurrencyException } from "./errors.js";
|
|
48
|
+
import { annotateCosmosResponse, annotateDb } from "./otel.js";
|
|
49
|
+
const execId = "exec";
|
|
50
|
+
const activityKey = (name, attempt) => `activity::${name}::${attempt}`;
|
|
51
|
+
const deferredKey = (name) => `deferred::${name}`;
|
|
52
|
+
const clockKey = (name) => `clock::${name}`;
|
|
53
|
+
const isOptimisticStatus = (code) => code === 409 || code === 412 || code === 404;
|
|
54
|
+
// --- Storage codecs ----------------------------------------------------------
|
|
55
|
+
// Values flowing through the engine's activity / deferred boundary are already
|
|
56
|
+
// schema-encoded, so the structure is round-tripped while the payload stays
|
|
57
|
+
// opaque (mirrors the cluster engine's `AnyOrVoid` usage).
|
|
58
|
+
const AnyOrVoid = S.Union([S.Any, S.Void]);
|
|
59
|
+
const ActivityResultCodec = S.fromJsonString(S.toCodecJson(Workflow.Result({ success: AnyOrVoid, error: AnyOrVoid })));
|
|
60
|
+
const DeferredExitCodec = S.fromJsonString(S.toCodecJson(S.Exit(AnyOrVoid, AnyOrVoid, S.Defect)));
|
|
61
|
+
const encodeActivityResult = (r) => Effect.orDie(S.encodeEffect(ActivityResultCodec)(r));
|
|
62
|
+
const decodeActivityResult = (s) => Effect.orDie(S.decodeEffect(ActivityResultCodec)(s));
|
|
63
|
+
const encodeDeferredExit = (e) => Effect.orDie(S.encodeEffect(DeferredExitCodec)(e));
|
|
64
|
+
const decodeDeferredExit = (s) => Effect.orDie(S.decodeEffect(DeferredExitCodec)(s));
|
|
65
|
+
const makeCosmosWorkflowEngine = Effect.fnUntraced(function* (cfg) {
|
|
66
|
+
const { db } = yield* CosmosClient;
|
|
67
|
+
const containerId = `${cfg.prefix ?? ""}workflow-engine`;
|
|
68
|
+
yield* Effect.promise(() => db.containers.createIfNotExists({
|
|
69
|
+
id: containerId,
|
|
70
|
+
partitionKey: { paths: ["/_partitionKey"], version: 2 }
|
|
71
|
+
}));
|
|
72
|
+
const container = db.container(containerId);
|
|
73
|
+
const scope = yield* Effect.scope;
|
|
74
|
+
const workerId = cfg.workerId ?? randomUUID();
|
|
75
|
+
const leaseTtl = cfg.leaseTtl ?? Duration.seconds(30);
|
|
76
|
+
const heartbeatInterval = cfg.heartbeatInterval ?? Duration.seconds(10);
|
|
77
|
+
const recoveryInterval = cfg.recoveryInterval ?? Duration.seconds(15);
|
|
78
|
+
const clockPollInterval = cfg.clockPollInterval ?? Duration.seconds(5);
|
|
79
|
+
const annotate = (operation, executionId) => annotateDb({
|
|
80
|
+
operation,
|
|
81
|
+
system: "cosmosdb",
|
|
82
|
+
collection: containerId,
|
|
83
|
+
entity: "workflow",
|
|
84
|
+
extra: executionId !== undefined
|
|
85
|
+
? { "azure.cosmosdb.operation.partition_key": executionId, "app.entity.id": executionId }
|
|
86
|
+
: undefined
|
|
87
|
+
});
|
|
88
|
+
const workflows = new Map();
|
|
89
|
+
const locals = new Map();
|
|
90
|
+
const clocks = yield* FiberMap.make();
|
|
91
|
+
// Per-workflow codecs for the typed payload + top-level result. Cached by
|
|
92
|
+
// workflow name; derived from the workflow's own schemas so typed values
|
|
93
|
+
// (dates, branded ids, schema classes) survive the storage round-trip.
|
|
94
|
+
const makePayloadCodec = (workflow) => S.fromJsonString(S.toCodecJson(workflow.payloadSchema));
|
|
95
|
+
const payloadCodecCache = new Map();
|
|
96
|
+
const payloadCodecFor = (workflow) => {
|
|
97
|
+
let c = payloadCodecCache.get(workflow.name);
|
|
98
|
+
if (!c) {
|
|
99
|
+
c = makePayloadCodec(workflow);
|
|
100
|
+
payloadCodecCache.set(workflow.name, c);
|
|
101
|
+
}
|
|
102
|
+
return c;
|
|
103
|
+
};
|
|
104
|
+
const makeResultCodec = (workflow) => S.fromJsonString(S.toCodecJson(Workflow.Result({ success: workflow.successSchema, error: workflow.errorSchema })));
|
|
105
|
+
const resultCodecCache = new Map();
|
|
106
|
+
const resultCodecFor = (workflow) => {
|
|
107
|
+
let c = resultCodecCache.get(workflow.name);
|
|
108
|
+
if (!c) {
|
|
109
|
+
c = makeResultCodec(workflow);
|
|
110
|
+
resultCodecCache.set(workflow.name, c);
|
|
111
|
+
}
|
|
112
|
+
return c;
|
|
113
|
+
};
|
|
114
|
+
const encodePayload = (workflow, payload) => Effect.orDie(S.encodeEffect(payloadCodecFor(workflow))(payload));
|
|
115
|
+
const decodePayload = (workflow, s) => Effect.orDie(S.decodeEffect(payloadCodecFor(workflow))(s));
|
|
116
|
+
const encodeResult = (workflow, r) => Effect.orDie(S.encodeEffect(resultCodecFor(workflow))(r));
|
|
117
|
+
const decodeResult = (workflow, s) => Effect.orDie(S.decodeEffect(resultCodecFor(workflow))(s));
|
|
118
|
+
// --- Cosmos primitives -------------------------------------------------
|
|
119
|
+
const readExec = (executionId) => Effect
|
|
120
|
+
.gen(function* () {
|
|
121
|
+
const resp = yield* Effect.promise(() => container.item(execId, executionId).read());
|
|
122
|
+
yield* annotateCosmosResponse({ requestCharge: resp.requestCharge, statusCode: resp.statusCode });
|
|
123
|
+
return Option.fromNullishOr(resp.resource).pipe(Option.map((r) => ({ ...r, _etag: resp.etag })));
|
|
124
|
+
})
|
|
125
|
+
.pipe(annotate("readExec", executionId));
|
|
126
|
+
const replaceExec = (doc) => Effect
|
|
127
|
+
.gen(function* () {
|
|
128
|
+
const resp = yield* Effect.promise(() => container.item(execId, doc._partitionKey).replace(doc, {
|
|
129
|
+
accessCondition: { type: "IfMatch", condition: doc._etag ?? "" }
|
|
130
|
+
}));
|
|
131
|
+
yield* annotateCosmosResponse({ requestCharge: resp.requestCharge, statusCode: resp.statusCode });
|
|
132
|
+
if (isOptimisticStatus(resp.statusCode)) {
|
|
133
|
+
return yield* new OptimisticConcurrencyException({
|
|
134
|
+
type: "workflow.exec",
|
|
135
|
+
id: doc._partitionKey,
|
|
136
|
+
code: resp.statusCode
|
|
137
|
+
});
|
|
138
|
+
}
|
|
139
|
+
return { ...doc, _etag: resp.etag };
|
|
140
|
+
})
|
|
141
|
+
.pipe(annotate("replaceExec", doc._partitionKey));
|
|
142
|
+
// Atomic create-or-noop using a single-op batch — returns true if created.
|
|
143
|
+
const createIfMissing = (body) => Effect.gen(function* () {
|
|
144
|
+
const resp = yield* Effect.promise(() => container.items.batch([{ operationType: "Create", resourceBody: body }], body._partitionKey));
|
|
145
|
+
const r = resp.result?.[0];
|
|
146
|
+
const code = r?.statusCode ?? 0;
|
|
147
|
+
if (code === 201)
|
|
148
|
+
return true;
|
|
149
|
+
if (code === 409)
|
|
150
|
+
return false;
|
|
151
|
+
return yield* Effect.die(new Error(`workflow-engine cosmos createIfMissing for ${body.id} failed: ${code}`));
|
|
152
|
+
});
|
|
153
|
+
// Last-writer-wins upsert — used to overwrite a persisted *suspended* activity
|
|
154
|
+
// result once it finally completes (create-only ops can't transition it).
|
|
155
|
+
const upsert = (body) => Effect.gen(function* () {
|
|
156
|
+
const resp = yield* Effect.promise(() => container.items.upsert(body));
|
|
157
|
+
yield* annotateCosmosResponse({ requestCharge: resp.requestCharge, statusCode: resp.statusCode });
|
|
158
|
+
});
|
|
159
|
+
const readPoint = (id, executionId) => Effect.promise(() => container.item(id, executionId).read()).pipe(Effect.map((r) => Option.fromNullishOr(r.resource)));
|
|
160
|
+
// --- Workflow result helpers ------------------------------------------
|
|
161
|
+
const completeResult = (workflow, state) => state.status === "complete" && state.completedResult
|
|
162
|
+
? Effect.map(decodeResult(workflow, state.completedResult), Option.some)
|
|
163
|
+
: Effect.succeedNone;
|
|
164
|
+
// --- Lease / claim ----------------------------------------------------
|
|
165
|
+
const leaseActive = (state, now) => state.worker !== undefined
|
|
166
|
+
&& state.worker !== workerId
|
|
167
|
+
&& state.leaseExpiresAt !== undefined
|
|
168
|
+
&& Date.parse(state.leaseExpiresAt) > now;
|
|
169
|
+
/**
|
|
170
|
+
* Try to claim a lease on `state`. Returns the updated doc on success, `None`
|
|
171
|
+
* if another worker holds an active lease, or on OCC conflict (caller may
|
|
172
|
+
* retry by re-reading).
|
|
173
|
+
*/
|
|
174
|
+
const tryClaim = (state) => Effect.gen(function* () {
|
|
175
|
+
const now = Date.now();
|
|
176
|
+
if (leaseActive(state, now))
|
|
177
|
+
return Option.none();
|
|
178
|
+
const updated = {
|
|
179
|
+
...state,
|
|
180
|
+
worker: workerId,
|
|
181
|
+
leaseExpiresAt: new Date(now + Duration.toMillis(leaseTtl)).toISOString()
|
|
182
|
+
};
|
|
183
|
+
return yield* replaceExec(updated).pipe(Effect.map(Option.some), Effect.catchTag("OptimisticConcurrencyException", () => Effect.succeed(Option.none())));
|
|
184
|
+
});
|
|
185
|
+
/**
|
|
186
|
+
* Renew lease until the local fiber stops or another worker takes the claim.
|
|
187
|
+
* Best-effort: failures are swallowed; loop simply retries on next tick.
|
|
188
|
+
*/
|
|
189
|
+
const heartbeat = (executionId) => Effect.gen(function* () {
|
|
190
|
+
while (true) {
|
|
191
|
+
yield* Effect.sleep(heartbeatInterval);
|
|
192
|
+
const local = locals.get(executionId);
|
|
193
|
+
const polled = local?.fiber?.pollUnsafe();
|
|
194
|
+
if (!local?.fiber || polled)
|
|
195
|
+
return;
|
|
196
|
+
const cur = yield* readExec(executionId).pipe(Effect.catchCause(() => Effect.succeed(Option.none())));
|
|
197
|
+
if (Option.isNone(cur))
|
|
198
|
+
continue;
|
|
199
|
+
const state = cur.value;
|
|
200
|
+
if (state.status === "complete" || state.worker !== workerId)
|
|
201
|
+
return;
|
|
202
|
+
yield* replaceExec({
|
|
203
|
+
...state,
|
|
204
|
+
leaseExpiresAt: new Date(Date.now() + Duration.toMillis(leaseTtl)).toISOString()
|
|
205
|
+
})
|
|
206
|
+
.pipe(Effect.catchTag("OptimisticConcurrencyException", () => Effect.void), Effect.catchCause(() => Effect.void));
|
|
207
|
+
}
|
|
208
|
+
});
|
|
209
|
+
// --- Drive logic -------------------------------------------------------
|
|
210
|
+
const drive = (executionId, payload, parent, entry) => Effect.gen(function* () {
|
|
211
|
+
let local = locals.get(executionId);
|
|
212
|
+
if (local?.fiber) {
|
|
213
|
+
const polled = local.fiber.pollUnsafe();
|
|
214
|
+
const stillRunning = !polled;
|
|
215
|
+
const completedNotResume = polled && polled._tag === "Success" && polled.value._tag === "Complete";
|
|
216
|
+
if (stillRunning || completedNotResume)
|
|
217
|
+
return;
|
|
218
|
+
}
|
|
219
|
+
const stateOpt = yield* readExec(executionId);
|
|
220
|
+
if (Option.isNone(stateOpt) || stateOpt.value.status === "complete")
|
|
221
|
+
return;
|
|
222
|
+
// Best-effort claim: takes lease so recovery poller leaves us alone.
|
|
223
|
+
// Failure is tolerated — local fiber still drives; OCC guards persisted
|
|
224
|
+
// state so split-brain stays correct.
|
|
225
|
+
const claimed = yield* tryClaim(stateOpt.value);
|
|
226
|
+
const state = Option.isSome(claimed) ? claimed.value : stateOpt.value;
|
|
227
|
+
const instance = WorkflowInstance.initial(entry.workflow, executionId);
|
|
228
|
+
instance.interrupted = state.interrupted;
|
|
229
|
+
if (!local) {
|
|
230
|
+
local = { instance, fiber: undefined, parent };
|
|
231
|
+
locals.set(executionId, local);
|
|
232
|
+
}
|
|
233
|
+
else {
|
|
234
|
+
local.instance = instance;
|
|
235
|
+
}
|
|
236
|
+
const onComplete = Effect.fnUntraced(function* (result) {
|
|
237
|
+
const current = yield* readExec(executionId);
|
|
238
|
+
if (Option.isNone(current) || current.value.status === "complete")
|
|
239
|
+
return;
|
|
240
|
+
const isComplete = result._tag === "Complete";
|
|
241
|
+
const completedResult = isComplete ? yield* encodeResult(entry.workflow, result) : undefined;
|
|
242
|
+
yield* replaceExec({
|
|
243
|
+
...current.value,
|
|
244
|
+
status: isComplete ? "complete" : current.value.status,
|
|
245
|
+
suspended: result._tag === "Suspended",
|
|
246
|
+
interrupted: instance.interrupted,
|
|
247
|
+
completedResult,
|
|
248
|
+
// Release lease on completion so the doc isn't seen as orphaned.
|
|
249
|
+
worker: isComplete ? undefined : current.value.worker,
|
|
250
|
+
leaseExpiresAt: isComplete ? undefined : current.value.leaseExpiresAt
|
|
251
|
+
})
|
|
252
|
+
.pipe(Effect.catchTag("OptimisticConcurrencyException", () => Effect.void));
|
|
253
|
+
if (parent && isComplete) {
|
|
254
|
+
yield* Effect.forkIn(driveById(parent), scope);
|
|
255
|
+
}
|
|
256
|
+
});
|
|
257
|
+
local.fiber = yield* entry.execute(payload, executionId).pipe(Effect.onExit(() => {
|
|
258
|
+
if (!instance.interrupted)
|
|
259
|
+
return Effect.void;
|
|
260
|
+
instance.suspended = false;
|
|
261
|
+
return Effect.withFiber((fiber) => Effect.interruptible(Fiber.interrupt(fiber)));
|
|
262
|
+
}), Workflow.intoResult, Effect.provideService(WorkflowInstance, instance), Effect.provideService(WorkflowEngine, engine), Effect.tap(onComplete), Effect.forkIn(entry.scope));
|
|
263
|
+
if (Option.isSome(claimed)) {
|
|
264
|
+
yield* Effect.forkIn(heartbeat(executionId), scope);
|
|
265
|
+
}
|
|
266
|
+
});
|
|
267
|
+
const driveById = (executionId) => Effect.gen(function* () {
|
|
268
|
+
const stateOpt = yield* readExec(executionId);
|
|
269
|
+
if (Option.isNone(stateOpt))
|
|
270
|
+
return;
|
|
271
|
+
const state = stateOpt.value;
|
|
272
|
+
const entry = workflows.get(state.workflowName);
|
|
273
|
+
if (!entry)
|
|
274
|
+
return;
|
|
275
|
+
const payload = yield* decodePayload(entry.workflow, state.payload);
|
|
276
|
+
yield* drive(executionId, payload, state.parent, entry);
|
|
277
|
+
});
|
|
278
|
+
// --- Clock firing -----------------------------------------------------
|
|
279
|
+
// Persist deferred completion (first-writer-wins via createIfMissing),
|
|
280
|
+
// resume the workflow, then clean up the clock doc.
|
|
281
|
+
const fireClock = (doc) => Effect.gen(function* () {
|
|
282
|
+
const created = yield* createIfMissing({
|
|
283
|
+
id: deferredKey(doc.deferredName),
|
|
284
|
+
_partitionKey: doc._partitionKey,
|
|
285
|
+
type: "deferred",
|
|
286
|
+
exit: yield* encodeDeferredExit(Exit.void)
|
|
287
|
+
})
|
|
288
|
+
.pipe(annotate("clockFire", doc._partitionKey));
|
|
289
|
+
if (created)
|
|
290
|
+
yield* driveById(doc._partitionKey);
|
|
291
|
+
yield* Effect.promise(() => container.item(doc.id, doc._partitionKey).delete()).pipe(Effect.catchCause(() => Effect.void));
|
|
292
|
+
});
|
|
293
|
+
// --- Encoded engine ----------------------------------------------------
|
|
294
|
+
const encoded = {
|
|
295
|
+
register: Effect.fnUntraced(function* (workflow, execute) {
|
|
296
|
+
workflows.set(workflow.name, {
|
|
297
|
+
workflow,
|
|
298
|
+
execute,
|
|
299
|
+
scope: yield* Effect.scope
|
|
300
|
+
});
|
|
301
|
+
}),
|
|
302
|
+
execute: Effect.fnUntraced(function* (workflow, options) {
|
|
303
|
+
const entry = workflows.get(workflow.name);
|
|
304
|
+
if (!entry) {
|
|
305
|
+
return yield* Effect.orDie(Effect.fail(`Workflow ${workflow.name} is not registered`));
|
|
306
|
+
}
|
|
307
|
+
const initial = {
|
|
308
|
+
id: execId,
|
|
309
|
+
_partitionKey: options.executionId,
|
|
310
|
+
type: "exec",
|
|
311
|
+
workflowName: workflow.name,
|
|
312
|
+
payload: yield* encodePayload(workflow, options.payload),
|
|
313
|
+
parent: options.parent?.executionId,
|
|
314
|
+
status: "running",
|
|
315
|
+
suspended: false,
|
|
316
|
+
interrupted: false
|
|
317
|
+
};
|
|
318
|
+
const created = yield* createIfMissing(initial).pipe(annotate("execute.claim", options.executionId));
|
|
319
|
+
if (created || !locals.has(options.executionId)) {
|
|
320
|
+
yield* drive(options.executionId, options.payload, options.parent?.executionId, entry);
|
|
321
|
+
}
|
|
322
|
+
if (options.discard)
|
|
323
|
+
return undefined;
|
|
324
|
+
const local = locals.get(options.executionId);
|
|
325
|
+
if (local?.fiber) {
|
|
326
|
+
return (yield* Fiber.join(local.fiber));
|
|
327
|
+
}
|
|
328
|
+
// Foreign-owned execution: poll until exec doc reports complete.
|
|
329
|
+
while (true) {
|
|
330
|
+
const cur = yield* readExec(options.executionId);
|
|
331
|
+
if (Option.isSome(cur)) {
|
|
332
|
+
const c = yield* completeResult(workflow, cur.value);
|
|
333
|
+
if (Option.isSome(c))
|
|
334
|
+
return c.value;
|
|
335
|
+
}
|
|
336
|
+
yield* Effect.sleep(Duration.millis(500));
|
|
337
|
+
}
|
|
338
|
+
}),
|
|
339
|
+
poll: (workflow, executionId) => Effect.gen(function* () {
|
|
340
|
+
const local = locals.get(executionId);
|
|
341
|
+
if (local?.fiber) {
|
|
342
|
+
const exit = local.fiber.pollUnsafe();
|
|
343
|
+
if (!exit)
|
|
344
|
+
return Option.none();
|
|
345
|
+
if (exit._tag !== "Success")
|
|
346
|
+
return yield* Effect.die(exit.cause);
|
|
347
|
+
return Option.some(exit.value);
|
|
348
|
+
}
|
|
349
|
+
const state = yield* readExec(executionId);
|
|
350
|
+
if (Option.isNone(state))
|
|
351
|
+
return Option.none();
|
|
352
|
+
return yield* completeResult(workflow, state.value);
|
|
353
|
+
}),
|
|
354
|
+
interrupt: Effect.fnUntraced(function* (_workflow, executionId) {
|
|
355
|
+
const local = locals.get(executionId);
|
|
356
|
+
if (local)
|
|
357
|
+
local.instance.interrupted = true;
|
|
358
|
+
const current = yield* readExec(executionId);
|
|
359
|
+
if (Option.isNone(current) || current.value.status === "complete")
|
|
360
|
+
return;
|
|
361
|
+
yield* replaceExec({ ...current.value, interrupted: true }).pipe(Effect.catchTag("OptimisticConcurrencyException", () => Effect.void));
|
|
362
|
+
yield* driveById(executionId);
|
|
363
|
+
}),
|
|
364
|
+
interruptUnsafe: Effect.fnUntraced(function* (_workflow, executionId) {
|
|
365
|
+
const local = locals.get(executionId);
|
|
366
|
+
if (local)
|
|
367
|
+
local.instance.interrupted = true;
|
|
368
|
+
const current = yield* readExec(executionId);
|
|
369
|
+
if (Option.isSome(current) && current.value.status !== "complete") {
|
|
370
|
+
yield* replaceExec({ ...current.value, interrupted: true }).pipe(Effect.catchTag("OptimisticConcurrencyException", () => Effect.void));
|
|
371
|
+
}
|
|
372
|
+
if (local?.fiber)
|
|
373
|
+
yield* Fiber.interrupt(local.fiber);
|
|
374
|
+
}),
|
|
375
|
+
resume: (_workflow, executionId) => driveById(executionId),
|
|
376
|
+
activityExecute: Effect.fnUntraced(function* (activity, attempt) {
|
|
377
|
+
const instance = yield* WorkflowInstance;
|
|
378
|
+
const id = activityKey(activity.name, attempt);
|
|
379
|
+
const existing = yield* readPoint(id, instance.executionId).pipe(annotate("activityRead", instance.executionId));
|
|
380
|
+
if (Option.isSome(existing)) {
|
|
381
|
+
const prev = yield* decodeActivityResult(existing.value.result);
|
|
382
|
+
// A completed activity is replayed from its persisted result; a
|
|
383
|
+
// suspended one must re-run (it parked on a clock/deferred).
|
|
384
|
+
if (prev._tag === "Complete")
|
|
385
|
+
return prev;
|
|
386
|
+
}
|
|
387
|
+
const activityInstance = WorkflowInstance.initial(instance.workflow, instance.executionId);
|
|
388
|
+
activityInstance.interrupted = instance.interrupted;
|
|
389
|
+
const result = yield* activity.executeEncoded.pipe(Workflow.intoResult, Effect.provideService(WorkflowInstance, activityInstance));
|
|
390
|
+
const doc = {
|
|
391
|
+
id,
|
|
392
|
+
_partitionKey: instance.executionId,
|
|
393
|
+
type: "activity",
|
|
394
|
+
result: yield* encodeActivityResult(result)
|
|
395
|
+
};
|
|
396
|
+
if (Option.isSome(existing)) {
|
|
397
|
+
// Overwrite the previously persisted *suspended* doc with the new result.
|
|
398
|
+
yield* upsert(doc).pipe(annotate("activityPersist", instance.executionId));
|
|
399
|
+
return result;
|
|
400
|
+
}
|
|
401
|
+
// First-writer-wins: if persistence loses the race, use the persisted result.
|
|
402
|
+
const persisted = yield* createIfMissing(doc).pipe(annotate("activityPersist", instance.executionId));
|
|
403
|
+
if (persisted)
|
|
404
|
+
return result;
|
|
405
|
+
const winner = yield* readPoint(id, instance.executionId);
|
|
406
|
+
if (Option.isSome(winner)) {
|
|
407
|
+
const w = yield* decodeActivityResult(winner.value.result);
|
|
408
|
+
if (w._tag === "Complete")
|
|
409
|
+
return w;
|
|
410
|
+
}
|
|
411
|
+
return result;
|
|
412
|
+
}),
|
|
413
|
+
deferredResult: Effect.fnUntraced(function* (deferred) {
|
|
414
|
+
const instance = yield* WorkflowInstance;
|
|
415
|
+
const got = yield* readPoint(deferredKey(deferred.name), instance.executionId).pipe(annotate("deferredRead", instance.executionId));
|
|
416
|
+
if (Option.isNone(got))
|
|
417
|
+
return Option.none();
|
|
418
|
+
return Option.some(yield* decodeDeferredExit(got.value.exit));
|
|
419
|
+
}),
|
|
420
|
+
deferredDone: Effect.fnUntraced(function* (options) {
|
|
421
|
+
const created = yield* createIfMissing({
|
|
422
|
+
id: deferredKey(options.deferredName),
|
|
423
|
+
_partitionKey: options.executionId,
|
|
424
|
+
type: "deferred",
|
|
425
|
+
exit: yield* encodeDeferredExit(options.exit)
|
|
426
|
+
})
|
|
427
|
+
.pipe(annotate("deferredPersist", options.executionId));
|
|
428
|
+
if (!created)
|
|
429
|
+
return;
|
|
430
|
+
yield* driveById(options.executionId);
|
|
431
|
+
}),
|
|
432
|
+
scheduleClock: (workflow, options) => {
|
|
433
|
+
const fireAt = new Date(Date.now() + Duration.toMillis(options.clock.duration)).toISOString();
|
|
434
|
+
const clockDoc = {
|
|
435
|
+
id: clockKey(options.clock.name),
|
|
436
|
+
_partitionKey: options.executionId,
|
|
437
|
+
type: "clock",
|
|
438
|
+
workflowName: workflow.name,
|
|
439
|
+
deferredName: options.clock.deferred.name,
|
|
440
|
+
fireAt
|
|
441
|
+
};
|
|
442
|
+
return Effect.gen(function* () {
|
|
443
|
+
yield* createIfMissing(clockDoc).pipe(annotate("clockPersist", options.executionId));
|
|
444
|
+
// Fast-path in-process timer. If this process dies, the clock poller
|
|
445
|
+
// picks up the persisted doc and fires the deferred.
|
|
446
|
+
yield* fireClock(clockDoc).pipe(Effect.delay(options.clock.duration), FiberMap.run(clocks, `${options.executionId}/${options.clock.name}`, { onlyIfMissing: true }), Effect.asVoid);
|
|
447
|
+
});
|
|
448
|
+
}
|
|
449
|
+
};
|
|
450
|
+
const engine = makeUnsafe(encoded);
|
|
451
|
+
// --- Recovery poller --------------------------------------------------
|
|
452
|
+
// Scan for executions whose lease has lapsed (or was never set) and
|
|
453
|
+
// re-drive them locally. driveById will go through claim → fork fiber,
|
|
454
|
+
// resuming activities from persisted results.
|
|
455
|
+
if (Duration.toMillis(recoveryInterval) > 0) {
|
|
456
|
+
const recoverStep = Effect
|
|
457
|
+
.gen(function* () {
|
|
458
|
+
const nowIso = new Date().toISOString();
|
|
459
|
+
const stale = yield* Effect.promise(() => container
|
|
460
|
+
.items
|
|
461
|
+
.query({
|
|
462
|
+
query: "SELECT c._partitionKey, c.workflowName FROM c WHERE c.type = 'exec' AND c.status = 'running' AND (NOT IS_DEFINED(c.leaseExpiresAt) OR c.leaseExpiresAt <= @now)",
|
|
463
|
+
parameters: [{ name: "@now", value: nowIso }]
|
|
464
|
+
})
|
|
465
|
+
.fetchAll());
|
|
466
|
+
for (const row of stale.resources) {
|
|
467
|
+
if (!workflows.has(row.workflowName))
|
|
468
|
+
continue;
|
|
469
|
+
const local = locals.get(row._partitionKey);
|
|
470
|
+
if (local?.fiber && !local.fiber.pollUnsafe())
|
|
471
|
+
continue;
|
|
472
|
+
yield* Effect.forkIn(driveById(row._partitionKey), scope);
|
|
473
|
+
}
|
|
474
|
+
})
|
|
475
|
+
.pipe(annotate("recoveryScan"), Effect.catchCause(() => Effect.void));
|
|
476
|
+
yield* recoverStep.pipe(Effect.repeat(Schedule.spaced(recoveryInterval)), Effect.forkIn(scope));
|
|
477
|
+
}
|
|
478
|
+
// --- Clock poller -----------------------------------------------------
|
|
479
|
+
// Cross-partition scan for clocks whose fireAt is due. Fires the deferred
|
|
480
|
+
// via createIfMissing (idempotent) so multiple pollers across processes
|
|
481
|
+
// converge. Also acts as the restart recovery path for clocks scheduled
|
|
482
|
+
// before a crash.
|
|
483
|
+
if (Duration.toMillis(clockPollInterval) > 0) {
|
|
484
|
+
const clockStep = Effect
|
|
485
|
+
.gen(function* () {
|
|
486
|
+
const nowIso = new Date().toISOString();
|
|
487
|
+
const due = yield* Effect.promise(() => container
|
|
488
|
+
.items
|
|
489
|
+
.query({
|
|
490
|
+
query: "SELECT c.id, c._partitionKey, c.workflowName, c.deferredName FROM c WHERE c.type = 'clock' AND c.fireAt <= @now",
|
|
491
|
+
parameters: [{ name: "@now", value: nowIso }]
|
|
492
|
+
})
|
|
493
|
+
.fetchAll());
|
|
494
|
+
for (const row of due.resources) {
|
|
495
|
+
yield* Effect.forkIn(fireClock({
|
|
496
|
+
id: row.id,
|
|
497
|
+
_partitionKey: row._partitionKey,
|
|
498
|
+
type: "clock",
|
|
499
|
+
workflowName: row.workflowName,
|
|
500
|
+
deferredName: row.deferredName,
|
|
501
|
+
fireAt: nowIso
|
|
502
|
+
}), scope);
|
|
503
|
+
}
|
|
504
|
+
})
|
|
505
|
+
.pipe(annotate("clockScan"), Effect.catchCause(() => Effect.void));
|
|
506
|
+
yield* clockStep.pipe(Effect.repeat(Schedule.spaced(clockPollInterval)), Effect.forkIn(scope));
|
|
507
|
+
}
|
|
508
|
+
return engine;
|
|
509
|
+
});
|
|
510
|
+
/**
|
|
511
|
+
* Cosmos DB backed `WorkflowEngine` layer.
|
|
512
|
+
*
|
|
513
|
+
* Per-execution writes share a partition key (TransactionalBatch-eligible) and
|
|
514
|
+
* use OCC via `_etag`/IfMatch, giving first-writer-wins semantics for activity
|
|
515
|
+
* results, durable-deferred completions, and exec-state transitions. All
|
|
516
|
+
* persisted payloads/results/exits are round-tripped through schema codecs.
|
|
517
|
+
*/
|
|
518
|
+
export const layerCosmos = (cfg) => Layer
|
|
519
|
+
.effect(WorkflowEngine)(makeCosmosWorkflowEngine(cfg))
|
|
520
|
+
.pipe(Layer.provide(CosmosClientLayer(Redacted.value(cfg.url), cfg.dbName)));
|
|
521
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"WorkflowEngineCosmos.js","sourceRoot":"","sources":["../src/WorkflowEngineCosmos.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@effect-app/infra",
|
|
3
|
-
"version": "4.0.0-beta.
|
|
3
|
+
"version": "4.0.0-beta.257",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"dependencies": {
|
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
"proper-lockfile": "^4.1.2",
|
|
14
14
|
"pure-rand": "8.4.0",
|
|
15
15
|
"query-string": "^9.3.1",
|
|
16
|
-
"effect-app": "4.0.0-beta.
|
|
16
|
+
"effect-app": "4.0.0-beta.257"
|
|
17
17
|
},
|
|
18
18
|
"devDependencies": {
|
|
19
19
|
"@azure/cosmos": "^4.9.3",
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"_check-agg-infer.test-d.d.ts","sourceRoot":"","sources":["../_check-agg-infer.test-d.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import * as S from "effect-app/Schema";
|
|
2
|
+
import { aggregate, make, where } from "effect-app/Model/query";
|
|
3
|
+
const baseSchema = S.Struct({
|
|
4
|
+
id: S.String,
|
|
5
|
+
address: S.Struct({ city: S.String }),
|
|
6
|
+
active: S.Boolean,
|
|
7
|
+
qty: S.Number
|
|
8
|
+
});
|
|
9
|
+
// Should compile — Row inferred from pipe
|
|
10
|
+
const _ok = make().pipe(aggregate(S.Struct({ city: S.String, count: S.NonNegativeInt, total: S.Number }), ($) => ({
|
|
11
|
+
city: $.field("address.city"),
|
|
12
|
+
count: $.countWhen((q) => q.pipe(where("active", true))),
|
|
13
|
+
total: $.sum("qty")
|
|
14
|
+
})));
|
|
15
|
+
// Should ERROR — bad path
|
|
16
|
+
const _bad = make().pipe(aggregate(S.Struct({ a: S.String }), ($) => ({
|
|
17
|
+
a: $.field("nonexistent")
|
|
18
|
+
})));
|
|
19
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiX2NoZWNrLWFnZy1pbmZlci50ZXN0LWQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9fY2hlY2stYWdnLWluZmVyLnRlc3QtZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssQ0FBQyxNQUFNLG1CQUFtQixDQUFBO0FBQ3RDLE9BQU8sRUFBRSxTQUFTLEVBQUUsSUFBSSxFQUFFLEtBQUssRUFBRSxNQUFNLHdCQUF3QixDQUFBO0FBRS9ELE1BQU0sVUFBVSxHQUFHLENBQUMsQ0FBQyxNQUFNLENBQUM7SUFDMUIsRUFBRSxFQUFFLENBQUMsQ0FBQyxNQUFNO0lBQ1osT0FBTyxFQUFFLENBQUMsQ0FBQyxNQUFNLENBQUMsRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDLE1BQU0sRUFBRSxDQUFDO0lBQ3JDLE1BQU0sRUFBRSxDQUFDLENBQUMsT0FBTztJQUNqQixHQUFHLEVBQUUsQ0FBQyxDQUFDLE1BQU07Q0FDZCxDQUFDLENBQUE7QUFHRiwwQ0FBMEM7QUFDMUMsTUFBTSxHQUFHLEdBQUcsSUFBSSxFQUFPLENBQUMsSUFBSSxDQUMxQixTQUFTLENBQ1AsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxFQUFFLElBQUksRUFBRSxDQUFDLENBQUMsTUFBTSxFQUFFLEtBQUssRUFBRSxDQUFDLENBQUMsY0FBYyxFQUFFLEtBQUssRUFBRSxDQUFDLENBQUMsTUFBTSxFQUFFLENBQUMsRUFDdEUsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUM7SUFDTixJQUFJLEVBQUUsQ0FBQyxDQUFDLEtBQUssQ0FBQyxjQUFjLENBQUM7SUFDN0IsS0FBSyxFQUFFLENBQUMsQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLFFBQVEsRUFBRSxJQUFJLENBQUMsQ0FBQyxDQUFDO0lBQ3hELEtBQUssRUFBRSxDQUFDLENBQUMsR0FBRyxDQUFDLEtBQUssQ0FBQztDQUNwQixDQUFDLENBQ0gsQ0FDRixDQUFBO0FBRUQsMEJBQTBCO0FBQzFCLE1BQU0sSUFBSSxHQUFHLElBQUksRUFBTyxDQUFDLElBQUksQ0FDM0IsU0FBUyxDQUNQLENBQUMsQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLEVBQUUsQ0FBQyxDQUFDLE1BQU0sRUFBRSxDQUFDLEVBQ3pCLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDO0lBQ04sQ0FBQyxFQUFFLENBQUMsQ0FBQyxLQUFLLENBQUMsYUFBYSxDQUFDO0NBQzFCLENBQUMsQ0FDSCxDQUNGLENBQUEifQ==
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"_check-proj-infer.test-d.d.ts","sourceRoot":"","sources":["../_check-proj-infer.test-d.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import * as S from "effect-app/Schema";
|
|
2
|
+
import { make, projectComputed, where } from "effect-app/Model/query";
|
|
3
|
+
const baseSchema = S.Struct({
|
|
4
|
+
id: S.String,
|
|
5
|
+
items: S.Array(S.Struct({ articleId: S.String, qty: S.Number, note: S.String }))
|
|
6
|
+
});
|
|
7
|
+
// Should compile — Row inferred from pipe
|
|
8
|
+
const _ok = make().pipe(projectComputed(S.Struct({ id: S.String, total: S.Number, distinctArticles: S.NonNegativeInt }), ({ relation }) => ({
|
|
9
|
+
total: relation("items").sum("qty"),
|
|
10
|
+
distinctArticles: relation("items").distinctCount("articleId", where("qty", "gte", 0))
|
|
11
|
+
})));
|
|
12
|
+
// Should ERROR — bad path on relation element
|
|
13
|
+
const _bad = make().pipe(projectComputed(S.Struct({ a: S.Number }), ({ relation }) => ({
|
|
14
|
+
a: relation("items").sum("nonexistent")
|
|
15
|
+
})));
|
|
16
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiX2NoZWNrLXByb2otaW5mZXIudGVzdC1kLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vX2NoZWNrLXByb2otaW5mZXIudGVzdC1kLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxDQUFDLE1BQU0sbUJBQW1CLENBQUE7QUFDdEMsT0FBTyxFQUFFLElBQUksRUFBRSxlQUFlLEVBQUUsS0FBSyxFQUFFLE1BQU0sd0JBQXdCLENBQUE7QUFFckUsTUFBTSxVQUFVLEdBQUcsQ0FBQyxDQUFDLE1BQU0sQ0FBQztJQUMxQixFQUFFLEVBQUUsQ0FBQyxDQUFDLE1BQU07SUFDWixLQUFLLEVBQUUsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsTUFBTSxDQUFDLEVBQUUsU0FBUyxFQUFFLENBQUMsQ0FBQyxNQUFNLEVBQUUsR0FBRyxFQUFFLENBQUMsQ0FBQyxNQUFNLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxDQUFDO0NBQ2pGLENBQUMsQ0FBQTtBQUdGLDBDQUEwQztBQUMxQyxNQUFNLEdBQUcsR0FBRyxJQUFJLEVBQU8sQ0FBQyxJQUFJLENBQzFCLGVBQWUsQ0FDYixDQUFDLENBQUMsTUFBTSxDQUFDLEVBQUUsRUFBRSxFQUFFLENBQUMsQ0FBQyxNQUFNLEVBQUUsS0FBSyxFQUFFLENBQUMsQ0FBQyxNQUFNLEVBQUUsZ0JBQWdCLEVBQUUsQ0FBQyxDQUFDLGNBQWMsRUFBRSxDQUFDLEVBQy9FLENBQUMsRUFBRSxRQUFRLEVBQUUsRUFBRSxFQUFFLENBQUMsQ0FBQztJQUNqQixLQUFLLEVBQUUsUUFBUSxDQUFDLE9BQU8sQ0FBQyxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUM7SUFDbkMsZ0JBQWdCLEVBQUUsUUFBUSxDQUFDLE9BQU8sQ0FBQyxDQUFDLGFBQWEsQ0FBQyxXQUFXLEVBQUUsS0FBSyxDQUFDLEtBQUssRUFBRSxLQUFLLEVBQUUsQ0FBQyxDQUFDLENBQUM7Q0FDdkYsQ0FBQyxDQUNILENBQ0YsQ0FBQTtBQUVELDhDQUE4QztBQUM5QyxNQUFNLElBQUksR0FBRyxJQUFJLEVBQU8sQ0FBQyxJQUFJLENBQzNCLGVBQWUsQ0FDYixDQUFDLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxFQUFFLENBQUMsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxFQUN6QixDQUFDLEVBQUUsUUFBUSxFQUFFLEVBQUUsRUFBRSxDQUFDLENBQUM7SUFDakIsQ0FBQyxFQUFFLFFBQVEsQ0FBQyxPQUFPLENBQUMsQ0FBQyxHQUFHLENBQUMsYUFBYSxDQUFDO0NBQ3hDLENBQUMsQ0FDSCxDQUNGLENBQUEifQ==
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"_check-tighten.test-d.d.ts","sourceRoot":"","sources":["../_check-tighten.test-d.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
import * as S from "effect-app/Schema";
|
|
2
|
+
import { computed, relation } from "effect-app/Model/query";
|
|
3
|
+
const baseSchema = S.Struct({
|
|
4
|
+
id: S.String,
|
|
5
|
+
items: S.Array(S.Struct({ articleId: S.String, qty: S.Number }))
|
|
6
|
+
});
|
|
7
|
+
// Should compile:
|
|
8
|
+
const _ok = computed({
|
|
9
|
+
a: relation("items").sum("qty"),
|
|
10
|
+
b: relation("items").distinctCount("articleId"),
|
|
11
|
+
c: relation("items").collect("articleId"),
|
|
12
|
+
d: relation("items").collectFields(["articleId", "qty"])
|
|
13
|
+
});
|
|
14
|
+
// Should ERROR — invalid field paths
|
|
15
|
+
const _bad = computed({
|
|
16
|
+
a: relation("items").sum("nonexistent"),
|
|
17
|
+
b: relation("items").distinctCount("not_a_field"),
|
|
18
|
+
c: relation("items").collect("zzz"),
|
|
19
|
+
d: relation("items").collectFields(["zzz"])
|
|
20
|
+
});
|
|
21
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiX2NoZWNrLXRpZ2h0ZW4udGVzdC1kLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vX2NoZWNrLXRpZ2h0ZW4udGVzdC1kLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxDQUFDLE1BQU0sbUJBQW1CLENBQUE7QUFDdEMsT0FBTyxFQUFFLFFBQVEsRUFBRSxRQUFRLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQTtBQUUzRCxNQUFNLFVBQVUsR0FBRyxDQUFDLENBQUMsTUFBTSxDQUFDO0lBQzFCLEVBQUUsRUFBRSxDQUFDLENBQUMsTUFBTTtJQUNaLEtBQUssRUFBRSxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsRUFBRSxTQUFTLEVBQUUsQ0FBQyxDQUFDLE1BQU0sRUFBRSxHQUFHLEVBQUUsQ0FBQyxDQUFDLE1BQU0sRUFBRSxDQUFDLENBQUM7Q0FDakUsQ0FBQyxDQUFBO0FBR0Ysa0JBQWtCO0FBQ2xCLE1BQU0sR0FBRyxHQUFHLFFBQVEsQ0FBQztJQUNuQixDQUFDLEVBQUUsUUFBUSxDQUFNLE9BQU8sQ0FBQyxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUM7SUFDcEMsQ0FBQyxFQUFFLFFBQVEsQ0FBTSxPQUFPLENBQUMsQ0FBQyxhQUFhLENBQUMsV0FBVyxDQUFDO0lBQ3BELENBQUMsRUFBRSxRQUFRLENBQU0sT0FBTyxDQUFDLENBQUMsT0FBTyxDQUFDLFdBQVcsQ0FBQztJQUM5QyxDQUFDLEVBQUUsUUFBUSxDQUFNLE9BQU8sQ0FBQyxDQUFDLGFBQWEsQ0FBQyxDQUFDLFdBQVcsRUFBRSxLQUFLLENBQUMsQ0FBQztDQUM5RCxDQUFDLENBQUE7QUFFRixxQ0FBcUM7QUFDckMsTUFBTSxJQUFJLEdBQUcsUUFBUSxDQUFDO0lBQ3BCLENBQUMsRUFBRSxRQUFRLENBQU0sT0FBTyxDQUFDLENBQUMsR0FBRyxDQUFDLGFBQWEsQ0FBQztJQUM1QyxDQUFDLEVBQUUsUUFBUSxDQUFNLE9BQU8sQ0FBQyxDQUFDLGFBQWEsQ0FBQyxhQUFhLENBQUM7SUFDdEQsQ0FBQyxFQUFFLFFBQVEsQ0FBTSxPQUFPLENBQUMsQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDO0lBQ3hDLENBQUMsRUFBRSxRQUFRLENBQU0sT0FBTyxDQUFDLENBQUMsYUFBYSxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUM7Q0FDakQsQ0FBQyxDQUFBIn0=
|