isml-linter 5.40.5 → 5.41.0

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [5.41.0] - 2023-01-21
+
+### Added
+ - Exposed "fix" method in [ISML Linter API][api-docs];
+
+### Fixed
+ - Line-by-line and tree rules issues now are fixed in a single ISML Linter execution, not in two steps anymore;
+ 
 ## [5.40.5] - 2023-01-15
 
 ### Fixed
@@ -1040,6 +1048,7 @@
 ### Added
 - Linter is published;
 
+[5.41.0]: https://github.com/FabiowQuixada/isml-linter/compare/v5.40.5...v5.41.0
 [5.40.5]: https://github.com/FabiowQuixada/isml-linter/compare/v5.40.4...v5.40.5
 [5.40.4]: https://github.com/FabiowQuixada/isml-linter/compare/v5.40.3...v5.40.4
 [5.40.3]: https://github.com/FabiowQuixada/isml-linter/compare/v5.40.2...v5.40.3

package/package.json

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

package/src/publicApi.js

@@ -14,8 +14,23 @@ module.exports = {
         }
 
         linterResult = IsmlLinter.run(path, content);
+
         return linterResult;
     },
+    fix          : (path, content, config) => {
+        let autofixConfig = config;
+
+        if (config) {
+            autofixConfig.autoFix = true;
+            IsmlLinter.setConfig(autofixConfig);
+        } else {
+            autofixConfig = IsmlLinter.getConfig();
+            autofixConfig.autoFix = true;
+            IsmlLinter.setConfig(autofixConfig);
+        }
+
+        return IsmlLinter.run(path, content, autofixConfig);
+    },
     printResults : ()    => ConsoleUtils.displayOccurrenceList(linterResult),
     build        : path  => Builder.run(path),
 

package/src/rules/prototypes/SingleLineRulePrototype.js

@@ -41,7 +41,10 @@ SingleLineRulePrototype.check = function(templateContent, data = { isCrlfLineBre
         };
     }
 
-    return { occurrenceList };
+    return { 
+        occurrenceList,
+        fixedContent : templateContent
+     };
 };
 
 module.exports = SingleLineRulePrototype;

package/src/util/ConfigUtils.js

@@ -158,7 +158,7 @@ const existEslintConfigFile = () => {
         FileUtils.fileExists(Constants.eslintConfigFilePathList[2]);
 };
 
-const isTestEnv = () => process.env.NODE_ENV === Constants.ENV_TEST;
+const isTestEnv = () => process.env.NODE_ENV === Constants.ENV_TEST && !global.isSimulatingProductionEnvironment;
 
 const setLocalConfig = configParam => {
     if (isTestEnv()) {

package/src/util/RuleUtils.js

@@ -93,6 +93,7 @@ const applyRuleOnTemplate = (ruleArray, templatePath, root, config, data) => {
             try {
                 ConsoleUtils.displayVerboseMessage(`Applying "${rule.id}" rule`, 1);
                 const ruleResults = rule.check(root, templateResults.data);
+                templateResults.finalContent = ruleResults.fixedContent;
                 applyRuleResult(config, ruleResults, templatePath, templateResults, rule);
 
             } catch (error) {
@@ -226,7 +227,7 @@ const checkTemplate = (templatePath, data, content = '', templateName = '') => {
     const config          = ConfigUtils.load();
     const templateContent = GeneralUtils.toLF(content || fs.readFileSync(templatePath, 'utf-8'));
     const lineResults     = checkLineByLineRules(templatePath, templateContent, config, data);
-    const treeResults     = checkTreeRules(templatePath, templateContent, config, data) || { errors : [] };
+    const treeResults     = checkTreeRules(templatePath, lineResults.finalContent, config, data) || { errors : [] };
     const filenameResults = checkFileName(templateName, templateContent);
 
     return {