Update DynamicSourceCache when executing specific commands

PowerType.Tests/CacheTests.cs

@@ -100,4 +100,26 @@ public void ShouldUpdate(TimeSpan? byTime, bool byCurrentWorkingDirectory, IEnum
             result.Should().Be(shouldUpdate);
         }
     }
+
+    [InlineData("install", true)]
+    [InlineData("Install", true)]
+    [InlineData("Install package", true)]
+    [InlineData("reinstall", false)]
+    [InlineData("uninstall", true)]
+    [Theory]
+    public void ShouldUpdateByCommand(string command, bool expected)
+    {
+        var cache = new Cache
+        {
+            ByCommand = new string[]
+            {
+                "install",
+                "uninstall"
+            }
+        };
+        var systemTime = new SystemTimeMock(DateTime.Today);
+        cache.Initialize(systemTime);
+        cache.UpdateCache(new List<SourceItem> { }, string.Empty);
+        cache.ShouldUpdate(string.Empty, command).Should().Be(expected);
+    }
 }

PowerType.Tests/DictionarySuggestorTests.cs → PowerType.Tests/DictionarySuggesterTests.cs

@@ -5,10 +5,10 @@
 using Xunit;
 
 namespace PowerType.Tests;
-public class DictionarySuggestorTests
+public class DictionarySuggesterTests
 {
-    private readonly DictionarySuggestor dictionarySuggestor;
-    public DictionarySuggestorTests()
+    private readonly DictionarySuggester dictionarySuggester;
+    public DictionarySuggesterTests()
     {
         var allRepositories = new DynamicSource
         {
@@ -135,7 +135,7 @@ public DictionarySuggestorTests()
         {
             SourceItem.FromName("First"), SourceItem.FromName("Second"), SourceItem.FromName("With space"), SourceItem.FromName("release/v1.16.26")
         }, "");
-        dictionarySuggestor = new DictionarySuggestor(dictionary);
+        dictionarySuggester = new DictionarySuggester(dictionary);
     }
 
     [Theory]
@@ -178,7 +178,7 @@ public void TestParsing(string[] input, string[] expectedOutput)
     {
         var context = new DictionaryParsingContext("", input.Select(x => PowerShellString.FromEscapedSmart(x)));
         context.Command = new Command("git", null!);
-        var result = dictionarySuggestor.GetPredictions(context).Select(x => x.SuggestionText);
+        var result = dictionarySuggester.GetPredictions(context).Select(x => x.SuggestionText);
         result.Should().BeEquivalentTo(expectedOutput);
     }
 }

PowerType.Tests/ExecutionEngineThreadTests.cs

@@ -38,7 +38,7 @@ public void CacheDictionaryDynamicSources()
         using var executionEngineThread = new ExecutionEngineThread(queue);
         SendAndWaitForCommand(new InitializeDictionaryCommand(Path.Combine(Environment.CurrentDirectory, "Dictionaries", "test.ps1")), queue, executionEngineThread);
         var dictionary = executionEngineThread.GetDictionaries().Single();
-        SendAndWaitForCommand(new CacheDictionaryDynamicSources(dictionary, Environment.CurrentDirectory), queue, executionEngineThread);
+        SendAndWaitForCommand(new CacheDictionaryDynamicSourcesCommand(dictionary, Environment.CurrentDirectory), queue, executionEngineThread);
         if (!executionEngineThread.IsHealthy(out var exception))
         {
             throw new Exception("execution engine thread was not healthy", exception);
@@ -51,7 +51,7 @@ public void GetSuggestors()
         var queue = new ThreadQueue<Command>();
         using var executionEngineThread = new ExecutionEngineThread(queue);
         SendAndWaitForCommand(new InitializeDictionaryCommand(Path.Combine(Environment.CurrentDirectory, "Dictionaries", "test.ps1")), queue, executionEngineThread);
-        executionEngineThread.GetSuggestors().Count.Should().Be(1);
+        executionEngineThread.GetSuggesters().Count.Should().Be(1);
     }
 
     [Fact]
@@ -62,7 +62,7 @@ public void DontCrashOnUnkownDrive()
         SendAndWaitForCommand(new InitializeDictionaryCommand(Path.Combine(Environment.CurrentDirectory, "Dictionaries", "test.ps1")), queue, executionEngineThread);
 
         var dictionary = executionEngineThread.GetDictionaries().Single();
