Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: monomorphic ResolveRequest object #445

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

feat: monomorphic ResolveRequest object #445

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
05e2599
feat: monomorphic ResolveRequest objects
dmichon-msft Jan 10, 2025
d343eb1
fix: cache failed main field lookups
dmichon-msft Jan 10, 2025
8e65a73
fixup monomorph
dmichon-msft Jan 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 36 additions & 4 deletions lib/AliasFieldPlugin.js
View file
Original file line number Diff line number Diff line change
@@ -68,8 +68,25 @@ module.exports = class AliasFieldPlugin {
if (data === false) {
/** @type {ResolveRequest} */
const ignoreObj = {
...request,
path: false
path: false,
context: request.context,
descriptionFilePath: request.descriptionFilePath,
descriptionFileRoot: request.descriptionFileRoot,
descriptionFileData: request.descriptionFileData,
relativePath: request.relativePath,
ignoreSymlinks: request.ignoreSymlinks,
fullySpecified: request.fullySpecified,
__innerRequest: request.__innerRequest,
__innerRequest_request: request.__innerRequest_request,
__innerRequest_relativePath: request.__innerRequest_relativePath,

request: request.request,
query: request.query,
fragment: request.fragment,
module: request.module,
directory: request.directory,
file: request.file,
internal: request.internal
};
if (typeof resolveContext.yield === "function") {
resolveContext.yield(ignoreObj);
@@ -79,10 +96,25 @@ module.exports = class AliasFieldPlugin {
}
/** @type {ResolveRequest} */
const obj = {
...request,
path: /** @type {string} */ (request.descriptionFileRoot),
context: request.context,
descriptionFilePath: request.descriptionFilePath,
descriptionFileRoot: request.descriptionFileRoot,
descriptionFileData: request.descriptionFileData,
relativePath: request.relativePath,
ignoreSymlinks: request.ignoreSymlinks,
fullySpecified: false,
__innerRequest: request.__innerRequest,
__innerRequest_request: request.__innerRequest_request,
__innerRequest_relativePath: request.__innerRequest_relativePath,

request: /** @type {string} */ (data),
fullySpecified: false
query: request.query,
fragment: request.fragment,
module: request.module,
directory: request.directory,
file: request.file,
internal: request.internal
};
resolver.doResolve(
target,
43 changes: 39 additions & 4 deletions lib/AliasPlugin.js
View file
Original file line number Diff line number Diff line change
@@ -85,8 +85,26 @@ module.exports = class AliasPlugin {
if (alias === false) {
/** @type {ResolveRequest} */
const ignoreObj = {
...request,
path: false
path: false,
context: request.context,
descriptionFilePath: request.descriptionFilePath,
descriptionFileRoot: request.descriptionFileRoot,
descriptionFileData: request.descriptionFileData,
relativePath: request.relativePath,
ignoreSymlinks: request.ignoreSymlinks,
fullySpecified: request.fullySpecified,
__innerRequest: request.__innerRequest,
__innerRequest_request: request.__innerRequest_request,
__innerRequest_relativePath:
request.__innerRequest_relativePath,

request: request.request,
query: request.query,
fragment: request.fragment,
module: request.module,
directory: request.directory,
file: request.file,
internal: request.internal
};
if (typeof resolveContext.yield === "function") {
resolveContext.yield(ignoreObj);
@@ -124,9 +142,26 @@ module.exports = class AliasPlugin {
shouldStop = true;
/** @type {ResolveRequest} */
const obj = {
...request,
path: request.path,
context: request.context,
descriptionFilePath: request.descriptionFilePath,
descriptionFileRoot: request.descriptionFileRoot,
descriptionFileData: request.descriptionFileData,
relativePath: request.relativePath,
ignoreSymlinks: request.ignoreSymlinks,
fullySpecified: false,
__innerRequest: request.__innerRequest,
__innerRequest_request: request.__innerRequest_request,
__innerRequest_relativePath:
request.__innerRequest_relativePath,

request: newRequestStr,
fullySpecified: false
query: request.query,
fragment: request.fragment,
module: request.module,
directory: request.directory,
file: request.file,
internal: request.internal
};
return resolver.doResolve(
target,
20 changes: 18 additions & 2 deletions lib/AppendPlugin.js
View file
Original file line number Diff line number Diff line change
@@ -32,10 +32,26 @@ module.exports = class AppendPlugin {
.tapAsync("AppendPlugin", (request, resolveContext, callback) => {
/** @type {ResolveRequest} */
const obj = {
...request,
path: request.path + this.appending,
context: request.context,
descriptionFilePath: request.descriptionFilePath,
descriptionFileRoot: request.descriptionFileRoot,
descriptionFileData: request.descriptionFileData,
relativePath:
request.relativePath && request.relativePath + this.appending
request.relativePath && request.relativePath + this.appending,
ignoreSymlinks: request.ignoreSymlinks,
fullySpecified: request.fullySpecified,
__innerRequest: request.__innerRequest,
__innerRequest_request: request.__innerRequest_request,
__innerRequest_relativePath: request.__innerRequest_relativePath,

request: request.request,
query: request.query,
fragment: request.fragment,
module: request.module,
directory: request.directory,
file: request.file,
internal: request.internal
};
resolver.doResolve(
target,
20 changes: 18 additions & 2 deletions lib/CloneBasenamePlugin.js
View file
Original file line number Diff line number Diff line change
@@ -35,11 +35,27 @@ module.exports = class CloneBasenamePlugin {
const filePath = resolver.join(requestPath, filename);
/** @type {ResolveRequest} */
const obj = {
...request,
path: filePath,
context: request.context,
descriptionFilePath: request.descriptionFilePath,
descriptionFileRoot: request.descriptionFileRoot,
descriptionFileData: request.descriptionFileData,
relativePath:
request.relativePath &&
resolver.join(request.relativePath, filename)
resolver.join(request.relativePath, filename),
ignoreSymlinks: request.ignoreSymlinks,
fullySpecified: request.fullySpecified,
__innerRequest: request.__innerRequest,
__innerRequest_request: request.__innerRequest_request,
__innerRequest_relativePath: request.__innerRequest_relativePath,

request: request.request,
query: request.query,
fragment: request.fragment,
module: request.module,
directory: request.directory,
file: request.file,
internal: request.internal
};
resolver.doResolve(
target,
21 changes: 18 additions & 3 deletions lib/DescriptionFilePlugin.js
View file
Original file line number Diff line number Diff line change
@@ -67,11 +67,26 @@ module.exports = class DescriptionFilePlugin {
"." + path.slice(result.directory.length).replace(/\\/g, "/");
/** @type {ResolveRequest} */
const obj = {
...request,
path: request.path,
context: request.context,
descriptionFilePath: result.path,
descriptionFileData: result.content,
descriptionFileRoot: result.directory,
relativePath: relativePath
descriptionFileData: result.content,
relativePath,
ignoreSymlinks: request.ignoreSymlinks,
fullySpecified: request.fullySpecified,
__innerRequest: request.__innerRequest,
__innerRequest_request: request.__innerRequest_request,
__innerRequest_relativePath:
request.__innerRequest_relativePath,

request: request.request,
query: request.query,
fragment: request.fragment,
module: request.module,
directory: request.directory,
file: request.file,
internal: request.internal
};
resolver.doResolve(
target,
19 changes: 16 additions & 3 deletions lib/ExportsFieldPlugin.js
View file
Original file line number Diff line number Diff line change
@@ -164,15 +164,28 @@ module.exports = class ExportsFieldPlugin {

/** @type {ResolveRequest} */
const obj = {
...request,
request: undefined,
path: resolver.join(
/** @type {string} */ (request.descriptionFileRoot),
relativePath
),
context: request.context,
descriptionFilePath: request.descriptionFilePath,
descriptionFileRoot: request.descriptionFileRoot,
descriptionFileData: request.descriptionFileData,
relativePath,
ignoreSymlinks: request.ignoreSymlinks,
fullySpecified: request.fullySpecified,
__innerRequest: request.__innerRequest,
__innerRequest_request: request.__innerRequest_request,
__innerRequest_relativePath: request.__innerRequest_relativePath,

request: undefined,
query,
fragment
fragment,
module: request.module,
directory: request.directory,
file: request.file,
internal: request.internal
};

resolver.doResolve(
20 changes: 18 additions & 2 deletions lib/ExtensionAliasPlugin.js
View file
Original file line number Diff line number Diff line change
@@ -52,9 +52,25 @@ module.exports = class ExtensionAliasPlugin {
return resolver.doResolve(
target,
{
...request,
path: request.path,
context: request.context,
descriptionFilePath: request.descriptionFilePath,
descriptionFileRoot: request.descriptionFileRoot,
descriptionFileData: request.descriptionFileData,
relativePath: request.relativePath,
ignoreSymlinks: request.ignoreSymlinks,
fullySpecified: true,
__innerRequest: request.__innerRequest,
__innerRequest_request: request.__innerRequest_request,
__innerRequest_relativePath: request.__innerRequest_relativePath,

request: newRequest,
fullySpecified: true
query: request.query,
fragment: request.fragment,
module: request.module,
directory: request.directory,
file: request.file,
internal: request.internal
},
`aliased from extension alias with mapping '${extension}' to '${alias}'`,
resolveContext,
20 changes: 17 additions & 3 deletions lib/ImportsFieldPlugin.js
View file
Original file line number Diff line number Diff line change
@@ -158,15 +158,29 @@ module.exports = class ImportsFieldPlugin {

/** @type {ResolveRequest} */
const obj = {
...request,
request: undefined,
path: resolver.join(
/** @type {string} */ (request.descriptionFileRoot),
path_
),
context: request.context,
descriptionFilePath: request.descriptionFilePath,
descriptionFileRoot: request.descriptionFileRoot,
descriptionFileData: request.descriptionFileData,
relativePath: path_,
ignoreSymlinks: request.ignoreSymlinks,
fullySpecified: request.fullySpecified,
__innerRequest: request.__innerRequest,
__innerRequest_request: request.__innerRequest_request,
__innerRequest_relativePath:
request.__innerRequest_relativePath,

request: undefined,
query,
fragment
fragment,
module: request.module,
directory: request.directory,
file: request.file,
internal: request.internal
};

resolver.doResolve(
18 changes: 16 additions & 2 deletions lib/JoinRequestPartPlugin.js
View file
Original file line number Diff line number Diff line change
@@ -56,17 +56,31 @@ module.exports = class JoinRequestPartPlugin {
}
/** @type {ResolveRequest} */
const obj = {
...request,
path: resolver.join(
/** @type {string} */
(request.path),
moduleName
),
context: request.context,
descriptionFilePath: request.descriptionFilePath,
descriptionFileRoot: request.descriptionFileRoot,
descriptionFileData: request.descriptionFileData,
relativePath:
request.relativePath &&
resolver.join(request.relativePath, moduleName),
ignoreSymlinks: request.ignoreSymlinks,
fullySpecified,
__innerRequest: request.__innerRequest,
__innerRequest_request: request.__innerRequest_request,
__innerRequest_relativePath: request.__innerRequest_relativePath,

request: remainingRequest,
fullySpecified
query: request.query,
fragment: request.fragment,
module: request.module,
directory: request.directory,
file: request.file,
internal: request.internal
};
resolver.doResolve(target, obj, null, resolveContext, callback);
}
19 changes: 17 additions & 2 deletions lib/JoinRequestPlugin.js
View file
Original file line number Diff line number Diff line change
@@ -32,12 +32,27 @@ module.exports = class JoinRequestPlugin {
const requestRequest = /** @type {string} */ (request.request);
/** @type {ResolveRequest} */
const obj = {
...request,
path: resolver.join(requestPath, requestRequest),
context: request.context,
descriptionFilePath: request.descriptionFilePath,
descriptionFileRoot: request.descriptionFileRoot,
descriptionFileData: request.descriptionFileData,
relativePath:
request.relativePath &&
resolver.join(request.relativePath, requestRequest),
request: undefined
ignoreSymlinks: request.ignoreSymlinks,
fullySpecified: request.fullySpecified,
__innerRequest: request.__innerRequest,
__innerRequest_request: request.__innerRequest_request,
__innerRequest_relativePath: request.__innerRequest_relativePath,

request: undefined,
query: request.query,
fragment: request.fragment,
module: request.module,
directory: request.directory,
file: request.file,
internal: request.internal
};
resolver.doResolve(target, obj, null, resolveContext, callback);
});
Loading
Oops, something went wrong.