Skip to content

Commit

Permalink
Chore: rename utils for consistency (#10727)
Browse files Browse the repository at this point in the history 
* Chore: rename test files for consistency (refs #10559)

* Chore: rename util => utils for consistency
  • Loading branch information
@aladdin-add @platinumazure
aladdin-add authored and platinumazure committed Aug 3, 2018
1 parent 6eb972c commit 6009239
Show file tree
Hide file tree
Showing 13 changed files with 96 additions and 96 deletions.
6 changes: 3 additions & 3 deletions lib/cli-engine.js
View file
Expand Up @@ -22,7 +22,7 @@ const fs = require("fs"),
IgnoredPaths = require("./ignored-paths"),
Config = require("./config"),
LintResultCache = require("./util/lint-result-cache"),
globUtil = require("./util/glob-utils"),
globUtils = require("./util/glob-utils"),
validator = require("./config/config-validator"),
hash = require("./util/hash"),
ModuleResolver = require("./util/module-resolver"),
Expand Down Expand Up @@ -492,7 +492,7 @@ class CLIEngine {
* @returns {string[]} The equivalent glob patterns.
*/
resolveFileGlobPatterns(patterns) {
return globUtil.resolveFileGlobPatterns(patterns.filter(Boolean), this.options);
return globUtils.resolveFileGlobPatterns(patterns.filter(Boolean), this.options);
}

/**
Expand All @@ -511,7 +511,7 @@ class CLIEngine {
}

const startTime = Date.now();
const fileList = globUtil.listFilesToProcess(patterns, options);
const fileList = globUtils.listFilesToProcess(patterns, options);
const results = fileList.map(fileInfo => {
if (fileInfo.ignored) {
return createIgnoreResult(fileInfo.filename, options.cwd);
Expand Down
12 changes: 6 additions & 6 deletions lib/config/config-initializer.js
View file
Expand Up @@ -18,7 +18,7 @@ const util = require("util"),
ConfigOps = require("./config-ops"),
getSourceCodeOfFiles = require("../util/source-code-utils").getSourceCodeOfFiles,
ModuleResolver = require("../util/module-resolver"),
npmUtil = require("../util/npm-utils"),
npmUtils = require("../util/npm-utils"),
recConfig = require("../../conf/eslint-recommended"),
log = require("../util/logging");

Expand Down Expand Up @@ -61,7 +61,7 @@ function writeFile(config, format) {
/**
* Get the peer dependencies of the given module.
* This adds the gotten value to cache at the first time, then reuses it.
* In a process, this function is called twice, but `npmUtil.fetchPeerDependencies` needs to access network which is relatively slow.
* In a process, this function is called twice, but `npmUtils.fetchPeerDependencies` needs to access network which is relatively slow.
* @param {string} moduleName The module name to get.
* @returns {Object} The peer dependencies of the given module.
* This object is the object of `peerDependencies` field of `package.json`.
Expand All @@ -73,7 +73,7 @@ function getPeerDependencies(moduleName) {
if (!result) {
log.info(`Checking peerDependencies of ${moduleName}`);

result = npmUtil.fetchPeerDependencies(moduleName);
result = npmUtils.fetchPeerDependencies(moduleName);
getPeerDependencies.cache.set(moduleName, result);
}

Expand Down Expand Up @@ -109,7 +109,7 @@ function getModulesList(config, installESLint) {
if (installESLint === false) {
delete modules.eslint;
} else {
const installStatus = npmUtil.checkDevDeps(["eslint"]);
const installStatus = npmUtils.checkDevDeps(["eslint"]);

// Mark to show messages if it's new installation of eslint.
if (installStatus.eslint === false) {
Expand Down Expand Up @@ -373,7 +373,7 @@ function hasESLintVersionConflict(answers) {
*/
function installModules(modules) {
log.info(`Installing ${modules.join(", ")}`);
npmUtil.installSyncSaveDev(modules);
npmUtils.installSyncSaveDev(modules);
}

/* istanbul ignore next: no need to test inquirer */
Expand Down Expand Up @@ -438,7 +438,7 @@ function promptUser() {
{ name: "Google (https://github.com/google/eslint-config-google)", value: "google" }
],
when(answers) {
answers.packageJsonExists = npmUtil.checkPackageJson();
answers.packageJsonExists = npmUtils.checkPackageJson();
return answers.source === "guide" && answers.packageJsonExists;
}
},
Expand Down
6 changes: 3 additions & 3 deletions lib/ignored-paths.js
View file
Expand Up @@ -12,7 +12,7 @@
const fs = require("fs"),
path = require("path"),
ignore = require("ignore"),
pathUtil = require("./util/path-utils");
pathUtils = require("./util/path-utils");

const debug = require("debug")("eslint:ignored-paths");

Expand Down Expand Up @@ -328,7 +328,7 @@ class IgnoredPaths {

let result = false;
const absolutePath = path.resolve(this.options.cwd, filepath);
const relativePath = pathUtil.getRelativePath(absolutePath, this.getBaseDir());
const relativePath = pathUtils.getRelativePath(absolutePath, this.getBaseDir());

if (typeof category === "undefined") {
result = (this.ig.default.filter([relativePath]).length === 0) ||
Expand Down Expand Up @@ -367,7 +367,7 @@ class IgnoredPaths {
const filter = ig.createFilter();

return function(absolutePath) {
const relative = pathUtil.getRelativePath(absolutePath, baseDir);
const relative = pathUtils.getRelativePath(absolutePath, baseDir);

if (!relative) {
return false;
Expand Down
4 changes: 2 additions & 2 deletions lib/util/glob-utils.js
View file
Expand Up @@ -13,7 +13,7 @@ const lodash = require("lodash"),
path = require("path"),
GlobSync = require("./glob"),

pathUtil = require("./path-utils"),
pathUtils = require("./path-utils"),
IgnoredPaths = require("../ignored-paths");

const debug = require("debug")("eslint:glob-utils");
Expand Down Expand Up @@ -77,7 +77,7 @@ function processPath(options) {
newPath = pathname.replace(/[/\\]$/, "") + suffix;
}

return pathUtil.convertPathToPosix(newPath);
return pathUtils.convertPathToPosix(newPath);
};
}

Expand Down
4 changes: 2 additions & 2 deletions lib/util/naming.js
View file
Expand Up @@ -7,7 +7,7 @@
// Requirements
//------------------------------------------------------------------------------

const pathUtil = require("../util/path-utils");
const pathUtils = require("../util/path-utils");

//------------------------------------------------------------------------------
// Private
Expand All @@ -31,7 +31,7 @@ function normalizePackageName(name, prefix) {
* https://github.com/eslint/eslint/issues/5644
*/
if (normalizedName.indexOf("\\") > -1) {
normalizedName = pathUtil.convertPathToPosix(normalizedName);
normalizedName = pathUtils.convertPathToPosix(normalizedName);
}

if (normalizedName.charAt(0) === "@") {
Expand Down
4 changes: 2 additions & 2 deletions lib/util/source-code-utils.js
View file
Expand Up @@ -10,7 +10,7 @@
//------------------------------------------------------------------------------

const CLIEngine = require("../cli-engine"),
globUtil = require("./glob-utils"),
globUtils = require("./glob-utils"),
baseDefaultOptions = require("../../conf/default-cli-options");

const debug = require("debug")("eslint:source-code-utils");
Expand Down Expand Up @@ -79,7 +79,7 @@ function getSourceCodeOfFiles(patterns, providedOptions, providedCallback) {
}
debug("constructed options:", options);

const filenames = globUtil.listFilesToProcess(globPatternsList, options)
const filenames = globUtils.listFilesToProcess(globPatternsList, options)
.filter(fileInfo => !fileInfo.ignored)
.reduce((files, fileInfo) => files.concat(fileInfo.filename), []);

Expand Down
14 changes: 7 additions & 7 deletions tests/lib/config/autoconfig.js
View file
Expand Up @@ -11,7 +11,7 @@

const assert = require("chai").assert,
autoconfig = require("../../../lib/config/autoconfig"),
sourceCodeUtil = require("../../../lib/util/source-code-utils"),
sourceCodeUtils = require("../../../lib/util/source-code-utils"),
baseDefaultOptions = require("../../../conf/default-cli-options");

const defaultOptions = Object.assign({}, baseDefaultOptions, { cwd: process.cwd() });
Expand Down Expand Up @@ -174,7 +174,7 @@ describe("autoconfig", () => {

beforeEach(() => {
const config = { ignore: false };
const sourceCode = sourceCodeUtil.getSourceCodeOfFiles(SOURCE_CODE_FIXTURE_FILENAME, config);
const sourceCode = sourceCodeUtils.getSourceCodeOfFiles(SOURCE_CODE_FIXTURE_FILENAME, config);

registry = new autoconfig.Registry(rulesConfig);
registry = registry.lintSourceCode(sourceCode, defaultOptions);
Expand All @@ -201,7 +201,7 @@ describe("autoconfig", () => {

it("should respect inline eslint config comments (and not crash when they make linting errors)", () => {
const config = { ignore: false };
const sourceCode = sourceCodeUtil.getSourceCodeOfFiles(CONFIG_COMMENTS_FILENAME, config);
const sourceCode = sourceCodeUtils.getSourceCodeOfFiles(CONFIG_COMMENTS_FILENAME, config);
const expectedRegistry = [
{ config: 2, specificity: 1, errorCount: 3 },
{ config: [2, "always"], specificity: 2, errorCount: 3 },
Expand All @@ -220,7 +220,7 @@ describe("autoconfig", () => {

beforeEach(() => {
const config = { ignore: false };
const sourceCode = sourceCodeUtil.getSourceCodeOfFiles(SOURCE_CODE_FIXTURE_FILENAME, config);
const sourceCode = sourceCodeUtils.getSourceCodeOfFiles(SOURCE_CODE_FIXTURE_FILENAME, config);

registry = new autoconfig.Registry(rulesConfig);
registry = registry.lintSourceCode(sourceCode, defaultOptions);
Expand Down Expand Up @@ -248,7 +248,7 @@ describe("autoconfig", () => {

beforeEach(() => {
const config = { ignore: false };
const sourceCode = sourceCodeUtil.getSourceCodeOfFiles(SOURCE_CODE_FIXTURE_FILENAME, config);
const sourceCode = sourceCodeUtils.getSourceCodeOfFiles(SOURCE_CODE_FIXTURE_FILENAME, config);
let registry = new autoconfig.Registry(errorRulesConfig);

registry = registry.lintSourceCode(sourceCode, defaultOptions);
Expand All @@ -269,7 +269,7 @@ describe("autoconfig", () => {

beforeEach(() => {
const config = { ignore: false };
const sourceCode = sourceCodeUtil.getSourceCodeOfFiles(SOURCE_CODE_FIXTURE_FILENAME, config);
const sourceCode = sourceCodeUtils.getSourceCodeOfFiles(SOURCE_CODE_FIXTURE_FILENAME, config);
let registry = new autoconfig.Registry(rulesConfig);

registry = registry.lintSourceCode(sourceCode, defaultOptions);
Expand All @@ -293,7 +293,7 @@ describe("autoconfig", () => {

it("should not care how many errors the config has", () => {
const config = { ignore: false };
const sourceCode = sourceCodeUtil.getSourceCodeOfFiles(SOURCE_CODE_FIXTURE_FILENAME, config);
const sourceCode = sourceCodeUtils.getSourceCodeOfFiles(SOURCE_CODE_FIXTURE_FILENAME, config);
let registry = new autoconfig.Registry(errorRulesConfig);

registry = registry.lintSourceCode(sourceCode, defaultOptions);
Expand Down
8 changes: 4 additions & 4 deletions tests/lib/config/config-initializer.js
View file
Expand Up @@ -16,7 +16,7 @@ const assert = require("chai").assert,
sinon = require("sinon"),
sh = require("shelljs"),
autoconfig = require("../../../lib/config/autoconfig"),
npmUtil = require("../../../lib/util/npm-utils");
npmUtils = require("../../../lib/util/npm-utils");

const originalDir = process.cwd();
const proxyquire = require("proxyquire").noPreserveCache();
Expand Down Expand Up @@ -83,13 +83,13 @@ describe("configInitializer", () => {
});

beforeEach(() => {
npmInstallStub = sinon.stub(npmUtil, "installSyncSaveDev");
npmCheckStub = sinon.stub(npmUtil, "checkDevDeps").callsFake(packages => packages.reduce((status, pkg) => {
npmInstallStub = sinon.stub(npmUtils, "installSyncSaveDev");
npmCheckStub = sinon.stub(npmUtils, "checkDevDeps").callsFake(packages => packages.reduce((status, pkg) => {
status[pkg] = false;
return status;
}, {}));
npmFetchPeerDependenciesStub = sinon
.stub(npmUtil, "fetchPeerDependencies")
.stub(npmUtils, "fetchPeerDependencies")
.returns({
eslint: "^3.19.0",
"eslint-plugin-jsx-a11y": "^5.0.1",
Expand Down
6 changes: 3 additions & 3 deletions tests/lib/ast-utils.js → tests/lib/util/ast-utils.js
View file
Expand Up @@ -11,9 +11,9 @@

const assert = require("chai").assert,
espree = require("espree"),
astUtils = require("../../lib/util/ast-utils"),
Linter = require("../../lib/linter"),
SourceCode = require("../../lib/util/source-code");
astUtils = require("../../../lib/util/ast-utils"),
Linter = require("../../../lib/linter"),
SourceCode = require("../../../lib/util/source-code");

//------------------------------------------------------------------------------
// Tests
Expand Down

0 comments on commit 6009239

Please sign in to comment.