shiki-codegen 3.22.0 → 4.0.0

package/dist/cli.d.mts

@@ -1,2 +1 @@
-
-export { };
+export { };

package/dist/cli.mjs

@@ -1,33 +1,32 @@
-import fs from 'node:fs/promises';
-import { resolve, dirname } from 'node:path';
-import { cac } from 'cac';
-import { codegen } from './index.mjs';
-import 'shiki/bundle/full';
+import { codegen } from "./index.mjs";
+import fs from "node:fs/promises";
+import { dirname, resolve } from "node:path";
+import { cac } from "cac";
 
+//#region src/cli.ts
 const cli = cac("shiki-codegen");
 cli.command("[path]", "Generate shiki bundle module").option("--themes <themes>", "Themes to include").option("--langs <langs>", "Languages to include").option("--engine <engine>", "Engine to use", { default: "javascript" }).option("--precompiled", "Use precompiled languages", { default: false }).option("--shorthands", "Generate shorthands", { default: true }).option("--format", "Use prettier to format", { default: true }).action(async (path, options) => {
-  const output = resolve(path || "shiki.bundle.ts");
-  const langs = (Array.isArray(options.langs) ? options.langs.join(",") : options.langs || "").split(",").map((lang) => lang.trim()).filter(Boolean);
-  const themes = (Array.isArray(options.themes) ? options.themes.join(",") : options.themes || "").split(",").map((theme) => theme.trim()).filter(Boolean);
-  const isTypeScript = !!output.match(/\.[cm]?ts$/i);
-  if (!themes.length) {
-    throw new Error("No themes specified, use --themes=theme-name to specify themes");
-  }
-  if (!langs.length) {
-    throw new Error("No langs specified, use --langs=lang-name to specify langs");
-  }
-  const { code } = await codegen({
-    langs,
-    themes,
-    engine: options.engine,
-    precompiled: options.precompiled,
-    shorthands: options.shorthands,
-    format: options.format,
-    typescript: isTypeScript
-  });
-  await fs.mkdir(dirname(output), { recursive: true });
-  await fs.writeFile(output, code, "utf-8");
-  console.log(`Generated bundle to ${output}`);
+	const output = resolve(path || "shiki.bundle.ts");
+	const langs = (Array.isArray(options.langs) ? options.langs.join(",") : options.langs || "").split(",").map((lang) => lang.trim()).filter(Boolean);
+	const themes = (Array.isArray(options.themes) ? options.themes.join(",") : options.themes || "").split(",").map((theme) => theme.trim()).filter(Boolean);
+	const isTypeScript = !!output.match(/\.[cm]?ts$/i);
+	if (!themes.length) throw new Error("No themes specified, use --themes=theme-name to specify themes");
+	if (!langs.length) throw new Error("No langs specified, use --langs=lang-name to specify langs");
+	const { code } = await codegen({
+		langs,
+		themes,
+		engine: options.engine,
+		precompiled: options.precompiled,
+		shorthands: options.shorthands,
+		format: options.format,
+		typescript: isTypeScript
+	});
+	await fs.mkdir(dirname(output), { recursive: true });
+	await fs.writeFile(output, code, "utf-8");
+	console.log(`Generated bundle to ${output}`);
 });
 cli.help();
 cli.parse();
+
+//#endregion
+export {  };

package/dist/index.d.mts

@@ -1,51 +1,51 @@
-import { Options } from 'prettier';
-import { BundledLanguage, BundledTheme } from 'shiki';
+import { Options } from "prettier";
+import { BundledLanguage, BundledTheme } from "shiki";
 
