@oomol-lab/open-flow 0.1.0-alpha.6 → 0.1.0-alpha.7

package/dist/common/control-api-conformance.js

@@ -79,11 +79,12 @@ function m(e, t, n, r = "marker") {
 			concurrency: 1,
 			inputs: {},
 			kind: "value",
-			values: { ready: {
+			values: [{
+				handle: "ready",
 				jsonSchema: { type: "boolean" },
 				nullable: !1,
 				value: !0
-			} }
+			}]
 		},
 		nodeId: r,
 		target: { kind: "flow" }
@@ -131,7 +132,11 @@ var y = [
 			let t = await f(e, "Control flow", "flow-lifecycle"), n = s(t.flowId, "Created Flow flowId"), r = s(t.draftRevisionId, "Created Flow draftRevisionId");
 			i(t.name, "Control flow", "Created Flow name"), i(t.status, "active", "Created Flow status"), i(await c(await d(e, "Control flow", "flow-lifecycle"), 200, "Replay Flow"), t, "Replayed Flow"), await l(await d(e, "Different flow", "flow-lifecycle"), 409, "flow.conflict", "Conflicting Flow"), i(await c(await u(e, `/v1/flows/${n}`), 200, "Read Flow"), t, "Read Flow");
 			let a = await c(await u(e, "/v1/flows?includeTotal=true"), 200, "List Flows");
-			i(a.flows, [t], "Listed Flows"), i(a.total, 1, "Flow total"), i((await c(await u(e, `/v1/flows/${n}`, {
+			i(a.flows, [t], "Listed Flows"), i(a.total, 1, "Flow total");
+			let o = await f(e, "Second control flow", "flow-lifecycle-second"), p = await c(await u(e, "/v1/flows?limit=1"), 200, "List first Flow page");
+			i(p.flows, [t], "First Flow page");
+			let h = s(p.nextCursor, "Flow cursor");
+			i((await c(await u(e, `/v1/flows?limit=1&cursor=${encodeURIComponent(h)}`), 200, "List second Flow page")).flows, [o], "Second Flow page"), i((await c(await u(e, `/v1/flows/${n}`, {
 				body: JSON.stringify({
 					name: "Renamed flow",
 					version: 1
@@ -144,9 +149,24 @@ var y = [
 		name: "commits immutable Draft Revisions for one Flow",
 		async verify(e) {
 			let t = await f(e, "Draft flow", "draft-flow"), n = s(t.flowId, "Draft Flow flowId"), r = s(t.draftRevisionId, "Draft Flow revisionId"), o = await c(await m(e, n, r), 200, "Change Draft"), d = h(o, "Changed Draft");
-			i(a(o.revision, "Changed Draft revision").parentRevisionId, r, "Changed Draft parent"), await l(await m(e, n, r, "stale"), 412, "flow.revision-conflict", "Stale Draft change"), i(a(a(a(a((await c(await u(e, `/v1/flows/${n}/revisions/${r}`), 200, "Read old Revision")).content, "Old content").document, "Old document").graph, "Old graph").nodes, "Old nodes"), {}, "Old Revision nodes"), i((await c(await u(e, `/v1/flows/${n}/draft`), 200, "Read Draft")).revisionId, d, "Draft revisionId");
-			let p = await c(await u(e, `/v1/flows/${n}/draft/sync?fromRevisionId=${r}`), 200, "Sync Draft");
-			i(p.kind, "snapshot", "Draft sync kind"), i(a(p.draft, "Draft snapshot").revisionId, d, "Draft snapshot revisionId");
+			i(a(o.revision, "Changed Draft revision").parentRevisionId, r, "Changed Draft parent"), await l(await p(e, n, d, [{
+				kind: "graph.node.replace",
+				node: {
+					concurrency: 1,
+					inputs: {},
+					kind: "value",
+					values: [{
+						handle: "ready",
+						jsonSchema: { type: "boolean" },
+						nullable: !1,
+						value: !0
+					}]
+				},
+				nodeId: "marker",
+				target: { kind: "flow" }
+			}]), 400, "flow.invalid", "No-op Draft change"), await l(await m(e, n, r, "stale"), 412, "flow.revision-conflict", "Stale Draft change"), i(a(a(a(a((await c(await u(e, `/v1/flows/${n}/revisions/${r}`), 200, "Read old Revision")).content, "Old content").document, "Old document").graph, "Old graph").nodes, "Old nodes"), {}, "Old Revision nodes"), i((await c(await u(e, `/v1/flows/${n}/draft`), 200, "Read Draft")).revisionId, d, "Draft revisionId");
+			let g = await c(await u(e, `/v1/flows/${n}/draft/sync?fromRevisionId=${r}`), 200, "Sync Draft");
+			i(g.kind, "snapshot", "Draft sync kind"), i(a(g.draft, "Draft snapshot").revisionId, d, "Draft snapshot revisionId");
 		}
 	},
 	{
@@ -170,21 +190,28 @@ var y = [
 					version: 1
 				}),
 				method: "PUT"
-			}), 412, "flow.presentation-conflict", "Stale Presentation update"), i((await c(await u(e, `/v1/flows/${n}`), 200, "Read Flow")).draftRevisionId, r, "Draft head");
+			}), 412, "flow.presentation-conflict", "Stale Presentation update"), i((await c(await u(e, a), 200, "Read Presentation")).value, o, "Presentation value after conflict"), await c(await u(e, `/v1/flows/${n}`, { method: "DELETE" }), 202, "Retire Presentation Flow"), await l(await u(e, a, {
+				body: JSON.stringify({
+					expectedRevision: 2,
+					value: {},
+					version: 1
+				}),
+				method: "PUT"
+			}), 409, "flow.busy", "Update retired Presentation"), i((await c(await u(e, `/v1/flows/${n}`), 200, "Read Flow")).draftRevisionId, r, "Draft head");
 		}
 	},
 	{
 		name: "validates, admits, lists, and cancels one Draft Run",
 		async verify(e) {
-			let t = await f(e, "Run flow", "run-flow"), r = s(t.flowId, "Run Flow flowId"), l = s(t.draftRevisionId, "Run Flow revisionId");
-			i((await c(await u(e, `/v1/flows/${r}/revisions/${l}/check`, {
+			let t = await f(e, "Run flow", "run-flow"), r = s(t.flowId, "Run Flow flowId"), d = s(t.draftRevisionId, "Run Flow revisionId");
+			i((await c(await u(e, `/v1/flows/${r}/revisions/${d}/check`, {
 				body: JSON.stringify({
 					engineContract: n,
 					version: 1
 				}),
 				method: "POST"
 			}), 200, "Check Flow")).valid, !0, "Flow validity");
-			let d = `/v1/flows/${r}/revisions/${l}/runs`, p = () => u(e, d, {
+			let p = `/v1/flows/${r}/revisions/${d}/runs`, m = () => u(e, p, {
 				body: JSON.stringify({
 					engineContract: n,
 					inputs: {},
@@ -192,11 +219,65 @@ var y = [
 				}),
 				headers: { "idempotency-key": "draft-run" },
 				method: "POST"
-			}), m = await c(await p(), 202, "Create Draft Run"), h = s(m.runId, "Draft Run runId");
-			i(await c(await p(), 200, "Replay Draft Run"), m, "Replayed Draft Run"), i(o((await c(await u(e, `/v1/flows/${r}/runs`), 200, "List Runs")).runs, "Runs").map((e) => a(e, "Run").runId), [h], "Listed Runs"), i((await c(await u(e, `/v1/runs/${h}/cancel`, {
+			}), h = await c(await m(), 202, "Create Draft Run"), g = s(h.runId, "Draft Run runId");
+			i(await c(await m(), 200, "Replay Draft Run"), h, "Replayed Draft Run"), await l(await u(e, `/v1/runs/${g}/result`), 409, "run.not-terminal", "Read queued Run result");
+			let _ = await c(await u(e, p, {
+				body: JSON.stringify({
+					engineContract: n,
+					inputs: {},
+					version: 1
+				}),
+				headers: { "idempotency-key": "draft-run-second" },
+				method: "POST"
+			}), 202, "Create second Draft Run"), v = await c(await u(e, `/v1/flows/${r}/runs?limit=1`), 200, "List Runs");
+			i(o(v.runs, "Runs").map((e) => a(e, "Run").runId), [g], "Listed Runs"), s(v.nextCursor, "Run cursor"), i((await c(await u(e, `/v1/runs/${g}/cancel`, {
+				body: JSON.stringify({ version: 1 }),
+				method: "POST"
+			}), 200, "Cancel Run")).status, "canceled", "Canceled Run status"), i((await c(await u(e, `/v1/runs/${g}/result`), 200, "Read canceled Run result")).status, "canceled", "Canceled Run result"), i((await c(await u(e, `/v1/runs/${g}/events`), 200, "Read canceled Run events")).done, !0, "Canceled Run events"), i((await c(await u(e, `/v1/runs/${s(_.runId, "Second Draft Run")}/cancel`, {
+				body: JSON.stringify({ version: 1 }),
+				method: "POST"
+			}), 200, "Cancel second Draft Run")).status, "canceled", "Second canceled Run status");
+		}
+	},
+	{
+		name: "rejects invalid and missing Flow control targets",
+		async verify(e) {
+			let t = "flow_missing", r = "revision_missing", i = "run_missing";
+			await l(await u(e, `/v1/flows/${t}`), 404, "flow.not-found", "Read missing Flow"), await l(await u(e, `/v1/flows/${t}`, {
+				body: JSON.stringify({
+					name: "Missing",
+					version: 1
+				}),
+				method: "PATCH"
+			}), 404, "flow.not-found", "Rename missing Flow"), await l(await u(e, `/v1/flows/${t}`, { method: "DELETE" }), 404, "flow.not-found", "Retire missing Flow"), await l(await u(e, `/v1/flows/${t}/draft`), 404, "flow.not-found", "Read missing Draft"), await l(await u(e, `/v1/flows/${t}/revisions/${r}`), 404, "flow.not-found", "Read missing Revision"), await l(await u(e, `/v1/flows/${t}/presentation`), 404, "flow.not-found", "Read missing Presentation"), await l(await u(e, `/v1/flows/${t}/presentation`, {
+				body: JSON.stringify({
+					expectedRevision: 1,
+					value: {},
+					version: 1
+				}),
+				method: "PUT"
+			}), 404, "flow.not-found", "Update missing Presentation"), await l(await u(e, `/v1/flows/${t}/runs`), 404, "flow.not-found", "List missing Flow Runs"), await l(await u(e, `/v1/runs/${i}`), 404, "run.not-found", "Read missing Run"), await l(await u(e, `/v1/runs/${i}/events`), 404, "run.not-found", "Read missing Run events"), await l(await u(e, `/v1/runs/${i}/result`), 404, "run.not-found", "Read missing Run result"), await l(await u(e, `/v1/runs/${i}/cancel`, {
 				body: JSON.stringify({ version: 1 }),
 				method: "POST"
-			}), 200, "Cancel Run")).status, "canceled", "Canceled Run status");
+			}), 404, "run.not-found", "Cancel missing Run");
+			let a = await f(e, "Invalid targets", "invalid-targets"), o = s(a.flowId, "Invalid targets Flow"), c = s(a.draftRevisionId, "Invalid targets Revision"), d = (t, n) => u(e, `/v1/flows/${o}/revisions/${t}/check`, {
+				body: JSON.stringify({
+					engineContract: n,
+					version: 1
+				}),
+				method: "POST"
+			});
+			await l(await d(c, "unsupported-engine/v1"), 409, "engine.unsupported", "Check unsupported Engine"), await l(await d(r, n), 404, "flow.not-found", "Check missing Revision");
+			let p = (t, n, r) => u(e, `/v1/flows/${o}/revisions/${t}/runs`, {
+				body: JSON.stringify({
+					engineContract: n,
+					inputs: {},
+					version: 1
+				}),
+				headers: { "idempotency-key": r },
+				method: "POST"
+			});
+			await l(await p(c, "unsupported-engine/v1", "unsupported-run"), 409, "engine.unsupported", "Run unsupported Engine"), await l(await p(r, n, "missing-revision-run"), 404, "flow.not-found", "Run missing Revision");
 		}
 	}
 ], b = [{
@@ -207,12 +288,22 @@ var y = [
 		let a = () => g(e, n, r, null, "publication-first"), o = await c(await a(), 201, "Publish Flow"), d = s(o.publicationId, "Publication id");
 		i(await c(await a(), 200, "Replay Publish"), o, "Replayed Publication"), await l(await g(e, n, r, d, "publication-first"), 409, "publication.conflict", "Conflicting replay"), i((await c(await u(e, `/v1/flows/${n}/live`), 200, "Read published Live")).publication, o, "Live Publication");
 		let p = await c(await u(e, `/v1/flows/${n}/publications?includeTotal=true`), 200, "List Publications");
-		i(p.publications, [o], "Publication history"), i(p.total, 1, "Publication total");
+		i(p.publications, [o], "Publication history"), i(p.total, 1, "Publication total"), await l(await u(e, `/v1/flows/${n}/revisions/${r}/publications`, {
+			body: JSON.stringify({
+				engineContract: "unsupported-engine/v1",
+				expectedLivePublicationId: d,
+				version: 1
+			}),
+			headers: { "idempotency-key": "unsupported-publication" },
+			method: "POST"
+		}), 409, "engine.unsupported", "Publish unsupported Engine"), await l(await g(e, n, "revision_missing", d, "missing-revision-publication"), 404, "flow.not-found", "Publish missing Revision"), await l(await _(e, n, "publication_missing", d, "missing-rollback"), 404, "publication.not-found", "Rollback missing Publication"), await l(await v(e, "publication_missing", "missing-publication-run"), 404, "publication.not-found", "Run missing Publication");
 	}
 }, {
 	name: "rolls back immutable history and fixes a Live Run target",
 	async verify(e) {
-		let t = await f(e, "Rollback flow", "rollback-flow"), n = s(t.flowId, "Rollback Flow flowId"), r = s(t.draftRevisionId, "Rollback Flow revisionId"), a = s((await c(await g(e, n, r, null, "publish-first"), 201, "Publish first Revision")).publicationId, "First Publication"), o = s((await c(await g(e, n, h(await c(await m(e, n, r), 200, "Change Draft"), "Second Revision"), a, "publish-second"), 201, "Publish second Revision")).publicationId, "Second Publication"), d = () => _(e, n, a, o, "rollback-first"), p = await c(await d(), 201, "Rollback Flow"), y = s(p.publicationId, "Rollback Publication");
+		let t = await f(e, "Rollback flow", "rollback-flow"), n = s(t.flowId, "Rollback Flow flowId"), r = s(t.draftRevisionId, "Rollback Flow revisionId"), a = s((await c(await g(e, n, r, null, "publish-first"), 201, "Publish first Revision")).publicationId, "First Publication"), o = s((await c(await g(e, n, h(await c(await m(e, n, r), 200, "Change Draft"), "Second Revision"), a, "publish-second"), 201, "Publish second Revision")).publicationId, "Second Publication");
+		await l(await v(e, a, "stale-live-run"), 412, "live.conflict", "Run stale Publication");
+		let d = () => _(e, n, a, o, "rollback-first"), p = await c(await d(), 201, "Rollback Flow"), y = s(p.publicationId, "Rollback Publication");
 		i(p.operation, "rollback", "Rollback operation"), i(p.sourcePublicationId, a, "Rollback source"), i(await c(await d(), 200, "Replay Rollback"), p, "Replayed Rollback");
 		let b = await c(await v(e, y, "rollback-run"), 202, "Create Live Run");
 		i(b.flowId, n, "Live Run flowId"), i(b.revisionId, r, "Live Run revisionId"), await c(await u(e, `/v1/flows/${n}`, { method: "DELETE" }), 202, "Retire Flow"), await l(await v(e, y, "retired-run"), 409, "flow.busy", "Run retired Flow");

package/dist/common/control-api.d.ts

@@ -254,8 +254,8 @@ interface PublicationOptions {
     readonly idempotencyKey?: string;
 }
 export declare class ApiError extends Error {
-    readonly status: number;
     readonly code: string;
+    readonly status: number;
     constructor(status: number, code: string, message: string);
 }
 export declare class ControlClient {

package/dist/common/control-api.js

@@ -67,7 +67,7 @@ var e = {
 	"starting"
 ], r = class extends Error {
 	constructor(e, t, n) {
-		super(n), this.status = e, this.code = t, this.name = "ApiError";
+		super(n), this.code = t, this.name = "ApiError", this.status = e;
 	}
 };
 function i() {

package/dist/common/flow-encoding.d.ts

@@ -1,9 +1,9 @@
-import type { CodeModule, FlowDocument, Graph, InputPortDefinition, JsonValue, OutputMapping, PortDefinition, RevisionContent } from '@oomol-lab/open-flow/flow-change';
+import type { CodeModule, FlowDocument, Graph, InputPort, JsonValue, OutputMapping, Port, RevisionContent } from '@oomol-lab/open-flow/flow-change';
 export declare const maxJsonDepth = 64;
 export declare function canonicalJsonBytes(value: JsonValue): Uint8Array;
 export declare function digestBytes(bytes: Uint8Array): Promise<string>;
-export declare function canonicalPorts(value: Readonly<Record<string, InputPortDefinition | PortDefinition>>): JsonValue;
-export declare function canonicalOutputs(value: Readonly<Record<string, OutputMapping & PortDefinition>>): JsonValue;
+export declare function canonicalPorts(value: readonly (InputPort | Port)[]): JsonValue;
+export declare function canonicalOutputs(value: readonly (OutputMapping & Port)[]): JsonValue;
 export declare function canonicalGraph(value: Graph): JsonValue;
 export declare function canonicalTask(task: FlowDocument['tasks'][string]): JsonValue;
 export declare function canonicalDocument(document: FlowDocument): JsonValue;

package/dist/common/flow-encoding.js

@@ -19,13 +19,14 @@ function a(e) {
 function o(e) {
 	return {
 		...e.description == null ? {} : { description: e.description },
+		handle: e.handle,
 		jsonSchema: e.jsonSchema,
 		nullable: e.nullable,
 		...Object.hasOwn(e, "value") ? { value: e.value } : {}
 	};
 }
 function s(e) {
-	return Object.fromEntries(a(e).map(([e, t]) => [e, o(t)]));
+	return e.map(o);
 }
 function c(e) {
 	switch (e.kind) {
@@ -43,18 +44,20 @@ function l(e) {
 	return Object.fromEntries(a(e).map(([e, t]) => [e, c(t)]));
 }
 function u(e) {
-	return Object.fromEntries(a(e).map(([e, t]) => [e, {
-		...t.description == null ? {} : { description: t.description },
-		jsonSchema: t.jsonSchema,
-		nullable: t.nullable,
-		sources: t.sources.map((e) => ({ ...e }))
-	}]));
+	return e.map((e) => ({
+		...e.description == null ? {} : { description: e.description },
+		handle: e.handle,
+		jsonSchema: e.jsonSchema,
+		nullable: e.nullable,
+		sources: e.sources.map((e) => ({ ...e }))
+	}));
 }
 function d(e) {
 	if (!("inputs" in e)) return v(e);
 	let t = {
 		concurrency: e.concurrency,
 		...e.description == null ? {} : { description: e.description },
+		...e.icon == null ? {} : { icon: e.icon },
 		inputs: l(e.inputs),
 		...e.name == null ? {} : { name: e.name },
 		...e.timeoutMs == null ? {} : { timeoutMs: e.timeoutMs }
@@ -172,6 +175,7 @@ function _(e) {
 function v(e) {
 	let t = (t) => ({
 		...e.description == null ? {} : { description: e.description },
+		...e.icon == null ? {} : { icon: e.icon },
 		kind: t,
 		name: e.name
 	});