eslint-plugin-vue-scoped-css 2.3.0 → 2.4.0

package/dist/styles/context/vue-components/index.js

@@ -17,7 +17,7 @@ class VueComponentContext {
     }
     findVueComponentProperty(name) {
         const properties = this.properties ||
-            (this.properties = extractVueComponentPropertes(this.node, this.context));
+            (this.properties = extractVueComponentProperties(this.node, this.context));
         if (properties[UNKNOWN]) {
             return null;
         }
@@ -48,7 +48,7 @@ function createVueComponentContext(context) {
     return new VueComponentContext(node, context);
 }
 exports.createVueComponentContext = createVueComponentContext;
-function extractVueComponentPropertes(vueNode, context) {
+function extractVueComponentProperties(vueNode, context) {
     const result = {
         data: {},
         computed: {},
@@ -129,7 +129,7 @@ function extractVueComponentComputed(computedNode, context) {
             continue;
         }
         const values = computed[keyName] || (computed[keyName] = []);
-        const { value } = p;
+        const value = p.value;
         let func = value;
         if (value.type === "ObjectExpression") {
             const get = value.properties

package/dist/styles/selectors/query/attribute-tracker.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getReferenceExpressions = exports.getAttributeValueNodes = void 0;
-const context_1 = require("../../context");
+exports.getAttributeValueNodes = void 0;
 const templates_1 = require("../../../utils/templates");
+const reference_expression_1 = require("./reference-expression");
 function getAttributeValueNodes(element, name, context) {
     const results = [];
     const { startTag } = element;
@@ -35,7 +35,7 @@ function getAttributeValueNodes(element, name, context) {
             if (expression == null) {
                 continue;
             }
-            const expressions = getReferenceExpressions(expression, context);
+            const expressions = (0, reference_expression_1.getReferenceExpressions)(expression, context);
             if (!expressions) {
                 return null;
             }
@@ -47,18 +47,3 @@ function getAttributeValueNodes(element, name, context) {
     return results;
 }
 exports.getAttributeValueNodes = getAttributeValueNodes;
-function getReferenceExpressions(expression, context) {
-    if (expression.type !== "Identifier") {
-        return [expression];
-    }
-    const vueComponent = (0, context_1.getVueComponentContext)(context);
-    if (!vueComponent) {
-        return null;
-    }
-    const props = vueComponent.findVueComponentProperty(expression.name);
-    if (props == null) {
-        return null;
-    }
-    return props;
-}
-exports.getReferenceExpressions = getReferenceExpressions;

package/dist/styles/selectors/query/index.js

@@ -9,6 +9,7 @@ const nodes_1 = require("../../utils/nodes");
 const template_1 = require("../../template");
 const templates_1 = require("../../../utils/templates");
 const style_1 = require("../../context/style");
+const reference_expression_1 = require("./reference-expression");
 const TRANSITION_CLASS_BASES = [
     "enter",
     "enter-from",
@@ -562,30 +563,20 @@ function matchClassNameExpression(expression, className, document) {
 }
 function matchClassNameForArrayExpression(expression, className, document) {
     for (const e of expression.elements) {
-        if (e.type === "Identifier") {
-            if (withinTemplate(e, document)) {
-                const expressions = (0, attribute_tracker_1.getReferenceExpressions)(e, document.context);
-                if (expressions) {
-                    for (const e2 of expressions) {
-                        if (matchClassNameExpression(e2, className, document)) {
-                            return true;
-                        }
-                    }
-                }
-            }
-            else {
-                if (matchClassNameExpression(e, className, document)) {
-                    return true;
-                }
-            }
-        }
-        else if (e.type === "SpreadElement") {
+        if (e.type === "SpreadElement") {
             if (matchClassNameExpression(e.argument, className, document)) {
                 return true;
             }
         }
-        else if (matchClassNameExpression(e, className, document)) {
-            return true;
+        else {
+            const expressions = (0, reference_expression_1.getReferenceExpressions)(e, document.context);
+            if (expressions) {
+                for (const e2 of expressions) {
+                    if (matchClassNameExpression(e2, className, document)) {
+                        return true;
+                    }
+                }
+            }
         }
     }
     return false;
@@ -629,12 +620,6 @@ function includesClassName(value, className) {
     }
     return value.divide(/\s+/u).some((s) => className.match(s));
 }
-function withinTemplate(expr, document) {
-    var _a;
-    const templateBody = document.context.getSourceCode().ast.templateBody;
-    const templateRange = (_a = templateBody === null || templateBody === void 0 ? void 0 : templateBody.range) !== null && _a !== void 0 ? _a : [0, 0];
-    return templateRange[0] <= expr.range[0] && expr.range[1] <= templateRange[1];
-}
 function* iterateUnique(gen) {
     const found = new Set();
     for (const e of gen()) {

package/dist/styles/selectors/query/reference-expression.js

@@ -0,0 +1,43 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getReferenceExpressions = void 0;
+const context_1 = require("../../context");
+function getReferenceExpressions(expression, context) {
+    var _a, _b, _c, _d;
+    if (expression.type === "ConditionalExpression") {
+        const { consequent, alternate } = expression;
+        return [
+            ...((_a = getReferenceExpressions(consequent, context)) !== null && _a !== void 0 ? _a : [consequent]),
+            ...((_b = getReferenceExpressions(alternate, context)) !== null && _b !== void 0 ? _b : [alternate]),
+        ];
+    }
+    if (expression.type === "LogicalExpression") {
+        const { left, right } = expression;
+        return [
+            ...((_c = getReferenceExpressions(left, context)) !== null && _c !== void 0 ? _c : [left]),
+            ...((_d = getReferenceExpressions(right, context)) !== null && _d !== void 0 ? _d : [right]),
+        ];
+    }
+    if (expression.type !== "Identifier") {
+        return [expression];
+    }
+    if (!withinTemplate(expression, context)) {
+        return [expression];
+    }
+    const vueComponent = (0, context_1.getVueComponentContext)(context);
+    if (!vueComponent) {
+        return null;
+    }
+    const props = vueComponent.findVueComponentProperty(expression.name);
+    if (props == null) {
+        return null;
+    }
+    return props;
+}
+exports.getReferenceExpressions = getReferenceExpressions;
+function withinTemplate(expr, context) {
+    var _a;
+    const templateBody = context.getSourceCode().ast.templateBody;
+    const templateRange = (_a = templateBody === null || templateBody === void 0 ? void 0 : templateBody.range) !== null && _a !== void 0 ? _a : [0, 0];
+    return templateRange[0] <= expr.range[0] && expr.range[1] <= templateRange[1];
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-vue-scoped-css",
-  "version": "2.3.0",
+  "version": "2.4.0",
   "description": "ESLint plugin for Scoped CSS in Vue.js",
   "main": "dist/index.js",
   "scripts": {