fix(typescript): revert #1653 (#1880)

revert(typescript): reverts #1653

This reverts commit 40a38b1
This commit caused certain files to no longer be included in the project.

Author: lukastaegert

packages/typescript/src/index.ts

@@ -2,7 +2,7 @@ import * as path from 'path';
 
 import { createFilter } from '@rollup/pluginutils';
 
-import type { Plugin, PluginContext, SourceDescription } from 'rollup';
+import type { Plugin, SourceDescription } from 'rollup';
 import type { Watch } from 'typescript';
 
 import type { RollupTypescriptOptions } from '../types';
@@ -37,31 +37,6 @@ export default function typescript(options: RollupTypescriptOptions = {}): Plugi
     tslib,
     typescript: ts
   } = getPluginOptions(options);
-  const createProgram = (context: PluginContext) =>
-    createWatchProgram(ts, context, {
-      formatHost,
-      resolveModule,
-      parsedOptions,
-      writeFile(fileName, data, _writeByteOrderMark, _onError, sourceFiles) {
-        if (sourceFiles) {
-          for (const sourceFile of sourceFiles) {
-            if (!parsedOptions.fileNames.includes(sourceFile.fileName)) {
-              parsedOptions.fileNames.push(sourceFile.fileName);
-            }
-          }
-        }
-
-        if (parsedOptions.options.composite || parsedOptions.options.incremental) {
-          tsCache.cacheCode(fileName, data);
-        }
-        emittedFiles.set(fileName, data);
-      },
-      status(diagnostic) {
-        watchProgramHelper.handleStatus(diagnostic);
-      },
-      transformers
-    });
-
   const tsCache = new TSCache(cacheDir);
   const emittedFiles = new Map<string, string>();
   const watchProgramHelper = new WatchProgramHelper();
