@openclaw/diffs 2026.10.5-beta.1 → 2026.10.5-beta.2

package/node_modules/@pierre/diffs/node_modules/@shikijs/transformers/dist/index.d.mts

@@ -12,10 +12,10 @@ interface MatchAlgorithmOptions {
    */
   matchAlgorithm?: MatchAlgorithm;
 }
-declare function createCommentNotationTransformer(name: string, regex: RegExp, onMatch: (this: ShikiTransformerContext, match: string[], line: Element, commentNode: Element, lines: Element[], index: number) => boolean, matchAlgorithm: MatchAlgorithm | undefined): ShikiTransformer;
+export declare function createCommentNotationTransformer(name: string, regex: RegExp, onMatch: (this: ShikiTransformerContext, match: string[], line: Element, commentNode: Element, lines: Element[], index: number) => boolean, matchAlgorithm: MatchAlgorithm | undefined): ShikiTransformer;
 //#endregion
 //#region src/transformers/compact-line-options.d.ts
-interface TransformerCompactLineOption {
+export interface TransformerCompactLineOption {
   /**
    * 1-based line number.
    */
@@ -25,11 +25,11 @@ interface TransformerCompactLineOption {
 /**
  * Transformer for `shiki`'s legacy `lineOptions`
  */
-declare function transformerCompactLineOptions(lineOptions?: TransformerCompactLineOption[]): ShikiTransformer$1;
+export declare function transformerCompactLineOptions(lineOptions?: TransformerCompactLineOption[]): ShikiTransformer$1;
 //#endregion
 //#region src/transformers/meta-highlight.d.ts
-declare function parseMetaHighlightString(meta: string): number[] | null;
-interface TransformerMetaHighlightOptions {
+export declare function parseMetaHighlightString(meta: string): number[] | null;
+export interface TransformerMetaHighlightOptions {
   /**
    * Class for highlighted lines
    *
@@ -46,11 +46,11 @@ interface TransformerMetaHighlightOptions {
 /**
  * Allow using `{1,3-5}` in the code snippet meta to mark highlighted lines.
  */
-declare function transformerMetaHighlight(options?: TransformerMetaHighlightOptions): ShikiTransformer$1;
+export declare function transformerMetaHighlight(options?: TransformerMetaHighlightOptions): ShikiTransformer$1;
 //#endregion
 //#region src/transformers/meta-highlight-word.d.ts
-declare function parseMetaHighlightWords(meta: string): string[];
-interface TransformerMetaWordHighlightOptions {
+export declare function parseMetaHighlightWords(meta: string): string[];
+export interface TransformerMetaWordHighlightOptions {
   /**
    * Class for highlighted words
    *
@@ -61,11 +61,11 @@ interface TransformerMetaWordHighlightOptions {
 /**
  * Allow using `/word/` in the code snippet meta to mark highlighted words.
  */
-declare function transformerMetaWordHighlight(options?: TransformerMetaWordHighlightOptions): ShikiTransformer$1;
-declare function findAllSubstringIndexes(str: string, substr: string): number[];
+export declare function transformerMetaWordHighlight(options?: TransformerMetaWordHighlightOptions): ShikiTransformer$1;
+export declare function findAllSubstringIndexes(str: string, substr: string): number[];
 //#endregion
 //#region src/transformers/notation-diff.d.ts
-interface TransformerNotationDiffOptions extends MatchAlgorithmOptions {
+export interface TransformerNotationDiffOptions extends MatchAlgorithmOptions {
   /**
    * Class for added lines
    */
@@ -86,10 +86,10 @@ interface TransformerNotationDiffOptions extends MatchAlgorithmOptions {
 /**
  * Use `[!code ++]` and `[!code --]` to mark added and removed lines.
  */
-declare function transformerNotationDiff(options?: TransformerNotationDiffOptions): ShikiTransformer$1;
+export declare function transformerNotationDiff(options?: TransformerNotationDiffOptions): ShikiTransformer$1;
 //#endregion
 //#region src/transformers/notation-error-level.d.ts
-interface TransformerNotationErrorLevelOptions extends MatchAlgorithmOptions {
+export interface TransformerNotationErrorLevelOptions extends MatchAlgorithmOptions {
   classMap?: Record<string, string | string[]>;
   /**
    * Class added to the <pre> element when the current code has diff
@@ -103,10 +103,10 @@ interface TransformerNotationErrorLevelOptions extends MatchAlgorithmOptions {
 /**
  * Allow using `[!code error]` `[!code warning]` notation in code to mark highlighted lines.
  */
-declare function transformerNotationErrorLevel(options?: TransformerNotationErrorLevelOptions): ShikiTransformer$1;
+export declare function transformerNotationErrorLevel(options?: TransformerNotationErrorLevelOptions): ShikiTransformer$1;
 //#endregion
 //#region src/transformers/notation-focus.d.ts
-interface TransformerNotationFocusOptions extends MatchAlgorithmOptions {
+export interface TransformerNotationFocusOptions extends MatchAlgorithmOptions {
   /**
    * Class for focused lines
    */
@@ -123,10 +123,10 @@ interface TransformerNotationFocusOptions extends MatchAlgorithmOptions {
 /**
  * Allow using `[!code focus]` notation in code to mark focused lines.
  */
-declare function transformerNotationFocus(options?: TransformerNotationFocusOptions): ShikiTransformer$1;
+export declare function transformerNotationFocus(options?: TransformerNotationFocusOptions): ShikiTransformer$1;
 //#endregion
 //#region src/transformers/notation-highlight.d.ts
-interface TransformerNotationHighlightOptions extends MatchAlgorithmOptions {
+export interface TransformerNotationHighlightOptions extends MatchAlgorithmOptions {
   /**
    * Class for highlighted lines
    */
@@ -143,10 +143,10 @@ interface TransformerNotationHighlightOptions extends MatchAlgorithmOptions {
 /**
  * Allow using `[!code highlight]` notation in code to mark highlighted lines.
  */
-declare function transformerNotationHighlight(options?: TransformerNotationHighlightOptions): ShikiTransformer$1;
+export declare function transformerNotationHighlight(options?: TransformerNotationHighlightOptions): ShikiTransformer$1;
 //#endregion
 //#region src/transformers/notation-highlight-word.d.ts
-interface TransformerNotationWordHighlightOptions extends MatchAlgorithmOptions {
+export interface TransformerNotationWordHighlightOptions extends MatchAlgorithmOptions {
   /**
    * Class for highlighted words
    */
@@ -155,11 +155,15 @@ interface TransformerNotationWordHighlightOptions extends MatchAlgorithmOptions
    * Class added to the root element when the code has highlighted words
    */
   classActivePre?: string;
+  /**
+   * Class added to the <code> element when the code has highlighted words
+   */
+  classActiveCode?: string;
 }
-declare function transformerNotationWordHighlight(options?: TransformerNotationWordHighlightOptions): ShikiTransformer$1;
+export declare function transformerNotationWordHighlight(options?: TransformerNotationWordHighlightOptions): ShikiTransformer$1;
 //#endregion
 //#region src/transformers/notation-map.d.ts
-interface TransformerNotationMapOptions extends MatchAlgorithmOptions {
+export interface TransformerNotationMapOptions extends MatchAlgorithmOptions {
   classMap?: Record<string, string | string[]>;
   /**
    * Class added to the <pre> element when the current code has diff
@@ -170,10 +174,10 @@ interface TransformerNotationMapOptions extends MatchAlgorithmOptions {
    */
   classActiveCode?: string;
 }
-declare function transformerNotationMap(options?: TransformerNotationMapOptions, name?: string): ShikiTransformer$1;
+export declare function transformerNotationMap(options?: TransformerNotationMapOptions, name?: string): ShikiTransformer$1;
 //#endregion
 //#region src/transformers/remove-comments.d.ts
-interface TransformerRemoveCommentsOptions {
+export interface TransformerRemoveCommentsOptions {
   /**
    * Remove lines that become empty after removing comments.
    * @default true
@@ -183,14 +187,14 @@ interface TransformerRemoveCommentsOptions {
 /**
  * Remove comments from the code.
  */
-declare function transformerRemoveComments(options?: TransformerRemoveCommentsOptions): ShikiTransformer$1;
+export declare function transformerRemoveComments(options?: TransformerRemoveCommentsOptions): ShikiTransformer$1;
 //#endregion
 //#region src/transformers/remove-line-breaks.d.ts
 /**
  * Remove line breaks between lines.
  * Useful when you override `display: block` to `.line` in CSS.
  */
-declare function transformerRemoveLineBreak(): ShikiTransformer$1;
+export declare function transformerRemoveLineBreak(): ShikiTransformer$1;
 //#endregion
 //#region src/transformers/remove-notation-escape.d.ts
 /**
@@ -198,20 +202,40 @@ declare function transformerRemoveLineBreak(): ShikiTransformer$1;
  * Useful when you want to write `// [!code` in markdown.
  * If you process `// [\!code ...]` expression, you can get `// [!code ...]` in the output.
  */
-declare function transformerRemoveNotationEscape(): ShikiTransformer$1;
+export declare function transformerRemoveNotationEscape(): ShikiTransformer$1;
 //#endregion
 //#region src/transformers/render-indent-guides.d.ts
-interface TransformerRenderIndentGuidesOptions {
+export interface TransformerRenderIndentGuidesOptions {
   indent?: number | false;
 }
 /**
  * Render indentations as separate tokens.
  * Apply with CSS, it can be used to render indent guides visually.
  */
-declare function transformerRenderIndentGuides(options?: TransformerRenderIndentGuidesOptions): ShikiTransformer$1;
+export declare function transformerRenderIndentGuides(options?: TransformerRenderIndentGuidesOptions): ShikiTransformer$1;
+//#endregion
+//#region src/transformers/render-line-number.d.ts
+export interface TransformerRenderLineNumberOptions {
+  /**
+   * Class for line number
+   * @default 'line-number'
+   */
+  classLineNumber?: string;
+  /**
+   * Start number
+   * @default 1
+   */
+  start?: number;
+}
+/**
+ * Render line number as separate tokens.
+ *
+ * @param options
+ */
+export declare function transformerRenderLineNumber(options?: TransformerRenderLineNumberOptions): ShikiTransformer$1;
 //#endregion
 //#region src/transformers/render-whitespace.d.ts
-interface TransformerRenderWhitespaceOptions {
+export interface TransformerRenderWhitespaceOptions {
   /**
    * Class for tab
    *
@@ -234,10 +258,10 @@ interface TransformerRenderWhitespaceOptions {
  * Render whitespaces as separate tokens.
  * Apply with CSS, it can be used to render tabs and spaces visually.
  */
-declare function transformerRenderWhitespace(options?: TransformerRenderWhitespaceOptions): ShikiTransformer$1;
+export declare function transformerRenderWhitespace(options?: TransformerRenderWhitespaceOptions): ShikiTransformer$1;
 //#endregion
 //#region src/transformers/style-to-class.d.ts
-interface TransformerStyleToClassOptions {
+export interface TransformerStyleToClassOptions {
   /**
    * Prefix for class names.
    * @default '__shiki_'
@@ -254,7 +278,7 @@ interface TransformerStyleToClassOptions {
    */
   classReplacer?: (className: string) => string;
 }
-interface ShikiTransformerStyleToClass extends ShikiTransformer$1 {
+export interface ShikiTransformerStyleToClass extends ShikiTransformer$1 {
   getClassRegistry: () => Map<string, Record<string, string> | string>;
   getCSS: () => string;
   clearRegistry: () => void;
@@ -263,6 +287,5 @@ interface ShikiTransformerStyleToClass extends ShikiTransformer$1 {
  * Remove line breaks between lines.
  * Useful when you override `display: block` to `.line` in CSS.
  */
-declare function transformerStyleToClass(options?: TransformerStyleToClassOptions): ShikiTransformerStyleToClass;
-//#endregion
-export { ShikiTransformerStyleToClass, TransformerCompactLineOption, TransformerMetaHighlightOptions, TransformerMetaWordHighlightOptions, TransformerNotationDiffOptions, TransformerNotationErrorLevelOptions, TransformerNotationFocusOptions, TransformerNotationHighlightOptions, TransformerNotationMapOptions, TransformerNotationWordHighlightOptions, TransformerRemoveCommentsOptions, TransformerRenderIndentGuidesOptions, TransformerRenderWhitespaceOptions, TransformerStyleToClassOptions, createCommentNotationTransformer, findAllSubstringIndexes, parseMetaHighlightString, parseMetaHighlightWords, transformerCompactLineOptions, transformerMetaHighlight, transformerMetaWordHighlight, transformerNotationDiff, transformerNotationErrorLevel, transformerNotationFocus, transformerNotationHighlight, transformerNotationMap, transformerNotationWordHighlight, transformerRemoveComments, transformerRemoveLineBreak, transformerRemoveNotationEscape, transformerRenderIndentGuides, transformerRenderWhitespace, transformerStyleToClass };
+export declare function transformerStyleToClass(options?: TransformerStyleToClassOptions): ShikiTransformerStyleToClass;
+//#endregion

package/node_modules/@pierre/diffs/node_modules/@shikijs/transformers/dist/index.mjs

@@ -2,6 +2,7 @@
 const RE_SPLIT_COMMENT = /(\s+\/\/)/;
 const RE_V1_END_COMMENT_PREFIX = /(?:\/\/|["'#]|;{1,2}|%{1,2}|--)(\s*)$/;
 const RE_V3_END_COMMENT_PREFIX = /(?:\/\/|#|;{1,2}|%{1,2}|--)(\s*)$/;
+const RE_LINE_COMMENT_PREFIX = /^(?:\/\/|["'#]|;{1,2}|%{1,2}|--)$/;
 /**
 * some comment formats have to be located at the end of line
 * hence we can skip matching them for other tokens
@@ -61,7 +62,7 @@ function parseComments(lines, jsx, matchAlgorithm) {
 				const prevToken = elements[i - 1];
 				if (prevToken?.type === "element") {
 					const prevHead = prevToken.children.at(0);
-					if (prevHead?.type === "text" && prevHead.value.includes("//")) {
+					if (prevHead?.type === "text" && (prevHead.value.includes("//") || RE_LINE_COMMENT_PREFIX.test(prevHead.value.trim()))) {
 						const combinedMatch = matchToken(prevHead.value + head.value, isLast);
 						if (combinedMatch) {
 							match = combinedMatch;
@@ -149,6 +150,7 @@ function v3ClearEndCommentPrefix(text) {
 }
 //#endregion
 //#region src/shared/notation-transformer.ts
+const RE_NOTATION = /#?\s*\[!code\b(?:\\.|[^\]])*\]/gi;
 function createCommentNotationTransformer(name, regex, onMatch, matchAlgorithm) {
 	matchAlgorithm ??= "v3";
 	return {
@@ -163,7 +165,8 @@ function createCommentNotationTransformer(name, regex, onMatch, matchAlgorithm)
 			for (const comment of parsed) {
 				if (comment.info[1].length === 0) continue;
 				let lineIdx = lines.indexOf(comment.line);
-				if (comment.isLineCommentOnly && matchAlgorithm !== "v1") lineIdx++;
+				const isStandaloneNotation = comment.info[1].replace(RE_NOTATION, "").replace(regex, "").trim().length === 0;
+				if (comment.isLineCommentOnly && isStandaloneNotation && matchAlgorithm !== "v1") lineIdx++;
 				let replaced = false;
 				comment.info[1] = comment.info[1].replace(regex, (...match) => {
 					if (onMatch.call(this, match, comment.line, comment.token, lines, lineIdx)) {
@@ -446,12 +449,13 @@ function inheritElement(original, overrides) {
 const RE_CODE_WORD = /\s*\[!code word:((?:\\.|[^:\]])+)(:\d+)?\]/;
 const RE_UNESCAPE = /\\(.)/g;
 function transformerNotationWordHighlight(options = {}) {
-	const { classActiveWord = "highlighted-word", classActivePre = void 0 } = options;
+	const { classActiveWord = "highlighted-word", classActivePre = void 0, classActiveCode = void 0 } = options;
 	return createCommentNotationTransformer("@shikijs/transformers:notation-highlight-word", RE_CODE_WORD, function([_, word, range], _line, comment, lines, index) {
 		const lineNum = range ? Number.parseInt(range.slice(1), 10) : lines.length;
 		word = word.replace(RE_UNESCAPE, "$1");
 		for (let i = index; i < Math.min(index + lineNum, lines.length); i++) highlightWordInLine.call(this, lines[i], comment, word, classActiveWord);
 		if (classActivePre) this.addClassToHast(this.pre, classActivePre);
+		if (classActiveCode) this.addClassToHast(this.code, classActiveCode);
 		return true;
 	}, options.matchAlgorithm);
 }
@@ -578,6 +582,33 @@ function transformerRenderIndentGuides(options = {}) {
 	};
 }
 //#endregion
+//#region src/transformers/render-line-number.ts
+/**
+* Render line number as separate tokens.
+*
+* @param options
+*/
+function transformerRenderLineNumber(options = {}) {
+	const { classLineNumber = "line-number", start = 1 } = options;
+	return {
+		name: "@shikijs/transformers:render-line-number",
+		line(node, line) {
+			if (node.tagName === "span") {
+				const num = start + line - 1;
+				node.children.unshift({
+					type: "element",
+					tagName: "span",
+					properties: { class: classLineNumber },
+					children: [{
+						type: "text",
+						value: String(num)
+					}]
+				});
+			}
+		}
+	};
+}
+//#endregion
 //#region src/shared/utils.ts
 function isTab(part) {
 	return part === "	";
@@ -741,4 +772,4 @@ function cyrb53(str, seed = 0) {
 	return (4294967296 * (2097151 & h2) + (h1 >>> 0)).toString(36).slice(0, 6);
 }
 //#endregion
-export { createCommentNotationTransformer, findAllSubstringIndexes, parseMetaHighlightString, parseMetaHighlightWords, transformerCompactLineOptions, transformerMetaHighlight, transformerMetaWordHighlight, transformerNotationDiff, transformerNotationErrorLevel, transformerNotationFocus, transformerNotationHighlight, transformerNotationMap, transformerNotationWordHighlight, transformerRemoveComments, transformerRemoveLineBreak, transformerRemoveNotationEscape, transformerRenderIndentGuides, transformerRenderWhitespace, transformerStyleToClass };
+export { createCommentNotationTransformer, findAllSubstringIndexes, parseMetaHighlightString, parseMetaHighlightWords, transformerCompactLineOptions, transformerMetaHighlight, transformerMetaWordHighlight, transformerNotationDiff, transformerNotationErrorLevel, transformerNotationFocus, transformerNotationHighlight, transformerNotationMap, transformerNotationWordHighlight, transformerRemoveComments, transformerRemoveLineBreak, transformerRemoveNotationEscape, transformerRenderIndentGuides, transformerRenderLineNumber, transformerRenderWhitespace, transformerStyleToClass };

package/node_modules/@pierre/diffs/node_modules/@shikijs/transformers/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@shikijs/transformers",
   "type": "module",
-  "version": "4.4.3",
+  "version": "4.5.0",
   "description": "Collective of common transformers transformers for Shiki",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -30,8 +30,8 @@
     "node": ">=20"
   },
   "dependencies": {
-    "@shikijs/core": "4.4.3",
-    "@shikijs/types": "4.4.3"
+    "@shikijs/core": "4.5.0",
+    "@shikijs/types": "4.5.0"
   },
   "scripts": {
     "build": "tsdown",