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

lib: optimize require() path walking #130

Merged
merged 1 commit into from
Dec 9, 2014
Merged

lib: optimize require() path walking #130

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions lib/module.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ function tryPackage(requestPath, exts) {
if (!pkg) return false;

var filename = path.resolve(requestPath, pkg);
return tryFile(filename) || tryExtensions(filename, exts) ||
return tryFile(filename, null) || tryExtensions(filename, exts) ||
tryExtensions(path.resolve(filename, 'index'), exts);
}

Expand All @@ -131,8 +131,8 @@ function tryPackage(requestPath, exts) {
Module._realpathCache = {};

// check if the file exists and is not a directory
function tryFile(requestPath) {
var stats = statPath(requestPath);
function tryFile(requestPath, stats) {
stats = stats || statPath(requestPath);
if (stats && !stats.isDirectory()) {
return fs.realpathSync(requestPath, Module._realpathCache);
}
Expand All @@ -142,7 +142,7 @@ function tryFile(requestPath) {
// given a path check a the file exists with any of the set extensions
function tryExtensions(p, exts) {
for (var i = 0, EL = exts.length; i < EL; i++) {
var filename = tryFile(p + exts[i]);
var filename = tryFile(p + exts[i], null);

if (filename) {
return filename;
Expand Down Expand Up @@ -174,7 +174,7 @@ Module._findPath = function(request, paths) {
if (!trailingSlash) {
var stats = statPath(basePath);
// try to join the request to the path
filename = tryFile(basePath);
filename = tryFile(basePath, stats);

if (!filename && stats && stats.isDirectory()) {
filename = tryPackage(basePath, exts);
Expand Down