Use strict types with PluginDriver (#3426)

* Use strict types with PluginDriver * Fix type errors Co-authored-by: Lukas Taegert-Atkinson <lukas.taegert-atkinson@tngtech.com>
rollup · Mar 10, 2020 · 77dbe1f · 77dbe1f
1 parent ddc267e
commit 77dbe1f
Show file tree

Hide file tree

Showing 6 changed files with 189 additions and 80 deletions.
diff --git a/src/ast/nodes/MetaProperty.ts b/src/ast/nodes/MetaProperty.ts
@@ -106,7 +106,7 @@ export default class MetaProperty extends NodeBase {
 				]);
 			}
 			if (!replacement) {
-				replacement = outputPluginDriver.hookFirstSync<'resolveFileUrl', string>('resolveFileUrl', [
+				replacement = outputPluginDriver.hookFirstSync<'resolveFileUrl'>('resolveFileUrl', [
 					{
 						assetReferenceId,
 						chunkId,
@@ -117,7 +117,7 @@ export default class MetaProperty extends NodeBase {
 						referenceId: referenceId || assetReferenceId || chunkReferenceId!,
 						relativePath
 					}
-				]);
+				]) as string;
 			}
 
 			code.overwrite(

diff --git a/src/rollup/rollup.ts b/src/rollup/rollup.ts
@@ -362,8 +362,8 @@ function normalizeOutputOptions(
 	const outputOptions = parseOutputOptions(
 		outputPluginDriver.hookReduceArg0Sync(
 			'outputOptions',
-			[rawOutputOptions.output || inputOptions.output || rawOutputOptions],
-			(outputOptions: OutputOptions, result: OutputOptions) => result || outputOptions,
+			[rawOutputOptions.output || inputOptions.output || rawOutputOptions] as [OutputOptions],
+			(outputOptions, result) => result || outputOptions,
 			pluginContext => {
 				const emitError = () => pluginContext.error(errCannotEmitFromOptionsHook());
 				return {

diff --git a/src/rollup/types.d.ts b/src/rollup/types.d.ts
@@ -288,7 +288,8 @@ export type ResolveFileUrlHook = (
 	}
 ) => string | null | undefined;
 
-export type AddonHook = string | ((this: PluginContext) => string | Promise<string>);
+export type AddonHookFunction = (this: PluginContext) => string | Promise<string>;
+export type AddonHook = string | AddonHookFunction;
 
 /**
  * use this type for plugin annotation
@@ -352,6 +353,51 @@ export interface PluginHooks extends OutputPluginHooks {
 	watchChange: (id: string) => void;
 }
 
+export type AsyncPluginHooks =
+	| 'buildEnd'
+	| 'buildStart'
+	| 'generateBundle'
+	| 'load'
+	| 'renderChunk'
+	| 'renderError'
+	| 'renderStart'
+	| 'resolveDynamicImport'
+	| 'resolveId'
+	| 'transform'
+	| 'writeBundle';
+
+export type PluginValueHooks = 'banner' | 'footer' | 'intro' | 'outro';
+
+export type SyncPluginHooks = Exclude<keyof PluginHooks, AsyncPluginHooks>;
+
+export type FirstPluginHooks =
+	| 'load'
+	| 'resolveAssetUrl'
+	| 'resolveDynamicImport'
+	| 'resolveFileUrl'
+	| 'resolveId'
+	| 'resolveImportMeta';
+
+export type SequentialPluginHooks =
+	| 'augmentChunkHash'
+	| 'generateBundle'
+	| 'options'
+	| 'outputOptions'
+	| 'renderChunk'
+	| 'transform'
+	| 'watchChange';
+
+export type ParallelPluginHooks =
+	| 'banner'
+	| 'buildEnd'
+	| 'buildStart'
+	| 'footer'
+	| 'intro'
+	| 'outro'
+	| 'renderError'
+	| 'renderStart'
+	| 'writeBundle';
+
 interface OutputPluginValueHooks {
 	banner: AddonHook;
 	cacheKey: string;