Skip to content

Variable Declarations & Callee Behavior #264

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

Open
jd-carroll wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Variable Declarations & Callee Behavior #264

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4b264d0
Vue specific names
jd-carroll Aug 11, 2023
443106b
Parse variable declarations
jd-carroll Aug 11, 2023
db6f424
Clean-up names
jd-carroll Aug 11, 2023
90a8f7f
Fix callee
jd-carroll Aug 11, 2023
84c9f49
Fix callee evaluation
jd-carroll Aug 11, 2023
ede49d0
Variable declarations on remaining rules && callee key vs value
jd-carroll Aug 11, 2023
d2ea041
Fix: Pass initialization node as arg
jd-carroll Aug 11, 2023
f1ab6f4
Support conditional expression declarations
jd-carroll Aug 14, 2023
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
Next Next commit
Fix callee
  • Loading branch information
@jd-carroll
jd-carroll committed Aug 11, 2023
commit 90a8f7ff7fbd34d0c4b2a43463b4cd3af87cce4e
17 changes: 9 additions & 8 deletions lib/rules/no-contradicting-classname.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,15 +166,16 @@ module.exports = {
return;
}
if (astUtil.isLiteralAttributeValue(node)) {
astUtil.parseNodeRecursive(node, null, parseForContradictingClassNames, true, false, ignoredKeys);
astUtil.parseNodeRecursive(node, null, parseForContradictingClassNames, true, false, ignoredKeys, false);
} else if (node.value && node.value.type === 'JSXExpressionContainer') {
astUtil.parseNodeRecursive(
node,
node.value.expression,
parseForContradictingClassNames,
true,
false,
ignoredKeys
ignoredKeys,
false
);
}
};
Expand All @@ -195,7 +196,7 @@ module.exports = {
}
};
node.arguments.forEach((arg) => {
astUtil.parseNodeRecursive(node, arg, pushClasses, true, false, ignoredKeys);
astUtil.parseNodeRecursive(node, arg, pushClasses, true, false, ignoredKeys, true);
});
parseForContradictingClassNames(allClassnamesForNode, node);
};
Expand All @@ -207,7 +208,7 @@ module.exports = {
if (!astUtil.isValidDeclaratorValue(node)) {
return;
}
astUtil.parseNodeRecursive(node, node.init, parseForContradictingClassNames, true, false, ignoredKeys);
astUtil.parseNodeRecursive(node, node.init, parseForContradictingClassNames, true, false, ignoredKeys, false);
};

const scriptVisitor = {
Expand All @@ -230,7 +231,7 @@ module.exports = {
allClassnamesForNode.push(...classNames);
}
};
astUtil.parseNodeRecursive(node, node.quasi, pushClasses, true, false, ignoredKeys);
astUtil.parseNodeRecursive(node, node.quasi, pushClasses, true, false, ignoredKeys, false);
parseForContradictingClassNames(allClassnamesForNode, node);
},
};
Expand All @@ -246,7 +247,7 @@ module.exports = {
case !astUtil.isValidVueAttribute(node, classRegex):
return;
case astUtil.isVLiteralValue(node):
astUtil.parseNodeRecursive(node, null, parseForContradictingClassNames, true, false, ignoredKeys);
astUtil.parseNodeRecursive(node, null, parseForContradictingClassNames, true, false, ignoredKeys, false);
break;
case astUtil.isVArrayExpression(node):
const allClassnamesForNode = [];
Expand All @@ -260,13 +261,13 @@ module.exports = {
}
};
node.value.expression.elements.forEach((el) => {
astUtil.parseNodeRecursive(node, el, pushClasses, true, false, ignoredKeys);
astUtil.parseNodeRecursive(node, el, pushClasses, true, false, ignoredKeys, false);
});
parseForContradictingClassNames(allClassnamesForNode, node);
break;
case astUtil.isVObjectExpression(node):
node.value.expression.properties.forEach((prop) => {
astUtil.parseNodeRecursive(node, prop, parseForContradictingClassNames, false, false, ignoredKeys);
astUtil.parseNodeRecursive(node, prop, parseForContradictingClassNames, false, false, ignoredKeys, false);
});
break;
}
Expand Down
16 changes: 8 additions & 8 deletions lib/rules/no-custom-classname.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,9 +163,9 @@ module.exports = {
return;
}
if (astUtil.isLiteralAttributeValue(node)) {
astUtil.parseNodeRecursive(node, null, parseForCustomClassNames, false, false, ignoredKeys);
astUtil.parseNodeRecursive(node, null, parseForCustomClassNames, false, false, ignoredKeys, false);
} else if (node.value && node.value.type === 'JSXExpressionContainer') {
astUtil.parseNodeRecursive(node, node.value.expression, parseForCustomClassNames, false, false, ignoredKeys);
astUtil.parseNodeRecursive(node, node.value.expression, parseForCustomClassNames, false, false, ignoredKeys, false);
}
};

Expand All @@ -175,7 +175,7 @@ module.exports = {
return;
}
node.arguments.forEach((arg) => {
astUtil.parseNodeRecursive(node, arg, parseForCustomClassNames, false, false, ignoredKeys);
astUtil.parseNodeRecursive(node, arg, parseForCustomClassNames, false, false, ignoredKeys, true);
});
};

