Add generic parameter PluginName to ExportPlugin<PluginName>

Same as recent change that added it to `ImportPlugin<PluginName>`

Author: milesrichardson

packages/base-db/base-db.ts

@@ -37,10 +37,15 @@ export interface ImportPlugin<
 //   withOptions: WithOptions<ImportPlugin>;
 // }
 
-export interface ExportPlugin extends Plugin {
+export interface ExportPlugin<
+  PluginName extends string,
+  ConcreteSourceOptions extends object = any,
+  ConcreteDestOptions extends object = any
+> extends Plugin {
+  __name: PluginName;
   exportData: (
-    sourceOptions: any,
-    destOptions: any
+    sourceOptions: ConcreteSourceOptions,
+    destOptions: ConcreteDestOptions
   ) => Promise<{ response: any | null; error: any | null; info?: any | null }>;
 }
 
@@ -87,9 +92,9 @@ export type ExportPluginFromList<
   ConcretePluginList extends PluginList,
   PluginName extends ExtractPlugin<
     ConcretePluginList,
-    ExportPlugin
+    ExportPlugin<string>
   >["__name"] = string
-> = ExtractPlugin<ConcretePluginList, ExportPlugin & { __name: PluginName }>;
+> = ExtractPlugin<ConcretePluginList, ExportPlugin<PluginName>>;
 
 export interface DbOptions<ConcretePluginList extends PluginList> {
   plugins: ConcretePluginList;

packages/db-seafowl/db-seafowl.ts

@@ -33,9 +33,9 @@ import {
 import type { HTTPStrategies, HTTPClientOptions } from "@madatdata/client-http";
 
 export type DefaultSeafowlPluginList<
-  ConcretePluginList extends (ImportPlugin<string> | ExportPlugin)[] = (
+  ConcretePluginList extends (ImportPlugin<string> | ExportPlugin<string>)[] = (
     | ImportPlugin<string>
-    | ExportPlugin
+    | ExportPlugin<string>
   )[]
 > = ConcretePluginList[number][];
 
@@ -265,10 +265,16 @@ export class DbSeafowl<SeafowlPluginList extends PluginList>
     );
   }
 
-  async exportData(
-    _pluginName: ExtractPlugin<SeafowlPluginList, ExportPlugin>["__name"],
+  // TODO: atm, there are no Seafowl export plugins
+  async exportData<
+    PluginName extends ExtractPlugin<
+      SeafowlPluginList,
+      ExportPlugin<string>
+    >["__name"]
+  >(
+    _pluginName: PluginName,
     ..._rest: Parameters<
-      ExtractPlugin<SeafowlPluginList, ExportPlugin>["exportData"]
+      ExtractPlugin<SeafowlPluginList, ExportPlugin<PluginName>>["exportData"]
     >
   ): Promise<unknown> {
     await Promise.resolve();

packages/db-splitgraph/db-splitgraph.ts

@@ -285,10 +285,18 @@ export class DbSplitgraph<SplitgraphPluginList extends PluginList>
     };
   }
 
-  async exportData(
-    pluginName: ExtractPlugin<SplitgraphPluginList, ExportPlugin>["__name"],
+  async exportData<
+    PluginName extends ExtractPlugin<
+      SplitgraphPluginList,
+      ExportPlugin<string>
+    >["__name"]
+  >(
+    pluginName: PluginName,
     ...rest: Parameters<
-      ExtractPlugin<SplitgraphPluginList, ExportPlugin>["exportData"]
+      ExtractPlugin<
+        SplitgraphPluginList,
+        ExportPlugin<PluginName>
+      >["exportData"]
     >
   ) {
     const [sourceOpts, destOpts] = rest;
@@ -299,10 +307,12 @@ export class DbSplitgraph<SplitgraphPluginList extends PluginList>
           plugin
         ): plugin is ExtractPlugin<
           SplitgraphPluginList,
-          ExportPlugin & { __name: typeof pluginName } & Partial<
-              WithOptionsInterface<ExportPlugin>
-            >
-        > => "exportData" in Object.getPrototypeOf(plugin)
+          ExportPlugin<typeof pluginName> & {
+            __name: typeof pluginName;
+          } & Partial<WithOptionsInterface<ExportPlugin<typeof pluginName>>>
+        > =>
+          "exportData" in Object.getPrototypeOf(plugin) &&
+          plugin.__name === pluginName
       )
       .pop();
 

packages/db-splitgraph/plugins/exporters/export-query-plugin.ts

@@ -53,7 +53,9 @@ const retryOptions = {
   exponentialOption: { maxInterval: MAX_BACKOFF_INTERVAL, multiplier: 2 },
 };
 export class ExportQueryPlugin
-  implements ExportPlugin, WithOptionsInterface<ExportQueryPlugin>
+  implements
+    ExportPlugin<"exportQuery">,
+    WithOptionsInterface<ExportQueryPlugin>
 {
   private readonly opts: ExportQueryPluginOptions;
   public readonly graphqlEndpoint: ExportQueryPluginOptions["graphqlEndpoint"];