@effected/markdown 0.5.2 → 0.6.1

package/MarkdownDocument.js

@@ -229,19 +229,43 @@ var MarkdownDocument = class MarkdownDocument extends Schema.Class("MarkdownDocu
 	get sections() {
 		const blocks = this.root.children;
 		const sections = [];
+		const headings = [];
 		for (let index = 0; index < blocks.length; index += 1) {
 			const block = blocks[index];
-			if (block === void 0 || block.type !== "heading") continue;
-			let boundary = this.source.length;
-			let end = blocks.length;
-			for (let next = index + 1; next < blocks.length; next += 1) {
-				const candidate = blocks[next];
-				if (candidate !== void 0 && candidate.type === "heading" && candidate.depth <= block.depth) {
-					boundary = candidate.position.start.offset;
-					end = next;
-					break;
-				}
+			if (block !== void 0 && block.type === "heading") headings.push({
+				index,
+				node: block
+			});
+		}
+		const nextByDepth = [
+			void 0,
+			void 0,
+			void 0,
+			void 0,
+			void 0,
+			void 0,
+			void 0
+		];
+		const boundaryByHeading = new Array(headings.length);
+		for (let index = headings.length - 1; index >= 0; index -= 1) {
+			const current = headings[index]?.node;
+			if (current === void 0) continue;
+			let boundary;
+			for (let depth = 1; depth <= current.depth; depth += 1) {
+				const candidate = nextByDepth[depth];
+				if (candidate !== void 0 && (boundary === void 0 || candidate < boundary)) boundary = candidate;
 			}
+			boundaryByHeading[index] = boundary;
+			nextByDepth[current.depth] = index;
+		}
+		for (let index = 0; index < headings.length; index += 1) {
+			const current = headings[index];
+			if (current === void 0) continue;
+			const block = current.node;
+			const boundaryHeading = boundaryByHeading[index];
+			const boundaryNode = boundaryHeading === void 0 ? void 0 : headings[boundaryHeading]?.node;
+			const boundary = boundaryNode === void 0 ? this.source.length : boundaryNode.position.start.offset;
+			const end = boundaryHeading === void 0 ? blocks.length : headings[boundaryHeading]?.index ?? blocks.length;
 			const start = block.position.start.offset;
 			const bodyStart = block.position.end.offset;
 			sections.push(new DocumentSection({
@@ -251,7 +275,7 @@ var MarkdownDocument = class MarkdownDocument extends Schema.Class("MarkdownDocu
 					offset: start,
 					length: boundary - start
 				}),
-				children: blocks.slice(index + 1, end).filter((child) => child.type !== "frontmatter"),
+				children: blocks.slice(current.index + 1, end).filter((child) => child.type !== "frontmatter"),
 				text: phrasingText(block.children),
 				bodyRange: MarkdownRange.make({
 					offset: bodyStart,

package/README.md

@@ -8,7 +8,7 @@
 Zero-dependency CommonMark 0.31.2 and GFM parsing, editing and transformation expressed as Effect schemas and pure functions. Parse markdown into mdast-shaped nodes carrying byte offsets, navigate headings, sections and links, compute surgical offset-splice edits, normalize markers, decode frontmatter into a validated domain schema, project to and from plain mdast for the remark ecosystem, and walk a document as a `Stream`.
 
 > **Pre-release.** This package is part of the `@effected/*` kit, in pre-`1.0.0`
-> development against a single pinned Effect v4 beta. Packages graduate to
+> development against a single pinned Effect v4 prerelease. Packages graduate to
 > `1.0.0` once Effect `4.0.0` ships. To hold your own `effect` versions at
 > exactly the ones the kit is built and tested against, install
 > [`@effected/pnpm-plugin-effect`](https://www.npmjs.com/package/@effected/pnpm-plugin-effect).

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@effected/markdown",
-	"version": "0.5.2",
+	"version": "0.6.1",
 	"private": false,
 	"description": "CommonMark and GFM markdown parse, edit and transform schemas for Effect",
 	"keywords": [
@@ -39,10 +39,10 @@
 		"./package.json": "./package.json"
 	},
 	"peerDependencies": {
-		"@effected/jsonc": "^0.6.0",
-		"@effected/toml": "^0.4.0",
-		"@effected/yaml": "^0.9.0",
-		"effect": "4.0.0-beta.107"
+		"@effected/jsonc": "^0.7.0",
+		"@effected/toml": "^0.5.0",
+		"@effected/yaml": "^0.10.0",
+		"effect": "4.0.0-rc.109"
 	},
 	"peerDependenciesMeta": {
 		"@effected/jsonc": {

package/tsdoc-metadata.json

@@ -5,7 +5,7 @@
   "toolPackages": [
     {
       "packageName": "@microsoft/api-extractor",
-      "packageVersion": "7.58.12"
+      "packageVersion": "7.58.13"
     }
   ]
 }