@segnavia/format 0.12.0 → 0.14.0

package/dist/board-edit.d.ts

@@ -0,0 +1,11 @@
+import { Board, BoardItem } from "./board.js";
+import { Point } from "./deck.js";
+//#region src/board-edit.d.ts
+export declare const MIN_BOARD_ITEM_WIDTH = 16;
+export type BoardItemAnchor = 'top-left' | 'top-right' | 'bottom-left' | 'bottom-right';
+export declare function moveItems(board: Board, ids: readonly string[], delta: Point): Board;
+export declare function moveSection(board: Board, sectionId: string, delta: Point): Board;
+export declare function resizeItem(board: Board, id: string, width: number, anchor: BoardItemAnchor, heightAt: (width: number) => number): Board;
+export declare function removeItems(board: Board, ids: readonly string[]): Board;
+export declare function addItem(board: Board, item: BoardItem): Board;
+//#endregion

package/dist/board-edit.js

@@ -0,0 +1,66 @@
+import { Board } from "./board.js";
+//#region src/board-edit.ts
+const MIN_BOARD_ITEM_WIDTH = 16;
+function moveItems(board, ids, delta) {
+	const moved = new Set(ids);
+	return {
+		...board,
+		items: board.items.map((item) => moved.has(item.id) ? {
+			...item,
+			x: item.x + delta.x,
+			y: item.y + delta.y
+		} : item)
+	};
+}
+function moveSection(board, sectionId, delta) {
+	const section = board.sections.find((entry) => entry.id === sectionId);
+	if (!section) return board;
+	const moved = moveItems(board, section.items, delta);
+	return {
+		...moved,
+		sections: moved.sections.map((entry) => entry.id === sectionId ? {
+			...entry,
+			rectangle: {
+				...entry.rectangle,
+				x: entry.rectangle.x + delta.x,
+				y: entry.rectangle.y + delta.y
+			}
+		} : entry)
+	};
+}
+function resizeItem(board, id, width, anchor, heightAt) {
+	const nextWidth = Math.max(16, width);
+	return {
+		...board,
+		items: board.items.map((item) => {
+			if (item.id !== id) return item;
+			const oldHeight = heightAt(item.width);
+			const newHeight = heightAt(nextWidth);
+			return {
+				...item,
+				width: nextWidth,
+				x: anchor.endsWith("right") ? item.x + item.width - nextWidth : item.x,
+				y: anchor.startsWith("bottom") ? item.y + oldHeight - newHeight : item.y
+			};
+		})
+	};
+}
+function removeItems(board, ids) {
+	const removed = new Set(ids);
+	return {
+		...board,
+		items: board.items.filter((item) => !removed.has(item.id)),
+		sections: board.sections.map((section) => ({
+			...section,
+			items: section.items.filter((id) => !removed.has(id))
+		}))
+	};
+}
+function addItem(board, item) {
+	return Board.parse({
+		...board,
+		items: [...board.items, item]
+	});
+}
+//#endregion
+export { MIN_BOARD_ITEM_WIDTH, addItem, moveItems, moveSection, removeItems, resizeItem };

package/dist/board-sections.d.ts

@@ -0,0 +1,18 @@
+import { Board, BoardSection } from "./board.js";
+import { Point } from "./deck.js";
+import { BoardShapes } from "./board-geometry.js";
+//#region src/board-sections.d.ts
+export declare const SECTION_PADDING = 24;
+export declare const SECTION_TITLE_ROOM = 32;
+export declare const SECTION_MIN_SIZE: {
+  readonly width: 240;
+  readonly height: 160;
+};
+export declare const SECTION_GAP = 16;
+export declare const MAKE_ROOM_LIMIT = 50;
+export declare function fitSection(board: Board, shapes: BoardShapes, sectionId: string): Board;
+export declare function assignMembership(board: Board, shapes: BoardShapes, ids: readonly string[], point: Point, startingSections?: readonly BoardSection[]): Board;
+export declare function makeRoom(board: Board, shapes: BoardShapes, changed: readonly string[]): Board;
+export declare function fitTouchedSections(previous: Board, board: Board, shapes: BoardShapes, touched: readonly string[]): Board;
+export declare function settleBoard(previous: Board, board: Board, shapes: BoardShapes, touched: readonly string[]): Board;
+//#endregion

