Skip to content

Commit

Permalink
fix: support partial config in createGenerator (#1919)
Browse files Browse the repository at this point in the history
fixes #1918
  • Loading branch information
domoritz committed Apr 13, 2024
1 parent 26f75af commit c9c2a19
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
13 changes: 7 additions & 6 deletions factory/generator.ts
@@ -1,13 +1,14 @@
import { CompletedConfig } from "../src/Config";
import { Config, DEFAULT_CONFIG } from "../src/Config";
import { SchemaGenerator } from "../src/SchemaGenerator";
import { createFormatter } from "./formatter";
import { createParser } from "./parser";
import { createProgram } from "./program";

export function createGenerator(config: CompletedConfig): SchemaGenerator {
const program = createProgram(config);
const parser = createParser(program, config);
const formatter = createFormatter(config);
export function createGenerator(config: Config): SchemaGenerator {
const completedConfig = { ...DEFAULT_CONFIG, ...config };
const program = createProgram(completedConfig);
const parser = createParser(program, completedConfig);
const formatter = createFormatter(completedConfig);

return new SchemaGenerator(program, parser, formatter, config);
return new SchemaGenerator(program, parser, formatter, completedConfig);
}
5 changes: 2 additions & 3 deletions ts-json-schema-generator.ts
@@ -1,7 +1,7 @@
import { Command, Option } from "commander";
import stableStringify from "safe-stable-stringify";
import { createGenerator } from "./factory/generator";
import { CompletedConfig, DEFAULT_CONFIG } from "./src/Config";
import { Config } from "./src/Config";
import { BaseError } from "./src/Error/BaseError";
import { formatError } from "./src/Utils/formatError";
import * as pkg from "./package.json";
Expand Down Expand Up @@ -53,8 +53,7 @@ const args = new Command()
.parse(process.argv)
.opts();

const config: CompletedConfig = {
...DEFAULT_CONFIG,
const config: Config = {
minify: args.minify,
path: args.path,
tsconfig: args.tsconfig,
Expand Down

0 comments on commit c9c2a19

Please sign in to comment.