chore(swc): Easier to maintain SWC cli option defaults using struct

nestjs · Jun 27, 2023 · c70aa59 · c70aa59
1 parent 3b1c1c4
commit c70aa59
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 11 deletions.
diff --git a/lib/compiler/defaults/swc-defaults.ts b/lib/compiler/defaults/swc-defaults.ts
@@ -1,9 +1,13 @@
 import * as ts from 'typescript';
-import { SwcCliOptions } from '../../configuration';
+import { Configuration } from '../../configuration';
+
+type SwcCliOptions = Required<
+  Required<Configuration>['compilerOptions']
+>['swcCliOptions'];
 
 export const swcDefaultsFactory = (
   tsOptions: ts.CompilerOptions,
-  swcCliOptions?: SwcCliOptions,
+  swcCliOptions: SwcCliOptions,
 ) => {
   return {
     swcOptions: {
@@ -29,14 +33,17 @@ export const swcDefaultsFactory = (
       swcrc: true,
     },
     cliOptions: {
-      outDir: swcCliOptions?.outDir || tsOptions.outDir || 'dist',
-      filenames: swcCliOptions?.filenames || ['src'],
-      sync: swcCliOptions?.sync || false,
-      extensions: swcCliOptions?.extensions || ['.js', '.ts'],
+      outDir: tsOptions.outDir || 'dist',
+      filenames: ['src'],
+      sync: false,
+      extensions: ['.js', '.ts'],
+      copyFiles: false,
+      includeDotfiles: false,
+      quiet: false,
       watch: false,
-      copyFiles: swcCliOptions?.copyFiles || false,
-      includeDotfiles: swcCliOptions?.includeDotfiles || false,
-      quiet: swcCliOptions?.quiet || false,
+
+      // Merge swcCliOptions
+      ...swcCliOptions,
     },
   };
 };
diff --git a/lib/compiler/swc/swc-compiler.ts b/lib/compiler/swc/swc-compiler.ts
@@ -43,7 +43,7 @@ export class SwcCompiler extends BaseCompiler {
   ) {
     const swcOptions = swcDefaultsFactory(
       extras.tsOptions,
-      configuration.compilerOptions.swcCliOptions,
+      configuration.compilerOptions.swcCliOptions || {},
     );
     if (extras.watch) {
       if (extras.typeCheck) {

diff --git a/lib/configuration/configuration.ts b/lib/configuration/configuration.ts
@@ -16,7 +16,7 @@ export interface ActionOnFile {
   watchAssetsMode: boolean;
 }
 
-export interface SwcCliOptions {
+interface SwcCliOptions {
   outDir?: string;
   filenames?: string[];
   sync?: boolean;