package/dist/board-sections.js

@@ -0,0 +1,210 @@
+import { moveItems, moveSection } from "./board-edit.js";
+import { itemHeight } from "./board-geometry.js";
+//#region src/board-sections.ts
+const SECTION_PADDING = 24;
+const SECTION_TITLE_ROOM = 32;
+const SECTION_MIN_SIZE = {
+	width: 240,
+	height: 160
+};
+const SECTION_GAP = 16;
+const MAKE_ROOM_LIMIT = 50;
+function itemRectangle(board, shapes, id) {
+	const item = board.items.find((entry) => entry.id === id);
+	if (!item) return void 0;
+	const shape = shapes.items[id];
+	if (!shape) throw new Error(`item "${id}" has no supplied shape; supply shapes.items["${id}"]`);
+	return {
+		x: item.x,
+		y: item.y,
+		width: item.width,
+		height: itemHeight(item, shape)
+	};
+}
+function fittedRectangle(board, shapes, sectionId, excluded = /* @__PURE__ */ new Set()) {
+	const section = board.sections.find((entry) => entry.id === sectionId);
+	if (!section) return void 0;
+	const members = section.items.filter((id) => !excluded.has(id)).map((id) => itemRectangle(board, shapes, id)).filter((rectangle) => rectangle !== void 0);
+	if (members.length === 0) return {
+		x: section.rectangle.x,
+		y: section.rectangle.y,
+		...SECTION_MIN_SIZE
+	};
+	const left = Math.min(...members.map((rectangle) => rectangle.x));
+	const top = Math.min(...members.map((rectangle) => rectangle.y));
+	const right = Math.max(...members.map((rectangle) => rectangle.x + rectangle.width));
+	const bottom = Math.max(...members.map((rectangle) => rectangle.y + rectangle.height));
+	return {
+		x: left - 24,
+		y: top - 24 - 32,
+		width: right - left + 48,
+		height: bottom - top + 48 + 32
+	};
+}
+function fitSection(board, shapes, sectionId) {
+	const rectangle = fittedRectangle(board, shapes, sectionId);
+	if (!rectangle) return board;
+	return {
+		...board,
+		sections: board.sections.map((section) => section.id === sectionId ? {
+			...section,
+			rectangle
+		} : section)
+	};
+}
+function contains(rectangle, point) {
+	return point.x >= rectangle.x && point.x <= rectangle.x + rectangle.width && point.y >= rectangle.y && point.y <= rectangle.y + rectangle.height;
+}
+function assignMembership(board, shapes, ids, point, startingSections = []) {
+	const moved = new Set(ids.filter((id) => board.items.some((item) => item.id === id)));
+	let target;
+	for (const section of board.sections) {
+		const rectangle = fittedRectangle(board, shapes, section.id, moved);
+		if (rectangle && contains(rectangle, point)) target = section.id;
+	}
+	const assignments = /* @__PURE__ */ new Map();
+	for (const id of moved) {
+		const starting = startingSections.find((section) => section.items.includes(id));
+		assignments.set(id, starting && contains(starting.rectangle, point) ? starting.id : target);
+	}
+	return {
+		...board,
+		sections: board.sections.map((section) => {
+			const items = section.items.filter((id) => !moved.has(id) || assignments.get(id) === section.id);
+			const existing = new Set(items);
+			const appended = ids.filter((id, index) => moved.has(id) && assignments.get(id) === section.id && !existing.has(id) && ids.indexOf(id) === index);
+			return {
+				...section,
+				items: [...items, ...appended]
+			};
+		})
+	};
+}
+function overlaps(a, b) {
+	return a.x < b.x + b.width && a.x + a.width > b.x && a.y < b.y + b.height && a.y + a.height > b.y;
+}
+function clearingDelta(anchor, neighbor) {
+	return [
+		{
+			x: anchor.x - 16 - (neighbor.x + neighbor.width),
+			y: 0
+		},
+		{
+			x: anchor.x + anchor.width + 16 - neighbor.x,
+			y: 0
+		},
+		{
+			x: 0,
+			y: anchor.y - 16 - (neighbor.y + neighbor.height)
+		},
+		{
+			x: 0,
+			y: anchor.y + anchor.height + 16 - neighbor.y
+		}
+	].reduce((best, candidate) => Math.abs(candidate.x) + Math.abs(candidate.y) < Math.abs(best.x) + Math.abs(best.y) ? candidate : best);
+}
+function entityRectangle(board, shapes, entity) {
+	if (entity.kind === "section") return board.sections.find((section) => section.id === entity.id)?.rectangle;
+	if (entity.kind === "item") return itemRectangle(board, shapes, entity.id);
+	const label = board.labels.find((entry) => entry.id === entity.id);
+	if (!label) return void 0;
+	const shape = shapes.labels[entity.id];
+	if (!shape) throw new Error(`label "${entity.id}" has no supplied shape; supply shapes.labels["${entity.id}"]`);
+	return {
+		x: label.x,
+		y: label.y,
+		...shape
+	};
+}
+function moveEntity(board, entity, delta) {
+	if (entity.kind === "item") return moveItems(board, [entity.id], delta);
+	if (entity.kind === "label") return {
+		...board,
+		labels: board.labels.map((label) => label.id === entity.id ? {
+			...label,
+			x: label.x + delta.x,
+			y: label.y + delta.y
+		} : label)
+	};
+	return moveSection(board, entity.id, delta);
+}
+function neighbors(board) {
+	return [
+		...board.sections.map((section) => ({
+			kind: "section",
+			id: section.id
+		})),
+		...board.items.map((item) => ({
+			kind: "item",
+			id: item.id
+		})),
+		...board.labels.map((label) => ({
+			kind: "label",
+			id: label.id
+		}))
+	];
+}
+function clearAround(board, shapes, anchor, context) {
+	const anchorRectangle = entityRectangle(board, shapes, anchor);
+	if (!anchorRectangle) return {
+		board,
+		moved: []
+	};
+	const anchorMembers = new Set(anchor.kind === "section" ? board.sections.find((section) => section.id === anchor.id)?.items : []);
+	let next = board;
+	const moved = [];
+	for (const neighbor of neighbors(board)) {
+		if (neighbor.kind === anchor.kind && neighbor.id === anchor.id) continue;
+		if (neighbor.kind === "section" && context.changedSections.has(neighbor.id)) continue;
+		if (neighbor.kind === "item" && (context.protectedItems.has(neighbor.id) || anchorMembers.has(neighbor.id))) continue;
+		const rectangle = entityRectangle(next, shapes, neighbor);
+		if (!rectangle || !overlaps(anchorRectangle, rectangle)) continue;
+		next = moveEntity(next, neighbor, clearingDelta(anchorRectangle, rectangle));
+		moved.push(neighbor);
+	}
+	return {
+		board: next,
+		moved
+	};
+}
+function makeRoom(board, shapes, changed) {
+	const changedSections = new Set(changed.filter((id) => board.sections.some((section) => section.id === id)));
+	const context = {
+		changedSections,
+		protectedItems: new Set(board.sections.filter((section) => changedSections.has(section.id)).flatMap((section) => section.items))
+	};
+	let next = board;
+	let frontier = [...changedSections].map((id) => ({
+		kind: "section",
+		id
+	}));
+	for (let pass = 0; pass < 50 && frontier.length > 0; pass += 1) {
+		const following = [];
+		for (const anchor of frontier) {
+			const cleared = clearAround(next, shapes, anchor, context);
+			next = cleared.board;
+			following.push(...cleared.moved);
+		}
+		frontier = following.length > 0 ? [...[...changedSections].map((id) => ({
+			kind: "section",
+			id
+		})), ...following] : [];
+	}
+	return next;
+}
+function touchedSections(previous, board, touched) {
+	const touchedIds = new Set(touched);
+	return [...previous.sections, ...board.sections].filter((section) => touchedIds.has(section.id) || section.items.some((id) => touchedIds.has(id))).map((section) => section.id).filter((id, index, ids) => ids.indexOf(id) === index);
+}
+function fitSections(board, shapes, sectionIds) {
+	return sectionIds.reduce((value, id) => fitSection(value, shapes, id), board);
+}
+function fitTouchedSections(previous, board, shapes, touched) {
+	return fitSections(board, shapes, touchedSections(previous, board, touched));
+}
+function settleBoard(previous, board, shapes, touched) {
+	const sectionIds = touchedSections(previous, board, touched);
+	return makeRoom(fitSections(board, shapes, sectionIds), shapes, sectionIds);
+}
+//#endregion
+export { MAKE_ROOM_LIMIT, SECTION_GAP, SECTION_MIN_SIZE, SECTION_PADDING, SECTION_TITLE_ROOM, assignMembership, fitSection, fitTouchedSections, makeRoom, settleBoard };

