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

package/dist/common/scheduler.js

@@ -1,11 +1,16 @@
+//#region src/flow/common/change.ts
+function e(e) {
+	return Object.fromEntries(e.map((e) => [e.handle, e]));
+}
+//#endregion
 //#region src/execution/common/scheduler.ts
-function e(e, t) {
+function t(e, t) {
 	return t?.(e) ?? {
 		code: "node.failed",
 		message: e instanceof Error ? e.message : String(e)
 	};
 }
-var t = class {
+var n = class {
 	#e = [];
 	#t = 0;
 	get length() {
@@ -18,9 +23,9 @@ var t = class {
 		let e = this.#e[this.#t];
 		return this.#t += 1, this.#t >= 64 && this.#t * 2 >= this.#e.length && (this.#e.splice(0, this.#t), this.#t = 0), e;
 	}
-}, n = class {
+}, r = class {
 	#e;
-	#t = new t();
+	#t = new n();
 	#n;
 	#r;
 	constructor(e, t, n) {
@@ -42,13 +47,13 @@ var t = class {
 	take() {
 		return this.#t.length > 0 ? this.#t.shift() : this.#r;
 	}
-}, r = class {
+}, i = class {
 	#e;
 	#t;
 	#n;
 	#r = !1;
-	constructor(e, t, r) {
-		this.#t = e, this.#n = new Map(Object.entries(r).map(([e, r]) => [e, new n(t, e, r)])), this.#e = [...this.#n.values()].some((e) => e.dynamic);
+	constructor(e, t, n) {
+		this.#t = e, this.#n = new Map(Object.entries(n).map(([e, n]) => [e, new r(t, e, n)])), this.#e = [...this.#n.values()].some((e) => e.dynamic);
 	}
 	get ready() {
 		return (!this.#r || this.#e) && [...this.#n.values()].every((e) => e.ready);
@@ -67,15 +72,15 @@ var t = class {
 		return this.#e || (this.#r = !0), Object.fromEntries([...this.#n].map(([e, t]) => [e, t.take()]));
 	}
 };
-function i(e, t) {
-	switch (t.kind) {
-		case "condition": return { [t.input.handle]: t.input };
+function a(t, n) {
+	switch (n.kind) {
+		case "condition": return { [n.input.handle]: n.input };
 		case "value": return {};
-		case "subflow": return e.subflows[t.subflowId].inputs;
-		case "task": return t.task == null ? e.tasks[t.taskId].inputs : t.task.inputs;
+		case "subflow": return e(t.subflows[n.subflowId].inputs);
+		case "task": return e(n.task == null ? t.tasks[n.taskId].inputs : n.task.inputs);
 	}
 }
-function a(e, t) {
+function o(e, t) {
 	if (t.name != null) return t.name;
 	switch (t.kind) {
 		case "condition": return;
@@ -84,17 +89,17 @@ function a(e, t) {
 		case "task": return t.task == null ? e.tasks[t.taskId].name : t.task.name;
 	}
 }
-function o(e, t) {
+function s(e, t) {
 	return t.kind == "task" ? t.task == null ? e.tasks[t.taskId].executor.kind : "javascript" : t.kind;
 }
-function s(e, t, n, r) {
+function c(e, t, n, r) {
 	let i = e.get(t) ?? /* @__PURE__ */ new Map(), a = i.get(n) ?? [];
 	a.push(r), i.set(n, a), e.set(t, i);
 }
-function c(e, t, n) {
+function l(e, t, n) {
 	return e.get(t)?.get(n) ?? [];
 }
-function l(e) {
+function u(e) {
 	let t = new Map(Object.entries(e.nodes).map(([t, n]) => [t, new Set(Object.values(n.inputs).flatMap((t) => t.kind == "sources" ? t.sources.flatMap((t) => t.kind == "node" && e.nodes[t.nodeId] != null ? [t.nodeId] : []) : []))])), n = [];
 	for (; t.size > 0;) {
 		let e = [...t].filter(([, e]) => e.size == 0).map(([e]) => e).toSorted();
@@ -104,18 +109,18 @@ function l(e) {
 	}
 	return n;
 }
-function u(e, t) {
+function d(e, t) {
 	if (e === t) return !0;
 	if (e == null || t == null || typeof e != "object" || typeof t != "object") return !1;
-	if (Array.isArray(e) || Array.isArray(t)) return Array.isArray(e) && Array.isArray(t) && e.length == t.length && e.every((e, n) => u(e, t[n]));
+	if (Array.isArray(e) || Array.isArray(t)) return Array.isArray(e) && Array.isArray(t) && e.length == t.length && e.every((e, n) => d(e, t[n]));
 	let n = Object.entries(e), r = Object.entries(t), i = t;
-	return n.length == r.length && n.every(([e, t]) => Object.hasOwn(i, e) && u(t, i[e]));
+	return n.length == r.length && n.every(([e, t]) => Object.hasOwn(i, e) && d(t, i[e]));
 }
-function d(e, t, n) {
+function f(e, t, n) {
 	let r = Object.hasOwn(n, t.input) ? n[t.input] : null, i = t.value;
 	switch (t.operator) {
-		case "==": return i !== void 0 && u(r, i);
-		case "!=": return i !== void 0 && !u(r, i);
+		case "==": return i !== void 0 && d(r, i);
+		case "!=": return i !== void 0 && !d(r, i);
 		case ">": return typeof r == "number" && typeof i == "number" && r > i;
 		case ">=": return typeof r == "number" && typeof i == "number" && r >= i;
 		case "<": return typeof r == "number" && typeof i == "number" && r < i;
@@ -123,7 +128,7 @@ function d(e, t, n) {
 		case "contains":
 		case "notContains": {
 			let e;
-			return typeof r == "string" && typeof i == "string" ? e = r.includes(i) : Array.isArray(r) && i !== void 0 && (e = r.some((e) => u(e, i))), e == null ? !1 : t.operator == "contains" ? e : !e;
+			return typeof r == "string" && typeof i == "string" ? e = r.includes(i) : Array.isArray(r) && i !== void 0 && (e = r.some((e) => d(e, i))), e == null ? !1 : t.operator == "contains" ? e : !e;
 		}
 		case "startsWith": return typeof r == "string" && typeof i == "string" && r.startsWith(i);
 		case "endsWith": return typeof r == "string" && typeof i == "string" && r.endsWith(i);
@@ -136,7 +141,7 @@ function d(e, t, n) {
 		case "hasValue":
 		case "notHasValue": {
 			if (r == null || Array.isArray(r) || typeof r != "object" || i === void 0) return !1;
-			let e = Object.values(r).some((e) => u(e, i));
+			let e = Object.values(r).some((e) => d(e, i));
 			return t.operator == "hasValue" ? e : !e;
 		}
 		case "isEmpty":
@@ -150,17 +155,17 @@ function d(e, t, n) {
 		case "isFalse": return r === !1;
 	}
 }
-function f(e, t) {
+function p(e, t) {
 	if (typeof e != "object" || !e || Array.isArray(e)) throw Error(`Node "${t}" must return an object.`);
 	return e;
 }
-function p(e) {
+function m(e) {
 	return e.reason instanceof Error ? e.reason : /* @__PURE__ */ Error("Run canceled.");
 }
-function m(e, t) {
+function h(e, t) {
 	return new Promise((n, r) => {
 		let i = () => {
-			t.removeEventListener("abort", i), r(p(t));
+			t.removeEventListener("abort", i), r(m(t));
 		};
 		e.then((e) => {
 			t.removeEventListener("abort", i), n(e);
@@ -169,196 +174,196 @@ function m(e, t) {
 		}), t.aborted ? i() : t.addEventListener("abort", i, { once: !0 });
 	});
 }
-async function h(t, n, u, p, g, v, y = {}, b, x) {
-	g.throwIfAborted(), await t.emit({
-		flowId: n.flowId,
-		...v == null ? {} : {
-			parentJobId: v.jobId,
-			parentRunId: v.runId
+async function g(n, r, d, m, _, y, b = {}, x, S) {
+	_.throwIfAborted(), await n.emit({
+		flowId: r.flowId,
+		...y == null ? {} : {
+			parentJobId: y.jobId,
+			parentRunId: y.runId
 		},
-		runId: u,
+		runId: d,
 		type: "run.started"
 	});
-	let S = l(n.graph), C = S.length, w = new Map(Object.entries(n.graph.nodes).map(([e, n]) => [e, new r(e, n, i(t.prepared, n))])), T = /* @__PURE__ */ new Map(), E = /* @__PURE__ */ new Map(), D = /* @__PURE__ */ new Map();
-	for (let [e, t] of Object.entries(n.graph.nodes)) for (let [n, r] of Object.entries(t.inputs)) if (r.kind == "sources") for (let t of r.sources) if (t.kind == "flow") {
-		let r = T.get(t.input) ?? [];
+	let C = u(r.graph), w = C.length, T = new Map(Object.entries(r.graph.nodes).map(([e, t]) => [e, new i(e, t, a(n.prepared, t))])), E = /* @__PURE__ */ new Map(), D = /* @__PURE__ */ new Map(), O = /* @__PURE__ */ new Map();
+	for (let [e, t] of Object.entries(r.graph.nodes)) for (let [n, r] of Object.entries(t.inputs)) if (r.kind == "sources") for (let t of r.sources) if (t.kind == "flow") {
+		let r = E.get(t.input) ?? [];
 		r.push({
 			handle: n,
 			nodeId: e
-		}), T.set(t.input, r);
-	} else t.kind == "node" && s(E, t.nodeId, t.output, {
+		}), E.set(t.input, r);
+	} else t.kind == "node" && c(D, t.nodeId, t.output, {
 		handle: n,
 		nodeId: e
 	});
-	for (let [e, t] of Object.entries(n.outputs)) for (let n of t.sources) n.kind == "node" && s(D, n.nodeId, n.output, e);
-	let O = /* @__PURE__ */ new Map(), k = /* @__PURE__ */ new Set(), A = /* @__PURE__ */ new Map(), j = /* @__PURE__ */ new Map(), M = /* @__PURE__ */ new Map(), N = /* @__PURE__ */ new Set(), P = new AbortController(), F = AbortSignal.any([g, P.signal]), I, L = !1, R, z = (e, t) => {
-		P.signal.aborted || (w.get(e.nodeId).push(e.handle, t), R(e.nodeId));
-	}, B = async (e, n, r, i) => {
-		await t.emit({
+	for (let [e, t] of Object.entries(r.outputs)) for (let n of t.sources) n.kind == "node" && c(O, n.nodeId, n.output, e);
+	let k = /* @__PURE__ */ new Map(), A = /* @__PURE__ */ new Set(), j = /* @__PURE__ */ new Map(), M = /* @__PURE__ */ new Map(), N = /* @__PURE__ */ new Map(), P = /* @__PURE__ */ new Set(), F = new AbortController(), I = AbortSignal.any([_, F.signal]), L, R = !1, z, B = (e, t) => {
+		F.signal.aborted || (T.get(e.nodeId).push(e.handle, t), z(e.nodeId));
+	}, V = async (e, t, r, i) => {
+		await n.emit({
 			handle: r,
-			jobId: n,
+			jobId: t,
 			nodeId: e,
-			runId: u,
+			runId: d,
 			type: "node.output",
 			value: i
 		});
-		for (let t of c(E, e, r)) z(t, i);
-		for (let t of c(D, e, r)) M.set(t, i), await b?.(t, i);
-	}, V = async (e, n, r, i) => {
-		let s = o(t.prepared, n), c = a(t.prepared, n);
-		await t.emit({
-			inputs: i,
-			jobId: r,
-			nodeId: e,
-			nodeKind: s,
-			...c == null ? {} : { nodeTitle: c },
-			runId: u,
+		for (let t of l(D, e, r)) B(t, i);
+		for (let t of l(O, e, r)) N.set(t, i), await x?.(t, i);
+	}, H = async (t, r, i, a) => {
+		let c = s(n.prepared, r), l = o(n.prepared, r);
+		await n.emit({
+			inputs: a,
+			jobId: i,
+			nodeId: t,
+			nodeKind: c,
+			...l == null ? {} : { nodeTitle: l },
+			runId: d,
 			type: "node.started"
 		});
-		let l = n.timeoutMs == null ? void 0 : new AbortController(), p = l == null ? void 0 : setTimeout(() => l.abort(/* @__PURE__ */ Error(`Node "${e}" timed out.`)), n.timeoutMs), g = l == null ? F : AbortSignal.any([F, l.signal]);
+		let u = r.timeoutMs == null ? void 0 : new AbortController(), m = u == null ? void 0 : setTimeout(() => u.abort(/* @__PURE__ */ Error(`Node "${t}" timed out.`)), r.timeoutMs), _ = u == null ? I : AbortSignal.any([I, u.signal]);
 		try {
-			let a;
-			switch (n.kind) {
+			let o;
+			switch (r.kind) {
 				case "condition": {
-					let t = n.cases.find((e) => {
+					let e = r.cases.find((e) => {
 						if (e.expressions.length == 0) return !1;
-						let t = e.expressions.map((e) => d(n, e, i));
+						let t = e.expressions.map((e) => f(r, e, a));
 						return e.relation == "all" ? t.every(Boolean) : t.some(Boolean);
-					})?.output ?? n.defaultOutput;
-					a = t == null ? {} : { [t]: i[n.input.handle] ?? null }, t != null && await B(e, r, t, a[t]);
+					})?.output ?? r.defaultOutput;
+					o = e == null ? {} : { [e]: a[r.input.handle] ?? null }, e != null && await V(t, i, e, o[e]);
 					break;
 				}
 				case "value":
-					a = Object.fromEntries(Object.entries(n.values).map(([e, t]) => [e, t.value ?? null]));
-					for (let [t, n] of Object.entries(a)) await B(e, r, t, n);
+					o = Object.fromEntries(r.values.map((e) => [e.handle, e.value ?? null]));
+					for (let [e, n] of Object.entries(o)) await V(t, i, e, n);
 					break;
 				case "subflow": {
-					let o = t.prepared.subflows[n.subflowId];
-					a = await m(h(t, {
-						flowId: n.subflowId,
-						graph: _(o.graph),
-						inputs: o.inputs,
+					let s = n.prepared.subflows[r.subflowId];
+					o = await h(g(n, {
+						flowId: r.subflowId,
+						graph: v(s.graph),
+						inputs: e(s.inputs),
 						kind: "subflow",
-						outputs: o.outputs
-					}, t.createId(), i, g, {
-						jobId: r,
-						runId: u
-					}, {}, (t, n) => B(e, r, t, n)), g);
+						outputs: e(s.outputs)
+					}, n.createId(), a, _, {
+						jobId: i,
+						runId: d
+					}, {}, (e, n) => V(t, i, e, n)), _);
 					break;
 				}
 				case "task":
-					a = f(await m(t.invokeTask({
-						input: i,
-						invocationId: t.createId(),
-						jobId: r,
-						nodeId: e,
-						runId: u,
-						signal: g,
-						...n.task == null ? { taskId: n.taskId } : {
-							capabilities: n.task.capabilities ?? [],
-							moduleId: n.task.moduleId
+					o = p(await h(n.invokeTask({
+						input: a,
+						invocationId: n.createId(),
+						jobId: i,
+						nodeId: t,
+						runId: d,
+						signal: _,
+						...r.task == null ? { taskId: r.taskId } : {
+							capabilities: r.task.capabilities ?? [],
+							moduleId: r.task.moduleId
 						}
-					}), g), e);
-					for (let [t, n] of Object.entries(a)) await B(e, r, t, n);
+					}), _), t);
+					for (let [e, n] of Object.entries(o)) await V(t, i, e, n);
 			}
-			return await t.emit({
-				jobId: r,
-				nodeId: e,
-				runId: u,
+			return await n.emit({
+				jobId: i,
+				nodeId: t,
+				runId: d,
 				type: "node.completed"
-			}), a;
+			}), o;
 		} finally {
-			p != null && clearTimeout(p);
+			m != null && clearTimeout(m);
 		}
-	}, H = (r) => {
-		let i = n.graph.nodes[r], a = w.get(r).take(), o = t.createId(), s = j.get(r) ?? 0;
-		j.set(r, s + 1), O.set(r, (O.get(r) ?? 0) + 1);
+	}, U = (e) => {
+		let i = r.graph.nodes[e], a = T.get(e).take(), o = n.createId(), s = M.get(e) ?? 0;
+		M.set(e, s + 1), k.set(e, (k.get(e) ?? 0) + 1);
 		let c = Promise.resolve();
-		c = V(r, i, o, a).then(async (e) => {
-			let n = A.get(r) ?? [];
-			n.push({
+		c = H(e, i, o, a).then(async (t) => {
+			let r = j.get(e) ?? [];
+			r.push({
 				jobId: o,
 				order: s,
-				outputs: e
-			}), A.set(r, n), N.has(r) || (N.add(r), await t.emit({
-				...v == null ? {} : {
-					parentJobId: v.jobId,
-					parentRunId: v.runId
+				outputs: t
+			}), j.set(e, r), P.has(e) || (P.add(e), await n.emit({
+				...y == null ? {} : {
+					parentJobId: y.jobId,
+					parentRunId: y.runId
 				},
-				progress: N.size / C * 100,
-				runId: u,
+				progress: P.size / w * 100,
+				runId: d,
 				type: "run.progress"
 			}));
-		}).catch(async (n) => {
-			L || (L = !0, I = n, P.abort(n));
-			let i = e(n, t.projectFailure);
-			await t.emit({
+		}).catch(async (r) => {
+			R || (R = !0, L = r, F.abort(r));
+			let i = t(r, n.projectFailure);
+			await n.emit({
 				...i,
 				jobId: o,
-				nodeId: r,
-				runId: u,
+				nodeId: e,
+				runId: d,
 				type: "node.failed"
 			}).catch(() => void 0);
 		}).finally(() => {
-			k.delete(c), O.set(r, (O.get(r) ?? 1) - 1), R(r);
-		}), k.add(c);
+			A.delete(c), k.set(e, (k.get(e) ?? 1) - 1), z(e);
+		}), A.add(c);
 	};
-	R = (e) => {
-		if (P.signal.aborted) return;
-		let t = n.graph.nodes[e], r = w.get(e);
-		for (; r.ready && (O.get(e) ?? 0) < t.concurrency;) H(e);
+	z = (e) => {
+		if (F.signal.aborted) return;
+		let t = r.graph.nodes[e], n = T.get(e);
+		for (; n.ready && (k.get(e) ?? 0) < t.concurrency;) U(e);
 	};
-	for (let [e, t] of Object.entries(y)) {
-		let n = w.get(e);
+	for (let [e, t] of Object.entries(b)) {
+		let n = T.get(e);
 		if (n != null) for (let [e, r] of Object.entries(t)) n.launch(e, r);
 	}
-	for (let [e, t] of Object.entries(n.inputs)) {
-		let r = Object.hasOwn(p, e) ? p[e] : t.value;
-		if (r !== void 0) {
-			for (let t of Object.entries(n.outputs)) t[1].sources.some((t) => t.kind == "flow" && t.input == e) && (M.set(t[0], r), await b?.(t[0], r));
-			for (let t of T.get(e) ?? []) z(t, r);
+	for (let [e, t] of Object.entries(r.inputs)) {
+		let n = Object.hasOwn(m, e) ? m[e] : t.value;
+		if (n !== void 0) {
+			for (let t of Object.entries(r.outputs)) t[1].sources.some((t) => t.kind == "flow" && t.input == e) && (N.set(t[0], n), await x?.(t[0], n));
+			for (let t of E.get(e) ?? []) B(t, n);
 		}
 	}
-	if (x != null) for (let e of c(E, x.nodeId, "payload")) z(e, x.payload);
-	for (let e of S) R(e);
-	for (; k.size > 0;) await Promise.race(k);
-	if (L) throw await t.emit({
-		message: I instanceof Error ? I.message : String(I),
-		runId: u,
+	if (S != null) for (let e of l(D, S.nodeId, "payload")) B(e, S.payload);
+	for (let e of C) z(e);
+	for (; A.size > 0;) await Promise.race(A);
+	if (R) throw await n.emit({
+		message: L instanceof Error ? L.message : String(L),
+		runId: d,
 		type: "run.failed"
-	}).catch(() => void 0), I;
-	if (F.throwIfAborted(), n.kind == "subflow") {
-		let e = Object.fromEntries(M);
-		return await t.emit({
+	}).catch(() => void 0), L;
+	if (I.throwIfAborted(), r.kind == "subflow") {
+		let e = Object.fromEntries(N);
+		return await n.emit({
 			result: {
 				kind: "function-outputs",
 				outputs: e,
 				target: "subflow"
 			},
-			runId: u,
+			runId: d,
 			type: "run.completed"
 		}), e;
 	}
-	let U = new Set(Object.values(n.graph.nodes).flatMap((e) => Object.values(e.inputs).flatMap((e) => e.kind == "sources" ? e.sources.filter((e) => e.kind == "node").map((e) => e.nodeId) : []))), W = {
+	let W = new Set(Object.values(r.graph.nodes).flatMap((e) => Object.values(e.inputs).flatMap((e) => e.kind == "sources" ? e.sources.filter((e) => e.kind == "node").map((e) => e.nodeId) : []))), G = {
 		kind: "node-results",
-		nodes: S.filter((e) => !U.has(e)).map((e) => ({
-			jobs: (A.get(e) ?? []).toSorted((e, t) => e.order - t.order).map(({ jobId: e, outputs: t }) => ({
+		nodes: C.filter((e) => !W.has(e)).map((e) => ({
+			jobs: (j.get(e) ?? []).toSorted((e, t) => e.order - t.order).map(({ jobId: e, outputs: t }) => ({
 				jobId: e,
 				outputs: t
 			})),
 			nodeId: e
 		}))
 	};
-	return await t.emit({
-		result: W,
-		runId: u,
+	return await n.emit({
+		result: G,
+		runId: d,
 		type: "run.completed"
-	}), W;
+	}), G;
 }
-async function g(e, t) {
+async function _(e, t) {
 	let n = async (e) => await t.emit?.(e), r = t.signal ?? new AbortController().signal, i = t.trigger == null ? void 0 : e.graph.nodes[t.trigger.nodeId];
 	if (t.trigger != null && (i == null || "inputs" in i)) throw Error(`Node "${t.trigger.nodeId}" is not a TriggerNode in Flow "${t.flowId}".`);
-	return await h({
+	return await g({
 		createId: t.createId,
 		emit: n,
 		invokeTask: t.invokeTask,
@@ -366,14 +371,14 @@ async function g(e, t) {
 		projectFailure: t.projectFailure
 	}, {
 		flowId: t.flowId,
-		graph: _(e.graph),
+		graph: v(e.graph),
 		inputs: {},
 		kind: "flow",
 		outputs: {}
 	}, t.runId, {}, r, void 0, t.inputs, void 0, t.trigger);
 }
-function _(e) {
+function v(e) {
 	return { nodes: Object.fromEntries(Object.entries(e.nodes).filter((e) => "inputs" in e[1])) };
 }
 //#endregion
-export { g as runFlow };
+export { _ as runFlow };

package/package.json

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