asciidoc-abundant-tree 0.2.5 → 0.2.6

package/dist/animation-yaml-export/cli.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { o as exportAnimationYaml } from "../src-DdGRLADG.mjs";
+import { o as exportAnimationYaml } from "../src-COUYWnMz.mjs";
 import process from "node:process";
 //#region src/animation-yaml-export/cli.ts
 const USAGE = `Usage:

package/dist/browser.mjs

@@ -1155,6 +1155,7 @@ function buildNode(block, context) {
 			})
 		});
 		requestTitleBindings(context, block);
+		requestListItemBindings(context, block);
 		return childBlocksOf(block).flatMap((child) => toNodes(buildNode(child, context)));
 	}
 }
@@ -1171,6 +1172,15 @@ function requestTitleBindings(context, block) {
 		xrefs
 	});
 }
+function requestListItemBindings(context, block) {
+	if (block.getContext?.() !== "list_item") return;
+	const span = context.intervalByBlock.get(block)?.contentSpan;
+	const xrefs = span ? collectXrefsInSpan(context, span) : [];
+	if (xrefs.length > 0) context.bindingRequests.push({
+		block,
+		xrefs
+	});
+}
 function canProjectBlock(block, context) {
 	return context.projectableBlocks?.has(block) ?? true;
 }
@@ -1947,7 +1957,7 @@ function resolveSourceInterval(surface, sourceTable) {
 	const undelimited = delimitedContext && delimited === void 0 && !synthesized ? resolveUndelimitedBlockSpan(lineTable, sourceTable, blockStartLine, surface) : void 0;
 	const sourceContentSpan = sourceContentSpanForContext(surface, lineTable, blockStartLine);
 	const nextSiblingStart = nextSiblingStartLine(surface, lineTable);
-	const childEndLine = surface.context === "dlist" ? lastChildEndLine(surface, lineTable) : void 0;
+	const childEndLine = surface.context === "dlist" ? lastChildEndLine(surface, sourceTable) : void 0;
 	const endLine = delimited?.span.endLine ?? undelimited?.span.endLine ?? sourceContentSpan?.endLine ?? childEndLine ?? (nextSiblingStart !== void 0 ? nextSiblingStart - 1 : void 0) ?? parentEndLine(surface, sourceTable) ?? lineTable.lines.length;
 	const span = normalizeLineSpan({
 		startLine,
@@ -2015,18 +2025,24 @@ function metadataForSurface(surface, lineTable, blockStartLine) {
 	if (takesParentSourceLocation(surface.block)) return [];
 	return collectPrecedingMetadata(lineTable, blockStartLine);
 }
-function lastChildEndLine(surface, lineTable) {
-	const childLines = surface.children.flatMap((child) => descendantSourceLines(child, lineTable));
+function lastChildEndLine(surface, sourceTable) {
+	const childLines = surface.children.map((child) => enclosedEndLine(child, sourceTable)).filter((line) => line !== void 0);
 	if (childLines.length === 0) return;
-	return Math.min(Math.max(...childLines), lastContentLine(lineTable));
+	return Math.min(Math.max(...childLines), lastContentLine(sourceTable));
 }
-function descendantSourceLines(surface, lineTable) {
-	const textEnd = isDescription(surface) ? descriptionTextOf(surface, lineTable)?.span.endLine : void 0;
-	return [
-		...surface.sourceLine === void 0 ? [] : [surface.sourceLine],
-		...textEnd === void 0 ? [] : [textEnd],
-		...surface.children.flatMap((child) => descendantSourceLines(child, lineTable))
-	];
+function enclosedEndLine(surface, sourceTable) {
+	const ends = [surface.sourceLine === void 0 ? void 0 : ownEndLine(surface, sourceTable, surface.sourceLine), ...surface.children.map((child) => enclosedEndLine(child, sourceTable))].filter((line) => line !== void 0);
+	return ends.length > 0 ? Math.max(...ends) : void 0;
+}
+function ownEndLine(surface, sourceTable, startLine) {
+	const lineTable = quotedLineTable(sourceTable, markdownQuoteDepth(surface.block));
+	const delimited = isDelimitedContext(surface.context) && !borrowsChildSourceLocation(surface.block) ? resolveDelimitedBlockSpan(lineTable, startLine, surface) ?? resolveUndelimitedBlockSpan(lineTable, sourceTable, startLine, surface) : void 0;
+	if (delimited) return delimited.span.endLine;
+	const paragraph = sourceContentSpanForContext(surface, lineTable, startLine);
+	if (paragraph) return paragraph.endLine;
+	if (isDescription(surface)) return descriptionTextOf(surface, lineTable)?.span.endLine ?? startLine;
+	if (surface.context === "list_item" && surface.parent?.context !== "dlist") return listItemTextEndLine(lineTable, startLine);
+	return startLine;
 }
 function parentEndLine(surface, lineTable) {
 	const parent = surface.parent;

package/dist/cli.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { a as parseAbundantTree, i as serializeAbundantTreeToJson, n as formatAbundantTree, t as rdf12 } from "./src-DdGRLADG.mjs";
+import { a as parseAbundantTree, i as serializeAbundantTreeToJson, n as formatAbundantTree, t as rdf12 } from "./src-COUYWnMz.mjs";
 import { relative, resolve, sep } from "node:path";
 import { existsSync } from "node:fs";
 import process from "node:process";

package/dist/index.mjs

@@ -1,2 +1,2 @@
-import { a as parseAbundantTree, i as serializeAbundantTreeToJson, n as formatAbundantTree, o as exportAnimationYaml, r as serializeAbundantTree, t as rdf12 } from "./src-DdGRLADG.mjs";
+import { a as parseAbundantTree, i as serializeAbundantTreeToJson, n as formatAbundantTree, o as exportAnimationYaml, r as serializeAbundantTree, t as rdf12 } from "./src-COUYWnMz.mjs";
 export { exportAnimationYaml, formatAbundantTree, parseAbundantTree, rdf12, serializeAbundantTree, serializeAbundantTreeToJson };

package/dist/{src-DdGRLADG.mjs → src-COUYWnMz.mjs}

@@ -4157,6 +4157,7 @@ function buildNode(block, context) {
 			})
 		});
 		requestTitleBindings(context, block);
+		requestListItemBindings(context, block);
 		return childBlocksOf(block).flatMap((child) => toNodes(buildNode(child, context)));
 	}
 }
@@ -4173,6 +4174,15 @@ function requestTitleBindings(context, block) {
 		xrefs
 	});
 }
+function requestListItemBindings(context, block) {
+	if (block.getContext?.() !== "list_item") return;
+	const span = context.intervalByBlock.get(block)?.contentSpan;
+	const xrefs = span ? collectXrefsInSpan(context, span) : [];
+	if (xrefs.length > 0) context.bindingRequests.push({
+		block,
+		xrefs
+	});
+}
 function canProjectBlock(block, context) {
 	return context.projectableBlocks?.has(block) ?? true;
 }
@@ -4949,7 +4959,7 @@ function resolveSourceInterval(surface, sourceTable) {
 	const undelimited = delimitedContext && delimited === void 0 && !synthesized ? resolveUndelimitedBlockSpan(lineTable, sourceTable, blockStartLine, surface) : void 0;
 	const sourceContentSpan = sourceContentSpanForContext(surface, lineTable, blockStartLine);
 	const nextSiblingStart = nextSiblingStartLine(surface, lineTable);
-	const childEndLine = surface.context === "dlist" ? lastChildEndLine(surface, lineTable) : void 0;
+	const childEndLine = surface.context === "dlist" ? lastChildEndLine(surface, sourceTable) : void 0;
 	const endLine = delimited?.span.endLine ?? undelimited?.span.endLine ?? sourceContentSpan?.endLine ?? childEndLine ?? (nextSiblingStart !== void 0 ? nextSiblingStart - 1 : void 0) ?? parentEndLine(surface, sourceTable) ?? lineTable.lines.length;
 	const span = normalizeLineSpan({
 		startLine,
@@ -5017,18 +5027,24 @@ function metadataForSurface(surface, lineTable, blockStartLine) {
 	if (takesParentSourceLocation(surface.block)) return [];
 	return collectPrecedingMetadata(lineTable, blockStartLine);
 }
-function lastChildEndLine(surface, lineTable) {
-	const childLines = surface.children.flatMap((child) => descendantSourceLines(child, lineTable));
+function lastChildEndLine(surface, sourceTable) {
+	const childLines = surface.children.map((child) => enclosedEndLine(child, sourceTable)).filter((line) => line !== void 0);
 	if (childLines.length === 0) return;
-	return Math.min(Math.max(...childLines), lastContentLine(lineTable));
+	return Math.min(Math.max(...childLines), lastContentLine(sourceTable));
 }
-function descendantSourceLines(surface, lineTable) {
-	const textEnd = isDescription(surface) ? descriptionTextOf(surface, lineTable)?.span.endLine : void 0;
-	return [
-		...surface.sourceLine === void 0 ? [] : [surface.sourceLine],
-		...textEnd === void 0 ? [] : [textEnd],
-		...surface.children.flatMap((child) => descendantSourceLines(child, lineTable))
-	];
+function enclosedEndLine(surface, sourceTable) {
+	const ends = [surface.sourceLine === void 0 ? void 0 : ownEndLine(surface, sourceTable, surface.sourceLine), ...surface.children.map((child) => enclosedEndLine(child, sourceTable))].filter((line) => line !== void 0);
+	return ends.length > 0 ? Math.max(...ends) : void 0;
+}
+function ownEndLine(surface, sourceTable, startLine) {
+	const lineTable = quotedLineTable(sourceTable, markdownQuoteDepth(surface.block));
+	const delimited = isDelimitedContext(surface.context) && !borrowsChildSourceLocation(surface.block) ? resolveDelimitedBlockSpan(lineTable, startLine, surface) ?? resolveUndelimitedBlockSpan(lineTable, sourceTable, startLine, surface) : void 0;
+	if (delimited) return delimited.span.endLine;
+	const paragraph = sourceContentSpanForContext(surface, lineTable, startLine);
+	if (paragraph) return paragraph.endLine;
+	if (isDescription(surface)) return descriptionTextOf(surface, lineTable)?.span.endLine ?? startLine;
+	if (surface.context === "list_item" && surface.parent?.context !== "dlist") return listItemTextEndLine(lineTable, startLine);
+	return startLine;
 }
 function parentEndLine(surface, lineTable) {
 	const parent = surface.parent;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "asciidoc-abundant-tree",
-	"version": "0.2.5",
+	"version": "0.2.6",
 	"description": "Recover a source-aware, analysis-ready tree from AsciiDoc files and explicit book-entry include graphs.",
 	"license": "Apache-2.0",
 	"author": {