-        SendAndWaitForCommand(new CacheDictionaryDynamicSources(dictionary, @"X:\DoesNotExist"), queue, executionEngineThread);
+        SendAndWaitForCommand(new CacheDictionaryDynamicSourcesCommand(dictionary, @"X:\DoesNotExist"), queue, executionEngineThread);
         if (!executionEngineThread.IsHealthy(out var exception))
         {
             throw new Exception("execution engine thread was not healthy", exception);

PowerType/BackgroundProcessing/Commands.cs

@@ -8,5 +8,5 @@ internal abstract record Command
     public volatile bool IsDone;
 }
 internal record InitializeDictionaryCommand(string File) : Command;
-internal record CacheDictionaryDynamicSources(PowerTypeDictionary Dictionary, string CurrentWorkingDirectory) : Command;
-
+internal record CacheDictionaryDynamicSourcesCommand(PowerTypeDictionary Dictionary, string CurrentWorkingDirectory) : Command;
+internal record CommandExecutedCommand(PowerTypeDictionary Dictionary, string CurrentWorkingDirectory, string Command) : Command;

PowerType/BackgroundProcessing/ExecutionEngine.cs

@@ -7,7 +7,7 @@ internal partial class ExecutionEngine
     private ExecutionEngineThread? executionEngineThread;
     private readonly ThreadQueue<Command> threadQueue = new();
 
-    public List<DictionarySuggestor> GetSuggestors() => executionEngineThread?.GetSuggestors() ?? new List<DictionarySuggestor>();
+    public List<DictionarySuggester> GetSuggesters() => executionEngineThread?.GetSuggesters() ?? new List<DictionarySuggester>();
 
     public bool IsHealthy(out Exception? exception)
     {
@@ -43,5 +43,8 @@ public void InitialDictionary(string dictionaryPath) =>
         threadQueue.Enqueue(new InitializeDictionaryCommand(dictionaryPath));
 
     public void Cache(PowerTypeDictionary dictionary, string currentWorkingDirectory) =>
-        threadQueue.Enqueue(new CacheDictionaryDynamicSources(dictionary, currentWorkingDirectory));
+        threadQueue.Enqueue(new CacheDictionaryDynamicSourcesCommand(dictionary, currentWorkingDirectory));
+
+    public void CommandExecuted(PowerTypeDictionary dictionary, string currentWorkingDirectory, string command) => 
+        threadQueue.Enqueue(new CommandExecutedCommand(dictionary, currentWorkingDirectory, command));
 }

PowerType/BackgroundProcessing/ExecutionEngineThread.cs

@@ -10,7 +10,7 @@ namespace PowerType.BackgroundProcessing;
 internal class ExecutionEngineThread : IDisposable
 {
     private bool disposed;
-    record DictionaryInformation(string File, DictionarySuggestor Suggestor);
+    record DictionaryInformation(string File, DictionarySuggester Suggester);
     private readonly object dictionariesLocker = new();
     private readonly List<DictionaryInformation> dictionaries = new();
     private readonly ThreadQueue<Command> queue;
@@ -39,11 +39,11 @@ public bool IsHealthy(out Exception? exception)
     }
 
     /// <summary>This method is thread safe</summary>
-    public List<DictionarySuggestor> GetSuggestors()
+    public List<DictionarySuggester> GetSuggesters()
     {
         lock (dictionariesLocker)
         {
-            return dictionaries.ConvertAll(x => x.Suggestor);
+            return dictionaries.ConvertAll(x => x.Suggester);
         }
     }
 
@@ -52,7 +52,7 @@ public List<PowerTypeDictionary> GetDictionaries()
     {
         lock (dictionariesLocker)
         {
-            return dictionaries.ConvertAll(x => x.Suggestor.Dictionary);
+            return dictionaries.ConvertAll(x => x.Suggester.Dictionary);
         }
     }
 
@@ -67,10 +67,14 @@ private void InnerLoop()
                 {
                     Handle(initializeCommand);
                 }
-                else if (command is CacheDictionaryDynamicSources cacheDictionaryCommand)
+                else if (command is CacheDictionaryDynamicSourcesCommand cacheDictionaryCommand)
                 {
                     Handle(cacheDictionaryCommand);
                 }
