feat: improve compatibility

shikijs · Aug 27, 2023 · 8e11f33 · 8e11f33
1 parent 7688547
commit 8e11f33
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 4 deletions.
diff --git a/packages/shikiji-compact/README.md → packages/shikiji-compat/README.md b/packages/shikiji-compact/README.md → packages/shikiji-compat/README.md
diff --git a/packages/shikiji-compact/build.config.ts → packages/shikiji-compat/build.config.ts b/packages/shikiji-compact/build.config.ts → packages/shikiji-compat/build.config.ts
diff --git a/packages/shikiji-compact/index.cjs → packages/shikiji-compat/index.cjs b/packages/shikiji-compact/index.cjs → packages/shikiji-compat/index.cjs
@@ -3,5 +3,11 @@ async function getHighlighter(...args) {
   return getHighlighter(...args)
 }
 
+async function loadTheme(...args) {
+  const { loadTheme } = await import('./dist/index.mjs')
+  return loadTheme(...args)
+}
+
 module.exports = getHighlighter
 module.exports.getHighlighter = getHighlighter
+module.exports.loadTheme = loadTheme
diff --git a/packages/shikiji-compact/package.json → packages/shikiji-compat/package.json b/packages/shikiji-compact/package.json → packages/shikiji-compat/package.json
diff --git a/packages/shikiji-compact/src/index.ts → packages/shikiji-compat/src/index.ts b/packages/shikiji-compact/src/index.ts → packages/shikiji-compat/src/index.ts
@@ -72,7 +72,7 @@ export async function getHighlighter(options: HighlighterOptions = {}) {
   }
 }
 
-export type Highlighter = ReturnType<typeof getHighlighter>
+export type Highlighter = Awaited<ReturnType<typeof getHighlighter>>
 
 export async function loadTheme(theme: BuiltinTheme | ThemeInput): Promise<ThemeRegistration> {
   if (typeof theme === 'string')

diff --git a/packages/shikiji-compact/src/stub.ts → packages/shikiji-compat/src/stub.ts b/packages/shikiji-compact/src/stub.ts → packages/shikiji-compat/src/stub.ts
diff --git a/packages/shikiji-compact/src/types.ts → packages/shikiji-compat/src/types.ts b/packages/shikiji-compact/src/types.ts → packages/shikiji-compat/src/types.ts
@@ -1,4 +1,4 @@
-import type { BuiltinLanguage, BuiltinTheme, BundledHighlighterOptions, LanguageRegistration, LineOption, StringLiteralUnion, ThemeRegistration } from 'shikiji'
+import type { BuiltinLanguage, BuiltinTheme, BundledHighlighterOptions, LanguageRegistration, LineOption, StringLiteralUnion, ThemeRegistration, ThemeRegistrationRaw } from 'shikiji'
 
 export interface AnsiToHtmlOptions {
   theme?: StringLiteralUnion<BuiltinTheme>
@@ -9,7 +9,9 @@ export interface HighlighterOptions extends BundledHighlighterOptions<BuiltinLan
   theme?: BuiltinTheme
 }
 
-export interface IThemeRegistration extends ThemeRegistration {}
+export type IThemeRegistration = ThemeRegistrationRaw | ThemeRegistration | StringLiteralUnion<BuiltinTheme>
+
+export interface IShikiTheme extends ThemeRegistration {}
 
 export interface ILanguageRegistration extends LanguageRegistration {}
 

diff --git a/packages/shikiji-compact/test/types.test.ts → packages/shikiji-compat/test/types.test.ts b/packages/shikiji-compact/test/types.test.ts → packages/shikiji-compat/test/types.test.ts
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml