Merge pull request #147 from wlewis-formative/fix/146

Stop `find` as soon as match is discovered

src/index.test.ts

@@ -17,6 +17,8 @@ describe("Dotenv Mono", () => {
 		malformedWithEol: "TEST_MALFORMED_ENV\r\n",
 		defaults: "TEST_DEFAULT_ENV=1",
 		webTest: "TEST_WEB_ENV=1",
+		parent: "PARENT_ENV=1",
+		child: "CHILD_ENV=1",
 	};
 
 	beforeEach(() => {
@@ -35,6 +37,12 @@ describe("Dotenv Mono", () => {
 					},
 				},
 			},
+			"/parent": {
+				".env": mockEnv.parent,
+				"child": {
+					".env": mockEnv.child,
+				},
+			},
 		});
 		jest.spyOn(process, "cwd").mockReturnValue("/root/apps");
 		instance = new Dotenv({
@@ -124,6 +132,14 @@ describe("Dotenv Mono", () => {
 		expect(process.env).toEqual(expect.objectContaining(expected));
 	});
 
+	it("should prefer the nearer of two .env files with the same priority", () => {
+		jest.spyOn(process, "cwd").mockReturnValue("/parent/child");
+		expect(() => instance.load()).not.toThrow();
+		const expected = {"CHILD_ENV": "1"};
+		expect(instance.env).toEqual(expected);
+		expect(process.env).toEqual(expect.objectContaining(expected));
+	});
+
 	it("should load returns an empty output when none dotenv been found", () => {
 		jest.spyOn(process, "cwd").mockReturnValue("/empty");
 		instance.cwd = process.cwd();

src/index.ts

@@ -365,7 +365,7 @@ export class Dotenv {
 				})
 			: {
 					parsed: this.parse(plain),
-					ignoreProcessEnv: true,
+					processEnv: {},
 				};
 
 		if (this.expand) dotenvExpand.expand(config);
@@ -405,14 +405,13 @@ export class Dotenv {
 		let directory = path.resolve(this.cwd);
 		const {root} = path.parse(directory);
 		let depth = 0;
-		let match = false;
 		while (depth < this.depth) {
 			depth++;
 			const {foundPath, foundDotenv} = matcher(dotenv, directory);
 			dotenv = foundDotenv;
-			if (match) break;
-			if (foundPath) match = true;
-			if (directory === root) break;
+			if (foundPath || directory === root) {
+				break;
+			}
 			directory = path.dirname(directory);
 		}
 		return dotenv;