+                else if (command is CommandExecutedCommand commandExecutedCommand)
+                {
+                    Handle(commandExecutedCommand);
+                }
                 else
                 {
                     throw new InvalidOperationException($"Don't know how to handle command {command.GetType()}!");
@@ -125,7 +129,7 @@ private void Handle(InitializeDictionaryCommand command)
             throw new Exception("Failed to initialize dictionary, errors: " + errors);
         }
 
-        DictionarySuggestor suggestor;
+        DictionarySuggester suggester;
         var resultObject = result.Single().BaseObject;
         if (resultObject is PowerTypeDictionary dictionary)
         {
@@ -136,27 +140,27 @@ private void Handle(InitializeDictionaryCommand command)
             }
             dictionary.Initialize(SystemTime.Instance);
             dictionary.Validate();
-            suggestor = new DictionarySuggestor(dictionary);
+            suggester = new DictionarySuggester(dictionary);
         }
-        else if (resultObject is DictionarySuggestor suggestorTmp)
+        else if (resultObject is DictionarySuggester suggesterTemp)
         {
-            suggestor = suggestorTmp;
+            suggester = suggesterTemp;
         }
         else
         {
-            throw new InvalidOperationException("Didn't receive a PowerTypeDictionary or ISuggestor");
+            throw new InvalidOperationException("Didn't receive a PowerTypeDictionary or ISuggester");
         }
         lock (dictionariesLocker)
         {
-            dictionaries.Add(new DictionaryInformation(command.File, suggestor));
+            dictionaries.Add(new DictionaryInformation(command.File, suggester));
         }
     }
 
-    private void Handle(CacheDictionaryDynamicSources command)
+    private void Handle(CacheDictionaryDynamicSourcesCommand command)
     {
         var dictionaryInformation = GetDictionaryInformation(command.Dictionary);
 
-        foreach (var dynamicSource in dictionaryInformation.Suggestor.GetDynamicSources())
+        foreach (var dynamicSource in dictionaryInformation.Suggester.GetDynamicSources())
         {
             if (dynamicSource.Cache.ShouldUpdate(command.CurrentWorkingDirectory))
             {
@@ -177,11 +181,36 @@ private void Handle(CacheDictionaryDynamicSources command)
         }
     }
 
+    private void Handle(CommandExecutedCommand command)
+    {
+        var dictionaryInformation = GetDictionaryInformation(command.Dictionary);
+
+        foreach (var dynamicSource in dictionaryInformation.Suggester.GetDynamicSources())
+        {
+            if (dynamicSource.Cache.ShouldUpdate(command.CurrentWorkingDirectory, command.Command))
+            {
+                try
+                {
+                    runspace.SessionStateProxy.Path.SetLocation(command.CurrentWorkingDirectory);
+                    var result = dynamicSource.CommandExpression.Invoke();
+                    var items = result.Select(x => x.BaseObject is string value ?
+                        new SourceItem { Name = value } :
+                        (SourceItem)x.BaseObject).ToList();
+                    dynamicSource.Cache.UpdateCache(items, command.CurrentWorkingDirectory);
+                }
+                catch (System.Management.Automation.DriveNotFoundException)
+                {
+                    //todo: log exception
+                }
+            }
+        }
+    }
+
     private DictionaryInformation GetDictionaryInformation(PowerTypeDictionary dictionary)
     {
         lock (dictionariesLocker)
         {
-            return this.dictionaries.Single(x => x.Suggestor is DictionarySuggestor suggestor && suggestor.Dictionary == dictionary);
+            return this.dictionaries.Single(x => x.Suggester is DictionarySuggester suggestor && suggestor.Dictionary == dictionary);
         }
     }
 

PowerType/CurrentWorkingDirectoryProvider.cs

@@ -1,8 +1,9 @@
 using System.Management.Automation;
+using PowerType.BackgroundProcessing;
 
 namespace PowerType;
 
-public class CurrentWorkingDirectoryProvider : ICurrentWorkingDirectoryProvider
+internal class CurrentWorkingDirectoryProvider : ICurrentWorkingDirectoryProvider
 {
     private bool disposed;
     private volatile string currentWorkingDirectory;
@@ -13,6 +14,7 @@ public CurrentWorkingDirectoryProvider(SessionState sessionState)
         this.sessionState = sessionState;
         currentWorkingDirectory = sessionState.Path.CurrentFileSystemLocation.ProviderPath;
         sessionState.InvokeCommand.LocationChangedAction += LocationChanged;
+
     }
 
     private void LocationChanged(object? sender, LocationChangedEventArgs e)

PowerType/Dictionaries/git.ps1

@@ -73,7 +73,8 @@ $remotes = [DynamicSource]@{
     };
     Cache = [Cache]@{
         ByCurrentWorkingDirectory = $true;
-        ByTime = New-TimeSpan -Seconds 30
+        ByTime = New-TimeSpan -Seconds 30;
+        ByCommand = @("remote")
     }
 }
 
