AEDebugging_ Optimize triplet search

SQUASHED: AUTO-COMMIT-src-client-reactive-active-expression-rewriting-active-expression-rewriting.js,AUTO-COMMIT-src-client-reactive-active-expression-rewriting-bidirectional-multi-map.js,AUTO-COMMIT-src-client-reactive-babel-plugin-polymorphic-identifiers-polymorphic-identifiers.js,

Author: Markus-Brand

src/client/reactive/active-expression-rewriting/active-expression-rewriting.js

@@ -216,33 +216,35 @@ class Dependency {
 
 const DependenciesToAExprs = {
   _depsToAExprs: new BidirectionalMultiMap(),
+  _AEsPerFile: new Map(),
 
   associate(dep, aexpr) {
+    const location = aexpr.meta().get("location").file;
+    if(!this._AEsPerFile.has(location)) {
+      this._AEsPerFile.set(location, new Set());
+    }
+    this._AEsPerFile.get(location).add(aexpr);
     this._depsToAExprs.associate(dep, aexpr);
     dep.updateTracking();
     debouncedUpdateDebuggingViews();
   },
 
   disconnectAllForAExpr(aexpr) {
+    const location = aexpr.meta().get("location").file;
+    if(this._AEsPerFile.has(location)) {
+      this._AEsPerFile.get(location).delete(aexpr);
+    }
     const deps = this.getDepsForAExpr(aexpr);
     this._depsToAExprs.removeAllLeftFor(aexpr);
     deps.forEach(dep => dep.updateTracking());
     debouncedUpdateDebuggingViews();
   },
 
-  getAETriplesForFile(url) {
-    const result = [];
-    for (const ae of this._depsToAExprs.getAllRight()) {
-      const location = ae.meta().get("location").file;
-      if (location.includes(url)) {
-        for (const dependency of this.getDepsForAExpr(ae)) {
-          for (const hook of HooksToDependencies.getHooksForDep(dependency)) {
-            result.push({ hook, dependency, ae });
-          }
-        }
-      }
+  getAEsInFile(url) {
+    for(const [location, aes] of this._AEsPerFile.entries()) {
+      if(location.includes(url)) return aes;
     }
-    return result;
+    return [];
   },
 
   getAExprsForDep(dep) {
@@ -275,24 +277,20 @@ const HooksToDependencies = {
     this._hooksToDeps.associate(hook, dep);
     debouncedUpdateDebuggingViews();
   },
+  
   remove(hook, dep) {
     this._hooksToDeps.remove(hook, dep);
     debouncedUpdateDebuggingViews();
   },
 
-  async getHookTriplesForFile(url) {
-    const result = [];
-    for (const hook of this._hooksToDeps.getAllLeft()) {
-      const locations = await hook.getLocations();
-      if (locations.some(loc => loc && loc.source.includes(url))) {
-        for (const dependency of this.getDepsForHook(hook)) {
-          for (const ae of DependenciesToAExprs.getAExprsForDep(dependency)) {
-            result.push({ hook, dependency, ae });
-          }
-        }
-      }
-    }
-    return result;
+  async getHooksInFile(url) {
+    const hooksWithLocations = await Promise.all(this._hooksToDeps.getAllLeft().map(hook => {
+      return hook.getLocations().then(locations => {return {hook, locations}});     
+    }))
+    return hooksWithLocations.filter(({hook, locations}) => {
+      const location = locations.find(loc => loc && loc.source); 
+      return location && locations.source.includes(url);
+    }).map(({hook, locations}) => hook);
   },
 
   disconnectAllForDependency(dep) {
@@ -932,12 +930,19 @@ export async function registerFileForAEDebugging(url, context, triplesCallback)
 
 export async function getDependencyTriplesForFile(url) {
   const result = [];
-  for (const hook of HooksToDependencies._hooksToDeps.getAllLeft()) {
-    const locations = await hook.getLocations();
+  for (const ae of DependenciesToAExprs.getAEsInFile(url)) {
+    for (const dependency of DependenciesToAExprs.getDepsForAExpr(ae)) {
+      for(const hook of HooksToDependencies.getHooksForDep(dependency)) {
+          result.push({ hook, dependency, ae });
+      }
+    }
+  }
+  for (const hook of await HooksToDependencies.getHooksInFile(url)) {
     for (const dependency of HooksToDependencies.getDepsForHook(hook)) {
-      for (const ae of DependenciesToAExprs.getAExprsForDep(dependency)) {
+      for(const ae of DependenciesToAExprs.getAExprsForDep(dependency)) {
         const location = ae.meta().get("location").file;
-        if (location.includes(url) || locations.some(loc => loc && loc.file.includes(url))) {
+        // if the AE is also in this file, we already covered it with the previous loop
+        if (!location.includes(url)){
           result.push({ hook, dependency, ae });
         }
       }

src/client/reactive/active-expression-rewriting/bidirectional-multi-map.js

@@ -27,6 +27,14 @@ export default class BidirectionalMultiMap {
     this.domainToRange.clear();
     this.rangeToDomain.clear();
   }
+  
+  hasRight(val) {    
+    return this.rangeToDomain.has(val);
+  }
+  
+  hasLeft(val) {
+    return this.domainToRange.has(val);
+  }
 
   getRightsFor(left) {
     return this.domainToRange.getOrCreate(left, () => new Set());

src/client/reactive/babel-plugin-polymorphic-identifiers/polymorphic-identifiers.js

@@ -30,7 +30,6 @@ export default function ({ types: t, template }) {
             return foundDirective;
           }
 
-          debugger
           const shouldTransform = state.opts.executedIn === 'workspace' || hasDirective(path, "pi");
           if (!shouldTransform) {
             return;