package/dist/index.d.ts

@@ -1,7 +1,9 @@
 import { Board, BoardInput, BoardItem, BoardLabel, BoardSection } from "./board.js";
 import { Annotation, Box, Cue, DECK_SIZE, Deck, DeckInput, DeckLimits, ImageFit, Manifest, Narration, Point, PublishedShot, SHOT_KEY, Shot, Size, Slide, SlideContent, Word, annotationCueIssues, exceedsLimits } from "./deck.js";
+import { BoardItemAnchor, MIN_BOARD_ITEM_WIDTH, addItem, moveItems, moveSection, removeItems, resizeItem } from "./board-edit.js";
 import { ArrangeOptions, BoardShapes, BoardView, MAX_BOARD_ZOOM, MIN_BOARD_ZOOM, ZoomBounds, arrange, boardBounds, boardToScreen, itemAt, itemHeight, revealView, screenToBoard, visibleItems, zoomAt, zoomToFit } from "./board-geometry.js";
 import { BoardListingGroup, boardListing, boardListingIsEmpty, foldForSearch, nameMatches } from "./board-listing.js";
+import { MAKE_ROOM_LIMIT, SECTION_GAP, SECTION_MIN_SIZE, SECTION_PADDING, SECTION_TITLE_ROOM, assignMembership, fitSection, fitTouchedSections, makeRoom, settleBoard } from "./board-sections.js";
 import { Book, BookContents, BookFrontMatterEntry, BookInput, BookMode, BookPage, BookSection, BookView, BookViewInput, Chapter, isBookContents, isHebrew, noteMarkerIssues } from "./book.js";
 import { DeckFromSlidesOptions, SlideRow, deckFromSlides } from "./deck-from-slides.js";
 import { Direction, TextDirection, firstStrongDirection, languageDirection, resolveDirection } from "./direction.js";
