Merge pull request #91 from htmlacademy/fix/code

Restructure code

Author: nikolai-shabalin

rules/aria-label-misuse/index.js

@@ -10,7 +10,7 @@ const interactive = [
   'a', 'audio', 'button', 'details', 'iframe', 'input', 'label', 'progress', 'select', 'textarea', 'video',
 ];
 
-function isValidUsage(node) {
+const isValidUsage = (node) => {
   /* landmark and other whitelisted elements are valid */
   if (whitelisted.includes(node.name.toLowerCase())) {
     return true;
@@ -22,7 +22,7 @@ function isValidUsage(node) {
 
   /* elements with tabindex (implicit interactive) are valid */
   return has_non_empty_attribute(node, 'tabindex');
-}
+};
 
 module.exports = {
   name: 'htmlacademy/aria-label-misuse',

rules/charset-position/index.js

@@ -1,13 +1,13 @@
 'use strict';
 // eslint-disable-next-line camelcase
-const dom_utils = require('@linthtml/dom-utils');
+const { is_tag_node } = require('@linthtml/dom-utils');
 
 module.exports = {
   name: 'htmlacademy/charset-position',
   // eslint-disable-next-line camelcase
   lint(node, rule_config, { report }) {
     // eslint-disable-next-line camelcase
-    if (dom_utils.is_tag_node(node) && node.name === 'head') {
+    if (is_tag_node(node) && node.name === 'head') {
       const childrenWithoutText = node.children.filter((children) => children.type !== 'text');
       const firstElement = childrenWithoutText[0];
       const hasMeta = firstElement.name === 'meta';

rules/class-first/index.js

@@ -1,17 +1,17 @@
 'use strict';
 // eslint-disable-next-line camelcase
-const dom_utils = require('@linthtml/dom-utils');
+const { is_tag_node, get_attribute } = require('@linthtml/dom-utils');
 
 module.exports = {
   name: 'htmlacademy/class-first',
   // eslint-disable-next-line camelcase
   lint(node, rule_config, { report }) {
     // eslint-disable-next-line camelcase
-    if (dom_utils.is_tag_node(node) === false) {
+    if (is_tag_node(node) === false) {
       return;
     }
     // eslint-disable-next-line camelcase
-    const attribute = dom_utils.get_attribute(node, 'class');
+    const attribute = get_attribute(node, 'class');
     if (attribute && attribute !== node.attributes[0]) {
       report({
         position: attribute.loc,

rules/form-action-attribute/index.js

@@ -1,13 +1,13 @@
 'use strict';
 // eslint-disable-next-line camelcase
-const dom_utils = require('@linthtml/dom-utils');
+const { is_tag_node } = require('@linthtml/dom-utils');
 
 module.exports = {
   name: 'htmlacademy/form-action-attribute',
   // eslint-disable-next-line camelcase
   lint(node, rule_config, { report }) {
     // eslint-disable-next-line camelcase
-    if (dom_utils.is_tag_node(node) && node.name === 'form') {
+    if (is_tag_node(node) && node.name === 'form') {
       const actionAttribute = node.attributes.find(
         (attr) => attr.name.chars === 'action'
       );

rules/head-meta-charset/index.js

@@ -1,13 +1,13 @@
 'use strict';
 // eslint-disable-next-line camelcase
-const dom_utils = require('@linthtml/dom-utils');
+const { is_tag_node } = require('@linthtml/dom-utils');
 
 module.exports = {
   name: 'htmlacademy/head-meta-charset',
   // eslint-disable-next-line camelcase
   lint(node, rule_config, { report }) {
     // eslint-disable-next-line camelcase
-    if (dom_utils.is_tag_node(node) && node.name === 'head') {
+    if (is_tag_node(node) && node.name === 'head') {
       const metaElements = node.children.filter((child) => child.name === 'meta');
       const hasCharset = metaElements.some((meta) => meta.attributes.some((attribute) => attribute.name.chars === 'charset'));
       if (hasCharset === false) {

rules/img-svg-req-dimensions/index.js

@@ -1,6 +1,6 @@
 'use strict';
 // eslint-disable-next-line camelcase
-const {is_tag_node, has_non_empty_attribute} = require('@linthtml/dom-utils');
+const { is_tag_node, has_non_empty_attribute } = require('@linthtml/dom-utils');
 
 module.exports = {
   name: 'htmlacademy/img-svg-req-dimensions',

rules/input-req-label/index.js

@@ -1,6 +1,6 @@
 'use strict';
 /* eslint-disable camelcase */
-const {is_tag_node, attribute_value, attribute_has_value, has_non_empty_attribute,} = require('@linthtml/dom-utils');
+const { is_tag_node, attribute_value, attribute_has_value, has_non_empty_attribute } = require('@linthtml/dom-utils');
 
 class Issue {
   code;

rules/no-px-size/index.js

@@ -1,6 +1,6 @@
 'use strict';
 // eslint-disable-next-line camelcase
-const {is_tag_node, has_non_empty_attribute, attribute_value, get_attribute} = require('@linthtml/dom-utils');
+const { is_tag_node, has_non_empty_attribute, attribute_value, get_attribute } = require('@linthtml/dom-utils');
 
 const onlyDigits = (val) => /^\d+$/.test(val);