isml-linter 5.42.3 → 5.43.0

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [5.43.0] - 2023-01-31
+
+### Added
+ - "allowWhenDynamic" (default `true`) option to "[no-inline-style][no-inline-style-readme]" rule;
+
+### Fixed
+ - Rule-level ignore string with "/" character for directories;
+ 
+## [5.42.4] - 2023-01-30
+
+### Fixed
+ - "indent" rule fix - multiline self-closing HTML conditional comment;
+ - "indent" rule fix - closing tag after closing "isif" tag;
+ 
 ## [5.42.3] - 2023-01-29
 
 ### Fixed
@@ -1074,6 +1088,8 @@
 ### Added
 - Linter is published;
 
+[5.43.0]: https://github.com/FabiowQuixada/isml-linter/compare/v5.42.4...v5.43.0
+[5.42.4]: https://github.com/FabiowQuixada/isml-linter/compare/v5.42.3...v5.42.4
 [5.42.3]: https://github.com/FabiowQuixada/isml-linter/compare/v5.42.2...v5.42.3
 [5.42.2]: https://github.com/FabiowQuixada/isml-linter/compare/v5.42.1...v5.42.2
 [5.42.1]: https://github.com/FabiowQuixada/isml-linter/compare/v5.42.0...v5.42.1
@@ -1244,7 +1260,7 @@
 [strict-void-elements-readme]: <docs/rules/strict-void-elements.md>
 [disallow-tags-readme]:        <docs/rules/disallow-tags.md>
 [no-br-readme]:                <docs/rules/no-br.md>
-[no-inline-style-readme]:      <docs/rules/no-br.md>
+[no-inline-style-readme]:      <docs/rules/no-inline-style.md>
 [no-isscript-readme]:          <docs/rules/no-isscript.md>
 [enforce-security-readme]:     <docs/rules/enforce-security.md>
 [no-hardcode-readme]:          <docs/rules/no-hardcode.md>

package/package.json

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

package/src/IsmlLinter.js

