isml-linter 5.40.3 → 5.40.5

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## [5.40.5] - 2023-01-15
+
+### Fixed
+ - Disallow void elements closing tags;
+ - Minor output messages improvement;
+
+## [5.40.4] - 2023-01-15
+
+### Fixed
+ - Invalid ">" character detection;
+ - Invalid element issue length;
+ - "no-inline-style" rule;
+ 
 ## [5.40.3] - 2022-09-12
 
 ### Fixed
@@ -1027,6 +1040,8 @@
 ### Added
 - Linter is published;
 
+[5.40.5]: https://github.com/FabiowQuixada/isml-linter/compare/v5.40.4...v5.40.5
+[5.40.4]: https://github.com/FabiowQuixada/isml-linter/compare/v5.40.3...v5.40.4
 [5.40.3]: https://github.com/FabiowQuixada/isml-linter/compare/v5.40.2...v5.40.3
 [5.40.2]: https://github.com/FabiowQuixada/isml-linter/compare/v5.40.1...v5.40.2
 [5.40.1]: https://github.com/FabiowQuixada/isml-linter/compare/v5.40.0...v5.40.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isml-linter",
-  "version": "5.40.3",
+  "version": "5.40.5",
   "author": "Fabiow Quixadá <ftquixada@gmail.com>",
   "license": "MIT",
   "main": "src/publicApi.js",

package/src/isml_tree/ParseUtils.js

@@ -103,6 +103,9 @@ const checkBalance = (node, templatePath) => {
 };
 
 const parseNextElement = state => {
+    const ConfigUtils = require('../util/ConfigUtils');
+
+    const config     = ConfigUtils.load();
     const newElement = getNewElement(state);
 
     const trimmedElement     = newElement.value.trim();
@@ -125,7 +128,8 @@ const parseNextElement = state => {
             parseTextElement(state, newElement);
     }
 
-    newElement.columnNumber = getElementColumnNumber(newElement, state);
+    newElement.columnNumber  = getElementColumnNumber(newElement, state);
+    newElement.isVoidElement = !config.disableHtml5 && Constants.voidElementsArray.indexOf(newElement.tagType) >= 0;
 
     if (state.isCrlfLineBreak) {
         newElement.globalPos += newElement.lineNumber - 1;
@@ -140,6 +144,14 @@ const parseNextElement = state => {
             newElement.globalPos,
             state.templatePath
         );
+    } else if (newElement.value.trim() === '>') {
+        throw ExceptionUtils.invalidCharacterError(
+            '>',
+            newElement.lineNumber,
+            newElement.globalPos,
+            1,
+            state.templatePath
+        );
     }
 
     return newElement;

package/src/isml_tree/TreeBuilder.js

@@ -110,7 +110,17 @@ const parseContainerElements = (element, currentParent, newNode, templatePath) =
 
 const parseNonContainerElements = (element, currentParent, newNode, templatePath) => {
     if (element.isSelfClosing) {
-        currentParent.addChild(newNode);
+        if (element.isClosingTag && element.isVoidElement) {
+            throw ExceptionUtils.voidElementClosingTag(
+                element.tagType,
+                element.lineNumber,
+                element.globalPos,
+                element.value.trim().length,
+                templatePath
+            );
+        } else {
+            currentParent.addChild(newNode);
+        }
     } else if (!element.isClosingTag && element.tagType !== 'isif') {
         currentParent.addChild(newNode);
 

package/src/rules/line_by_line/no-inline-style.js

@@ -2,7 +2,7 @@ const SingleLineRulePrototype = require('../prototypes/SingleLineRulePrototype')
 
 const ruleId         = require('path').basename(__filename).slice(0, -3);
 const description    = 'Avoid using inline style';
-const occurrenceText = 'style="';
+const occurrenceText = ' style="';
 
 const Rule = Object.create(SingleLineRulePrototype);
 
@@ -11,7 +11,7 @@ Rule.init(ruleId, description);
 Rule.isBroken = function(line) { return line.indexOf('<isprint') === -1 && line.indexOf(occurrenceText) >= 0; };
 
 Rule.getColumnNumber = function(line) {
-    return Math.max(line.indexOf(occurrenceText), 0) + 1;
+    return Math.max(line.indexOf(occurrenceText), 0) + 2;
 };
 
 Rule.getFirstOccurrence = function(line) {
@@ -23,8 +23,8 @@ Rule.getFirstOccurrence = function(line) {
         const matchPos = line.indexOf(occurrenceText);
 
         result = {
-            globalPos : matchPos,
-            length    : occurrenceText.length - 2
+            globalPos : matchPos + 1,
+            length    : occurrenceText.length - 3
         };
     }
 

package/src/util/ExceptionUtils.js

@@ -7,6 +7,7 @@ const types = {
     INVALID_TEMPLATE                 : 'INVALID_TEMPLATE',
     INVALID_NESTED_ISIF              : 'INVALID_NESTED_ISIF',
     INVALID_CHARACTER                : 'INVALID_CHARACTER',
+    VOID_ELEMENT_CLOSING_TAG         : 'VOID_ELEMENT_CLOSING_TAG',
     RULE_ERROR                       : 'RULE_ERROR',
     NO_CONFIG                        : 'NO_CONFIG',
 };
@@ -100,12 +101,24 @@ const invalidCharacterError = (character, lineNumber, globalPos, length, templat
     };
 };
 
+const voidElementClosingTag = (element, lineNumber, globalPos, length, templatePath) => {
+    return {
+        message      : `"<${element}>" is a void element, and as such, should not have a corresponding closing tag`,
+        templatePath : templatePath,
+        globalPos,
+        length,
+        lineNumber   : lineNumber,
+        isCustom     : true,
+        type         : types.VOID_ELEMENT_CLOSING_TAG
+    };
+};
+
 const invalidNestedIsifError = (tagType, lineNumber, globalPos, templatePath) => {
     return {
         message      : `An error occurred while parsing element "<${tagType}>" in line ${lineNumber}. Try moving the closing character ">" of the "<${tagType}>" element to outside of the "<isif>" condition.`,
         templatePath : templatePath,
         globalPos,
-        length       : tagType.length,
+        length       : tagType.length + 1,
         lineNumber   : lineNumber,
         isCustom     : true,
         type         : types.INVALID_NESTED_ISIF
@@ -135,14 +148,14 @@ const unkownError = (templatePath) => {
 
 const noConfigError = () => {
     return {
-        message  : `No configuration found. Please run the following command: ${Constants.EOL}${Constants.EOL}\t./node_modules/.bin/isml-linter --init${Constants.EOL}${Constants.EOL}`,
+        message  : `No ISML Linter configuration file found. Please run the following command: ${Constants.EOL}${Constants.EOL}\t./node_modules/.bin/isml-linter --init${Constants.EOL}${Constants.EOL}`,
         isCustom : true
     };
 };
 
 const noEslintConfigError = () => {
     return {
-        message  : 'No eslint configuration found. Please add an ESLint configuration file and try again.',
+        message  : 'No ESLint configuration file found. Please add an ESLint configuration file and try again.',
         isCustom : true
     };
 };
@@ -160,6 +173,7 @@ module.exports = {
     unbalancedQuotesError,
     ruleApplianceError,
     unkownError,
+    voidElementClosingTag,
     invalidNestedIsifError,
     unclosedDeprecatedIsmlComment,
     unbalancedElementError,