isml-linter 5.40.0 → 5.40.3

package/.gitattributes

@@ -0,0 +1 @@
+bin/isml-linter.js text eol=lf

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## [5.40.3] - 2022-09-12
+
+### Fixed
+ - [Issue #35][issue#35] - Manually set bin file linebreak to LF, as previous version didn't fix the issue;
+
+## [5.40.2] - 2022-09-05
+
+### Fixed
+ - [Issue #35][issue#35] - Set bin file linebreak to LF;
+
+## [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 +1027,9 @@
 ### Added
 - Linter is published;
 
+[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
 [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
@@ -1162,6 +1181,7 @@
 [issue#29]: https://github.com/FabiowQuixada/isml-linter/issues/29
 [issue#30]: https://github.com/FabiowQuixada/isml-linter/issues/30
 [issue#31]: https://github.com/FabiowQuixada/isml-linter/issues/31
+[issue#35]: https://github.com/FabiowQuixada/isml-linter/issues/35
 
 [cli-docs]: <docs/cli.md>
 [api-docs]: <docs/api.md>

package/bin/isml-linter.js

@@ -1,32 +1,32 @@
-#!/usr/bin/env node
-
-require('../src/util/NativeExtensionUtils');
-
-const CommandLineUtils = require('../src/util/CommandLineUtils');
-const ConfigUtils      = require('../src/util/ConfigUtils');
-
-try {
-    const commandObj = CommandLineUtils.parseCommand();
-
-    if (!commandObj) {
-        process.exit(0);
-    }
-
-    if (commandObj.options.indexOf('--init') >= 0) {
-        ConfigUtils.init();
-        process.exit(0);
-    }
-
-    const IsmlLinter       = require('../src/publicApi');
-    const filePatternArray = commandObj.files;
-    const exitCode         = IsmlLinter.build(filePatternArray);
-
-    if (commandObj.options.indexOf('--build') >= 0) {
-        process.exit(exitCode);
-    }
-
-} catch (e) {
-    const ConsoleUtils = require('../src/util/ConsoleUtils');
-    ConsoleUtils.printExceptionMsg(e.stack || e);
-    process.exit(1);
-}
+#!/usr/bin/env node
+
+require('../src/util/NativeExtensionUtils');
+
+const CommandLineUtils = require('../src/util/CommandLineUtils');
+const ConfigUtils      = require('../src/util/ConfigUtils');
+
+try {
+    const commandObj = CommandLineUtils.parseCommand();
+
+    if (!commandObj) {
+        process.exit(0);
+    }
+
+    if (commandObj.options.indexOf('--init') >= 0) {
+        ConfigUtils.init();
+        process.exit(0);
+    }
+
+    const IsmlLinter       = require('../src/publicApi');
+    const filePatternArray = commandObj.files;
+    const exitCode         = IsmlLinter.build(filePatternArray);
+
+    if (commandObj.options.indexOf('--build') >= 0) {
+        process.exit(exitCode);
+    }
+
+} catch (e) {
+    const ConsoleUtils = require('../src/util/ConsoleUtils');
+    ConsoleUtils.printExceptionMsg(e.stack || e);
+    process.exit(1);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isml-linter",
-  "version": "5.40.0",
+  "version": "5.40.3",
   "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,