rename EnvVarSnapshot to ActualValuesSnapshot; move direct usages from Env inside Parsers;

Author: Philipp-Binder

src/DotNetEnv/Env.cs

@@ -91,11 +91,10 @@ private static IEnumerable<KeyValuePair<string, string>> LoadContents(string con
                 ? CreateDictionaryOption.TakeLast
                 : CreateDictionaryOption.TakeFirst;
 
-            Parsers.EnvVarSnapshot =
-                new ConcurrentDictionary<string, string>(envVarSnapshot.Concat(previousValues)
-                    .ToDotEnvDictionary(dictionaryOption));
+            var actualValues = new ConcurrentDictionary<string, string>(envVarSnapshot.Concat(previousValues)
+                .ToDotEnvDictionary(dictionaryOption));
 
-            var pairs = Parsers.ParseDotenvFile(contents, options.ClobberExistingVars);
+            var pairs = Parsers.ParseDotenvFile(contents, options.ClobberExistingVars, actualValues);
 
             // for NoClobber, remove pairs which are exactly contained in previousValues or present in EnvironmentVariables
             var unClobberedPairs = (options.ClobberExistingVars

src/DotNetEnv/IValue.cs

@@ -19,7 +19,7 @@ public ValueInterpolated (string id)
 
         public string GetValue ()
         {
-            return Parsers.EnvVarSnapshot.TryGetValue(_id, out var val) ? val : string.Empty;
+            return Parsers.ActualValuesSnapshot.TryGetValue(_id, out var val) ? val : string.Empty;
         }
     }
 

src/DotNetEnv/Parsers.cs

@@ -12,7 +12,7 @@ namespace DotNetEnv
 {
     class Parsers
     {
-        public static ConcurrentDictionary<string, string> EnvVarSnapshot = new ConcurrentDictionary<string, string>();
+        public static ConcurrentDictionary<string, string> ActualValuesSnapshot = new ConcurrentDictionary<string, string>();
 
         // helpful blog I discovered only after digging through all the Sprache source myself:
         // https://justinpealing.me.uk/post/2020-03-11-sprache1-chars/
@@ -260,11 +260,11 @@ from _c in Comment.OptionalOrDefault()
                 from _lt in LineTerminator
                 select new KeyValuePair<string, string>(null, null));
 
-        public static IEnumerable<KeyValuePair<string, string>> ParseDotenvFile (
-            string contents,
-            bool clobberExistingVariables = true
-        )
+        public static IEnumerable<KeyValuePair<string, string>> ParseDotenvFile(string contents,
+            bool clobberExistingVariables = true, IDictionary<string, string> actualValues = null)
         {
+            ActualValuesSnapshot = new ConcurrentDictionary<string, string>(actualValues ?? new Dictionary<string, string>());
+
             return Assignment.Select(UpdateEnvVarSnapshot).Or(Empty)
                 .Many()
                 .AtEnd()
@@ -273,8 +273,8 @@ public static IEnumerable<KeyValuePair<string, string>> ParseDotenvFile (
 
             KeyValuePair<string, string> UpdateEnvVarSnapshot(KeyValuePair<string, string> pair)
             {
-                if (clobberExistingVariables || !EnvVarSnapshot.ContainsKey(pair.Key))
-                    EnvVarSnapshot.AddOrUpdate(pair.Key, pair.Value, (key, oldValue) => pair.Value);
+                if (clobberExistingVariables || !ActualValuesSnapshot.ContainsKey(pair.Key))
+                    ActualValuesSnapshot.AddOrUpdate(pair.Key, pair.Value, (key, oldValue) => pair.Value);
 
                 return pair;
             }

test/DotNetEnv.Tests/ParserTests.cs

@@ -10,26 +10,22 @@
 
 namespace DotNetEnv.Tests
 {
-    public class ParserTests : IDisposable
+    public class ParserTests
     {
         // C# wow that you can't handle 32 bit unicode as chars. wow. strings for 4 byte chars.
         private static readonly string RocketChar = char.ConvertFromUtf32(0x1F680); // 🚀
 
         private const string EXCEPT_CHARS = "'\"$";
 
         private const string EV_TEST = "ENVVAR_TEST";
-
-        public ParserTests ()
+        private readonly IDictionary<string, string> _actualValuesDictionary = new Dictionary<string, string>()
         {
-            Parsers.EnvVarSnapshot = new ConcurrentDictionary<string, string>()
-            {
-                [EV_TEST] = "ENV value"
-            };
-        }
+            [EV_TEST] = "ENV value"
+        };
 
-        public void Dispose ()
+        public ParserTests()
         {
-            Parsers.EnvVarSnapshot.Clear();
+            Parsers.ActualValuesSnapshot = new ConcurrentDictionary<string, string>(_actualValuesDictionary);
         }
 
         [Fact]
@@ -441,7 +437,7 @@ public void ParseDotenvFile ()
         {
             void TestParse(KeyValuePair<string, string>[] expecteds, string input)
             {
-                var outputs = Parsers.ParseDotenvFile(input).ToArray();
+                var outputs = Parsers.ParseDotenvFile(input, actualValues: _actualValuesDictionary).ToArray();
                 Assert.Equal(expecteds.Length, outputs.Length);
 
                 for (var i = 0; i < outputs.Length; i++)