Allow overriding with other env files

renaming and additional readme

revert pubspec.lock changes

increment minor version level

Author: e-e

README.md

@@ -128,7 +128,7 @@ ESCAPED_DOLLAR_SIGN='$1000'
 You can merge a map into the environment on load:
 
 ```dart
-  await DotEnv.load(mergeWith: { "FOO": "foo", "BAR": "bar"});
+  await dotenv.load(mergeWith: { "FOO": "foo", "BAR": "bar"});
 ```
 
 You can also reference these merged variables within `.env`:
@@ -137,13 +137,33 @@ You can also reference these merged variables within `.env`:
   FOOBAR=$FOO$BAR
 ```
 
+## Merge with other env files:
+
+Useful for defining a base set of values, and overriding a subset based on environment. Env files specified first take precedence.
+
+```env
+# .env
+TEST_VALUE=base-value
+```
+
+```env
+# .env-staging
+TEST_VALUE=staging-value
+```
+
+```dart
+  await dotenv.load(fileName: ".env", overrideWith: [".env-staging"]);
+
+  dotenv.get("TEST_VALUE") // => "staging-value"
+```
+
 ## Usage with Platform Environment
 
 The Platform.environment map can be merged into the env:
 
 ```dart
   // For example using Platform.environment that contains a CLIENT_ID entry
