update

Author: xiaoxiaojx

lib/Resolver.js

@@ -16,7 +16,7 @@ const {
 } = require("./util/path");
 
 /** @typedef {import("./ResolverFactory").ResolveOptions} ResolveOptions */
-
+/** @typedef {import("./AliasUtils").AliasOption} AliasOption */
 /** @typedef {Error & { details?: string }} ErrorWithDetail */
 
 /** @typedef {(err: ErrorWithDetail | null, res?: string | false, req?: ResolveRequest) => void} ResolveCallback */
@@ -292,6 +292,12 @@ const {
 // eslint-disable-next-line jsdoc/require-property
 /** @typedef {object} Context */
 
+/**
+ * @typedef {object} TsconfigFileData
+ * @property {Array<AliasOption>} aliases tsconfig file data
+ * @property {Set<string>} fileDependencies file dependencies
+ */
+
 /**
  * @typedef {object} BaseResolveRequest
  * @property {string | false} path path
@@ -302,6 +308,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=} tsconfigFileData 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

@@ -10,8 +10,10 @@ const { aliasResolveHandler } = require("./AliasUtils");
 const { modulesResolveHandler } = require("./ModulesUtils");
 
 /** @typedef {import("./Resolver")} Resolver */
-/** @typedef {{alias: string | string[] | false, name: string, onlyModule?: boolean}} AliasOption */
 /** @typedef {import("./Resolver").ResolveStepHook} ResolveStepHook */
+/** @typedef {import("./AliasUtils").AliasOption} AliasOption */
+/** @typedef {import("./Resolver").ResolveRequest} ResolveRequest */
+/** @typedef {import("./Resolver").ResolveContext} ResolveContext */
 
 /**
  * @typedef {object} TsconfigPathsPluginOptions
@@ -37,22 +39,18 @@ module.exports = class TsconfigPathsPlugin {
 	apply(resolver) {
 		const aliasTarget = resolver.ensureHook("internal-resolve");
 		const moduleTarget = resolver.ensureHook("module");
-		const aliasResultCachePromise = this.loadAndConvertPaths(resolver);
 
 		resolver
 			.getHook("raw-resolve")
 			.tapAsync(
 				"TsconfigPathsPlugin",
 				async (request, resolveContext, callback) => {
 					try {
-						const aliasResult = await aliasResultCachePromise;
-						if (!aliasResult) return callback();
-						const { aliases, fileDependencies } = aliasResult;
-						for (const fileDependency of fileDependencies) {
-							if (resolveContext.fileDependencies) {
-								resolveContext.fileDependencies.add(fileDependency);
-							}
-						}
+						const aliases = await this.beforeResolve(
+							resolver,
+							request,
+							resolveContext,
+						);
 						aliasResolveHandler(
 							resolver,
 							aliases.filter((option) => option.name !== "*"),
@@ -73,18 +71,14 @@ module.exports = class TsconfigPathsPlugin {
 				"TsconfigPathsPlugin",
 				async (request, resolveContext, callback) => {
 					try {
-						const aliasResult = await aliasResultCachePromise;
-						if (!aliasResult) return callback();
-						const { aliases, fileDependencies } = aliasResult;
-						for (const fileDependency of fileDependencies) {
-							if (resolveContext.fileDependencies) {
-								resolveContext.fileDependencies.add(fileDependency);
-							}
-						}
+						const aliases = await this.beforeResolve(
+							resolver,
+							request,
+							resolveContext,
+						);
 						const directories = aliases
 							.filter((option) => option.name === "*")
 							.map((option) => /** @type {string} */ (option.alias));
-						if (directories.length === 0) return callback();
 
 						modulesResolveHandler(
 							resolver,
@@ -101,6 +95,27 @@ module.exports = class TsconfigPathsPlugin {
 			);
 	}
 