Expand All @@ -186,7 +186,7 @@ module.exports = {
if (!astUtil.isValidDeclaratorValue(node)) {
return;
}
astUtil.parseNodeRecursive(node, node.init, parseForCustomClassNames, false, false, ignoredKeys);
astUtil.parseNodeRecursive(node, node.init, parseForCustomClassNames, false, false, ignoredKeys, false);
};

const scriptVisitor = {
Expand All @@ -198,7 +198,7 @@ module.exports = {
if (!tags.includes(node.tag.name)) {
return;
}
astUtil.parseNodeRecursive(node, node.quasi, parseForCustomClassNames, false, false, ignoredKeys);
astUtil.parseNodeRecursive(node, node.quasi, parseForCustomClassNames, false, false, ignoredKeys, false);
},
};

Expand All @@ -213,16 +213,16 @@ module.exports = {
case !astUtil.isValidVueAttribute(node, classRegex):
return;
case astUtil.isVLiteralValue(node):
astUtil.parseNodeRecursive(node, null, parseForCustomClassNames, false, false, ignoredKeys);
astUtil.parseNodeRecursive(node, null, parseForCustomClassNames, false, false, ignoredKeys, false);
break;
case astUtil.isVArrayExpression(node):
node.value.expression.elements.forEach((arg) => {
astUtil.parseNodeRecursive(node, arg, parseForCustomClassNames, false, false, ignoredKeys);
astUtil.parseNodeRecursive(node, arg, parseForCustomClassNames, false, false, ignoredKeys, false);
});
break;
case astUtil.isVObjectExpression(node):
node.value.expression.properties.forEach((prop) => {
astUtil.parseNodeRecursive(node, prop, parseForCustomClassNames, false, false, ignoredKeys);
astUtil.parseNodeRecursive(node, prop, parseForCustomClassNames, false, false, ignoredKeys, false);
});
break;
}
Expand Down
21 changes: 10 additions & 11 deletions lib/util/ast.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ function extractClassnamesFromValue(classStr) {
* @param {Array} ignoredKeys Optional, set object keys which should not be parsed e.g. for `cva`
* @returns {void}
*/
function parseNodeRecursive(rootNode, childNode, cb, skipConditional = false, isolate = false, ignoredKeys = []) {
function parseNodeRecursive(rootNode, childNode, cb, skipConditional = false, isolate = false, ignoredKeys = [], callee = false) {
// TODO allow vue non litteral
let originalClassNamesValue;
let classNames;
Expand All @@ -335,28 +335,26 @@ function parseNodeRecursive(rootNode, childNode, cb, skipConditional = false, is
switch (childNode.type) {
case 'TemplateLiteral':
childNode.expressions.forEach((exp) => {
parseNodeRecursive(rootNode, exp, cb, skipConditional, forceIsolation, ignoredKeys);
parseNodeRecursive(rootNode, exp, cb, skipConditional, forceIsolation, ignoredKeys, callee);
});
childNode.quasis.forEach((quasis) => {
parseNodeRecursive(rootNode, quasis, cb, skipConditional, isolate, ignoredKeys);
parseNodeRecursive(rootNode, quasis, cb, skipConditional, isolate, ignoredKeys, callee);
});
return;
case 'ConditionalExpression':
parseNodeRecursive(rootNode, childNode.consequent, cb, skipConditional, forceIsolation, ignoredKeys);
parseNodeRecursive(rootNode, childNode.alternate, cb, skipConditional, forceIsolation, ignoredKeys);
parseNodeRecursive(rootNode, childNode.consequent, cb, skipConditional, forceIsolation, ignoredKeys, callee);
parseNodeRecursive(rootNode, childNode.alternate, cb, skipConditional, forceIsolation, ignoredKeys, callee);
return;
case 'LogicalExpression':
parseNodeRecursive(rootNode, childNode.right, cb, skipConditional, forceIsolation, ignoredKeys);
parseNodeRecursive(rootNode, childNode.right, cb, skipConditional, forceIsolation, ignoredKeys, callee);
return;
case 'ArrayExpression':
childNode.elements.forEach((el) => {
parseNodeRecursive(rootNode, el, cb, skipConditional, forceIsolation, ignoredKeys);
parseNodeRecursive(rootNode, el, cb, skipConditional, forceIsolation, ignoredKeys, callee);
});
return;
case 'ObjectExpression':
childNode.properties.forEach((prop) => {
const isUsedByClassNamesPlugin = rootNode.callee && rootNode.callee.name === 'classnames';

if (prop.type === 'SpreadElement') {
// Ignore spread elements
return;
Expand All @@ -373,12 +371,13 @@ function parseNodeRecursive(rootNode, childNode, cb, skipConditional = false, is
cb,
skipConditional,
forceIsolation,
ignoredKeys
ignoredKeys,
callee
);
});
return;
case 'Property':
parseNodeRecursive(rootNode, childNode.key, cb, skipConditional, forceIsolation, ignoredKeys);
parseNodeRecursive(rootNode, childNode.key, cb, skipConditional, forceIsolation, ignoredKeys, callee);
return;
case 'Literal':
trim = true;
Expand Down