Merge pull request #2182 from hey-api/refactor/plugin-types

Author: mrlubos

packages/openapi-ts/src/initConfigs.ts

@@ -122,10 +122,7 @@ const getPluginsConfig = ({
     if (plugin._infer) {
       const context: PluginContext = {
         ensureDependency: (dependency) => {
-          if (
-            typeof dependency === 'string' &&
-            !plugin._dependencies.includes(dependency)
-          ) {
+          if (!plugin._dependencies.includes(dependency)) {
             plugin._dependencies = [...plugin._dependencies, dependency];
           }
         },
@@ -139,7 +136,7 @@ const getPluginsConfig = ({
               defaultConfig._tags?.includes(tag) &&
               userPlugin !== name
             ) {
-              return userPlugin;
+              return userPlugin as any;
             }
           }
 

packages/openapi-ts/src/plugins/@hey-api/sdk/config.ts

@@ -14,30 +14,26 @@ export const defaultConfig: Plugin.Config<Config> = {
         plugin.config.client = context.pluginByTag({
           defaultPlugin: '@hey-api/client-fetch',
           tag: 'client',
-        }) as unknown as typeof plugin.config.client;
+        });
       }
 
-      context.ensureDependency(plugin.config.client);
+      context.ensureDependency(plugin.config.client!);
     }
 
     if (plugin.config.transformer) {
       if (typeof plugin.config.transformer === 'boolean') {
-        plugin.config.transformer = context.pluginByTag({
-          tag: 'transformer',
-        }) as unknown as typeof plugin.config.transformer;
+        plugin.config.transformer = context.pluginByTag({ tag: 'transformer' });
       }
 
-      context.ensureDependency(plugin.config.transformer);
+      context.ensureDependency(plugin.config.transformer!);
     }
 
     if (plugin.config.validator) {
       if (typeof plugin.config.validator === 'boolean') {
-        plugin.config.validator = context.pluginByTag({
-          tag: 'validator',
-        }) as unknown as typeof plugin.config.validator;
+        plugin.config.validator = context.pluginByTag({ tag: 'validator' });
       }
 
-      context.ensureDependency(plugin.config.validator);
+      context.ensureDependency(plugin.config.validator!);
     }
 
     if (plugin.config.instance) {

packages/openapi-ts/src/plugins/types.d.ts

@@ -40,12 +40,12 @@ export type AnyPluginName = PluginNames | (string & {});
 type PluginTag = 'client' | 'transformer' | 'validator';
 
 export interface PluginContext {
-  ensureDependency: (name: PluginNames | true) => void;
-  pluginByTag: (props: {
-    defaultPlugin?: AnyPluginName;
+  ensureDependency: (name: PluginNames) => void;
+  pluginByTag: <T extends AnyPluginName | boolean = AnyPluginName>(props: {
+    defaultPlugin?: Exclude<T, boolean>;
     errorMessage?: string;
     tag: PluginTag;
-  }) => AnyPluginName | undefined;
+  }) => Exclude<T, boolean> | undefined;
 }
 
 export interface BaseConfig {