fix: remove .ts extension for .vue files in dependencies (#528)

✅ Closes: #527

Author: piotr-oles

src/typescript-reporter/extension/TypeScriptEmbeddedExtension.ts

@@ -2,6 +2,7 @@ import * as ts from 'typescript';
 import { extname } from 'path';
 import { TypeScriptExtension } from './TypeScriptExtension';
 import { Issue } from '../../issue';
+import { Dependencies } from '../../reporter';
 
 interface TypeScriptEmbeddedSource {
   sourceText: string;
@@ -167,8 +168,27 @@ function createTypeScriptEmbeddedExtension({
         },
       };
     },
-    extendSupportedFileExtensions(extensions: string[]) {
-      return [...extensions, ...embeddedExtensions];
+    extendDependencies(dependencies: Dependencies) {
+      return {
+        ...dependencies,
+        files: dependencies.files.map((fileName) => {
+          const {
+            embeddedExtension,
+            embeddedFileName,
+            extension,
+          } = parsePotentiallyEmbeddedFileName(fileName);
+
+          if (embeddedExtensions.includes(embeddedExtension)) {
+            const embeddedSource = getCachedEmbeddedSource(embeddedFileName);
+            if (embeddedSource && embeddedSource.extension === extension) {
+              return embeddedFileName;
+            }
+          }
+
+          return fileName;
+        }),
+        extensions: [...dependencies.extensions, ...embeddedExtensions],
+      };
     },
   };
 }

src/typescript-reporter/extension/TypeScriptExtension.ts

@@ -1,5 +1,6 @@
 import * as ts from 'typescript';
 import { Issue } from '../../issue';
+import { Dependencies } from '../../reporter';
 
 interface TypeScriptHostExtension {
   extendWatchSolutionBuilderHost?<
@@ -21,11 +22,11 @@ interface TypeScriptHostExtension {
     parsedCommandLine?: ts.ParsedCommandLine
   ): THost;
   extendParseConfigFileHost?<THost extends ts.ParseConfigFileHost>(host: THost): THost;
-  extendSupportedFileExtensions?(extensions: string[]): string[];
 }
 
 interface TypeScriptReporterExtension {
   extendIssues?(issues: Issue[]): Issue[];
+  extendDependencies?(dependencies: Dependencies): Dependencies;
 }
 
 interface TypeScriptExtension extends TypeScriptHostExtension, TypeScriptReporterExtension {}

src/typescript-reporter/reporter/TypeScriptReporter.ts

@@ -111,21 +111,27 @@ function createTypeScriptReporter(configuration: TypeScriptReporterConfiguration
     }
   }
 
-  function parseConfiguration() {
-    const parseConfigurationDiagnostics = [];
+  function getParseConfigFileHost() {
+    const parseConfigDiagnostics: ts.Diagnostic[] = [];
 
     let parseConfigFileHost: ts.ParseConfigFileHost = {
       ...system,
       onUnRecoverableConfigFileDiagnostic: (diagnostic) => {
-        parseConfigurationDiagnostics.push(diagnostic);
+        parseConfigDiagnostics.push(diagnostic);
       },
     };
 
-    extensions.forEach((extension) => {
+    for (const extension of extensions) {
       if (extension.extendParseConfigFileHost) {
         parseConfigFileHost = extension.extendParseConfigFileHost(parseConfigFileHost);
       }
-    });
+    }
+
+    return [parseConfigFileHost, parseConfigDiagnostics] as const;
+  }
+
+  function parseConfiguration() {
+    const [parseConfigFileHost, parseConfigDiagnostics] = getParseConfigFileHost();
 
     const parsedConfiguration = parseTypeScriptConfiguration(
       typescript,
@@ -136,10 +142,10 @@ function createTypeScriptReporter(configuration: TypeScriptReporterConfiguration
     );
 
     if (parsedConfiguration.errors) {
-      parseConfigurationDiagnostics.push(...parsedConfiguration.errors);
+      parseConfigDiagnostics.push(...parsedConfiguration.errors);
     }
 
-    return [parsedConfiguration, parseConfigurationDiagnostics] as const;
+    return [parsedConfiguration, parseConfigDiagnostics] as const;
   }
 
   function parseConfigurationIfNeeded(): ts.ParsedCommandLine {
@@ -153,19 +159,22 @@ function createTypeScriptReporter(configuration: TypeScriptReporterConfiguration
   function getDependencies(): Dependencies {
     parsedConfiguration = parseConfigurationIfNeeded();
 
-    const parseConfigFileHost: ts.ParseConfigFileHost = {
-      ...system,
-      onUnRecoverableConfigFileDiagnostic: () => {
-        // it's handled in a different place
-      },
-    };
+    const [parseConfigFileHost] = getParseConfigFileHost();
 
-    return getDependenciesFromTypeScriptConfiguration(
+    let dependencies = getDependenciesFromTypeScriptConfiguration(
       typescript,
       parsedConfiguration,
       configuration.context,
       parseConfigFileHost
     );
+
+    for (const extension of extensions) {
+      if (extension.extendDependencies) {
+        dependencies = extension.extendDependencies(dependencies);
+      }
+    }
+
+    return dependencies;
   }
 
   function startProfilingIfNeeded() {
@@ -274,13 +283,6 @@ function createTypeScriptReporter(configuration: TypeScriptReporterConfiguration
         async getDependencies() {
           if (!dependencies) {
             dependencies = getDependencies();
-            for (const extension of extensions) {
-              if (extension.extendSupportedFileExtensions) {
-                dependencies.extensions = extension.extendSupportedFileExtensions(
-                  dependencies.extensions
-                );
-              }
-            }
           }
 
           return dependencies;