@loadmap/cli 0.11.0 → 0.13.0

package/dist/bin.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { n as main } from "./src-0Gq92LO7.js";
+import { n as main } from "./src-uR5aJH2I.js";
 // src/bin.ts
 main(process.argv.slice(2)).then((code) => process.exit(code), (err) => {
 	console.error(err instanceof Error ? err.message : err);

package/dist/index.js

@@ -1 +1 @@
-export { t as USAGE, o as check, a as fmt, s as github, n as main, r as parseRecord, i as record } from "./src-0Gq92LO7.js";
+export { t as USAGE, o as check, a as fmt, s as github, n as main, r as parseRecord, i as record } from "./src-uR5aJH2I.js";

package/dist/{src-0Gq92LO7.js → src-uR5aJH2I.js}

@@ -588,6 +588,21 @@ function defineModel(def) {
 			firstLimit: first
 		};
 	};
+	const resolveStages = (ctx, shed) => {
+		const stages = {};
+		for (const s of stageIds) {
+			const st = resolveStage(s, def.stages[s], ctx, flowIds, thresholds.full);
+			stages[s] = st.kind === "pass" || st.kind === "limit" || st.kind === "cache" ? {
+				...st,
+				shed: shed(s)
+			} : st;
+		}
+		for (const st of Object.values(stages)) if (st.kind === "fanout") for (const b of Object.values(st.to).flat()) {
+			const to = stages[b.stage];
+			if (!to || to.kind === "queue" || to.kind === "workers" || to.kind === "fanout") throw new Error(`loadmap: fan-out "${st.id}" branches to "${b.stage}", which is not a sink, store or pass stage`);
+		}
+		return stages;
+	};
 	const evaluate = (partial) => {
 		const values = {
 			...defaults(),
@@ -632,18 +647,7 @@ function defineModel(def) {
 		const full = edges("fullRange");
 		const flows = {};
 		for (const f of flowIds) flows[f] = ctx.flows[f];
-		const stages = {};
-		for (const s of stageIds) {
-			const st = resolveStage(s, def.stages[s], ctx, flowIds, thresholds.full);
-			stages[s] = st.kind === "pass" || st.kind === "limit" || st.kind === "cache" ? {
-				...st,
-				shed: shed(s)
-			} : st;
-		}
-		for (const st of Object.values(stages)) if (st.kind === "fanout") for (const b of Object.values(st.to).flat()) {
-			const to = stages[b.stage];
-			if (!to || to.kind === "queue" || to.kind === "workers" || to.kind === "fanout") throw new Error(`loadmap: fan-out "${st.id}" branches to "${b.stage}", which is not a sink, store or pass stage`);
-		}
+		const stages = resolveStages(ctx, shed);
 		const overload = {};
 		for (const f of flowIds) overload[f] = overloadOf(f);
 		const at = {};
@@ -710,6 +714,18 @@ function defineModel(def) {
 			return d ? isEnabled(d, values) : false;
 		},
 		evaluate,
+		stagesAt: (partial) => {
+			const values = {
+				...defaults(),
+				...partial
+			};
+			const { ctx, shed } = context(def, values);
+			return {
+				values,
+				ctx,
+				stages: resolveStages(ctx, shed)
+			};
+		},
 		utilization: (partial, bound) => {
 			const util = context(def, {
 				...defaults(),
@@ -1260,6 +1276,8 @@ function defineView(model, def) {
 	const nodes = def.nodes;
 	for (const e of def.edges) for (const end of [e.from, e.to]) if (!(end in nodes)) throw new Error(`loadmap: edge to unknown node "${end}"`);
 	for (const [f, fv] of Object.entries(def.flows)) if (!(fv.from in nodes)) throw new Error(`loadmap: flow "${f}" starts at unknown node "${fv.from}"`);
+	const tiers = def.tiers ?? {};
+	for (const [id, n] of Object.entries(nodes)) if (n.tier != null && !Object.hasOwn(tiers, n.tier)) throw new Error(`loadmap: node "${id}" stands in unknown tier "${n.tier}"`);
 	const shows = (n, s) => Array.isArray(n.stage) ? n.stage.includes(s) : n.stage === s;
 	for (const s of model.stageIds) if (!Object.values(nodes).some((n) => shows(n, s))) throw new Error(`loadmap: no node shows stage "${s}"`);
 	return {
@@ -1486,6 +1504,11 @@ const SUB = {
 	scope: "ctx",
 	doc: "The second line of the box."
 };
+const TIER = {
+	value: "tier",
+	scope: "const",
+	doc: "The tier the box stands in; without one, that of the boxes that feed it."
+};
 const OVERLOAD_WHEN = {
 	value: "boolean",
 	scope: "ctx",
@@ -1579,6 +1602,7 @@ const SCHEMA = {
 			"node",
 			"cluster",
 			"pool",
+			"tier",
 			"thresholds"
 		],
 		edges: "edges"
@@ -2021,6 +2045,20 @@ const SCHEMA = {
 		props: COMPONENT_PROPS,
 		children: []
 	},
+	tier: {
+		doc: "A band across the flow (edge, app, data) drawn behind its boxes. Tiers run in the order they are declared.",
+		example: "tier data \"Data\"",
+		args: [{
+			name: "id",
+			kind: "id"
+		}, {
+			name: "label",
+			kind: "text",
+			optional: true
+		}],
+		props: {},
+		children: []
+	},
 	node: {
 		doc: "A box. It may run a stage (pass, store, sink, fanout) and own a component (demand and capacity lines).",
 		example: "node gateway \"API gateway\" { pass; demand: flows.orders; capacity: estimated(20000, \"req/s\") }",
@@ -2033,6 +2071,7 @@ const SCHEMA = {
 				values: ["box", "cylinder"],
 				doc: "box (the default) or cylinder."
 			},
+			tier: TIER,
 			...COMPONENT_PROPS
 		},
 		children: [
@@ -2063,6 +2102,7 @@ const SCHEMA = {
 				scope: "i",
 				doc: "Each member's label, from its index i: `broker ${i}`."
 			},
+			tier: TIER,
 			...COMPONENT_PROPS
 		},
 		children: ["queue", "component"]
@@ -2078,6 +2118,7 @@ const SCHEMA = {
 				scope: "i",
 				doc: "Each pod's label, from its index i: `pod ${i}`."
 			},
+			tier: TIER,
 			...COMPONENT_PROPS
 		},
 		children: ["workers", "component"]
@@ -3771,10 +3812,30 @@ var Compiler = class {
 		}
 		const searchMax = this.constProp(root, "searchMax");
 		if (searchMax != null) model.searchMax = searchMax;
+		const tiers = {};
+		const tierNames = /* @__PURE__ */ new Map();
+		for (const b of byKind("tier")) {
+			if (!b.args.id) continue;
+			this.declare("tier", b.args.id.name, b.args.id, b, tierNames);
+			tiers[b.args.id.name] = { label: this.text(b.args.label) ?? b.args.id.name };
+		}
 		const nodes = {};
-		for (const box of boxes) nodes[box.id] = this.node(box);
+		for (const box of boxes) {
+			nodes[box.id] = this.node(box);
+			const tier = this.named(box.block, "tier", [...tierNames.keys()], "tier");
+			if (tier) nodes[box.id].tier = tier;
+		}
 		const edges = [];
 		for (const e of root.edges) edges.push(...this.edges(e, boxById));
+		const tierOf = (id) => {
+			const t = nodes[id]?.tier;
+			return t == null ? void 0 : Object.keys(tiers).indexOf(t);
+		};
+		for (const e of root.edges) e.chain.forEach((to, i) => {
+			const from = e.chain[i - 1];
+			const [a, b] = from ? [tierOf(from.name), tierOf(to.name)] : [];
+			if (from && a != null && b != null && a > b) this.report.warning(to, `${from.name} -> ${to.name} runs back from the tier "${nodes[from.name].tier}" to "${nodes[to.name].tier}"`);
+		});
 		if (!flows.length) this.report.error({
 			from: 0,
 			to: 0
@@ -3796,11 +3857,13 @@ var Compiler = class {
 			if (typeof v === "string") options.assumptions.push(v);
 		}
 		if (this.report.failed) return void 0;
-		return this.build(model, {
+		const view = {
 			nodes,
 			edges,
-			flows: flowViews
-		}, options, byKind("preset"), byKind("scenario"));
+			flows: flowViews,
+			...Object.keys(tiers).length ? { tiers } : {}
+		};
+		return this.build(model, view, options, byKind("preset"), byKind("scenario"));
 	}
 	/** Hands the parts to core and layout, then runs the model once per preset and scenario so formula errors show now. */
 	build(modelDef, viewDef, options, presets, scenarios) {