@lvce-editor/eslint-plugin-virtual-dom 17.0.0 → 17.0.1

package/dist/index.js

@@ -150,6 +150,13 @@ const isStaticIdentifier = (sourceCode, node) => {
   const variable = findVariable(sourceCode, node);
   return Boolean(variable && isStaticModuleVariable(variable));
 };
+const isVirtualDomElement = node => {
+  if (!isVirtualDomNode(node) || !hasProperty(node, 'childCount')) {
+    return false;
+  }
+  const type = getProperty(node, 'type');
+  return Boolean(type && !isStringLiteral(type.value));
+};
 const isStaticProperty = (sourceCode, node) => {
   if (node.type === 'SpreadElement' || node.kind !== 'init' || node.method) {
     return false;
@@ -190,7 +197,7 @@ const isStaticExpression = (sourceCode, node) => {
 const create$b = context => {
   return {
     ObjectExpression(node) {
-      if (!isVirtualDomNode(node)) {
+      if (!isVirtualDomElement(node)) {
         return;
       }
       if (!context.sourceCode.getAncestors(node).some(isFunctionNode$1)) {
@@ -553,6 +560,9 @@ const preferLazyDateTimeFormat = {
 const isClassNameKey = node => {
   return getStaticPropertyName(node) === 'className';
 };
+const isClassNameProperty = node => {
+  return isPropertyNode(node) && isClassNameKey(node);
+};
 const isStringLiteralWithSpace = node => {
   return isStringLiteral(node) && /\s/.test(node.value);
 };
@@ -574,6 +584,24 @@ const isManualClassNameConcatenation = node => {
   }
   return isStringLiteralWithSpace(node.left) || isStringLiteralWithSpace(node.right) || isManualClassNameConcatenation(node.left) || isManualClassNameConcatenation(node.right);
 };
+const hasClassNamesReference = node => {
+  if (isMemberExpressionNode(node)) {
+    return isIdentifierNode(node.object) && node.object.name === 'ClassNames' || hasClassNamesReference(node.object) || node.computed && hasClassNamesReference(node.property);
+  }
+  if (isBinaryExpressionNode(node)) {
+    return hasClassNamesReference(node.left) || hasClassNamesReference(node.right);
+  }
+  if (isTemplateLiteralNode(node)) {
+    return node.expressions.some(hasClassNamesReference);
+  }
+  return false;
+};
+const getParent = node => {
+  if (typeof node === 'object' && node !== null && 'parent' in node) {
+    return node.parent;
+  }
+  return undefined;
+};
 const meta$2 = {
   docs: {
     description: 'Prefer mergeClassNames for composing virtual-dom className values'
@@ -584,7 +612,21 @@ const meta$2 = {
   type: 'suggestion'
 };
 const create$2 = context => {
+  const reportNamespacedClassNameComposition = node => {
+    if (!isManualClassNameConcatenation(node) || !hasClassNamesReference(node)) {
+      return;
+    }
+    const parent = getParent(node);
+    if (isManualClassNameConcatenation(parent) || isClassNameProperty(parent)) {
+      return;
+    }
+    context.report({
+      messageId: 'preferMergeClassNames',
+      node: node
+    });
+  };
   return {
+    BinaryExpression: reportNamespacedClassNameComposition,
     Property(node) {
       if (!isPropertyNode(node) || !isClassNameKey(node) || !isManualClassNameConcatenation(node.value)) {
         return;
@@ -593,7 +635,8 @@ const create$2 = context => {
         messageId: 'preferMergeClassNames',
         node: node.value
       });
-    }
+    },
+    TemplateLiteral: reportNamespacedClassNameComposition
   };
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/eslint-plugin-virtual-dom",
-  "version": "17.0.0",
+  "version": "17.0.1",
   "main": "dist/index.js",
   "repository": {
     "type": "git",