refactor(plugin): return plugin interface from defineplugin

Author: mrlubos

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

@@ -1,16 +1,15 @@
 import { definePluginConfig } from '../../shared/utils/config';
-import type { Plugin } from '../../types';
 import { clientDefaultConfig, clientDefaultMeta } from '../client-core/config';
 import { clientPluginHandler } from '../client-core/plugin';
 import type { HeyApiClientAxiosPlugin } from './types';
 
-export const defaultConfig: Plugin.Config<HeyApiClientAxiosPlugin> = {
+export const defaultConfig: HeyApiClientAxiosPlugin['Config'] = {
   ...clientDefaultMeta,
   config: {
     ...clientDefaultConfig,
     throwOnError: false,
   },
-  handler: clientPluginHandler as Plugin.Handler<HeyApiClientAxiosPlugin>,
+  handler: clientPluginHandler as HeyApiClientAxiosPlugin['Handler'],
   name: '@hey-api/client-axios',
 };
 

packages/openapi-ts/src/plugins/@hey-api/client-axios/types.d.ts

@@ -1,4 +1,4 @@
-import type { Plugin } from '../../types';
+import type { DefinePlugin, Plugin } from '../../types';
 import type { Client } from '../client-core/types';
 
 export type Config = Plugin.Name<'@hey-api/client-axios'> &
@@ -11,4 +11,4 @@ export type Config = Plugin.Name<'@hey-api/client-axios'> &
     throwOnError?: boolean;
   };
 
-export type HeyApiClientAxiosPlugin = Plugin.Types<Config>;
+export type HeyApiClientAxiosPlugin = DefinePlugin<Config>;

packages/openapi-ts/src/plugins/@hey-api/client-core/client.ts

@@ -5,9 +5,9 @@ import { typesId } from '../typescript/ref';
 import type { PluginHandler } from './types';
 import { clientId, getClientBaseUrlKey } from './utils';
 
