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.

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

fix: handle properties behind spread syntax in require-meta-* rules #251

Merged
merged 2 commits into from
Jun 20, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 7 additions & 10 deletions lib/rules/require-meta-docs-description.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ module.exports = {
return {
Program() {
const sourceCode = context.getSourceCode();
const { scopeManager } = sourceCode;
const info = utils.getRuleInfo(sourceCode);

if (info === null) {
Expand All @@ -57,17 +58,13 @@ module.exports = {
: DEFAULT_PATTERN;

const metaNode = info.meta;
const docsNode =
metaNode &&
metaNode.properties &&
metaNode.properties.find(
(p) => p.type === 'Property' && utils.getKeyName(p) === 'docs'
);
const docsNode = utils
.evaluateObjectProperties(metaNode, scopeManager)
.find((p) => p.type === 'Property' && utils.getKeyName(p) === 'docs');

const descriptionNode =
docsNode &&
docsNode.value.properties &&
docsNode.value.properties.find(
const descriptionNode = utils
.evaluateObjectProperties(docsNode && docsNode.value, scopeManager)
.find(
(p) =>
p.type === 'Property' && utils.getKeyName(p) === 'description'
);
Expand Down
25 changes: 12 additions & 13 deletions lib/rules/require-meta-docs-url.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ module.exports = {
*/
create(context) {
const options = context.options[0] || {};
const sourceCode = context.getSourceCode();
const filename = context.getFilename();
const ruleName =
filename === '<input>'
Expand All @@ -75,24 +74,24 @@ module.exports = {

return {
Program() {
const sourceCode = context.getSourceCode();
const { scopeManager } = sourceCode;

const info = util.getRuleInfo(sourceCode);
if (info === null) {
return;
}

const metaNode = info.meta;
const docsPropNode =
metaNode &&
metaNode.properties &&
metaNode.properties.find(
(p) => p.type === 'Property' && util.getKeyName(p) === 'docs'
);
const urlPropNode =
docsPropNode &&
docsPropNode.value.properties &&
docsPropNode.value.properties.find(
(p) => p.type === 'Property' && util.getKeyName(p) === 'url'
);
const docsPropNode = util
.evaluateObjectProperties(metaNode, scopeManager)
.find((p) => p.type === 'Property' && util.getKeyName(p) === 'docs');
const urlPropNode = util
.evaluateObjectProperties(
docsPropNode && docsPropNode.value,
scopeManager
)
.find((p) => p.type === 'Property' && util.getKeyName(p) === 'url');

const staticValue = urlPropNode
? getStaticValue(urlPropNode.value, context.getScope())
Expand Down
14 changes: 5 additions & 9 deletions lib/rules/require-meta-fixable.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ module.exports = {
context.options[0] && context.options[0].catchNoFixerButFixableProperty;

const sourceCode = context.getSourceCode();
const { scopeManager } = sourceCode;
const ruleInfo = utils.getRuleInfo(sourceCode);
let contextIdentifiers;
let usesFixFunctions;
Expand All @@ -62,10 +63,7 @@ module.exports = {

return {
Program(ast) {
contextIdentifiers = utils.getContextIdentifiers(
sourceCode.scopeManager,
ast
);
contextIdentifiers = utils.getContextIdentifiers(scopeManager, ast);
},
CallExpression(node) {
if (
Expand All @@ -86,11 +84,9 @@ module.exports = {
'Program:exit'() {
const metaFixableProp =
ruleInfo &&
ruleInfo.meta &&
ruleInfo.meta.type === 'ObjectExpression' &&
ruleInfo.meta.properties.find(
(prop) => utils.getKeyName(prop) === 'fixable'
);
utils
.evaluateObjectProperties(ruleInfo.meta, scopeManager)
.find((prop) => utils.getKeyName(prop) === 'fixable');

if (metaFixableProp) {
const staticValue = getStaticValue(
Expand Down
15 changes: 5 additions & 10 deletions lib/rules/require-meta-has-suggestions.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,14 @@ module.exports = {

create(context) {
const sourceCode = context.getSourceCode();
const { scopeManager } = sourceCode;
const ruleInfo = utils.getRuleInfo(sourceCode);
let contextIdentifiers;
let ruleReportsSuggestions;

return {
Program(ast) {
contextIdentifiers = utils.getContextIdentifiers(
sourceCode.scopeManager,
ast
);
contextIdentifiers = utils.getContextIdentifiers(scopeManager, ast);
},
CallExpression(node) {
if (
Expand Down Expand Up @@ -78,12 +76,9 @@ module.exports = {
},
'Program:exit'() {
const metaNode = ruleInfo && ruleInfo.meta;
const hasSuggestionsProperty =
metaNode && metaNode.type === 'ObjectExpression'
? metaNode.properties.find(
(prop) => utils.getKeyName(prop) === 'hasSuggestions'
)
: undefined;
const hasSuggestionsProperty = utils
.evaluateObjectProperties(metaNode, scopeManager)
.find((prop) => utils.getKeyName(prop) === 'hasSuggestions');
const hasSuggestionsStaticValue =
hasSuggestionsProperty &&
getStaticValue(hasSuggestionsProperty.value, context.getScope());
Expand Down
7 changes: 3 additions & 4 deletions lib/rules/require-meta-schema.js
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,9 @@ module.exports = {
Program(ast) {
contextIdentifiers = utils.getContextIdentifiers(scopeManager, ast);

schemaNode =
metaNode &&
metaNode.properties &&
metaNode.properties.find(
schemaNode = utils
.evaluateObjectProperties(metaNode, scopeManager)
.find(
(p) => p.type === 'Property' && utils.getKeyName(p) === 'schema'
);

Expand Down
10 changes: 4 additions & 6 deletions lib/rules/require-meta-type.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,19 +41,17 @@ module.exports = {
return {
Program() {
const sourceCode = context.getSourceCode();
const { scopeManager } = sourceCode;
const info = utils.getRuleInfo(sourceCode);

if (info === null) {
return;
}

const metaNode = info.meta;
const typeNode =
metaNode &&
metaNode.properties &&
metaNode.properties.find(
(p) => p.type === 'Property' && utils.getKeyName(p) === 'type'
);
const typeNode = utils
.evaluateObjectProperties(metaNode, scopeManager)
.find((p) => p.type === 'Property' && utils.getKeyName(p) === 'type');

if (!typeNode) {
context.report({
Expand Down
24 changes: 24 additions & 0 deletions lib/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -738,4 +738,28 @@ module.exports = {
).suggest === parent.parent.parent
);
},

/**
* List all properties contained in an object.
* Evaluates and includes any properties that may be behind spreads.
* @param {Node} objectNode
* @param {ScopeManager} scopeManager
* @returns {Node[]} the list of all properties that could be found
*/
evaluateObjectProperties(objectNode, scopeManager) {
if (!objectNode || objectNode.type !== 'ObjectExpression') {
return [];
}

return objectNode.properties.flatMap((property) => {
if (property.type === 'SpreadElement') {
const value = findVariableValue(property.argument, scopeManager);
if (value && value.type === 'ObjectExpression') {
return value.properties;
}
return [];
}
return [property];
});
},
};
11 changes: 10 additions & 1 deletion tests/lib/rules/require-meta-docs-description.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const RuleTester = require('eslint').RuleTester;
// Tests
// ------------------------------------------------------------------------------

const ruleTester = new RuleTester({ parserOptions: { ecmaVersion: 6 } });
const ruleTester = new RuleTester({ parserOptions: { ecmaVersion: 9 } });
ruleTester.run('require-meta-docs-description', rule, {
valid: [
'foo()',
Expand Down Expand Up @@ -107,6 +107,15 @@ ruleTester.run('require-meta-docs-description', rule, {
create(context) {}
};
`,
// Spread.
`
const extraDocs = { description: 'enforce foo' };
const extraMeta = { docs: { ...extraDocs } };
module.exports = {
meta: { ...extraMeta },
create(context) {}
};
`,
],

invalid: [
Expand Down
58 changes: 58 additions & 0 deletions tests/lib/rules/require-meta-docs-url.js
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,19 @@ tester.run('require-meta-docs-url', rule, {
},
],
},
{
// Spread.
filename: 'test-rule',
code: `
const extraDocs = { url: "path/to/test-rule.md" };
const extraMeta = { docs: { ...extraDocs } };
module.exports = {
meta: { ...extraMeta },
create() {}
}
`,
options: [{ pattern: 'path/to/{{name}}.md' }],
},
],

invalid: [
Expand Down Expand Up @@ -624,6 +637,51 @@ url: "plugin-name/test.md"
],
errors: [{ messageId: 'missing', type: 'ObjectExpression' }],
},
{
// URL missing, spreads present.
filename: 'test.js',
code: `
const extraDocs = { };
const extraMeta = { docs: { ...extraDocs } };
module.exports = {
meta: { ...extraMeta },
create() {}
}
`,
output: `
const extraDocs = { };
const extraMeta = { docs: { ...extraDocs,
url: "plugin-name/test.md" } };
module.exports = {
meta: { ...extraMeta },
create() {}
}
`,
options: [{ pattern: 'plugin-name/{{ name }}.md' }],
errors: [{ messageId: 'missing', type: 'ObjectExpression' }],
},
{
// URL wrong inside spreads.
filename: 'test.js',
code: `
const extraDocs = { url: 'wrong' };
const extraMeta = { docs: { ...extraDocs } };
module.exports = {
meta: { ...extraMeta },
create() {}
}
`,
output: `
const extraDocs = { url: "plugin-name/test.md" };
const extraMeta = { docs: { ...extraDocs } };
module.exports = {
meta: { ...extraMeta },
create() {}
}
`,
options: [{ pattern: 'plugin-name/{{ name }}.md' }],
errors: [{ messageId: 'mismatch', type: 'Literal' }],
},
{
// CJS file extension
filename: 'test.cjs',
Expand Down
12 changes: 11 additions & 1 deletion tests/lib/rules/require-meta-fixable.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const RuleTester = require('eslint').RuleTester;
// Tests
// ------------------------------------------------------------------------------

const ruleTester = new RuleTester({ parserOptions: { ecmaVersion: 6 } });
const ruleTester = new RuleTester({ parserOptions: { ecmaVersion: 9 } });
ruleTester.run('require-meta-fixable', rule, {
valid: [
// No `meta`.
Expand Down Expand Up @@ -189,6 +189,16 @@ ruleTester.run('require-meta-fixable', rule, {
`,
options: [{ catchNoFixerButFixableProperty: true }],
},
// Spread.
`
const extra = { 'fixable': 'code' };
module.exports = {
meta: { ...extra },
create(context) {
context.report({node, message, fix: foo});
}
};
`,
],

invalid: [
Expand Down
14 changes: 12 additions & 2 deletions tests/lib/rules/require-meta-has-suggestions.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const RuleTester = require('eslint').RuleTester;
// Tests
// ------------------------------------------------------------------------------

const ruleTester = new RuleTester({ parserOptions: { ecmaVersion: 6 } });
const ruleTester = new RuleTester({ parserOptions: { ecmaVersion: 9 } });
ruleTester.run('require-meta-has-suggestions', rule, {
valid: [
'module.exports = context => { return {}; };',
Expand Down Expand Up @@ -171,7 +171,7 @@ ruleTester.run('require-meta-has-suggestions', rule, {
}
};
`,
// Spread syntax.
// Unrelated spread syntax.
{
code: `
const extra = {};
Expand All @@ -185,6 +185,16 @@ ruleTester.run('require-meta-has-suggestions', rule, {
ecmaVersion: 9,
},
},
// Related spread.
`
const extra = { hasSuggestions: true };
module.exports = {
meta: { ...extra },
create(context) {
context.report({node, message, suggest: [{}]});
}
};
`,
],

invalid: [
Expand Down
10 changes: 9 additions & 1 deletion tests/lib/rules/require-meta-schema.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const RuleTester = require('eslint').RuleTester;
// Tests
// ------------------------------------------------------------------------------

const ruleTester = new RuleTester({ parserOptions: { ecmaVersion: 6 } });
const ruleTester = new RuleTester({ parserOptions: { ecmaVersion: 9 } });
ruleTester.run('require-meta-schema', rule, {
valid: [
`
Expand Down Expand Up @@ -109,6 +109,14 @@ ruleTester.run('require-meta-schema', rule, {
code: 'module.exports = { create(context) {} };',
options: [{ requireSchemaPropertyWhenOptionless: false }],
},
// Spread.
`
const extra = { schema: [] };
module.exports = {
meta: { ...extra },
create(context) {}
};
`,
],

invalid: [
Expand Down
Loading