@mehm8128/rehype-toc 1.3.0 → 1.4.1

package/dist/index.js

@@ -3,56 +3,54 @@ import { visit } from "unist-util-visit";
 //#region src/index.ts
 const rehypeCollapsibleToc = () => {
 	return (tree) => {
-		const rootUlElement = {
+		const rootOlElement = {
 			type: "element",
 			tagName: "ol",
 			properties: {},
 			children: []
 		};
 		visit(tree, "element", (node) => {
-			visitorCallback(node, rootUlElement);
+			visitorCallback(node, rootOlElement);
 		});
-		const detailsElement = createCollapsibleToc(rootUlElement);
+		const detailsElement = createCollapsibleToc(rootOlElement);
 		tree.children.unshift(detailsElement);
 	};
 };
-const visitorCallback = (node, rootUlElement) => {
+const visitorCallback = (node, rootOlElement) => {
 	if (!/^h[2-6]$/.test(node.tagName)) return;
 	const headingLevel = getHeadingLevelFromElement(node);
 	const liElement = createListItemElement(node);
-	const rootUlElementChildren = assertElementNodeList(rootUlElement.children);
+	const rootOlElementChildren = assertElementNodeList(rootOlElement.children);
 	if (headingLevel === 2) {
-		rootUlElement.children.push(liElement);
+		rootOlElement.children.push(liElement);
 		return;
 	}
-	const sameLevelUlElement = searchSameLevelUlElement(rootUlElementChildren, headingLevel);
-	if (sameLevelUlElement) {
-		sameLevelUlElement.children.push(liElement);
+	const rootElementHeadingLevel = 2;
+	const sameLevelOlElement = searchSameLevelOlElement(rootOlElement, headingLevel, rootElementHeadingLevel);
+	if (sameLevelOlElement) {
+		sameLevelOlElement.children.push(liElement);
 		return;
 	}
-	const deepestLiElement = getDeepestLiElement(rootUlElementChildren);
-	const newUlElement = createUlElement();
-	newUlElement.children.push(liElement);
-	deepestLiElement.children.push(newUlElement);
+	const deepestLiElement = getDeepestLiElement(rootOlElementChildren);
+	const newOlElement = createOlElement();
+	newOlElement.children.push(liElement);
+	deepestLiElement.children.push(newOlElement);
 };
 /**
 * 引数のolに入っている一番新しいliの中で、levelと同じ見出しレベルのli要素を返す
 */
-const searchSameLevelUlElement = (rootUlElement, level) => {
-	const rootLiElement = assertElementNode(rootUlElement[rootUlElement.length - 1]);
-	const headingAnchorElement = assertElementNode(rootLiElement.children[0]);
-	const headingTextElement = assertElementText(headingAnchorElement.children[0]);
-	const rootElementHeadingLevel = getHeadingLevelFromText(headingTextElement);
-	if (rootElementHeadingLevel === level) return rootLiElement;
-	const childUlElement = assertElementNodeList(rootLiElement.children)[1];
-	if (childUlElement === void 0) return;
-	return searchSameLevelUlElement(assertElementNodeList(childUlElement.children), level);
+const searchSameLevelOlElement = (rootOlElement, level, rootElementHeadingLevel) => {
+	const rootLiElement = assertElementNode(rootOlElement.children[rootOlElement.children.length - 1]);
+	if (level === rootElementHeadingLevel) return rootOlElement;
+	const childOlElement = assertElementNodeList(rootLiElement.children)[1];
+	if (childOlElement === void 0) return;
+	return searchSameLevelOlElement(childOlElement, level, rootElementHeadingLevel + 1);
 };
 /**
 * 引数のolに入っている一番新しいliの中で、一番深いli要素を取得する
 */
-const getDeepestLiElement = (rootUlElement) => {
-	const rootLiElement = assertElementNode(rootUlElement[rootUlElement.length - 1]);
+const getDeepestLiElement = (rootOlElement) => {
+	const rootLiElement = assertElementNode(rootOlElement[rootOlElement.length - 1]);
 	const olElement = assertElementNodeList(rootLiElement.children)[1];
 	if (!olElement) return rootLiElement;
 	return getDeepestLiElement(assertElementNodeList(olElement.children));
@@ -61,11 +59,7 @@ const getHeadingLevelFromElement = (headingElement) => {
 	const headingLevel = Number(headingElement.tagName.charAt(1));
 	return headingLevel;
 };
-const getHeadingLevelFromText = (headingElement) => {
-	const headingLevel = Number(headingElement.value.charAt(1));
-	return headingLevel;
-};
-const createUlElement = () => {
+const createOlElement = () => {
 	return {
 		type: "element",
 		tagName: "ol",
@@ -77,11 +71,12 @@ const createListItemElement = (node) => {
 	const headingChildren = node.children.flatMap((child) => child.type === "element" ? child.children : []);
 	const headingTextElement = headingChildren.find((child) => child.type === "text");
 	if (!headingTextElement) throw new Error("見出しにテキストがありません");
+	const headingId = node.properties.id;
 	const headingText = headingTextElement.value;
 	const anchorElement = {
 		type: "element",
 		tagName: "a",
-		properties: { href: `#${headingText}` },
+		properties: { href: `#${headingId}` },
 		children: [{
 			type: "text",
 			value: headingText
@@ -94,7 +89,7 @@ const createListItemElement = (node) => {
 		children: [anchorElement]
 	};
 };
-const createCollapsibleToc = (rootUlElement) => {
+const createCollapsibleToc = (rootOlElement) => {
 	const summaryElement = {
 		type: "element",
 		tagName: "summary",
@@ -108,7 +103,7 @@ const createCollapsibleToc = (rootUlElement) => {
 		type: "element",
 		tagName: "details",
 		properties: {},
-		children: [summaryElement, rootUlElement]
+		children: [summaryElement, rootOlElement]
 	};
 	return detailsElement;
 };
@@ -120,10 +115,6 @@ const assertElementNodeList = (nodeList) => {
 	if (nodeList.some((node) => node.type !== "element")) throw new Error("Elementノードではありません");
 	return nodeList;
 };
-const assertElementText = (node) => {
-	if (node.type !== "text") throw new Error("Textノードではありません");
-	return node;
-};
 
 //#endregion
 export { rehypeCollapsibleToc };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mehm8128/rehype-toc",
-  "version": "1.3.0",
+  "version": "1.4.1",
   "type": "module",
   "repository": {
     "type": "git",