isml-linter 5.43.8 → 5.43.10

package/CHANGELOG.md

@@ -1,36 +1,50 @@
 # Changelog
 
+## [5.43.10] - 2025-12-22
+
+### Fixed
+ - "indent" rule - content of a "style" tag should be ignored completely;
+ - Fixed README commands to use "npx";
+
+### Security
+ - Removed unncecessary dependency;
+
+## [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
@@ -40,7 +54,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
@@ -48,7 +62,7 @@
 
 ### Fixed
  - Rule-level ignore string with "/" character for directories;
- 
+
 ## [5.42.4] - 2023-01-30
 
 ### Fixed
@@ -1129,6 +1143,7 @@
 ### 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

package/README.md

@@ -24,10 +24,10 @@ and add the following to package.json:
 
 ```js
 "scripts": {
-    "init:isml":  "./node_modules/.bin/isml-linter --init",
-    "lint:isml":  "./node_modules/.bin/isml-linter",
-    "build:isml": "./node_modules/.bin/isml-linter --build",
-    "fix:isml":   "./node_modules/.bin/isml-linter --autofix"
+    "init:isml":  "npx isml-linter --init",
+    "lint:isml":  "npx isml-linter",
+    "build:isml": "npx isml-linter --build",
+    "fix:isml":   "npx isml-linter --autofix"
 }
 ```
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isml-linter",
-  "version": "5.43.8",
+  "version": "5.43.10",
   "author": "Fabiow Quixadá <ftquixada@gmail.com>",
   "license": "MIT",
   "main": "src/publicApi.js",
@@ -46,7 +46,6 @@
     "ghooks": "^2.0.4",
     "jasmine": "^3.6.4",
     "jasmine-node": "^1.16.0",
-    "rmdir": "^1.0.0",
     "sinon": "^9.2.4",
     "to-snake-case": "^1.0.0"
   }

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() {

package/src/rules/tree/indent.js

@@ -609,6 +609,12 @@ const getClosingChars = node => {
     return '';
 };
 
+const shouldChangeIndentation = node => {
+    return !node.isRoot() &&
+        !node.isContainer() &&
+        !node.parent.isOneOfTypes(['isscript', 'script', 'style']);
+}
+
 const addIndentation = (node, isOpeningTag) => {
     const content             = isOpeningTag ? node.head : node.tail;
     const startingPos         = ParseUtils.getNextNonEmptyCharPos(content);
@@ -660,7 +666,7 @@ const addIndentation = (node, isOpeningTag) => {
 };
 
 const removeAllIndentation = node => {
-    if (!node.isRoot() && !node.isContainer() && !node.parent.isOneOfTypes(['isscript', 'script'])) {
+    if (shouldChangeIndentation(node)) {
 
         const shouldRemoveHeadIndentation = node.head && !node.isInSameLineAsPreviousSibling() && !node.isInSameLineAsParent() && !(node.lineNumber === node.parent.endLineNumber);
         const shouldRemoveTailIndentation = !!(node.tail && !(node.hasChildren() && node.getLastChild().lineNumber === node.tailLineNumber));
@@ -681,7 +687,7 @@ const removeAllIndentation = node => {
 
 const addCorrectIndentation = node => {
 
-    if (!node.isRoot() && !node.isContainer() && !node.parent.isOneOfTypes(['isscript', 'script'])) {
+    if (shouldChangeIndentation(node)) {
         if (node.parent.isOfType('iscomment')) {
             const shouldAddIndentationToText = checkIfShouldAddIndentationToHead(node);
 

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;