Skip to content

tools: force common be required before any other modules #27650

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

Closed
ZYSzys wants to merge 2 commits into from
Closed

tools: force common be required before any other modules #27650

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f9918b
tools: force common be required before any other modules
ZYSzys May 12, 2019
e7850e7
fixup! tools: force common be required before any other modules
ZYSzys May 13, 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
Prev Previous commit
fixup! tools: force common be required before any other modules
  • Loading branch information
@ZYSzys
ZYSzys committed May 13, 2019
commit e7850e7caed9b71e1aad0b46693811aa54865ed4
26 changes: 13 additions & 13 deletions tools/eslint-rules/require-common-first.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ module.exports = function(context) {
}

/**
* Function to check if the path is a required module and return its name.
* Function to check if the path is a module and return its name.
* @param {String} str The path to check
* @returns {String} required module name
* @returns {String} module name
*/
function getRequiredModuleName(str) {
function getModuleName(str) {
if (str === '../common/index.mjs') {
return 'common';
}
Expand All @@ -46,15 +46,15 @@ module.exports = function(context) {
}

/**
* Function to check if a node has an argument that is a required module and
* Function to check if a node has an argument that is a module and
* return its name.
* @param {ASTNode} node The node to check
* @returns {undefined|String} required module name or undefined
* @returns {undefined|String} module name or undefined
*/
function getRequiredModuleNameFromCall(node) {
function getModuleNameFromCall(node) {
// Node has arguments and first argument is string
if (node.arguments.length && isString(node.arguments[0])) {
return getRequiredModuleName(node.arguments[0].value.trim());
return getModuleName(node.arguments[0].value.trim());
}

return undefined;
Expand All @@ -77,18 +77,18 @@ module.exports = function(context) {

if (isESM) {
rules.ImportDeclaration = (node) => {
const requiredModuleName = getRequiredModuleName(node.source.value);
if (requiredModuleName) {
foundModules.push(requiredModuleName);
const moduleName = getModuleName(node.source.value);
if (moduleName) {
foundModules.push(moduleName);
}
};
} else {
rules.CallExpression = (node) => {
if (isRequireCall(node)) {
const requiredModuleName = getRequiredModuleNameFromCall(node);
const moduleName = getModuleNameFromCall(node);

if (requiredModuleName) {
foundModules.push(requiredModuleName);
if (moduleName) {
foundModules.push(moduleName);
}
}
};
Expand Down