Merge pull request #77 from htmlacademy/fix/req-charset-utf

Adds a property check

Author: nikolai-shabalin

.eslintrc

@@ -5,5 +5,10 @@
   },
   "extends": [
     "htmlacademy/vanilla"
-  ]
+  ],
+  "rules": {
+    "camelcase": [2, {
+      "ignoreDestructuring": true
+    }]
+  }
 }

package.json

@@ -5,7 +5,7 @@
   "main": "index.js",
   "scripts": {
     "eslint": "eslint rules/**/*.js",
-    "lint": "eslint"
+    "lint": "npm run eslint"
   },
   "keywords": [],
   "author": "",

rules/req-charset-utf/index.js

@@ -1,20 +1,18 @@
 'use strict';
-// eslint-disable-next-line camelcase
-const dom_utils = require('@linthtml/dom-utils');
+const { has_non_empty_attribute, is_tag_node, attribute_has_value } = require('@linthtml/dom-utils');
 
 module.exports = {
   name: 'htmlacademy/req-charset-utf',
   // eslint-disable-next-line camelcase
   lint(node, rule_config, { report }) {
-    // eslint-disable-next-line camelcase
-    if (dom_utils.is_tag_node(node) && node.name === 'meta') {
-      const hasUtf = node.attributes.some((attribute) => attribute.value.chars.toLowerCase() === 'utf-8');
-      const hasCharset = node.attributes.some((attribute) => attribute.name.chars === 'charset');
+    if (is_tag_node(node) && node.name === 'meta') {
+      const hasCharset = has_non_empty_attribute(node, 'charset', true);
+      const hasUtf = attribute_has_value(node, 'charset', /^utf-8$/i);
 
       if (hasCharset === true && hasUtf === false) {
         report({
           position: node.loc,
-          message: '"The attribute charset="" should have a value of \'utf-8\'."',
+          message: 'The attribute charset should have a value of "utf-8".',
         });
       }
     }