laif-ds 0.2.20 → 0.2.22

package/dist/node_modules/@shikijs/core/dist/index.js

@@ -29,7 +29,7 @@ function U(n) {
 function fe(n) {
   return U(n);
 }
-function he(n, e) {
+function ue(n, e) {
   if (!e)
     return n;
   n.properties ||= {}, n.properties.class ||= [], typeof n.properties.class == "string" && (n.properties.class = n.properties.class.split(/\s+/g)), Array.isArray(n.properties.class) || (n.properties.class = []);
@@ -76,7 +76,7 @@ function _e(n) {
     posToIndex: s
   };
 }
-function ft(n, e, t) {
+function ut(n, e, t) {
   const s = /* @__PURE__ */ new Set();
   for (const o of n.matchAll(/lang=["']([\w-]+)["']/g))
     s.add(o[1]);
@@ -117,24 +117,24 @@ function Ce(n, e, t, s, r = "css-vars") {
     content: n.content,
     explanation: n.explanation,
     offset: n.offset
-  }, i = e.map((l) => M(n.variants[l])), a = new Set(i.flatMap((l) => Object.keys(l))), c = {}, f = (l, h) => {
-    const u = h === "color" ? "" : h === "background-color" ? "-bg" : `-${h}`;
-    return t + e[l] + (h === "color" ? "" : u);
+  }, i = e.map((l) => M(n.variants[l])), a = new Set(i.flatMap((l) => Object.keys(l))), c = {}, f = (l, u) => {
+    const h = u === "color" ? "" : u === "background-color" ? "-bg" : `-${u}`;
+    return t + e[l] + (u === "color" ? "" : h);
   };
-  return i.forEach((l, h) => {
-    for (const u of a) {
-      const p = l[u] || "inherit";
-      if (h === 0 && s && Le.includes(u))
+  return i.forEach((l, u) => {
+    for (const h of a) {
+      const p = l[h] || "inherit";
+      if (u === 0 && s && Le.includes(h))
         if (s === Y && i.length > 1) {
           const d = e.findIndex((g) => g === "light"), S = e.findIndex((g) => g === "dark");
           if (d === -1 || S === -1)
             throw new T('When using `defaultColor: "light-dark()"`, you must provide both `light` and `dark` themes');
-          const y = i[d][u] || "inherit", m = i[S][u] || "inherit";
-          c[u] = `light-dark(${y}, ${m})`, r === "css-vars" && (c[f(h, u)] = p);
+          const y = i[d][h] || "inherit", m = i[S][h] || "inherit";
+          c[h] = `light-dark(${y}, ${m})`, r === "css-vars" && (c[f(u, h)] = p);
         } else
-          c[u] = p;
+          c[h] = p;
       else
-        r === "css-vars" && (c[f(h, u)] = p);
+        r === "css-vars" && (c[f(u, h)] = p);
     }
   }), o.htmlStyle = c, o;
 }
@@ -150,12 +150,12 @@ function M(n) {
 function J(n) {
   return typeof n == "string" ? n : Object.entries(n).map(([e, t]) => `${e}:${t}`).join(";");
 }
-const ue = /* @__PURE__ */ new WeakMap();
+const he = /* @__PURE__ */ new WeakMap();
 function H(n, e) {
-  ue.set(n, e);
+  he.set(n, e);
 }
 function E(n) {
-  return ue.get(n);
+  return he.get(n);
 }
 class N {
   /**
@@ -241,11 +241,13 @@ function Ie() {
           const a = r.lines[i.line];
           if (a === void 0)
             throw new T(`Invalid decoration position ${JSON.stringify(i)}. Lines length: ${r.lines.length}`);
-          if (i.character < 0 || i.character > a.length)
+          let c = i.character;
+          if (c < 0 && (c = a.length + c), c < 0 || c > a.length)
             throw new T(`Invalid decoration position ${JSON.stringify(i)}. Line ${i.line} length: ${a.length}`);
           return {
             ...i,
-            offset: r.posToIndex(i.line, i.character)
+            character: c,
+            offset: r.posToIndex(i.line, c)
           };
         }
       };
@@ -276,12 +278,12 @@ function Ie() {
       const s = e(this), r = Array.from(t.children).filter((l) => l.type === "element" && l.tagName === "span");
       if (r.length !== s.converter.lines.length)
         throw new T(`Number of lines in code element (${r.length}) does not match the number of lines in the source (${s.converter.lines.length}). Failed to apply decorations.`);
-      function o(l, h, u, p) {
+      function o(l, u, h, p) {
         const d = r[l];
         let S = "", y = -1, m = -1;
-        if (h === 0 && (y = 0), u === 0 && (m = 0), u === Number.POSITIVE_INFINITY && (m = d.children.length), y === -1 || m === -1)
+        if (u === 0 && (y = 0), h === 0 && (m = 0), h === Number.POSITIVE_INFINITY && (m = d.children.length), y === -1 || m === -1)
           for (let b = 0; b < d.children.length; b++)
-            S += ge(d.children[b]), y === -1 && S.length === h && (y = b + 1), m === -1 && S.length === u && (m = b + 1);
+            S += ge(d.children[b]), y === -1 && S.length === u && (y = b + 1), m === -1 && S.length === h && (m = b + 1);
         if (y === -1)
           throw new T(`Failed to find start index for decoration ${JSON.stringify(p.start)}`);
         if (m === -1)
@@ -301,27 +303,27 @@ function Ie() {
           a(b, p, "wrapper"), d.children.splice(y, g.length, b);
         }
       }
-      function i(l, h) {
-        r[l] = a(r[l], h, "line");
+      function i(l, u) {
+        r[l] = a(r[l], u, "line");
       }
-      function a(l, h, u) {
-        const p = h.properties || {}, d = h.transform || ((S) => S);
-        return l.tagName = h.tagName || "span", l.properties = {
+      function a(l, u, h) {
+        const p = u.properties || {}, d = u.transform || ((S) => S);
+        return l.tagName = u.tagName || "span", l.properties = {
           ...l.properties,
           ...p,
           class: l.properties.class
-        }, h.properties?.class && he(l, h.properties.class), l = d(l, u) || l, l;
+        }, u.properties?.class && ue(l, u.properties.class), l = d(l, h) || l, l;
       }
-      const c = [], f = s.decorations.sort((l, h) => h.start.offset - l.start.offset || l.end.offset - h.end.offset);
+      const c = [], f = s.decorations.sort((l, u) => u.start.offset - l.start.offset || l.end.offset - u.end.offset);
       for (const l of f) {
-        const { start: h, end: u } = l;
-        if (h.line === u.line)
-          o(h.line, h.character, u.character, l);
-        else if (h.line < u.line) {
-          o(h.line, h.character, Number.POSITIVE_INFINITY, l);
-          for (let p = h.line + 1; p < u.line; p++)
+        const { start: u, end: h } = l;
+        if (u.line === h.line)
+          o(u.line, u.character, h.character, l);
+        else if (u.line < h.line) {
+          o(u.line, u.character, Number.POSITIVE_INFINITY, l);
+          for (let p = u.line + 1; p < h.line; p++)
             c.unshift(() => i(p, l));
-          o(u.line, 0, u.character, l);
+          o(h.line, 0, h.character, l);
         }
       }
       c.forEach((l) => l());
@@ -336,7 +338,7 @@ function Ee(n) {
     for (let s = e + 1; s < n.length; s++) {
       const r = n[s], o = t.start.offset <= r.start.offset && r.start.offset < t.end.offset, i = t.start.offset < r.end.offset && r.end.offset <= t.end.offset, a = r.start.offset <= t.start.offset && t.start.offset < r.end.offset, c = r.start.offset < t.end.offset && t.end.offset <= r.end.offset;
       if (o || i || a || c) {
-        if (o && i || a && c)
+        if (o && i || a && c || a && t.start.offset === t.end.offset || i && r.start.offset === r.end.offset)
           continue;
         throw new T(`Decorations ${JSON.stringify(t.start)} and ${JSON.stringify(r.start)} intersect.`);
       }
@@ -350,11 +352,29 @@ const Oe = [
   /* @__PURE__ */ Ie()
 ];
 function A(n) {
+  const e = je(n.transformers || []);
   return [
-    ...n.transformers || [],
+    ...e.pre,
+    ...e.normal,
+    ...e.post,
     ...Oe
   ];
 }
+function je(n) {
+  const e = [], t = [], s = [];
+  for (const r of n)
+    switch (r.enforce) {
+      case "pre":
+        e.push(r);
+        break;
+      case "post":
+        t.push(r);
+        break;
+      default:
+        s.push(r);
+    }
+  return { pre: e, post: t, normal: s };
+}
 var x = [
   "black",
   "red",
@@ -381,7 +401,7 @@ var x = [
   8: "hidden",
   9: "strikethrough"
 };
-function je(n, e) {
+function Me(n, e) {
   const t = n.indexOf("\x1B", e);
   if (t !== -1 && n[t + 1] === "[") {
     const s = n.indexOf("m", t);
@@ -410,7 +430,7 @@ function ne(n) {
       return { type: "table", index: Number(t) };
   }
 }
-function Me(n) {
+function Ae(n) {
   const e = [];
   for (; n.length > 0; ) {
     const t = n.shift();
@@ -478,21 +498,21 @@ function Me(n) {
   }
   return e;
 }
-function Ae() {
+function Be() {
   let n = null, e = null, t = /* @__PURE__ */ new Set();
   return {
     parse(s) {
       const r = [];
       let o = 0;
       do {
-        const i = je(s, o), a = i.sequence ? s.substring(o, i.startPosition) : s.substring(o);
+        const i = Me(s, o), a = i.sequence ? s.substring(o, i.startPosition) : s.substring(o);
         if (a.length > 0 && r.push({
           value: a,
           foreground: n,
           background: e,
           decorations: new Set(t)
         }), i.sequence) {
-          const c = Me(i.sequence);
+          const c = Ae(i.sequence);
           for (const f of c)
             f.type === "resetAll" ? (n = null, e = null, t.clear()) : f.type === "resetForegroundColor" ? n = null : f.type === "resetBackgroundColor" ? e = null : f.type === "resetDecoration" && t.delete(f.value);
           for (const f of c)
@@ -504,7 +524,7 @@ function Ae() {
     }
   };
 }
-var Be = {
+var Ge = {
   black: "#000000",
   red: "#bb0000",
   green: "#00bb00",
@@ -522,7 +542,7 @@ var Be = {
   brightCyan: "#55ffff",
   brightWhite: "#ffffff"
 };
-function Ge(n = Be) {
+function Re(n = Ge) {
   function e(a) {
     return n[a];
   }
@@ -539,8 +559,8 @@ function Ge(n = Be) {
     let a = [0, 95, 135, 175, 215, 255];
     for (let f = 0; f < 6; f++)
       for (let l = 0; l < 6; l++)
-        for (let h = 0; h < 6; h++)
-          s.push(t([a[f], a[l], a[h]]));
+        for (let u = 0; u < 6; u++)
+          s.push(t([a[f], a[l], a[u]]));
     let c = 8;
     for (let f = 0; f < 24; f++, c += 10)
       s.push(t([c, c, c]));
@@ -563,32 +583,32 @@ function Ge(n = Be) {
     value: i
   };
 }
-function Re(n, e, t) {
-  const s = j(n, t), r = W(e), o = Ge(
+function We(n, e, t) {
+  const s = j(n, t), r = W(e), o = Re(
     Object.fromEntries(
       x.map((a) => [
         a,
         n.colors?.[`terminal.ansi${a[0].toUpperCase()}${a.substring(1)}`]
       ])
     )
-  ), i = Ae();
+  ), i = Be();
   return r.map(
     (a) => i.parse(a[0]).map((c) => {
       let f, l;
-      c.decorations.has("reverse") ? (f = c.background ? o.value(c.background) : n.bg, l = c.foreground ? o.value(c.foreground) : n.fg) : (f = c.foreground ? o.value(c.foreground) : n.fg, l = c.background ? o.value(c.background) : void 0), f = L(f, s), l = L(l, s), c.decorations.has("dim") && (f = We(f));
-      let h = w.None;
-      return c.decorations.has("bold") && (h |= w.Bold), c.decorations.has("italic") && (h |= w.Italic), c.decorations.has("underline") && (h |= w.Underline), c.decorations.has("strikethrough") && (h |= w.Strikethrough), {
+      c.decorations.has("reverse") ? (f = c.background ? o.value(c.background) : n.bg, l = c.foreground ? o.value(c.foreground) : n.fg) : (f = c.foreground ? o.value(c.foreground) : n.fg, l = c.background ? o.value(c.background) : void 0), f = L(f, s), l = L(l, s), c.decorations.has("dim") && (f = He(f));
+      let u = w.None;
+      return c.decorations.has("bold") && (u |= w.Bold), c.decorations.has("italic") && (u |= w.Italic), c.decorations.has("underline") && (u |= w.Underline), c.decorations.has("strikethrough") && (u |= w.Strikethrough), {
         content: c.value,
         offset: a[1],
         // TODO: more accurate offset? might need to fork ansi-sequence-parser
         color: f,
         bgColor: l,
-        fontStyle: h
+        fontStyle: u
       };
     })
   );
 }
-function We(n) {
+function He(n) {
   const e = n.match(/#([0-9a-f]{3})([0-9a-f]{3})?([0-9a-f]{2})?/);
   if (e)
     if (e[3]) {
@@ -607,7 +627,7 @@ function q(n, e, t = {}) {
     return W(e).map((c) => [{ content: c[0], offset: c[1] }]);
   const { theme: o, colorMap: i } = n.setTheme(r);
   if (s === "ansi")
-    return Re(o, e, t);
+    return We(o, e, t);
   const a = n.getLanguage(s);
   if (t.grammarState) {
     if (t.grammarState.lang !== a.name)
@@ -615,9 +635,9 @@ function q(n, e, t = {}) {
     if (!t.grammarState.themes.includes(o.name))
       throw new T(`Grammar state themes "${t.grammarState.themes}" do not contain highlight theme "${o.name}"`);
   }
-  return De(e, a, o, i, t);
+  return Fe(e, a, o, i, t);
 }
-function He(...n) {
+function De(...n) {
   if (n.length === 2)
     return E(n[1]);
   const [e, t, s = {}] = n, {
@@ -635,7 +655,7 @@ function He(...n) {
     i.name
   );
 }
-function De(n, e, t, s, r) {
+function Fe(n, e, t, s, r) {
   const o = B(n, e, t, s, r), i = new N(
     B(n, e, t, s, r).stateStack,
     e.name,
@@ -659,15 +679,15 @@ function B(n, e, t, s, r) {
       grammarContextCode: void 0
     }
   ).stateStack : V, l = [];
-  const h = [];
-  for (let u = 0, p = c.length; u < p; u++) {
-    const [d, S] = c[u];
+  const u = [];
+  for (let h = 0, p = c.length; h < p; h++) {
+    const [d, S] = c[h];
     if (d === "") {
-      l = [], h.push([]);
+      l = [], u.push([]);
       continue;
     }
     if (i > 0 && d.length >= i) {
-      l = [], h.push([{
+      l = [], u.push([{
         content: d,
         offset: S,
         color: "",
@@ -720,9 +740,9 @@ function B(n, e, t, s, r) {
           );
           ee += C.length, F.explanation.push({
             content: C,
-            scopes: r.includeExplanation === "scopeName" ? Fe(
+            scopes: r.includeExplanation === "scopeName" ? Pe(
               k.scopes
-            ) : Pe(
+            ) : ze(
               Z,
               k.scopes
             )
@@ -731,23 +751,23 @@ function B(n, e, t, s, r) {
       }
       l.push(F);
     }
-    h.push(l), l = [], f = b.ruleStack;
+    u.push(l), l = [], f = b.ruleStack;
   }
   return {
-    tokens: h,
+    tokens: u,
     stateStack: f
   };
 }
-function Fe(n) {
+function Pe(n) {
   return n.map((e) => ({ scopeName: e }));
 }
-function Pe(n, e) {
+function ze(n, e) {
   const t = [];
   for (let s = 0, r = e.length; s < r; s++) {
     const o = e[s];
     t[s] = {
       scopeName: o,
-      themeMatches: Ve(n, o, e.slice(0, s))
+      themeMatches: Je(n, o, e.slice(0, s))
     };
   }
   return t;
@@ -755,7 +775,7 @@ function Pe(n, e) {
 function se(n, e) {
   return n === e || e.substring(0, n.length) === n && e[n.length] === ".";
 }
-function ze(n, e, t) {
+function Ve(n, e, t) {
   if (!se(n[n.length - 1], e))
     return !1;
   let s = n.length - 2, r = t.length - 1;
@@ -763,11 +783,11 @@ function ze(n, e, t) {
     se(n[s], t[r]) && (s -= 1), r -= 1;
   return s === -1;
 }
-function Ve(n, e, t) {
+function Je(n, e, t) {
   const s = [];
   for (const { selectors: r, settings: o } of n)
     for (const i of r)
-      if (ze(i, e, t)) {
+      if (Ve(i, e, t)) {
         s.push(o);
         break;
       }
@@ -778,30 +798,30 @@ function de(n, e, t) {
     const f = q(n, e, {
       ...t,
       theme: c.theme
-    }), l = E(f), h = typeof c.theme == "string" ? c.theme : c.theme.name;
+    }), l = E(f), u = typeof c.theme == "string" ? c.theme : c.theme.name;
     return {
       tokens: f,
       state: l,
-      theme: h
+      theme: u
     };
-  }), o = Je(
+  }), o = Ke(
     ...r.map((c) => c.tokens)
   ), i = o[0].map(
-    (c, f) => c.map((l, h) => {
-      const u = {
+    (c, f) => c.map((l, u) => {
+      const h = {
         content: l.content,
         variants: {},
         offset: l.offset
       };
-      return "includeExplanation" in t && t.includeExplanation && (u.explanation = l.explanation), o.forEach((p, d) => {
+      return "includeExplanation" in t && t.includeExplanation && (h.explanation = l.explanation), o.forEach((p, d) => {
         const {
           content: S,
           explanation: y,
           offset: m,
           ...g
-        } = p[f][h];
-        u.variants[s[d].color] = g;
-      }), u;
+        } = p[f][u];
+        h.variants[s[d].color] = g;
+      }), h;
     })
   ), a = r[0].state ? new N(
     Object.fromEntries(r.map((c) => [c.theme, c.state?.getInternalStack(c.theme)])),
@@ -809,7 +829,7 @@ function de(n, e, t) {
   ) : void 0;
   return a && H(i, a), i;
 }
-function Je(...n) {
+function Ke(...n) {
   const e = n.map(() => []), t = n.length;
   for (let s = 0; s < n[0].length; s++) {
     const r = n.map((c) => c[s]), o = e.map(() => []);
@@ -838,21 +858,21 @@ function G(n, e, t) {
     const {
       defaultColor: f = "light",
       cssVariablePrefix: l = "--shiki-",
-      colorsRendering: h = "css-vars"
-    } = t, u = Object.entries(t.themes).filter((m) => m[1]).map((m) => ({ color: m[0], theme: m[1] })).sort((m, g) => m.color === f ? -1 : g.color === f ? 1 : 0);
-    if (u.length === 0)
+      colorsRendering: u = "css-vars"
+    } = t, h = Object.entries(t.themes).filter((m) => m[1]).map((m) => ({ color: m[0], theme: m[1] })).sort((m, g) => m.color === f ? -1 : g.color === f ? 1 : 0);
+    if (h.length === 0)
       throw new T("`themes` option must not be empty");
     const p = de(
       n,
       e,
       t
     );
-    if (c = E(p), f && Y !== f && !u.find((m) => m.color === f))
+    if (c = E(p), f && Y !== f && !h.find((m) => m.color === f))
       throw new T(`\`themes\` option must contain the defaultColor key \`${f}\``);
-    const d = u.map((m) => n.getTheme(m.theme)), S = u.map((m) => m.color);
-    o = p.map((m) => m.map((g) => Ce(g, S, l, f, h))), c && H(o, c);
-    const y = u.map((m) => j(m.theme, t));
-    r = re(u, d, y, l, f, "fg", h), s = re(u, d, y, l, f, "bg", h), i = `shiki-themes ${d.map((m) => m.name).join(" ")}`, a = f ? void 0 : [r, s].join(";");
+    const d = h.map((m) => n.getTheme(m.theme)), S = h.map((m) => m.color);
+    o = p.map((m) => m.map((g) => Ce(g, S, l, f, u))), c && H(o, c);
+    const y = h.map((m) => j(m.theme, t));
+    r = re(h, d, y, l, f, "fg", u), s = re(h, d, y, l, f, "bg", u), i = `shiki-themes ${d.map((m) => m.name).join(" ")}`, a = f ? void 0 : [r, s].join(";");
   } else if ("theme" in t) {
     const f = j(t.theme, t);
     o = q(
@@ -878,10 +898,10 @@ function re(n, e, t, s, r, o, i) {
     const f = L(e[c][o], t[c]) || "inherit", l = `${s + a.color}${o === "bg" ? "-bg" : ""}:${f}`;
     if (c === 0 && r) {
       if (r === Y && n.length > 1) {
-        const h = n.findIndex((S) => S.color === "light"), u = n.findIndex((S) => S.color === "dark");
-        if (h === -1 || u === -1)
+        const u = n.findIndex((S) => S.color === "light"), h = n.findIndex((S) => S.color === "dark");
+        if (u === -1 || h === -1)
           throw new T('When using `defaultColor: "light-dark()"`, you must provide both `light` and `dark` themes');
-        const p = L(e[h][o], t[h]) || "inherit", d = L(e[u][o], t[u]) || "inherit";
+        const p = L(e[u][o], t[u]) || "inherit", d = L(e[h][o], t[h]) || "inherit";
         return `light-dark(${p}, ${d});${l}`;
       }
       return f;
@@ -907,10 +927,10 @@ function R(n, e, t, s = {
     grammarState: l
   } = G(n, r, t);
   const {
-    mergeWhitespaces: h = !0,
-    mergeSameStyleTokens: u = !1
+    mergeWhitespaces: u = !0,
+    mergeSameStyleTokens: h = !1
   } = t;
-  h === !0 ? o = Ue(o) : h === "never" && (o = Ye(o)), u && (o = qe(o));
+  u === !0 ? o = Ye(o) : u === "never" && (o = qe(o)), h && (o = Qe(o));
   const p = {
     ...s,
     get source() {
@@ -919,7 +939,7 @@ function R(n, e, t, s = {
   };
   for (const d of A(t))
     o = d.tokens?.call(p, o) || o;
-  return Ke(
+  return Ue(
     o,
     {
       ...t,
@@ -932,7 +952,7 @@ function R(n, e, t, s = {
     l
   );
 }
-function Ke(n, e, t, s = E(n)) {
+function Ue(n, e, t, s = E(n)) {
   const r = A(e), o = [], i = {
     type: "root",
     children: []
@@ -962,10 +982,10 @@ function Ke(n, e, t, s = E(n)) {
     properties: {},
     children: o
   };
-  const h = [], u = {
+  const u = [], h = {
     ...t,
     structure: a,
-    addClassToHast: he,
+    addClassToHast: ue,
     get source() {
       return t.source;
     },
@@ -985,7 +1005,7 @@ function Ke(n, e, t, s = E(n)) {
       return l;
     },
     get lines() {
-      return h;
+      return u;
     }
   };
   if (n.forEach((d, S) => {
@@ -1009,28 +1029,28 @@ function Ke(n, e, t, s = E(n)) {
       const v = J(g.htmlStyle || M(g));
       v && (b.properties.style = v);
       for (const _ of r)
-        b = _?.span?.call(u, b, S + 1, m, y, g) || b;
+        b = _?.span?.call(h, b, S + 1, m, y, g) || b;
       a === "inline" ? i.children.push(b) : a === "classic" && y.children.push(b), m += g.content.length;
     }
     if (a === "classic") {
       for (const g of r)
-        y = g?.line?.call(u, y, S + 1) || y;
-      h.push(y), o.push(y);
+        y = g?.line?.call(h, y, S + 1) || y;
+      u.push(y), o.push(y);
     }
   }), a === "classic") {
     for (const d of r)
-      l = d?.code?.call(u, l) || l;
+      l = d?.code?.call(h, l) || l;
     f.children.push(l);
     for (const d of r)
-      f = d?.pre?.call(u, f) || f;
+      f = d?.pre?.call(h, f) || f;
     i.children.push(f);
   }
   let p = i;
   for (const d of r)
-    p = d?.root?.call(u, p) || p;
+    p = d?.root?.call(h, p) || p;
   return s && H(p, s), p;
 }
-function Ue(n) {
+function Ye(n) {
   return n.map((e) => {
     const t = [];
     let s = "", r = 0;
@@ -1050,7 +1070,7 @@ function Ue(n) {
     }), t;
   });
 }
-function Ye(n) {
+function qe(n) {
   return n.map((e) => e.flatMap((t) => {
     if (t.content.match(/^\s+$/))
       return t;
@@ -1074,7 +1094,7 @@ function Ye(n) {
     }), a;
   }));
 }
-function qe(n) {
+function Qe(n) {
   return n.map((e) => {
     const t = [];
     for (const s of e) {
@@ -1088,15 +1108,15 @@ function qe(n) {
     return t;
   });
 }
-const Qe = we;
-function Xe(n, e, t) {
+const Xe = we;
+function Ze(n, e, t) {
   const s = {
     meta: {},
     options: t,
     codeToHast: (o, i) => R(n, o, i),
     codeToTokens: (o, i) => G(n, o, i)
   };
-  let r = Qe(R(n, e, t, s));
+  let r = Xe(R(n, e, t, s));
   for (const o of A(t))
     r = o.postprocess?.call(s, r, t) || r;
   return r;
@@ -1140,12 +1160,12 @@ function Q(n) {
       }
     };
     if (c) {
-      const h = i(a.settings.foreground);
-      e.colorReplacements[h] = a.settings.foreground, l.settings.foreground = h;
+      const u = i(a.settings.foreground);
+      e.colorReplacements[u] = a.settings.foreground, l.settings.foreground = u;
     }
     if (f) {
-      const h = i(a.settings.background);
-      e.colorReplacements[h] = a.settings.background, l.settings.background = h;
+      const u = i(a.settings.background);
+      e.colorReplacements[u] = a.settings.background, l.settings.background = u;
     }
     return l;
   });
@@ -1172,16 +1192,16 @@ async function pe(n) {
     )
   )).filter((t) => !!t);
 }
-let Ze = 3;
-function et(n, e = 3) {
-  e > Ze || console.trace(`[SHIKI DEPRECATE]: ${n}`);
+let et = 3;
+function tt(n, e = 3) {
+  e > et || console.trace(`[SHIKI DEPRECATE]: ${n}`);
 }
 class $ extends Error {
   constructor(e) {
     super(e), this.name = "ShikiError";
   }
 }
-class tt extends Se {
+class nt extends Se {
   constructor(e, t, s, r = {}) {
     super(e), this._resolver = e, this._themes = t, this._langs = s, this._alias = r, this._themes.map((o) => this.loadTheme(o)), this.loadLanguages(this._langs);
   }
@@ -1268,7 +1288,7 @@ class tt extends Se {
         this._langGraph.set(t, this._langMap.get(t));
   }
 }
-class nt {
+class st {
   _langs = /* @__PURE__ */ new Map();
   _scopeToLang = /* @__PURE__ */ new Map();
   _injections = /* @__PURE__ */ new Map();
@@ -1306,12 +1326,12 @@ class nt {
   }
 }
 let I = 0;
-function st(n) {
+function rt(n) {
   I += 1, n.warnings !== !1 && I >= 10 && I % 10 === 0 && console.warn(`[Shiki] ${I} instances have been created. Shiki is supposed to be used as a singleton, consider refactoring your code to cache your highlighter instance; Or call \`highlighter.dispose()\` to release unused instances.`);
   let e = !1;
   if (!n.engine)
     throw new $("`engine` option is required for synchronous mode");
-  const t = (n.langs || []).flat(1), s = (n.themes || []).flat(1).map(Q), r = new nt(n.engine, t), o = new tt(r, s, t, n.langAlias);
+  const t = (n.langs || []).flat(1), s = (n.themes || []).flat(1).map(Q), r = new st(n.engine, t), o = new nt(r, s, t, n.langAlias);
   let i;
   function a(g) {
     y();
@@ -1342,14 +1362,14 @@ function st(n) {
   function l() {
     return y(), o.getLoadedThemes();
   }
-  function h() {
+  function u() {
     return y(), o.getLoadedLanguages();
   }
-  function u(...g) {
+  function h(...g) {
     y(), o.loadLanguages(g.flat(1));
   }
   async function p(...g) {
-    return u(await me(g));
+    return h(await me(g));
   }
   function d(...g) {
     y();
@@ -1371,17 +1391,17 @@ function st(n) {
     getTheme: c,
     getLanguage: a,
     getLoadedThemes: l,
-    getLoadedLanguages: h,
+    getLoadedLanguages: u,
     loadLanguage: p,
-    loadLanguageSync: u,
+    loadLanguageSync: h,
     loadTheme: S,
     loadThemeSync: d,
     dispose: m,
     [Symbol.dispose]: m
   };
 }
-async function rt(n) {
-  n.engine || et("`engine` option is required. Use `createOnigurumaEngine` or `createJavaScriptRegexEngine` to create an engine.");
+async function ot(n) {
+  n.engine || tt("`engine` option is required. Use `createOnigurumaEngine` or `createJavaScriptRegexEngine` to create an engine.");
   const [
     e,
     t,
@@ -1391,22 +1411,22 @@ async function rt(n) {
     me(n.langs || []),
     n.engine
   ]);
-  return st({
+  return rt({
     ...n,
     themes: e,
     langs: t,
     engine: s
   });
 }
-async function ot(n) {
-  const e = await rt(n);
+async function at(n) {
+  const e = await ot(n);
   return {
-    getLastGrammarState: (...t) => He(e, ...t),
+    getLastGrammarState: (...t) => De(e, ...t),
     codeToTokensBase: (t, s) => q(e, t, s),
     codeToTokensWithThemes: (t, s) => de(e, t, s),
     codeToTokens: (t, s) => G(e, t, s),
     codeToHast: (t, s) => R(e, t, s),
-    codeToHtml: (t, s) => Xe(e, t, s),
+    codeToHtml: (t, s) => Ze(e, t, s),
     getBundledLanguages: () => ({}),
     getBundledThemes: () => ({}),
     ...e,
@@ -1416,30 +1436,30 @@ async function ot(n) {
 function ht(n) {
   const e = n.langs, t = n.themes, s = n.engine;
   async function r(o) {
-    function i(h) {
-      if (typeof h == "string") {
-        if (le(h))
+    function i(u) {
+      if (typeof u == "string") {
+        if (le(u))
           return [];
-        h = o.langAlias?.[h] || h;
-        const u = e[h];
-        if (!u)
-          throw new T(`Language \`${h}\` is not included in this bundle. You may want to load it from external source.`);
-        return u;
+        u = o.langAlias?.[u] || u;
+        const h = e[u];
+        if (!h)
+          throw new T(`Language \`${u}\` is not included in this bundle. You may want to load it from external source.`);
+        return h;
       }
-      return h;
+      return u;
     }
-    function a(h) {
-      if (fe(h))
+    function a(u) {
+      if (fe(u))
         return "none";
-      if (typeof h == "string") {
-        const u = t[h];
-        if (!u)
-          throw new T(`Theme \`${h}\` is not included in this bundle. You may want to load it from external source.`);
-        return u;
+      if (typeof u == "string") {
+        const h = t[u];
+        if (!h)
+          throw new T(`Theme \`${u}\` is not included in this bundle. You may want to load it from external source.`);
+        return h;
       }
-      return h;
+      return u;
     }
-    const c = (o.themes ?? []).map((h) => a(h)), f = (o.langs ?? []).map((h) => i(h)), l = await ot({
+    const c = (o.themes ?? []).map((u) => a(u)), f = (o.langs ?? []).map((u) => i(u)), l = await at({
       engine: o.engine ?? s(),
       ...o,
       themes: c,
@@ -1447,11 +1467,11 @@ function ht(n) {
     });
     return {
       ...l,
-      loadLanguage(...h) {
-        return l.loadLanguage(...h.map(i));
+      loadLanguage(...u) {
+        return l.loadLanguage(...u.map(i));
       },
-      loadTheme(...h) {
-        return l.loadTheme(...h.map(a));
+      loadTheme(...u) {
+        return l.loadTheme(...u.map(a));
       },
       getBundledLanguages() {
         return e;
@@ -1463,7 +1483,7 @@ function ht(n) {
   }
   return r;
 }
-function at(n) {
+function it(n) {
   let e;
   async function t(s = {}) {
     if (e) {
@@ -1481,8 +1501,8 @@ function at(n) {
   }
   return t;
 }
-function ut(n, e) {
-  const t = at(n);
+function gt(n, e) {
+  const t = it(n);
   async function s(r, o) {
     const i = await t({
       langs: [o.lang],
@@ -1519,28 +1539,28 @@ function ut(n, e) {
 }
 export {
   T as ShikiError,
-  he as addClassToHast,
+  ue as addClassToHast,
   L as applyColorReplacements,
   R as codeToHast,
-  Xe as codeToHtml,
+  Ze as codeToHtml,
   G as codeToTokens,
   q as codeToTokensBase,
   de as codeToTokensWithThemes,
-  ot as createHighlighterCore,
+  at as createHighlighterCore,
   _e as createPositionConverter,
-  rt as createShikiInternal,
-  st as createShikiInternalSync,
-  ut as createSingletonShorthands,
+  ot as createShikiInternal,
+  rt as createShikiInternalSync,
+  gt as createSingletonShorthands,
   ht as createdBundledHighlighter,
   Ce as flatTokenVariants,
   M as getTokenStyleObject,
-  ft as guessEmbeddedLanguages,
-  Qe as hastToHtml,
+  ut as guessEmbeddedLanguages,
+  Xe as hastToHtml,
   U as isNoneTheme,
   K as isPlainLang,
   le as isSpecialLang,
   fe as isSpecialTheme,
-  at as makeSingletonHighlighter,
+  it as makeSingletonHighlighter,
   ce as normalizeGetter,
   Q as normalizeTheme,
   j as resolveColorReplacements,
@@ -1549,9 +1569,9 @@ export {
   xe as splitTokens,
   J as stringifyTokenStyle,
   ke as toArray,
-  Re as tokenizeAnsiWithTheme,
-  De as tokenizeWithTheme,
-  Ke as tokensToHast,
+  We as tokenizeAnsiWithTheme,
+  Fe as tokenizeWithTheme,
+  Ue as tokensToHast,
   Ie as transformerDecorations,
-  et as warnDeprecated
+  tt as warnDeprecated
 };