Hide TSFile properly

- Parse signalEmittedFiles and listEmittedFiles individually - Transmit to print those 2 params - Move the hide logic inside the print function
llllvvuu · May 9, 2022 · ab461f7 · ab461f7
1 parent c8a34c0
commit ab461f7
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 14 deletions.
diff --git a/src/lib/args-manager.ts b/src/lib/args-manager.ts
@@ -54,7 +54,8 @@ export function extractArgs(inputArgs: string[]) {
   const noColors = extractCommand(args, '--noColors');
   const noClear = extractCommand(args, '--noClear');
   const silent = extractCommand(args, '--silent');
-  const signalEmittedFiles = extractCommand(args, '--signalEmittedFiles') && !args.includes('--listEmittedFiles');
+  const signalEmittedFiles = extractCommand(args, '--signalEmittedFiles');
+  const requestedToListEmittedFiles = extractCommand(args, '--listEmittedFiles');
   let compiler = extractCommandWithValue(args, '--compiler');
   if (!compiler) {
     compiler = 'typescript/bin/tsc';
@@ -71,6 +72,7 @@ export function extractArgs(inputArgs: string[]) {
     maxNodeMem,
     noColors,
     noClear,
+    requestedToListEmittedFiles,
     signalEmittedFiles,
     silent,
     compiler,

diff --git a/src/lib/stdout-manipulator.ts b/src/lib/stdout-manipulator.ts
@@ -57,6 +57,7 @@ function color(line: string, noClear: boolean = false): string {
 type TPrintParams = {
   noColors?: boolean;
   noClear?: boolean;
+  requestedToListEmittedFiles?: boolean;
   signalEmittedFiles?: boolean;
 };
 
@@ -65,9 +66,10 @@ export function print(
     {
       noColors = false,
       noClear = false,
-      signalEmittedFiles = false
+      requestedToListEmittedFiles = false,
+      signalEmittedFiles = false,
     }: TPrintParams = {}): void {
-  if (signalEmittedFiles && line.startsWith('TSFILE:')) {
+  if (signalEmittedFiles && !requestedToListEmittedFiles && line.startsWith('TSFILE:')) {
     return;
   }
 

diff --git a/src/lib/tsc-watch.ts b/src/lib/tsc-watch.ts
@@ -24,6 +24,7 @@ const {
   maxNodeMem,
   noColors,
   noClear,
+  requestedToListEmittedFiles,
   signalEmittedFiles,
   silent,
   compiler,
@@ -85,15 +86,16 @@ function getTscPath(): string {
 
 interface INodeSettings {
   maxNodeMem: string | null;
+  requestedToListEmittedFiles: boolean;
   signalEmittedFiles: boolean;
 }
 
-function spawnTsc({ maxNodeMem, signalEmittedFiles }: INodeSettings, args: string[]): ChildProcess {
+function spawnTsc({ maxNodeMem, requestedToListEmittedFiles, signalEmittedFiles }: INodeSettings, args: string[]): ChildProcess {
   const nodeArgs = [];
   if (maxNodeMem) {
     nodeArgs.push(`--max_old_space_size=${maxNodeMem}`);
   }
-  if (signalEmittedFiles) {
+  if (signalEmittedFiles && !requestedToListEmittedFiles) {
     nodeArgs.push(`--listEmittedFiles`);
   }
 
@@ -105,7 +107,7 @@ function spawnTsc({ maxNodeMem, signalEmittedFiles }: INodeSettings, args: strin
 }
 
 let compilationErrorSinceStart = false;
-const tscProcess = spawnTsc({ maxNodeMem, signalEmittedFiles }, args);
+const tscProcess = spawnTsc({ maxNodeMem, requestedToListEmittedFiles, signalEmittedFiles }, args);
 if (!tscProcess.stdout) {
   throw new Error('Unable to read Typescript stdout');
 }
@@ -119,7 +121,7 @@ rl.on('line', function (input) {
 
   const line = manipulate(input);
   if (!silent) {
-    print(line, { noColors, noClear, signalEmittedFiles });
+    print(line, { noColors, noClear, signalEmittedFiles, requestedToListEmittedFiles });
   }
   const state = detectState(line);
   const compilationStarted = state.compilationStarted;

diff --git a/src/test/args-manager.test.ts b/src/test/args-manager.test.ts
@@ -120,8 +120,9 @@ describe('Args Manager', () => {
     expect(extractArgs(['node', 'tsc-watch.js', '--signalEmittedFiles', '1.ts']).signalEmittedFiles).toBe(true);
   });
 
-  it('Should not return conflicting signalEmittedFiles if --listEmittedFiles is specifically flagged', () => {
-    expect(extractArgs(['node', 'tsc-watch.js', '--signalEmittedFiles', '--listEmittedFiles', '1.ts']).signalEmittedFiles).toBe(false);
+  it('Should return requestedToListEmittedFiles when tsc native listEmittedFiles is set', () => {
+    expect(extractArgs(['node', 'tsc-watch.js', '1.ts']).requestedToListEmittedFiles).toBe(false);
+    expect(extractArgs(['node', 'tsc-watch.js', '--listEmittedFiles', '1.ts']).requestedToListEmittedFiles).toBe(true);
   });
 
   it('Should return the compiler', () => {

diff --git a/src/test/stdout-manipulator.test.ts b/src/test/stdout-manipulator.test.ts
@@ -60,14 +60,21 @@ describe('stdout-manipulator', () => {
             expect(forkSpy.mock.calls).toEqual([['raw tsc line']])
         });
 
-        it('Should hide a TSFILE line when signalEmittedFiles is true', async () => {
-            print('TSFILE: /home/emitted/file.js', { signalEmittedFiles: true });
-            expect(forkSpy.mock.calls).toEqual([])
-        });
-
         it('Should not hide a normal line when signalEmittedFiles is true', async () => {
             print('any other line', { signalEmittedFiles: true });
             expect(forkSpy.mock.calls).toEqual([['any other line']])
         });
+
+        describe("TSFILE support", () => {
+            it('Should hide a TSFILE line when signalEmittedFiles is true', async () => {
+                print('TSFILE: /home/emitted/file.js', { signalEmittedFiles: true });
+                expect(forkSpy.mock.calls).toEqual([])
+            });
+
+            it('Should not hide a TSFILE line when signalEmittedFiles is true and native --listEmittedFiles (requestedToListEmittedFiles) is true', async () => {
+                print('TSFILE: /home/emitted/file.js', { noColors: true, signalEmittedFiles: true, requestedToListEmittedFiles: true });
+                expect(forkSpy.mock.calls).toEqual([['TSFILE: /home/emitted/file.js']])
+            });
+        });
     });
 });