@vortexlabs/kirari-rehype 1.0.1 → 1.0.2

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @vortexlabs/kirari-rehype
 
+## 1.0.2
+
+### Patch Changes
+
+- 52ad674: Stop line wrappers from adding an empty last line after a code block's trailing newline. Markdown code blocks always end with a newline, so every block rendered with `lines` or fence line metadata such as `{2,4-6}` showed an extra empty line, and an extra number when line numbers come from CSS. The newline still follows the last wrapper, so the source text is unchanged, and blank lines before it keep their wrappers.
+
 ## 1.0.1
 
 ### Patch Changes

package/README.md

@@ -132,8 +132,8 @@ const options = {
 } satisfies Options
 ```
 
-Line endings remain outside the wrappers. Empty and trailing lines are
-preserved. Callback offsets are UTF-16 code units into the code block's source;
+Line endings remain outside the wrappers. Empty lines are preserved; the
+fence's trailing newline does not add an extra line. Callback offsets are UTF-16 code units into the code block's source;
 `start` is inclusive and `end` is exclusive and excludes the line ending.
 Token class callbacks receive each original token once, even when a token spans
 multiple lines.

package/dist/index.js

@@ -106,10 +106,30 @@ const tokenNodes = (source, tokens, options, ranges) => {
             break;
         nodes.push({ type: 'text', value: match[0] });
         start = end + match[0].length;
+        if (start === source.length)
+            break;
         number++;
     } while (true);
     return nodes;
 };
+const optsOut = (classNames) => {
+    return classNames.some(name => name === 'no-highlight' || name === 'nohighlight');
+};
+/** Replaces the text of a `<code>` with highlighted nodes; returns whether it did. */
+const highlightCode = (code, registry, options) => {
+    if (code.type !== 'element' || code.tagName !== 'code' || code.children.some(node => node.type !== 'text'))
+        return false;
+    const codeClasses = classes(code.properties.className);
+    if (optsOut(codeClasses))
+        return false;
+    const language = codeClasses.filter(name => name.startsWith('language-')).map(name => registry.resolve(name.slice(9))).find(Boolean);
+    if (!language)
+        return false;
+    const source = code.children.map(node => node.type === 'text' ? node.value : '').join('');
+    const meta = code.data && 'meta' in code.data ? code.data.meta : undefined;
+    code.children = tokenNodes(source, tokenize(source, language), options, lineRanges(meta));
+    return true;
+};
 const rehypeKirari = (options = {}) => {
     const registry = createRegistry(options.languages ?? []);
     return tree => {
@@ -119,22 +139,11 @@ const rehypeKirari = (options = {}) => {
             for (const child of parent.children) {
                 if (child.type === 'element' && child.tagName === 'pre') {
                     const preClasses = classes(child.properties.className);
-                    if (!preClasses.some(name => name === 'no-highlight' || name === 'nohighlight')) {
-                        for (const code of child.children) {
-                            if (code.type !== 'element' || code.tagName !== 'code' || code.children.some(node => node.type !== 'text'))
-                                continue;
-                            const codeClasses = classes(code.properties.className);
-                            if (codeClasses.some(name => name === 'no-highlight' || name === 'nohighlight'))
-                                continue;
-                            const language = codeClasses.filter(name => name.startsWith('language-')).map(name => registry.resolve(name.slice(9))).find(Boolean);
-                            if (!language)
-                                continue;
-                            const source = code.children.map(node => node.type === 'text' ? node.value : '').join('');
-                            const meta = code.data && 'meta' in code.data ? code.data.meta : undefined;
-                            const children = tokenNodes(source, tokenize(source, language), options, lineRanges(meta));
-                            code.children = children;
+                    if (optsOut(preClasses))
+                        continue;
+                    for (const code of child.children) {
+                        if (highlightCode(code, registry, options))
                             child.properties.className = [...new Set([...preClasses, 'kirari'])];
-                        }
                     }
                     continue;
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vortexlabs/kirari-rehype",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Kirari syntax highlighting for Rehype and MDX.",
   "keywords": [
     "rehype",
@@ -47,7 +47,7 @@
     "@mdx-js/mdx": "^3.1.1",
     "@types/react": "^19.3.0",
     "@types/react-dom": "^19.3.0",
-    "@vortexlabs/kirari": "1.0.1",
+    "@vortexlabs/kirari": "1.0.5",
     "react": "^19.3.1",
     "react-dom": "^19.3.1",
     "rehype-sanitize": "^6.0.0",