Skip to content

Commit

Permalink
Limits length external module readable identifier
Browse files Browse the repository at this point in the history
Limits in place only for external modules. See issue # 16475
  • Loading branch information
Trevor Github committed Nov 16, 2022
1 parent d5b488f commit 2f9f1ae
Showing 1 changed file with 38 additions and 22 deletions.
60 changes: 38 additions & 22 deletions lib/stats/DefaultStatsFactoryPlugin.js
Expand Up @@ -6,6 +6,7 @@
"use strict";

const util = require("util");
const ExternalModule = require("../ExternalModule");
const ModuleDependency = require("../dependencies/ModuleDependency");
const formatLocation = require("../formatLocation");
const { LogType } = require("../logging/Logger");
Expand Down Expand Up @@ -316,11 +317,16 @@ const { makePathsRelative, parseResource } = require("../util/identifier");

/**
* @param {string} readableIdentifier user readable identifier of the module
* @param {Module} module base module type
* @returns {string} an elided readableIdentifier, when readableIdentifier exceeds a maximum length
*/
const truncateLongReadableIdentifier = readableIdentifier => {
const truncateLongExternalModuleReadableIdentifier = (
readableIdentifier,
module
) => {
const maxLength = 80;
return readableIdentifier.length > maxLength
return module instanceof ExternalModule &&
readableIdentifier.length > maxLength
? readableIdentifier.substring(0, maxLength) + "..."
: readableIdentifier;
};
Expand Down Expand Up @@ -404,8 +410,9 @@ const EXTRACT_ERROR = {
}
if (error.module) {
object.moduleIdentifier = error.module.identifier();
object.moduleName = truncateLongReadableIdentifier(
error.module.readableIdentifier(requestShortener)
object.moduleName = truncateLongExternalModuleReadableIdentifier(
error.module.readableIdentifier(requestShortener),
error.module
);
}
if (error.loc) {
Expand Down Expand Up @@ -1146,8 +1153,9 @@ const SIMPLE_EXTRACTORS = {
/** @type {KnownStatsModule} */
const statsModule = {
identifier: module.identifier(),
name: truncateLongReadableIdentifier(
module.readableIdentifier(requestShortener)
name: truncateLongExternalModuleReadableIdentifier(
module.readableIdentifier(requestShortener),
module
),
nameForCondition: module.nameForCondition(),
index: moduleGraph.getPreOrderIndex(module),
Expand All @@ -1163,8 +1171,9 @@ const SIMPLE_EXTRACTORS = {
issuer: issuer && issuer.identifier(),
issuerName:
issuer &&
truncateLongReadableIdentifier(
issuer.readableIdentifier(requestShortener)
truncateLongExternalModuleReadableIdentifier(
issuer.readableIdentifier(requestShortener),
issuer
),
issuerPath:
issuer &&
Expand Down Expand Up @@ -1305,8 +1314,9 @@ const SIMPLE_EXTRACTORS = {
/** @type {KnownStatsModuleIssuer} */
const statsModuleIssuer = {
identifier: module.identifier(),
name: truncateLongReadableIdentifier(
module.readableIdentifier(requestShortener)
name: truncateLongExternalModuleReadableIdentifier(
module.readableIdentifier(requestShortener),
module
)
};
Object.assign(object, statsModuleIssuer);
Expand All @@ -1329,21 +1339,24 @@ const SIMPLE_EXTRACTORS = {
? reason.originModule.identifier()
: null,
module: reason.originModule
? truncateLongReadableIdentifier(
reason.originModule.readableIdentifier(requestShortener)
? truncateLongExternalModuleReadableIdentifier(
reason.originModule.readableIdentifier(requestShortener),
reason.originModule
)
: null,
moduleName: reason.originModule
? truncateLongReadableIdentifier(
reason.originModule.readableIdentifier(requestShortener)
? truncateLongExternalModuleReadableIdentifier(
reason.originModule.readableIdentifier(requestShortener),
reason.originModule
)
: null,
resolvedModuleIdentifier: reason.resolvedOriginModule
? reason.resolvedOriginModule.identifier()
: null,
resolvedModule: reason.resolvedOriginModule
? truncateLongReadableIdentifier(
reason.resolvedOriginModule.readableIdentifier(requestShortener)
? truncateLongExternalModuleReadableIdentifier(
reason.resolvedOriginModule.readableIdentifier(requestShortener),
reason.resolvedOriginModule
)
: null,
type: reason.dependency ? reason.dependency.type : null,
Expand Down Expand Up @@ -1472,8 +1485,9 @@ const SIMPLE_EXTRACTORS = {
module: origin.module ? origin.module.identifier() : "",
moduleIdentifier: origin.module ? origin.module.identifier() : "",
moduleName: origin.module
? truncateLongReadableIdentifier(
origin.module.readableIdentifier(requestShortener)
? truncateLongExternalModuleReadableIdentifier(
origin.module.readableIdentifier(requestShortener),
origin.module
)
: "",
loc: formatLocation(origin.loc),
Expand All @@ -1496,12 +1510,14 @@ const SIMPLE_EXTRACTORS = {
compilation: { moduleGraph }
} = context;
object.originIdentifier = origin.identifier();
object.originName = truncateLongReadableIdentifier(
origin.readableIdentifier(requestShortener)
object.originName = truncateLongExternalModuleReadableIdentifier(
origin.readableIdentifier(requestShortener),
origin
);
object.moduleIdentifier = module.identifier();
object.moduleName = truncateLongReadableIdentifier(
module.readableIdentifier(requestShortener)
object.moduleName = truncateLongExternalModuleReadableIdentifier(
module.readableIdentifier(requestShortener),
module
);
const dependencies = Array.from(
moduleGraph.getIncomingConnections(module)
Expand Down

0 comments on commit 2f9f1ae

Please sign in to comment.