Fix some type issues

rollup · Apr 25, 2023 · 6edc9eb · 6edc9eb
1 parent fda79bc
commit 6edc9eb
Show file tree

Hide file tree

Showing 48 changed files with 91 additions and 32 deletions.
diff --git a/src/rollup/types.d.ts b/src/rollup/types.d.ts
@@ -519,7 +519,7 @@ export type InputPluginOption = MaybePromise<Plugin | NullValue | false | InputP
 
 export interface InputOptions {
 	acorn?: Record<string, unknown>;
-	acornInjectPlugins?: (() => unknown)[] | (() => unknown);
+	acornInjectPlugins?: ((...arguments_: any[]) => unknown)[] | ((...arguments_: any[]) => unknown);
 	cache?: boolean | RollupCache;
 	context?: string;
 	experimentalCacheExpiry?: number;

diff --git a/test/browser/index.js b/test/browser/index.js
@@ -10,7 +10,6 @@ const fixturify = require('fixturify');
 /**
  * @type {import('../../src/rollup/types')} Rollup
  */
-// @ts-expect-error cast to Rollup
 const { rollup } = require('../../browser/dist/rollup.browser.js');
 const { assertFilesAreEqual, runTestSuiteWithSamples, compareError } = require('../utils.js');
 
@@ -68,6 +67,7 @@ runTestSuiteWithSamples('browser', resolve(__dirname, 'samples'), (directory, co
 });
 
 function assertOutputMatches(output, directory) {
+	/** @type any */
 	const actual = {};
 	for (const file of output) {
 		const filePath = file.fileName.split('/');

diff --git a/test/browser/samples/missing-load/_config.js b/test/browser/samples/missing-load/_config.js
@@ -2,6 +2,7 @@ module.exports = defineTest({
 	description: 'fails if a file cannot be loaded',
 	options: {
 		plugins: {
+			name: 'test',
 			resolveId(source) {
 				return source;
 			}

diff --git a/test/form/samples/absolute-path-resolver/_config.js b/test/form/samples/absolute-path-resolver/_config.js
@@ -5,6 +5,7 @@ module.exports = defineTest({
 	options: {
 		plugins: [
 			{
+				name: 'test',
 				transform(code, id) {
 					if (/main/.test(id)) {
 						return code.replace('"./a.js"', JSON.stringify(path.resolve(__dirname, 'a.js')));

diff --git a/test/form/samples/addon-functions/_config.js b/test/form/samples/addon-functions/_config.js
@@ -1,5 +1,4 @@
 const assert = require('node:assert');
-// @ts-expect-error export outside root
 const { replaceDirectoryInStringifiedObject } = require('../../../utils');
 const assertChunkData = chunk =>
 	assert.strictEqual(

diff --git a/test/form/samples/banner-and-footer/_config.js b/test/form/samples/banner-and-footer/_config.js
@@ -7,18 +7,21 @@ module.exports = defineTest({
 		},
 		plugins: [
 			{
+				name: 'first',
 				banner: '/* first banner */',
 				footer() {
 					return '/* first footer */';
 				}
 			},
 			{
+				name: 'second',
 				banner() {
 					return '/* second banner */';
 				},
 				footer: '/* second footer */'
 			},
 			{
+				name: 'third',
 				banner() {
 					return Promise.resolve('/* 3rd banner */');
 				},

diff --git a/test/form/samples/configure-file-url/_config.js b/test/form/samples/configure-file-url/_config.js
@@ -3,6 +3,7 @@ module.exports = defineTest({
 	options: {
 		plugins: [
 			{
+				name: 'first',
 				resolveId(id) {
 					if (id.endsWith('solved')) {
 						return id;
@@ -32,6 +33,7 @@ module.exports = defineTest({
 				}
 			},
 			{
+				name: 'second',
 				resolveFileUrl({ moduleId }) {
 					if (moduleId === 'resolved') {
 						return `'resolved'`;

diff --git a/test/form/samples/custom-dynamic-import-no-interop/_config.js b/test/form/samples/custom-dynamic-import-no-interop/_config.js
@@ -6,6 +6,7 @@ module.exports = defineTest({
 			interop: 'auto'
 		},
 		plugins: {
+			name: 'test',
 			renderDynamicImport() {
 				return { left: 'getIt(', right: ')' };
 			}

diff --git a/test/form/samples/dynamic-import-unresolvable/_config.js b/test/form/samples/dynamic-import-unresolvable/_config.js
@@ -5,12 +5,15 @@ module.exports = defineTest({
 	options: {
 		plugins: [
 			{
+				name: 'test',
 				resolveDynamicImport(specifier) {
 					if (specifier === './seven.js') {
 						return false;
 					}
 					assert.ok(specifier);
-					assert.strictEqual(typeof specifier, 'object');
+					if (typeof specifier !== 'object') {
+						throw new TypeError(`Unexpected specifier type ${typeof specifier}.`);
+					}
 					if (specifier.type === 'Literal') {
 						return "'./seven.js'";
 					}

diff --git a/test/form/samples/emit-asset-file/_config.js b/test/form/samples/emit-asset-file/_config.js
@@ -6,6 +6,7 @@ module.exports = defineTest({
 	description: 'supports emitting assets from plugin hooks',
 	options: {
 		plugins: {
+			name: 'test',
 			resolveId(id, importee) {
 				if (id.endsWith('.svg')) {
 					return path.resolve(path.dirname(importee), id);
@@ -26,9 +27,13 @@ module.exports = defineTest({
 				assert.strictEqual(keys[0], 'assets/logo-a2a2cdc4.svg');
 				const asset = outputBundle[keys[0]];
 				assert.strictEqual(asset.fileName, 'assets/logo-a2a2cdc4.svg');
-				assert.strictEqual(asset.type, 'asset');
+				if (asset.type !== 'asset') {
+					throw new Error(`Unexpected asset type ${asset.type}.`);
+				}
+				/** @type {any} */
+				const source = asset.source;
 				assert.ok(
-					asset.source.equals(readFileSync(path.resolve(__dirname, 'logo.svg'))),
+					source.equals(readFileSync(path.resolve(__dirname, 'logo.svg'))),
 					'asset has correct source'
 				);
 				assert.ok(keys[1].endsWith('.js'), `${keys[1]} ends with ".js"`);

diff --git a/test/form/samples/emit-file-tree-shaken-access/_config.js b/test/form/samples/emit-file-tree-shaken-access/_config.js
@@ -5,6 +5,7 @@ module.exports = defineTest({
 	description: 'does not include format globals when tree-shaking an asset access',
 	options: {
 		plugins: {
+			name: 'test',
 			resolveId(id, importee) {
 				if (id.endsWith('.svg')) {
 					return path.resolve(path.dirname(importee), id);

diff --git a/test/form/samples/emit-uint8array-no-buffer/_config.js b/test/form/samples/emit-uint8array-no-buffer/_config.js
@@ -10,6 +10,7 @@ module.exports = defineTest({
 	},
 	options: {
 		plugins: {
+			name: 'test',
 			resolveId(id) {
 				if (id.startsWith('asset')) {
 					return id;

diff --git a/test/form/samples/generated-code-compact/const-bindings-false/_config.js b/test/form/samples/generated-code-compact/const-bindings-false/_config.js
@@ -14,6 +14,7 @@ module.exports = defineTest({
 		},
 		plugins: [
 			{
+				name: 'test',
 				transform(code, id) {
 					if (id.endsWith('synthetic.js')) {
 						return { syntheticNamedExports: true };

diff --git a/test/form/samples/generated-code-compact/const-bindings-true/_config.js b/test/form/samples/generated-code-compact/const-bindings-true/_config.js
@@ -14,6 +14,7 @@ module.exports = defineTest({
 		},
 		plugins: [
 			{
+				name: 'test',
 				transform(code, id) {
 					if (id.endsWith('synthetic.js')) {
 						return { syntheticNamedExports: true };

diff --git a/test/form/samples/generated-code-compact/reserved-names-as-props-false/_config.js b/test/form/samples/generated-code-compact/reserved-names-as-props-false/_config.js
@@ -14,6 +14,7 @@ module.exports = defineTest({
 		},
 		plugins: [
 			{
+				name: 'test',
 				transform() {
 					return { syntheticNamedExports: true };
 				}

diff --git a/test/form/samples/generated-code-compact/reserved-names-as-props-true/_config.js b/test/form/samples/generated-code-compact/reserved-names-as-props-true/_config.js
@@ -14,6 +14,7 @@ module.exports = defineTest({
 		},
 		plugins: [
 			{
+				name: 'test',
 				transform() {
 					return { syntheticNamedExports: true };
 				}

diff --git a/test/form/samples/generated-code-presets/es2015/_config.js b/test/form/samples/generated-code-presets/es2015/_config.js
@@ -11,6 +11,7 @@ module.exports = defineTest({
 		},
 		plugins: [
 			{
+				name: 'test',
 				renderStart(options) {
 					assert.strictEqual(options.generatedCode.arrowFunctions, true);
 					assert.strictEqual(options.generatedCode.objectShorthand, true);

diff --git a/test/form/samples/generated-code-presets/es5/_config.js b/test/form/samples/generated-code-presets/es5/_config.js
@@ -11,6 +11,7 @@ module.exports = defineTest({
 		},
 		plugins: [
 			{
+				name: 'test',
 				renderStart(options) {
 					assert.strictEqual(options.generatedCode.arrowFunctions, false);
 					assert.strictEqual(options.generatedCode.objectShorthand, false);

diff --git a/test/form/samples/generated-code-presets/preset-with-override/_config.js b/test/form/samples/generated-code-presets/preset-with-override/_config.js
@@ -14,6 +14,7 @@ module.exports = defineTest({
 		},
 		plugins: [
 			{
+				name: 'test',
 				renderStart(options) {
 					assert.strictEqual(options.generatedCode.arrowFunctions, false);
 					assert.strictEqual(options.generatedCode.objectShorthand, true);

diff --git a/test/form/samples/generated-code/const-bindings-false/_config.js b/test/form/samples/generated-code/const-bindings-false/_config.js
@@ -13,6 +13,7 @@ module.exports = defineTest({
 		},
 		plugins: [
 			{
+				name: 'test',
 				transform(code, id) {
 					if (id.endsWith('synthetic.js')) {
 						return { syntheticNamedExports: true };

diff --git a/test/form/samples/generated-code/const-bindings-true/_config.js b/test/form/samples/generated-code/const-bindings-true/_config.js
@@ -13,6 +13,7 @@ module.exports = defineTest({
 		},
 		plugins: [
 			{
+				name: 'test',
 				transform(code, id) {
 					if (id.endsWith('synthetic.js')) {
 						return { syntheticNamedExports: true };

diff --git a/test/form/samples/generated-code/reserved-names-as-props-false/_config.js b/test/form/samples/generated-code/reserved-names-as-props-false/_config.js
@@ -13,6 +13,7 @@ module.exports = defineTest({
 		},
 		plugins: [
 			{
+				name: 'test',
 				transform() {
 					return { syntheticNamedExports: true };
 				}

diff --git a/test/form/samples/generated-code/reserved-names-as-props-true/_config.js b/test/form/samples/generated-code/reserved-names-as-props-true/_config.js
@@ -13,6 +13,7 @@ module.exports = defineTest({
 		},
 		plugins: [
 			{
+				name: 'test',
 				transform() {
 					return { syntheticNamedExports: true };
 				}

diff --git a/test/form/samples/import-assertions/assertion-shapes/_config.js b/test/form/samples/import-assertions/assertion-shapes/_config.js
@@ -1,6 +1,5 @@
 module.exports = defineTest({
 	description: 'handles special shapes of assertions',
-	expectedWarnings: 'UNRESOLVED_IMPORT',
 	options: {
 		external: () => true
 	}

diff --git a/test/form/samples/import-assertions/keep-dynamic-assertions/_config.js b/test/form/samples/import-assertions/keep-dynamic-assertions/_config.js
@@ -8,6 +8,7 @@ module.exports = defineTest({
 		},
 		plugins: [
 			{
+				name: 'test',
 				resolveDynamicImport(specifier) {
 					if (typeof specifier === 'object') {
 						if (specifier.type === 'TemplateLiteral') {

diff --git a/test/form/samples/import-assertions/plugin-assertions-resolvedynamicimport/_config.js b/test/form/samples/import-assertions/plugin-assertions-resolvedynamicimport/_config.js
@@ -3,6 +3,7 @@ module.exports = defineTest({
 	options: {
 		plugins: [
 			{
+				name: 'test',
 				resolveDynamicImport(specifier, importer, { assertions }) {
 					const resolutionOptions = {
 						external: true,

diff --git a/test/form/samples/import-assertions/plugin-assertions-resolveid/_config.js b/test/form/samples/import-assertions/plugin-assertions-resolveid/_config.js
@@ -4,6 +4,7 @@ module.exports = defineTest({
 		output: { name: 'bundle' },
 		plugins: [
 			{
+				name: 'test',
 				resolveId(source, importer, { assertions, isEntry }) {
 					return {
 						id: source,

diff --git a/test/form/samples/import-assertions/removes-dynamic-assertions/_config.js b/test/form/samples/import-assertions/removes-dynamic-assertions/_config.js
@@ -8,6 +8,7 @@ module.exports = defineTest({
 		},
 		plugins: [
 			{
+				name: 'test',
 				resolveDynamicImport(specifier) {
 					if (typeof specifier === 'object') {
 						if (specifier.type === 'TemplateLiteral') {

diff --git a/test/form/samples/interop-per-dependency-no-freeze/_config.js b/test/form/samples/interop-per-dependency-no-freeze/_config.js
@@ -4,6 +4,7 @@ module.exports = defineTest({
 		external: id => id.startsWith('external'),
 		output: {
 			freeze: false,
+			/** @type any */
 			interop(id) {
 				return id.split('-')[1];
 			},

diff --git a/test/form/samples/interop-per-dependency-no-live-binding/_config.js b/test/form/samples/interop-per-dependency-no-live-binding/_config.js
@@ -6,6 +6,7 @@ module.exports = defineTest({
 		external: id => id.startsWith('external'),
 		output: {
 			externalLiveBindings: false,
+			/** @type any */
 			interop(id) {
 				if (checkedIds.has(id)) {
 					throw new Error(`Interop for id ${id} has been requested twice.`);

diff --git a/test/form/samples/interop-per-dependency/_config.js b/test/form/samples/interop-per-dependency/_config.js
@@ -3,6 +3,7 @@ module.exports = defineTest({
 	options: {
 		external: id => id.startsWith('external'),
 		output: {
+			/** @type any*/
 			interop(id) {
 				if (id === null) {
 					return 'auto';

diff --git a/test/form/samples/interop-per-reexported-dependency/_config.js b/test/form/samples/interop-per-reexported-dependency/_config.js
@@ -3,6 +3,7 @@ module.exports = defineTest({
 	options: {
 		external: id => id.startsWith('external'),
 		output: {
+			/** @type any */
 			interop(id) {
 				return id.split('-')[1];
 			},

diff --git a/test/form/samples/intro-and-outro/_config.js b/test/form/samples/intro-and-outro/_config.js
@@ -10,6 +10,7 @@ module.exports = defineTest({
 		external: ['external'],
 		plugins: [
 			{
+				name: 'first',
 				intro() {
 					return '// intro 1';
 				},
@@ -18,6 +19,7 @@ module.exports = defineTest({
 				}
 			},
 			{
+				name: 'second',
 				intro() {
 					return '// intro 2';
 				},
@@ -26,6 +28,7 @@ module.exports = defineTest({
 				}
 			},
 			{
+				name: 'third',
 				intro() {
 					return Promise.resolve('// intro 3');
 				},
@@ -34,6 +37,7 @@ module.exports = defineTest({
 				}
 			},
 			{
+				name: 'fourth',
 				intro: '// intro 4',
 				outro: '// outro 4'
 			}

diff --git a/test/form/samples/make-absolute-externals-relative/make-relative-false/_config.js b/test/form/samples/make-absolute-externals-relative/make-relative-false/_config.js
@@ -19,6 +19,7 @@ module.exports = defineTest({
 				return true;
 		},
 		plugins: {
+			name: 'test',
 			async buildStart() {
 				// eslint-disable-next-line unicorn/consistent-function-scoping
 				const testExternal = async (source, expected) =>

diff --git a/test/form/samples/make-absolute-externals-relative/make-relative-relative/_config.js b/test/form/samples/make-absolute-externals-relative/make-relative-relative/_config.js
@@ -22,6 +22,7 @@ module.exports = defineTest({
 				return true;
 		},
 		plugins: {
+			name: 'test',
 			async buildStart() {
 				// eslint-disable-next-line unicorn/consistent-function-scoping
 				const testExternal = async (source, expected) =>

diff --git a/test/form/samples/make-absolute-externals-relative/make-relative-true/_config.js b/test/form/samples/make-absolute-externals-relative/make-relative-true/_config.js
@@ -21,6 +21,7 @@ module.exports = defineTest({
 				return true;
 		},
 		plugins: {
+			name: 'test',
 			async buildStart() {
 				// eslint-disable-next-line unicorn/consistent-function-scoping
 				const testExternal = async (source, expected) =>

diff --git a/test/form/samples/merge-namespaces/_config.js b/test/form/samples/merge-namespaces/_config.js
@@ -4,6 +4,7 @@ module.exports = defineTest({
 		external: ['external1', 'external2'],
 		plugins: [
 			{
+				name: 'test',
 				transform() {
 					return { syntheticNamedExports: '__synthetic' };
 				}

diff --git a/test/form/samples/supports-es6-shim/_config.js b/test/form/samples/supports-es6-shim/_config.js
@@ -10,7 +10,7 @@ module.exports = defineTest({
 		treeshake: true,
 		plugins: [
 			require('@rollup/plugin-node-resolve').default(),
-			require('@rollup/plugin-commonjs')()
+			require('@rollup/plugin-commonjs').default()
 		]
 	}
 });
diff --git a/test/form/samples/synthetic-named-exports/_config.js b/test/form/samples/synthetic-named-exports/_config.js
@@ -3,6 +3,7 @@ module.exports = defineTest({
 	options: {
 		plugins: [
 			{
+				name: 'test',
 				resolveId(id) {
 					if (id.endsWith('dep1.js')) {
 						return id;

diff --git a/test/form/samples/system-reexports/_config.js b/test/form/samples/system-reexports/_config.js
@@ -1,7 +1,7 @@
 module.exports = defineTest({
 	description: 'merges reexports in systemjs',
 	options: {
-		external: true,
+		external: () => true,
 		output: { format: 'system' }
 	}
 });