Skip to content

Commit 876b0b0

Browse files
committed
[Refactor] use "basedir" instead of "y", because meaningful variable names
1 parent 0c18e40 commit 876b0b0

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

lib/async.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,22 +30,22 @@ module.exports = function resolve(x, options, callback) {
3030
var readFile = opts.readFile || fs.readFile;
3131

3232
var extensions = opts.extensions || ['.js'];
33-
var y = opts.basedir || path.dirname(caller());
33+
var basedir = opts.basedir || path.dirname(caller());
3434

3535
opts.paths = opts.paths || [];
3636

3737
if (/^(?:\.\.?(?:\/|$)|\/|([A-Za-z]:)?[/\\])/.test(x)) {
38-
var res = path.resolve(y, x);
38+
var res = path.resolve(basedir, x);
3939
if (x === '..' || x.slice(-1) === '/') res += '/';
40-
if (/\/$/.test(x) && res === y) {
40+
if (/\/$/.test(x) && res === basedir) {
4141
loadAsDirectory(res, opts.package, onfile);
4242
} else loadAsFile(res, opts.package, onfile);
43-
} else loadNodeModules(x, y, function (err, n, pkg) {
43+
} else loadNodeModules(x, basedir, function (err, n, pkg) {
4444
if (err) cb(err);
4545
else if (n) cb(null, n, pkg);
4646
else if (core[x]) return cb(null, x);
4747
else {
48-
var moduleError = new Error("Cannot find module '" + x + "' from '" + y + "'");
48+
var moduleError = new Error("Cannot find module '" + x + "' from '" + basedir + "'");
4949
moduleError.code = 'MODULE_NOT_FOUND';
5050
cb(moduleError);
5151
}
@@ -58,7 +58,7 @@ module.exports = function resolve(x, options, callback) {
5858
if (err) cb(err);
5959
else if (d) cb(null, d, pkg);
6060
else {
61-
var moduleError = new Error("Cannot find module '" + x + "' from '" + y + "'");
61+
var moduleError = new Error("Cannot find module '" + x + "' from '" + basedir + "'");
6262
moduleError.code = 'MODULE_NOT_FOUND';
6363
cb(moduleError);
6464
}

lib/sync.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,23 +21,23 @@ module.exports = function (x, options) {
2121
var readFileSync = opts.readFileSync || fs.readFileSync;
2222

2323
var extensions = opts.extensions || ['.js'];
24-
var y = opts.basedir || path.dirname(caller());
24+
var basedir = opts.basedir || path.dirname(caller());
2525

2626
opts.paths = opts.paths || [];
2727

2828
if (/^(?:\.\.?(?:\/|$)|\/|([A-Za-z]:)?[/\\])/.test(x)) {
29-
var res = path.resolve(y, x);
29+
var res = path.resolve(basedir, x);
3030
if (x === '..' || x.slice(-1) === '/') res += '/';
3131
var m = loadAsFileSync(res) || loadAsDirectorySync(res);
3232
if (m) return m;
3333
} else {
34-
var n = loadNodeModulesSync(x, y);
34+
var n = loadNodeModulesSync(x, basedir);
3535
if (n) return n;
3636
}
3737

3838
if (core[x]) return x;
3939

40-
var err = new Error("Cannot find module '" + x + "' from '" + y + "'");
40+
var err = new Error("Cannot find module '" + x + "' from '" + basedir + "'");
4141
err.code = 'MODULE_NOT_FOUND';
4242
throw err;
4343

0 commit comments

Comments
 (0)