test typings and fix type problems in loaders in the test suite

test/cases/compile/error-hide-stack/loader.js

@@ -1,6 +1,8 @@
-module.exports = function() {
+/** @type {import("../../../../").LoaderDefinition} */
+module.exports = function () {
 	var err = new Error("Message");
 	err.stack = "Stack";
+	//@ts-expect-error hideStack is not a property on normal errors
 	err.hideStack = true;
 	throw err;
 };

test/cases/errors/load-module-cycle/loader.js

@@ -1,4 +1,5 @@
-exports.default = function(source) {
+/** @type {import("../../../../").LoaderDefinitionFunction} */
+exports.default = function (source) {
 	const ref = JSON.parse(source);
 	const callback = this.async();
 	this.loadModule("../loader!" + ref, (err, source, sourceMap, module) => {

test/cases/errors/load-module-error/loader.js

@@ -1,4 +1,5 @@
-exports.default = function(source) {
+/** @type {import("../../../../").LoaderDefinitionFunction} */
+exports.default = function (source) {
 	const callback = this.async();
 	const ref = JSON.parse(source);
 	this.loadModule("./error-loader!" + ref, (err, source, sourceMap, module) => {

test/cases/errors/loader-error-warning/error-loader.js

@@ -1,4 +1,6 @@
-module.exports = function(source) {
+/** @type {import("../../../../").LoaderDefinition<string>} */
+module.exports = function (source) {
+	//@ts-expect-error errors must be Errors, string is not recommended and should lead to type error
 	this.emitError(this.query.substr(1));
 	return source;
-}
+};

test/cases/errors/loader-error-warning/warning-loader.js

@@ -1,4 +1,6 @@
-module.exports = function(source) {
+/** @type {import("../../../../").LoaderDefinition<string>} */
+module.exports = function (source) {
+	//@ts-expect-error warnings must be Errors, string is not recommended and should lead to type error
 	this.emitWarning(this.query.substr(1));
 	return source;
-}
+};

test/cases/loaders/async/loaders/asyncloader.js

@@ -1,8 +1,10 @@
-module.exports = function(content) {
+/** @type {import("../../../../../").LoaderDefinition} */
+module.exports = function (content) {
 	var cb = this.async();
-	if(!cb) throw new Error("Loader should allow async mode");
+	if (!cb) throw new Error("Loader should allow async mode");
-	if(cb !== this.callback) throw new Error("result of this.async() should be equal to this.callback");
+	if (cb !== this.callback)
-	process.nextTick(function() {
+		throw new Error("result of this.async() should be equal to this.callback");
+	process.nextTick(function () {
 		cb(null, content);
 	});
-};
+};

test/cases/loaders/async/loaders/syncloader.js

@@ -1,3 +1,4 @@
-module.exports = function(content) {
+/** @type {import("../../../../../").LoaderDefinition} */
+module.exports = function (content) {
 	return content;
-};
+};

test/cases/loaders/emit-file/loader.js

@@ -1,4 +1,5 @@
-module.exports = function(content) {
+/** @type {import("../../../../").LoaderDefinition} */
+module.exports = function (content) {
 	this.emitFile("extra-file.js", content);
 	return "";
-}
+};

test/cases/loaders/issue-10725/loader.js

@@ -2,22 +2,25 @@ const { getRemainingRequest, stringifyRequest } = require("loader-utils");
 
 const loaderPath = require.resolve("./loader");
 
+/** @type {import("../../../../").LoaderDefinition} */
 module.exports = function () {
 	if (this.query === "?load") {
 		return `
 import { answer } from "./lib";
 
 export default answer;
-`
+`;
 	}
 
 	const matchResource = `${this.resourcePath}.js`;
 	const loader = `${loaderPath}?load`;
 	const remaining = getRemainingRequest(this);
-	const request = JSON.parse(stringifyRequest(this, `${matchResource}!=!${loader}!${remaining}`));
+	const request = JSON.parse(
+		stringifyRequest(this, `${matchResource}!=!${loader}!${remaining}`)
+	);
 
 	this.async();
 	this.loadModule(request, (err, source) => {
-		this.callback(err, source)
+		this.callback(err, source);
 	});
 };

test/cases/loaders/module-description-file/reverseloader.js

@@ -1,3 +1,4 @@
-module.exports = function(content) {
+/** @type {import("../../../../").LoaderDefinition} */
+module.exports = function (content) {
 	return content.split("").reverse().join("");
-}
+};

test/cases/loaders/query/loaders/queryloader.js

@@ -1,7 +1,11 @@
-module.exports = function(content) {
+/** @type {import("../../../../../").LoaderDefinition} */
-	return "module.exports = " + JSON.stringify({
+module.exports = function (content) {
-		resourceQuery: this.resourceQuery,
+	return (
-		query: this.query,
+		"module.exports = " +
-		prev: content
+		JSON.stringify({
-	});
+			resourceQuery: this.resourceQuery,
-}
+			query: this.query,
+			prev: content
+		})
+	);
+};

test/cases/loaders/resolve/loader.js

@@ -1,5 +1,6 @@
 const path = require("path");
-module.exports = function() {
+/** @type {import("../../../../").LoaderDefinition} */
+module.exports = function () {
 	const resolve1 = this.getResolve();
 	const resolve2 = this.getResolve({
 		extensions: [".xyz", ".js"]

test/cases/loaders/utils/loader.js

@@ -1,3 +1,4 @@
+/** @type {import("../../../../").LoaderDefinition} */
 module.exports = function () {
 	return `module.exports = {
 	request1: ${JSON.stringify(

test/cases/parsing/context/loaders/queryloader.js

@@ -1,7 +1,11 @@
-module.exports = function(content) {
+/** @type {import("../../../../../").LoaderDefinition} */
-	return "module.exports = " + JSON.stringify({
+module.exports = function (content) {
-		resourceQuery: this.resourceQuery,
+	return (
-		query: this.query,
+		"module.exports = " +
-		prev: content
+		JSON.stringify({
-	});
+			resourceQuery: this.resourceQuery,
+			query: this.query,
+			prev: content
+		})
+	);
 };

test/cases/parsing/precreated-ast/ast-loader.js

@@ -3,7 +3,8 @@
 const acorn = require("acorn");
 const acornParser = acorn.Parser;
 
-module.exports = function(source) {
+/** @type {import("../../../../").LoaderDefinition} */
+module.exports = function (source) {
 	const comments = [];
 
 	const ast = acornParser.parse(source, {
@@ -15,9 +16,12 @@ module.exports = function(source) {
 	});
 
 	// change something to test if it's really used
+	//@ts-ignore
 	ast.body[0].expression.right.arguments[0].value = "./ok";
-	ast.body[0].expression.right.arguments[0].raw = "\"./ok\"";
+	//@ts-ignore
+	ast.body[0].expression.right.arguments[0].raw = '"./ok"';
 
+	//@ts-ignore
 	ast.comments = comments;
 	this.callback(null, source, null, {
 		webpackAST: ast

test/cases/resolving/context/loaders/queryloader.js

@@ -1,7 +1,11 @@
-module.exports = function(content) {
+/** @type {import("../../../../../").LoaderDefinition} */
-	return "module.exports = " + JSON.stringify({
+module.exports = function (content) {
-		resourceQuery: this.resourceQuery,
+	return (
-		query: this.query,
+		"module.exports = " +
-		prev: content
+		JSON.stringify({
-	});
+			resourceQuery: this.resourceQuery,
-}
+			query: this.query,
+			prev: content
+		})
+	);
+};

test/cases/wasm/two-files-loader/wrapper-loader.js

@@ -1,5 +1,6 @@
 const stringifyRequest = require("loader-utils").stringifyRequest;
 
+/** @type {import("../../../../").PitchLoaderDefinitionFunction} */
 module.exports.pitch = function (remainingRequest) {
 	return `
 	import { getString as _getString, memory } from ${stringifyRequest(

test/cases/wasm/two-files-loader/wrapper-loader2.js

@@ -1,5 +1,6 @@
 const stringifyRequest = require("loader-utils").stringifyRequest;
 
+/** @type {import("../../../../").PitchLoaderDefinitionFunction} */
 module.exports.pitch = function (remainingRequest) {
 	return `
 	import { getString as _getString, memory } from ${stringifyRequest(

test/configCases/cache-dependencies/managed-items/loader.js

@@ -1,4 +1,6 @@
 const path = require("path");
+
+/** @type {import("../../../../").LoaderDefinition} */
 module.exports = function (source) {
 	this.addDependency(path.resolve(__dirname, "node_modules/package/extra.js"));
 	this.addDependency(path.resolve(__dirname, "extra.js"));

test/configCases/context-replacement/d/queryloader.js

@@ -1,7 +1,11 @@
-module.exports = function(content) {
+/** @type {import("../../../../").LoaderDefinition} */
-	return "module.exports = " + JSON.stringify({
+module.exports = function (content) {
-		resourceQuery: this.resourceQuery,
+	return (
-		query: this.query,
+		"module.exports = " +
-		prev: content.replace(/\r\n?/g, "\n")
+		JSON.stringify({
-	});
+			resourceQuery: this.resourceQuery,
+			query: this.query,
+			prev: content.replace(/\r\n?/g, "\n")
+		})
+	);
 };

test/configCases/deprecations/invalid-dependencies/loader.js

@@ -1,3 +1,4 @@
+/** @type {import("../../../../").LoaderDefinition} */
 module.exports = function (source) {
 	this.addDependency("loader.js");
 	this.addDependency("../**/dir/*.js");

test/configCases/dll-plugin/0-create-dll/g-loader.js

@@ -1,3 +1,4 @@
-module.exports = function(source) {
+/** @type {import("../../../../").LoaderDefinition} */
+module.exports = function (source) {
 	return source;
 };

test/configCases/inner-graph/_helpers/entryLoader.js

@@ -1,4 +1,5 @@
-module.exports = function() {
+/** @type {import("../../../../").LoaderDefinition<string>} */
+module.exports = function () {
 	const { name, expect, usedExports } = JSON.parse(this.query.slice(1));
 	return [
 		`if (Math.random() < 0) require(${JSON.stringify(

test/configCases/inner-graph/_helpers/testModuleLoader.js

@@ -1,4 +1,5 @@
-module.exports = function() {
+/** @type {import("../../../../").LoaderDefinition<string>} */
+module.exports = function () {
 	const usedExports = JSON.parse(this.query.slice(1));
 	return [
 		`import { ${usedExports

test/configCases/layer/rules/loader.js

@@ -1,3 +1,4 @@
+/** @type {import("../../../../").LoaderDefinition<{ value: any }>} */
 module.exports = function (source) {
 	const options = this.getOptions();
 	return `${source}

test/configCases/loader-import-module/css/loader.js

@@ -1,3 +1,4 @@
+/** @type {import("../../../../").PitchLoaderDefinitionFunction} */
 exports.pitch = async function (remaining) {
 	const result = await this.importModule(
 		this.resourcePath + ".webpack[javascript/auto]" + "!=!" + remaining,

test/configCases/loaders/generate-ident/loader1.js

@@ -1,3 +1,6 @@
-module.exports.pitch = function(remainingRequest) {
+/** @type {import("../../../../").PitchLoaderDefinitionFunction} */
-	return "module.exports = require(" + JSON.stringify("!!" + remainingRequest) + ");";
+module.exports.pitch = function (remainingRequest) {
+	return (
+		"module.exports = require(" + JSON.stringify("!!" + remainingRequest) + ");"
+	);
 };

test/configCases/loaders/generate-ident/loader2.js

@@ -1,3 +1,6 @@
-module.exports = function(source) {
+/** @type {import("../../../../").LoaderDefinition<{ f(): any }>} */
+module.exports = function (source) {
+	if (typeof this.query === "string")
+		throw new Error("query must be an object");
 	return "module.exports = " + JSON.stringify(this.query.f());
 };

test/configCases/loaders/hot-in-context/loader.js

@@ -1,3 +1,4 @@
-module.exports = function() {
+/** @type {import("../../../../").LoaderDefinition}} */
+module.exports = function () {
 	return `module.exports = ${JSON.stringify(!!this.hot)};`;
-}
+};

test/configCases/loaders/mode-default/loader.js

@@ -1,3 +1,4 @@
-module.exports = function(source) {
+/** @type {import("../../../../").LoaderDefinition} */
+module.exports = function (source) {
 	return `module.exports = "${this.mode}";`;
 };

test/configCases/loaders/mode-development/loader.js

@@ -1,3 +1,4 @@
-module.exports = function(source) {
+/** @type {import("../../../../").LoaderDefinition} */
+module.exports = function (source) {
 	return `module.exports = "${this.mode}";`;
 };

test/configCases/loaders/mode-none/loader.js

@@ -1,3 +1,4 @@
-module.exports = function(source) {
+/** @type {import("../../../../").LoaderDefinition} */
+module.exports = function (source) {
 	return `module.exports = "${this.mode}";`;
 };

test/configCases/loaders/mode-production/loader.js

@@ -1,3 +1,4 @@
-module.exports = function(source) {
+/** @type {import("../../../../").LoaderDefinition} */
+module.exports = function (source) {
 	return `module.exports = "${this.mode}";`;
 };

test/configCases/loaders/options/loader-1.js

@@ -1,6 +1,7 @@
-const schema = require("./loader-1.options");
+const schema = require("./loader-1.options.json");
 
-module.exports = function() {
+/** @type {import("../../../../").LoaderDefinition} */
+module.exports = function () {
 	const options = this.getOptions(schema);
 
 	const json = JSON.stringify(options)

test/configCases/loaders/options/loader-2.js

@@ -1,6 +1,7 @@
-const schema = require("./loader-2.options");
+const schema = require("./loader-2.options.json");
 
-module.exports = function() {
+/** @type {import("../../../../").LoaderDefinition} */
+module.exports = function () {
 	const options = this.getOptions(schema);
 
 	const json = JSON.stringify(options)

test/configCases/loaders/options/loader.js

@@ -1,9 +1,10 @@
-module.exports = function() {
+/** @type {import("../../../../").LoaderDefinition} */
+module.exports = function () {
 	const options = this.getOptions();
 
 	const json = JSON.stringify(options)
-		.replace(/\u2028/g, '\\u2028')
+		.replace(/\u2028/g, "\\u2028")
-		.replace(/\u2029/g, '\\u2029');
+		.replace(/\u2029/g, "\\u2029");
 
 	return `module.exports = ${json}`;
 };

test/configCases/loaders/pre-post-loader/loader1.js

@@ -1,3 +1,4 @@
-module.exports = function(source) {
+/** @type {import("../../../../").LoaderDefinition} */
-	return source + "module.exports += \" loader1\";\n";
+module.exports = function (source) {
+	return source + 'module.exports += " loader1";\n';
 };

test/configCases/loaders/pre-post-loader/loader2.js

@@ -1,3 +1,4 @@
-module.exports = function(source) {
+/** @type {import("../../../../").LoaderDefinition} */
-	return source + "module.exports += \" loader2\";\n";
+module.exports = function (source) {
+	return source + 'module.exports += " loader2";\n';
 };

test/configCases/loaders/pre-post-loader/loader3.js

@@ -1,3 +1,4 @@
-module.exports = function(source) {
+/** @type {import("../../../../").LoaderDefinition} */
-	return source + "module.exports += \" loader3\";\n";
+module.exports = function (source) {
+	return source + 'module.exports += " loader3";\n';
 };

test/configCases/loaders/remaining-request/loader1.js

@@ -1,3 +1,6 @@
-module.exports.pitch = function(remainingRequest) {
+/** @type {import("../../../../").PitchLoaderDefinitionFunction} */
-	return "module.exports = require(" + JSON.stringify("!!" + remainingRequest) + ");";
+module.exports.pitch = function (remainingRequest) {
+	return (
+		"module.exports = require(" + JSON.stringify("!!" + remainingRequest) + ");"
+	);
 };

test/configCases/loaders/remaining-request/loader2.js

@@ -1,3 +1,6 @@
-module.exports = function(source) {
+/** @type {import("../../../../").LoaderDefinition<{ f(): any }>} */
+module.exports = function (source) {
+	if (typeof this.query === "string")
+		throw new Error("query must be an object");
 	return "module.exports = " + JSON.stringify(this.query.f());
 };

test/configCases/module-name/different-issuers-for-same-module/loader-a.js

@@ -1,3 +1,4 @@
-module.exports = function(src) {
+/** @type {import("../../../../").LoaderDefinition} */
+module.exports = function (src) {
 	return `module.exports = "loader-a" + module.id`;
 };

test/configCases/module-name/different-issuers-for-same-module/loader-b.js

@@ -1,3 +1,4 @@
-module.exports = function(src) {
+/** @type {import("../../../../").LoaderDefinition} */
+module.exports = function (src) {
 	return `module.exports = "loader-b" + module.id`;
 };

test/configCases/performance/many-async-imports/reexport.loader.js

@@ -1,7 +1,8 @@
-module.exports = function() {
+/** @type {import("../../../../").LoaderDefinition} */
+module.exports = function () {
 	var str = "export default Promise.all([\n";
-	for(var i = 0; i < 6; i++) {
+	for (var i = 0; i < 6; i++) {
-		for(var j = 0; j < 2; j++) {
+		for (var j = 0; j < 2; j++) {
 			str += `import("./reexport.loader.js!?${i}"),\n`;
 		}
 	}

test/configCases/performance/many-exports/file.loader.js

@@ -1,7 +1,8 @@
-module.exports = function() {
+/** @type {import("../../../../").LoaderDefinition} */
+module.exports = function () {
 	var str = "";
-	for(var i = 0; i < 1000; i++) {
+	for (var i = 0; i < 1000; i++) {
 		str += `export var a${i} = ${i};\n`;
 	}
 	return str;
-}
+};

test/configCases/performance/many-exports/reexport.loader.js

@@ -1,9 +1,10 @@
-module.exports = function() {
+/** @type {import("../../../../").LoaderDefinition} */
-	var str = "import * as i from \"./file.loader.js!\";\n";
+module.exports = function () {
+	var str = 'import * as i from "./file.loader.js!";\n';
 	str += "var sum = 0;\n";
-	for(var i = 0; i < 1000; i++) {
+	for (var i = 0; i < 1000; i++) {
 		str += `sum += i.a${i};\n`;
 	}
 	str += "export default sum;\n";
 	return str;
-}
+};

test/configCases/plugins/loader-options-plugin/loader.js

@@ -1,6 +1,10 @@
-module.exports = function() {
+/** @type {import("../../../../").LoaderDefinition<{}, { minimize: boolean, jsfile: boolean }>} */
-	return "module.exports = " + JSON.stringify({
+module.exports = function () {
-		minimize: this.minimize,
+	return (
-		jsfile: this.jsfile
+		"module.exports = " +
-	});
+		JSON.stringify({
+			minimize: this.minimize,
+			jsfile: this.jsfile
+		})
+	);
 };

test/configCases/race-conditions/load-module/loader.js

@@ -1,4 +1,5 @@
-module.exports = function() {
+/** @type {import("../../../../").LoaderDefinition} */
+module.exports = function () {
 	const callback = this.async();
 	let finished = false;
 	this.loadModule("./module.js", (err, result) => {

test/configCases/rebuild/finishModules/loader.js

@@ -1,3 +1,4 @@
+/** @type {import("../../../../").LoaderDefinition<{}, { shouldReplace: boolean }>} */
 module.exports = function (source) {
 	if (this.shouldReplace) {
 		this._module.buildInfo._isReplaced = true;

test/configCases/rebuild/rebuildWithNewDependencies/loader.js

@@ -1,3 +1,4 @@
+/** @type {import("../../../../").LoaderDefinition<{}, { shouldReplace: boolean }>} */
 module.exports = function (source) {
 	if (this.shouldReplace) {
 		this._module.buildInfo._isReplaced = true;

test/configCases/records/issue-295/loader.js

@@ -1,3 +1,4 @@
-module.exports = function(source) {
+/** @type {import("../../../../").LoaderDefinition} */
+module.exports = function (source) {
 	return source;
 };

test/configCases/resolve-merging/override/loader.js

@@ -1,3 +1,4 @@
+/** @type {import("../../../../").LoaderDefinition} */
 module.exports = async function () {
 	const defaultResolve = this.getResolve({});
 	const overrideResolve = this.getResolve({
@@ -20,6 +21,7 @@ module.exports = async function () {
 	expect(await defaultResolve(undefined, "package2").catch(e => "ok")).toBe(
 		"ok"
 	);
+	// @ts-expect-error undefined should not be a valid type
 	expect(await defaultResolve(undefined).catch(e => "ok")).toBe("ok");
 	return `
 export { default as a } from ${JSON.stringify(resolved1)};

test/configCases/rule-set/chaining/loader.js

@@ -1,8 +1,8 @@
-module.exports = function(source) {
+/** @type {import("../../../../").LoaderDefinition<{ get(): string }>} */
+module.exports = function (source) {
 	var query = this.query;
-	if(typeof query === "object" && typeof query.get === "function") {
+	if (typeof query === "object" && typeof query.get === "function") {
 		query = query.get();
 	}
 	return source + "\nmodule.exports.push(" + JSON.stringify(query) + ");";
 };
-

test/configCases/rule-set/compiler/loader.js

@@ -1,4 +1,4 @@
-module.exports = function(source) {
+/** @type {import("../../../../").LoaderDefinition} */
+module.exports = function (source) {
 	return "module.exports = " + JSON.stringify("loader matched");
 };
-

test/configCases/rule-set/custom/loader.js

@@ -1,8 +1,8 @@
-module.exports = function(source) {
+/** @type {import("../../../../").LoaderDefinition<{ get(): string }>} */
+module.exports = function (source) {
 	var query = this.query;
-	if(typeof query === "object" && typeof query.get === "function") {
+	if (typeof query === "object" && typeof query.get === "function") {
 		query = query.get();
 	}
 	return source + "\nmodule.exports.push(" + JSON.stringify(query) + ");";
 };
-

test/configCases/rule-set/query/loader.js

@@ -1,8 +1,8 @@
-module.exports = function(source) {
+/** @type {import("../../../../").LoaderDefinition<{ get(): string }>} */
+module.exports = function (source) {
 	var query = this.query;
-	if(typeof query === "object" && typeof query.get === "function") {
+	if (typeof query === "object" && typeof query.get === "function") {
 		query = query.get();
 	}
 	return source + "\nmodule.exports.push(" + JSON.stringify(query) + ");";
 };
-

test/configCases/rule-set/simple-use-array-fn/loader.js

@@ -1,8 +1,8 @@
-module.exports = function(source) {
+/** @type {import("../../../../").LoaderDefinition<{ get(): string }>} */
+module.exports = function (source) {
 	var query = this.query;
-	if(typeof query === "object" && typeof query.get === "function") {
+	if (typeof query === "object" && typeof query.get === "function") {
 		query = query.get();
 	}
 	return source + "\nmodule.exports.push(" + JSON.stringify(query) + ");";
 };
-

test/configCases/rule-set/simple-use-fn-array/loader.js

@@ -1,8 +1,8 @@
-module.exports = function(source) {
+/** @type {import("../../../../").LoaderDefinition<{ get(): string }>} */
+module.exports = function (source) {
 	var query = this.query;
-	if(typeof query === "object" && typeof query.get === "function") {
+	if (typeof query === "object" && typeof query.get === "function") {
 		query = query.get();
 	}
 	return source + "\nmodule.exports.push(" + JSON.stringify(query) + ");";
 };
-

test/configCases/rule-set/simple/loader.js

@@ -1,8 +1,8 @@
-module.exports = function(source) {
+/** @type {import("../../../../").LoaderDefinition<{ get(): string }>} */
+module.exports = function (source) {
 	var query = this.query;
-	if(typeof query === "object" && typeof query.get === "function") {
+	if (typeof query === "object" && typeof query.get === "function") {
 		query = query.get();
 	}
 	return source + "\nmodule.exports.push(" + JSON.stringify(query) + ");";
 };
-

test/configCases/source-map/no-source-map/loader.js

@@ -1,4 +1,5 @@
 const path = require("path");
+/** @type {import("../../../../").LoaderDefinition} */
 module.exports = function () {
 	this.callback(null, "module.exports = 'ok';", {
 		version: 3,
@@ -6,6 +7,7 @@ module.exports = function () {
 		sourceRoot: path.join(__dirname, "folder"),
 		sources: ["test1.txt"],
 		sourcesContent: ["Test"],
+		names: [],
 		mappings: "AAAA"
 	});
 };

test/configCases/source-map/relative-source-maps-by-loader/loader-no-source-root.js

@@ -1,10 +1,12 @@
 const path = require("path");
-module.exports = function() {
+/** @type {import("../../../../").LoaderDefinition} */
+module.exports = function () {
 	this.callback(null, "module.exports = 'ok';", {
 		version: 3,
 		file: "/should/be/removed",
 		sources: [path.join(__dirname, "folder", "test5.txt")],
 		sourcesContent: ["Test"],
+		names: [],
 		mappings: "AAAA"
 	});
 };

test/configCases/source-map/relative-source-maps-by-loader/loader-pre-relative.js

@@ -1,9 +1,11 @@
-module.exports = function() {
+/** @type {import("../../../../").LoaderDefinition} */
+module.exports = function () {
 	this.callback(null, "module.exports = 'ok';", {
 		version: 3,
 		file: "/should/be/removed",
 		sources: ["webpack://./folder/test6.txt"],
 		sourcesContent: ["Test"],
+		names: [],
 		mappings: "AAAA"
 	});
 };

test/configCases/source-map/relative-source-maps-by-loader/loader-source-root-2-slash.js

@@ -1,11 +1,13 @@
 const path = require("path");
-module.exports = function() {
+/** @type {import("../../../../").LoaderDefinition} */
+module.exports = function () {
 	this.callback(null, "module.exports = 'ok';", {
 		version: 3,
 		file: "/should/be/removed",
 		sourceRoot: path.join(__dirname, "folder") + "/",
 		sources: ["/test4.txt"],
 		sourcesContent: ["Test"],
+		names: [],
 		mappings: "AAAA"
 	});
 };

test/configCases/source-map/relative-source-maps-by-loader/loader-source-root-slash.js

@@ -1,11 +1,13 @@
 const path = require("path");
-module.exports = function() {
+/** @type {import("../../../../").LoaderDefinition} */
+module.exports = function () {
 	this.callback(null, "module.exports = 'ok';", {
 		version: 3,
 		file: "/should/be/removed",
 		sourceRoot: path.join(__dirname, "folder") + "/",
 		sources: ["test3.txt"],
 		sourcesContent: ["Test"],
+		names: [],
 		mappings: "AAAA"
 	});
 };

test/configCases/source-map/relative-source-maps-by-loader/loader-source-root-source-slash.js

@@ -1,11 +1,13 @@
 const path = require("path");
-module.exports = function() {
+/** @type {import("../../../../").LoaderDefinition} */
+module.exports = function () {
 	this.callback(null, "module.exports = 'ok';", {
 		version: 3,
 		file: "/should/be/removed",
 		sourceRoot: path.join(__dirname, "folder"),
 		sources: ["/test2.txt"],
 		sourcesContent: ["Test"],
+		names: [],
 		mappings: "AAAA"
 	});
 };

test/configCases/source-map/relative-source-maps-by-loader/loader-source-root.js

@@ -1,11 +1,13 @@
 const path = require("path");
-module.exports = function() {
+/** @type {import("../../../../").LoaderDefinition} */
+module.exports = function () {
 	this.callback(null, "module.exports = 'ok';", {
 		version: 3,
 		file: "/should/be/removed",
 		sourceRoot: path.join(__dirname, "folder"),
 		sources: ["test1.txt"],
 		sourcesContent: ["Test"],
+		names: [],
 		mappings: "AAAA"
 	});
 };

test/fixtures/count-loader.js

@@ -1,5 +1,6 @@
 let counter = 0;
 
-module.exports = function() {
+/** @type {import("../../../../").LoaderDefinition} */
+module.exports = function () {
 	return `module.exports = ${counter++};`;
 };

test/fixtures/delay-loader.js

@@ -1,6 +1,7 @@
-module.exports = function(source) {
+/** @type {import("../../../../").LoaderDefinition} */
+module.exports = function (source) {
 	var cb = this.async();
-	setTimeout(function() {
+	setTimeout(function () {
 		cb(null, source);
 	}, 500);
-};
+};

test/fixtures/errors/add-comment-loader.js

@@ -1,3 +1,4 @@
-module.exports = function(source) {
+/** @type {import("../../../../").LoaderDefinition} */
+module.exports = function (source) {
 	return source + "// some comment";
 };

test/fixtures/errors/async-error-loader.js

@@ -1,4 +1,5 @@
-module.exports = function(source) {
+/** @type {import("../../../../").LoaderDefinition} */
+module.exports = function (source) {
 	const callback = this.async();
 	const error = new Error("this is a callback error");
 	callback(error, source);

test/fixtures/errors/emit-error-loader.js

@@ -1,4 +1,5 @@
-module.exports = function(source) {
+/** @type {import("../../../../").LoaderDefinition} */
+module.exports = function (source) {
 	this.emitWarning(new Error("this is a warning"));
 	this.emitError(new Error("this is an error"));
 	return source;

test/fixtures/errors/identity-loader.js

@@ -1,3 +1,4 @@
-module.exports = function(source) {
+/** @type {import("../../../../").LoaderDefinition} */
+module.exports = function (source) {
 	return source;
 };

test/fixtures/errors/irregular-error-loader.js

@@ -1,4 +1,5 @@
-module.exports = function(source) {
+/** @type {import("../../../../").LoaderDefinition} */
+module.exports = function (source) {
 	const empty = null;
 	const emptyError = new Error();
 	this.emitWarning(empty);

test/fixtures/errors/no-return-loader.js

@@ -1,2 +1,2 @@
-module.exports = function(){
+/** @type {import("../../../../").LoaderDefinition} */
-}
+module.exports = function () {};

test/fixtures/errors/throw-error-loader.js

@@ -1,3 +1,4 @@
-module.exports = function(source) {
+/** @type {import("../../../../").LoaderDefinition} */
+module.exports = function (source) {
 	throw new Error("this is a thrown error");
 };

test/hotCases/child-compiler/issue-9706/report-child-assets-loader.js

@@ -5,6 +5,7 @@ const {
 
 const compilerCache = new WeakMap();
 
+/** @type {import("../../../../").LoaderDefinition} */
 module.exports = function (source) {
 	let childCompiler = compilerCache.get(this._compiler);
 	if (childCompiler === undefined) {

test/hotCases/fake-update-loader.js

@@ -1,4 +1,5 @@
-module.exports = function(source) {
+/** @type {import("../../").LoaderDefinition<{}, { updateIndex: number }>} */
+module.exports = function (source) {
 	var idx = this.updateIndex;
 	var items = source.split(/---+\r?\n/g);
 	if (items.length > 1) {

test/hotCases/loader-import-module/css/loader.js

@@ -1,3 +1,4 @@
+/** @type {import("../../../../").PitchLoaderDefinitionFunction} */
 exports.pitch = async function (remaining) {
 	const result = await this.importModule(
 		this.resourcePath + ".webpack[javascript/auto]" + "!=!" + remaining

test/hotCases/recover/recover-after-loader-error/loader.js

@@ -1,5 +1,5 @@
-module.exports = function(source) {
+/** @type {import("../../../../").LoaderDefinition} */
-	if(source.indexOf("error") >= 0)
+module.exports = function (source) {
-		throw new Error(source.trim());
+	if (source.indexOf("error") >= 0) throw new Error(source.trim());
 	return source;
 };

test/watchCases/cache/child-compilation-cache/0/report-cache-counters-loader.js

@@ -4,30 +4,38 @@ var cacheMap = new WeakMap();
 
 const getCache = (associate, path) => {
 	let o = cacheMap.get(associate);
-	if(o === undefined) {
+	if (o === undefined) {
 		o = new Map();
 		cacheMap.set(associate, o);
 	}
 	let c = o.get(path);
-	if(c === undefined) {
+	if (c === undefined) {
 		c = { counter: 0 };
 		o.set(path, c);
 	}
 	return c;
 };
 
-module.exports = function(source) {
+/** @type {import("../../../../../").LoaderDefinition} */
-	if(map.has(currentWatchStepModule.step)) return map.get(currentWatchStepModule.step);
+module.exports = function (source) {
+	if (map.has(currentWatchStepModule.step))
+		return map.get(currentWatchStepModule.step);
 
-	const compilationCache = getCache(this._compiler.root, this._compilation.compilerPath);
+	const compilationCache = getCache(
+		this._compiler.root,
+		this._compilation.compilerPath
+	);
 	compilationCache.counter++;
 
-	var childCompiler = this._compilation.createChildCompiler("my-compiler " + source.trim(), {
+	var childCompiler = this._compilation.createChildCompiler(
-		filename: "test"
+		"my-compiler " + source.trim(),
-	});
+		{
+			filename: "test"
+		}
+	);
 	var callback = this.async();
 	childCompiler.runAsChild((err, entries, compilation) => {
-		if(err) return callback(err);
+		if (err) return callback(err);
 
 		const childCache = getCache(this._compiler.root, compilation.compilerPath);
 		childCache.counter++;

test/watchCases/cache/loader-import-module/0/loader.js

@@ -1,3 +1,4 @@
+/** @type {import("../../../../../").PitchLoaderDefinitionFunction} */
 exports.pitch = async function (remaining) {
 	const result = await this.importModule(
 		`${this.resourcePath}.webpack[javascript/auto]!=!${remaining}`

test/watchCases/context/loader-context-dep/0/loader.js

@@ -1,7 +1,8 @@
 const path = require("path");
 const directory = path.resolve(__dirname, "directory");
 
-module.exports = function() {
+/** @type {import("../../../../../").LoaderDefinition} */
+module.exports = function () {
 	this.addContextDependency(directory);
 	const callback = this.async();
 	this.fs.readdir(directory, (err, files) => {

test/watchCases/resolve/in-loader/0/loader.js

@@ -1,7 +1,9 @@
-module.exports = function() {
+/** @type {import("../../../../../").LoaderDefinition} */
+module.exports = function () {
 	const callback = this.async();
 	this.resolve(this.context, "./file", (err, file) => {
 		if (err) return callback(err);
+		if (!file) return callback(new Error("Resolving failed"));
 		this.fs.readFile(file, (err, result) => {
 			if (err) return callback(err);
 			callback(

test/watchCases/warnings/warnings-contribute-to-hash/0/warning-loader.js

@@ -1,4 +1,5 @@
-module.exports = function(source) {
+/** @type {import("../../../../../").LoaderDefinition} */
+module.exports = function (source) {
 	this.emitWarning(new Error(source.trim()));
 	return "";
 };

tsconfig.test.json

@@ -12,5 +12,12 @@
     "types": ["node", "jest"],
     "esModuleInterop": true
   },
-  "include": ["test/**/webpack.config.js", "declarations.test.d.ts"]
+  "include": [
+    "test/**/webpack.config.js",
+    "test/cases/**/*loader*.js",
+    "test/watchCases/**/*loader*.js",
+    "test/configCases/**/*loader*.js",
+    "test/hotCases/**/*loader*.js",
+    "declarations.test.d.ts"
+  ]
 }