fix: .d.mts for all

Author: antfu

package.json

@@ -18,19 +18,19 @@
   "sideEffects": false,
   "exports": {
     ".": {
-      "types": "./dist/index.d.ts",
+      "types": "./dist/index.d.mts",
       "import": "./dist/index.mjs"
     },
     "./core": {
-      "types": "./dist/core.d.ts",
+      "types": "./dist/core.d.mts",
       "import": "./dist/core.mjs"
     },
     "./dist/*": "./dist/*",
     "./*": "./dist/*"
   },
   "main": "./dist/index.mjs",
   "module": "./dist/index.mjs",
-  "types": "./dist/index.d.ts",
+  "types": "./dist/index.d.mts",
   "files": [
     "dist"
   ],

rollup.config.mjs

@@ -28,6 +28,7 @@ export default defineConfig([
     input: [
       'src/index.ts',
       'src/core.ts',
+      'src/wasm.ts',
     ],
     output: {
       dir: 'dist',
@@ -51,13 +52,14 @@ export default defineConfig([
     input: [
       'src/core.ts',
       'src/index.ts',
+      'src/wasm.ts',
       'src/types.ts',
     ],
     output: {
       dir: 'dist',
       format: 'esm',
-      chunkFileNames: 'types/[name].d.ts',
-      entryFileNames: f => `${f.name.replace('src/', '')}.d.ts`,
+      chunkFileNames: 'types/[name].d.mts',
+      entryFileNames: f => `${f.name.replace('src/', '')}.d.mts`,
     },
     plugins: [
       dts({
@@ -74,15 +76,15 @@ export default defineConfig([
           await Promise.all(
             langs.map(file => fs.writeFile(
               join(dirname(file), `${basename(file, '.mjs')}.d.mts`),
-              'import { LanguageRegistration } from \'../types\';declare const reg: LanguageRegistration;export default reg',
+              'import { LanguageRegistration } from \'../types.mjs\';declare const reg: LanguageRegistration;export default reg',
               'utf-8',
             )),
           )
           const themes = await fg('dist/themes/*.mjs', { absolute: true })
           await Promise.all(
             themes.map(file => fs.writeFile(
               join(dirname(file), `${basename(file, '.mjs')}.d.mts`),
-              'import { ThemeRegisterationRaw } from \'../types\';declare const reg: ThemeRegisterationRaw;export default reg',
+              'import { ThemeRegisterationRaw } from \'../types.mjs\';declare const reg: ThemeRegisterationRaw;export default reg',
               'utf-8',
             )),
           )

src/index.ts

@@ -2,24 +2,21 @@ import type { BuiltinLanguages, BuiltinThemes, LanguageInput, ThemeInput } from
 import { themes } from './vendor/themes'
 import { languages } from './vendor/langs'
 import { getHighlighter as getCoreHighlighter } from './core'
+import { loadWasm } from './oniguruma'
+import { getWasmInlined } from './wasm'
 
 export * from './types'
 
+export {
+  loadWasm,
+  getWasmInlined,
+}
+
 export interface HighlighterOptions {
   themes?: (ThemeInput | BuiltinThemes)[]
   langs?: (LanguageInput | BuiltinLanguages)[]
 }
 
-let _onigurumaPromise: Promise<{ data: ArrayBuffer }> | null = null
-export async function getWasmInlined(): Promise<{ data: ArrayBuffer }> {
-  if (!_onigurumaPromise) {
-    // @ts-expect-error anyway
-    _onigurumaPromise = import('vscode-oniguruma/release/onig.wasm')
-      .then(r => ({ data: r.default as ArrayBuffer }))
-  }
-  return _onigurumaPromise
-}
-
 export async function getHighlighter(options: HighlighterOptions = {}) {
   const _themes = (options.themes ?? ['nord']).map((i) => {
     if (typeof i === 'string')

src/wasm.ts

@@ -0,0 +1,9 @@
+let _onigurumaPromise: Promise<{ data: ArrayBuffer }> | null = null
+export async function getWasmInlined(): Promise<{ data: ArrayBuffer }> {
+  if (!_onigurumaPromise) {
+    // @ts-expect-error anyway
+    _onigurumaPromise = import('vscode-oniguruma/release/onig.wasm')
+      .then(r => ({ data: r.default as ArrayBuffer }))
+  }
+  return _onigurumaPromise
+}

test/core.test.ts

@@ -1,10 +1,7 @@
 import { describe, expect, it } from 'vitest'
 import { getHighlighter } from '../src/core'
 
-// @ts-expect-error no-types
 import js from '../dist/languages/javascript.mjs'
-
-// @ts-expect-error no-types
 import nord from '../dist/themes/nord.mjs'
 
 // @ts-expect-error no-types
@@ -13,8 +10,8 @@ import onig from '../dist/onig.mjs'
 describe('should', () => {
   it('exported', async () => {
     const shiki = await getHighlighter({
-      themes: [nord as any],
-      langs: [js as any],
+      themes: [nord],
+      langs: [js],
       loadWasm: {
         instantiator: obj => WebAssembly.instantiate(onig, obj),
       },