Refactor MultiStats to es2015

This commit is contained in:
Lior Amsalem 2017-03-04 23:04:35 +02:00
parent 5abfeea64b
commit 6a93e02e5c
2 changed files with 104 additions and 66 deletions

View File

@ -2,70 +2,78 @@
MIT License http://www.opensource.org/licenses/mit-license.php
Author Tobias Koppers @sokra
*/
var Stats = require("./Stats");
"use strict";
function MultiStats(stats) {
this.stats = stats;
this.hash = stats.map(function(stat) {
return stat.hash;
}).join("");
const Stats = require("./Stats");
const optionOrFallback = (optionValue, fallbackValue) => optionValue !== undefined ? optionValue : fallbackValue;
class MultiStats {
constructor(stats) {
this.stats = stats;
this.hash = stats.map((stat) => stat.hash).join("");
}
hasErrors() {
return this.stats.map((stat) => stat.hasErrors()).reduce((a, b) => a || b, false);
}
hasWarnings() {
return this.stats.map((stat) => stat.hasWarnings()).reduce((a, b) => a || b, false);
}
toJson(options, forToString) {
if(typeof options === "boolean" || typeof options === "string") {
options = Stats.presetToOptions(options);
} else if(!options) {
options = {};
}
const jsons = this.stats.map((stat, idx) => {
const childOptions = Stats.getChildOptions(options, idx);
const obj = stat.toJson(childOptions, forToString);
obj.name = stat.compilation && stat.compilation.name;
return obj;
});
const showVersion = typeof options.version === "undefined" ? jsons.every(j => j.version) : options.version !== false;
const showHash = typeof options.hash === "undefined" ? jsons.every(j => j.hash) : options.hash !== false;
jsons.forEach(j => {
if(showVersion)
delete j.version;
});
const obj = {
errors: jsons.reduce((arr, j) => {
return arr.concat(j.errors.map((msg) => {
return `(${j.name}) ${msg}`;
}));
}, []),
warnings: jsons.reduce((arr, j) => {
return arr.concat(j.warnings.map((msg) => {
return `(${j.name}) ${msg}`;
}));
}, [])
};
if(showVersion)
obj.version = require("../package.json").version;
if(showHash)
obj.hash = this.hash;
if(options.children !== false)
obj.children = jsons;
return obj;
}
toString(options) {
if(typeof options === "boolean" || typeof options === "string") {
options = Stats.presetToOptions(options);
} else if(!options) {
options = {};
}
const useColors = optionOrFallback(options.colors, false);
const obj = this.toJson(options, true);
return Stats.jsonToString(obj, useColors);
}
}
MultiStats.prototype.hasErrors = function() {
return this.stats.map(function(stat) {
return stat.hasErrors();
}).reduce(function(a, b) {
return a || b;
}, false);
};
MultiStats.prototype.hasWarnings = function() {
return this.stats.map(function(stat) {
return stat.hasWarnings();
}).reduce(function(a, b) {
return a || b;
}, false);
};
MultiStats.prototype.toJson = function(options, forToString) {
if(typeof options === "boolean" || typeof options === "string") {
options = Stats.presetToOptions(options);
} else if(!options) {
options = {};
}
var jsons = this.stats.map((stat, idx) => {
var childOptions = Stats.getChildOptions(options, idx);
var obj = stat.toJson(childOptions, forToString);
obj.name = stat.compilation && stat.compilation.name;
return obj;
});
var showVersion = typeof options.version === "undefined" ? jsons.every(j => j.version) : options.version !== false;
var showHash = typeof options.hash === "undefined" ? jsons.every(j => j.hash) : options.hash !== false;
jsons.forEach(j => {
if(showVersion)
delete j.version;
});
var obj = {
errors: jsons.reduce(function(arr, j) {
return arr.concat(j.errors.map(function(msg) {
return "(" + j.name + ") " + msg;
}));
}, []),
warnings: jsons.reduce(function(arr, j) {
return arr.concat(j.warnings.map(function(msg) {
return "(" + j.name + ") " + msg;
}));
}, [])
};
if(showVersion)
obj.version = require("../package.json").version;
if(showHash)
obj.hash = this.hash;
if(options.children !== false)
obj.children = jsons;
return obj;
};
MultiStats.prototype.toString = Stats.prototype.toString;
module.exports = MultiStats;

View File

@ -160,14 +160,14 @@ describe("MultiStats", () => {
})
})
];
});
it("returns plain object representation", () => {
myMultiStats = new MultiStats(stats);
result = myMultiStats.toJson({
version: false,
hash: false
});
});
it("returns plain object representation", () => {
result.should.deepEqual({
errors: [
"(abc123-compilation) abc123-error"
@ -197,6 +197,36 @@ describe("MultiStats", () => {
]
});
});
it("returns plain object representation with json set to true", () => {
myMultiStats = new MultiStats(stats);
result = myMultiStats.toJson(true);
result.should.deepEqual({
errors: [
"(abc123-compilation) abc123-error"
],
warnings: [
"(abc123-compilation) abc123-warning",
"(xyz890-compilation) xyz890-warning-1",
"(xyz890-compilation) xyz890-warning-2"
],
hash: "abc123xyz890",
children: [{
warnings: ["abc123-warning"],
errors: ["abc123-error"],
name: "abc123-compilation"
},
{
warnings: [
"xyz890-warning-1",
"xyz890-warning-2"
],
errors: [],
name: "xyz890-compilation"
}
]
});
});
});
describe("toString", () => {