@abaplint/cli 2.93.1 → 2.93.4

package/build/src/fixes.js

@@ -1,35 +1,59 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ApplyFixes = void 0;
+/* eslint-disable max-len */
 const core_1 = require("@abaplint/core");
 class ApplyFixes {
     constructor() {
         this.changedFiles = new Set();
     }
-    applyFixes(inputIssues, reg, fs, bar) {
-        let changed = [];
+    // Strategy:
+    // Execute one rule at a time and apply fixes for that rule
+    // Some rules are quite expensive to initialize(like downport),
+    // so running all rules every time is expensive.
+    async applyFixes(reg, fs, quiet) {
         let iteration = 1;
-        let issues = inputIssues;
         this.changedFiles.clear();
         const MAX_ITERATIONS = 50000;
-        bar === null || bar === void 0 ? void 0 : bar.set(MAX_ITERATIONS, "Apply Fixes");
+        const objects = new core_1.RulesRunner(reg).objectsToCheck(reg.getObjects());
+        const rules = reg.getConfig().getEnabledRules();
         while (iteration <= MAX_ITERATIONS) {
-            bar === null || bar === void 0 ? void 0 : bar.tick("Apply Fixes, iteration " + iteration + ", " + issues.length + " candidates");
-            changed = this.applyList(issues, reg);
-            if (changed.length === 0) {
+            let changed = 0;
+            for (const rule of rules) {
+                while (iteration <= MAX_ITERATIONS) {
+                    const before = Date.now();
+                    rule.initialize(reg);
+                    const issues = [];
+                    for (const obj of objects) {
+                        issues.push(...rule.run(obj));
+                    }
+                    iteration++;
+                    const appliedCount = this.applyList(issues, reg).length;
+                    const runtime = Date.now() - before;
+                    if (quiet !== true) {
+                        process.stderr.write(`\tIteration ${iteration.toString().padEnd(3, " ")}, ${appliedCount} fixes applied, ${runtime}ms, rule ${rule.getMetadata().key}\n`);
+                    }
+                    if (appliedCount > 0) {
+                        changed += appliedCount;
+                        const before = Date.now();
+                        reg.parse();
+                        const runtime = Date.now() - before;
+                        if (quiet !== true) {
+                            process.stderr.write(`\tParse, ${runtime}ms\n`);
+                        }
+                    }
+                    else {
+                        break;
+                    }
+                }
+            }
+            if (changed === 0) {
                 break;
             }
-            iteration++;
-            issues = reg.parse().findIssues();
         }
         this.writeChangesToFS(fs, reg);
-        // always end the progress indicator at 100%
-        while (iteration <= MAX_ITERATIONS) {
-            bar === null || bar === void 0 ? void 0 : bar.tick("Fixes Applied");
-            iteration++;
-        }
-        return issues;
     }
+    ///////////////////////////////////////////////////
     writeChangesToFS(fs, reg) {
         for (const filename of this.changedFiles.values()) {
             const file = reg.getFileByName(filename);

package/build/src/index.js

@@ -186,7 +186,8 @@ async function run(arg) {
         }
         let extra = "";
         if (arg.runFix === true && reg) {
-            issues = new fixes_1.ApplyFixes().applyFixes(issues, reg, fs, progress);
+            issues = [];
+            await new fixes_1.ApplyFixes().applyFixes(reg, fs);
             extra = "Fixes applied";
         }
         else if (arg.runRename === true && reg) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/cli",
-    "version": "2.93.1",
+    "version": "2.93.4",
     "description": "abaplint - Command Line Interface",
     "bin": {
         "abaplint": "./abaplint"
@@ -39,12 +39,12 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@abaplint/core": "^2.93.1",
+        "@abaplint/core": "^2.93.4",
         "@types/chai": "^4.3.3",
         "@types/glob": "^7.2.0",
         "@types/minimist": "^1.2.2",
         "@types/mocha": "^9.1.1",
-        "@types/node": "^18.7.13",
+        "@types/node": "^18.7.14",
         "@types/progress": "^2.0.5",
         "chai": "^4.3.6",
         "chalk": "^5.0.1",