@oomol-lab/open-flow 0.1.0-beta.4 → 0.1.0-beta.6

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

@@ -62,17 +62,18 @@ function d(e, t, n) {
 async function f(e, t, n) {
 	return c(await d(e, t, n), 201, "Create Flow");
 }
-function p(e, t, n, r) {
+function p(e, t, n, r, i = `change-${crypto.randomUUID()}`) {
 	return u(e, `/v1/flows/${encodeURIComponent(t)}/draft/changes`, {
 		body: JSON.stringify({
 			expectedRevisionId: n,
 			operations: r,
 			version: 1
 		}),
+		headers: { "idempotency-key": i },
 		method: "POST"
 	});
 }
-function m(e, t, n, r = "marker") {
+function m(e, t, n, r = "marker", i) {
 	return p(e, t, n, [{
 		kind: "graph.node.create",
 		node: {
@@ -88,7 +89,7 @@ function m(e, t, n, r = "marker") {
 		},
 		nodeId: r,
 		target: { kind: "flow" }
-	}]);
+	}], i);
 }
 function h(e, t) {
 	return s(a(e.revision, `${t} revision`).revisionId, `${t} revisionId`);
@@ -197,24 +198,25 @@ var b = [
 	{
 		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 p(e, n, d, [{
-				kind: "graph.node.replace",
-				node: {
-					concurrency: 1,
-					inputs: {},
-					kind: "value",
-					values: [{
-						handle: "ready",
-						jsonSchema: { type: "boolean" },
-						nullable: !1,
-						value: !0
-					}]
-				},
+			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, "marker", "draft-change"), 200, "Change Draft"), d = h(o, "Changed Draft");
+			i(a(o.revision, "Changed Draft revision").parentRevisionId, r, "Changed Draft parent"), i(await c(await m(e, n, r, "marker", "draft-change"), 200, "Replay Draft change"), o, "Replayed Draft change"), await l(await m(e, n, r, "another-marker", "draft-change"), 409, "flow.conflict", "Conflicting Draft change replay"), await l(await p(e, n, d, [{
+				before: [{
+					handle: "ready",
+					jsonSchema: { type: "boolean" },
+					nullable: !1,
+					value: !0
+				}],
+				kind: "graph.node.values.set",
 				nodeId: "marker",
-				target: { kind: "flow" }
+				target: { kind: "flow" },
+				value: [{
+					handle: "ready",
+					jsonSchema: { type: "boolean" },
+					nullable: !1,
+					value: !0
+				}]
 			}]), 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");
+			let g = await c(await u(e, `/v1/flows/${n}/draft/sync`), 200, "Sync Draft");
 			i(g.kind, "snapshot", "Draft sync kind"), i(a(g.draft, "Draft snapshot").revisionId, d, "Draft snapshot revisionId");
 		}
 	},
@@ -299,6 +301,12 @@ var b = [
 				node: {
 					actions: ["approve", "reject"],
 					concurrency: 1,
+					input: {
+						handle: "value",
+						jsonSchema: {},
+						nullable: !0,
+						value: null
+					},
 					inputs: { value: {
 						kind: "value",
 						value: { request: 1 }

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

@@ -114,18 +114,11 @@ export interface DraftChange {
     readonly revision: RevisionMetadata;
     readonly version: 1;
 }
-export type DraftSync = {
-    readonly kind: 'changes';
-    readonly revisions: readonly {
-        readonly operations: readonly ChangeOperation[];
-        readonly revision: RevisionMetadata;
-    }[];
-    readonly version: 1;
-} | {
+export interface DraftSync {
     readonly draft: Draft;
     readonly kind: 'snapshot';
     readonly version: 1;
-};
+}
 export interface Publication {
     readonly actorId: string;
     readonly closureDigest: string;
@@ -339,7 +332,7 @@ export declare class ControlClient {
     resumeFlowTrigger(flowId: string, triggerNodeId: string): Promise<TriggerBinding>;
     testFlowPollTrigger(flowId: string, triggerNodeId: string): Promise<PollTriggerTestResult>;
     getDraft(flowId: string): Promise<Draft>;
-    syncDraft(flowId: string, fromRevisionId?: string): Promise<DraftSync>;
+    syncDraft(flowId: string): Promise<DraftSync>;
     getRevision(flowId: string, revisionId: string): Promise<Draft>;
     listConnectorProviders(signal?: AbortSignal, flowId?: string): Promise<readonly ConnectorProvider[]>;
     listConnectorActions(serviceId?: string, signal?: AbortSignal, flowId?: string): Promise<readonly ConnectorAction[]>;
@@ -347,7 +340,7 @@ export declare class ControlClient {
     getConnectorAction(actionId: string, signal?: AbortSignal, flowId?: string): Promise<ConnectorAction>;
     listConnectorConnections(serviceId: string, signal?: AbortSignal, flowId?: string): Promise<readonly ConnectorConnection[]>;
     createConnectorConnectionPage(serviceId: string, flowId?: string): Promise<string>;
-    changeDraft(flowId: string, expectedRevisionId: string, operations: readonly ChangeOperation[]): Promise<DraftChange>;
+    changeDraft(flowId: string, expectedRevisionId: string, operations: readonly ChangeOperation[], changeId?: string): Promise<DraftChange>;
     checkFlow(flowId: string, revisionId: string): Promise<FlowCheck>;
     getLive(flowId: string): Promise<Live>;
     listPublications(flowId: string, options?: {

package/dist/common/control-api.js

@@ -396,23 +396,11 @@ function M(e) {
 }
 function N(e) {
 	let t = a(e);
-	return t.version == 1 ? t.kind == "snapshot" ? {
+	return t.version != 1 || t.kind != "snapshot" ? i() : {
 		draft: j(t.draft),
 		kind: "snapshot",
 		version: 1
-	} : t.kind != "changes" || !Array.isArray(t.revisions) ? i() : {
-		kind: "changes",
-		revisions: t.revisions.map((e) => {
-			let t = a(e);
-			if (!Array.isArray(t.operations) || t.operations.length == 0) return i();
-			for (let e of t.operations) if (typeof a(e).kind != "string") return i();
-			return {
-				operations: t.operations,
-				revision: A(t.revision)
-			};
-		}),
-		version: 1
-	} : i();
+	};
 }
 function P(e) {
 	let t = a(e), n = t.operation, r = t.sourcePublicationId;
@@ -839,9 +827,8 @@ var ee = class {
 	async getDraft(e) {
 		return j(await this.request(`/v1/flows/${Q(e)}/draft`));
 	}
-	async syncDraft(e, t) {
-		let n = t == null ? "" : `?fromRevisionId=${Q(t)}`;
-		return N(await this.request(`/v1/flows/${Q(e)}/draft/sync${n}`));
+	async syncDraft(e) {
+		return N(await this.request(`/v1/flows/${Q(e)}/draft/sync`));
 	}
 	async getRevision(e, t) {
 		return j(await this.request(`/v1/flows/${Q(e)}/revisions/${Q(t)}`));
@@ -887,13 +874,14 @@ var ee = class {
 			return i();
 		}
 	}
-	async changeDraft(e, t, n) {
+	async changeDraft(e, t, n, r = $("change")) {
 		return M(await this.request(`/v1/flows/${Q(e)}/draft/changes`, {
 			body: JSON.stringify({
 				expectedRevisionId: t,
 				operations: n,
 				version: 1
 			}),
+			headers: { "idempotency-key": r },
 			method: "POST"
 		}));
 	}

package/dist/common/flow-encoding.js

@@ -107,6 +107,10 @@ function d(e) {
 		case "wait": return {
 			...t,
 			actions: e.actions,
+			input: {
+				handle: e.input.handle,
+				...o(e.input)
+			},
 			kind: e.kind,
 			...e.notification == null ? {} : { notification: {
 				inputs: l(e.notification.inputs),

package/dist/common/flow-semantics.js

@@ -10249,6 +10249,10 @@ function vo(e) {
 		case "wait": return {
 			...t,
 			actions: e.actions,
+			input: {
+				handle: e.input.handle,
+				...po(e.input)
+			},
 			kind: e.kind,
 			...e.notification == null ? {} : { notification: {
 				inputs: go(e.notification.inputs),
@@ -10713,11 +10717,7 @@ function Jo(e, t) {
 		case "value": return {};
 		case "subflow": return oo(e.subflows[t.subflowId]?.inputs ?? []);
 		case "task": return oo([...t.task == null ? e.tasks[t.taskId]?.inputs ?? [] : t.task.inputs, ...t.additionalInputs ?? []]);
-		case "wait": return { value: {
-			jsonSchema: {},
-			nullable: !0,
-			value: null
-		} };
+		case "wait": return { [t.input.handle]: t.input };
 		case "cron":
 		case "integration":
 		case "poll":
@@ -10733,10 +10733,7 @@ function Yo(e, t) {
 		case "value": return oo(t.values);
 		case "subflow": return oo(e.subflows[t.subflowId]?.outputs ?? []);
 		case "task": return oo(t.task == null ? e.tasks[t.taskId]?.outputs ?? [] : t.task.outputs);
-		case "wait": return Object.fromEntries(t.actions.map((e) => [e, {
-			jsonSchema: {},
-			nullable: !0
-		}]));
+		case "wait": return Object.fromEntries(t.actions.map((e) => [e, t.input]));
 		case "cron":
 		case "integration":
 		case "poll":
@@ -10792,6 +10789,7 @@ function Qo(e, t, n, r, i, a, o, s) {
 		"concurrency",
 		"description",
 		"icon",
+		"input",
 		"inputs",
 		"kind",
 		"name",
@@ -10801,7 +10799,7 @@ function Qo(e, t, n, r, i, a, o, s) {
 	if (l.length > 0 && s.push(Q("wait.field-unsupported", `Wait node "${e}" contains unsupported fields: ${l.join(", ")}.`, o, {
 		fields: l.join(", "),
 		nodeId: e
-	})), a || s.push(Q("wait.not-allowed", "Wait nodes are only allowed in Flows.", o)), t.concurrency != 1 && s.push(Q("wait.concurrency-invalid", "Wait concurrency must be 1.", `${o}/concurrency`)), (typeof t.prompt != "string" || t.prompt.trim().length == 0 || [...t.prompt].length > 1e3) && s.push(Q("wait.prompt-invalid", "Wait prompt must contain between 1 and 1,000 Unicode code points.", `${o}/prompt`)), (!Array.isArray(t.actions) || !(t.actions.length == 1 && t.actions[0] == "continue" || t.actions.length == 2 && t.actions[0] == "approve" && t.actions[1] == "reject")) && s.push(Q("wait.actions-invalid", "Wait actions must be [\"continue\"] or [\"approve\", \"reject\"].", `${o}/actions`)), t.notification == null) return;
+	})), a || s.push(Q("wait.not-allowed", "Wait nodes are only allowed in Flows.", o)), t.concurrency != 1 && s.push(Q("wait.concurrency-invalid", "Wait concurrency must be 1.", `${o}/concurrency`)), t.input.handle != "value" && s.push(Q("wait.input-invalid", "Wait input handle must be \"value\".", `${o}/input/handle`)), (typeof t.prompt != "string" || t.prompt.trim().length == 0 || [...t.prompt].length > 1e3) && s.push(Q("wait.prompt-invalid", "Wait prompt must contain between 1 and 1,000 Unicode code points.", `${o}/prompt`)), (!Array.isArray(t.actions) || !(t.actions.length == 1 && t.actions[0] == "continue" || t.actions.length == 2 && t.actions[0] == "approve" && t.actions[1] == "reject")) && s.push(Q("wait.actions-invalid", "Wait actions must be [\"continue\"] or [\"approve\", \"reject\"].", `${o}/actions`)), t.notification == null) return;
 	let u = t.notification;
 	if (typeof u != "object" || Array.isArray(u)) {
 		s.push(Q("wait.notification-invalid", "Wait notification must be an object.", `${o}/notification`));

package/dist/common/runtime-contract.d.ts

@@ -44,7 +44,7 @@ export interface RuntimeInvocation {
 }
 export interface RuntimeHarness {
     readonly engineDigest: string;
-    invoke(invocation: RuntimeInvocation): Promise<JsonValue>;
+    invoke(invocation: RuntimeInvocation): Promise<JsonValue | undefined>;
 }
 export interface RuntimeConformanceCase {
     readonly name: string;

package/dist/common/runtime-contract.js

@@ -129,6 +129,33 @@ var c = [
 			}], "Capability request");
 		}
 	},
+	{
+		name: "submits Task outputs and accepts a void result",
+		async verify(e) {
+			let t = [];
+			o(await e.invoke({
+				capability: async (e) => (t.push(e), {
+					body: null,
+					status: 200
+				}),
+				input: null,
+				invocationId: "task-outputs",
+				program: a(e, "export default async (_input, context) => {\n  await context.outputs({ first: 1 })\n  await context.outputs({ second: 2 })\n}")
+			}), void 0, "Void Task result"), o(t.map(({ invocationId: e, kind: t, payload: n }) => ({
+				invocationId: e,
+				kind: t,
+				payload: n
+			})), [{
+				invocationId: "task-outputs",
+				kind: "outputs",
+				payload: { first: 1 }
+			}, {
+				invocationId: "task-outputs",
+				kind: "outputs",
+				payload: { second: 2 }
+			}], "Task outputs request");
+		}
+	},
 	{
 		name: "cancels a pending Capability and the user invocation",
 		async verify(e) {

package/dist/common/scheduler.d.ts

@@ -147,7 +147,7 @@ export interface FlowRunOptions {
     readonly emit?: (event: SchedulerEvent) => Effect.Effect<void, Error>;
     readonly flowId: string;
     readonly inputs?: Readonly<Record<string, Readonly<Record<string, JsonValue>>>>;
-    readonly invokeTask: (invocation: TaskInvocation) => Effect.Effect<unknown, Error>;
+    readonly invokeTask: (invocation: TaskInvocation, outputs: (value: unknown) => Effect.Effect<void, Error>) => Effect.Effect<unknown, Error>;
     readonly projectFailure?: (error: unknown) => SchedulerFailure;
     readonly resume?: {
         readonly action: WaitAction;

package/dist/common/scheduler.js

@@ -122,14 +122,10 @@ function p(e, t) {
 		case "subflow": return a(e.subflows[t.subflowId].inputs);
 		case "task": return a([...t.task == null ? e.tasks[t.taskId].inputs : t.task.inputs, ...t.additionalInputs ?? []]);
 		case "wait": {
-			let n = t.notification == null ? void 0 : e.tasks[t.notification.taskId];
+			let n = t.notification, r = n == null ? void 0 : e.tasks[n.taskId];
 			return {
-				value: {
-					jsonSchema: {},
-					nullable: !0,
-					value: null
-				},
-				...t.notification == null || n == null ? {} : Object.fromEntries(n.inputs.flatMap((e) => "handle" in e && e.handle != t.notification.messageHandle ? [[d(e.handle), e]] : []))
+				[t.input.handle]: t.input,
+				...n == null || r == null ? {} : Object.fromEntries(r.inputs.flatMap((e) => "handle" in e && e.handle != n.messageHandle ? [[d(e.handle), e]] : []))
 			};
 		}
 	}
@@ -317,6 +313,7 @@ function D(e, t, n) {
 	}
 }
 function O(e, t) {
+	if (e === void 0) return {};
 	if (typeof e != "object" || !e || Array.isArray(e)) throw Error(`Node "${t}" must return an object.`);
 	return e;
 }
@@ -374,7 +371,7 @@ function k(r, s, c, d, b, x = {}, S, C, w) {
 		}), ee = (t, n, i, o) => {
 			let l = e.gen(function* () {
 				let l = h(r.prepared, n), u = m(r.prepared, n), d = Object.fromEntries(Object.entries(o).filter(([e]) => {
-					if (n.kind == "wait") return e == "value";
+					if (n.kind == "wait") return e == n.input.handle;
 					let t = n.inputs[e];
 					return t?.kind != "sources" || t.sources.every((e) => e.kind != "binding");
 				}));
@@ -417,7 +414,14 @@ function k(r, s, c, d, b, x = {}, S, C, w) {
 						break;
 					}
 					case "task": {
-						let a = new Set((n.additionalInputs ?? []).map((e) => e.handle)), l = yield* r.invokeTask({
+						let a = new Set((n.additionalInputs ?? []).map((e) => e.handle)), l = /* @__PURE__ */ new Map(), u = (n) => e.gen(function* () {
+							let r = yield* e.try({
+								try: () => O(n, t),
+								catch: (e) => e instanceof Error ? e : Error(String(e))
+							});
+							for (let [e, n] of Object.entries(r)) yield* Z(t, i, e, n), l.set(e, n);
+						});
+						yield* u(yield* r.invokeTask({
 							additionalInputs: Object.fromEntries(Object.entries(o).filter(([e]) => a.has(e))),
 							blockId: n.task == null ? n.taskId : n.task.moduleId,
 							flowId: s.flowId,
@@ -430,12 +434,7 @@ function k(r, s, c, d, b, x = {}, S, C, w) {
 								capabilities: n.task.capabilities ?? [],
 								moduleId: n.task.moduleId
 							}
-						});
-						f = yield* e.try({
-							try: () => O(l, t),
-							catch: (e) => e instanceof Error ? e : Error(String(e))
-						});
-						for (let [e, n] of Object.entries(f)) yield* Z(t, i, e, n);
+						}, u)), f = Object.fromEntries(l);
 						break;
 					}
 					case "wait": return yield* e.fail(/* @__PURE__ */ Error("Wait jobs are handled by the Scheduler suspension boundary."));
@@ -464,10 +463,10 @@ function k(r, s, c, d, b, x = {}, S, C, w) {
 						taskId: n.notification.taskId
 					} },
 					order: d,
-					value: a.value ?? null,
+					value: a[n.input.handle] ?? null,
 					waitId: i()
 				};
-				let e = n.inputs.value, o = e?.kind == "sources" && e.sources.some((e) => e.kind == "binding") ? {} : { value: a.value ?? null };
+				let e = n.inputs[n.input.handle], o = e?.kind == "sources" && e.sources.some((e) => e.kind == "binding") ? {} : { [n.input.handle]: a[n.input.handle] ?? null };
 				B(r.emit({
 					inputs: o,
 					jobId: l,
@@ -513,7 +512,7 @@ function k(r, s, c, d, b, x = {}, S, C, w) {
 		if (Y = (e) => {
 			if (G != null || q) return;
 			let t = s.graph.nodes[e], n = N.get(e);
-			for (; n.ready && (R.get(e) ?? 0) < t.concurrency;) te(e);
+			for (; n.ready && (R.get(e) ?? 0) < t.concurrency;) if (te(e), q) return;
 		}, w == null) {
 			for (let [e, t] of Object.entries(x)) {
 				let n = N.get(e);

package/dist/index.d.ts

@@ -57,7 +57,7 @@ export interface TaskContext<Outputs extends object = Record<string, unknown>> {
     readonly artifact: ArtifactCapability;
     readonly fetch: typeof fetch;
     readonly logger: TaskLogger;
-    output<Handle extends keyof Outputs & string>(handle: Handle, value: Outputs[Handle]): Promise<void>;
+    outputs(value: Partial<Outputs>): Promise<void>;
     preview(payload: PreviewPayload, id?: string): Promise<void>;
     reportProgress(progress: number): Promise<void>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oomol-lab/open-flow",
-  "version": "0.1.0-beta.4",
+  "version": "0.1.0-beta.6",
   "description": "TypeScript contracts and Browser runtime for Open Flow.",
   "license": "Apache-2.0",
   "repository": {