@@ -720,4 +722,4 @@ export declare function jsonSchemas(): {
   }, z.core.$strip>>;
 };
 //#endregion
-export { Annotation, type ArrangeOptions, Board, type BoardInput, BoardItem, BoardLabel, type BoardListingGroup, BoardSection, type BoardShapes, type BoardView, Book, BookContents, BookFrontMatterEntry, type BookInput, BookMode, BookPage, BookSection, BookView, type BookViewInput, Box, Chapter, Cue, DECK_SIZE, DEFAULT_TRANSITION_DURATION_MS, Deck, type DeckFromSlidesOptions, type DeckInput, type DeckLimits, Direction, ImageFit, type Imposed, Lexicon, MARK_GAP_MM, MARK_LENGTH_MM, MAX_BOARD_ZOOM, MAX_SLIDE_TIMING_MS, MAX_TRANSITION_DURATION_MS, MIN_BOARD_ZOOM, MIN_TRANSITION_DURATION_MS, MM_PER_PT, Manifest, type MillimeterEdges, NAMED_PAPERS, Narration, NoteMarker, NumberSystem, PAPER_MM, PX_PER_MM, type PageFit, type PagePlacementKind, type PagePlacementLayout, Paper, type PaperBox, type Placement, Point, PronunciationEntry, PublishedShot, SHOT_KEY, Scripts, Shot, type ShotUse, Size, Slide, SlideContent, type SlideRow, TextDirection, Transition, TransitionInput, Word, type ZoomBounds, annotationCueIssues, arrange, boardBounds, boardListing, boardListingIsEmpty, boardToScreen, deckFromSlides, exceedsLimits, firstStrongDirection, fitPage, foldForSearch, formatNumber, impose, isBookContents, isHebrew, itemAt, itemHeight, languageDirection, lexiconVersion, mirrorPlacement, nameMatches, noteMarker, noteMarkerIssues, pagePlacementLayout, printBoxes, printPadding, printProperties, resolveDirection, revealView, roundMillimeters, screenToBoard, sheetMm, shotsUsed, toMillimeters, visibleItems, zoomAt, zoomToFit };
+export { Annotation, type ArrangeOptions, Board, type BoardInput, BoardItem, type BoardItemAnchor, BoardLabel, type BoardListingGroup, BoardSection, type BoardShapes, type BoardView, Book, BookContents, BookFrontMatterEntry, type BookInput, BookMode, BookPage, BookSection, BookView, type BookViewInput, Box, Chapter, Cue, DECK_SIZE, DEFAULT_TRANSITION_DURATION_MS, Deck, type DeckFromSlidesOptions, type DeckInput, type DeckLimits, Direction, ImageFit, type Imposed, Lexicon, MAKE_ROOM_LIMIT, MARK_GAP_MM, MARK_LENGTH_MM, MAX_BOARD_ZOOM, MAX_SLIDE_TIMING_MS, MAX_TRANSITION_DURATION_MS, MIN_BOARD_ITEM_WIDTH, MIN_BOARD_ZOOM, MIN_TRANSITION_DURATION_MS, MM_PER_PT, Manifest, type MillimeterEdges, NAMED_PAPERS, Narration, NoteMarker, NumberSystem, PAPER_MM, PX_PER_MM, type PageFit, type PagePlacementKind, type PagePlacementLayout, Paper, type PaperBox, type Placement, Point, PronunciationEntry, PublishedShot, SECTION_GAP, SECTION_MIN_SIZE, SECTION_PADDING, SECTION_TITLE_ROOM, SHOT_KEY, Scripts, Shot, type ShotUse, Size, Slide, SlideContent, type SlideRow, TextDirection, Transition, TransitionInput, Word, type ZoomBounds, addItem, annotationCueIssues, arrange, assignMembership, boardBounds, boardListing, boardListingIsEmpty, boardToScreen, deckFromSlides, exceedsLimits, firstStrongDirection, fitPage, fitSection, fitTouchedSections, foldForSearch, formatNumber, impose, isBookContents, isHebrew, itemAt, itemHeight, languageDirection, lexiconVersion, makeRoom, mirrorPlacement, moveItems, moveSection, nameMatches, noteMarker, noteMarkerIssues, pagePlacementLayout, printBoxes, printPadding, printProperties, removeItems, resizeItem, resolveDirection, revealView, roundMillimeters, screenToBoard, settleBoard, sheetMm, shotsUsed, toMillimeters, visibleItems, zoomAt, zoomToFit };

