feat: add report config

skarab42 · Jul 9, 2022 · 41a88ff · 41a88ff
1 parent 276fb9e
commit 41a88ff
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 17 deletions.
diff --git a/src/plugin/index.ts b/src/plugin/index.ts
@@ -1,21 +1,26 @@
 import type { Plugin } from 'vite';
 import { transform } from './transform';
 import { fileNameMatch, type IncludeExclude } from '../util';
-import { TypeScriptConfigOptions, loadConfig } from '../typescript/config';
+import { type TypeScriptConfigOptions, loadConfig } from '../typescript/config';
+
+export type Reporter = 'type-error' | 'type-assertion';
 
 export interface PluginOptions {
+ report?: Reporter[];
  include?: IncludeExclude['include'];
  exclude?: IncludeExclude['exclude'];
  typescript?: TypeScriptConfigOptions;
 }
 
-const defaultOptions = {
+const defaultOptions: PluginOptions = {
+ report: ['type-error', 'type-assertion'],
  include: ['**/*.test.ts'],
  exclude: [],
+ typescript: {},
 };
 
 export function vitestTypescriptAssertPlugin(options: PluginOptions = {}): Plugin {
- const { include, exclude, typescript } = { ...defaultOptions, ...options };
+ const { include, exclude, typescript, report } = { ...defaultOptions, ...options } as Required<PluginOptions>;
 
  const tsconfig = loadConfig(typescript);
 
@@ -31,12 +36,7 @@ export function vitestTypescriptAssertPlugin(options: PluginOptions = {}): Plugi
  return;
  }
 
- return transform({
- code,
- fileName,
- tsconfig: tsconfig.config,
- shouldReportDiagnostics: !!typescript?.shouldReportDiagnostics,
- });
+ return transform({ code, fileName, report, typescript: { config: tsconfig.config, options: typescript } });
  },
  };
 }
diff --git a/src/plugin/transform.ts b/src/plugin/transform.ts
@@ -1,21 +1,26 @@
 import type ts from 'byots';
+import type { Reporter } from '.';
 import MagicString from 'magic-string';
 import { reportDiagnostics } from './util';
 import type { TransformResult } from 'vite';
 import { program } from '../typescript/program';
+import type { TypeScriptConfigOptions } from '../typescript/config';
 
-export interface TransformOptions {
+export interface TransformSettings {
  code: string;
  fileName: string;
- tsconfig: ts.ParsedCommandLine;
- shouldReportDiagnostics?: boolean;
+ report: Reporter[];
+ typescript: {
+ config: ts.ParsedCommandLine;
+ options: TypeScriptConfigOptions;
+ };
 }
 
-export function transform({ code, fileName, tsconfig, shouldReportDiagnostics }: TransformOptions): TransformResult {
- const { diagnostics } = program({ config: tsconfig, fileName });
+export function transform({ code, fileName, report, typescript }: TransformSettings): TransformResult {
+ const { diagnostics } = program({ config: typescript.config, fileName });
  const newCode = new MagicString(code);
 
- if (shouldReportDiagnostics) {
+ if (report.includes('type-error')) {
  reportDiagnostics(diagnostics, newCode, fileName);
  }
 

diff --git a/src/typescript/config.ts b/src/typescript/config.ts
@@ -1,5 +1,5 @@
-import path from 'path';
 import ts from 'byots';
+import path from 'path';
 import { formatDiagnostics } from './diagnostic';
 import { errorMessage, ErrorCode } from '../error';
 import { getCurrentDirectory, fileExists, readFile } from './util';
@@ -8,7 +8,6 @@ export interface TypeScriptConfigOptions {
  configName?: string;
  searchPath?: string;
  compilerOptions?: ts.CompilerOptions;
- shouldReportDiagnostics?: boolean;
 }
 
 export function findConfigFile(options: TypeScriptConfigOptions = {}) {