isml-linter 5.43.6 → 5.43.8

package/CHANGELOG.md

@@ -1,14 +1,24 @@
 # Changelog
 
+## [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;
+ - "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;
+ - "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
@@ -1119,6 +1129,8 @@
 ### Added
 - Linter is published;
 
+[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
 [5.43.4]: https://github.com/FabiowQuixada/isml-linter/compare/v5.43.3...v5.43.4

package/package.json

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

package/src/isml_tree/IsmlNode.js

@@ -450,7 +450,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 +500,7 @@ const getStringifiedAttributeArray = content => {
 
     const maskedAttributeList = maskedContent
         .replace(/><+/g, '> <')
+        .replace(/"</g, '" <')
         .replace(/\s\s+/g, ' ')
         .split(' ')
         .filter(attr => attr);
@@ -509,6 +510,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/indent.js

@@ -619,17 +619,18 @@ const addIndentation = (node, isOpeningTag) => {
     const nodeIndentation     = node.isInSameLineAsParent() && isOpeningTag ? '' : Rule.getIndentation(node.depth - 1);
     const attributeOffset     = Rule.getAttributeIndentationOffset();
     const attributeList       = node.getAttributeList();
+    const leadingLineBreakQty = ParseUtils.getLeadingLineBreakQty(node.head);
     let contentResult         = '';
 
     if (isOpeningTag) {
         const shouldAddIndentationToClosingChar = shouldAddIndentationToClosingChars(node);
         const closingChars                      = getClosingChars(node);
-        const tagNameEndPos                     = ParseUtils.getLeadingLineBreakQty(node.head)
+        const tagNameEndPos                     = leadingLineBreakQty
             + ParseUtils.getFirstEmptyCharPos(node.head.trim()) + 1;
 
         if (ParseUtils.getLineBreakQty(node.head.trim()) > 0 || shouldAddIndentationToClosingChar && node.isSelfClosing()) {
             contentResult = attributeList.length > 0 ?
-                node.head.substring(0, tagNameEndPos).trimStart() :
+                node.head.trimStart().substring(0, tagNameEndPos - leadingLineBreakQty).trimStart() :
                 node.head.trimStart();
 
             for (let i = 0; i < attributeList.length; i++) {
@@ -662,7 +663,7 @@ const removeAllIndentation = node => {
     if (!node.isRoot() && !node.isContainer() && !node.parent.isOneOfTypes(['isscript', 'script'])) {
 
         const shouldRemoveHeadIndentation = node.head && !node.isInSameLineAsPreviousSibling() && !node.isInSameLineAsParent() && !(node.lineNumber === node.parent.endLineNumber);
-        const shouldRemoveTailIndentation = node.tail && !(node.hasChildren() && node.getLastChild().lineNumber === node.tailLineNumber);
+        const shouldRemoveTailIndentation = !!(node.tail && !(node.hasChildren() && node.getLastChild().lineNumber === node.tailLineNumber));
 
         if (shouldRemoveHeadIndentation) {
             node.head = removeIndentation(node.head);