refactor: move types

Author: antfu

packages/devtools-kit/package.json

@@ -35,6 +35,7 @@
     "vite": "catalog:build"
   },
   "devDependencies": {
-    "tsdown": "catalog:build"
+    "tsdown": "catalog:build",
+    "vite": "catalog:build"
   }
 }

packages/devtools-kit/src/index.ts

@@ -1 +1,2 @@
-export const one = 1
+export type * from './types'
+export * from './utils/rpc'

packages/devtools/src/types.ts packages/devtools-kit/src/types/extend.tspackages/devtools/src/types.ts renamed to packages/devtools-kit/src/types/extend.ts

@@ -1,6 +1,5 @@
-export interface DevToolsPluginOptions {
-  setup: () => void | Promise<void>
-}
+import type { DevToolsPluginOptions } from './vite'
+import 'vite'
 
 // Extend Vite's Plugin interface
 declare module 'vite' {

packages/devtools-kit/src/types/index.ts

@@ -0,0 +1,5 @@
+import './extend'
+
+export * from './rpc'
+export * from './utils'
+export * from './vite'

…ages/devtools-vite/src/node/rpc/types.ts packages/devtools-kit/src/types/rpc.tspackages/devtools-vite/src/node/rpc/types.ts renamed to packages/devtools-kit/src/types/rpc.ts packages/devtools-vite/src/node/rpc/types.ts renamed to packages/devtools-kit/src/types/rpc.ts

@@ -1,4 +1,4 @@
-import type { RolldownLogsManager } from '../rolldown/logs-manager'
+import type { EntriesToObject, Thenable } from './utils'
 
 /**
  * Type of the RPC function,
@@ -8,8 +8,6 @@ import type { RolldownLogsManager } from '../rolldown/logs-manager'
  */
 export type RpcFunctionType = 'static' | 'action' | 'query'
 
-export type Thenable<T> = T | Promise<T>
-
 export interface RpcFunctionSetupResult<
   ARGS extends any[],
   RETURN = void,
@@ -33,39 +31,16 @@ export interface RpcFunctionDefinition<
 export interface RpcContext {
   cwd: string
   mode: 'dev' | 'build'
-  manager: RolldownLogsManager
-}
-
-export type EntriesToObject<T extends readonly [string, any][]> = {
-  [K in T[number] as K[0]]: K[1]
+  meta?: any
 }
 
-export type DefinitionsToFunctions<T extends readonly RpcFunctionDefinition<any, any, any>[]> = EntriesToObject<{
+export type RpcDefinitionsToFunctions<T extends readonly RpcFunctionDefinition<any, any, any>[]> = EntriesToObject<{
   [K in keyof T]: [T[K]['name'], Awaited<ReturnType<T[K]['setup']>>['handler']]
 }>
 
-export type FilterDefinitions<
+export type RpcDefinitionsFilter<
   T extends readonly RpcFunctionDefinition<any, any, any>[],
   Type extends RpcFunctionType,
 > = {
   [K in keyof T]: T[K] extends { type: Type } ? T[K] : never
 }
-
-// type a = DefinitionsToFunctions<
-//   FilterDefinitions<[
-//     {
-//       name: 'a'
-//       type: 'static'
-//       setup: () => ({
-//         handler: () => void
-//       })
-//     },
-//     {
-//       name: 'b'
-//       type: 'action'
-//       setup: () => ({
-//         handler: (a: string) => void
-//       })
-//     },
-//   ], 'action' | 'static'>
-// >

packages/devtools-kit/src/types/utils.ts

@@ -0,0 +1,5 @@
+export type Thenable<T> = T | Promise<T>
+
+export type EntriesToObject<T extends readonly [string, any][]> = {
+  [K in T[number] as K[0]]: K[1]
+}

packages/devtools-kit/src/types/vite.ts

@@ -0,0 +1,9 @@
+import type { RpcContext } from './rpc'
+
+export interface DevToolsPluginOptions {
+  setup: () => void | Promise<void>
+}
+
+export interface DevToolsSetupContext {
+  rpc: RpcContext
+}

packages/devtools-kit/src/utils/rpc.ts

@@ -0,0 +1,28 @@
+import type { RpcContext, RpcFunctionDefinition, RpcFunctionType } from '../types'
+
+export function defineRpcFunction<
+  NAME extends string,
+  TYPE extends RpcFunctionType,
+  ARGS extends any[],
+  RETURN = void,
+>(
+  definition: RpcFunctionDefinition<NAME, TYPE, ARGS, RETURN>,
+): RpcFunctionDefinition<NAME, TYPE, ARGS, RETURN> {
+  return definition
+}
+
+export async function getRpcHandler<
+  NAME extends string,
+  TYPE extends RpcFunctionType,
+  ARGS extends any[],
+  RETURN = void,
+>(
+  definition: RpcFunctionDefinition<NAME, TYPE, ARGS, RETURN>,
+  context: RpcContext,
+): Promise<(...args: ARGS) => RETURN> {
+  if (definition.handler) {
+    return definition.handler
+  }
+  const result = definition.__resolved ??= await definition.setup(context)
+  return result.handler
+}

packages/devtools-kit/tsconfig.json

@@ -1,12 +1,11 @@
 import { defineConfig } from 'tsdown'
 
-export default defineConfig([
-  {
-    entry: [
-      'src/index.ts',
-    ],
-    clean: true,
-    fixedExtension: true,
-    dts: true,
-  },
-])
+export default defineConfig({
+  entry: [
+    'src/index.ts',
+  ],
+  clean: true,
+  tsconfig: '../../tsconfig.pkgs.json',
+  fixedExtension: true,
+  dts: true,
+})