feat(plugins-manager): further improve types

Author: bennypowers

packages/plugins-manager/src/addPlugin.js

@@ -1,6 +1,9 @@
 /** @typedef {import('../types/main').MetaPlugin} MetaPlugin */
 
-/** @type {import('../types/main').AddPluginType} */
+/**
+ * @template {Function} T
+ * @param {import('../types/main').AddPluginOptions<T>} metaPluginAndOptions
+ */
 export function addPlugin(metaPluginAndOptions) {
   const {
     name,

packages/plugins-manager/types/main.d.ts

@@ -3,20 +3,22 @@ type AnyFn = (...args: any[]) => any;
 export interface MetaPlugin<F = AnyFn> {
   name: string;
   plugin: F extends (options?: infer O) => P ? F : any;
-  options?: F extends (options: infer O) => P ? O : any;
+  options?: /* prettier-ignore */ (
+      F extends (eleventyConfig: any, options?: infer O) => void ? O
+    : F extends (options: infer O) => P ? O
+    : any
+  );
 }
 
 export interface MetaPluginWrapable extends MetaPlugin {
   __noWrap?: boolean;
 }
 
-interface AddPluginOptions {
+export type AddPluginOptions<T> = MetaPlugin<T> & {
   how?: 'after' | 'before' | 'fixed';
   location?: 'top' | 'bottom' | string;
-}
+};
 
 type AddPluginFn = (plugins: MetaPlugin[]) => MetaPlugin[];
 
-export type AddPluginType = <F>(
-  metaPluginAndOptions: MetaPlugin<F> & AddPluginOptions,
-) => AddPluginFn;
+export type AddPluginType = <F>(metaPluginAndOptions: AddPluginOptions<F>) => AddPluginFn;