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: replace var with let/const #30440

Closed
wants to merge 2 commits into from
Closed

lib: replace var with let/const #30440

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
200a63d
lib: replace var with let/const
khoumani Nov 12, 2019
90684fa
lib: address comments
khoumani Nov 16, 2019
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
54 changes: 27 additions & 27 deletions lib/internal/modules/cjs/loader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ Module.builtinModules = builtinModules;
Module._cache = Object.create(null);
Module._pathCache = Object.create(null);
Module._extensions = Object.create(null);
var modulePaths = [];
let modulePaths = [];
Module.globalPaths = [];

let patched = false;
Expand Down Expand Up @@ -349,7 +349,7 @@ function toRealPath(requestPath) {

// Given a path, check if the file exists with any of the set extensions
function tryExtensions(p, exts, isMain) {
for (var i = 0; i < exts.length; i++) {
for (let i = 0; i < exts.length; i++) {
const filename = tryFile(p + exts[i], isMain);

if (filename) {
Expand Down Expand Up @@ -627,22 +627,22 @@ Module._findPath = function(request, paths, isMain) {
if (entry)
return entry;

var exts;
var trailingSlash = request.length > 0 &&
let exts;
let trailingSlash = request.length > 0 &&
request.charCodeAt(request.length - 1) === CHAR_FORWARD_SLASH;
if (!trailingSlash) {
trailingSlash = /(?:^|\/)\.?\.$/.test(request);
}

// For each path
for (var i = 0; i < paths.length; i++) {
for (let i = 0; i < paths.length; i++) {
// Don't search further if path doesn't exist
const curPath = paths[i];
if (curPath && stat(curPath) < 1) continue;
var basePath = resolveExports(curPath, request, absoluteRequest);
var filename;
const basePath = resolveExports(curPath, request, absoluteRequest);
let filename;

var rc = stat(basePath);
const rc = stat(basePath);
if (!trailingSlash) {
if (rc === 0) { // File.
if (!isMain) {
Expand Down Expand Up @@ -716,9 +716,9 @@ if (isWindows) {
return [from + 'node_modules'];

const paths = [];
var p = 0;
var last = from.length;
for (var i = from.length - 1; i >= 0; --i) {
let p = 0;
let last = from.length;
for (let i = from.length - 1; i >= 0; --i) {
trivikr marked this conversation as resolved.
Show resolved Hide resolved
const code = from.charCodeAt(i);
// The path segment separator check ('\' and '/') was used to get
// node_modules path for every path segment.
Expand Down Expand Up @@ -757,9 +757,9 @@ if (isWindows) {
// to be absolute. Doing a fully-edge-case-correct path.split
// that works on both Windows and Posix is non-trivial.
const paths = [];
var p = 0;
var last = from.length;
for (var i = from.length - 1; i >= 0; --i) {
let p = 0;
let last = from.length;
for (let i = from.length - 1; i >= 0; --i) {
const code = from.charCodeAt(i);
if (code === CHAR_FORWARD_SLASH) {
if (p !== nmLen)
Expand Down Expand Up @@ -958,7 +958,7 @@ Module._resolveFilename = function(request, parent, isMain, options) {
return request;
}

var paths;
let paths;

if (typeof options === 'object' && options !== null) {
if (Array.isArray(options.paths)) {
Expand All @@ -974,12 +974,12 @@ Module._resolveFilename = function(request, parent, isMain, options) {

paths = [];

for (var i = 0; i < options.paths.length; i++) {
for (let i = 0; i < options.paths.length; i++) {
const path = options.paths[i];
fakeParent.paths = Module._nodeModulePaths(path);
const lookupPaths = Module._resolveLookupPaths(request, fakeParent);

for (var j = 0; j < lookupPaths.length; j++) {
for (let j = 0; j < lookupPaths.length; j++) {
if (!paths.includes(lookupPaths[j]))
paths.push(lookupPaths[j]);
}
Expand All @@ -998,7 +998,7 @@ Module._resolveFilename = function(request, parent, isMain, options) {
const filename = Module._findPath(request, paths, isMain);
if (!filename) {
const requireStack = [];
for (var cursor = parent;
for (let cursor = parent;
cursor;
cursor = cursor.parent) {
requireStack.push(cursor.filename || cursor.id);
Expand All @@ -1008,7 +1008,7 @@ Module._resolveFilename = function(request, parent, isMain, options) {
message = message + '\nRequire stack:\n- ' + requireStack.join('\n- ');
}
// eslint-disable-next-line no-restricted-syntax
var err = new Error(message);
const err = new Error(message);
err.code = 'MODULE_NOT_FOUND';
err.requireStack = requireStack;
throw err;
Expand Down Expand Up @@ -1081,7 +1081,7 @@ Module.prototype.require = function(id) {

// Resolved path to process.argv[1] will be lazily placed here
// (needed for setting breakpoint when called with --inspect-brk)
var resolvedArgv;
let resolvedArgv;
let hasPausedEntry = false;

function wrapSafe(filename, content, cjsModuleInstance) {
Expand Down Expand Up @@ -1151,7 +1151,7 @@ Module.prototype._compile = function(content, filename) {
maybeCacheSourceMap(filename, content, this);
const compiledWrapper = wrapSafe(filename, content, this);

var inspectorWrapper = null;
let inspectorWrapper = null;
if (getOptionValue('--inspect-brk') && process._eval == null) {
if (!resolvedArgv) {
// We enter the repl if we're not given a filename argument.
Expand All @@ -1170,7 +1170,7 @@ Module.prototype._compile = function(content, filename) {
}
const dirname = path.dirname(filename);
const require = makeRequireFunction(this, redirects);
var result;
let result;
const exports = this.exports;
const thisValue = exports;
const module = this;
Expand Down Expand Up @@ -1311,8 +1311,8 @@ function createRequire(filename) {
Module.createRequire = createRequire;

Module._initPaths = function() {
var homeDir;
var nodePath;
let homeDir;
let nodePath;
trivikr marked this conversation as resolved.
Show resolved Hide resolved
if (isWindows) {
homeDir = process.env.USERPROFILE;
nodePath = process.env.NODE_PATH;
Expand All @@ -1322,15 +1322,15 @@ Module._initPaths = function() {
}

// $PREFIX/lib/node, where $PREFIX is the root of the Node.js installation.
var prefixDir;
let prefixDir;
trivikr marked this conversation as resolved.
Show resolved Hide resolved
// process.execPath is $PREFIX/bin/node except on Windows where it is
// $PREFIX\node.exe.
if (isWindows) {
prefixDir = path.resolve(process.execPath, '..');
} else {
prefixDir = path.resolve(process.execPath, '..', '..');
}
var paths = [path.resolve(prefixDir, 'lib', 'node')];
let paths = [path.resolve(prefixDir, 'lib', 'node')];

if (homeDir) {
paths.unshift(path.resolve(homeDir, '.node_libraries'));
Expand Down Expand Up @@ -1364,7 +1364,7 @@ Module._preloadModules = function(requests) {
throw e;
}
}
for (var n = 0; n < requests.length; n++)
for (let n = 0; n < requests.length; n++)
parent.require(requests[n]);
};

Expand Down