+	/**
+	 * Pre-process request to load tsconfig.json and convert paths to AliasPlugin format
+	 * @param {Resolver} resolver the resolver
+	 * @param {ResolveRequest} request the request
+	 * @param {ResolveContext} resolveContext the resolve context
+	 * @returns {Promise<Array<AliasOption>>} the pre-processed request
+	 */
+	async beforeResolve(resolver, request, resolveContext) {
+		const tsconfigFileData =
+			request.tsconfigFileData || (await this.loadAndConvertPaths(resolver));
+		if (!tsconfigFileData) return [];
+		const { aliases, fileDependencies } = tsconfigFileData;
+		for (const fileDependency of fileDependencies) {
+			if (resolveContext.fileDependencies) {
+				resolveContext.fileDependencies.add(fileDependency);
+			}
+		}
+		request.tsconfigFileData = tsconfigFileData;
+		return aliases;
+	}
+
 	/**
 	 * Load tsconfig.json (and referenced tsconfigs) and convert paths to AliasPlugin format
 	 * @param {Resolver} resolver the resolver

types.d.ts

@@ -15,17 +15,12 @@ declare interface Abortable {
 	signal?: AbortSignal;
 }
 type Alias = string | false | string[];
-declare interface AliasOptionAliasPlugin {
+declare interface AliasOption {
 	alias: Alias;
 	name: string;
 	onlyModule?: boolean;
 }
 type AliasOptionNewRequest = string | false | string[];
-declare interface AliasOptionTsconfigPathsPlugin {
-	alias: string | false | string[];
-	name: string;
-	onlyModule?: boolean;
-}
 declare interface AliasOptions {
 	[index: string]: AliasOptionNewRequest;
 }
@@ -71,6 +66,11 @@ declare interface BaseResolveRequest {
 	 */
 	fullySpecified?: boolean;
 
+	/**
+	 * tsconfig file data
+	 */
+	tsconfigFileData?: TsconfigFileData;
+
 	/**
 	 * inner request for internal usage
 	 */
@@ -1140,12 +1140,12 @@ declare interface ResolveOptionsResolverFactoryObject_1 {
 	/**
 	 * alias
 	 */
-	alias: AliasOptionAliasPlugin[];
+	alias: AliasOption[];
 
 	/**
 	 * fallback
 	 */
-	fallback: AliasOptionAliasPlugin[];
+	fallback: AliasOption[];
 
 	/**
 	 * alias fields
@@ -1281,12 +1281,12 @@ declare interface ResolveOptionsResolverFactoryObject_2 {
 	/**
 	 * A list of module alias configurations or an object which maps key to value
 	 */
-	alias?: AliasOptions | AliasOptionAliasPlugin[];
+	alias?: AliasOptions | AliasOption[];
 
 	/**
 	 * A list of module alias configurations or an object which maps key to value, applied only after modules option
 	 */
-	fallback?: AliasOptions | AliasOptionAliasPlugin[];
+	fallback?: AliasOptions | AliasOption[];
 
 	/**
 	 * An object which maps extension to extension aliases
@@ -1584,17 +1584,37 @@ declare interface SyncFileSystem {
 	 */
 	realpathSync?: RealPathSync;
 }
+declare interface TsconfigFileData {
+	/**
+	 * tsconfig file data
+	 */
+	aliases: AliasOption[];
+
+	/**
+	 * file dependencies
+	 */
+	fileDependencies: Set<string>;
+}
 declare class TsconfigPathsPlugin {
 	constructor(configFile: string);
 	configFile: string;
 	apply(resolver: Resolver): void;
 
+	/**
+	 * Pre-process request to load tsconfig.json and convert paths to AliasPlugin format
+	 */
+	beforeResolve(
+		resolver: Resolver,
+		request: ResolveRequest,
+		resolveContext: ResolveContext,
+	): Promise<AliasOption[]>;
+
 	/**
 	 * Load tsconfig.json (and referenced tsconfigs) and convert paths to AliasPlugin format
 	 */
 	loadAndConvertPaths(
 		resolver: Resolver,
-	): Promise<AliasOptionTsconfigPathsPlugin[]>;
+	): Promise<null | { aliases: AliasOption[]; fileDependencies: Set<string> }>;
 
 	/**
 	 * Read tsconfig.json and return normalized compiler options
@@ -1611,7 +1631,7 @@ declare class TsconfigPathsPlugin {
 		resolver: Resolver,
 		paths: { [index: string]: string[] },
 		baseUrl: string,
-	): AliasOptionTsconfigPathsPlugin[];
+	): AliasOption[];
 }
 declare interface URL_url extends URL_Import {}
 declare interface WriteOnlySet<T> {