isml-linter 5.40.0 → 5.40.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [5.40.1] - 2022-09-01
+
+### Fixed
+ - HTML-element embedded `<isif>` condition scenario;
+ - Added mechanism to prevent infinite loops in case of unexpected errors;
+ 
 ## [5.40.0] - 2022-02-05
 
 ### Added
@@ -1011,6 +1017,7 @@
 ### Added
 - Linter is published;
 
+[5.40.0]: https://github.com/FabiowQuixada/isml-linter/compare/v5.40.0...v5.40.1
 [5.40.0]: https://github.com/FabiowQuixada/isml-linter/compare/v5.39.4...v5.40.0
 [5.39.4]: https://github.com/FabiowQuixada/isml-linter/compare/v5.39.3...v5.39.4
 [5.39.3]: https://github.com/FabiowQuixada/isml-linter/compare/v5.39.2...v5.39.3

package/package.json

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

package/src/isml_tree/ParseUtils.js

@@ -132,6 +132,15 @@ const parseNextElement = state => {
     }
 
     state.elementList.push(newElement);
+    
+    if (newElement.type === 'htmlTag' && newElement.value.indexOf('<isif') >= 0 && newElement.value.indexOf('</isif') < 0) {
+        throw ExceptionUtils.invalidNestedIsifError(
+            newElement.tagType,
+            newElement.lineNumber,
+            newElement.globalPos,
+            state.templatePath
+        );
+    }
 
     return newElement;
 };
@@ -454,13 +463,21 @@ const getNewElement = state => {
 
 const getElementList = (templateContent, templatePath, isCrlfLineBreak) => {
 
-    const state       = getInitialState(templateContent, templatePath, isCrlfLineBreak);
-    const elementList = state.elementList;
+    const state              = getInitialState(templateContent, templatePath, isCrlfLineBreak);
+    const elementList        = state.elementList;
+    let previousStateContent = state.remainingShadowContent;
 
     do {
         initLoopState(state);
         parseNextElement(state);
         finishLoopState(state);
+
+        if (previousStateContent.length === state.remainingShadowContent.length) {
+            throw ExceptionUtils.unkownError(templatePath);
+        }
+
+        previousStateContent = state.remainingShadowContent;
+
     } while (state.remainingShadowContent.length > 0);
 
     adjustTrailingSpaces(state);

package/src/util/ExceptionUtils.js

@@ -5,6 +5,7 @@ const types = {
     UNKNOWN_ERROR                    : 'UNKNOWN_ERROR',
     UNCLOSED_DEPRECATED_ISML_COMMENT : 'UNCLOSED_DEPRECATED_ISML_COMMENT',
     INVALID_TEMPLATE                 : 'INVALID_TEMPLATE',
+    INVALID_NESTED_ISIF              : 'INVALID_NESTED_ISIF',
     INVALID_CHARACTER                : 'INVALID_CHARACTER',
     RULE_ERROR                       : 'RULE_ERROR',
     NO_CONFIG                        : 'NO_CONFIG',
@@ -99,6 +100,18 @@ const invalidCharacterError = (character, lineNumber, globalPos, length, templat
     };
 };
 
+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,
+        lineNumber   : lineNumber,
+        isCustom     : true,
+        type         : types.INVALID_NESTED_ISIF
+    };
+};
+
 const parseError = (elementType, lineNumber, globalPos, length, templatePath) => {
     return {
         message      : `An unexpected error happened while parsing element ${elementType} at ${templatePath}:${lineNumber}.`,
@@ -111,6 +124,15 @@ const parseError = (elementType, lineNumber, globalPos, length, templatePath) =>
     };
 };
 
+const unkownError = (templatePath) => {
+    return {
+        message      : `An unexpected error happened while parsing template ${templatePath}. Please consider adding it to the ignore list for now.`,
+        templatePath : templatePath,
+        isCustom     : true,
+        type         : types.UNKNOWN_ERROR
+    };
+};
+
 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}`,
@@ -137,6 +159,8 @@ module.exports = {
     parseError,
     unbalancedQuotesError,
     ruleApplianceError,
+    unkownError,
+    invalidNestedIsifError,
     unclosedDeprecatedIsmlComment,
     unbalancedElementError,
     unexpectedClosingElementError,