refactor: re-organize

Author: sxzz

src/core/utils.ts

@@ -0,0 +1,30 @@
+import path from 'node:path'
+
+export function lowestCommonAncestor(...filepaths: string[]): string {
+  if (filepaths.length === 0) return ''
+  if (filepaths.length === 1) return path.dirname(filepaths[0])
+  filepaths = filepaths.map((p) => p.replaceAll('\\', '/'))
+  const [first, ...rest] = filepaths
+  let ancestor = first.split('/')
+  for (const filepath of rest) {
+    const directories = filepath.split('/', ancestor.length)
+    let index = 0
+    for (const directory of directories) {
+      if (directory === ancestor[index]) {
+        index += 1
+      } else {
+        ancestor = ancestor.slice(0, index)
+        break
+      }
+    }
+    ancestor = ancestor.slice(0, index)
+  }
+
+  return ancestor.length <= 1 && ancestor[0] === ''
+    ? `/${ancestor[0]}`
+    : ancestor.join('/')
+}
+
+export function stripExt(filename: string): string {
+  return filename.replace(/\.(.?)[jt]sx?$/, '')
+}

src/index.ts

@@ -16,9 +16,15 @@ import {
   tsTransform,
   type TransformResult,
 } from './core/transformer'
+import { lowestCommonAncestor, stripExt } from './core/utils'
 import type * as OxcTypes from '@oxc-project/types'
 import type { PluginBuild } from 'esbuild'
-import type { Plugin, PluginContext } from 'rollup'
+import type {
+  NormalizedInputOptions,
+  NormalizedOutputOptions,
+  Plugin,
+  PluginContext,
+} from 'rollup'
 
 export type { Options }
 
@@ -28,70 +34,23 @@ export const IsolatedDecl: UnpluginInstance<Options | undefined, false> =
     const filter = createFilter(options.include, options.exclude)
 
     const outputFiles: Record<string, string> = {}
-
     function addOutput(filename: string, source: string) {
       outputFiles[stripExt(filename)] = source
     }
 
     const rollup: Partial<Plugin> = {
-      renderStart(outputOptions, inputOptions) {
-        const { input } = inputOptions
-        const inputMap = !Array.isArray(input)
-          ? Object.fromEntries(
-              Object.entries(input).map(([k, v]) => [
-                path.resolve(stripExt(v)),
-                k,
-              ]),
-            )
-          : undefined
-        const normalizedInput = Array.isArray(input)
-          ? input
-          : Object.values(input)
-        const outBase = lowestCommonAncestor(...normalizedInput)
-
-        if (typeof outputOptions.entryFileNames !== 'string') {
-          return this.error('entryFileNames must be a string')
-        }
-
-        let entryFileNames = outputOptions.entryFileNames.replace(
-          /\.(.)?[jt]sx?$/,
-          (_, s) => `.d.${s || ''}ts`,
-        )
-
-        if (options.extraOutdir) {
-          entryFileNames = path.join(options.extraOutdir, entryFileNames)
-        }
-
-        for (let [outname, source] of Object.entries(outputFiles)) {
-          const name: string =
-            inputMap?.[outname] || path.relative(outBase, outname)
-          const fileName = entryFileNames.replace('[name]', name)
-          if (options.patchCjsDefaultExport && fileName.endsWith('.d.cts')) {
-            source = patchCjsDefaultExport(source)
-          }
-          this.emitFile({
-            type: 'asset',
-            fileName,
-            source,
-          })
-        }
-      },
+      renderStart: rollupRenderStart,
     }
 
     return {
       name: 'unplugin-isolated-decl',
 
-      transformInclude(id) {
-        return filter(id)
-      },
-
+      transformInclude: (id) => filter(id),
       transform(code, id): Promise<undefined> {
         return transform(this, code, id)
       },
 
-      esbuild: {
-        setup: esbuildSetup,
-      },
+      esbuild: { setup: esbuildSetup },
       rollup,
       rolldown: rollup as any,
       vite: {
@@ -214,6 +173,53 @@ export const IsolatedDecl: UnpluginInstance<Options | undefined, false> =
       }
     }
 
+    function rollupRenderStart(
+      this: PluginContext,
+      outputOptions: NormalizedOutputOptions,
+      inputOptions: NormalizedInputOptions,
+    ) {
+      const { input } = inputOptions
+      const inputMap = !Array.isArray(input)
+        ? Object.fromEntries(
+            Object.entries(input).map(([k, v]) => [
+              path.resolve(stripExt(v)),
+              k,
+            ]),
+          )
+        : undefined
+      const normalizedInput = Array.isArray(input)
+        ? input
+        : Object.values(input)
+      const outBase = lowestCommonAncestor(...normalizedInput)
+
+      if (typeof outputOptions.entryFileNames !== 'string') {
+        return this.error('entryFileNames must be a string')
+      }
+
+      let entryFileNames = outputOptions.entryFileNames.replace(
+        /\.(.)?[jt]sx?$/,
+        (_, s) => `.d.${s || ''}ts`,
+      )
+
+      if (options.extraOutdir) {
+        entryFileNames = path.join(options.extraOutdir, entryFileNames)
+      }
+
+      for (let [outname, source] of Object.entries(outputFiles)) {
+        const name: string =
+          inputMap?.[outname] || path.relative(outBase, outname)
+        const fileName = entryFileNames.replace('[name]', name)
+        if (options.patchCjsDefaultExport && fileName.endsWith('.d.cts')) {
+          source = patchCjsDefaultExport(source)
+        }
+        this.emitFile({
+          type: 'asset',
+          fileName,
+          source,
+        })
+      }
+    }
+
     function esbuildSetup(build: PluginBuild) {
       build.onEnd(async (result) => {
         const esbuildOptions = build.initialOptions
@@ -297,38 +303,9 @@ async function resolve(
   return { id: resolved.id, external: !!resolved.external }
 }
 
-function stripExt(filename: string) {
-  return filename.replace(/\.(.?)[jt]sx?$/, '')
-}
-
 function patchCjsDefaultExport(source: string) {
   return source.replace(
     /(?<=(?:[;}]|^)\s*export\s*)(?:\{\s*([\w$]+)\s*as\s+default\s*\}|default\s+([\w$]+))/,
     (_, s1, s2) => `= ${s1 || s2}`,
   )
 }
-
-export function lowestCommonAncestor(...filepaths: string[]): string {
-  if (filepaths.length === 0) return ''
-  if (filepaths.length === 1) return path.dirname(filepaths[0])
-  filepaths = filepaths.map((p) => p.replaceAll('\\', '/'))
-  const [first, ...rest] = filepaths
-  let ancestor = first.split('/')
-  for (const filepath of rest) {
-    const directories = filepath.split('/', ancestor.length)
-    let index = 0
-    for (const directory of directories) {
-      if (directory === ancestor[index]) {
-        index += 1
-      } else {
-        ancestor = ancestor.slice(0, index)
-        break
-      }
-    }
-    ancestor = ancestor.slice(0, index)
-  }
-
-  return ancestor.length <= 1 && ancestor[0] === ''
-    ? `/${ancestor[0]}`
-    : ancestor.join('/')
-}

tests/paths.test.ts

@@ -1,5 +1,5 @@
 import { expect, test } from 'vitest'
-import { lowestCommonAncestor } from '../src'
+import { lowestCommonAncestor } from '../src/core/utils'
 
 test('lowestCommonAncestor', () => {
   expect(lowestCommonAncestor('/a/b', '/a')).toBe('/a')