fix: support esm projects

mnahkies · mnahkies · commit 5a773df704c5 · 2025-10-20T21:09:43.000+01:00
diff --git a/integration-tests/biome.jsonc.disable b/integration-tests/biome.jsonc.disable
@@ -0,0 +1,9 @@
+{
+  "$schema": "https://biomejs.dev/schemas/2.2.5/schema.json",
+  "extends": "//",
+  "linter": {
+    "includes": [
+      "**"
+    ]
+  }
+}
diff --git a/integration-tests/typescript-angular/tsconfig.json b/integration-tests/typescript-angular/tsconfig.json
@@ -16,6 +16,7 @@
     "sourceMap": true,
     "declaration": false,
     "experimentalDecorators": true,
+    "rewriteRelativeImportExtensions": true,
     "moduleResolution": "bundler",
     "target": "ES2022",
     "module": "ES2022"
diff --git a/integration-tests/typescript-axios/package.json b/integration-tests/typescript-axios/package.json
@@ -5,6 +5,7 @@
   "author": "Michael Nahkies",
   "license": "MIT",
   "private": true,
+  "type": "module",
   "scripts": {
     "clean": "rm -rf ./dist && rm -rf ./src/generated",
     "validate": "tsc -p ./tsconfig.json"
diff --git a/integration-tests/typescript-axios/src/audit-github-repositories.ts b/integration-tests/typescript-axios/src/audit-github-repositories.ts
@@ -6,8 +6,8 @@ import axios, {type AxiosResponse, isAxiosError} from "axios"
 import {
   ApiClient,
   GitHubV3RestApiServers,
-} from "./generated/api.github.com.yaml/client"
-import type {t_repository} from "./generated/api.github.com.yaml/models"
+} from "./generated/api.github.com.yaml/client.ts"
+import type {t_repository} from "./generated/api.github.com.yaml/models.ts"
 
 const client = new ApiClient({
   axios: axios.create({
diff --git a/integration-tests/typescript-axios/src/uniform-github-repositories.ts b/integration-tests/typescript-axios/src/uniform-github-repositories.ts
@@ -3,8 +3,8 @@ import dotenv from "dotenv"
 dotenv.config()
 
 import axios from "axios"
-import {ApiClient} from "./generated/api.github.com.yaml/client"
-import type {t_repository} from "./generated/api.github.com.yaml/models"
+import {ApiClient} from "./generated/api.github.com.yaml/client.ts"
+import type {t_repository} from "./generated/api.github.com.yaml/models.ts"
 
 const client = new ApiClient({
   axios: axios.create({
diff --git a/integration-tests/typescript-axios/tsconfig.json b/integration-tests/typescript-axios/tsconfig.json
@@ -6,6 +6,9 @@
     "rootDir": "./src",
     /* exercise the code path where exactOptionalPropertyTypes is enabled */
     "exactOptionalPropertyTypes": true,
-    "noUnusedLocals": true
+    "noUnusedLocals": true,
+    "verbatimModuleSyntax": true,
+    "rewriteRelativeImportExtensions": true
+
   }
 }
diff --git a/integration-tests/typescript-express/package.json b/integration-tests/typescript-express/package.json
@@ -5,6 +5,7 @@
   "author": "Michael Nahkies",
   "license": "MIT",
   "private": true,
+  "type": "module",
   "scripts": {
     "clean": "rm -rf ./dist && rm -rf ./src/generated",
     "validate": "tsc -p ./tsconfig.json"
diff --git a/integration-tests/typescript-express/tsconfig.json b/integration-tests/typescript-express/tsconfig.json
@@ -6,6 +6,9 @@
     "types": [],
     /* exercise the code path where exactOptionalPropertyTypes is enabled */
     "exactOptionalPropertyTypes": true,
-    "noUnusedLocals": true
+    "verbatimModuleSyntax": true,
+    "noUnusedLocals": true,
+    "rewriteRelativeImportExtensions": true
+
   }
 }
diff --git a/integration-tests/typescript-fetch/package.json b/integration-tests/typescript-fetch/package.json
@@ -9,6 +9,7 @@
     "clean": "rm -rf ./dist && rm -rf ./src/generated",
     "validate": "tsc -p ./tsconfig.json"
   },
+  "type": "module",
   "dependencies": {
     "@nahkies/typescript-fetch-runtime": "workspace:*",
     "dotenv": "^17.2.3",
diff --git a/integration-tests/typescript-fetch/src/generate-release-notes.ts b/integration-tests/typescript-fetch/src/generate-release-notes.ts
@@ -3,7 +3,7 @@ import path from "node:path"
 import {
   GitHubV3RestApi,
   GitHubV3RestApiServers,
-} from "./generated/api.github.com.yaml/client"
+} from "./generated/api.github.com.yaml/client.ts"
 
 function formatDate(dateStr: string | null) {
   if (!dateStr) return ""
diff --git a/integration-tests/typescript-fetch/src/todo-lists.type-tests.ts b/integration-tests/typescript-fetch/src/todo-lists.type-tests.ts
@@ -1,4 +1,4 @@
-import {TodoListsExampleApiServers} from "./generated/todo-lists.yaml/client"
+import {TodoListsExampleApiServers} from "./generated/todo-lists.yaml/client.ts"
 
 TodoListsExampleApiServers.server()
 
diff --git a/integration-tests/typescript-fetch/src/uniform-github-repositories.ts b/integration-tests/typescript-fetch/src/uniform-github-repositories.ts
@@ -2,8 +2,8 @@ import dotenv from "dotenv"
 
 dotenv.config()
 
-import {ApiClient} from "./generated/api.github.com.yaml/client"
-import type {t_repository} from "./generated/api.github.com.yaml/models"
+import {ApiClient} from "./generated/api.github.com.yaml/client.ts"
+import type {t_repository} from "./generated/api.github.com.yaml/models.ts"
 
 const {writeHeapSnapshot} = require("node:v8")
 
diff --git a/integration-tests/typescript-fetch/tsconfig.json b/integration-tests/typescript-fetch/tsconfig.json
@@ -6,6 +6,8 @@
     "rootDir": "./src",
     /* exercise the code path where exactOptionalPropertyTypes is disabled */
     "exactOptionalPropertyTypes": false,
-    "noUnusedLocals": true
+    "noUnusedLocals": true,
+    "verbatimModuleSyntax": true,
+    "rewriteRelativeImportExtensions": true
   }
 }
diff --git a/integration-tests/typescript-koa/package.json b/integration-tests/typescript-koa/package.json
@@ -5,6 +5,7 @@
   "author": "Michael Nahkies",
   "license": "MIT",
   "private": true,
+  "type": "module",
   "scripts": {
     "clean": "rm -rf ./dist && rm -rf ./src/generated",
     "validate": "tsc -p ./tsconfig.json"
diff --git a/integration-tests/typescript-koa/src/petstore-expanded.yaml.ts b/integration-tests/typescript-koa/src/petstore-expanded.yaml.ts
@@ -6,8 +6,8 @@ import {
   bootstrap,
   createRouter,
   type FindPetById,
-} from "./generated/petstore-expanded.yaml/generated"
-import type {t_Error} from "./generated/petstore-expanded.yaml/models"
+} from "./generated/petstore-expanded.yaml/generated.ts"
+import type {t_Error} from "./generated/petstore-expanded.yaml/models.ts"
 
 export const notImplemented = async (
   _: unknown,
diff --git a/integration-tests/typescript-koa/src/todo-lists.yaml.ts b/integration-tests/typescript-koa/src/todo-lists.yaml.ts
@@ -2,9 +2,12 @@ import {
   bootstrap,
   createRouter,
   type GetTodoLists,
-} from "./generated/todo-lists.yaml/generated"
-import type {t_TodoList} from "./generated/todo-lists.yaml/models"
-import {genericErrorMiddleware, notImplemented} from "./petstore-expanded.yaml"
+} from "./generated/todo-lists.yaml/generated.ts"
+import type {t_TodoList} from "./generated/todo-lists.yaml/models.ts"
+import {
+  genericErrorMiddleware,
+  notImplemented,
+} from "./petstore-expanded.yaml.ts"
 
 const getTodoLists: GetTodoLists = async ({query}, respond) => {
   console.info("query", {query})
diff --git a/integration-tests/typescript-koa/tsconfig.json b/integration-tests/typescript-koa/tsconfig.json
@@ -7,6 +7,9 @@
     "types": [],
     /* exercise the code path where exactOptionalPropertyTypes is disabled */
     "exactOptionalPropertyTypes": false,
-    "noUnusedLocals": true
+    "noUnusedLocals": true,
+    "verbatimModuleSyntax": true,
+    "rewriteRelativeImportExtensions": true
+
   }
 }
diff --git a/packages/openapi-code-generator/src/typescript/common/import-builder.ts b/packages/openapi-code-generator/src/typescript/common/import-builder.ts
@@ -132,8 +132,9 @@ export class ImportBuilder {
 
   private normalizeFrom(from: string) {
     if (from.endsWith(".ts")) {
+      // TODO: toggle based on project settings
       // biome-ignore lint/style/noParameterAssign: normalization
-      from = from.substring(0, from.length - ".ts".length)
+      // from = from.substring(0, from.length - ".ts".length)
     }
 
     if (this.unit && from.startsWith("./")) {

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,9 @@`
`6`	`6`	`"rootDir": "./src",`
`7`	`7`	`/* exercise the code path where exactOptionalPropertyTypes is enabled */`
`8`	`8`	`"exactOptionalPropertyTypes": true,`
`9`		`- "noUnusedLocals": true`
	`9`	`+ "noUnusedLocals": true,`
	`10`	`+ "verbatimModuleSyntax": true,`
	`11`	`+ "rewriteRelativeImportExtensions": true`
	`12`	`+`
`10`	`13`	`}`
`11`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,9 @@`
`6`	`6`	`"types": [],`
`7`	`7`	`/* exercise the code path where exactOptionalPropertyTypes is enabled */`
`8`	`8`	`"exactOptionalPropertyTypes": true,`
`9`		`- "noUnusedLocals": true`
	`9`	`+ "verbatimModuleSyntax": true,`
	`10`	`+ "noUnusedLocals": true,`
	`11`	`+ "rewriteRelativeImportExtensions": true`
	`12`	`+`
`10`	`13`	`}`
`11`	`14`	`}`