isml-linter 5.39.4 → 5.40.0

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## [5.40.0] - 2022-02-05
+
+### Added
+ - "one-element-per-line" rule autofix;
+
+### Fixed
+ - Small "indent" rule issue;
+ - Tree build edge case;
+ 
 ## [5.39.4] - 2022-01-30
 
 ### Fixed
@@ -1002,6 +1011,7 @@
 ### Added
 - Linter is published;
 
+[5.40.0]: https://github.com/FabiowQuixada/isml-linter/compare/v5.39.4...v5.40.0
 [5.39.4]: https://github.com/FabiowQuixada/isml-linter/compare/v5.39.3...v5.39.4
 [5.39.3]: https://github.com/FabiowQuixada/isml-linter/compare/v5.39.2...v5.39.3
 [5.39.2]: https://github.com/FabiowQuixada/isml-linter/compare/v5.39.1...v5.39.2

package/package.json

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

package/src/isml_tree/IsmlNode.js

@@ -251,6 +251,14 @@ class IsmlNode {
         return this.parent && this.parent.isIsmlComment();
     }
 
+    isHardCodedText() {
+        return !this.isRoot()
+            && !this.isContainer()
+            && !this.isConditionalComment()
+            && !this.isTag()
+            && !this.isExpression();
+    }
+
     getPreviousSibling() {
         if (!this.parent || !this.parent.isContainer() && this.isFirstChild() || this.parent.isContainer() && this.parent.isFirstChild() && this.isFirstChild()) {
             return null;

package/src/isml_tree/ParseUtils.js

@@ -193,6 +193,7 @@ const getElementType = trimmedElement => {
         const typeValueLastPos = Math.min(...[
             trimmedElement.indexOf(' '),
             trimmedElement.indexOf('/'),
+            trimmedElement.indexOf(Constants.EOL),
             trimmedElement.indexOf('>')
         ].filter(j => j >= 0));
 

package/src/rules/prototypes/TreeRulePrototype.js

@@ -58,7 +58,7 @@ TreeRulePrototype.return = function(node, occurrenceList, config) {
 
         return  {
             occurrenceList
-        } ;
+        };
 
     } else {
         return occurrenceList;

package/src/rules/tree/indent.js

@@ -754,6 +754,9 @@ const checkIfShouldAddIndentationToTail = node => {
         !isTailInSameLineAsChild &&
         !isInSameLineAsChild &&
         !isLastClause
+    // TODO Works for a specific case only. Might have side effects;
+    ||
+        node.isOfType('iscomment') && !isTailInSameLineAsChild
     ||
         isBrokenIntoMultipleLines;
 

package/src/rules/tree/one-element-per-line.js

@@ -1,7 +1,9 @@
 const TreeRulePrototype = require('../prototypes/TreeRulePrototype');
+const IndentRule        = require('../tree/indent');
 const ConfigUtils       = require('../../util/ConfigUtils');
-// const Constants         = require('../../Constants');
-// const GeneralUtils = require('../../util/GeneralUtils');
+const Constants         = require('../../Constants');
+const GeneralUtils      = require('../../util/GeneralUtils');
+const TreeBuilder       = require('../../isml_tree/TreeBuilder');
 
 const ruleId      = require('path').basename(__filename).slice(0, -3);
 const description = 'Only one element per line is allowed';
@@ -28,49 +30,53 @@ Rule.isBroken = function(node) {
 
     return !node.isRoot() &&
         !node.parent.isContainer() &&
-        node.lineNumber === node.parent.lineNumber;
+        node.lineNumber === node.parent.endLineNumber;
 };
 
-// Rule.getFixedContent = rootNode => {
-//     fixContent(rootNode);
+Rule.getFixedContent = rootNode => {
+    addLineBreaks(rootNode);
 
-//     return GeneralUtils.applyActiveLineBreaks(rootNode.toString());
-// };
+    // Rebuilding the tree automatically updates all node data, such as column number,
+    // line number, global position, etc;
+    const stringifiedTree   = rootNode.toString();
+    const newRootNode       = TreeBuilder.build(null, stringifiedTree).rootNode;
+    const partialFixContent = IndentRule.getFixedContent(newRootNode);
 
-// const fixContent = node => {
-//     for (let i = 0; i < node.children.length; i++) {
-//         const child = node.children[i];
-
-//         if (child.isInSameLineAsParent() && !node.isIsmlComment()) {
-//             const indentation       = getCorrectIndentation(child);
-//             const parentIndentation = getCorrectIndentation(node);
+    return GeneralUtils.applyActiveLineBreaks(partialFixContent);
+};
 
-//             child.head = `${Constants.EOL}${indentation}${child.head}${Constants.EOL}${parentIndentation}`;
+const addLineBreaks = node => {
+    const config              = ConfigUtils.load();
+    const ruleConfig          = config.rules[ruleId];
+    const shouldIgnoreNonTags = ruleConfig && ruleConfig.except && ruleConfig.except.indexOf('non-tag') >= 0;
 
-//             if (child.tail) {
-//                 child.setTail(`${Constants.EOL}${indentation}${child.tail}${Constants.EOL}`);
-//             }
-//         }
+    for (let i = 0; i < node.children.length; i++) {
+        const child = node.children[i];
 
-//         fixContent(child);
-//     }
-// };
+        if (shouldAddLeadingLineBreakToChildHead(node, child, shouldIgnoreNonTags)) {
+            child.head = Constants.EOL + child.head;
+        }
 
-// const getCorrectIndentation = node => {
-//     const indentSize = node.depth - 1;
-//     const config     = ConfigUtils.load();
-//     let indentation  = '';
-//     let indentUnit   = '';
+        if (shouldAddLeadingLineBreakToParentTail(node, child, shouldIgnoreNonTags)) {
+            node.tail = Constants.EOL + node.tail;
+        }
 
-//     for (let i = 0; i < (config.indent || 4); ++i) {
-//         indentUnit += ' ';
-//     }
+        addLineBreaks(child);
+    }
+};
 
-//     for (let i = 0; i < indentSize; ++i) {
-//         indentation += indentUnit;
-//     }
+const shouldAddLeadingLineBreakToChildHead = (node, child, shouldIgnoreNonTags) => {
+    return (child.isFirstChild() && child.isInSameLineAsParentEnd() || child.isTag() && child.isInSameLineAsPreviousSibling())
+        && !node.isIsmlComment()
+        && (child.isTag() || !child.isTag() && !shouldIgnoreNonTags);
+};
 
-//     return indentation;
-// };
+const shouldAddLeadingLineBreakToParentTail = (node, child, shouldIgnoreNonTags) => {
+    return child.isLastChild()
+        && child.endLineNumber === node.tailLineNumber
+        && !node.isIsmlComment()
+        && !node.tail.startsWith(Constants.EOL)
+        && (child.isTag() || !child.isTag() && !shouldIgnoreNonTags);
+};
 
 module.exports = Rule;