refactor: enable isolatedDeclarations

Author: sxzz

package.json

@@ -73,6 +73,7 @@
     "build": "tsdown",
     "dev": "pnpm run -C playground dev",
     "test": "vitest",
+    "typecheck": "tsc --noEmit",
     "release": "bumpp && pnpm publish",
     "benchmark": "node benchmark/index.js",
     "prepublishOnly": "pnpm run build"

src/core/convert.ts

@@ -444,7 +444,7 @@ export function transformJsxToString(
     plugins,
     id = '',
   }: Pick<OptionsResolved, 'debug' | 'plugins'> & { id?: string },
-) {
+): { code: string; map: any } {
   const s = new MagicString(code)
 
   if (id.endsWith('.tsx')) plugins.push('typescript')
@@ -468,8 +468,9 @@ export function transformJsxToString(
     code: s.toString(),
     get map() {
       return s.generateMap({
-        hires: 'boundary',
+        source: id,
         includeContent: true,
+        hires: 'boundary',
       })
     },
   }

src/core/options.ts

@@ -3,7 +3,7 @@ import type { FilterPattern } from '@rollup/pluginutils'
 
 export interface Options {
   include?: FilterPattern
-  exclude?: FilterPattern | undefined
+  exclude?: FilterPattern
   debug?: boolean
   /**
    * Plugins for `@babel/parser`
@@ -12,15 +12,22 @@ export interface Options {
    * @default `['jsx']` or `['jsx', 'typescript']`.
    */
   plugins?: ParserPlugin[]
+  enforce?: 'pre' | 'post' | undefined
 }
 
-export type OptionsResolved = Required<Options>
+type Overwrite<T, U> = Pick<T, Exclude<keyof T, keyof U>> & U
 
-export function resolveOption(options: Options): OptionsResolved {
+export type OptionsResolved = Overwrite<
+  Required<Options>,
+  Pick<Options, 'enforce'>
+>
+
+export function resolveOptions(options: Options): OptionsResolved {
   return {
     include: options.include || [/\.[jt]sx$/],
-    exclude: options.exclude || undefined,
+    exclude: options.exclude || [/node_modules/],
     debug: options.debug ?? false,
     plugins: ['jsx'],
+    enforce: 'enforce' in options ? options.enforce : 'pre',
   }
 }

src/core/utils.ts

@@ -10,20 +10,21 @@ export type Primitive =
   | bigint
 
 const KEBAB_REGEX = /[A-Z\u00C0-\u00D6\u00D8-\u00DE]/g
-export function kebabCase(str: string) {
+export function kebabCase(str: string): string {
   return str.replaceAll(KEBAB_REGEX, (match) => {
     return `-${match.toLowerCase()}`
   })
 }
 
-export const styleToString = (styles: Record<string, string>) =>
-  Object.entries(styles)
+export function styleToString(styles: Record<string, string>): string {
+  return Object.entries(styles)
     .map(([key, value]) => `${kebabCase(key)}:${value}`)
     .join(';')
+}
 
 const RAW_RE = /__RAW_(.*?)_RAW/g
 
-export const escapeString = (str: string) => {
+export function escapeString(str: string): string {
   const text = jsesc(str, {
     quotes: 'backtick',
     wrap: true,

src/esbuild.ts

@@ -1,3 +1,3 @@
 import unplugin from '.'
 
-export default unplugin.esbuild
+export default unplugin.esbuild as typeof unplugin.esbuild

src/index.ts

@@ -1,36 +1,40 @@
 import { createFilter } from '@rollup/pluginutils'
-import { createUnplugin } from 'unplugin'
+import { createUnplugin, type UnpluginInstance } from 'unplugin'
 import { transformJsxToString } from './core/convert'
-import { resolveOption, type Options } from './core/options'
+import { resolveOptions, type Options } from './core/options'
 
 declare global {
   // @ts-expect-error missing JSX
   const jsxToString: (element: JSX.Element) => string
   const jsxRaw: (variable: any) => any
 }
 
-export default createUnplugin<Options | undefined, false>((options = {}) => {
-  const opt = resolveOption(options)
-  const filter = createFilter(opt.include, opt.exclude)
+const JsxString: UnpluginInstance<Options | undefined, false> = createUnplugin(
+  (options = {}) => {
+    const opt = resolveOptions(options)
+    const filter = createFilter(opt.include, opt.exclude)
 
-  const name = 'unplugin-jsx-string'
-  return {
-    name,
-    enforce: 'pre',
+    const name = 'unplugin-jsx-string'
+    return {
+      name,
+      enforce: 'pre',
 
-    transformInclude(id) {
-      return filter(id)
-    },
+      transformInclude(id) {
+        return filter(id)
+      },
 
-    transform(code, id) {
-      try {
-        return transformJsxToString(code, {
-          ...opt,
-          id,
-        })
-      } catch (error: unknown) {
-        this.error(`${name} ${error}`)
-      }
-    },
-  }
-})
+      transform(code, id) {
+        try {
+          return transformJsxToString(code, {
+            ...opt,
+            id,
+          })
+        } catch (error: unknown) {
+          this.error(`${name} ${error}`)
+        }
+      },
+    }
+  },
+)
+
+export default JsxString

src/rollup.ts

@@ -1,3 +1,3 @@
 import unplugin from '.'
 
-export default unplugin.rollup
+export default unplugin.rollup as typeof unplugin.rollup

src/vite.ts

@@ -1,3 +1,3 @@
 import unplugin from '.'
 
-export default unplugin.vite
+export default unplugin.vite as typeof unplugin.vite

src/webpack.ts

@@ -1,3 +1,3 @@
 import unplugin from '.'
 
-export default unplugin.webpack
+export default unplugin.webpack as typeof unplugin.webpack

tsconfig.json

@@ -1,17 +1,22 @@
 {
   "compilerOptions": {
-    "target": "es2022",
+    "target": "esnext",
     "jsx": "preserve",
     "lib": ["es2022"],
-    "module": "esnext",
-    "moduleResolution": "node",
+    "moduleDetection": "force",
+    "module": "preserve",
+    "moduleResolution": "bundler",
     "resolveJsonModule": true,
     "types": ["node", "react"],
     "strict": true,
-    "exactOptionalPropertyTypes": true,
     "noUnusedLocals": true,
+    "declaration": true,
+    "isolatedDeclarations": true,
     "esModuleInterop": true,
+    "isolatedModules": true,
+    "verbatimModuleSyntax": true,
     "skipLibCheck": true
   },
-  "include": ["src", "tests"]
+  "include": ["src", "tests"],
+  "exclude": ["tests/fixtures"]
 }