@@ -85,7 +86,8 @@ $allBranches = [DynamicSource]@{
     };
     Cache = [Cache]@{
         ByCurrentWorkingDirectory = $true;
-        ByTime = New-TimeSpan -Seconds 10
+        ByTime = New-TimeSpan -Seconds 10;
+        ByCommand = @("checkout", "fetch", "pull", "switch")
     }
 }
 
@@ -97,7 +99,8 @@ $localBranches = [DynamicSource]@{
     };
     Cache = [Cache]@{
         ByCurrentWorkingDirectory = $true;
-        ByTime = New-TimeSpan -Seconds 10
+        ByTime = New-TimeSpan -Seconds 10;
+        ByCommand = @("checkout", "fetch", "pull", "switch")
     }
 }
 
@@ -109,7 +112,8 @@ $stashes = [DynamicSource]@{
     };
     Cache = [Cache]@{
         ByCurrentWorkingDirectory = $true;
-        ByTime = New-TimeSpan -Seconds 10
+        ByTime = New-TimeSpan -Seconds 10;
+        ByCommand = @("stash")
     }
 }
 

PowerType/Dictionaries/nvm4win.ps1

@@ -7,7 +7,8 @@
         $hardcoded + $list
     };
     Cache = [Cache]@{
-        ByTime = New-TimeSpan -Seconds 10
+        ByTime = New-TimeSpan -Seconds 10;
+        ByCommand = @("install", "uninstall")
     }
 }
 

PowerType/DictionarySuggestor.cs → PowerType/DictionarySuggester.cs

@@ -5,7 +5,7 @@
 
 namespace PowerType;
 
-internal class DictionarySuggestor
+internal class DictionarySuggester
 {
     private readonly List<DynamicSource> dynamicSources;
     public PowerTypeDictionary Dictionary { get; }
@@ -18,7 +18,7 @@ internal class DictionarySuggestor
 
     public bool HasKey(string key) => Keys.Contains(key, StringComparer.OrdinalIgnoreCase);
 
-    public DictionarySuggestor(PowerTypeDictionary dictionary)
+    public DictionarySuggester(PowerTypeDictionary dictionary)
     {
         this.Dictionary = dictionary;
         dynamicSources = dictionary.Parameters.SelectMany(p => RecursiveGet(p)).ToList();

PowerType/Model/Cache.cs

@@ -1,4 +1,6 @@
-namespace PowerType.Model;
+using PowerType.BackgroundProcessing;
+
+namespace PowerType.Model;
 
 public interface ISystemTime
 {
@@ -9,6 +11,7 @@ public class Cache
 {
     private ISystemTime systemTime = default!;
     public TimeSpan? ByTime { get; set; }
+    public string[] ByCommand { get; set; } = new string[0];
     public bool ByCurrentWorkingDirectory { get; set; }
 
     internal void Initialize(ISystemTime systemTime)
@@ -33,13 +36,14 @@ internal void Validate()
     private DateTime lastUpdate = DateTime.MinValue;
     private string lastWokringDirectory = string.Empty;
 
-    internal bool ShouldUpdate(string currentWorkingDirectory)
+    internal bool ShouldUpdate(string currentWorkingDirectory, string? commandExecuted = null)
     {
         lock (locker)
         {
             var diff = systemTime.UtcNow.Subtract(lastUpdate);
             return (ByTime.HasValue && diff > ByTime.Value) ||
-                   (ByCurrentWorkingDirectory && lastWokringDirectory != currentWorkingDirectory);
+                   (ByCurrentWorkingDirectory && lastWokringDirectory != currentWorkingDirectory) ||
+                   (commandExecuted != null && ByCommand.Any(x => commandExecuted.StartsWith(x, StringComparison.OrdinalIgnoreCase)));
         }
     }