+//#region src/index.d.ts
 interface ShikiCodegenOptions {
-    /**
-     * The header to add to the generated code.
-     *
-     * @default '/* Generate by @shikijs/codegen *\/'
-     */
-    header?: string;
-    /**
-     * The languages to bundle.
-     */
-    langs: readonly BundledLanguage[];
-    /**
-     * The themes to bundle.
-     */
-    themes: readonly BundledTheme[];
-    /**
-     * The engine to use for syntax highlighting.
-     */
-    engine: 'oniguruma' | 'javascript' | 'javascript-raw';
-    /**
-     * Use precompiled grammars.
-     * Only available when `engine` is set to `javascript` or `javascript-raw`.
-     */
-    precompiled?: boolean;
-    /**
-     * Whether to generate TypeScript code.
-     *
-     * @default true
-     */
-    typescript?: boolean;
-    /**
-     * Generate shorthands for the highlighter.
-     *
-     * @default true
-     */
-    shorthands?: boolean;
-    /**
-     * Use Prettier to format the generated code.
-     */
-    format?: boolean | Options;
+  /**
+   * The header to add to the generated code.
+   *
+   * @default '/* Generate by @shikijs/codegen *\/'
+   */
+  header?: string;
+  /**
+   * The languages to bundle.
+   */
+  langs: readonly BundledLanguage[];
+  /**
+   * The themes to bundle.
+   */
+  themes: readonly BundledTheme[];
+  /**
+   * The engine to use for syntax highlighting.
+   */
+  engine: 'oniguruma' | 'javascript' | 'javascript-raw';
+  /**
+   * Use precompiled grammars.
+   * Only available when `engine` is set to `javascript` or `javascript-raw`.
+   */
+  precompiled?: boolean;
+  /**
+   * Whether to generate TypeScript code.
+   *
+   * @default true
+   */
+  typescript?: boolean;
+  /**
+   * Generate shorthands for the highlighter.
+   *
+   * @default true
+   */
+  shorthands?: boolean;
+  /**
+   * Use Prettier to format the generated code.
+   */
+  format?: boolean | Options;
 }
 interface ShikiCodegenResult {
-    code: string;
+  code: string;
 }
 declare function codegen(options: ShikiCodegenOptions): Promise<ShikiCodegenResult>;
-
-export { codegen };
-export type { ShikiCodegenOptions, ShikiCodegenResult };
+//#endregion
+export { ShikiCodegenOptions, ShikiCodegenResult, codegen };

package/dist/index.mjs

@@ -1,152 +1,95 @@
-import { bundledLanguagesInfo, bundledThemesInfo } from 'shiki/bundle/full';
+import { bundledLanguagesInfo, bundledThemesInfo } from "shiki/bundle/full";
 
