fix: export rolldown compat types (#337)

rolldown · Nov 20, 2023 · 3efa4fd · 3efa4fd
1 parent 340cd27
commit 3efa4fd
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 33 deletions.
diff --git a/packages/node/package.json b/packages/node/package.json
@@ -32,7 +32,6 @@
   "devDependencies": {
     "@types/node": "^18.14.0",
     "rollup": "^3.17.2",
-    "type-fest": "^3.6.0",
     "typescript": "^5.0.0",
     "unbuild": "^2.0.0",
     "vitest": "^0.34.6"

diff --git a/packages/node/src/index.ts b/packages/node/src/index.ts
@@ -1,5 +1,8 @@
 import type { InputOptions } from './options/input-options'
 import type { OutputOptions } from './options/output-options'
+import type { PluginOptions } from '@rolldown/node-binding'
+import { RolldownOutput } from './utils'
+
 export { rolldown } from './rolldown'
 
 interface RollupOptions extends InputOptions {
@@ -8,7 +11,10 @@ interface RollupOptions extends InputOptions {
 }
 
 // export types from rolldown
-export type { RollupOptions, InputOptions, OutputOptions }
-
-// export types from rollup
-export type { RollupOutput, Plugin } from 'rollup'
+export type {
+  RollupOptions,
+  InputOptions,
+  OutputOptions,
+  PluginOptions as Plugin,
+  RolldownOutput as RollupOutput,
+}
diff --git a/packages/node/src/rolldown-build.ts b/packages/node/src/rolldown-build.ts
@@ -1,12 +1,8 @@
 import { Bundler } from '@rolldown/node-binding'
 import { InputOptions, normalizeInputOptions } from './options/input-options'
 import { normalizeOutputOptions, OutputOptions } from './options/output-options'
-import type {
-  RollupBuild,
-  RollupOutput,
-  SerializedTimings,
-} from './rollup-types'
-import { transformToRollupOutput, unimplemented } from './utils'
+import type { RollupBuild, SerializedTimings } from './rollup-types'
+import { transformToRollupOutput, RolldownOutput, unimplemented } from './utils'
 import { createInputOptionsAdapter } from './options/input-options-adapter'
 
 export class RolldownBuild implements RollupBuild {
@@ -33,14 +29,14 @@ export class RolldownBuild implements RollupBuild {
   closed = false
 
   // @ts-expect-error 2416
-  async generate(outputOptions: OutputOptions = {}): Promise<RollupOutput> {
+  async generate(outputOptions: OutputOptions = {}): Promise<RolldownOutput> {
     const bindingOptions = normalizeOutputOptions(outputOptions)
     const output = await this.#bundler.write(bindingOptions)
     return transformToRollupOutput(output)
   }
 
   // @ts-expect-error 2416
-  async write(outputOptions?: OutputOptions = {}): Promise<RollupOutput> {
+  async write(outputOptions?: OutputOptions = {}): Promise<RolldownOutput> {
     const bindingOptions = normalizeOutputOptions(outputOptions)
     const output = await this.#bundler.write(bindingOptions)
     return transformToRollupOutput(output)

diff --git a/packages/node/src/utils/transform-to-rollup-output.ts b/packages/node/src/utils/transform-to-rollup-output.ts
@@ -1,7 +1,5 @@
-import type { AsyncReturnType } from 'type-fest'
-import { Bundler, OutputAsset, OutputChunk } from '@rolldown/node-binding'
+import { OutputAsset, OutputChunk, Outputs } from '@rolldown/node-binding'
 import type {
-  RollupOutput,
   OutputChunk as RollupOutputChunk,
   OutputAsset as RollupOutputAsset,
 } from '../rollup-types'
@@ -15,6 +13,8 @@ function transformToRollupOutputChunk(chunk: OutputChunk): RollupOutputChunk {
     // @ts-expect-error undefined can't assign to null
     modules: chunk.modules,
     exports: chunk.exports,
+    isEntry: chunk.isEntry,
+    facadeModuleId: chunk.facadeModuleId || null,
     get dynamicImports() {
       return unimplemented()
     },
@@ -33,15 +33,9 @@ function transformToRollupOutputChunk(chunk: OutputChunk): RollupOutputChunk {
     get map() {
       return unimplemented()
     },
-    get facadeModuleId() {
-      return chunk.facadeModuleId || null
-    },
     get isDynamicEntry() {
       return unimplemented()
     },
-    get isEntry() {
-      return chunk.isEntry
-    },
     get isImplicitEntry() {
       return unimplemented()
     },
@@ -74,9 +68,7 @@ function transformToRollupOutputAsset(asset: OutputAsset): RollupOutputAsset {
   }
 }
 
-export function transformToRollupOutput(
-  output: AsyncReturnType<Bundler['write']>,
-): RollupOutput {
+export function transformToRollupOutput(output: Outputs): RolldownOutput {
   const { chunks, assets } = output
 
   return {
@@ -87,3 +79,12 @@ export function transformToRollupOutput(
     ],
   }
 }
+
+type RolldownOutputChunk = OutputChunk & { type: 'chunk' }
+type RolldownOutputAsset = OutputAsset & { type: 'asset' }
+export interface RolldownOutput {
+  output: [
+    RolldownOutputChunk,
+    ...(RolldownOutputChunk | RolldownOutputAsset)[],
+  ]
+}
diff --git a/yarn.lock b/yarn.lock
@@ -1490,7 +1490,6 @@ __metadata:
     "@rolldown/node-binding": "workspace:*"
     "@types/node": "npm:^18.14.0"
     rollup: "npm:^3.17.2"
-    type-fest: "npm:^3.6.0"
     typescript: "npm:^5.0.0"
     unbuild: "npm:^2.0.0"
     vitest: "npm:^0.34.6"
@@ -11172,13 +11171,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"type-fest@npm:^3.6.0":
-  version: 3.13.1
-  resolution: "type-fest@npm:3.13.1"
-  checksum: 9a8a2359ada34c9b3affcaf3a8f73ee14c52779e89950db337ce66fb74c3399776c697c99f2532e9b16e10e61cfdba3b1c19daffb93b338b742f0acd0117ce12
-  languageName: node
-  linkType: hard
-
 "typed-array-buffer@npm:^1.0.0":
   version: 1.0.0
   resolution: "typed-array-buffer@npm:1.0.0"