nuxt-ignis 0.5.2 → 0.5.3

package/.output/server/node_modules/@shikijs/core/dist/index.mjs

@@ -57,6 +57,9 @@ function addClassToHast(node, className) {
 }
 
 function splitLines(code, preserveEnding = false) {
+  if (code.length === 0) {
+    return [["", 0]];
+  }
   const parts = code.split(/(\r?\n)/g);
   let index = 0;
   const lines = [];
@@ -102,14 +105,26 @@ function createPositionConverter(code) {
 }
 function guessEmbeddedLanguages(code, _lang, highlighter) {
   const langs = /* @__PURE__ */ new Set();
-  for (const match of code.matchAll(/lang=["']([\w-]+)["']/g)) {
-    langs.add(match[1]);
+  for (const match of code.matchAll(/:?lang=["']([^"']+)["']/g)) {
+    const lang = match[1].toLowerCase().trim();
+    if (lang)
+      langs.add(lang);
   }
   for (const match of code.matchAll(/(?:```|~~~)([\w-]+)/g)) {
-    langs.add(match[1]);
+    const lang = match[1].toLowerCase().trim();
+    if (lang)
+      langs.add(lang);
   }
   for (const match of code.matchAll(/\\begin\{([\w-]+)\}/g)) {
-    langs.add(match[1]);
+    const lang = match[1].toLowerCase().trim();
+    if (lang)
+      langs.add(lang);
+  }
+  for (const match of code.matchAll(/<script\s+(?:type|lang)=["']([^"']+)["']/gi)) {
+    const fullType = match[1].toLowerCase().trim();
+    const lang = fullType.includes("/") ? fullType.split("/").pop() : fullType;
+    if (lang)
+      langs.add(lang);
   }
   if (!highlighter)
     return Array.from(langs);
@@ -844,15 +859,26 @@ function tokenizeAnsiWithTheme(theme, fileContents, options) {
   );
 }
 function dimColor(color) {
-  const hexMatch = color.match(/#([0-9a-f]{3})([0-9a-f]{3})?([0-9a-f]{2})?/i);
+  const hexMatch = color.match(/#([0-9a-f]{3,8})/i);
   if (hexMatch) {
-    if (hexMatch[3]) {
-      const alpha = Math.round(Number.parseInt(hexMatch[3], 16) / 2).toString(16).padStart(2, "0");
-      return `#${hexMatch[1]}${hexMatch[2]}${alpha}`;
-    } else if (hexMatch[2]) {
-      return `#${hexMatch[1]}${hexMatch[2]}80`;
-    } else {
-      return `#${Array.from(hexMatch[1]).map((x) => `${x}${x}`).join("")}80`;
+    const hex = hexMatch[1];
+    if (hex.length === 8) {
+      const alpha = Math.round(Number.parseInt(hex.slice(6, 8), 16) / 2).toString(16).padStart(2, "0");
+      return `#${hex.slice(0, 6)}${alpha}`;
+    } else if (hex.length === 6) {
+      return `#${hex}80`;
+    } else if (hex.length === 4) {
+      const r = hex[0];
+      const g = hex[1];
+      const b = hex[2];
+      const a = hex[3];
+      const alpha = Math.round(Number.parseInt(`${a}${a}`, 16) / 2).toString(16).padStart(2, "0");
+      return `#${r}${r}${g}${g}${b}${b}${alpha}`;
+    } else if (hex.length === 3) {
+      const r = hex[0];
+      const g = hex[1];
+      const b = hex[2];
+      return `#${r}${r}${g}${g}${b}${b}80`;
     }
   }
   const cssVarMatch = color.match(/var\((--[\w-]+-ansi-[\w-]+)\)/);
@@ -863,15 +889,15 @@ function dimColor(color) {
 
 function codeToTokensBase(internal, code, options = {}) {
   const {
-    lang = "text",
     theme: themeName = internal.getLoadedThemes()[0]
   } = options;
+  const lang = internal.resolveLangAlias(options.lang || "text");
   if (isPlainLang(lang) || isNoneTheme(themeName))
     return splitLines(code).map((line) => [{ content: line[0], offset: line[1] }]);
   const { theme, colorMap } = internal.setTheme(themeName);
   if (lang === "ansi")
     return tokenizeAnsiWithTheme(theme, code, options);
-  const _grammar = internal.getLanguage(lang);
+  const _grammar = internal.getLanguage(options.lang || "text");
   if (options.grammarState) {
     if (options.grammarState.lang !== _grammar.name) {
       throw new ShikiError$1(`Grammar state language "${options.grammarState.lang}" does not match highlight language "${_grammar.name}"`);
@@ -1386,6 +1412,8 @@ function tokensToHast(tokens, options, transformerContext, grammarState = getLas
         lineNode = transformer?.line?.call(context, lineNode, idx + 1) || lineNode;
       lineNodes.push(lineNode);
       lines.push(lineNode);
+    } else if (structure === "inline") {
+      lineNodes.push(lineNode);
     }
   });
   if (structure === "classic") {
@@ -1395,6 +1423,45 @@ function tokensToHast(tokens, options, transformerContext, grammarState = getLas
     for (const transformer of transformers)
       preNode = transformer?.pre?.call(context, preNode) || preNode;
     root.children.push(preNode);
+  } else if (structure === "inline") {
+    const syntheticLines = [];
+    let currentLine = {
+      type: "element",
+      tagName: "span",
+      properties: { class: "line" },
+      children: []
+    };
+    for (const child of root.children) {
+      if (child.type === "element" && child.tagName === "br") {
+        syntheticLines.push(currentLine);
+        currentLine = {
+          type: "element",
+          tagName: "span",
+          properties: { class: "line" },
+          children: []
+        };
+      } else if (child.type === "element" || child.type === "text") {
+        currentLine.children.push(child);
+      }
+    }
+    syntheticLines.push(currentLine);
+    const syntheticCode = {
+      type: "element",
+      tagName: "code",
+      properties: {},
+      children: syntheticLines
+    };
+    let transformedCode = syntheticCode;
+    for (const transformer of transformers)
+      transformedCode = transformer?.code?.call(context, transformedCode) || transformedCode;
+    root.children = [];
+    for (let i = 0; i < transformedCode.children.length; i++) {
+      if (i > 0)
+        root.children.push({ type: "element", tagName: "br", properties: {}, children: [] });
+      const line = transformedCode.children[i];
+      if (line.type === "element")
+        root.children.push(...line.children);
+    }
   }
   let result = root;
   for (const transformer of transformers)
@@ -1407,12 +1474,12 @@ function mergeWhitespaceTokens(tokens) {
   return tokens.map((line) => {
     const newLine = [];
     let carryOnContent = "";
-    let firstOffset = 0;
+    let firstOffset;
     line.forEach((token, idx) => {
       const isDecorated = token.fontStyle && (token.fontStyle & FontStyle.Underline || token.fontStyle & FontStyle.Strikethrough);
       const couldMerge = !isDecorated;
       if (couldMerge && token.content.match(/^\s+$/) && line[idx + 1]) {
-        if (!firstOffset)
+        if (firstOffset === void 0)
           firstOffset = token.offset;
         carryOnContent += token.content;
       } else {
@@ -1432,7 +1499,7 @@ function mergeWhitespaceTokens(tokens) {
               token
             );
           }
-          firstOffset = 0;
+          firstOffset = void 0;
           carryOnContent = "";
         } else {
           newLine.push(token);
@@ -1644,6 +1711,21 @@ class ShikiError extends Error {
   }
 }
 
+function resolveLangAlias(name, alias) {
+  if (!alias)
+    return name;
+  if (alias[name]) {
+    const resolved = /* @__PURE__ */ new Set([name]);
+    while (alias[name]) {
+      name = alias[name];
+      if (resolved.has(name))
+        throw new ShikiError(`Circular alias \`${Array.from(resolved).join(" -> ")} -> ${name}\``);
+      resolved.add(name);
+    }
+  }
+  return name;
+}
+
 class Registry extends Registry$1 {
   constructor(_resolver, _themes, _langs, _alias = {}) {
     super(_resolver);
@@ -1694,15 +1776,7 @@ class Registry extends Registry$1 {
     this._syncRegistry.setTheme(textmateTheme);
   }
   getGrammar(name) {
-    if (this._alias[name]) {
-      const resolved = /* @__PURE__ */ new Set([name]);
-      while (this._alias[name]) {
-        name = this._alias[name];
-        if (resolved.has(name))
-          throw new ShikiError(`Circular alias \`${Array.from(resolved).join(" -> ")} -> ${name}\``);
-        resolved.add(name);
-      }
-    }
+    name = resolveLangAlias(name, this._alias);
     return this._resolvedGrammars.get(name);
   }
   loadLanguage(lang) {
@@ -1769,8 +1843,9 @@ class Registry extends Registry$1 {
   resolveEmbeddedLanguages(lang) {
     this._langMap.set(lang.name, lang);
     this._langGraph.set(lang.name, lang);
-    if (lang.embeddedLangs) {
-      for (const embeddedLang of lang.embeddedLangs)
+    const embedded = lang.embeddedLanguages ?? lang.embeddedLangs;
+    if (embedded) {
+      for (const embeddedLang of embedded)
         this._langGraph.set(embeddedLang, this._langMap.get(embeddedLang));
     }
   }
@@ -1837,6 +1912,9 @@ function createShikiInternalSync(options) {
   const resolver = new Resolver(options.engine, langs);
   const _registry = new Registry(resolver, themes, langs, options.langAlias);
   let _lastTheme;
+  function resolveLangAlias$1(name) {
+    return resolveLangAlias(name, options.langAlias);
+  }
   function getLanguage(name) {
     ensureNotDisposed();
     const _lang = _registry.getGrammar(typeof name === "string" ? name : name.name);
@@ -1908,6 +1986,7 @@ function createShikiInternalSync(options) {
     getLanguage,
     getLoadedThemes,
     getLoadedLanguages,
+    resolveLangAlias: resolveLangAlias$1,
     loadLanguage,
     loadLanguageSync,
     loadTheme,
@@ -1991,16 +2070,16 @@ function makeSingletonHighlighterCore(createHighlighter) {
 }
 const getSingletonHighlighterCore = /* @__PURE__ */ makeSingletonHighlighterCore(createHighlighterCore);
 
-function createdBundledHighlighter(options) {
+function createBundledHighlighter(options) {
   const bundledLanguages = options.langs;
   const bundledThemes = options.themes;
   const engine = options.engine;
   async function createHighlighter(options2) {
     function resolveLang(lang) {
       if (typeof lang === "string") {
+        lang = options2.langAlias?.[lang] || lang;
         if (isSpecialLang(lang))
           return [];
-        lang = options2.langAlias?.[lang] || lang;
         const bundle = bundledLanguages[lang];
         if (!bundle)
           throw new ShikiError$1(`Language \`${lang}\` is not included in this bundle. You may want to load it from external source.`);
@@ -2117,6 +2196,7 @@ function createSingletonShorthands(createHighlighter, config) {
     }
   };
 }
+const createdBundledHighlighter = createBundledHighlighter;
 
 function createCssVariablesTheme(options = {}) {
   const {
@@ -2353,4 +2433,4 @@ function createCssVariablesTheme(options = {}) {
   return theme;
 }
 
-export { addClassToHast, applyColorReplacements, codeToHast, codeToHtml, codeToTokens, codeToTokensBase, codeToTokensWithThemes, createCssVariablesTheme, createHighlighterCore, createHighlighterCoreSync, createPositionConverter, createShikiInternal, createShikiInternalSync, createSingletonShorthands, createdBundledHighlighter, enableDeprecationWarnings, flatTokenVariants, getSingletonHighlighterCore, getTokenStyleObject, guessEmbeddedLanguages, hastToHtml, isNoneTheme, isPlainLang, isSpecialLang, isSpecialTheme, makeSingletonHighlighter, makeSingletonHighlighterCore, normalizeGetter, normalizeTheme, resolveColorReplacements, splitLines, splitToken, splitTokens, stringifyTokenStyle, toArray, tokenizeAnsiWithTheme, tokenizeWithTheme, tokensToHast, transformerDecorations, warnDeprecated };
+export { addClassToHast, applyColorReplacements, codeToHast, codeToHtml, codeToTokens, codeToTokensBase, codeToTokensWithThemes, createBundledHighlighter, createCssVariablesTheme, createHighlighterCore, createHighlighterCoreSync, createPositionConverter, createShikiInternal, createShikiInternalSync, createSingletonShorthands, createdBundledHighlighter, enableDeprecationWarnings, flatTokenVariants, getSingletonHighlighterCore, getTokenStyleObject, guessEmbeddedLanguages, hastToHtml, isNoneTheme, isPlainLang, isSpecialLang, isSpecialTheme, makeSingletonHighlighter, makeSingletonHighlighterCore, normalizeGetter, normalizeTheme, resolveColorReplacements, splitLines, splitToken, splitTokens, stringifyTokenStyle, toArray, tokenizeAnsiWithTheme, tokenizeWithTheme, tokensToHast, transformerDecorations, warnDeprecated };

package/.output/server/node_modules/@shikijs/core/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@shikijs/core",
   "type": "module",
-  "version": "3.15.0",
+  "version": "3.18.0",
   "description": "Core of Shiki",
   "author": "Pine Wu <octref@gmail.com>; Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -39,7 +39,7 @@
     "@shikijs/vscode-textmate": "^10.0.2",
     "@types/hast": "^3.0.4",
     "hast-util-to-html": "^9.0.5",
-    "@shikijs/types": "3.15.0"
+    "@shikijs/types": "3.18.0"
   },
   "scripts": {
     "build": "unbuild",

package/.output/server/node_modules/@shikijs/engine-javascript/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@shikijs/engine-javascript",
   "type": "module",
-  "version": "3.17.0",
+  "version": "3.20.0",
   "description": "Engine for Shiki using JavaScript's native RegExp",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -30,7 +30,7 @@
   "dependencies": {
     "@shikijs/vscode-textmate": "^10.0.2",
     "oniguruma-to-es": "^4.3.4",
-    "@shikijs/types": "3.17.0"
+    "@shikijs/types": "3.20.0"
   },
   "scripts": {
     "build": "unbuild",

package/.output/server/node_modules/@shikijs/engine-oniguruma/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@shikijs/engine-oniguruma",
   "type": "module",
-  "version": "3.17.0",
+  "version": "3.20.0",
   "description": "Engine for Shiki using Oniguruma RegExp engine in WebAssembly",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -30,7 +30,7 @@
   ],
   "dependencies": {
     "@shikijs/vscode-textmate": "^10.0.2",
-    "@shikijs/types": "3.17.0"
+    "@shikijs/types": "3.20.0"
   },
   "devDependencies": {
     "vscode-oniguruma": "1.7.0"

package/.output/server/node_modules/@shikijs/langs/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@shikijs/langs",
   "type": "module",
-  "version": "3.17.0",
+  "version": "3.20.0",
   "description": "TextMate grammars for Shiki in ESM",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -357,7 +357,7 @@
     "dist"
   ],
   "dependencies": {
-    "@shikijs/types": "3.17.0"
+    "@shikijs/types": "3.20.0"
   },
   "devDependencies": {
     "tm-grammars": "^1.26.0"

package/.output/server/node_modules/@shikijs/themes/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@shikijs/themes",
   "type": "module",
-  "version": "3.17.0",
+  "version": "3.20.0",
   "description": "TextMate themes for Shiki in ESM",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -87,7 +87,7 @@
     "dist"
   ],
   "dependencies": {
-    "@shikijs/types": "3.17.0"
+    "@shikijs/types": "3.20.0"
   },
   "devDependencies": {
     "tm-themes": "^1.10.13"

package/.output/server/node_modules/@shikijs/transformers/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 = "";
+                }
+              }
+            }
           }
         }
       }
@@ -197,28 +241,24 @@ function parseMetaHighlightString(meta) {
   if (!match)
     return null;
   const lines = match[1].split(",").flatMap((v) => {
-    const num = v.split("-").map((v2) => Number.parseInt(v2, 10));
-    if (num.length === 1)
-      return [num[0]];
-    return Array.from({ length: num[1] - num[0] + 1 }, (_, i) => i + num[0]);
+    const range = v.split("-").map((n) => Number.parseInt(n, 10));
+    return range.length === 1 ? [range[0]] : Array.from({ length: range[1] - range[0] + 1 }, (_, i) => range[0] + i);
   });
   return lines;
 }
 const symbol = Symbol("highlighted-lines");
 function transformerMetaHighlight(options = {}) {
-  const {
-    className = "highlighted"
-  } = options;
+  const { className = "highlighted", zeroIndexed = false } = options;
   return {
     name: "@shikijs/transformers:meta-highlight",
-    line(node, line) {
-      if (!this.options.meta?.__raw) {
+    line(node, lineNumber) {
+      if (!this.options.meta?.__raw)
         return;
-      }
       const meta = this.meta;
       meta[symbol] ??= parseMetaHighlightString(this.options.meta.__raw);
-      const lines = meta[symbol] ?? [];
-      if (lines.includes(line))
+      const highlightedLines = meta[symbol] ?? [];
+      const effectiveLine = zeroIndexed ? lineNumber - 1 : lineNumber;
+      if (highlightedLines.includes(effectiveLine))
         this.addClassToHast(node, className);
       return node;
     }
@@ -282,7 +322,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/.output/server/node_modules/@shikijs/transformers/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@shikijs/transformers",
   "type": "module",
-  "version": "3.15.0",
+  "version": "3.18.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.18.0",
+    "@shikijs/types": "3.18.0"
   },
   "scripts": {
     "build": "unbuild",

package/.output/server/node_modules/@shikijs/types/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@shikijs/types",
   "type": "module",
-  "version": "3.15.0",
+  "version": "3.18.0",
   "description": "Type definitions for Shiki",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",