+//#region src/index.ts
 async function codegen(options) {
-  const {
-    header = "/* Generate by @shikijs/codegen */",
-    typescript = true,
-    precompiled = false,
-    format: _format = true,
-    shorthands = true
-  } = options;
-  const ts = (code2) => typescript ? code2 : "";
-  if (precompiled && options.engine !== "javascript" && options.engine !== "javascript-raw")
-    throw new Error("Precompiled grammars are only available when using the JavaScript engine");
-  const langs = options.langs.map((lang) => {
-    const info = bundledLanguagesInfo.find((i) => i.id === lang || i.aliases?.includes(lang));
-    if (!info)
-      throw new Error(`Language ${lang} not found`);
-    return info;
-  });
-  const themes = options.themes.map((theme) => {
-    const info = bundledThemesInfo.find((i) => i.id === theme);
-    if (!info)
-      throw new Error(`Theme ${theme} not found`);
-    return info;
-  });
-  const langsCode = `{
-${langs.flatMap((lang) => {
-    const ids = [lang.id, ...lang.aliases || []];
-    return ids.map((id) => {
-      return `${JSON.stringify(id)}: () => import('@shikijs/${precompiled ? "langs-precompiled" : "langs"}/${lang.id}'),
-`;
-    });
-  }).join("")}}`;
-  const themesCode = `{
-${themes.map((theme) => {
-    return `${JSON.stringify(theme.id)}: () => import('@shikijs/themes/${theme.id}'),
-`;
-  }).join("")}}`;
-  const typeImports = {
-    "@shikijs/types": ["HighlighterGeneric", "DynamicImportThemeRegistration", "DynamicImportLanguageRegistration"]
-  };
-  const imports = {
-    "@shikijs/core": ["createBundledHighlighter"]
-  };
-  const lines = [
-    ""
-  ];
-  const exports$1 = [];
-  const typeExports = [];
-  if (typescript) {
-    lines.push(
-      "",
-      `type BundledLanguage = ${langs.flatMap((lang) => [lang.id, ...lang.aliases || []]).map((lang) => `'${lang}'`).join(" | ")}`,
-      `type BundledTheme = ${themes.map((theme) => `'${theme.id}'`).join(" | ")}`,
-      `type Highlighter = HighlighterGeneric<BundledLanguage, BundledTheme>`,
-      ""
-    );
-    typeExports.push("BundledLanguage", "BundledTheme", "Highlighter");
-  }
-  lines.push(
-    "",
-    `const bundledLanguages = ${langsCode}${ts(" as Record<BundledLanguage, DynamicImportLanguageRegistration>")}`,
-    "",
-    `const bundledThemes = ${themesCode}${ts(" as Record<BundledTheme, DynamicImportThemeRegistration>")}`,
-    ""
-  );
-  exports$1.push("bundledLanguages", "bundledThemes");
-  let engine;
-  if (options.engine === "javascript") {
-    imports["@shikijs/engine-javascript"] = ["createJavaScriptRegexEngine"];
-    engine = "createJavaScriptRegexEngine()";
-  } else if (options.engine === "javascript-raw") {
-    imports["@shikijs/engine-javascript/raw"] = ["createJavaScriptRawEngine"];
-    engine = "createJavaScriptRawEngine()";
-  } else {
-    imports["@shikijs/engine-oniguruma"] = ["createOnigurumaEngine"];
-    engine = "createOnigurumaEngine(import('shiki/wasm'))";
-  }
-  lines.push(
-    "",
-    `const createHighlighter = /* @__PURE__ */ createBundledHighlighter${ts("<BundledLanguage, BundledTheme>")}({`,
-    `  langs: bundledLanguages,`,
-    `  themes: bundledThemes,`,
-    `  engine: () => ${engine}`,
-    `})`
-  );
-  exports$1.push("createHighlighter");
-  if (shorthands) {
-    imports["@shikijs/core"].push("createSingletonShorthands");
-    const shorthandFunctions = [
-      "codeToHtml",
-      "codeToHast",
-      "codeToTokensBase",
-      "codeToTokens",
-      "codeToTokensWithThemes",
-      "getSingletonHighlighter",
-      "getLastGrammarState"
-    ];
-    lines.push(
-      "",
-      `const { ${shorthandFunctions.join(", ")} } = /* @__PURE__ */ createSingletonShorthands${ts("<BundledLanguage,BundledTheme>")}(createHighlighter)`
-    );
-    exports$1.push(
-      ...shorthandFunctions
-    );
-  }
-  lines.unshift(
-    Object.entries(imports).map(
-      ([module, imports2]) => {
-        return `import { ${imports2.sort().join(", ")} } from '${module}'`;
-      }
-    ).join("\n")
-  );
-  if (typescript) {
-    lines.unshift(
-      Object.entries(typeImports).map(
-        ([module, types]) => {
-          return `import type { ${types.sort().join(", ")} } from '${module}'`;
-        }
-      ).join("\n")
-    );
-  }
-  lines.push(
-    "",
-    `export { ${exports$1.sort().join(", ")} }`
-  );
-  if (typescript) {
-    lines.push(
-      `export type { ${typeExports.sort().join(", ")} }`
-    );
-  }
-  lines.unshift(header);
-  let code = lines.join("\n");
-  if (_format) {
-    const { format } = await import('prettier');
-    const prettierOptions = {
-      parser: typescript ? "typescript" : "babel",
-      semi: false,
-      tabWidth: 2,
-      useTabs: false,
-      singleQuote: true,
-      trailingComma: "all",
-      ..._format === true ? {} : _format
-    };
-    code = await format(code, prettierOptions);
-  }
-  return {
-    code
-  };
+	const { header = "/* Generate by @shikijs/codegen */", typescript = true, precompiled = false, format: _format = true, shorthands = true } = options;
+	const ts = (code) => typescript ? code : "";
+	if (precompiled && options.engine !== "javascript" && options.engine !== "javascript-raw") throw new Error("Precompiled grammars are only available when using the JavaScript engine");
+	const langs = options.langs.map((lang) => {
+		const info = bundledLanguagesInfo.find((i) => i.id === lang || i.aliases?.includes(lang));
+		if (!info) throw new Error(`Language ${lang} not found`);
+		return info;
+	});
+	const themes = options.themes.map((theme) => {
+		const info = bundledThemesInfo.find((i) => i.id === theme);
+		if (!info) throw new Error(`Theme ${theme} not found`);
+		return info;
+	});
+	const langsCode = `{\n${langs.flatMap((lang) => {
+		return [lang.id, ...lang.aliases || []].map((id) => {
+			return `${JSON.stringify(id)}: () => import('@shikijs/${precompiled ? "langs-precompiled" : "langs"}/${lang.id}'),\n`;
+		});
+	}).join("")}}`;
+	const themesCode = `{\n${themes.map((theme) => {
+		return `${JSON.stringify(theme.id)}: () => import('@shikijs/themes/${theme.id}'),\n`;
+	}).join("")}}`;
+	const typeImports = { "@shikijs/types": [
+		"HighlighterGeneric",
+		"DynamicImportThemeRegistration",
+		"DynamicImportLanguageRegistration"
+	] };
+	const imports = { "@shikijs/core": ["createBundledHighlighter"] };
+	const lines = [""];
+	const exports = [];
+	const typeExports = [];
+	if (typescript) {
+		lines.push("", `type BundledLanguage = ${langs.flatMap((lang) => [lang.id, ...lang.aliases || []]).map((lang) => `'${lang}'`).join(" | ")}`, `type BundledTheme = ${themes.map((theme) => `'${theme.id}'`).join(" | ")}`, `type Highlighter = HighlighterGeneric<BundledLanguage, BundledTheme>`, "");
+		typeExports.push("BundledLanguage", "BundledTheme", "Highlighter");
+	}
+	lines.push("", `const bundledLanguages = ${langsCode}${ts(" as Record<BundledLanguage, DynamicImportLanguageRegistration>")}`, "", `const bundledThemes = ${themesCode}${ts(" as Record<BundledTheme, DynamicImportThemeRegistration>")}`, "");
+	exports.push("bundledLanguages", "bundledThemes");
+	let engine;
+	if (options.engine === "javascript") {
+		imports["@shikijs/engine-javascript"] = ["createJavaScriptRegexEngine"];
+		engine = "createJavaScriptRegexEngine()";
+	} else if (options.engine === "javascript-raw") {
+		imports["@shikijs/engine-javascript/raw"] = ["createJavaScriptRawEngine"];
+		engine = "createJavaScriptRawEngine()";
+	} else {
+		imports["@shikijs/engine-oniguruma"] = ["createOnigurumaEngine"];
+		engine = "createOnigurumaEngine(import('shiki/wasm'))";
+	}
+	lines.push("", `const createHighlighter = /* @__PURE__ */ createBundledHighlighter${ts("<BundledLanguage, BundledTheme>")}({`, `  langs: bundledLanguages,`, `  themes: bundledThemes,`, `  engine: () => ${engine}`, `})`);
+	exports.push("createHighlighter");
+	if (shorthands) {
+		imports["@shikijs/core"].push("createSingletonShorthands");
+		const shorthandFunctions = [
+			"codeToHtml",
+			"codeToHast",
+			"codeToTokensBase",
+			"codeToTokens",
+			"codeToTokensWithThemes",
+			"getSingletonHighlighter",
+			"getLastGrammarState"
+		];
+		lines.push("", `const { ${shorthandFunctions.join(", ")} } = /* @__PURE__ */ createSingletonShorthands${ts("<BundledLanguage,BundledTheme>")}(createHighlighter)`);
+		exports.push(...shorthandFunctions);
+	}
+	lines.unshift(Object.entries(imports).map(([module, imports]) => {
+		return `import { ${imports.sort().join(", ")} } from '${module}'`;
+	}).join("\n"));
+	if (typescript) lines.unshift(Object.entries(typeImports).map(([module, types]) => {
+		return `import type { ${types.sort().join(", ")} } from '${module}'`;
+	}).join("\n"));
+	lines.push("", `export { ${exports.sort().join(", ")} }`);
+	if (typescript) lines.push(`export type { ${typeExports.sort().join(", ")} }`);
+	lines.unshift(header);
+	let code = lines.join("\n");
+	if (_format) {
+		const { format } = await import("prettier");
+		const prettierOptions = {
+			parser: typescript ? "typescript" : "babel",
+			semi: false,
+			tabWidth: 2,
+			useTabs: false,
+			singleQuote: true,
+			trailingComma: "all",
+			..._format === true ? {} : _format
+		};
+		code = await format(code, prettierOptions);
+	}
+	return { code };
 }
 
-export { codegen };
+//#endregion
+export { codegen };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "shiki-codegen",
   "type": "module",
-  "version": "3.22.0",
+  "version": "4.0.0",
   "description": "Codegen for fine-grained Shiki bundles.",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -31,14 +31,17 @@
     "bin.mjs",
     "dist"
   ],
+  "engines": {
+    "node": ">=20"
+  },
   "dependencies": {
     "cac": "^6.7.14",
     "prettier": "^3.8.1",
-    "shiki": "3.22.0"
+    "shiki": "4.0.0"
   },
   "scripts": {
-    "build": "unbuild",
-    "dev": "unbuild --stub",
+    "build": "tsdown",
+    "dev": "tsdown --watch",
     "test": "vitest"
   }
 }