@@ -81,14 +56,6 @@ export default function typescript(options: RollupTypescriptOptions = {}): Plugi
     name: 'typescript',
 
     buildStart(rollupOptions) {
-      if (typeof rollupOptions.input === 'string') {
-        rollupOptions.input = [rollupOptions.input];
-      }
-
-      if (Array.isArray(rollupOptions.input)) {
-        parsedOptions.fileNames = rollupOptions.input.map((fileName) => path.resolve(fileName));
-      }
-
       emitParsedOptionsErrors(ts, this, parsedOptions);
 
       preflight({
@@ -107,7 +74,21 @@ export default function typescript(options: RollupTypescriptOptions = {}): Plugi
         program = null;
       }
       if (!program) {
-        program = createProgram(this);
+        program = createWatchProgram(ts, this, {
+          formatHost,
+          resolveModule,
+          parsedOptions,
+          writeFile(fileName, data) {
+            if (parsedOptions.options.composite || parsedOptions.options.incremental) {
+              tsCache.cacheCode(fileName, data);
+            }
+            emittedFiles.set(fileName, data);
+          },
+          status(diagnostic) {
+            watchProgramHelper.handleStatus(diagnostic);
+          },
+          transformers
+        });
       }
     },
 
@@ -158,6 +139,7 @@ export default function typescript(options: RollupTypescriptOptions = {}): Plugi
 
       if (resolved) {
         if (/\.d\.[cm]?ts/.test(resolved.extension)) return null;
+        if (!filter(resolved.resolvedFileName)) return null;
         return path.normalize(resolved.resolvedFileName);
       }
 
@@ -167,20 +149,16 @@ export default function typescript(options: RollupTypescriptOptions = {}): Plugi
     async load(id) {
       if (!filter(id)) return null;
 
-      const resolvedId = path.resolve(id);
-
-      this.addWatchFile(resolvedId);
+      this.addWatchFile(id);
       await watchProgramHelper.wait();
 
-      const fileName = normalizePath(resolvedId);
+      const fileName = normalizePath(id);
       if (!parsedOptions.fileNames.includes(fileName)) {
         // Discovered new file that was not known when originally parsing the TypeScript config
-        parsedOptions.fileNames.push(path.resolve(fileName));
-
-        createProgram(this).close();
+        parsedOptions.fileNames.push(fileName);
       }
 
-      const output = findTypescriptOutput(ts, parsedOptions, resolvedId, emittedFiles, tsCache);
+      const output = findTypescriptOutput(ts, parsedOptions, id, emittedFiles, tsCache);
 
       return output.code != null ? (output as SourceDescription) : null;
     },

packages/typescript/test/fixtures/included-declarations/declarations.d.ts

@@ -0,0 +1,3 @@
+declare module 'declared-module' {
+  export function declaredFunction(): void;
+}

packages/typescript/test/fixtures/included-declarations/main.ts

@@ -0,0 +1,3 @@
+import { declaredFunction } from 'declared-module';
+
+declaredFunction();

packages/typescript/test/fixtures/included-declarations/tsconfig.json

@@ -0,0 +1,3 @@
+{
+  "include": ["main.ts", "declarations.d.ts"],
+}

packages/typescript/test/fixtures/with-invalid-sources-inside-cwd/invalid.ts

@@ -1154,8 +1154,7 @@ test.serial('does it support tsconfig.rootDir for filtering', async (t) => {
   t.is(files.length, 1);
 });
 
-// todo: why would want to deliberately forbid resolution from outside of CWD? What problem does it solve to add such a constraint?
-test.skip('does it fail for filtering with incorrect rootDir in nested projects', async (t) => {
+test.serial('does it fail for filtering with incorrect rootDir in nested projects', async (t) => {
   process.chdir('fixtures/root-dir/packages/test-2');
   const error = await t.throwsAsync(
     rollup({
@@ -1615,17 +1614,18 @@ test.serial('compiled external library', async (t) => {
   t.pass();
 });
 
-test.serial(
-  'do not consider files that are not part of the entry point dependency graph',
-  async (t) => {
-    process.chdir('fixtures/with-invalid-sources-inside-cwd');
-    const input = 'main.ts';
-
-    const build = await rollup({
-      input,
-      plugins: [typescript()]
-    });
+test.serial('observes included declarations', async (t) => {
+  const warnings = [];
+  const bundle = await rollup({
+    input: 'fixtures/included-declarations/main.ts',
+    external: ['declared-module'],
+    plugins: [typescript({ tsconfig: 'fixtures/included-declarations/tsconfig.json' })],
+    onwarn(warning) {
+      warnings.push(warning);
+    }
+  });
+  t.deepEqual(warnings, []);
 
-    t.deepEqual(build.watchFiles, [path.resolve('main.ts'), path.resolve('valid.ts')]);
-  }
-);
+  const files = await getCode(bundle, { format: 'es' }, true);
+  t.is(files.length, 1);
+});

packages/typescript/test/fixtures/with-invalid-sources-inside-cwd/main.ts

@@ -1,5 +1,4 @@
 import { platform } from 'os';
-import { resolve } from 'path';
 
 import test from 'ava';
 import type { RollupError } from 'rollup';
@@ -63,15 +62,13 @@ test.serial('fails on bad tslib path', async (t) => {
     return;
   }
 
-  t.deepEqual(
-    error.message,
-    `Could not load fixtures/joker/tslib.js (imported by fixtures/overriding-tslib/main.ts): ENOENT: no such file or directory, open 'fixtures/joker/tslib.js'`
-  );
-  t.deepEqual(error.watchFiles, [
-    resolve('fixtures/overriding-tslib/main.ts'),
-    'fixtures/joker/tslib.js'
-  ]);
-  t.deepEqual(error.code, 'ENOENT');
+  if (error.watchFiles) {
+    let [filePath] = error.watchFiles;
+    filePath = filePath.substring(filePath.indexOf('packages'));
+    error.watchFiles[0] = filePath;
+  }
+
+  t.snapshot(error);
 });
 
 test.serial('fails without tslib installed', async (t) => {