isml-linter 5.43.5 → 5.43.7

package/CHANGELOG.md

@@ -1,9 +1,19 @@
 # Changelog
 
+## [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;
+ - "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
@@ -1114,6 +1124,8 @@
 ### Added
 - Linter is published;
 
+[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
 [5.43.3]: https://github.com/FabiowQuixada/isml-linter/compare/v5.43.2...v5.43.3

package/package.json

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

package/src/isml_tree/IsmlNode.js

@@ -445,16 +445,16 @@ const privateToString = (node, stream = '') => {
 };
 
 const getAttributes = node => {
-    const trimmedHead              = node.head.trim();
-    const nodeHead                 = trimmedHead.substring(1, trimmedHead.length - 1);
-    const firstSpaceAfterTagPos    = ParseUtils.getFirstEmptyCharPos(trimmedHead);
-    const leadingEmptySpaceQty     = ParseUtils.getNextNonEmptyCharPos(nodeHead);
-    const afterTagContent          = nodeHead.substring(leadingEmptySpaceQty + firstSpaceAfterTagPos);
-    const stringifiedAttributeList = getStringifiedAttributeArray(afterTagContent);
-    const attributeList            = [];
-
-    for (let i = 0; i < stringifiedAttributeList.length; i++) {
-        const attr = parseAttribute(node, stringifiedAttributeList, i);
+    const trimmedHead           = node.head.trim();
+    const nodeHead              = trimmedHead.substring(1, trimmedHead.length - 1);
+    const firstSpaceAfterTagPos = ParseUtils.getFirstEmptyCharPos(trimmedHead);
+    const leadingEmptySpaceQty  = ParseUtils.getNextNonEmptyCharPos(nodeHead);
+    const afterTagContent       = nodeHead.substring(leadingEmptySpaceQty + firstSpaceAfterTagPos);
+    const rawAttributeList      = getStringifiedAttributeArray(afterTagContent);
+    const attributeList         = [];
+
+    for (let i = 0; i < rawAttributeList.length; i++) {
+        const attr = parseAttribute(node, rawAttributeList, attributeList, i);
         attributeList.push(attr);
     }
 
@@ -525,8 +525,8 @@ const getStringifiedAttributeArray = content => {
     return result;
 };
 
-const parseAttribute = (node, attributeList, index) => {
-    const attribute                             = attributeList[index];
+const parseAttribute = (node, rawAttributeList, resultingAttributeList, index) => {
+    const attribute                             = rawAttributeList[index];
     const isAttributeANestedIsmlTag             = attribute.startsWith('<is');
     const isExpressionAttribute                 = attribute.startsWith('${') && attribute.endsWith('}');
     const trimmedAttribute                      = attribute.trim();
@@ -547,6 +547,7 @@ const parseAttribute = (node, attributeList, index) => {
     const isFirstValueInSameLineAsAttributeName = value && ParseUtils.getLeadingLineBreakQty(value) === 0;
     const quoteChar                             = getQuoteChar(trimmedAttribute);
     const attributeNameFirstLine                = name.split(Constants.EOL)[0];
+    const isInSameLineAsPreviousAttribute       = index >= 1 && resultingAttributeList[index - 1].lineNumber === lineNumber;
 
     const columnNumber = isInSameLineAsTagName ?
         node.columnNumber + leadingContent.length :
@@ -572,6 +573,7 @@ const parseAttribute = (node, attributeList, index) => {
             isInSameLineAsTagName,
             isFirstInLine,
             isFirstValueInSameLineAsAttributeName,
+            isInSameLineAsPreviousAttribute,
             isExpressionAttribute,
             hasMultilineValue,
             isNestedIsmlTag : isAttributeANestedIsmlTag,
@@ -594,6 +596,7 @@ const parseAttribute = (node, attributeList, index) => {
             isInSameLineAsTagName,
             isFirstInLine,
             isFirstValueInSameLineAsAttributeName,
+            isInSameLineAsPreviousAttribute,
             isExpressionAttribute,
             hasMultilineValue,
             isNestedIsmlTag: isAttributeANestedIsmlTag,

package/src/rules/tree/indent.js

@@ -441,21 +441,24 @@ const addIndentationToText = node => {
 };
 
 const getIndentedNestedIsmlContent = (attribute, nodeIndentation, attributeOffset) => {
-    if (attribute.fullContent.startsWith('<isif')) {
-        const attributeRootNode = TreeBuilder.parse(attribute.fullContent, null, null, true);
-        const fixedContent      = Rule.getFixedContent(attributeRootNode);
+    const attributeRootNode = TreeBuilder.parse(attribute.fullContent, null, null, true);
+    const fixedContent      = Rule.getFixedContent(attributeRootNode);
 
-        return fixedContent
-            .split(Constants.EOL)
-            .map( (line, i) => {
-                if (i === 0 && attribute.isFirstInLine && !attribute.isInSameLineAsTagName && attribute.index !== 0) {
-                    return Constants.EOL + nodeIndentation + attributeOffset + line;
-                }
+    return fixedContent
+        .split(Constants.EOL)
+        .map( (line, i) => {
+            const shouldAddLineBreak = i === 0 && attribute.isFirstInLine && !attribute.isInSameLineAsTagName && attribute.index !== 0;
 
-                return nodeIndentation + attributeOffset + line;
-            })
-            .join(Constants.EOL);
-    }
+            if (attribute.isInSameLineAsPreviousAttribute) {
+                return ' ' + line;
+            }
+
+            return (shouldAddLineBreak ? Constants.EOL : '')
+                + nodeIndentation
+                + attributeOffset
+                + line;
+        })
+        .join(Constants.EOL);
 };
 
 const getTreeBuiltAttributeIndentedValue = (attribute, nodeIndentation, attributeOffset) => {
@@ -616,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++) {
@@ -659,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);