diff --git a/packages/openapi-ts/src/index.ts b/packages/openapi-ts/src/index.ts
index 903e335cb..01a95c091 100644
--- a/packages/openapi-ts/src/index.ts
+++ b/packages/openapi-ts/src/index.ts
@@ -18,9 +18,11 @@ declare module '@hey-api/codegen-core' {
     category?:
       | 'client'
       | 'external'
+      | 'hook'
       | 'schema'
       | 'sdk'
       | 'type'
+      | 'utility'
       | (string & {});
     /**
      * Path to the resource this symbol represents.
diff --git a/packages/openapi-ts/src/plugins/@pinia/colada/api.ts b/packages/openapi-ts/src/plugins/@pinia/colada/api.ts
index 0074ad753..63e8000f7 100644
--- a/packages/openapi-ts/src/plugins/@pinia/colada/api.ts
+++ b/packages/openapi-ts/src/plugins/@pinia/colada/api.ts
@@ -4,11 +4,7 @@ import type { Plugin } from '~/plugins';
 
 type SelectorType =
   | '_JSONValue'
-  | 'AxiosError'
-  | 'createQueryKey'
   | 'defineQueryOptions'
-  | 'QueryKey'
-  | 'queryOptionsFn'
   | 'serializeQueryKeyValue'
   | 'UseMutationOptions'
   | 'UseQueryOptions';
@@ -18,11 +14,7 @@ export type IApi = {
    * @param type Selector type.
    * @param value Depends on `type`:
    *  - `_JSONValue`: never
-   *  - `AxiosError`: never
-   *  - `createQueryKey`: never
    *  - `defineQueryOptions`: never
-   *  - `QueryKey`: never
-   *  - `queryOptionsFn`: `operation.id` string
    *  - `serializeQueryKeyValue`: never
    *  - `UseMutationOptions`: never
    *  - `UseQueryOptions`: never
diff --git a/packages/openapi-ts/src/plugins/@pinia/colada/plugin.ts b/packages/openapi-ts/src/plugins/@pinia/colada/plugin.ts
index 4101c52c1..b013199cd 100644
--- a/packages/openapi-ts/src/plugins/@pinia/colada/plugin.ts
+++ b/packages/openapi-ts/src/plugins/@pinia/colada/plugin.ts
@@ -27,8 +27,11 @@ export const handler: PiniaColadaPlugin['Handler'] = ({ plugin }) => {
   plugin.registerSymbol({
     external: 'axios',
     kind: 'type',
+    meta: {
+      category: 'external',
+      resource: 'axios.AxiosError',
+    },
     name: 'AxiosError',
-    selector: plugin.api.selector('AxiosError'),
   });
 
   const sdkPlugin = plugin.getPluginOrThrow('@hey-api/sdk');
diff --git a/packages/openapi-ts/src/plugins/@pinia/colada/queryKey.ts b/packages/openapi-ts/src/plugins/@pinia/colada/queryKey.ts
index 60b5bd7ce..a65e2c978 100644
--- a/packages/openapi-ts/src/plugins/@pinia/colada/queryKey.ts
+++ b/packages/openapi-ts/src/plugins/@pinia/colada/queryKey.ts
@@ -22,17 +22,23 @@ export const createQueryKeyFunction = ({
   plugin: PiniaColadaPlugin['Instance'];
 }) => {
   const symbolCreateQueryKey = plugin.registerSymbol({
+    meta: {
+      category: 'utility',
+      resource: 'createQueryKey',
+      tool: plugin.name,
+    },
     name: buildName({
       config: {
         case: plugin.config.case,
       },
       name: 'createQueryKey',
     }),
-    selector: plugin.api.selector('createQueryKey'),
   });
-  const symbolQueryKeyType = plugin.referenceSymbol(
-    plugin.api.selector('QueryKey'),
-  );
+  const symbolQueryKeyType = plugin.referenceSymbol({
+    category: 'type',
+    resource: 'QueryKey',
+    tool: plugin.name,
+  });
   const symbolJsonValue = plugin.referenceSymbol(
     plugin.api.selector('_JSONValue'),
   );
@@ -281,9 +287,11 @@ const createQueryKeyLiteral = ({
     });
   }
 
-  const symbolCreateQueryKey = plugin.referenceSymbol(
-    plugin.api.selector('createQueryKey'),
-  );
+  const symbolCreateQueryKey = plugin.referenceSymbol({
+    category: 'utility',
+    resource: 'createQueryKey',
+    tool: plugin.name,
+  });
   const createQueryKeyCallExpression = tsc.callExpression({
     functionName: symbolCreateQueryKey.placeholder,
     parameters: [tsc.ots.string(id), 'options', tagsExpression],
@@ -331,8 +339,12 @@ export const createQueryKeyType = ({
   const symbolQueryKeyType = plugin.registerSymbol({
     exported: true,
     kind: 'type',
+    meta: {
+      category: 'type',
+      resource: 'QueryKey',
+      tool: plugin.name,
+    },
     name: 'QueryKey',
-    selector: plugin.api.selector('QueryKey'),
   });
   const queryKeyType = tsc.typeAliasDeclaration({
     exportType: symbolQueryKeyType.exported,
diff --git a/packages/openapi-ts/src/plugins/@pinia/colada/queryOptions.ts b/packages/openapi-ts/src/plugins/@pinia/colada/queryOptions.ts
index 4cdd209cc..c059bf893 100644
--- a/packages/openapi-ts/src/plugins/@pinia/colada/queryOptions.ts
+++ b/packages/openapi-ts/src/plugins/@pinia/colada/queryOptions.ts
@@ -39,7 +39,13 @@ export const createQueryOptions = ({
     context: plugin.context,
     operation,
   });
-  if (!plugin.getSymbol(plugin.api.selector('createQueryKey'))) {
+  if (
+    !plugin.getSymbol({
+      category: 'utility',
+      resource: 'createQueryKey',
+      tool: plugin.name,
+    })
+  ) {
     createQueryKeyType({ plugin });
     createQueryKeyFunction({ plugin });
   }
@@ -64,9 +70,11 @@ export const createQueryOptions = ({
       parameters: [optionsParamName],
     });
   } else {
-    const symbolCreateQueryKey = plugin.referenceSymbol(
-      plugin.api.selector('createQueryKey'),
-    );
+    const symbolCreateQueryKey = plugin.referenceSymbol({
+      category: 'utility',
+      resource: 'createQueryKey',
+      tool: plugin.name,
+    });
     // Optionally include tags when configured
     let tagsExpr: ts.Expression | undefined;
     if (
@@ -151,11 +159,17 @@ export const createQueryOptions = ({
 
   const symbolQueryOptionsFn = plugin.registerSymbol({
     exported: true,
+    meta: {
+      category: 'hook',
+      resource: 'operation',
+      resourceId: operation.id,
+      role: 'queryOptions',
+      tool: plugin.name,
+    },
     name: buildName({
       config: plugin.config.queryOptions,
       name: operation.id,
     }),
-    selector: plugin.api.selector('queryOptionsFn', operation.id),
   });
   const symbolDefineQueryOptions = plugin.registerSymbol({
     external: plugin.name,
diff --git a/packages/openapi-ts/src/plugins/@pinia/colada/useType.ts b/packages/openapi-ts/src/plugins/@pinia/colada/useType.ts
index 424506330..a0215d091 100644
--- a/packages/openapi-ts/src/plugins/@pinia/colada/useType.ts
+++ b/packages/openapi-ts/src/plugins/@pinia/colada/useType.ts
@@ -37,7 +37,10 @@ export const useTypeError = ({
     typeErrorName = 'Error';
   }
   if (client.name === '@hey-api/client-axios') {
-    const symbol = plugin.referenceSymbol(plugin.api.selector('AxiosError'));
+    const symbol = plugin.referenceSymbol({
+      category: 'external',
+      resource: 'axios.AxiosError',
+    });
     typeErrorName = `${symbol.placeholder}<${typeErrorName}>`;
   }
   return typeErrorName;
diff --git a/packages/openapi-ts/src/plugins/@tanstack/angular-query-experimental/api.ts b/packages/openapi-ts/src/plugins/@tanstack/angular-query-experimental/api.ts
index d3cb57c4e..1496308d2 100644
--- a/packages/openapi-ts/src/plugins/@tanstack/angular-query-experimental/api.ts
+++ b/packages/openapi-ts/src/plugins/@tanstack/angular-query-experimental/api.ts
@@ -1,47 +1,3 @@
-import type { Selector } from '@hey-api/codegen-core';
+export type IApi = any;
 
-import type { Plugin } from '~/plugins';
-
-type SelectorType =
-  | 'AxiosError'
-  | 'createInfiniteParams'
-  | 'createQueryKey'
-  | 'DefaultError'
-  | 'infiniteQueryOptions'
-  | 'InfiniteData'
-  | 'MutationOptions'
-  | 'queryOptions'
-  | 'queryOptionsFn'
-  | 'QueryKey'
-  | 'useQuery';
-
-export type IApi = {
-  /**
-   * @param type Selector type.
-   * @param value Depends on `type`:
-   *  - `AxiosError`: never
-   *  - `createInfiniteParams`: never
-   *  - `createQueryKey`: never
-   *  - `DefaultError`: never
-   *  - `infiniteQueryOptions`: never
-   *  - `InfiniteData`: never
-   *  - `MutationOptions`: never
-   *  - `queryOptions`: never
-   *  - `queryOptionsFn`: `operation.id` string
-   *  - `QueryKey`: never
-   *  - `useQuery`: never
-   * @returns Selector array
-   * @deprecated
-   */
-  selector: (type: SelectorType, value?: string) => Selector;
-};
-
-export class Api implements IApi {
-  constructor(
-    public meta: Plugin.Name<'@tanstack/angular-query-experimental'>,
-  ) {}
-
-  selector(...args: ReadonlyArray<string | undefined>): Selector {
-    return [this.meta.name, ...(args as Selector)];
-  }
-}
+export class Api implements IApi {}
diff --git a/packages/openapi-ts/src/plugins/@tanstack/angular-query-experimental/config.ts b/packages/openapi-ts/src/plugins/@tanstack/angular-query-experimental/config.ts
index 873364817..0e50763b0 100644
--- a/packages/openapi-ts/src/plugins/@tanstack/angular-query-experimental/config.ts
+++ b/packages/openapi-ts/src/plugins/@tanstack/angular-query-experimental/config.ts
@@ -6,9 +6,7 @@ import { Api } from './api';
 import type { TanStackAngularQueryPlugin } from './types';
 
 export const defaultConfig: TanStackAngularQueryPlugin['Config'] = {
-  api: new Api({
-    name: '@tanstack/angular-query-experimental',
-  }),
+  api: new Api(),
   config: {
     case: 'camelCase',
     comments: true,
diff --git a/packages/openapi-ts/src/plugins/@tanstack/query-core/infiniteQueryOptions.ts b/packages/openapi-ts/src/plugins/@tanstack/query-core/infiniteQueryOptions.ts
index 74535be7a..d83b5b34b 100644
--- a/packages/openapi-ts/src/plugins/@tanstack/query-core/infiniteQueryOptions.ts
+++ b/packages/openapi-ts/src/plugins/@tanstack/query-core/infiniteQueryOptions.ts
@@ -25,13 +25,17 @@ const createInfiniteParamsFunction = ({
   plugin: PluginInstance;
 }) => {
   const symbolCreateInfiniteParams = plugin.registerSymbol({
+    meta: {
+      category: 'utility',
+      resource: 'createInfiniteParams',
+      tool: plugin.name,
+    },
     name: buildName({
       config: {
         case: plugin.config.case,
       },
       name: 'createInfiniteParams',
     }),
-    selector: plugin.api.selector('createInfiniteParams'),
   });
 
   const fn = tsc.constVariable({
@@ -242,29 +246,45 @@ export const createInfiniteQueryOptions = ({
     operation,
   });
 
-  if (!plugin.getSymbol(plugin.api.selector('createQueryKey'))) {
+  if (
+    !plugin.getSymbol({
+      category: 'utility',
+      resource: 'createQueryKey',
+      tool: plugin.name,
+    })
+  ) {
     createQueryKeyType({ plugin });
     createQueryKeyFunction({ plugin });
   }
 
-  if (!plugin.getSymbol(plugin.api.selector('createInfiniteParams'))) {
+  if (
+    !plugin.getSymbol({
+      category: 'utility',
+      resource: 'createInfiniteParams',
+      tool: plugin.name,
+    })
+  ) {
     createInfiniteParamsFunction({ plugin });
   }
 
-  const symbolInfiniteQueryOptions = plugin.referenceSymbol(
-    plugin.api.selector('infiniteQueryOptions'),
-  );
-  const symbolInfiniteDataType = plugin.referenceSymbol(
-    plugin.api.selector('InfiniteData'),
-  );
+  const symbolInfiniteQueryOptions = plugin.referenceSymbol({
+    category: 'external',
+    resource: `${plugin.name}.infiniteQueryOptions`,
+  });
+  const symbolInfiniteDataType = plugin.referenceSymbol({
+    category: 'external',
+    resource: `${plugin.name}.InfiniteData`,
+  });
 
   const typeData = useTypeData({ operation, plugin });
   const typeError = useTypeError({ operation, plugin });
   const typeResponse = useTypeResponse({ operation, plugin });
 
-  const symbolQueryKeyType = plugin.referenceSymbol(
-    plugin.api.selector('QueryKey'),
-  );
+  const symbolQueryKeyType = plugin.referenceSymbol({
+    category: 'type',
+    resource: 'QueryKey',
+    tool: plugin.name,
+  });
   const typeQueryKey = `${symbolQueryKeyType.placeholder}<${typeData}>`;
   const typePageObjectParam = `Pick<${typeQueryKey}[0], 'body' | 'headers' | 'path' | 'query'>`;
   const pluginTypeScript = plugin.getPluginOrThrow('@hey-api/typescript');
@@ -330,9 +350,11 @@ export const createInfiniteQueryOptions = ({
     }),
   });
 
-  const symbolCreateInfiniteParams = plugin.referenceSymbol(
-    plugin.api.selector('createInfiniteParams'),
-  );
+  const symbolCreateInfiniteParams = plugin.referenceSymbol({
+    category: 'utility',
+    resource: 'createInfiniteParams',
+    tool: plugin.name,
+  });
 
   const statements: Array<ts.Statement> = [
     tsc.constVariable({
diff --git a/packages/openapi-ts/src/plugins/@tanstack/query-core/mutationOptions.ts b/packages/openapi-ts/src/plugins/@tanstack/query-core/mutationOptions.ts
index 50dbf250a..ac9d22277 100644
--- a/packages/openapi-ts/src/plugins/@tanstack/query-core/mutationOptions.ts
+++ b/packages/openapi-ts/src/plugins/@tanstack/query-core/mutationOptions.ts
@@ -18,9 +18,10 @@ export const createMutationOptions = ({
   plugin: PluginInstance;
   queryFn: string;
 }): void => {
-  const symbolMutationOptionsType = plugin.referenceSymbol(
-    plugin.api.selector('MutationOptions'),
-  );
+  const symbolMutationOptionsType = plugin.referenceSymbol({
+    category: 'external',
+    resource: `${plugin.name}.MutationOptions`,
+  });
 
   const typeData = useTypeData({ operation, plugin });
   const typeError = useTypeError({ operation, plugin });
diff --git a/packages/openapi-ts/src/plugins/@tanstack/query-core/plugin.ts b/packages/openapi-ts/src/plugins/@tanstack/query-core/plugin.ts
index 947557bcf..5e74836d9 100644
--- a/packages/openapi-ts/src/plugins/@tanstack/query-core/plugin.ts
+++ b/packages/openapi-ts/src/plugins/@tanstack/query-core/plugin.ts
@@ -11,14 +11,20 @@ export const handler: PluginHandler = ({ plugin }) => {
   plugin.registerSymbol({
     external: plugin.name,
     kind: 'type',
+    meta: {
+      category: 'external',
+      resource: `${plugin.name}.DefaultError`,
+    },
     name: 'DefaultError',
-    selector: plugin.api.selector('DefaultError'),
   });
   plugin.registerSymbol({
     external: plugin.name,
     kind: 'type',
+    meta: {
+      category: 'external',
+      resource: `${plugin.name}.InfiniteData`,
+    },
     name: 'InfiniteData',
-    selector: plugin.api.selector('InfiniteData'),
   });
   const mutationsType =
     plugin.name === '@tanstack/angular-query-experimental' ||
@@ -29,29 +35,44 @@ export const handler: PluginHandler = ({ plugin }) => {
   plugin.registerSymbol({
     external: plugin.name,
     kind: 'type',
+    meta: {
+      category: 'external',
+      resource: `${plugin.name}.MutationOptions`,
+    },
     name: mutationsType,
-    selector: plugin.api.selector('MutationOptions'),
   });
   plugin.registerSymbol({
     external: plugin.name,
+    meta: {
+      category: 'external',
+      resource: `${plugin.name}.infiniteQueryOptions`,
+    },
     name: 'infiniteQueryOptions',
-    selector: plugin.api.selector('infiniteQueryOptions'),
   });
   plugin.registerSymbol({
     external: plugin.name,
+    meta: {
+      category: 'external',
+      resource: `${plugin.name}.queryOptions`,
+    },
     name: 'queryOptions',
-    selector: plugin.api.selector('queryOptions'),
   });
   plugin.registerSymbol({
     external: plugin.name,
+    meta: {
+      category: 'external',
+      resource: `${plugin.name}.useQuery`,
+    },
     name: 'useQuery',
-    selector: plugin.api.selector('useQuery'),
   });
   plugin.registerSymbol({
     external: 'axios',
     kind: 'type',
+    meta: {
+      category: 'external',
+      resource: 'axios.AxiosError',
+    },
     name: 'AxiosError',
-    selector: plugin.api.selector('AxiosError'),
   });
 
   const sdkPlugin = plugin.getPluginOrThrow('@hey-api/sdk');
diff --git a/packages/openapi-ts/src/plugins/@tanstack/query-core/queryKey.ts b/packages/openapi-ts/src/plugins/@tanstack/query-core/queryKey.ts
index ebb530c1e..f796da682 100644
--- a/packages/openapi-ts/src/plugins/@tanstack/query-core/queryKey.ts
+++ b/packages/openapi-ts/src/plugins/@tanstack/query-core/queryKey.ts
@@ -21,17 +21,23 @@ export const createQueryKeyFunction = ({
   plugin: PluginInstance;
 }) => {
   const symbolCreateQueryKey = plugin.registerSymbol({
+    meta: {
+      category: 'utility',
+      resource: 'createQueryKey',
+      tool: plugin.name,
+    },
     name: buildName({
       config: {
         case: plugin.config.case,
       },
       name: 'createQueryKey',
     }),
-    selector: plugin.api.selector('createQueryKey'),
   });
-  const symbolQueryKeyType = plugin.referenceSymbol(
-    plugin.api.selector('QueryKey'),
-  );
+  const symbolQueryKeyType = plugin.referenceSymbol({
+    category: 'type',
+    resource: 'QueryKey',
+    tool: plugin.name,
+  });
 
   const returnType = tsc.indexedAccessTypeNode({
     indexType: tsc.literalTypeNode({
@@ -267,9 +273,11 @@ const createQueryKeyLiteral = ({
     });
   }
 
-  const symbolCreateQueryKey = plugin.referenceSymbol(
-    plugin.api.selector('createQueryKey'),
-  );
+  const symbolCreateQueryKey = plugin.referenceSymbol({
+    category: 'utility',
+    resource: 'createQueryKey',
+    tool: plugin.name,
+  });
   const createQueryKeyCallExpression = tsc.callExpression({
     functionName: symbolCreateQueryKey.placeholder,
     parameters: [
@@ -309,8 +317,12 @@ export const createQueryKeyType = ({ plugin }: { plugin: PluginInstance }) => {
   const symbolQueryKeyType = plugin.registerSymbol({
     exported: true,
     kind: 'type',
+    meta: {
+      category: 'type',
+      resource: 'QueryKey',
+      tool: plugin.name,
+    },
     name: 'QueryKey',
-    selector: plugin.api.selector('QueryKey'),
   });
   const queryKeyType = tsc.typeAliasDeclaration({
     exportType: symbolQueryKeyType.exported,
diff --git a/packages/openapi-ts/src/plugins/@tanstack/query-core/queryOptions.ts b/packages/openapi-ts/src/plugins/@tanstack/query-core/queryOptions.ts
index bf460e656..3b979cc07 100644
--- a/packages/openapi-ts/src/plugins/@tanstack/query-core/queryOptions.ts
+++ b/packages/openapi-ts/src/plugins/@tanstack/query-core/queryOptions.ts
@@ -38,14 +38,21 @@ export const createQueryOptions = ({
     operation,
   });
 
-  if (!plugin.getSymbol(plugin.api.selector('createQueryKey'))) {
+  if (
+    !plugin.getSymbol({
+      category: 'utility',
+      resource: 'createQueryKey',
+      tool: plugin.name,
+    })
+  ) {
     createQueryKeyType({ plugin });
     createQueryKeyFunction({ plugin });
   }
 
-  const symbolQueryOptions = plugin.referenceSymbol(
-    plugin.api.selector('queryOptions'),
-  );
+  const symbolQueryOptions = plugin.referenceSymbol({
+    category: 'external',
+    resource: `${plugin.name}.queryOptions`,
+  });
 
   const symbolQueryKey = plugin.registerSymbol({
     exported: true,
@@ -156,11 +163,17 @@ export const createQueryOptions = ({
 
   const symbolQueryOptionsFn = plugin.registerSymbol({
     exported: plugin.config.queryOptions.exported,
+    meta: {
+      category: 'hook',
+      resource: 'operation',
+      resourceId: operation.id,
+      role: 'queryOptions',
+      tool: plugin.name,
+    },
     name: buildName({
       config: plugin.config.queryOptions,
       name: operation.id,
     }),
-    selector: plugin.api.selector('queryOptionsFn', operation.id),
   });
   const statement = tsc.constVariable({
     comment: plugin.config.comments
diff --git a/packages/openapi-ts/src/plugins/@tanstack/query-core/useQuery.ts b/packages/openapi-ts/src/plugins/@tanstack/query-core/useQuery.ts
index ec3ad8da6..3d49c2aa0 100644
--- a/packages/openapi-ts/src/plugins/@tanstack/query-core/useQuery.ts
+++ b/packages/openapi-ts/src/plugins/@tanstack/query-core/useQuery.ts
@@ -35,9 +35,10 @@ export const createUseQuery = ({
     }),
   });
 
-  const symbolUseQuery = plugin.referenceSymbol(
-    plugin.api.selector('useQuery'),
-  );
+  const symbolUseQuery = plugin.referenceSymbol({
+    category: 'external',
+    resource: `${plugin.name}.useQuery`,
+  });
 
   const isRequiredOptions = isOperationOptionsRequired({
     context: plugin.context,
@@ -45,9 +46,13 @@ export const createUseQuery = ({
   });
   const typeData = useTypeData({ operation, plugin });
 
-  const symbolQueryOptionsFn = plugin.referenceSymbol(
-    plugin.api.selector('queryOptionsFn', operation.id),
-  );
+  const symbolQueryOptionsFn = plugin.referenceSymbol({
+    category: 'hook',
+    resource: 'operation',
+    resourceId: operation.id,
+    role: 'queryOptions',
+    tool: plugin.name,
+  });
   const statement = tsc.constVariable({
     comment: plugin.config.comments
       ? createOperationComment({ operation })
diff --git a/packages/openapi-ts/src/plugins/@tanstack/query-core/useType.ts b/packages/openapi-ts/src/plugins/@tanstack/query-core/useType.ts
index 48c95f661..0b16b0b43 100644
--- a/packages/openapi-ts/src/plugins/@tanstack/query-core/useType.ts
+++ b/packages/openapi-ts/src/plugins/@tanstack/query-core/useType.ts
@@ -34,11 +34,17 @@ export const useTypeError = ({
 
   let typeErrorName: string | undefined = symbolErrorType?.placeholder;
   if (!typeErrorName) {
-    const symbol = plugin.referenceSymbol(plugin.api.selector('DefaultError'));
+    const symbol = plugin.referenceSymbol({
+      category: 'external',
+      resource: `${plugin.name}.DefaultError`,
+    });
     typeErrorName = symbol.placeholder;
   }
   if (client.name === '@hey-api/client-axios') {
-    const symbol = plugin.referenceSymbol(plugin.api.selector('AxiosError'));
+    const symbol = plugin.referenceSymbol({
+      category: 'external',
+      resource: 'axios.AxiosError',
+    });
     typeErrorName = `${symbol.placeholder}<${typeErrorName}>`;
   }
   return typeErrorName;
diff --git a/packages/openapi-ts/src/plugins/@tanstack/react-query/api.ts b/packages/openapi-ts/src/plugins/@tanstack/react-query/api.ts
index fdf0c6b48..1496308d2 100644
--- a/packages/openapi-ts/src/plugins/@tanstack/react-query/api.ts
+++ b/packages/openapi-ts/src/plugins/@tanstack/react-query/api.ts
@@ -1,45 +1,3 @@
-import type { Selector } from '@hey-api/codegen-core';
+export type IApi = any;
 
-import type { Plugin } from '~/plugins';
-
-type SelectorType =
-  | 'AxiosError'
-  | 'createInfiniteParams'
-  | 'createQueryKey'
-  | 'DefaultError'
-  | 'infiniteQueryOptions'
-  | 'InfiniteData'
-  | 'MutationOptions'
-  | 'queryOptions'
-  | 'queryOptionsFn'
-  | 'QueryKey'
-  | 'useQuery';
-
-export type IApi = {
-  /**
-   * @param type Selector type.
-   * @param value Depends on `type`:
-   *  - `AxiosError`: never
-   *  - `createInfiniteParams`: never
-   *  - `createQueryKey`: never
-   *  - `DefaultError`: never
-   *  - `infiniteQueryOptions`: never
-   *  - `InfiniteData`: never
-   *  - `MutationOptions`: never
-   *  - `queryOptions`: never
-   *  - `queryOptionsFn`: `operation.id` string
-   *  - `QueryKey`: never
-   *  - `useQuery`: never
-   * @returns Selector array
-   * @deprecated
-   */
-  selector: (type: SelectorType, value?: string) => Selector;
-};
-
-export class Api implements IApi {
-  constructor(public meta: Plugin.Name<'@tanstack/react-query'>) {}
-
-  selector(...args: ReadonlyArray<string | undefined>): Selector {
-    return [this.meta.name, ...(args as Selector)];
-  }
-}
+export class Api implements IApi {}
diff --git a/packages/openapi-ts/src/plugins/@tanstack/react-query/config.ts b/packages/openapi-ts/src/plugins/@tanstack/react-query/config.ts
index 87135dd47..8f5e2870a 100644
--- a/packages/openapi-ts/src/plugins/@tanstack/react-query/config.ts
+++ b/packages/openapi-ts/src/plugins/@tanstack/react-query/config.ts
@@ -6,9 +6,7 @@ import { Api } from './api';
 import type { TanStackReactQueryPlugin } from './types';
 
 export const defaultConfig: TanStackReactQueryPlugin['Config'] = {
-  api: new Api({
-    name: '@tanstack/react-query',
-  }),
+  api: new Api(),
   config: {
     case: 'camelCase',
     comments: true,
diff --git a/packages/openapi-ts/src/plugins/@tanstack/solid-query/api.ts b/packages/openapi-ts/src/plugins/@tanstack/solid-query/api.ts
index 227ba1e9e..1496308d2 100644
--- a/packages/openapi-ts/src/plugins/@tanstack/solid-query/api.ts
+++ b/packages/openapi-ts/src/plugins/@tanstack/solid-query/api.ts
@@ -1,45 +1,3 @@
-import type { Selector } from '@hey-api/codegen-core';
+export type IApi = any;
 
-import type { Plugin } from '~/plugins';
-
-type SelectorType =
-  | 'AxiosError'
-  | 'createInfiniteParams'
-  | 'createQueryKey'
-  | 'DefaultError'
-  | 'infiniteQueryOptions'
-  | 'InfiniteData'
-  | 'MutationOptions'
-  | 'queryOptions'
-  | 'queryOptionsFn'
-  | 'QueryKey'
-  | 'useQuery';
-
-export type IApi = {
-  /**
-   * @param type Selector type.
-   * @param value Depends on `type`:
-   *  - `AxiosError`: never
-   *  - `createInfiniteParams`: never
-   *  - `createQueryKey`: never
-   *  - `DefaultError`: never
-   *  - `infiniteQueryOptions`: never
-   *  - `InfiniteData`: never
-   *  - `MutationOptions`: never
-   *  - `queryOptions`: never
-   *  - `queryOptionsFn`: `operation.id` string
-   *  - `QueryKey`: never
-   *  - `useQuery`: never
-   * @returns Selector array
-   * @deprecated
-   */
-  selector: (type: SelectorType, value?: string) => Selector;
-};
-
-export class Api implements IApi {
-  constructor(public meta: Plugin.Name<'@tanstack/solid-query'>) {}
-
-  selector(...args: ReadonlyArray<string | undefined>): Selector {
-    return [this.meta.name, ...(args as Selector)];
-  }
-}
+export class Api implements IApi {}
diff --git a/packages/openapi-ts/src/plugins/@tanstack/solid-query/config.ts b/packages/openapi-ts/src/plugins/@tanstack/solid-query/config.ts
index d62a3c6bf..301b8d6d1 100644
--- a/packages/openapi-ts/src/plugins/@tanstack/solid-query/config.ts
+++ b/packages/openapi-ts/src/plugins/@tanstack/solid-query/config.ts
@@ -6,9 +6,7 @@ import { Api } from './api';
 import type { TanStackSolidQueryPlugin } from './types';
 
 export const defaultConfig: TanStackSolidQueryPlugin['Config'] = {
-  api: new Api({
-    name: '@tanstack/solid-query',
-  }),
+  api: new Api(),
   config: {
     case: 'camelCase',
     comments: true,
diff --git a/packages/openapi-ts/src/plugins/@tanstack/svelte-query/api.ts b/packages/openapi-ts/src/plugins/@tanstack/svelte-query/api.ts
index f022e01b6..1496308d2 100644
--- a/packages/openapi-ts/src/plugins/@tanstack/svelte-query/api.ts
+++ b/packages/openapi-ts/src/plugins/@tanstack/svelte-query/api.ts
@@ -1,45 +1,3 @@
-import type { Selector } from '@hey-api/codegen-core';
+export type IApi = any;
 
-import type { Plugin } from '~/plugins';
-
-type SelectorType =
-  | 'AxiosError'
-  | 'createInfiniteParams'
-  | 'createQueryKey'
-  | 'DefaultError'
-  | 'infiniteQueryOptions'
-  | 'InfiniteData'
-  | 'MutationOptions'
-  | 'queryOptions'
-  | 'queryOptionsFn'
-  | 'QueryKey'
-  | 'useQuery';
-
-export type IApi = {
-  /**
-   * @param type Selector type.
-   * @param value Depends on `type`:
-   *  - `AxiosError`: never
-   *  - `createInfiniteParams`: never
-   *  - `createQueryKey`: never
-   *  - `DefaultError`: never
-   *  - `infiniteQueryOptions`: never
-   *  - `InfiniteData`: never
-   *  - `MutationOptions`: never
-   *  - `queryOptions`: never
-   *  - `queryOptionsFn`: `operation.id` string
-   *  - `QueryKey`: never
-   *  - `useQuery`: never
-   * @returns Selector array
-   * @deprecated
-   */
-  selector: (type: SelectorType, value?: string) => Selector;
-};
-
-export class Api implements IApi {
-  constructor(public meta: Plugin.Name<'@tanstack/svelte-query'>) {}
-
-  selector(...args: ReadonlyArray<string | undefined>): Selector {
-    return [this.meta.name, ...(args as Selector)];
-  }
-}
+export class Api implements IApi {}
diff --git a/packages/openapi-ts/src/plugins/@tanstack/svelte-query/config.ts b/packages/openapi-ts/src/plugins/@tanstack/svelte-query/config.ts
index dfa0b2f4f..c0cf525b6 100644
--- a/packages/openapi-ts/src/plugins/@tanstack/svelte-query/config.ts
+++ b/packages/openapi-ts/src/plugins/@tanstack/svelte-query/config.ts
@@ -6,9 +6,7 @@ import { Api } from './api';
 import type { TanStackSvelteQueryPlugin } from './types';
 
 export const defaultConfig: TanStackSvelteQueryPlugin['Config'] = {
-  api: new Api({
-    name: '@tanstack/svelte-query',
-  }),
+  api: new Api(),
   config: {
     case: 'camelCase',
     comments: true,
diff --git a/packages/openapi-ts/src/plugins/@tanstack/vue-query/api.ts b/packages/openapi-ts/src/plugins/@tanstack/vue-query/api.ts
index e416c6558..1496308d2 100644
--- a/packages/openapi-ts/src/plugins/@tanstack/vue-query/api.ts
+++ b/packages/openapi-ts/src/plugins/@tanstack/vue-query/api.ts
@@ -1,45 +1,3 @@
-import type { Selector } from '@hey-api/codegen-core';
+export type IApi = any;
 
-import type { Plugin } from '~/plugins';
-
-type SelectorType =
-  | 'AxiosError'
-  | 'createInfiniteParams'
-  | 'createQueryKey'
-  | 'DefaultError'
-  | 'infiniteQueryOptions'
-  | 'InfiniteData'
-  | 'MutationOptions'
-  | 'queryOptions'
-  | 'queryOptionsFn'
-  | 'QueryKey'
-  | 'useQuery';
-
-export type IApi = {
-  /**
-   * @param type Selector type.
-   * @param value Depends on `type`:
-   *  - `AxiosError`: never
-   *  - `createInfiniteParams`: never
-   *  - `createQueryKey`: never
-   *  - `DefaultError`: never
-   *  - `infiniteQueryOptions`: never
-   *  - `InfiniteData`: never
-   *  - `MutationOptions`: never
-   *  - `queryOptions`: never
-   *  - `queryOptionsFn`: `operation.id` string
-   *  - `QueryKey`: never
-   *  - `useQuery`: never
-   * @returns Selector array
-   * @deprecated
-   */
-  selector: (type: SelectorType, value?: string) => Selector;
-};
-
-export class Api implements IApi {
-  constructor(public meta: Plugin.Name<'@tanstack/vue-query'>) {}
-
-  selector(...args: ReadonlyArray<string | undefined>): Selector {
-    return [this.meta.name, ...(args as Selector)];
-  }
-}
+export class Api implements IApi {}
diff --git a/packages/openapi-ts/src/plugins/@tanstack/vue-query/config.ts b/packages/openapi-ts/src/plugins/@tanstack/vue-query/config.ts
index fbff14dea..826d06617 100644
--- a/packages/openapi-ts/src/plugins/@tanstack/vue-query/config.ts
+++ b/packages/openapi-ts/src/plugins/@tanstack/vue-query/config.ts
@@ -6,9 +6,7 @@ import { Api } from './api';
 import type { TanStackVueQueryPlugin } from './types';
 
 export const defaultConfig: TanStackVueQueryPlugin['Config'] = {
-  api: new Api({
-    name: '@tanstack/vue-query',
-  }),
+  api: new Api(),
   config: {
     case: 'camelCase',
     comments: true,