update

Author: xiaoxiaojx

lib/Resolver.js

@@ -293,7 +293,7 @@ const {
 /** @typedef {object} Context */
 
 /**
- * @typedef {object} TsconfigFileData
+ * @typedef {object} TsconfigPathsData
  * @property {Array<AliasOption>} alias tsconfig file data
  * @property {Array<string>} modules tsconfig file data
  * @property {Set<string>} fileDependencies file dependencies
@@ -309,7 +309,7 @@ const {
  * @property {string=} relativePath relative path
  * @property {boolean=} ignoreSymlinks true when need to ignore symlinks, otherwise false
  * @property {boolean=} fullySpecified true when full specified, otherwise false
- * @property {TsconfigFileData | null=} tsconfigFileData tsconfig file data
+ * @property {TsconfigPathsData | null=} tsconfigPathsData tsconfig file data
  * @property {string=} __innerRequest inner request for internal usage
  * @property {string=} __innerRequest_request inner request for internal usage
  * @property {string=} __innerRequest_relativePath inner relative path for internal usage

lib/TsconfigPathsPlugin.js

@@ -7,14 +7,15 @@
 
 const { aliasResolveHandler } = require("./AliasUtils");
 const { modulesResolveHandler } = require("./ModulesUtils");
+
 const TsconfigPathsUtils = require("./TsconfigPathsUtils");
 
 /** @typedef {import("./Resolver")} Resolver */
 /** @typedef {import("./Resolver").ResolveStepHook} ResolveStepHook */
 /** @typedef {import("./AliasUtils").AliasOption} AliasOption */
 /** @typedef {import("./Resolver").ResolveRequest} ResolveRequest */
 /** @typedef {import("./Resolver").ResolveContext} ResolveContext */
-/** @typedef {import("./Resolver").TsconfigFileData} TsconfigFileData */
+/** @typedef {import("./Resolver").TsconfigPathsData} TsconfigPathsData */
 
 const DEFAULT_CONFIG_FILE = "tsconfig.json";
 
@@ -40,17 +41,17 @@ module.exports = class TsconfigPathsPlugin {
 				"TsconfigPathsPlugin",
 				async (request, resolveContext, callback) => {
 					try {
-						const tsconfigFileData = await this.loadTsconfigFile(
+						const tsconfigPathsData = await this.loadTsconfigPathsData(
 							resolver,
 							request,
 							resolveContext,
 						);
 
-						if (!tsconfigFileData) return callback();
+						if (!tsconfigPathsData) return callback();
 
 						aliasResolveHandler(
 							resolver,
-							tsconfigFileData.alias,
+							tsconfigPathsData.alias,
 							aliasTarget,
 							request,
 							resolveContext,
@@ -68,17 +69,17 @@ module.exports = class TsconfigPathsPlugin {
 				"TsconfigPathsPlugin",
 				async (request, resolveContext, callback) => {
 					try {
-						const tsconfigFileData = await this.loadTsconfigFile(
+						const tsconfigPathsData = await this.loadTsconfigPathsData(
 							resolver,
 							request,
 							resolveContext,
 						);
 
-						if (!tsconfigFileData) return callback();
+						if (!tsconfigPathsData) return callback();
 
 						modulesResolveHandler(
 							resolver,
-							tsconfigFileData.modules,
+							tsconfigPathsData.modules,
 							moduleTarget,
 							request,
 							resolveContext,
@@ -96,27 +97,29 @@ module.exports = class TsconfigPathsPlugin {
 	 * @param {Resolver} resolver the resolver
 	 * @param {ResolveRequest} request the request
 	 * @param {ResolveContext} resolveContext the resolve context
-	 * @returns {Promise<TsconfigFileData | null>} the pre-processed request
+	 * @returns {Promise<TsconfigPathsData | null>} the pre-processed request
 	 */
-	async loadTsconfigFile(resolver, request, resolveContext) {
-		if (typeof request.tsconfigFileData === "undefined") {
-			request.tsconfigFileData = await TsconfigPathsUtils.loadTsconfigFile(
-				resolver.fileSystem,
-				this.configFile,
-			);
+	async loadTsconfigPathsData(resolver, request, resolveContext) {
+		if (typeof request.tsconfigPathsData === "undefined") {
+			request.tsconfigPathsData =
+				await TsconfigPathsUtils.loadTsconfigPathsData(
+					resolver.fileSystem,
+					this.configFile,
+					request.path || undefined,
+				);
 		}
 
-		const { tsconfigFileData } = request;
+		const { tsconfigPathsData } = request;
 
-		if (!tsconfigFileData) {
+		if (!tsconfigPathsData) {
 			return null;
 		}
 
-		for (const fileDependency of tsconfigFileData.fileDependencies) {
+		for (const fileDependency of tsconfigPathsData.fileDependencies) {
 			if (resolveContext.fileDependencies) {
 				resolveContext.fileDependencies.add(fileDependency);
 			}
 		}
-		return tsconfigFileData;
+		return tsconfigPathsData;
 	}
 };