-  await DotEnv.load(mergeWith: Platform.environment);
+  await dotenv.load(mergeWith: Platform.environment);
   print(env["CLIENT_ID"]);
 ```
 

lib/src/dotenv.dart

@@ -51,23 +51,50 @@ class DotEnv {
 
   /// Loads environment variables from the env file into a map
   /// Merge with any entries defined in [mergeWith]
-  Future<void> load(
-      {String fileName = '.env', Parser parser = const Parser(), Map<String, String> mergeWith = const {}}) async {
+  /// [overrideWith] is a list of other env files whose values will override values
+  ///   read from [fileName]
+  Future<void> load({
+    String fileName = '.env',
+    Parser parser = const Parser(),
+    Map<String, String> mergeWith = const {},
+    List<String> overrideWith = const [],
+  }) async {
     clean();
     final linesFromFile = await _getEntriesFromFile(fileName);
-    final linesFromMergeWith = mergeWith.entries.map((entry) => "${entry.key}=${entry.value}").toList();
-    final allLines = linesFromMergeWith..addAll(linesFromFile);
+    final linesFromOverrides = await _getLinesFromOverride(overrideWith);
+
+    final linesFromMergeWith = mergeWith.entries
+        .map((entry) => "${entry.key}=${entry.value}")
+        .toList();
+    final allLines = linesFromMergeWith
+      ..addAll(linesFromOverrides)
+      ..addAll(linesFromFile);
+
     final envEntries = parser.parse(allLines);
     _envMap.addAll(envEntries);
     _isInitialized = true;
   }
 
-  Future<void> testLoad(
-      {String fileInput = '', Parser parser = const Parser(), Map<String, String> mergeWith = const {}}) async {
+  Future<void> testLoad({
+    String fileInput = '',
+    Parser parser = const Parser(),
+    Map<String, String> mergeWith = const {},
+    List<String> overrideWith = const [],
+  }) async {
     clean();
     final linesFromFile = fileInput.split('\n');
-    final linesFromMergeWith = mergeWith.entries.map((entry) => "${entry.key}=${entry.value}").toList();
-    final allLines = linesFromMergeWith..addAll(linesFromFile);
+
+    final linesFromOverrides = overrideWith
+        .map((String lines) => lines.split("\n"))
+        .expand((x) => x)
+        .toList();
+
+    final linesFromMergeWith = mergeWith.entries
+        .map((entry) => "${entry.key}=${entry.value}")
+        .toList();
+    final allLines = linesFromMergeWith
+      ..addAll(linesFromOverrides)
+      ..addAll(linesFromFile);
     final envEntries = parser.parse(allLines);
     _envMap.addAll(envEntries);
     _isInitialized = true;
@@ -76,7 +103,8 @@ class DotEnv {
   /// True if all supplied variables have nonempty value; false otherwise.
   /// Differs from [containsKey](dart:core) by excluding null values.
   /// Note [load] should be called first.
-  bool isEveryDefined(Iterable<String> vars) => vars.every((k) => _envMap[k]?.isNotEmpty ?? false);
+  bool isEveryDefined(Iterable<String> vars) =>
+      vars.every((k) => _envMap[k]?.isNotEmpty ?? false);
 
   Future<List<String>> _getEntriesFromFile(String filename) async {
     try {
@@ -90,4 +118,16 @@ class DotEnv {
       throw FileNotFoundError();
     }
   }
+
+  Future<List<String>> _getLinesFromOverride(List<String> overrideWith) async {
+    List<String> overrideLines = [];
+
+    for (int i = 0; i < overrideWith.length; i++) {
+      final overrideWithFile = overrideWith[i];
+      final lines = await _getEntriesFromFile(overrideWithFile);
+      overrideLines = overrideLines..addAll(lines);
+    }
+
+    return overrideLines;
+  }
 }

pubspec.yaml

@@ -1,5 +1,5 @@
 name: flutter_dotenv
-version: 5.0.0
+version: 5.1.0
 description: Easily configure any flutter application with global variables using a `.env` file.
 homepage: https://github.com/java-james/flutter_dotenv
 environment:

test/.env

@@ -28,4 +28,6 @@ RETAIN_TRAILING_SQUOTE=retained'
 RETAIN_INNER_QUOTES_AS_STRING='{"foo": "bar"}'
 TRIM_SPACE_FROM_UNQUOTED=    some spaced out string
 USERNAME=[email protected]
-    SPACED_KEY = parsed
+    SPACED_KEY = parsed
+
+OVERRIDE_VALUE=not-overridden

test/.env-override

@@ -0,0 +1 @@
+OVERRIDE_VALUE=overridden

test/dotenv_test.dart

@@ -6,7 +6,9 @@ void main() {
   group('dotenv', () {
     setUp(() {
       print(Directory.current.toString());
-      dotenv.testLoad(fileInput: File('test/.env').readAsStringSync()); //, mergeWith: Platform.environment
+      dotenv.testLoad(
+          fileInput: File('test/.env')
+              .readAsStringSync()); //, mergeWith: Platform.environment
     });
     test('able to load .env', () {
       expect(dotenv.env['FOO'], 'foo');
@@ -35,6 +37,45 @@ void main() {
       expect(dotenv.env['TRIM_SPACE_FROM_UNQUOTED'], 'some spaced out string');
       expect(dotenv.env['USERNAME'], '[email protected]');
       expect(dotenv.env['SPACED_KEY'], 'parsed');
+      expect(dotenv.env['OVERRIDE_VALUE'], 'not-overridden');
+    });
+  });
+
+  group('dotenv with overrides', () {
+    setUp(() {
+      print(Directory.current.toString());
+      dotenv.testLoad(
+        fileInput: File('test/.env').readAsStringSync(),
+        overrideWith: [File("test/.env-override").readAsStringSync()],
+      ); //, mergeWith: Platform.environment
+    });
+    test('able to load .env', () {
+      expect(dotenv.env['BAR'], 'bar');
+      expect(dotenv.env['FOOBAR'], '\$FOOfoobar');
+      expect(dotenv.env['ESCAPED_DOLLAR_SIGN'], '\$1000');
+      expect(dotenv.env['ESCAPED_QUOTE'], "'");
+      expect(dotenv.env['BASIC'], 'basic');
+      expect(dotenv.env['AFTER_LINE'], 'after_line');
+      expect(dotenv.env['EMPTY'], '');
+      expect(dotenv.env['SINGLE_QUOTES'], 'single_quotes');
+      expect(dotenv.env['SINGLE_QUOTES_SPACED'], '    single quotes    ');
+      expect(dotenv.env['DOUBLE_QUOTES'], 'double_quotes');
+      expect(dotenv.env['DOUBLE_QUOTES_SPACED'], '    double quotes    ');
+      expect(dotenv.env['EXPAND_NEWLINES'], "expand\nnew\nlines");
+      expect(dotenv.env['DONT_EXPAND_UNQUOTED'], 'dontexpand\\nnewlines');
+      expect(dotenv.env['DONT_EXPAND_SQUOTED'], 'dontexpand\\nnewlines');
+      expect(dotenv.env['COMMENTS'], null);
+      expect(dotenv.env['EQUAL_SIGNS'], 'equals==');
+      expect(dotenv.env['RETAIN_INNER_QUOTES'], '{"foo": "bar"}');
+      expect(dotenv.env['RETAIN_LEADING_DQUOTE'], "\"retained");
+      expect(dotenv.env['RETAIN_LEADING_SQUOTE'], '\'retained');
+      expect(dotenv.env['RETAIN_TRAILING_DQUOTE'], 'retained\"');
+      expect(dotenv.env['RETAIN_TRAILING_SQUOTE'], "retained\'");
+      expect(dotenv.env['RETAIN_INNER_QUOTES_AS_STRING'], '{"foo": "bar"}');
+      expect(dotenv.env['TRIM_SPACE_FROM_UNQUOTED'], 'some spaced out string');
+      expect(dotenv.env['USERNAME'], '[email protected]');
+      expect(dotenv.env['SPACED_KEY'], 'parsed');
+      expect(dotenv.env['OVERRIDE_VALUE'], 'overridden');
     });
   });
 }