package/dist/index.js

@@ -8,8 +8,10 @@ import { NoteMarker, NumberSystem, formatNumber, noteMarker } from "./numbering.
 import { MARK_GAP_MM, MARK_LENGTH_MM, MM_PER_PT, NAMED_PAPERS, PAPER_MM, PX_PER_MM, Paper, printBoxes, printPadding, printProperties, roundMillimeters, sheetMm, toMillimeters } from "./paper.js";
 import { Book, BookContents, BookFrontMatterEntry, BookMode, BookPage, BookSection, BookShape, BookView, Chapter, isBookContents, isHebrew, noteMarkerIssues } from "./book.js";
 import { Lexicon, PronunciationEntry, lexiconVersion } from "./lexicon.js";
+import { MIN_BOARD_ITEM_WIDTH, addItem, moveItems, moveSection, removeItems, resizeItem } from "./board-edit.js";
 import { MAX_BOARD_ZOOM, MIN_BOARD_ZOOM, arrange, boardBounds, boardToScreen, itemAt, itemHeight, revealView, screenToBoard, visibleItems, zoomAt, zoomToFit } from "./board-geometry.js";
 import { boardListing, boardListingIsEmpty, foldForSearch, nameMatches } from "./board-listing.js";
+import { MAKE_ROOM_LIMIT, SECTION_GAP, SECTION_MIN_SIZE, SECTION_PADDING, SECTION_TITLE_ROOM, assignMembership, fitSection, fitTouchedSections, makeRoom, settleBoard } from "./board-sections.js";
 import { deckFromSlides } from "./deck-from-slides.js";
 import { fitPage, impose, mirrorPlacement, pagePlacementLayout } from "./imposition.js";
 import { shotsUsed } from "./shots-used.js";
