@shikijs/transformers 3.15.0 → 3.17.0

package/dist/index.mjs

@@ -60,7 +60,32 @@ function parseComments(lines, jsx, matchAlgorithm) {
       if (head?.type !== "text")
         continue;
       const isLast = i === elements.length - 1;
-      const match = matchToken(head.value, isLast);
+      let match = matchToken(head.value, isLast);
+      let additionalTokens;
+      if (!match && i > 0 && head.value.trim().startsWith("[!code")) {
+        const prevToken = elements[i - 1];
+        if (prevToken?.type === "element") {
+          const prevHead = prevToken.children.at(0);
+          if (prevHead?.type === "text" && prevHead.value.includes("//")) {
+            const combinedValue = prevHead.value + head.value;
+            const combinedMatch = matchToken(combinedValue, isLast);
+            if (combinedMatch) {
+              match = combinedMatch;
+              out.push({
+                info: combinedMatch,
+                line,
+                token: prevToken,
+                // Use the previous token as the main token
+                isLineCommentOnly: elements.length === 2 && prevToken.children.length === 1 && token.children.length === 1,
+                isJsxStyle: false,
+                additionalTokens: [token]
+                // Current token is the additional one
+              });
+              continue;
+            }
+          }
+        }
+      }
       if (!match)
         continue;
       if (jsx && !isLast && i !== 0) {
@@ -70,7 +95,8 @@ function parseComments(lines, jsx, matchAlgorithm) {
           line,
           token,
           isLineCommentOnly: elements.length === 3 && token.children.length === 1,
-          isJsxStyle
+          isJsxStyle,
+          additionalTokens
         });
       } else {
         out.push({
@@ -78,7 +104,8 @@ function parseComments(lines, jsx, matchAlgorithm) {
           line,
           token,
           isLineCommentOnly: elements.length === 1 && token.children.length === 1,
-          isJsxStyle: false
+          isJsxStyle: false,
+          additionalTokens
         });
       }
     }
@@ -158,11 +185,28 @@ function createCommentNotationTransformer(name, regex, onMatch, matchAlgorithm)
         } else if (isEmpty && comment.isJsxStyle) {
           comment.line.children.splice(comment.line.children.indexOf(comment.token) - 1, 3);
         } else if (isEmpty) {
+          if (comment.additionalTokens) {
+            for (let j = comment.additionalTokens.length - 1; j >= 0; j--) {
+              const additionalToken = comment.additionalTokens[j];
+              const tokenIndex = comment.line.children.indexOf(additionalToken);
+              if (tokenIndex !== -1) {
+                comment.line.children.splice(tokenIndex, 1);
+              }
+            }
+          }
           comment.line.children.splice(comment.line.children.indexOf(comment.token), 1);
         } else {
           const head = comment.token.children[0];
           if (head.type === "text") {
             head.value = comment.info.join("");
+            if (comment.additionalTokens) {
+              for (const additionalToken of comment.additionalTokens) {
+                const additionalHead = additionalToken.children[0];
+                if (additionalHead?.type === "text") {
+                  additionalHead.value = "";
+                }
+              }
+            }
           }
         }
       }
@@ -282,7 +326,7 @@ function transformerNotationMap(options = {}, name = "@shikijs/transformers:nota
   } = options;
   return createCommentNotationTransformer(
     name,
-    new RegExp(`\\s*\\[!code (${Object.keys(classMap).map(escapeRegExp).join("|")})(:\\d+)?\\]`),
+    new RegExp(`#?\\s*\\[!code (${Object.keys(classMap).map(escapeRegExp).join("|")})(:\\d+)?\\]`, "gi"),
     function([_, match, range = ":1"], _line, _comment, lines, index) {
       const lineNum = Number.parseInt(range.slice(1), 10);
       for (let i = index; i < Math.min(index + lineNum, lines.length); i++) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@shikijs/transformers",
   "type": "module",
-  "version": "3.15.0",
+  "version": "3.17.0",
   "description": "Collective of common transformers transformers for Shiki",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -27,8 +27,8 @@
     "dist"
   ],
   "dependencies": {
-    "@shikijs/core": "3.15.0",
-    "@shikijs/types": "3.15.0"
+    "@shikijs/core": "3.17.0",
+    "@shikijs/types": "3.17.0"
   },
   "scripts": {
     "build": "unbuild",