@eagleoutice/flowr 2.2.9 → 2.2.11

package/slicing/static/visiting-queue.js

@@ -2,19 +2,21 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VisitingQueue = void 0;
 const fingerprint_1 = require("./fingerprint");
-const static_slicer_1 = require("./static-slicer");
-const assert_1 = require("../../util/assert");
 class VisitingQueue {
     threshold;
     timesHitThreshold = 0;
     seen = new Map();
+    seenByCache = new Set();
     idThreshold = new Map();
     queue = [];
+    cache = new Map();
     // the set of potential additions holds nodes which may be added if a second edge deems them relevant (e.g., found with the `defined-by-on-call` edge)
     // additionally it holds which node id added the addition so we can separate their inclusion on the structure
     potentialAdditions = new Map();
-    constructor(threshold) {
+    cachedCallTargets = new Map();
+    constructor(threshold, cache) {
         this.threshold = threshold;
+        this.cache = cache;
     }
     /**
      * Adds a node to the queue if it has not been seen before.
@@ -26,16 +28,22 @@ class VisitingQueue {
     add(target, env, envFingerprint, onlyForSideEffects) {
         const idCounter = this.idThreshold.get(target) ?? 0;
         if (idCounter > this.threshold) {
-            static_slicer_1.slicerLogger.warn(`id: ${target} has been visited ${idCounter} times, skipping`);
             this.timesHitThreshold++;
             return;
         }
         /* we do not include the in call part in the fingerprint as it is 'deterministic' from the source position */
         const print = (0, fingerprint_1.fingerprint)(target, envFingerprint, onlyForSideEffects);
         if (!this.seen.has(print)) {
+            const cached = this.cache?.get(print);
+            if (cached) {
+                this.seenByCache.add(target);
+                for (const id of cached) {
+                    this.queue.push({ id, baseEnvironment: env, envFingerprint, onlyForSideEffects });
+                }
+            }
             this.idThreshold.set(target, idCounter + 1);
             this.seen.set(print, target);
-            this.queue.push({ id: target, baseEnvironment: env, onlyForSideEffects });
+            this.queue.push({ id: target, baseEnvironment: env, envFingerprint, onlyForSideEffects });
         }
     }
     next() {
@@ -47,10 +55,16 @@ class VisitingQueue {
     hasId(id) {
         return this.idThreshold.has(id);
     }
+    memoizeCallTargets(id, targets) {
+        if (!this.cachedCallTargets.has(id)) {
+            this.cachedCallTargets.set(id, targets());
+        }
+        return this.cachedCallTargets.get(id);
+    }
     status() {
         return {
             timesHitThreshold: this.timesHitThreshold,
-            result: new Set([...this.seen.values()].filter(assert_1.isNotUndefined))
+            result: new Set([...this.seen.values(), ...this.seenByCache])
         };
     }
 }

package/util/version.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.flowrVersion = flowrVersion;
 const semver_1 = require("semver");
 // this is automatically replaced with the current version by release-it
-const version = '2.2.9';
+const version = '2.2.11';
 function flowrVersion() {
     return new semver_1.SemVer(version);
 }