fix: ensure typescript is imported only as type-only (#633)

Ensure typescript is imported only as type-only and close reporter on unsuccessful `configure` or `connect`

Co-authored-by: Mark Molinaro <[email protected]>

src/reporter/reporter-rpc/ReporterRpcClient.ts

@@ -29,8 +29,16 @@ function createReporterRpcClient<TConfiguration extends object>(
         await channel.open();
       }
       if (!rpcClient.isConnected()) {
-        await rpcClient.connect();
-        await rpcClient.dispatchCall(configure, configuration);
+        try {
+          await rpcClient.connect();
+          await rpcClient.dispatchCall(configure, configuration);
+        } catch (error) {
+          // connect or configure was not successful -
+          // close the reporter and re-throw an error
+          await rpcClient.disconnect();
+          await channel.close();
+          throw error;
+        }
       }
     },
     disconnect: async () => {

src/typescript-reporter/extension/TypeScriptEmbeddedExtension.ts

@@ -1,4 +1,4 @@
-import * as ts from 'typescript';
+import type * as ts from 'typescript';
 import { extname } from 'path';
 import { TypeScriptExtension } from './TypeScriptExtension';
 import { Issue } from '../../issue';

src/typescript-reporter/extension/TypeScriptExtension.ts

@@ -1,4 +1,4 @@
-import * as ts from 'typescript';
+import type * as ts from 'typescript';
 import { Issue } from '../../issue';
 import { FilesMatch } from '../../reporter';
 

src/typescript-reporter/issue/TypeScriptIssueFactory.ts

@@ -1,4 +1,4 @@
-import * as ts from 'typescript';
+import type * as ts from 'typescript';
 import * as os from 'os';
 import { deduplicateAndSortIssues, Issue, IssueLocation } from '../../issue';
 

src/typescript-reporter/profile/TypeScriptPerformance.ts

@@ -1,4 +1,4 @@
-import * as ts from 'typescript';
+import type * as ts from 'typescript';
 import { Performance } from '../../profile/Performance';
 
 interface TypeScriptPerformance {

src/typescript-reporter/reporter/ControlledTypeScriptSystem.ts

@@ -1,4 +1,4 @@
-import * as ts from 'typescript';
+import type * as ts from 'typescript';
 import { dirname, join } from 'path';
 import { createPassiveFileSystem } from '../file-system/PassiveFileSystem';
 import forwardSlash from '../../utils/path/forwardSlash';

src/typescript-reporter/reporter/ControlledWatchCompilerHost.ts

@@ -1,4 +1,4 @@
-import * as ts from 'typescript';
+import type * as ts from 'typescript';
 import { TypeScriptHostExtension } from '../extension/TypeScriptExtension';
 import { ControlledTypeScriptSystem } from './ControlledTypeScriptSystem';
 

src/typescript-reporter/reporter/ControlledWatchSolutionBuilderHost.ts

@@ -1,4 +1,4 @@
-import * as ts from 'typescript';
+import type * as ts from 'typescript';
 import { createControlledWatchCompilerHost } from './ControlledWatchCompilerHost';
 import { TypeScriptHostExtension } from '../extension/TypeScriptExtension';
 import { ControlledTypeScriptSystem } from './ControlledTypeScriptSystem';
@@ -59,7 +59,7 @@ function createControlledWatchSolutionBuilderHost<TProgram extends ts.BuilderPro
       system.deleteFile(fileName);
     },
     getParsedCommandLine(fileName: string): ts.ParsedCommandLine | undefined {
-      return ts.getParsedCommandLineOfConfigFile(
+      return typescript.getParsedCommandLineOfConfigFile(
         fileName,
         { skipLibCheck: true },
         {

src/typescript-reporter/reporter/TypeScriptConfigurationParser.ts

@@ -1,4 +1,4 @@
-import * as ts from 'typescript';
+import type * as ts from 'typescript';
 import { normalize, dirname, basename, resolve, relative } from 'path';
 import { TypeScriptConfigurationOverwrite } from '../TypeScriptConfigurationOverwrite';
 import { FilesMatch } from '../../reporter';
@@ -114,10 +114,10 @@ function removeJsonExtension(path: string) {
   }
 }
 
-function getTsBuildInfoEmitOutputFilePath(options: ts.CompilerOptions) {
-  if (typeof ts.getTsBuildInfoEmitOutputFilePath === 'function') {
+function getTsBuildInfoEmitOutputFilePath(typescript: typeof ts, options: ts.CompilerOptions) {
+  if (typeof typescript.getTsBuildInfoEmitOutputFilePath === 'function') {
     // old TypeScript version doesn't provides this method
-    return ts.getTsBuildInfoEmitOutputFilePath(options);
+    return typescript.getTsBuildInfoEmitOutputFilePath(options);
   }
 
   // based on the implementation from typescript
@@ -159,7 +159,10 @@ function getArtifactsFromTypeScriptConfiguration(
     if (parsedConfiguration.options.outFile) {
       files.add(resolve(configFileContext, parsedConfiguration.options.outFile));
     }
-    const tsBuildInfoPath = getTsBuildInfoEmitOutputFilePath(parsedConfiguration.options);
+    const tsBuildInfoPath = getTsBuildInfoEmitOutputFilePath(
+      typescript,
+      parsedConfiguration.options
+    );
     if (tsBuildInfoPath) {
       files.add(resolve(configFileContext, tsBuildInfoPath));
     }

src/typescript-reporter/reporter/TypeScriptReporter.ts

@@ -1,4 +1,4 @@
-import * as ts from 'typescript';
+import type * as ts from 'typescript';
 import path from 'path';
 import { FilesMatch, Reporter } from '../../reporter';
 import { createIssuesFromTsDiagnostics } from '../issue/TypeScriptIssueFactory';