@dr-ishaan/rehype-perfect-code-blocks 1.1.6 → 1.2.0

package/dist/types.d.ts

@@ -47,6 +47,16 @@ export interface PerfectCodeOptions {
     wrap?: boolean;
     /** Auto-collapse blocks longer than N lines. null = never. Default: null */
     collapseAfter?: number | null;
+    /**
+     * Per-line collapsible sections.
+     * Pass a meta string like `collapse="5-12,20-30"` to wrap matching line ranges
+     * in `<details><summary>N collapsed lines</summary>...</details>`.
+     * Style options: 'github' (default), 'collapsible-start', 'collapsible-end', 'collapsible-auto'.
+     * Default: null (disabled).
+     */
+    collapseRanges?: string | null;
+    /** Style for collapsible sections. Default: 'github'. */
+    collapseStyle?: 'github' | 'collapsible-start' | 'collapsible-end' | 'collapsible-auto';
     /** Show visible whitespace (tabs/spaces). Default: false */
     showWhitespace?: false | 'all' | 'boundary' | 'trailing' | 'leading';
     /** Render vertical indent guides. false | true (default 2) | number (indent width). Default: false */
@@ -62,11 +72,15 @@ export interface PerfectCodeOptions {
     engine?: 'auto' | 'shiki' | 'passthrough';
     /** Shiki options passed through when the plugin calls Shiki itself. */
     shiki?: {
-        /** Theme — string for single theme, { light, dark } for dual-theme via CSS vars. */
+        /**
+         * Theme — string for single theme, { light, dark } for dual-theme via CSS vars,
+         * or a Record<string, string> for multi-theme (3+ themes) support.
+         * Multi-theme example: `{ light: 'github-light', dark: 'github-dark', dim: 'github-dark-dimmed' }`.
+         */
         theme?: string | {
             light: string;
             dark: string;
-        };
+        } | Record<string, string>;
         /** Pre-loaded languages. Defaults to a sensible set; missing langs are lazy-loaded. */
         langs?: string[];
         /**
@@ -77,6 +91,12 @@ export interface PerfectCodeOptions {
         regexEngine?: 'oniguruma' | 'javascript';
         /** Additional Shiki transformers to apply (see @shikijs/transformers). */
         transformers?: ShikiTransformer[];
+        /**
+         * Controls whether user-provided transformers run 'before' or 'after' the
+         * auto-registered ones (default: 'after'). Use 'before' to give user
+         * transformers first access to the code text.
+         */
+        transformerOrder?: 'before' | 'after';
         /** Override the highlighter factory (e.g. for custom TextMate grammars). */
         getHighlighter?: (opts: {
             themes: string[];
@@ -100,6 +120,38 @@ export interface PerfectCodeOptions {
      * round-trip. Faster + safer. Default: true.
      */
     useHastApi?: boolean;
+    /**
+     * Disable auto-registration of @shikijs/transformers. When true, ONLY the
+     * transformers in `shiki.transformers` are applied. Default: false.
+     * Useful for advanced users who want full manual control.
+     */
+    disableAutoTransformers?: boolean;
+    /**
+     * Strip all comments from the rendered code (// ..., # ..., /* ... *\/, <!-- ... -->).
+     * Powered by @shikijs/transformers `transformerRemoveComments`. Default: false.
+     */
+    removeComments?: boolean;
+    /**
+     * Remove line breaks from the rendered code (joins all lines into one).
+     * Powered by @shikijs/transformers `transformerRemoveLineBreaks`. Default: false.
+     * Useful for compact inline-style code blocks.
+     */
+    removeLineBreaks?: boolean;
+    /**
+     * When `true`, treat {1,3-5} meta ranges as zero-indexed (line 0 is the first
+     * line). When `false` (default), line numbers start at 1.
+     */
+    zeroIndexed?: boolean;
+    /**
+     * Programmatic per-line class assignment (Shiki's `transformerCompactLineOptions`).
+     * Example: `[{ line: 1, classes: ['highlight'] }, { line: 3, classes: ['add'] }]`.
+     * Default: [] (disabled).
+     */
+    lineOptions?: {
+        line: number;
+        classes?: string[];
+        attrs?: Record<string, string>;
+    }[];
     /**
      * Custom // [!code xxx] notations mapped to CSS classes. Default: {}.
      * Example: `{ 'my-marker': 'pcb__line--custom' }` lets users write
@@ -127,7 +179,7 @@ export interface PerfectCodeOptions {
     tokensMap?: Record<string, string>;
     /**
      * Auto-switch to terminal preset for these languages. Default:
-     * ['sh', 'bash', 'zsh', 'shell', 'console', 'powershell', 'bat', 'cmd', 'fish']
+     * ['sh', 'bash', 'zsh', 'shell', 'console', 'powershell', 'bat', 'cmd', 'fish', 'ansi']
      */
     terminalLangs?: string[];
     /**
@@ -159,7 +211,19 @@ export interface PerfectCodeOptions {
      */
     defaultInlineLang?: string;
     /**
-     * Add `role="region"` and `aria-label` to scrollable code blocks (WCAG 4.1.2).
+     * Replace tabs with N spaces before tokenization. 0 disables (default).
+     * Useful for languages where Shiki's tab rendering doesn't match the
+     * surrounding code style.
+     */
+    tabWidth?: number;
+    /**
+     * Strip leading `#` comment lines from terminal code when copying to clipboard.
+     * Default: true (only effective when preset === 'terminal').
+     */
+    copyStripComments?: boolean;
+    /**
+     * Add `role="region"`, `aria-label`, and `tabindex="0"` to scrollable code
+     * blocks (WCAG 2.1.1 keyboard accessible, 4.1.2 name-role-value).
      * Default: true.
      */
     accessibleScroll?: boolean;
@@ -174,6 +238,12 @@ export interface PerfectCodeOptions {
      * Default: true.
      */
     hideCopyWithoutJs?: boolean;
+    /**
+     * Add a screen-reader-only `<span class="pcb__sr-only">Terminal window</span>`
+     * to terminal-preset blocks that have no title. Improves screen reader context.
+     * Default: true.
+     */
+    terminalSrOnlyTitle?: boolean;
     /**
      * Additional rehype plugins to run BEFORE rehype-perfect-code-blocks.
      * Pass `rehypeRaw` here if your markdown contains raw HTML (`<details>`,
@@ -205,6 +275,37 @@ export interface PerfectCodeOptions {
     onVisitTitle?: (element: unknown) => void;
     /** Called for the caption element (if present). */
     onVisitCaption?: (element: unknown) => void;
+    /**
+     * Localized UI strings. Defaults are English. Override per-locale by
+     * passing a different `texts` object based on the current language.
+     */
+    texts?: {
+        /** Copy button label (default: 'copy'). */
+        copyLabel?: string;
+        /** Label shown after successful copy (default: 'copied!'). */
+        doneLabel?: string;
+        /** Aria-label for the copy button (default: 'Copy code'). */
+        copyAriaLabel?: string;
+        /** Screen-reader-only title for terminal-preset blocks (default: 'Terminal window'). */
+        terminalSrOnlyTitle?: string;
+        /** aria-label prefix for scrollable body (default: 'Code block'). */
+        codeBlockAriaPrefix?: string;
+        /** Summary text for collapsed sections, with `{n}` placeholder (default: '{n} collapsed lines'). */
+        collapsedLinesLabel?: (n: number) => string;
+    };
+    /**
+     * Custom logger. Defaults to `console`. Useful for silencing warnings in
+     * production or routing them to a structured logger.
+     */
+    logger?: {
+        warn: (msg: string) => void;
+        error: (msg: string) => void;
+    };
+    /**
+     * Nonce to add to injected `<script>` and `<style>` tags. Enables strict CSP
+     * (`script-src 'self' 'nonce-...'`). Default: undefined (no nonce).
+     */
+    cspNonce?: string;
     /** Visual preset. Default: 'default' */
     preset?: 'default' | 'terminal' | 'minimal';
     /** Inject the bundled CSS automatically. Set false to ship your own. Default: true */
@@ -241,6 +342,10 @@ export interface ParsedMeta {
         id?: string;
     }[];
     lineNumbersStart: number | null;
+    collapseRanges: {
+        from: number;
+        to: number;
+    }[];
     flags: {
         wrap: boolean | null;
         lineNumbers: boolean | null;

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dr-ishaan/rehype-perfect-code-blocks",
-  "version": "1.1.6",
+  "version": "1.2.0",
   "description": "Beautiful, configurable code blocks for Astro / MDX / any rehype pipeline. Built on Shiki, inspired by rehype-pretty-code, VitePress, Docusaurus, and Expressive Code.",
   "type": "module",
   "main": "./dist/index.js",
@@ -19,12 +19,33 @@
       "types": "./dist/remark.d.ts",
       "import": "./dist/remark.js"
     },
+    "./meta": {
+      "types": "./dist/meta.d.ts",
+      "import": "./dist/meta.js"
+    },
+    "./transformer": {
+      "types": "./dist/transformer.d.ts",
+      "import": "./dist/transformer.js"
+    },
+    "./shiki": {
+      "types": "./dist/shiki.d.ts",
+      "import": "./dist/shiki.js"
+    },
+    "./copy-script": {
+      "types": "./dist/copy-script.d.ts",
+      "import": "./dist/copy-script.js"
+    },
+    "./types": {
+      "types": "./dist/types.d.ts",
+      "import": "./dist/types.js"
+    },
     "./styles.css": "./dist/styles.css"
   },
   "files": [
     "dist",
     "src",
     "README.md",
+    "CHANGELOG.md",
     "LICENSE"
   ],
   "scripts": {
@@ -65,7 +86,7 @@
     "node": ">=18.0.0"
   },
   "peerDependencies": {
-    "astro": "^4.0.0 || ^5.0.0"
+    "astro": "^4.0.0 || ^5.0.0 || ^6.0.0"
   },
   "peerDependenciesMeta": {
     "astro": {
@@ -79,8 +100,6 @@
     "@shikijs/transformers": "^4.2.0",
     "hast": "^1.0.0",
     "hast-util-from-html": "^2.0.0",
-    "rehype-raw": "^7.0.0",
-    "remark-gfm": "^4.0.1",
     "unist-util-visit": "^5.0.0"
   },
   "devDependencies": {

package/src/astro.ts

@@ -29,6 +29,17 @@ import { dirname, join } from 'node:path';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 
+/**
+ * Load the bundled CSS at runtime via readFileSync rather than via Vite's
+ * `?raw` query. The `?raw` approach only works when Vite is bundling the
+ * module (i.e. inside an Astro/Vite project that resolves the package
+ * through Vite's pipeline). When the package is consumed by a plain Node
+ * script, a non-Vite bundler, or — importantly — when it is *symlinked*
+ * into a project (so Vite treats it as a linked dep), the `?raw` query
+ * fails with `Unknown file extension ".css"`.
+ *
+ * Using readFileSync at runtime is more portable.
+ */
 function loadCss(): string {
   try {
     return readFileSync(join(__dirname, 'styles.css'), 'utf8');
@@ -41,6 +52,13 @@ function loadCss(): string {
   }
 }
 
+/** Escape a string for use as an HTML attribute value (defense in depth). */
+function escapeAttr(s: string): string {
+  return s.replace(/[<>"'&]/g, (c) => ({
+    '<': '&lt;', '>': '&gt;', '"': '&quot;', "'": '&#39;', '&': '&amp;',
+  }[c] ?? c));
+}
+
 /** Recursively walk a directory and return all .html file paths. */
 function findHtmlFiles(dir: string): string[] {
   const results: string[] = [];
@@ -68,7 +86,7 @@ export default function perfectCode(
     hooks: {
       'astro:config:setup': ({ updateConfig }) => {
         // 1. Register the remark + rehype plugins with the Markdown pipeline.
-        const userRehypePlugins = options.rehypePlugins ?? [];
+        const userRehypePlugins = (options.rehypePlugins ?? []) as unknown[];
         updateConfig({
           markdown: {
             syntaxHighlight: 'shiki',
@@ -80,8 +98,10 @@ export default function perfectCode(
                   : undefined,
             remarkPlugins: [remarkPreserveCodeMeta],
             rehypePlugins: [
-              ...(userRehypePlugins as unknown[]),
+              ...userRehypePlugins,
               [rehypePerfectCodeBlocks, options],
+              // Cast: Astro's rehypePlugins type is a complex union; our
+              // array shape ([plugin, options]) is one of the supported forms.
             ] as never,
           },
         });
@@ -90,36 +110,43 @@ export default function perfectCode(
       'astro:build:done': ({ dir }) => {
         // 2. After Astro finishes building all pages, inject CSS + scripts
         //    into every generated .html file. This is the most reliable
-        //    method — it works with Astro v4, v5, static and SSR modes,
+        //    method — it works with Astro v4, v5, v6, static and SSR modes,
         //    and doesn't require the user to import anything in their layout.
+        //
+        //    (The previous `injectScript('page', '<style>...')` approach
+        //    breaks on Astro 6 where injectScript expects JS, not HTML.)
         const injections: string[] = [];
+        // CSP nonce: if set, add `nonce="..."` to all <script> and <style> tags
+        // so they pass a strict Content-Security-Policy.
+        const nonceAttr = options.cspNonce ? ` nonce="${escapeAttr(options.cspNonce)}"` : '';
 
         // CSS
         if (options.injectStyles !== false) {
           const css = loadCss();
           if (css) {
-            injections.push(`<style data-pcb>${css}</style>`);
+            injections.push(`<style data-pcb${nonceAttr}>${css}</style>`);
           }
         }
 
         // Copy-button script
         if (options.copyButton !== false) {
-          injections.push(`<script>${COPY_SCRIPT}</script>`);
-
+          injections.push(`<script${nonceAttr}>${COPY_SCRIPT}</script>`);
           // Graceful degradation: .no-js class
           if (options.hideCopyWithoutJs !== false) {
             injections.push(
-              `<script>document.documentElement.classList.add('no-js');</script>`
+              `<script${nonceAttr}>document.documentElement.classList.add('no-js');</script>`
             );
           }
         }
 
         // Manual theme override
         if (options.theme && options.theme !== 'auto') {
-          const safeTheme = ['dark', 'light'].includes(options.theme) ? options.theme : 'auto';
+          const safeTheme = ['dark', 'light'].includes(options.theme)
+            ? options.theme
+            : 'auto';
           if (safeTheme !== 'auto') {
             injections.push(
-              `<script>document.documentElement.setAttribute('data-theme','${safeTheme}');</script>`
+              `<script${nonceAttr}>document.documentElement.setAttribute('data-theme','${safeTheme}');</script>`
             );
           }
         }

package/src/copy-script.ts

@@ -10,6 +10,7 @@
  *   - Falls back to execCommand for non-secure contexts
  *   - Respects `prefers-reduced-motion` (the CSS handles the animation)
  *   - Reads `data-done-label`, `data-success-icon`, `data-feedback-duration` from the button
+ *   - Strips leading `#` comment lines when `data-strip-comments` is set (terminal preset)
  *   - Announces "Copied" to screen readers via an aria-live region (WCAG 4.1.2)
  *   - Hides copy button when JS is disabled (via .no-js class on <html>)
  */
@@ -50,6 +51,15 @@ export const COPY_SCRIPT = `
     return btn.querySelector('svg');
   }
 
+  // Strip leading comment lines (e.g. shell prompts like "# comment") from
+  // the text before copying. Used for terminal-preset blocks where the
+  // displayed code may include comments the user doesn't want on the clipboard.
+  function stripComments(text) {
+    // Strip lines that start with optional whitespace followed by # (shell),
+    // // (C-style), or REM (Windows batch). Keep everything else.
+    return text.replace(/^[ \\t]*(?:#|\\/\\/|REM\\b).*$/gm, '').replace(/\\n{3,}/g, '\\n\\n').trim();
+  }
+
   document.addEventListener('click', function (e) {
     var btn = e.target && e.target.closest && e.target.closest('.pcb__copy');
     if (!btn) return;
@@ -60,12 +70,16 @@ export const COPY_SCRIPT = `
     var done = btn.getAttribute('data-done-label') || 'copied!';
     var duration = parseInt(btn.getAttribute('data-feedback-duration') || '1600', 10);
     var successIconHtml = btn.getAttribute('data-success-icon');
+    var stripCommentsFlag = btn.hasAttribute('data-strip-comments');
 
     var label = findLabel(btn);
     var icon = findIcon(btn);
     var originalLabel = label ? label.textContent : null;
     var originalIconHtml = icon ? icon.outerHTML : null;
 
+    var rawText = code.innerText;
+    var textToCopy = stripCommentsFlag ? stripComments(rawText) : rawText;
+
     var finish = function () {
       btn.classList.add('pcb__copy--done');
       if (label) label.textContent = done;
@@ -93,14 +107,14 @@ export const COPY_SCRIPT = `
     };
 
     if (navigator.clipboard && navigator.clipboard.writeText) {
-      navigator.clipboard.writeText(code.innerText).then(finish).catch(fallback);
+      navigator.clipboard.writeText(textToCopy).then(finish).catch(fallback);
     } else {
       fallback();
     }
 
     function fallback() {
       var ta = document.createElement('textarea');
-      ta.value = code.innerText;
+      ta.value = textToCopy;
       ta.style.position = 'fixed';
       ta.style.opacity = '0';
       document.body.appendChild(ta);

package/src/index.ts

@@ -94,6 +94,8 @@ function resolveDefaults(opts: PerfectCodeOptions): Required<PerfectCodeOptions>
     errorLevels: opts.errorLevels ?? true,
     wrap: opts.wrap ?? false,
     collapseAfter: opts.collapseAfter ?? null,
+    collapseRanges: opts.collapseRanges ?? null,
+    collapseStyle: opts.collapseStyle ?? 'github',
     showWhitespace: opts.showWhitespace ?? false,
     indentGuides: opts.indentGuides ?? false,
     caption: opts.caption ?? true,
@@ -102,11 +104,17 @@ function resolveDefaults(opts: PerfectCodeOptions): Required<PerfectCodeOptions>
       theme: { light: 'github-light', dark: 'github-dark' },
       langs: [],
       transformers: [],
+      transformerOrder: 'after',
       ...userShiki,
     },
     keepBackground: opts.keepBackground ?? false,
     styleToClass: opts.styleToClass ?? false,
     useHastApi: opts.useHastApi ?? true,
+    disableAutoTransformers: opts.disableAutoTransformers ?? false,
+    removeComments: opts.removeComments ?? false,
+    removeLineBreaks: opts.removeLineBreaks ?? false,
+    zeroIndexed: opts.zeroIndexed ?? false,
+    lineOptions: opts.lineOptions ?? [],
     customNotations: opts.customNotations ?? {},
     magicComments: opts.magicComments ?? [
       {
@@ -119,14 +127,17 @@ function resolveDefaults(opts: PerfectCodeOptions): Required<PerfectCodeOptions>
     inlineDefaultLang: opts.inlineDefaultLang ?? opts.defaultInlineLang ?? '',
     defaultInlineLang: opts.defaultInlineLang ?? opts.inlineDefaultLang ?? '',
     tokensMap: opts.tokensMap ?? {},
-    terminalLangs: opts.terminalLangs ?? ['sh', 'bash', 'zsh', 'shell', 'console', 'powershell', 'bat', 'cmd', 'fish'],
+    terminalLangs: opts.terminalLangs ?? ['sh', 'bash', 'zsh', 'shell', 'console', 'powershell', 'bat', 'cmd', 'fish', 'ansi'],
     extractFileNameFromCode: opts.extractFileNameFromCode ?? false,
     languageLabels: opts.languageLabels ?? {},
     languageAliases: opts.languageAliases ?? {},
     defaultBlockLang: opts.defaultBlockLang ?? '',
+    tabWidth: opts.tabWidth ?? 0,
+    copyStripComments: opts.copyStripComments ?? true,
     accessibleScroll: opts.accessibleScroll ?? true,
     announceCopy: opts.announceCopy ?? true,
     hideCopyWithoutJs: opts.hideCopyWithoutJs ?? true,
+    terminalSrOnlyTitle: opts.terminalSrOnlyTitle ?? true,
     rehypePlugins: opts.rehypePlugins ?? [],
     filterMetaString: opts.filterMetaString ?? ((s) => s),
     onVisitLine: opts.onVisitLine ?? (() => {}),
@@ -134,6 +145,9 @@ function resolveDefaults(opts: PerfectCodeOptions): Required<PerfectCodeOptions>
     onVisitHighlightedChars: opts.onVisitHighlightedChars ?? (() => {}),
     onVisitTitle: opts.onVisitTitle ?? (() => {}),
     onVisitCaption: opts.onVisitCaption ?? (() => {}),
+    texts: opts.texts ?? {},
+    logger: opts.logger ?? console,
+    cspNonce: opts.cspNonce ?? '',
     preset: opts.preset ?? 'default',
     injectStyles: opts.injectStyles ?? true,
     theme: opts.theme ?? 'auto',

package/src/meta.ts

@@ -56,6 +56,7 @@ export function parseMeta(meta: string | undefined): ParsedMeta {
     highlightGroups: [],
     wordHighlights: [],
     lineNumbersStart: null,
+    collapseRanges: [],
     flags: {
       wrap: null,
       lineNumbers: null,
@@ -84,6 +85,16 @@ export function parseMeta(meta: string | undefined): ParsedMeta {
       continue;
     }
 
+    // collapse="5-12,20-30" — per-line collapsible sections
+    if (tok.startsWith('collapse=')) {
+      const val = unquote(tok.slice('collapse='.length));
+      result.collapseRanges = parseCollapseRanges(val);
+      if (result.collapseRanges.length > 0) {
+        result.flags.collapse = true;
+      }
+      continue;
+    }
+
     // {1,3-5} or {1,3-5}#id  — line highlight (optionally grouped)
     if (tok.startsWith('{') && tok.includes('}')) {
       const closeIdx = tok.indexOf('}');
@@ -136,8 +147,9 @@ export function parseMeta(meta: string | undefined): ParsedMeta {
       }
     }
 
-    // ln{N} or showLineNumbers{N} — start line numbers at N
-    const startMatch = tok.match(/^(?:ln|showlinenumbers)\{(\d+)\}$/i);
+    // ln{N} or showLineNumbers{N} or lineNumbers{N} — start line numbers at N
+    // (issue #5: also accept `linenumbers` as a third alternative, case-insensitive)
+    const startMatch = tok.match(/^(?:ln|showlinenumbers|linenumbers)\{(\d+)\}$/i);
     if (startMatch) {
       result.lineNumbersStart = parseInt(startMatch[1], 10);
       result.flags.lineNumbers = true;
@@ -164,8 +176,8 @@ function tokenize(input: string): string[] {
     while (i < input.length && /\s/.test(input[i])) i++;
     if (i >= input.length) break;
 
-    // Quoted key="value" or key='value' (title=, caption=)
-    if (/^(?:title|caption)=$/.test(input.slice(i).match(/^[a-z]+=/i)?.[0] ?? '')) {
+    // Quoted key="value" or key='value' (title=, caption=, collapse=)
+    if (/^(?:title|caption|collapse)=$/.test(input.slice(i).match(/^[a-z]+=/i)?.[0] ?? '')) {
       const eq = input.indexOf('=', i);
       let j = eq + 1;
       const quote = input[j];
@@ -225,8 +237,9 @@ function tokenize(input: string): string[] {
       }
     }
 
-    // ln{N} or showLineNumbers{N}
-    if (/^(?:ln|showlinenumbers)\{/i.test(input.slice(i))) {
+    // ln{N} or showLineNumbers{N} or lineNumbers{N}
+    // (issue #5: also accept `linenumbers` as a prefix)
+    if (/^(?:ln|showlinenumbers|linenumbers)\{/i.test(input.slice(i))) {
       const closeIdx = input.indexOf('}', i);
       const stop = closeIdx === -1 ? input.length : closeIdx + 1;
       tokens.push(input.slice(i, stop));
@@ -265,7 +278,16 @@ function findMatchingQuote(s: string, start: number): number {
 
 function parseRanges(spec: string): number[] {
   const out = new Set<number>();
-  for (const part of spec.split(/[\s,]+/)) {
+  // Issue #4: previously `3 - 5` was split into ['3', '-', '5'] by the
+  // `[\s,]+` separator and the regex `/^(\d+)(?:-(\d+))?$/` rejected the
+  // bare '-'. Result: `{3 - 5}` parsed as [3, 5] instead of [3, 4, 5].
+  //
+  // Fix: pre-normalize whitespace around `-` inside the spec so that
+  // `3 - 5` becomes `3-5` before splitting. The split still happens on
+  // `,` and remaining whitespace (between range tokens), so `{1, 3 - 5, 7}`
+  // → `1, 3-5, 7` → splits to ['1', '3-5', '7'] → [1, 3, 4, 5, 7]. ✓
+  const normalized = spec.replace(/\s*-\s*/g, '-');
+  for (const part of normalized.split(/[\s,]+/)) {
     if (!part) continue;
     const m = part.match(/^(\d+)(?:-(\d+))?$/);
     if (!m) continue;
@@ -288,6 +310,28 @@ function unquote(s: string): string {
   return s;
 }
 
+/**
+ * Parse a collapse-range spec like "5-12,20-30" into structured ranges.
+ * Each part is either `N` (single line) or `N-M` (range, inclusive).
+ * Whitespace around commas and `-` is allowed.
+ *
+ * Example: "5-12, 20-30" → [{from:5,to:12}, {from:20,to:30}]
+ */
+function parseCollapseRanges(spec: string): { from: number; to: number }[] {
+  const out: { from: number; to: number }[] = [];
+  // Normalize whitespace around `-` so `5 - 12` parses correctly (mirrors parseRanges).
+  const normalized = spec.replace(/\s*-\s*/g, '-');
+  for (const part of normalized.split(/[\s,]+/)) {
+    if (!part) continue;
+    const m = part.match(/^(\d+)(?:-(\d+))?$/);
+    if (!m) continue;
+    const start = parseInt(m[1], 10);
+    const end = m[2] ? parseInt(m[2], 10) : start;
+    out.push({ from: Math.min(start, end), to: Math.max(start, end) });
+  }
+  return out.sort((a, b) => a.from - b.from);
+}
+
 function unescapeRegex(s: string): string {
   return s.replace(/\\\//g, '/').replace(/\\\\/g, '\\');
 }