feat: auto module default resolution

.eslintignore

@@ -1,2 +1,2 @@
-src/vendor/languages
+src/vendor
 onig.js

README.md

@@ -54,13 +54,13 @@ const shiki = await getHighlighter({
   themes: [nord],
   langs: [
     // Or a getter if you want to do chunk splitting
-    () => import('shikiji/languages/javascript.mjs').then(m => m.default),
+    () => import('shikiji/languages/javascript.mjs')
   ],
   loadWasm: getWasmInlined
 })
 
 // optionally, load themes and languages after creation
-await shiki.loadTheme(() => import('shikiji/themes/vitesse-light.mjs').then(m => m.default))
+await shiki.loadTheme(() => import('shikiji/themes/vitesse-light.mjs'))
 
 const code = shiki.codeToHtml('const a = 1', { lang: 'javascript' })
 ```

scripts/prepare.ts

@@ -31,9 +31,9 @@ for (const file of files) {
   }, { spaces: 2 })
 }
 
-const languages = Object.fromEntries(BUNDLED_LANGUAGES.map(i => [i.id, `__()=>import('./languages/${i.id}.json').then(r=>r.default as unknown as LanguageRegistration)__`]))
+const languages = Object.fromEntries(BUNDLED_LANGUAGES.map(i => [i.id, `__() => import('./languages/${i.id}.json') as unknown as Promise<{ default: LanguageRegistration }>__`]))
 
-const themes = Object.fromEntries(BUNDLED_THEMES.map(i => [i, `__()=>import('shiki/themes/${i}.json').then(r=>r.default as unknown as ThemeRegisterationRaw)__`]))
+const themes = Object.fromEntries(BUNDLED_THEMES.map(i => [i, `__() => import('shiki/themes/${i}.json') as unknown as Promise<{ default: ThemeRegisterationRaw }>__`]))
 
 await fs.writeFile(
   'src/vendor/langs.ts',

src/core.ts

@@ -23,8 +23,8 @@ export async function getHighlighterCore(options: HighlighterCoreOptions) {
     themes,
     langs,
   ] = await Promise.all([
-    Promise.all(options.themes.map(async t => typeof t === 'function' ? await t() : t)),
-    Promise.all(options.langs.map(async t => typeof t === 'function' ? await t() : t)),
+    Promise.all(options.themes.map(normalizeGetter)),
+    Promise.all(options.langs.map(normalizeGetter)),
     typeof options.loadWasm === 'function'
       ? Promise.resolve(options.loadWasm()).then(r => loadWasm(r))
       : options.loadWasm
@@ -116,5 +116,5 @@ function isPlaintext(lang: string | null | undefined) {
 }
 
 async function normalizeGetter<T>(p: MaybeGetter<T>): Promise<T> {
-  return typeof p === 'function' ? (p as any)() : p
+  return typeof p === 'function' ? Promise.resolve((p as any)()).then(r => r.default || r) : p
 }

src/types.ts

@@ -7,7 +7,8 @@ export type BuiltinLanguages = keyof typeof bundledLanguages
 export type BuiltinThemes = keyof typeof bundledThemes
 
 export type Awaitable<T> = T | Promise<T>
-export type MaybeGetter<T> = T | (() => Awaitable<T>)
+export type MaybeGetter<T> = T | (() => Awaitable<MaybeModule<T>>)
+export type MaybeModule<T> = T | { default: T }
 
 export type ThemeInput = MaybeGetter<ThemeRegisteration | ThemeRegisterationRaw>
 export type LanguageInput = MaybeGetter<LanguageRegistration>

src/vendor/themes.ts

@@ -1,33 +1,33 @@
 import type { ThemeRegisterationRaw } from '../types'
 
 export const bundledThemes = {
-  'css-variables': () => import('shiki/themes/css-variables.json').then(r => r.default as unknown as ThemeRegisterationRaw),
-  'dark-plus': () => import('shiki/themes/dark-plus.json').then(r => r.default as unknown as ThemeRegisterationRaw),
-  'dracula-soft': () => import('shiki/themes/dracula-soft.json').then(r => r.default as unknown as ThemeRegisterationRaw),
-  'dracula': () => import('shiki/themes/dracula.json').then(r => r.default as unknown as ThemeRegisterationRaw),
-  'github-dark-dimmed': () => import('shiki/themes/github-dark-dimmed.json').then(r => r.default as unknown as ThemeRegisterationRaw),
-  'github-dark': () => import('shiki/themes/github-dark.json').then(r => r.default as unknown as ThemeRegisterationRaw),
-  'github-light': () => import('shiki/themes/github-light.json').then(r => r.default as unknown as ThemeRegisterationRaw),
-  'hc_light': () => import('shiki/themes/hc_light.json').then(r => r.default as unknown as ThemeRegisterationRaw),
-  'light-plus': () => import('shiki/themes/light-plus.json').then(r => r.default as unknown as ThemeRegisterationRaw),
-  'material-theme-darker': () => import('shiki/themes/material-theme-darker.json').then(r => r.default as unknown as ThemeRegisterationRaw),
-  'material-theme-lighter': () => import('shiki/themes/material-theme-lighter.json').then(r => r.default as unknown as ThemeRegisterationRaw),
-  'material-theme-ocean': () => import('shiki/themes/material-theme-ocean.json').then(r => r.default as unknown as ThemeRegisterationRaw),
-  'material-theme-palenight': () => import('shiki/themes/material-theme-palenight.json').then(r => r.default as unknown as ThemeRegisterationRaw),
-  'material-theme': () => import('shiki/themes/material-theme.json').then(r => r.default as unknown as ThemeRegisterationRaw),
-  'min-dark': () => import('shiki/themes/min-dark.json').then(r => r.default as unknown as ThemeRegisterationRaw),
-  'min-light': () => import('shiki/themes/min-light.json').then(r => r.default as unknown as ThemeRegisterationRaw),
-  'monokai': () => import('shiki/themes/monokai.json').then(r => r.default as unknown as ThemeRegisterationRaw),
-  'nord': () => import('shiki/themes/nord.json').then(r => r.default as unknown as ThemeRegisterationRaw),
-  'one-dark-pro': () => import('shiki/themes/one-dark-pro.json').then(r => r.default as unknown as ThemeRegisterationRaw),
-  'poimandres': () => import('shiki/themes/poimandres.json').then(r => r.default as unknown as ThemeRegisterationRaw),
-  'rose-pine-dawn': () => import('shiki/themes/rose-pine-dawn.json').then(r => r.default as unknown as ThemeRegisterationRaw),
-  'rose-pine-moon': () => import('shiki/themes/rose-pine-moon.json').then(r => r.default as unknown as ThemeRegisterationRaw),
-  'rose-pine': () => import('shiki/themes/rose-pine.json').then(r => r.default as unknown as ThemeRegisterationRaw),
-  'slack-dark': () => import('shiki/themes/slack-dark.json').then(r => r.default as unknown as ThemeRegisterationRaw),
-  'slack-ochin': () => import('shiki/themes/slack-ochin.json').then(r => r.default as unknown as ThemeRegisterationRaw),
-  'solarized-dark': () => import('shiki/themes/solarized-dark.json').then(r => r.default as unknown as ThemeRegisterationRaw),
-  'solarized-light': () => import('shiki/themes/solarized-light.json').then(r => r.default as unknown as ThemeRegisterationRaw),
-  'vitesse-dark': () => import('shiki/themes/vitesse-dark.json').then(r => r.default as unknown as ThemeRegisterationRaw),
-  'vitesse-light': () => import('shiki/themes/vitesse-light.json').then(r => r.default as unknown as ThemeRegisterationRaw),
-}
+  "css-variables": () => import('shiki/themes/css-variables.json') as unknown as Promise<{ default: ThemeRegisterationRaw }>,
+  "dark-plus": () => import('shiki/themes/dark-plus.json') as unknown as Promise<{ default: ThemeRegisterationRaw }>,
+  "dracula-soft": () => import('shiki/themes/dracula-soft.json') as unknown as Promise<{ default: ThemeRegisterationRaw }>,
+  "dracula": () => import('shiki/themes/dracula.json') as unknown as Promise<{ default: ThemeRegisterationRaw }>,
+  "github-dark-dimmed": () => import('shiki/themes/github-dark-dimmed.json') as unknown as Promise<{ default: ThemeRegisterationRaw }>,
+  "github-dark": () => import('shiki/themes/github-dark.json') as unknown as Promise<{ default: ThemeRegisterationRaw }>,
+  "github-light": () => import('shiki/themes/github-light.json') as unknown as Promise<{ default: ThemeRegisterationRaw }>,
+  "hc_light": () => import('shiki/themes/hc_light.json') as unknown as Promise<{ default: ThemeRegisterationRaw }>,
+  "light-plus": () => import('shiki/themes/light-plus.json') as unknown as Promise<{ default: ThemeRegisterationRaw }>,
+  "material-theme-darker": () => import('shiki/themes/material-theme-darker.json') as unknown as Promise<{ default: ThemeRegisterationRaw }>,
+  "material-theme-lighter": () => import('shiki/themes/material-theme-lighter.json') as unknown as Promise<{ default: ThemeRegisterationRaw }>,
+  "material-theme-ocean": () => import('shiki/themes/material-theme-ocean.json') as unknown as Promise<{ default: ThemeRegisterationRaw }>,
+  "material-theme-palenight": () => import('shiki/themes/material-theme-palenight.json') as unknown as Promise<{ default: ThemeRegisterationRaw }>,
+  "material-theme": () => import('shiki/themes/material-theme.json') as unknown as Promise<{ default: ThemeRegisterationRaw }>,
+  "min-dark": () => import('shiki/themes/min-dark.json') as unknown as Promise<{ default: ThemeRegisterationRaw }>,
+  "min-light": () => import('shiki/themes/min-light.json') as unknown as Promise<{ default: ThemeRegisterationRaw }>,
+  "monokai": () => import('shiki/themes/monokai.json') as unknown as Promise<{ default: ThemeRegisterationRaw }>,
+  "nord": () => import('shiki/themes/nord.json') as unknown as Promise<{ default: ThemeRegisterationRaw }>,
+  "one-dark-pro": () => import('shiki/themes/one-dark-pro.json') as unknown as Promise<{ default: ThemeRegisterationRaw }>,
+  "poimandres": () => import('shiki/themes/poimandres.json') as unknown as Promise<{ default: ThemeRegisterationRaw }>,
+  "rose-pine-dawn": () => import('shiki/themes/rose-pine-dawn.json') as unknown as Promise<{ default: ThemeRegisterationRaw }>,
+  "rose-pine-moon": () => import('shiki/themes/rose-pine-moon.json') as unknown as Promise<{ default: ThemeRegisterationRaw }>,
+  "rose-pine": () => import('shiki/themes/rose-pine.json') as unknown as Promise<{ default: ThemeRegisterationRaw }>,
+  "slack-dark": () => import('shiki/themes/slack-dark.json') as unknown as Promise<{ default: ThemeRegisterationRaw }>,
+  "slack-ochin": () => import('shiki/themes/slack-ochin.json') as unknown as Promise<{ default: ThemeRegisterationRaw }>,
+  "solarized-dark": () => import('shiki/themes/solarized-dark.json') as unknown as Promise<{ default: ThemeRegisterationRaw }>,
+  "solarized-light": () => import('shiki/themes/solarized-light.json') as unknown as Promise<{ default: ThemeRegisterationRaw }>,
+  "vitesse-dark": () => import('shiki/themes/vitesse-dark.json') as unknown as Promise<{ default: ThemeRegisterationRaw }>,
+  "vitesse-light": () => import('shiki/themes/vitesse-light.json') as unknown as Promise<{ default: ThemeRegisterationRaw }>
+}

test/core.test.ts

@@ -30,7 +30,7 @@ describe('should', () => {
       },
     })
 
-    await shiki.loadLanguage(() => import('../dist/languages/python.mjs').then(m => m.default))
+    await shiki.loadLanguage(() => import('../dist/languages/python.mjs'))
     await shiki.loadTheme(() => import('../dist/themes/vitesse-light.mjs').then(m => m.default))
 
     expect(shiki.codeToHtml('print 1', { lang: 'python', theme: 'vitesse-light' }))