isml-linter 5.42.4 → 5.43.1

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## [5.43.1] - 2023-02-11
+
+### Fixed
+ - All line-by-line rules are applied, one after the other, without ovewriting the previous rule fixed content;
+ 
+## [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
@@ -1080,6 +1093,8 @@
 ### Added
 - Linter is published;
 
+[5.43.1]: https://github.com/FabiowQuixada/isml-linter/compare/v5.43.0...v5.43.1
+[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
@@ -1251,7 +1266,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.4",
+  "version": "5.43.1",
   "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/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/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;

package/src/util/RuleUtils.js

@@ -77,7 +77,7 @@ const fixTemplateOrReportIssues = (config, ruleResult, templatePath, templateRes
     }
 };
 
-const fixTemplateOrReportIssuesForRuleList = (ruleArray, templatePath, root, config, data) => {
+const fixTemplateOrReportIssuesForRuleList = (ruleArray, templatePath, rootNodeOrTemplateContent, config, data) => {
     const templateResults = {
         fixed    : false,
         errors   : {},
@@ -86,13 +86,20 @@ const fixTemplateOrReportIssuesForRuleList = (ruleArray, templatePath, root, con
         data
     };
 
+    let tempRootNodeOrTemplateContent = rootNodeOrTemplateContent;
+
     for (let i = 0; i < ruleArray.length; i++) {
         const rule = ruleArray[i];
         if (!rule.shouldIgnore(templatePath)) {
             try {
                 ConsoleUtils.displayVerboseMessage(`Applying "${rule.id}" rule`, 1);
-                const ruleResults            = rule.check(root, templateResults.data);
+                const ruleResults            = rule.check(tempRootNodeOrTemplateContent, templateResults.data);
                 templateResults.finalContent = ruleResults.fixedContent;
+
+                if (typeof rootNodeOrTemplateContent === 'string') {
+                    tempRootNodeOrTemplateContent = ruleResults.fixedContent;
+                }
+
                 fixTemplateOrReportIssues(config, ruleResults, templatePath, templateResults, rule);
 
             } catch (error) {