Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions docs/packages/transformers.md
Original file line number Diff line number Diff line change
Expand Up @@ -404,6 +404,35 @@ pre.shiki .indent::before {

---

### `transformerMetaDiff`

Mark lines as added or removed based on the meta string provided on the code snippet.

````md
```js {1+, 3-5-}
console.log('added')
console.log('kept')
console.log('removed')
console.log('removed')
console.log('removed')
```
````

Renders (with custom CSS rules):

```js {1+, 3-5-}
console.log('added')
console.log('kept')
console.log('removed')
console.log('removed')
console.log('removed')
```

- `1+` outputs: `<span class="line diff add">`
- `3-5-` outputs: `<span class="line diff remove">`

---

### `transformerMetaHighlight`

Highlight lines based on the [meta string](/guide/transformers#meta) provided on the code snippet.
Expand Down
1 change: 1 addition & 0 deletions packages/transformers/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
export { createCommentNotationTransformer } from './shared/notation-transformer'

export * from './transformers/compact-line-options'
export * from './transformers/meta-diff'
export * from './transformers/meta-highlight'
export * from './transformers/meta-highlight-word'
export * from './transformers/notation-diff'
Expand Down
99 changes: 99 additions & 0 deletions packages/transformers/src/transformers/meta-diff.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
import type { ShikiTransformer } from '@shikijs/types'

export interface TransformerMetaDiffOptions {
/**
* Class for added lines
*
* @default 'diff add'
*/
classLineAdd?: string
/**
* Class for removed lines
*
* @default 'diff remove'
*/
classLineRemove?: string
}

const symbol = Symbol('diff-lines')

/**
* Allow using `{1+,3-5-}` in the code snippet meta to mark added/removed lines.
*/
export function transformerMetaDiff(
options: TransformerMetaDiffOptions = {},
): ShikiTransformer {
const {
classLineAdd = 'diff add',
classLineRemove = 'diff remove',
} = options

return {
name: '@shikijs/transformers:meta-diff',
line(node, lineNumber) {
if (!this.options.meta?.__raw)
return

const meta = this.meta as { [symbol]: Map<number, string> | null }
meta[symbol] ??= parseMetaDiffString(this.options.meta.__raw)

const diffs = meta[symbol]
if (!diffs)
return

const type = diffs.get(lineNumber)
if (type === '+')
this.addClassToHast(node, classLineAdd)
else if (type === '-')
this.addClassToHast(node, classLineRemove)
},
}
}

export function parseMetaDiffString(meta: string): Map<number, string> | null {
if (!meta)
return null

const match = meta.match(/\{([^}]+)\}/)
if (!match)
return null

const map = new Map<number, string>()

// Split by comma
const parts = match[1].split(',')
for (const part of parts) {
const trimmed = part.trim()
if (!trimmed)
continue

// Check for + or - suffix
const type = trimmed.endsWith('+')
? '+'
: trimmed.endsWith('-')
? '-'
: null
if (!type)
continue

const content = trimmed.slice(0, -1)

// Parse range or number
const range = content.split('-').map(n => Number.parseInt(n, 10))
if (range.some(Number.isNaN))
continue

const lines = range.length === 1
? [range[0]]
: Array.from({ length: range[1] - range[0] + 1 }, (_, i) => range[0] + i)

for (const line of lines) {
map.set(line, type)
}
}

if (map.size === 0)
return null

return map
}
24 changes: 24 additions & 0 deletions packages/transformers/test/fixtures.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { codeToHtml } from 'shiki'
import { describe, expect, it } from 'vitest'
import {
transformerCompactLineOptions,
transformerMetaDiff,
transformerNotationDiff,
transformerNotationErrorLevel,
transformerNotationFocus,
Expand Down Expand Up @@ -88,6 +89,29 @@ body { margin: 0; }
</style>`,
)

suite(
'meta-diff',
import.meta.glob('./fixtures/meta-diff/*.*', { query: '?raw', import: 'default', eager: true }),
[
transformerMetaDiff(),
transformerRemoveLineBreak(),
],
code => `${code}
<style>
body { margin: 0; }
.shiki { padding: 1.5em; }
.line { display: block; width: 100%; height: 1.2em; }
.diff.add { background-color: #0505; color: green; }
.diff.remove { background-color: #8005; color: red; }
</style>`,
undefined,
{
meta: {
__raw: '{1+, 3-, 5+}',
},
},
)

suite(
'focus',
import.meta.glob('./fixtures/focus/*.*', { query: '?raw', import: 'default', eager: true }),
Expand Down
5 changes: 5 additions & 0 deletions packages/transformers/test/fixtures/meta-diff/basic.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions test/exports/@shikijs/transformers.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
.:
createCommentNotationTransformer: function
findAllSubstringIndexes: function
parseMetaDiffString: function
parseMetaHighlightString: function
parseMetaHighlightWords: function
transformerCompactLineOptions: function
transformerMetaDiff: function
transformerMetaHighlight: function
transformerMetaWordHighlight: function
transformerNotationDiff: function
Expand Down