@@ -155,4 +157,4 @@ function jsonSchemas() {
 	};
 }
 //#endregion
-export { Annotation, Board, BoardItem, BoardLabel, BoardSection, Book, BookContents, BookFrontMatterEntry, BookMode, BookPage, BookSection, BookView, Box, Chapter, Cue, DECK_SIZE, DEFAULT_TRANSITION_DURATION_MS, Deck, Direction, ImageFit, Imposition, Lexicon, MARK_GAP_MM, MARK_LENGTH_MM, MAX_BOARD_ZOOM, MAX_IMPOSITION_CELLS, MAX_SLIDE_TIMING_MS, MAX_TRANSITION_DURATION_MS, MIN_BOARD_ZOOM, MIN_TRANSITION_DURATION_MS, MM_PER_PT, Manifest, Margin, NAMED_PAPERS, Narration, NoteMarker, NumberSystem, PAPER_MM, PX_PER_MM, Page, PageSize, Paper, Point, Print, PronunciationEntry, PublishedShot, SHOT_KEY, Scripts, Shot, Size, Slide, SlideContent, TextDirection, Transition, Word, annotationCueIssues, arrange, boardBounds, boardListing, boardListingIsEmpty, boardToScreen, deckFromSlides, exceedsLimits, firstStrongDirection, fitPage, foldForSearch, formatNumber, impose, isBookContents, isHebrew, itemAt, itemHeight, jsonSchemas, languageDirection, lexiconVersion, mirrorPlacement, nameMatches, noteMarker, noteMarkerIssues, pagePlacementLayout, printBoxes, printPadding, printProperties, resolveDirection, revealView, roundMillimeters, screenToBoard, sheetMm, shotsUsed, toMillimeters, visibleItems, zoomAt, zoomToFit };
+export { Annotation, Board, BoardItem, BoardLabel, BoardSection, Book, BookContents, BookFrontMatterEntry, BookMode, BookPage, BookSection, BookView, Box, Chapter, Cue, DECK_SIZE, DEFAULT_TRANSITION_DURATION_MS, Deck, Direction, ImageFit, Imposition, Lexicon, MAKE_ROOM_LIMIT, MARK_GAP_MM, MARK_LENGTH_MM, MAX_BOARD_ZOOM, MAX_IMPOSITION_CELLS, MAX_SLIDE_TIMING_MS, MAX_TRANSITION_DURATION_MS, MIN_BOARD_ITEM_WIDTH, MIN_BOARD_ZOOM, MIN_TRANSITION_DURATION_MS, MM_PER_PT, Manifest, Margin, NAMED_PAPERS, Narration, NoteMarker, NumberSystem, PAPER_MM, PX_PER_MM, Page, PageSize, Paper, Point, Print, PronunciationEntry, PublishedShot, SECTION_GAP, SECTION_MIN_SIZE, SECTION_PADDING, SECTION_TITLE_ROOM, SHOT_KEY, Scripts, Shot, Size, Slide, SlideContent, TextDirection, Transition, Word, addItem, annotationCueIssues, arrange, assignMembership, boardBounds, boardListing, boardListingIsEmpty, boardToScreen, deckFromSlides, exceedsLimits, firstStrongDirection, fitPage, fitSection, fitTouchedSections, foldForSearch, formatNumber, impose, isBookContents, isHebrew, itemAt, itemHeight, jsonSchemas, languageDirection, lexiconVersion, makeRoom, mirrorPlacement, moveItems, moveSection, nameMatches, noteMarker, noteMarkerIssues, pagePlacementLayout, printBoxes, printPadding, printProperties, removeItems, resizeItem, resolveDirection, revealView, roundMillimeters, screenToBoard, settleBoard, sheetMm, shotsUsed, toMillimeters, visibleItems, zoomAt, zoomToFit };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@segnavia/format",
-  "version": "0.12.0",
+  "version": "0.14.0",
   "type": "module",
   "license": "MIT",
   "repository": {