diff --git a/docs/data/people.ts b/docs/data/people.ts
index 01b6c8090..dc7e75b30 100644
--- a/docs/data/people.ts
+++ b/docs/data/people.ts
@@ -3,6 +3,11 @@ type Person = {
   name: string;
 };
 
+export const dmitriyBrolnickij: Person = {
+  github: 'https://github.com/brolnickij',
+  name: 'Dmitriy Brolnickij',
+};
+
 export const jacobCohen: Person = {
   github: 'https://github.com/jacobinu',
   name: 'Jacob Cohen',
@@ -22,8 +27,3 @@ export const sebastiaanWouters: Person = {
   github: 'https://github.com/SebastiaanWouters',
   name: 'Sebastiaan Wouters',
 };
-
-export const dmitriyBrolnickij: Person = {
-  github: 'https://github.com/brolnickij',
-  name: 'Dmitriy Brolnickij',
-};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/test/generated/v3_no_index/client.gen.ts.snap b/packages/openapi-ts-tests/main/test/__snapshots__/test/generated/v3_no_index/client.gen.ts.snap
index b47036454..6b55ac80f 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/test/generated/v3_no_index/client.gen.ts.snap
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/test/generated/v3_no_index/client.gen.ts.snap
@@ -1,7 +1,7 @@
 // This file is auto-generated by @hey-api/openapi-ts
 
-import { type ClientOptions, type Config, createClient, createConfig } from './client/index.js';
-import type { ClientOptions as ClientOptions2 } from './types.gen.js';
+import { type ClientOptions, type Config, createClient, createConfig } from './client';
+import type { ClientOptions as ClientOptions2 } from './types.gen';
 
 /**
  * The `createClientConfig()` function will be called on client initialization
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/test/generated/v3_no_index/client/client.gen.ts.snap b/packages/openapi-ts-tests/main/test/__snapshots__/test/generated/v3_no_index/client/client.gen.ts.snap
index 67961302b..a439d2748 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/test/generated/v3_no_index/client/client.gen.ts.snap
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/test/generated/v3_no_index/client/client.gen.ts.snap
@@ -1,14 +1,14 @@
 // This file is auto-generated by @hey-api/openapi-ts
 
-import { createSseClient } from '../core/serverSentEvents.gen.js';
-import type { HttpMethod } from '../core/types.gen.js';
-import { getValidRequestBody } from '../core/utils.gen.js';
+import { createSseClient } from '../core/serverSentEvents.gen';
+import type { HttpMethod } from '../core/types.gen';
+import { getValidRequestBody } from '../core/utils.gen';
 import type {
   Client,
   Config,
   RequestOptions,
   ResolvedRequestOptions,
-} from './types.gen.js';
+} from './types.gen';
 import {
   buildUrl,
   createConfig,
@@ -17,7 +17,7 @@ import {
   mergeConfigs,
   mergeHeaders,
   setAuthParams,
-} from './utils.gen.js';
+} from './utils.gen';
 
 type ReqInit = Omit<RequestInit, 'body' | 'headers'> & {
   body?: any;
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/test/generated/v3_no_index/client/index.ts.snap b/packages/openapi-ts-tests/main/test/__snapshots__/test/generated/v3_no_index/client/index.ts.snap
index 99df3b851..318a84b6a 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/test/generated/v3_no_index/client/index.ts.snap
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/test/generated/v3_no_index/client/index.ts.snap
@@ -1,14 +1,14 @@
 // This file is auto-generated by @hey-api/openapi-ts
 
-export type { Auth } from '../core/auth.gen.js';
-export type { QuerySerializerOptions } from '../core/bodySerializer.gen.js';
+export type { Auth } from '../core/auth.gen';
+export type { QuerySerializerOptions } from '../core/bodySerializer.gen';
 export {
   formDataBodySerializer,
   jsonBodySerializer,
   urlSearchParamsBodySerializer,
-} from '../core/bodySerializer.gen.js';
-export { buildClientParams } from '../core/params.gen.js';
-export { createClient } from './client.gen.js';
+} from '../core/bodySerializer.gen';
+export { buildClientParams } from '../core/params.gen';
+export { createClient } from './client.gen';
 export type {
   Client,
   ClientOptions,
@@ -21,5 +21,5 @@ export type {
   ResolvedRequestOptions,
   ResponseStyle,
   TDataShape,
-} from './types.gen.js';
-export { createConfig, mergeHeaders } from './utils.gen.js';
+} from './types.gen';
+export { createConfig, mergeHeaders } from './utils.gen';
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/test/generated/v3_no_index/client/types.gen.ts.snap b/packages/openapi-ts-tests/main/test/__snapshots__/test/generated/v3_no_index/client/types.gen.ts.snap
index d68ab68c4..1a005b51e 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/test/generated/v3_no_index/client/types.gen.ts.snap
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/test/generated/v3_no_index/client/types.gen.ts.snap
@@ -1,15 +1,15 @@
 // This file is auto-generated by @hey-api/openapi-ts
 
-import type { Auth } from '../core/auth.gen.js';
+import type { Auth } from '../core/auth.gen';
 import type {
   ServerSentEventsOptions,
   ServerSentEventsResult,
-} from '../core/serverSentEvents.gen.js';
+} from '../core/serverSentEvents.gen';
 import type {
   Client as CoreClient,
   Config as CoreConfig,
-} from '../core/types.gen.js';
-import type { Middleware } from './utils.gen.js';
+} from '../core/types.gen';
+import type { Middleware } from './utils.gen';
 
 export type ResponseStyle = 'data' | 'fields';
 
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/test/generated/v3_no_index/client/utils.gen.ts.snap b/packages/openapi-ts-tests/main/test/__snapshots__/test/generated/v3_no_index/client/utils.gen.ts.snap
index 48f1c9738..b4bcc4d19 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/test/generated/v3_no_index/client/utils.gen.ts.snap
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/test/generated/v3_no_index/client/utils.gen.ts.snap
@@ -1,15 +1,15 @@
 // This file is auto-generated by @hey-api/openapi-ts
 
-import { getAuthToken } from '../core/auth.gen.js';
-import type { QuerySerializerOptions } from '../core/bodySerializer.gen.js';
-import { jsonBodySerializer } from '../core/bodySerializer.gen.js';
+import { getAuthToken } from '../core/auth.gen';
+import type { QuerySerializerOptions } from '../core/bodySerializer.gen';
+import { jsonBodySerializer } from '../core/bodySerializer.gen';
 import {
   serializeArrayParam,
   serializeObjectParam,
   serializePrimitiveParam,
-} from '../core/pathSerializer.gen.js';
-import { getUrl } from '../core/utils.gen.js';
-import type { Client, ClientOptions, Config, RequestOptions } from './types.gen.js';
+} from '../core/pathSerializer.gen';
+import { getUrl } from '../core/utils.gen';
+import type { Client, ClientOptions, Config, RequestOptions } from './types.gen';
 
 export const createQuerySerializer = <T = unknown>({
   allowReserved,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/test/generated/v3_no_index/core/bodySerializer.gen.ts.snap b/packages/openapi-ts-tests/main/test/__snapshots__/test/generated/v3_no_index/core/bodySerializer.gen.ts.snap
index b2f0d3829..49cd8925e 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/test/generated/v3_no_index/core/bodySerializer.gen.ts.snap
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/test/generated/v3_no_index/core/bodySerializer.gen.ts.snap
@@ -4,7 +4,7 @@ import type {
   ArrayStyle,
   ObjectStyle,
   SerializerOptions,
-} from './pathSerializer.gen.js';
+} from './pathSerializer.gen';
 
 export type QuerySerializer = (query: Record<string, unknown>) => string;
 
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/test/generated/v3_no_index/core/serverSentEvents.gen.ts.snap b/packages/openapi-ts-tests/main/test/__snapshots__/test/generated/v3_no_index/core/serverSentEvents.gen.ts.snap
index d73aa0f30..f8fd78e28 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/test/generated/v3_no_index/core/serverSentEvents.gen.ts.snap
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/test/generated/v3_no_index/core/serverSentEvents.gen.ts.snap
@@ -1,6 +1,6 @@
 // This file is auto-generated by @hey-api/openapi-ts
 
-import type { Config } from './types.gen.js';
+import type { Config } from './types.gen';
 
 export type ServerSentEventsOptions<TData = unknown> = Omit<
   RequestInit,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/test/generated/v3_no_index/core/types.gen.ts.snap b/packages/openapi-ts-tests/main/test/__snapshots__/test/generated/v3_no_index/core/types.gen.ts.snap
index cc8a9e60f..643c070c9 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/test/generated/v3_no_index/core/types.gen.ts.snap
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/test/generated/v3_no_index/core/types.gen.ts.snap
@@ -1,11 +1,11 @@
 // This file is auto-generated by @hey-api/openapi-ts
 
-import type { Auth, AuthToken } from './auth.gen.js';
+import type { Auth, AuthToken } from './auth.gen';
 import type {
   BodySerializer,
   QuerySerializer,
   QuerySerializerOptions,
-} from './bodySerializer.gen.js';
+} from './bodySerializer.gen';
 
 export type HttpMethod =
   | 'connect'
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/test/generated/v3_no_index/core/utils.gen.ts.snap b/packages/openapi-ts-tests/main/test/__snapshots__/test/generated/v3_no_index/core/utils.gen.ts.snap
index 3029f7b3c..0b5389d08 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/test/generated/v3_no_index/core/utils.gen.ts.snap
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/test/generated/v3_no_index/core/utils.gen.ts.snap
@@ -1,12 +1,12 @@
 // This file is auto-generated by @hey-api/openapi-ts
 
-import type { BodySerializer, QuerySerializer } from './bodySerializer.gen.js';
+import type { BodySerializer, QuerySerializer } from './bodySerializer.gen';
 import {
   type ArraySeparatorStyle,
   serializeArrayParam,
   serializeObjectParam,
   serializePrimitiveParam,
-} from './pathSerializer.gen.js';
+} from './pathSerializer.gen';
 
 export interface PathSerializer {
   path: Record<string, unknown>;
diff --git a/packages/openapi-ts-tests/main/test/index.test.ts b/packages/openapi-ts-tests/main/test/index.test.ts
index 56a61a6f8..0a787595e 100644
--- a/packages/openapi-ts-tests/main/test/index.test.ts
+++ b/packages/openapi-ts-tests/main/test/index.test.ts
@@ -245,11 +245,6 @@ describe('OpenAPI v3', () => {
         output: {
           indexFile: false,
           path: '',
-          tsConfigPath: path.resolve(
-            __dirname,
-            'tsconfig',
-            'tsconfig.nodenext.json',
-          ),
         },
         parser: {
           transforms: {
diff --git a/packages/openapi-ts-tests/main/test/tsconfig/tsconfig.nodenext.json b/packages/openapi-ts-tests/main/test/tsconfig/tsconfig.nodenext.json
index 776e1c6e6..090bb97ca 100644
--- a/packages/openapi-ts-tests/main/test/tsconfig/tsconfig.nodenext.json
+++ b/packages/openapi-ts-tests/main/test/tsconfig/tsconfig.nodenext.json
@@ -1,7 +1,6 @@
 {
   "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
-    "module": "NodeNext",
     "declaration": false,
     "moduleResolution": "nodenext",
     "resolveJsonModule": true,
diff --git a/packages/openapi-ts/src/plugins/@pinia/colada/api.ts b/packages/openapi-ts/src/plugins/@pinia/colada/api.ts
index bd6242fa8..171c8310c 100644
--- a/packages/openapi-ts/src/plugins/@pinia/colada/api.ts
+++ b/packages/openapi-ts/src/plugins/@pinia/colada/api.ts
@@ -6,10 +6,10 @@ type SelectorType =
   | '_JSONValue'
   | 'AxiosError'
   | 'createQueryKey'
-  | 'serializeQueryKeyValue'
   | 'defineQueryOptions'
-  | 'queryOptionsFn'
   | 'QueryKey'
+  | 'queryOptionsFn'
+  | 'serializeQueryKeyValue'
   | 'UseMutationOptions'
   | 'UseQueryOptions';
 
@@ -20,10 +20,10 @@ export type IApi = {
    *  - `_JSONValue`: never
    *  - `AxiosError`: never
    *  - `createQueryKey`: never
-   *  - `serializeQueryKeyValue`: never
    *  - `defineQueryOptions`: never
-   *  - `queryOptionsFn`: `operation.id` string
    *  - `QueryKey`: never
+   *  - `queryOptionsFn`: `operation.id` string
+   *  - `serializeQueryKeyValue`: never
    *  - `UseMutationOptions`: never
    *  - `UseQueryOptions`: never
    * @returns Selector array
diff --git a/packages/openapi-ts/src/plugins/@pinia/colada/utils.ts b/packages/openapi-ts/src/plugins/@pinia/colada/utils.ts
index 9a8369e14..a5757b680 100644
--- a/packages/openapi-ts/src/plugins/@pinia/colada/utils.ts
+++ b/packages/openapi-ts/src/plugins/@pinia/colada/utils.ts
@@ -1,5 +1,6 @@
 import { getClientPlugin } from '../../@hey-api/client-core/utils';
 import type { PiniaColadaPlugin } from './types';
+
 export const getPublicTypeData = ({
   plugin,
   typeData,