vscode-shiki-bridge 0.3.0 → 0.4.0

package/README.md

@@ -48,8 +48,6 @@ const html = highlighter.codeToHtml(
 
 A tuple containing a theme id, and an array containing the `ThemeRegistration`.
 
-If the theme cannot be found, [the special `"none"` theme](https://shiki.style/themes#special-themes) is returned.
-
 ```ts
 export type UserThemeResult = [id: string, themes: [ThemeRegistration]];
 ```
@@ -66,8 +64,6 @@ async function getUserTheme(): Promise<UserThemeResult>;
 
 Get a `UserThemeResult` for the given `themeName`. The `themeName` can be its `label` or `id`. VS Code themes will define at least on of these (usually the `label`), `vscode-shiki-bridge` will resolve it to the correct theme.
 
-If the theme cannot be found, [the special `"none"` theme](https://shiki.style/themes#special-themes) is returned.
-
 ```ts
 async function getTheme(themeName: string): Promise<UserThemeResult>;
 ```

package/dist/index.cjs

@@ -294,10 +294,6 @@ async function getUserTheme() {
 	const vscode = getVscode();
 	const workbenchConfig = vscode.workspace.getConfiguration("workbench");
 	const themeName = workbenchConfig.get("colorTheme");
-	if (!themeName) {
-		logger.debug("no theme name found under workbench.colorTheme");
-		return THEME_NOT_FOUND_RESULT;
-	}
 	return await getTheme(themeName);
 }
 /**
@@ -313,13 +309,13 @@ async function getTheme(themeName) {
 	const themeId = registry.resolveLabelToId(themeName);
 	const contribution = registry.themes.get(themeId);
 	if (!contribution) {
-		logger.debug(`no theme contribution found for theme id ${themeId}`);
-		return THEME_NOT_FOUND_RESULT;
+		const message = `no theme contribution found for theme id ${themeId}`;
+		logger.debug(message);
+		throw new Error(message);
 	}
 	const themeRegistration = await buildThemeRegistration(contribution, registry, fileReader, vscode.Uri);
 	return [themeId, [themeRegistration]];
 }
-const THEME_NOT_FOUND_RESULT = ["none", ["none"]];
 
 //#endregion
 //#region src/language-registration-collection-builder.ts

package/dist/index.d.ts

@@ -1,9 +1,9 @@
 import "vscode";
-import { LanguageRegistration, SpecialTheme, ThemeRegistration } from "shiki";
+import { LanguageRegistration, ThemeRegistration } from "shiki";
 import { ExtensionLanguage } from "vscode-extension-manifest";
 
 //#region src/user-theme.d.ts
-type UserThemeResult = [id: string, themes: [ThemeRegistration]] | [id: string, themes: [SpecialTheme]];
+type UserThemeResult = [id: string, themes: [ThemeRegistration]];
 /**
  * Get the `ThemeRegistration` for the currently active theme.
  */
@@ -17,6 +17,7 @@ declare function getUserTheme(): Promise<UserThemeResult>;
 declare function getTheme(themeName: string): Promise<UserThemeResult>;
 //#endregion
 //#region src/language-registration-types.d.ts
+
 /**
  * To not lose the information about which files a language could apply, we keep the information language contributions provide
  */

package/dist/index.js

@@ -1,11 +1,9 @@
+import { createRequire } from "node:module";
 import { parse } from "fast-plist";
 import { parse as parse$1 } from "jsonc-parser";
 
 //#region rolldown:runtime
-var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, { get: (a, b) => (typeof require !== "undefined" ? require : a)[b] }) : x)(function(x) {
-	if (typeof require !== "undefined") return require.apply(this, arguments);
-	throw Error("Calling `require` for \"" + x + "\" in an environment that doesn't expose the `require` function.");
-});
+var __require = /* @__PURE__ */ createRequire(import.meta.url);
 
 //#endregion
 //#region src/vscode-utils.ts
@@ -278,10 +276,6 @@ async function getUserTheme() {
 	const vscode = getVscode();
 	const workbenchConfig = vscode.workspace.getConfiguration("workbench");
 	const themeName = workbenchConfig.get("colorTheme");
-	if (!themeName) {
-		logger.debug("no theme name found under workbench.colorTheme");
-		return THEME_NOT_FOUND_RESULT;
-	}
 	return await getTheme(themeName);
 }
 /**
@@ -297,13 +291,13 @@ async function getTheme(themeName) {
 	const themeId = registry.resolveLabelToId(themeName);
 	const contribution = registry.themes.get(themeId);
 	if (!contribution) {
-		logger.debug(`no theme contribution found for theme id ${themeId}`);
-		return THEME_NOT_FOUND_RESULT;
+		const message = `no theme contribution found for theme id ${themeId}`;
+		logger.debug(message);
+		throw new Error(message);
 	}
 	const themeRegistration = await buildThemeRegistration(contribution, registry, fileReader, vscode.Uri);
 	return [themeId, [themeRegistration]];
 }
-const THEME_NOT_FOUND_RESULT = ["none", ["none"]];
 
 //#endregion
 //#region src/language-registration-collection-builder.ts

package/dist/internals.js

@@ -1,11 +1,9 @@
+import { createRequire } from "node:module";
 import { parse } from "fast-plist";
 import { parse as parse$1 } from "jsonc-parser";
 
 //#region rolldown:runtime
-var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, { get: (a, b) => (typeof require !== "undefined" ? require : a)[b] }) : x)(function(x) {
-	if (typeof require !== "undefined") return require.apply(this, arguments);
-	throw Error("Calling `require` for \"" + x + "\" in an environment that doesn't expose the `require` function.");
-});
+var __require = /* @__PURE__ */ createRequire(import.meta.url);
 
 //#endregion
 //#region src/vscode-utils.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vscode-shiki-bridge",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "Embed Shiki code blocks in VS Code, inheriting the user's themes and languages",
   "type": "module",
   "license": "MIT",
@@ -19,17 +19,18 @@
   "files": [
     "dist"
   ],
-  "main": "./dist/index.js",
+  "main": "./dist/index.cjs",
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "exports": {
     ".": {
       "development": "./src/index.ts",
-      "default": "./dist/index.js"
+      "require": "./dist/index.cjs",
+      "import": "./dist/index.js"
     },
     "./internals": {
       "development": "./src/internals.ts",
-      "default": "./dist/internals.js"
+      "import": "./dist/internals.js"
     },
     "./package.json": "./package.json"
   },