@shikijs/core 1.11.1 → 1.12.0

package/dist/chunk-tokens.d.mts

@@ -516,9 +516,13 @@ interface BundledThemeInfo {
  * It's used to highlight code snippets that are part of the target language.
  */
 declare class GrammarState {
-    private _stack;
-    lang: string;
-    theme: string;
+    private readonly _stack;
+    readonly lang: string;
+    readonly theme: string;
+    /**
+     * Static method to create a initial grammar state.
+     */
+    static initial(lang: string, theme: string): GrammarState;
     constructor(_stack: StateStack, lang: string, theme: string);
     get scopes(): string[];
     toJSON(): {
@@ -622,8 +626,6 @@ interface DecorationItem {
     start: OffsetOrPosition;
     /**
      * End offset or position of the decoration.
-     *
-     * If the
      */
     end: OffsetOrPosition;
     /**

package/dist/index.d.mts

@@ -81,7 +81,7 @@ declare function createSingletonShorthands<L extends string, T extends string>(c
 
 declare function toArray<T>(x: MaybeArray<T>): T[];
 /**
- * Slipt a string into lines, each line preserves the line ending.
+ * Split a string into lines, each line preserves the line ending.
  */
 declare function splitLines(code: string, preserveEnding?: boolean): [string, number][];
 /**
@@ -133,6 +133,8 @@ declare function getTokenStyleObject(token: TokenStyles): Record<string, string>
 declare function stringifyTokenStyle(token: Record<string, string>): string;
 /**
  * Creates a converter between index and position in a code block.
+ *
+ * Overflow/underflow are unchecked.
  */
 declare function createPositionConverter(code: string): {
     lines: string[];

package/dist/index.mjs

@@ -5,7 +5,7 @@ function toArray(x) {
     return Array.isArray(x) ? x : [x];
 }
 /**
- * Slipt a string into lines, each line preserves the line ending.
+ * Split a string into lines, each line preserves the line ending.
  */
 function splitLines(code, preserveEnding = false) {
     const parts = code.split(/(\r?\n)/g);
@@ -158,10 +158,18 @@ function stringifyTokenStyle(token) {
 }
 /**
  * Creates a converter between index and position in a code block.
+ *
+ * Overflow/underflow are unchecked.
  */
 function createPositionConverter(code) {
     const lines = splitLines(code, true).map(([line]) => line);
     function indexToPos(index) {
+        if (index === code.length) {
+            return {
+                line: lines.length - 1,
+                character: lines[lines.length - 1].length,
+            };
+        }
         let character = index;
         let line = 0;
         for (const lineText of lines) {
@@ -533,6 +541,12 @@ class GrammarState {
     _stack;
     lang;
     theme;
+    /**
+     * Static method to create a initial grammar state.
+     */
+    static initial(lang, theme) {
+        return new GrammarState(INITIAL, lang, theme);
+    }
     constructor(_stack, lang, theme) {
         this._stack = _stack;
         this.lang = lang;
@@ -866,7 +880,7 @@ function codeToTokens(internal, code, options) {
         rootStyle = defaultColor ? undefined : [fg, bg].join(';');
     }
     else if ('theme' in options) {
-        const colorReplacements = resolveColorReplacements(options.theme, options.colorReplacements);
+        const colorReplacements = resolveColorReplacements(options.theme, options);
         tokens = codeToTokensBase(internal, code, options);
         const _theme = internal.getTheme(options.theme);
         bg = applyColorReplacements(_theme.bg, colorReplacements);
@@ -926,12 +940,19 @@ function transformerDecorations() {
             const converter = createPositionConverter(shiki.source);
             function normalizePosition(p) {
                 if (typeof p === 'number') {
+                    if (p < 0 || p > shiki.source.length)
+                        throw new ShikiError(`Invalid decoration offset: ${p}. Code length: ${shiki.source.length}`);
                     return {
                         ...converter.indexToPos(p),
                         offset: p,
                     };
                 }
                 else {
+                    const line = converter.lines[p.line];
+                    if (line === undefined)
+                        throw new ShikiError(`Invalid decoration position ${JSON.stringify(p)}. Lines length: ${converter.lines.length}`);
+                    if (p.character < 0 || p.character > line.length)
+                        throw new ShikiError(`Invalid decoration position ${JSON.stringify(p)}. Line ${p.line} length: ${line.length}`);
                     return {
                         ...p,
                         offset: converter.posToIndex(p.line, p.character),

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@shikijs/core",
   "type": "module",
-  "version": "1.11.1",
+  "version": "1.12.0",
   "description": "Core of Shiki",
   "author": "Pine Wu <octref@gmail.com>; Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",