@dashfoo/core 0.5.1 → 0.5.2

package/dist/index.js

@@ -95,11 +95,11 @@ const globalAttributesSchema = z.object({
 });
 const dashfooSchema = z.object({
 	activeTabsetId: z.string().optional(),
+	floats: z.array(floatNodeSchema).optional(),
 	global: globalAttributesSchema,
 	layout: rowNodeSchema,
 	maximizedTabsetId: z.string().optional(),
-	version: z.literal(1),
-	floats: z.array(floatNodeSchema).optional()
+	version: z.literal(1)
 });
 
 //#endregion
@@ -138,6 +138,7 @@ const dockLocationSchema = z.enum([
 	"split-right",
 	"split-top"
 ]);
+const splitWeightsSchema = z.array(z.number());
 const actionSchema = z.discriminatedUnion("type", [
 	z.object({
 		index: z.number().int().optional(),
@@ -189,7 +190,7 @@ const actionSchema = z.discriminatedUnion("type", [
 	z.object({
 		rowId: z.string(),
 		type: z.literal("adjustSplit"),
-		weights: z.array(z.number())
+		weights: splitWeightsSchema
 	}),
 	z.object({
 		attrs: mutableNodeAttrsSchema,
@@ -244,9 +245,52 @@ const createTabId = () => createNodeId("tab");
 //#region src/model/tree.ts
 const collectRoots = (model) => [model.layout, ...(model.floats ?? []).map((float) => float.layout)];
 const findFloat = (model, floatId) => (model.floats ?? []).find((float) => float.id === floatId);
+/**
+* Depth-first pre-order over one root: the row itself, then each child in
+* order, descending into nested rows and into a tabset's tabs. Returning a
+* defined value from `visit` stops the walk and becomes the result, so one
+* traversal serves both find-first and collect-all.
+*
+* Every query below used to carry its own copy of this recursion, and they had
+* drifted in child order: some scanned a row's own tabsets before descending,
+* others interleaved. With unique ids all orders agree, so they now share this
+* one; a model with duplicate ids (which the builder and the parser both warn
+* about) can see a different duplicate win than it did before.
+*/
+const walk = (row, visit, parent, index = -1) => {
+	const atRoot = visit({
+		index,
+		node: row,
+		parent
+	});
+	if (atRoot !== void 0) return atRoot;
+	for (const [childIndex, child] of row.children.entries()) {
+		if (child.type === "row") {
+			const inRow = walk(child, visit, row, childIndex);
+			if (inRow !== void 0) return inRow;
+			continue;
+		}
+		const atTabset = visit({
+			index: childIndex,
+			node: child,
+			parent: row
+		});
+		if (atTabset !== void 0) return atTabset;
+		for (const [tabIndex, tab] of child.children.entries()) {
+			const atTab = visit({
+				index: tabIndex,
+				node: tab,
+				parent: child
+			});
+			if (atTab !== void 0) return atTab;
+		}
+	}
+};
+const locate = (row, id) => walk(row, (found) => found.node.id === id ? found : void 0);
 const collectTabsetsInRow = (row, acc) => {
-	for (const child of row.children) if (child.type === "tabset") acc.push(child);
-	else collectTabsetsInRow(child, acc);
+	walk(row, ({ node }) => {
+		if (node.type === "tabset") acc.push(node);
+	});
 };
 const collectTabsets = (model) => {
 	const acc = [];
@@ -258,7 +302,7 @@ const findTabset = (model, tabsetId) => collectTabsets(model).find((tabset) => t
 const findTabInContainer = (container, tabId) => {
 	const index = container.children.findIndex((tab) => tab.id === tabId);
 	if (index === -1) return;
-	const tab = container.children[index];
+	const tab = container.children.at(index);
 	if (!tab) return;
 	return {
 		container,
@@ -273,25 +317,10 @@ const findTab = (model, tabId) => {
 	}
 };
 const findRow = (row, id) => {
-	if (row.id === id) return row;
-	for (const child of row.children) if (child.type === "row") {
-		const found = findRow(child, id);
-		if (found) return found;
-	}
-};
-const findAttributedNodeInRow = (row, id) => {
-	if (row.id === id) return row;
-	for (const child of row.children) {
-		if (child.type === "row") {
-			const found = findAttributedNodeInRow(child, id);
-			if (found) return found;
-			continue;
-		}
-		if (child.id === id) return child;
-		const tab = child.children.find((candidate) => candidate.id === id);
-		if (tab) return tab;
-	}
+	const found = locate(row, id)?.node;
+	return found?.type === "row" ? found : void 0;
 };
+const findAttributedNodeInRow = (row, id) => locate(row, id)?.node;
 const findAttributedNode = (model, id) => {
 	for (const root of collectRoots(model)) {
 		const found = findAttributedNodeInRow(root, id);
@@ -302,23 +331,16 @@ const findRootContaining = (model, nodeId) => {
 	for (const root of collectRoots(model)) if (findAttributedNodeInRow(root, nodeId)) return root;
 };
 const findTabsetParent = (row, tabsetId) => {
-	const index = row.children.findIndex((child) => child.type === "tabset" && child.id === tabsetId);
-	if (index !== -1) return {
-		index,
-		parent: row
-	};
-	for (const child of row.children) if (child.type === "row") {
-		const found = findTabsetParent(child, tabsetId);
-		if (found) return found;
-	}
+	const found = locate(row, tabsetId);
+	return found?.node.type === "tabset" && found.parent?.type === "row" ? {
+		index: found.index,
+		parent: found.parent
+	} : void 0;
 };
 const collectIdsInRow = (row, acc) => {
-	acc.push(row.id);
-	for (const child of row.children) if (child.type === "row") collectIdsInRow(child, acc);
-	else {
-		acc.push(child.id);
-		for (const tab of child.children) acc.push(tab.id);
-	}
+	walk(row, ({ node }) => {
+		acc.push(node.id);
+	});
 };
 const findDuplicateIds = (model) => {
 	const ids = [];
@@ -385,7 +407,7 @@ const model = (layout, options = {}) => {
 		global: options.global ?? {}
 	};
 	const duplicates = findDuplicateIds(built);
-	if (duplicates.length > 0) console.warn(`[dashfoo] builder produced duplicate node ids: ${duplicates.join(", ")} — pass explicit ids when reusing a component`);
+	if (duplicates.length > 0) console.warn(`[dashfoo] builder produced duplicate node ids: ${duplicates.join(", ")}. Pass explicit ids when reusing a component`);
 	return built;
 };
 
@@ -541,6 +563,7 @@ const zoneRect = (rect, location) => {
 			x: rect.x,
 			y: rect.y
 		};
+		case "center": return rect;
 		default: return rect;
 	}
 };
@@ -617,6 +640,27 @@ const normalizeTabset = (tabset) => ({
 	...tabset,
 	selected: clampSelected(tabset.children.length, tabset.selected)
 });
+/**
+* A row that collapses to a single child hands its slot in the parent to
+* that child, so the slot's sizing constraints have to travel with it.
+* Dropping them silently widens a pinned sidebar, and `normalize` runs on
+* load and on every persist, so the loss is permanent.
+*
+* `snap` only exists on rows, so it is carried only to a row survivor.
+*/
+const inheritSlot = (row, survivor) => {
+	const sized = {
+		...survivor,
+		...row.weight === void 0 ? {} : { weight: row.weight },
+		...row.min === void 0 ? {} : { min: row.min },
+		...row.max === void 0 ? {} : { max: row.max }
+	};
+	if (sized.type === "row" && row.snap !== void 0) return {
+		...sized,
+		snap: row.snap
+	};
+	return sized;
+};
 const normalizeRowChildren = (children) => {
 	const out = [];
 	for (const child of children) {
@@ -628,10 +672,7 @@ const normalizeRowChildren = (children) => {
 		if (grandchildren.length === 0) continue;
 		if (grandchildren.length === 1) {
 			const only = grandchildren[0];
-			if (only !== void 0) out.push(child.weight === void 0 ? only : {
-				...only,
-				weight: child.weight
-			});
+			if (only !== void 0) out.push(inheritSlot(child, only));
 			continue;
 		}
 		out.push({
@@ -686,26 +727,13 @@ const normalize = (model) => {
 
 //#endregion
 //#region src/state/surgery.ts
-const removeTabset = (row, tabsetId) => {
-	const index = row.children.findIndex((child) => child.type === "tabset" && child.id === tabsetId);
-	if (index !== -1) {
-		row.children.splice(index, 1);
-		return true;
-	}
-	for (const child of row.children) if (child.type === "row" && removeTabset(child, tabsetId)) return true;
-	return false;
-};
 const removeTabsetReturning = (row, tabsetId) => {
-	const index = row.children.findIndex((child) => child.type === "tabset" && child.id === tabsetId);
-	if (index !== -1) {
-		const [removed] = row.children.splice(index, 1);
-		return removed?.type === "tabset" ? removed : void 0;
-	}
-	for (const child of row.children) if (child.type === "row") {
-		const found = removeTabsetReturning(child, tabsetId);
-		if (found) return found;
-	}
+	const found = findTabsetParent(row, tabsetId);
+	if (!found) return;
+	const [removed] = found.parent.children.splice(found.index, 1);
+	return removed?.type === "tabset" ? removed : void 0;
 };
+const removeTabset = (row, tabsetId) => removeTabsetReturning(row, tabsetId) !== void 0;
 const splitOrientation = (location) => location === "split-left" || location === "split-right" ? "row" : "column";
 const splitsBefore = (location) => location === "split-left" || location === "split-top";
 const placeBesideTarget = (draft, placed, targetId, location) => {
@@ -744,17 +772,19 @@ const insertTab = (draft, tab, target) => {
 		targetTabset.selected = at;
 		return;
 	}
-	placeBesideTarget(draft, {
+	const newTabset = {
 		children: [tab],
 		id: createNodeId("tabset"),
 		selected: 0,
 		type: "tabset",
 		weight: 50
-	}, targetId, location);
+	};
+	placeBesideTarget(draft, newTabset, targetId, location);
 };
-const tabsetsInRow = (row, acc) => {
-	for (const child of row.children) if (child.type === "tabset") acc.push(child);
-	else tabsetsInRow(child, acc);
+const mergeTabsInto = (target, tabs, selectedOffset) => {
+	const mergeStart = target.children.length;
+	target.children.push(...tabs);
+	target.selected = mergeStart + selectedOffset;
 };
 const wrapTabInLayout = (tab) => ({
 	children: [{
@@ -799,8 +829,8 @@ const pushFloat = (draft, layout, geometry, floatId) => {
 	};
 	draft.floats = [...draft.floats ?? [], float];
 	const tabsets = [];
-	tabsetsInRow(layout, tabsets);
-	const first = tabsets[0];
+	collectTabsetsInRow(layout, tabsets);
+	const first = tabsets.at(0);
 	if (first) draft.activeTabsetId = first.id;
 };
 const floatTabsetById = (draft, tabsetId, geometry, floatId) => {
@@ -811,8 +841,8 @@ const floatTabsetById = (draft, tabsetId, geometry, floatId) => {
 };
 const resolveMainTarget = (draft, targetId) => {
 	const mainTabsets = [];
-	tabsetsInRow(draft.layout, mainTabsets);
-	if (targetId) {
+	collectTabsetsInRow(draft.layout, mainTabsets);
+	if (targetId !== void 0) {
 		const explicit = mainTabsets.find((tabset) => tabset.id === targetId);
 		if (explicit) return explicit;
 	}
@@ -826,15 +856,15 @@ const dockFloat = (draft, floatId, targetId, location) => {
 	const floats = draft.floats ?? [];
 	const index = floats.findIndex((float) => float.id === floatId);
 	if (index === -1) return;
-	const [float] = floats.splice(index, 1);
+	const float = floats.splice(index, 1).at(0);
 	draft.floats = floats;
 	if (!float) return;
 	const tabsets = [];
-	tabsetsInRow(float.layout, tabsets);
+	collectTabsetsInRow(float.layout, tabsets);
 	const tabs = tabsets.flatMap((tabset) => tabset.children);
 	if (tabs.length === 0) return;
-	const leadTabset = tabsets[0];
-	const selectedOffset = leadTabset ? Math.min(Math.max(leadTabset.selected, 0), leadTabset.children.length - 1) : 0;
+	const leadTabset = tabsets.at(0);
+	const selectedOffset = leadTabset ? clampSelected(leadTabset.children.length, leadTabset.selected) : 0;
 	const target = resolveMainTarget(draft, targetId);
 	if (!target) {
 		draft.layout = float.layout;
@@ -842,9 +872,7 @@ const dockFloat = (draft, floatId, targetId, location) => {
 		return;
 	}
 	if (location === "center") {
-		const mergeStart = target.children.length;
-		target.children.push(...tabs);
-		target.selected = mergeStart + selectedOffset;
+		mergeTabsInto(target, tabs, selectedOffset);
 		draft.activeTabsetId = target.id;
 		return;
 	}
@@ -877,7 +905,7 @@ const applyAction = (draft, action) => {
 			const row = findRow(findRootContaining(draft, action.rowId) ?? draft.layout, action.rowId);
 			if (!row) return;
 			for (let index = 0; index < action.weights.length; index++) {
-				const child = row.children[index];
+				const child = row.children.at(index);
 				const weight = action.weights[index];
 				if (!child || weight === void 0) continue;
 				child.weight = weight;
@@ -900,7 +928,7 @@ const applyAction = (draft, action) => {
 		case "floatTab": {
 			const location = findTab(draft, action.tabId);
 			if (!location) return;
-			const [removed] = location.container.children.splice(location.index, 1);
+			const removed = location.container.children.splice(location.index, 1).at(0);
 			if (removed) pushFloat(draft, wrapTabInLayout(removed), action.geometry, action.floatId);
 			return;
 		}
@@ -915,7 +943,7 @@ const applyAction = (draft, action) => {
 		case "moveNode": {
 			const source = findTab(draft, action.sourceId);
 			if (!source) return;
-			const [removed] = source.container.children.splice(source.index, 1);
+			const removed = source.container.children.splice(source.index, 1).at(0);
 			if (!removed) return;
 			insertTab(draft, removed, {
 				id: action.targetId,
@@ -931,10 +959,7 @@ const applyAction = (draft, action) => {
 			if (action.location === "center") {
 				const target = findTabset(draft, action.targetId);
 				if (target) {
-					const mergeStart = target.children.length;
-					const sourceSelected = Math.min(Math.max(source.selected, 0), source.children.length - 1);
-					target.children.push(...source.children);
-					target.selected = mergeStart + sourceSelected;
+					mergeTabsInto(target, source.children, clampSelected(source.children.length, source.selected));
 					const sourceRoot = findRootContaining(draft, action.sourceId);
 					if (sourceRoot) removeTabset(sourceRoot, action.sourceId);
 				}