Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: internal TS type errors #187

Merged
merged 4 commits into from Oct 31, 2022
Merged

fix: internal TS type errors #187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c7c331c
chore: switch to @antfu/eslint-config
sxzz Oct 29, 2022
4ff6c33
ci: add lint
sxzz Oct 29, 2022
df92ec9
fix: TS type errors
sxzz Oct 29, 2022
ddbb519
Merge branch 'main' into fix/generic
antfu Oct 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/rollup/index.ts
View file
Open in desktop
@@ -1,17 +1,17 @@
import type { RollupPlugin, UnpluginContextMeta, UnpluginFactory, UnpluginInstance, UnpluginOptions } from '../types'
import { toArray } from '../utils'

export function getRollupPlugin <UserOptions = {}>(
factory: UnpluginFactory<UserOptions>,
): UnpluginInstance<UserOptions>['rollup'] {
return (userOptions?: UserOptions) => {
export function getRollupPlugin <UserOptions = {}, Nested extends boolean = boolean>(
factory: UnpluginFactory<UserOptions, Nested>,
) {
return ((userOptions?: UserOptions) => {
const meta: UnpluginContextMeta = {
framework: 'rollup',
}
const rawPlugins = toArray(factory(userOptions!, meta))
const plugins = rawPlugins.map(plugin => toRollupPlugin(plugin))
return plugins.length === 1 ? plugins[0] : plugins
}
}) as UnpluginInstance<UserOptions, Nested>['rollup']
}

export function toRollupPlugin(plugin: UnpluginOptions, containRollupOptions = true): RollupPlugin {
Expand Down
4 changes: 2 additions & 2 deletions src/types.ts
View file
Open in desktop
Expand Up @@ -69,15 +69,15 @@ export interface ResolvedUnpluginOptions extends UnpluginOptions {
__virtualModulePrefix: string
}

export type UnpluginFactory<UserOptions, Nested extends boolean> = (options: UserOptions, meta: UnpluginContextMeta) =>
export type UnpluginFactory<UserOptions, Nested extends boolean = boolean> = (options: UserOptions, meta: UnpluginContextMeta) =>
Nested extends true
? Array<UnpluginOptions>
: UnpluginOptions
export type UnpluginFactoryOutput<UserOptions, Return> = undefined extends UserOptions
? (options?: UserOptions) => Return
: (options: UserOptions) => Return

export interface UnpluginInstance<UserOptions, Nested extends boolean> {
export interface UnpluginInstance<UserOptions, Nested extends boolean = boolean> {
rollup: UnpluginFactoryOutput<UserOptions, Nested extends true ? Array<RollupPlugin> : RollupPlugin>
vite: UnpluginFactoryOutput<UserOptions, Nested extends true ? Array<VitePlugin> : VitePlugin>
webpack: UnpluginFactoryOutput<UserOptions, WebpackPluginInstance>
Expand Down
10 changes: 5 additions & 5 deletions src/vite/index.ts
View file
Open in desktop
Expand Up @@ -2,10 +2,10 @@ import { toRollupPlugin } from '../rollup'
import type { UnpluginContextMeta, UnpluginFactory, UnpluginInstance, VitePlugin } from '../types'
import { toArray } from '../utils'

export function getVitePlugin <UserOptions = {}>(
factory: UnpluginFactory<UserOptions>,
): UnpluginInstance<UserOptions>['vite'] {
return (userOptions?: UserOptions) => {
export function getVitePlugin <UserOptions = {}, Nested extends boolean = boolean>(
factory: UnpluginFactory<UserOptions, Nested>,
) {
return ((userOptions?: UserOptions) => {
const meta: UnpluginContextMeta = {
framework: 'vite',
}
Expand All @@ -20,5 +20,5 @@ export function getVitePlugin <UserOptions = {}>(
})

return plugins.length === 1 ? plugins[0] : plugins
}
}) as UnpluginInstance<UserOptions, Nested>['vite']
}