@@ -225,13 +225,13 @@ Linter.run = (pathData, content, data = {}) => {
         const lintStartTime = new Date();
 
         for (let i = 0; i < templatePathArray.length; i++) {
-            const templateName = templatePathArray[i];
-            const templatePath = Array.isArray(templateData.pathData) || path.isAbsolute(templateName) || templateData.pathData === templateName ?
+            const templateName    = templatePathArray[i];
+            const templatePath    = Array.isArray(templateData.pathData) || path.isAbsolute(templateName) || templateData.pathData === templateName ?
                 templateName :
                 path.join(templateData.pathData, templateName);
-            const isIgnored    = FileUtils.isIgnored(templatePath);
+            const shouldBeIgnored = FileUtils.shouldBeIgnored(templatePath);
 
-            if (!isIgnored) {
+            if (!shouldBeIgnored) {
                 const templateResults = parseAndPossiblyFixTemplate(templatePath, data, content, templateName);
 
                 finalResult = merge(finalResult, templateResults);

package/src/isml_tree/IsmlNode.js

@@ -404,12 +404,11 @@ class IsmlNode {
             indentation += '    ';
         }
 
-        // if(this.isRoot()) {
-        //     console.log('Depth\t :: LineNumber\t :: Content');
-        // }
+        if(this.isRoot()) {
+            console.log('Depth\t :: LineNumber\t :: Content');
+        }
 
-        // console.log(this.depth + '\t :: ' + this.lineNumber + '\t\t :: ' + indentation + getDisplayText(this));
-        console.log(this.depth + ' :: ' + this.lineNumber + ' :: ' + indentation + getDisplayText(this));
+        console.log(this.depth + '\t :: ' + this.lineNumber + '\t\t :: ' + indentation + getDisplayText(this));
 
         for (let i = 0; i < this.children.length; i++) {
             this.children[i].print();

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

@@ -8,7 +8,37 @@ const Rule = Object.create(SingleLineRulePrototype);
 
 Rule.init(ruleId, description);
 
-Rule.isBroken = function(line) { return line.indexOf('<isprint') === -1 && line.indexOf(occurrenceText) >= 0; };
+Rule.isBroken = function(line) {
+    const shouldAllowWhenDynamic = this.getConfigs().allowWhenDynamic;
+
+    if (line.indexOf(occurrenceText) >= 0) {
+        if (shouldAllowWhenDynamic && line.indexOf('${') >= 0) {
+            const attributePos      = line.indexOf(occurrenceText);
+            const tagClosingCharPos = line.substring(attributePos).indexOf('>');
+            const expressionPos     = line.substring(tagClosingCharPos).indexOf('${');
+
+            if (attributePos >= 0 && tagClosingCharPos >= 0 && expressionPos >= 0 &&
+                attributePos < tagClosingCharPos && tagClosingCharPos < expressionPos
+            ) {
+                return true;
+            }
+
+            if (attributePos === -1 || tagClosingCharPos === -1 || expressionPos === -1) {
+                return false;
+            }
+        }
+
+        return line.indexOf('<isprint') === -1;
+    }
+
+    return false;
+};
+
+Rule.getDefaultAttrs = () => {
+    return {
+        allowWhenDynamic: true
+    };
+};
 
 Rule.getColumnNumber = function(line) {
     return Math.max(line.indexOf(occurrenceText), 0) + 2;

package/src/rules/prototypes/RulePrototype.js

@@ -32,11 +32,12 @@ const RulePrototype = {
     },
 
     shouldIgnore(templatePath) {
-        const ignoreArray = this.getConfigs().ignore;
+        const ignoreArray       = this.getConfigs().ignore;
+        const formattedFilePath = templatePath.replaceAll('\\', '/');
 
         if (ignoreArray) {
             return ignoreArray.some( ignore => {
-                return templatePath.includes(ignore);
+                return formattedFilePath.includes(ignore);
             });
         }
 

package/src/rules/tree/indent.js

@@ -613,7 +613,7 @@ const addIndentation = (node, isOpeningTag) => {
     const fullLeadingContent  = content.substring(0, startingPos);
     const preLineBreakContent = fullLeadingContent.substring(0, fullLeadingContent.lastIndexOf(Constants.EOL) + 1);
     const fullTrailingContent = content.substring(endingPos);
-    let nodeIndentation       = node.isInSameLineAsParent() && isOpeningTag ? '' : Rule.getIndentation(node.depth - 1);
+    const nodeIndentation     = node.isInSameLineAsParent() && isOpeningTag ? '' : Rule.getIndentation(node.depth - 1);
     const attributeOffset     = Rule.getAttributeIndentationOffset();
     const attributeList       = node.getAttributeList();
     let contentResult         = '';
@@ -641,21 +641,15 @@ const addIndentation = (node, isOpeningTag) => {
         } else {
             contentResult = node.head.trim();
         }
-    } else {
-        const nodeLastChild = node.getLastChild();
-
-        if (nodeLastChild) {
-            const lastChildLineNumber = nodeLastChild.isContainer() ?
-                nodeLastChild.getLastChild().getLastLineNumber() :
-                nodeLastChild.getLastLineNumber();
 
-            if (node.tailLineNumber === lastChildLineNumber) {
-                contentResult   = Constants.EOL + nodeIndentation;
-                nodeIndentation = '';
-            }
+        if (node.isOfType('html_conditional_comment')) {
+            contentResult = contentResult
+                .split(Constants.EOL)
+                .map((line, i) => i > 0 ? nodeIndentation + line : line)
+                .join(Constants.EOL);
         }
-
-        contentResult += node.tail.trim();
+    } else {
+        contentResult = node.tail.trim();
     }
 
     return preLineBreakContent + nodeIndentation + contentResult + fullTrailingContent;

package/src/util/FileUtils.js

@@ -59,12 +59,13 @@ const deleteDirectoryRecursively = dirPath => {
     return false;
 };
 
-const isIgnored = filePath => {
-    const config = ConfigUtils.load();
+const shouldBeIgnored = filePath => {
+    const config            = ConfigUtils.load();
+    const formattedFilePath = filePath.replaceAll('\\', '/');
 
-    return config.ignore && config.ignore.some( ignoredPath => {
-        return filePath.indexOf(ignoredPath) >= 0;
-    });
+    return !!(config.ignore && config.ignore.some( ignoredPath => {
+        return formattedFilePath.indexOf(ignoredPath) >= 0;
+    }));
 };
 
 const fileExists = filePath => fs.existsSync(filePath);
@@ -76,4 +77,4 @@ module.exports.createDirIfDoesNotExist    = createDirIfDoesNotExist;
 module.exports.deleteFile                 = deleteFile;
 module.exports.deleteDirectoryRecursively = deleteDirectoryRecursively;
 module.exports.createClientDir            = createClientDir;
-module.exports.isIgnored                  = isIgnored;
+module.exports.shouldBeIgnored            = shouldBeIgnored;