Skip to content

Commit b54f2ac

Browse files
committed
use forEachBail from enhanced-resolve
1 parent 9c6557e commit b54f2ac

File tree

2 files changed

+3
-18
lines changed

2 files changed

+3
-18
lines changed

lib/CacheFacade.js

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
"use strict";
77

8+
const { forEachBail } = require("enhanced-resolve");
89
const asyncLib = require("neo-async");
910
const getLazyHashedEtag = require("./cache/getLazyHashedEtag");
1011
const mergeEtags = require("./cache/mergeEtags");
@@ -46,23 +47,7 @@ class MultiItemCache {
4647
* @returns {void}
4748
*/
4849
get(callback) {
49-
let i = 0;
50-
let resultFound = false;
51-
const generateGetCallback = (/** @type {Boolean} */ lastItem) => {
52-
return (
53-
/** @type {import("./WebpackError")} */ err,
54-
/** @type {T} */ res
55-
) => {
56-
if (resultFound) return;
57-
resultFound = !!(err || res || false);
58-
if (err) return callback(err);
59-
if (res !== undefined) return callback(null, res);
60-
if (lastItem) return callback();
61-
};
62-
};
63-
do {
64-
this._items[i].get(generateGetCallback(i === this._items.length - 1));
65-
} while (++i < this._items.length);
50+
forEachBail(this._items, (item, callback) => item.get(callback), callback);
6651
}
6752

6853
/**

test/MultiItemCache.unittest.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ describe("MultiItemCache", () => {
3232
const multiItemCache = new MultiItemCache(itemCaches);
3333
let callbacks = 0;
3434
const callback = (err, res) => {
35-
expect(err).toBeUndefined();
35+
expect(err).toBeNull();
3636
expect(res).toBeUndefined();
3737
++callbacks;
3838
};

0 commit comments

Comments
 (0)