Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion packages/openapi-code-generator/src/cli.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

import "source-map-support/register"

// eslint-disable-next-line no-restricted-imports
import path from "node:path"
import {
Command,
InvalidArgumentError,
Expand All @@ -10,6 +12,7 @@ import {
import {promptContinue} from "./core/cli-utils"
import {NodeFsAdaptor} from "./core/file-system/node-fs-adaptor"
import {OperationGroupStrategy} from "./core/input"
import {loadTsConfigCompilerOptions} from "./core/loaders/tsconfig.loader"
import {logger} from "./core/logger"
import {OpenapiValidator} from "./core/openapi-validator"
import {generate} from "./index"
Expand Down Expand Up @@ -142,8 +145,20 @@ async function main() {
"yes",
)
})
const compilerOptions = await loadTsConfigCompilerOptions(
path.join(process.cwd(), config.output),
fsAdaptor,
)

await generate(config, fsAdaptor, formatter, validator)
await generate(
{
...config,
tsCompilerOptions: compilerOptions,
},
fsAdaptor,
formatter,
validator,
)
}

main()
Expand Down
12 changes: 3 additions & 9 deletions packages/openapi-code-generator/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
import path from "path"

import {IFsAdaptor} from "./core/file-system/fs-adaptor"
import {Input} from "./core/input"
import {IFormatter} from "./core/interfaces"
import {GenericLoader} from "./core/loaders/generic.loader"
import {loadTsConfigCompilerOptions} from "./core/loaders/tsconfig.loader"
import type {CompilerOptions} from "./core/loaders/tsconfig.loader"
import {logger} from "./core/logger"
import {OpenapiLoader} from "./core/openapi-loader"
import {OpenapiValidator} from "./core/openapi-validator"
Expand All @@ -26,6 +24,7 @@ export type Config = {
allowUnusedImports: boolean
groupingStrategy: "none" | "first-slug" | "first-tag"
tsAllowAny: boolean
tsCompilerOptions: CompilerOptions
}

export async function generate(
Expand All @@ -38,11 +37,6 @@ export async function generate(
logger.info(`running on input file '${config.input}'`)
logger.time("load files")

const compilerOptions = await loadTsConfigCompilerOptions(
path.join(process.cwd(), config.output),
fsAdaptor,
)

const genericLoader = new GenericLoader(fsAdaptor)

const loader = await OpenapiLoader.create(
Expand All @@ -67,7 +61,7 @@ export async function generate(
emitter,
schemaBuilder: config.schemaBuilder,
enableRuntimeResponseValidation: config.enableRuntimeResponseValidation,
compilerOptions,
compilerOptions: config.tsCompilerOptions,
groupingStrategy: config.groupingStrategy,
allowAny: config.tsAllowAny,
})
Expand Down
2 changes: 1 addition & 1 deletion packages/openapi-code-generator/src/templates.types.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {Input, OperationGroupStrategy} from "./core/input"
import {CompilerOptions} from "./core/loaders/tsconfig.loader"
import type {CompilerOptions} from "./core/loaders/tsconfig.loader"
import {SchemaBuilderType} from "./typescript/common/schema-builders/schema-builder"
import {TypescriptEmitter} from "./typescript/common/typescript-emitter"

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {describe, expect, it} from "@jest/globals"
import {CompilerOptions} from "../../core/loaders/tsconfig.loader"
import type {CompilerOptions} from "../../core/loaders/tsconfig.loader"
import {testVersions, unitTestInput} from "../../test/input.test-utils"
import {ImportBuilder} from "./import-builder"
import {TypeBuilder, TypeBuilderConfig} from "./type-builder"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {Input} from "../../core/input"
import {CompilerOptions} from "../../core/loaders/tsconfig.loader"
import type {CompilerOptions} from "../../core/loaders/tsconfig.loader"
import {logger} from "../../core/logger"
import {Reference} from "../../core/openapi-types"
import {MaybeIRModel} from "../../core/openapi-types-normalized"
Expand Down