feat: support typescript-json-schema options config

liangskyli · Apr 26, 2023 · 54b83c6 · 54b83c6
1 parent 3bc7eaf
commit 54b83c6
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/packages/openapi-gen-ts/src/gen/gen-json-schema-file.ts b/packages/openapi-gen-ts/src/gen/gen-json-schema-file.ts
@@ -2,26 +2,28 @@ import type { IPrettierOptions } from '@liangskyli/utils';
 import { colors, prettierData } from '@liangskyli/utils';
 import fs from 'fs-extra';
 import path from 'path';
+import type { PartialArgs } from 'typescript-json-schema';
 import * as TJS from 'typescript-json-schema';
 
-type IOpts = {
+export type IGenSchemaDataFile = {
   tsSchemaPath: string;
   genSchemaAPIAbsolutePath: string;
-  compilerOptions?: TJS.CompilerOptions;
   prettierOptions?: IPrettierOptions;
+  typescriptJsonSchemaOptions?: PartialArgs;
 };
 
-const genSchemaDataFile = async (opts: IOpts) => {
+const genSchemaDataFile = async (opts: IGenSchemaDataFile) => {
   const {
     tsSchemaPath,
     genSchemaAPIAbsolutePath,
-    compilerOptions = { strictNullChecks: true },
+    typescriptJsonSchemaOptions = {},
   } = opts;
   let { prettierOptions } = opts;
-  const program = TJS.getProgramFromFiles([tsSchemaPath], compilerOptions);
+  const program = TJS.getProgramFromFiles([tsSchemaPath]);
   const schemaDefinition = TJS.generateSchema(program, 'paths', {
     required: true,
     ignoreErrors: true,
+    ...typescriptJsonSchemaOptions,
   });
   if (prettierOptions === undefined) {
     prettierOptions = { parser: 'json' };

diff --git a/packages/openapi-gen-ts/src/gen/index.ts b/packages/openapi-gen-ts/src/gen/index.ts
@@ -14,6 +14,7 @@ import openapiTS, {
 } from '../esm-to-commjs/openapi-typescript';
 import { fileTip } from '../utils';
 import { genInterfaceFile } from './gen-interface-file';
+import type { IGenSchemaDataFile } from './gen-json-schema-file';
 import { genSchemaDataFile } from './gen-json-schema-file';
 
 export type IGenTsDataOpts = {
@@ -37,6 +38,7 @@ export type IGenTsDataOpts = {
   requestQueryOmit?: string[];
   requestBodyOmit?: string[];
   openAPITSOptions?: Omit<OpenAPITSOptions, 'commentHeader'>;
+  typescriptJsonSchemaOptions?: IGenSchemaDataFile['typescriptJsonSchemaOptions'];
 };
 
 export type IGenTsDataOptsCLI = IGenTsDataOpts | IGenTsDataOpts[];
@@ -50,6 +52,7 @@ const genTsData = async (opts: IGenTsDataOpts) => {
     requestQueryOmit,
     requestBodyOmit,
     openAPITSOptions = {},
+    typescriptJsonSchemaOptions,
   } = opts;
 
   const genTsPath = path.join(genTsDir, 'schema-api');
@@ -112,6 +115,7 @@ const genTsData = async (opts: IGenTsDataOpts) => {
     tsSchemaPath,
     genSchemaAPIAbsolutePath: genTsAbsolutePath,
     prettierOptions: copyOptions(prettierOptions),
+    typescriptJsonSchemaOptions,
   });
 
   // 生成接口文件

diff --git a/packages/openapi-gen-ts/test/http/gen.ts b/packages/openapi-gen-ts/test/http/gen.ts
@@ -11,6 +11,7 @@ genTsData({
   },
   //requestQueryOmit: ['activityId','b'],
   //requestBodyOmit: ['a','b'],
+  typescriptJsonSchemaOptions: { strictNullChecks: true },
 }).then();
 
 genTsData({