isml-linter 5.43.7 → 5.43.9

package/CHANGELOG.md

@@ -1,31 +1,41 @@
 # Changelog
 
+## [5.43.9] - 2023-03-05
+
+### Fixed
+ - "leading-iscache" and "leading-iscontent" rules - update tree data after move nodes on autofix mode;
+
+## [5.43.8] - 2023-03-04
+
+### Fixed
+ - Identification of HTML tag attributes even when there is no blank space separating them;
+
 ## [5.43.7] - 2023-03-03
 
 ### Fixed
  - "indent" rule - keep tag type if previous element has trailing spaces;
- 
+
 ## [5.43.6] - 2023-02-25
 
 ### Fixed
  - "indent" rule - don't add indentation to embbeded "isprint" tag if it's in the same line as previous attribute;
- 
+
 ## [5.43.5] - 2023-02-21
 
 ### Fixed
  - "indent" rule - keep indentation of closing tag that is in same line as corresponding opening tag;
  - Tree build for an empty template;
- 
+
 ## [5.43.4] - 2023-02-20
 
 ### Fixed
  - [Issue #39][issue#39] - Allow closing tag to be in the same line as corresponding opening tag last character;
- 
+
 ## [5.43.3] - 2023-02-20
 
 ### Fixed
  - Issue that blocked process due to a missing return value in some rules;
- 
+
 ## [5.43.2] - 2023-02-12
 
 ### Security
@@ -35,7 +45,7 @@
 
 ### 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
@@ -43,7 +53,7 @@
 
 ### Fixed
  - Rule-level ignore string with "/" character for directories;
- 
+
 ## [5.42.4] - 2023-01-30
 
 ### Fixed
@@ -1124,6 +1134,8 @@
 ### Added
 - Linter is published;
 
+[5.43.9]: https://github.com/FabiowQuixada/isml-linter/compare/v5.43.8...v5.43.9
+[5.43.8]: https://github.com/FabiowQuixada/isml-linter/compare/v5.43.7...v5.43.8
 [5.43.7]: https://github.com/FabiowQuixada/isml-linter/compare/v5.43.6...v5.43.7
 [5.43.6]: https://github.com/FabiowQuixada/isml-linter/compare/v5.43.5...v5.43.6
 [5.43.5]: https://github.com/FabiowQuixada/isml-linter/compare/v5.43.4...v5.43.5

package/package.json

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

package/src/Constants.js

@@ -40,6 +40,7 @@ const specComplexTemplatesDir          = path.join(specIsmlTreeTemplateDir, 'com
 const specElementBalanceTemplatesDir   = path.join(specIsmlTreeTemplateDir, 'element_balance');
 const specTailLineNumberTemplatesDir   = path.join(specIsmlTreeTemplateDir, 'tail_line_number');
 const specAutofixTemplatesDir          = path.join(specTemplateDir, 'autofix');
+const specTreeRuleTemplatesDir         = path.join(specTemplateDir, 'rules', 'tree');
 const rulesDir                         = path.join(linterModuleDir, 'src', 'rules');
 const lineByLineRulesDir               = path.join(rulesDir, 'line_by_line');
 const treeRulesDir                     = path.join(rulesDir, 'tree');
@@ -102,6 +103,7 @@ module.exports = {
     specColumnNumberTemplateDir,
     specInvalidTemplateDir,
     specComplexTemplatesDir,
+    specTreeRuleTemplatesDir,
     specAutofixTemplatesDir,
     specElementBalanceTemplatesDir,
     specTailLineNumberTemplatesDir,

package/src/isml_tree/IsmlNode.js

@@ -351,6 +351,9 @@ class IsmlNode {
         return !this.parent || this.parent.getLastChild() === this;
     }
 
+    // No position or line number is set. To get
+    // it, it is necessary to re-parse the tree.
+    // This is valid for all nodes;
     removeChild(node) {
         let index = null;
 
@@ -365,15 +368,27 @@ class IsmlNode {
 
         const removedNode = this.children[index];
         this.children.splice(index, 1);
+
+        for (let i = 0; i < this.children.length; i++) {
+            const child   = this.children[index];
+            child.childNo = i;
+        }
+
         return removedNode;
     }
 
     // No position or line number is set. To get
-    // it, it is necessary to re-parse the tree;
+    // it, it is necessary to re-parse the tree.
+    // This is valid for all nodes;
     addChildNodeToPos(node, index) {
         node.parent = this;
         node.depth  = this.depth + 1;
         this.children.splice(index, 0, node);
+
+        for (let i = 0; i < this.children.length; i++) {
+            const child   = this.children[i];
+            child.childNo = i;
+        }
     }
 
     getRoot() {
@@ -450,7 +465,7 @@ const getAttributes = node => {
     const firstSpaceAfterTagPos = ParseUtils.getFirstEmptyCharPos(trimmedHead);
     const leadingEmptySpaceQty  = ParseUtils.getNextNonEmptyCharPos(nodeHead);
     const afterTagContent       = nodeHead.substring(leadingEmptySpaceQty + firstSpaceAfterTagPos);
-    const rawAttributeList      = getStringifiedAttributeArray(afterTagContent);
+    const rawAttributeList      = getStringifiedAttributeArray(afterTagContent.trim());
     const attributeList         = [];
 
     for (let i = 0; i < rawAttributeList.length; i++) {
@@ -500,6 +515,7 @@ const getStringifiedAttributeArray = content => {
 
     const maskedAttributeList = maskedContent
         .replace(/><+/g, '> <')
+        .replace(/"</g, '" <')
         .replace(/\s\s+/g, ' ')
         .split(' ')
         .filter(attr => attr);
@@ -509,6 +525,8 @@ const getStringifiedAttributeArray = content => {
             attrStartPosList.push(i);
         } else if (maskedContent[i - 1] === ' ' && maskedContent[i] !== ' ' || maskedContent[i - 1] === '>' && maskedContent[i] === '<') {
             attrStartPosList.push(i);
+        } else if (maskedContent[i - 1] === '"' && maskedContent[i] === '<') {
+            attrStartPosList.push(i + 1);
         }
     }
 

package/src/rules/tree/leading-iscache.js

@@ -35,4 +35,11 @@ Rule.getFixedContent = function(rootNode) {
     return rootNode.toString();
 };
 
+Rule.fixContent = function(rootNode) {
+    return {
+        rootNode,
+        fixedContent : this.getFixedContent(rootNode)
+    };
+};
+
 module.exports = Rule;

package/src/rules/tree/leading-iscontent.js

@@ -31,4 +31,11 @@ Rule.getFixedContent = function(rootNode) {
     return rootNode.toString();
 };
 
+Rule.fixContent = function(rootNode) {
+    return {
+        rootNode,
+        fixedContent : this.getFixedContent(rootNode)
+    };
+};
+
 module.exports = Rule;