fix: include .vue files as the project root files (#471)

✅ Closes: #452
TypeStrong · Jul 1, 2020 · 65ab0cc · 65ab0cc
1 parent ad0eac9
commit 65ab0cc
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 37 deletions.
diff --git a/src/typescript-reporter/extension/TypeScriptEmbeddedExtension.ts b/src/typescript-reporter/extension/TypeScriptEmbeddedExtension.ts
@@ -130,6 +130,40 @@ function createTypeScriptEmbeddedExtension({
         fileExists: createEmbeddedFileExists(host.fileExists),
       };
     },
+    extendParseConfigFileHost<THost extends ts.ParseConfigFileHost>(host: THost): THost {
+      return {
+        ...host,
+        readDirectory(
+          rootDir: string,
+          extensions: readonly string[],
+          excludes: readonly string[] | undefined,
+          includes: readonly string[],
+          depth?: number
+        ): readonly string[] {
+          return host
+            .readDirectory(
+              rootDir,
+              [...extensions, ...embeddedExtensions],
+              excludes,
+              includes,
+              depth
+            )
+            .map((fileName) => {
+              const isEmbeddedFile = embeddedExtensions.some((embeddedExtension) =>
+                fileName.endsWith(embeddedExtension)
+              );
+
+              if (isEmbeddedFile) {
+                const embeddedSource = getCachedEmbeddedSource(fileName);
+
+                return embeddedSource ? `${fileName}${embeddedSource.extension}` : fileName;
+              } else {
+                return fileName;
+              }
+            });
+        },
+      };
+    },
   };
 }
 

diff --git a/src/typescript-reporter/extension/TypeScriptExtension.ts b/src/typescript-reporter/extension/TypeScriptExtension.ts
@@ -20,6 +20,7 @@ interface TypeScriptHostExtension {
     host: THost,
     parsedCommandLine?: ts.ParsedCommandLine
   ): THost;
+  extendParseConfigFileHost?<THost extends ts.ParseConfigFileHost>(host: THost): THost;
 }
 
 interface TypeScriptReporterExtension {

diff --git a/src/typescript-reporter/reporter/TypeScriptReporter.ts b/src/typescript-reporter/reporter/TypeScriptReporter.ts
@@ -115,17 +115,25 @@ function createTypeScriptReporter(configuration: TypeScriptReporterConfiguration
       if (!parsedConfiguration) {
         const parseConfigurationDiagnostics: ts.Diagnostic[] = [];
 
+        let parseConfigFileHost: ts.ParseConfigFileHost = {
+          ...system,
+          onUnRecoverableConfigFileDiagnostic: (diagnostic) => {
+            parseConfigurationDiagnostics.push(diagnostic);
+          },
+        };
+
+        extensions.forEach((extension) => {
+          if (extension.extendParseConfigFileHost) {
+            parseConfigFileHost = extension.extendParseConfigFileHost(parseConfigFileHost);
+          }
+        });
+
         performance.markStart('Parse Configuration');
         parsedConfiguration = parseTypeScriptConfiguration(
           configuration.configFile,
           configuration.context,
           configuration.configOverwrite,
-          {
-            ...system,
-            onUnRecoverableConfigFileDiagnostic: (diagnostic) => {
-              parseConfigurationDiagnostics.push(diagnostic);
-            },
-          }
+          parseConfigFileHost
         );
         performance.markEnd('Parse Configuration');
 

diff --git a/test/e2e/TypeScriptVueExtension.spec.ts b/test/e2e/TypeScriptVueExtension.spec.ts
@@ -61,17 +61,6 @@ describe('TypeScript Vue Extension', () => {
       ]);
 
       if (vue === '^2.6.11') {
-        await sandbox.write(
-          'src/index.ts',
-          [
-            "import Vue from 'vue'",
-            "import App from './App.vue'",
-            '',
-            'new Vue({',
-            '  render: h => h(App)',
-            "}).$mount('#app')",
-          ].join('\n')
-        );
         await sandbox.write(
           'src/vue-shim.d.ts',
           [
@@ -82,15 +71,6 @@ describe('TypeScript Vue Extension', () => {
           ].join('\n')
         );
       } else {
-        await sandbox.write(
-          'src/index.ts',
-          [
-            "import { createApp } from 'vue'",
-            "import App from './App.vue'",
-            '',
-            "createApp(App).mount('#app')",
-          ].join('\n')
-        );
         await sandbox.write('src/vue-shim.d.ts', 'declare module "*.vue";');
       }
 

diff --git a/test/e2e/fixtures/environment/typescript-vue.fixture b/test/e2e/fixtures/environment/typescript-vue.fixture
@@ -40,8 +40,7 @@
     "importsNotUsedAsValues": "preserve"
   },
   "include": [
-    "src/**/*.ts",
-    "src/**/*.vue"
+    "src",
   ],
   "exclude": [
     "node_modules"
@@ -62,7 +61,7 @@ try {
 }
 
 module.exports = {
-  entry: './src/index.ts',
+  entry: './src/App.vue',
   output: {
     filename: 'index.js',
     path: path.resolve(__dirname, 'dist'),

diff --git a/test/e2e/fixtures/implementation/typescript-vue.fixture b/test/e2e/fixtures/implementation/typescript-vue.fixture
@@ -1,11 +1,3 @@
-/// src/index.ts
-import Vue from 'vue'
-import App from './App.vue'
-
-new Vue({
-  render: h => h(App)
-}).$mount('#app')
-
 /// src/App.vue
 <template>
   <logged-in v-if="user" :user="user" @logout="logout"></logged-in>