-const resolveBaseUrlString: PluginHandler<string | undefined> = ({
+const resolveBaseUrlString = ({
   plugin,
-}) => {
+}: Parameters<PluginHandler>[0]): string | undefined => {
   const { baseUrl } = plugin.config;
 
   if (baseUrl === false) {
@@ -27,7 +27,7 @@ const resolveBaseUrlString: PluginHandler<string | undefined> = ({
   return servers[typeof baseUrl === 'number' ? baseUrl : 0]?.url;
 };
 
-export const createClient: PluginHandler = ({ plugin }) => {
+export const createClient = ({ plugin }: Parameters<PluginHandler>[0]) => {
   const file = plugin.context.file({ id: clientId })!;
 
   const clientModule = clientModulePath({
@@ -60,7 +60,9 @@ export const createClient: PluginHandler = ({ plugin }) => {
 
   const defaultValues: Array<unknown> = [];
 
-  const resolvedBaseUrl = resolveBaseUrlString({ plugin });
+  const resolvedBaseUrl = resolveBaseUrlString({
+    plugin: plugin as any,
+  });
   if (resolvedBaseUrl) {
     const url = parseUrl(resolvedBaseUrl);
     if (url.protocol && url.host && !resolvedBaseUrl.includes('{')) {

packages/openapi-ts/src/plugins/@hey-api/client-core/createClientConfig.ts

@@ -4,7 +4,9 @@ import { clientId } from '../client-core/utils';
 import { typesId } from '../typescript/ref';
 import type { PluginHandler } from './types';
 
-export const createClientConfigType: PluginHandler = ({ plugin }) => {
+export const createClientConfigType = ({
+  plugin,
+}: Parameters<PluginHandler>[0]) => {
   const file = plugin.context.file({ id: clientId })!;
 
   const clientModule = clientModulePath({

packages/openapi-ts/src/plugins/@hey-api/client-core/plugin.ts

@@ -3,12 +3,18 @@ import { createClient } from './client';
 import { createClientConfigType } from './createClientConfig';
 import type { PluginHandler } from './types';
 
-export const clientPluginHandler: PluginHandler = ({ plugin }) => {
+export const clientPluginHandler = ({
+  plugin,
+}: Parameters<PluginHandler>[0]) => {
   plugin.createFile({
     id: clientId,
     path: plugin.output,
   });
 
-  createClientConfigType({ plugin });
-  createClient({ plugin });
+  createClientConfigType({
+    plugin: plugin as any,
+  });
+  createClient({
+    plugin: plugin as any,
+  });
 };

packages/openapi-ts/src/plugins/@hey-api/client-core/types.d.ts

@@ -1,16 +1,13 @@
-import type { Plugin } from '../../types';
 import type { HeyApiClientAxiosPlugin } from '../client-axios';
 import type { HeyApiClientFetchPlugin } from '../client-fetch';
 import type { HeyApiClientNextPlugin } from '../client-next';
 import type { HeyApiClientNuxtPlugin } from '../client-nuxt';
 
-export type PluginHandler<ReturnType = void> = Plugin.Handler<
-  | HeyApiClientAxiosPlugin
-  | HeyApiClientFetchPlugin
-  | HeyApiClientNextPlugin
-  | HeyApiClientNuxtPlugin,
-  ReturnType
->;
+export type PluginHandler =
+  | HeyApiClientAxiosPlugin['Handler']
+  | HeyApiClientFetchPlugin['Handler']
+  | HeyApiClientNextPlugin['Handler']
+  | HeyApiClientNuxtPlugin['Handler'];
 
 /**
  * Public Client API.

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

@@ -1,16 +1,15 @@
 import { definePluginConfig } from '../../shared/utils/config';
-import type { Plugin } from '../../types';
 import { clientDefaultConfig, clientDefaultMeta } from '../client-core/config';
 import { clientPluginHandler } from '../client-core/plugin';
 import type { HeyApiClientFetchPlugin } from './types';
 
-export const defaultConfig: Plugin.Config<HeyApiClientFetchPlugin> = {
+export const defaultConfig: HeyApiClientFetchPlugin['Config'] = {
   ...clientDefaultMeta,
   config: {
     ...clientDefaultConfig,
     throwOnError: false,
   },
-  handler: clientPluginHandler as Plugin.Handler<HeyApiClientFetchPlugin>,
+  handler: clientPluginHandler as HeyApiClientFetchPlugin['Handler'],
   name: '@hey-api/client-fetch',
 };
 

packages/openapi-ts/src/plugins/@hey-api/client-fetch/types.d.ts

@@ -1,4 +1,4 @@
-import type { Plugin } from '../../types';
+import type { DefinePlugin, Plugin } from '../../types';
 import type { Client } from '../client-core/types';
 
 export type Config = Plugin.Name<'@hey-api/client-fetch'> &
@@ -11,4 +11,4 @@ export type Config = Plugin.Name<'@hey-api/client-fetch'> &
     throwOnError?: boolean;
   };
 
-export type HeyApiClientFetchPlugin = Plugin.Types<Config>;
+export type HeyApiClientFetchPlugin = DefinePlugin<Config>;

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

@@ -1,16 +1,15 @@
 import { definePluginConfig } from '../../shared/utils/config';
-import type { Plugin } from '../../types';
 import { clientDefaultConfig, clientDefaultMeta } from '../client-core/config';
 import { clientPluginHandler } from '../client-core/plugin';
 import type { HeyApiClientNextPlugin } from './types';
 
-export const defaultConfig: Plugin.Config<HeyApiClientNextPlugin> = {
+export const defaultConfig: HeyApiClientNextPlugin['Config'] = {
   ...clientDefaultMeta,
   config: {
     ...clientDefaultConfig,
     throwOnError: false,
   },
-  handler: clientPluginHandler as Plugin.Handler<HeyApiClientNextPlugin>,
+  handler: clientPluginHandler as HeyApiClientNextPlugin['Handler'],
   name: '@hey-api/client-next',
 };
 

packages/openapi-ts/src/plugins/@hey-api/client-next/types.d.ts

@@ -1,4 +1,4 @@
-import type { Plugin } from '../../types';
+import type { DefinePlugin, Plugin } from '../../types';
 import type { Client } from '../client-core/types';
 
 export type Config = Plugin.Name<'@hey-api/client-next'> &
@@ -11,4 +11,4 @@ export type Config = Plugin.Name<'@hey-api/client-next'> &
     throwOnError?: boolean;
   };
 
-export type HeyApiClientNextPlugin = Plugin.Types<Config>;
+export type HeyApiClientNextPlugin = DefinePlugin<Config>;