refactcor(dotenv): prepare for noUncheckedIndexedAccess (#4261)

* refatcor: prepare for noUncheckedIndexedAccess * fix: type check * fix: lint * fix: cr
denoland · Feb 1, 2024 · d8a912f · d8a912f
1 parent 85c8edc
commit d8a912f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/dotenv/mod.ts b/dotenv/mod.ts
@@ -76,9 +76,9 @@ export function loadSync(
 
   if (defaultsPath) {
     const confDefaults = parseFileSync(defaultsPath);
-    for (const key in confDefaults) {
+    for (const [key, value] of Object.entries(confDefaults)) {
       if (!(key in conf)) {
-        conf[key] = confDefaults[key];
+        conf[key] = value;
       }
     }
   }
@@ -89,9 +89,9 @@ export function loadSync(
   }
 
   if (_export) {
-    for (const key in conf) {
+    for (const [key, value] of Object.entries(conf)) {
       if (Deno.env.get(key) !== undefined) continue;
-      Deno.env.set(key, conf[key]);
+      Deno.env.set(key, value);
     }
   }
 
@@ -283,9 +283,9 @@ export async function load(
 
   if (defaultsPath) {
     const confDefaults = await parseFile(defaultsPath);
-    for (const key in confDefaults) {
+    for (const [key, value] of Object.entries(confDefaults)) {
       if (!(key in conf)) {
-        conf[key] = confDefaults[key];
+        conf[key] = value;
       }
     }
   }
@@ -296,9 +296,9 @@ export async function load(
   }
 
   if (_export) {
-    for (const key in conf) {
+    for (const [key, value] of Object.entries(conf)) {
       if (Deno.env.get(key) !== undefined) continue;
-      Deno.env.set(key, conf[key]);
+      Deno.env.set(key, value);
     }
   }
 

diff --git a/dotenv/parse.ts b/dotenv/parse.ts
@@ -24,7 +24,7 @@ function expandCharacters(str: string): string {
 
   return str.replace(
     /\\([nrt])/g,
-    ($1: keyof CharactersMap): string => charactersMap[$1],
+    ($1: keyof CharactersMap): string => charactersMap[$1] || "",
   );
 }
 
@@ -89,7 +89,7 @@ export function parse(rawDotenv: string): Record<string, string> {
   //https://github.com/motdotla/dotenv-expand/blob/ed5fea5bf517a09fd743ce2c63150e88c8a5f6d1/lib/main.js#L23
   const variablesMap = { ...env };
   keysForExpandCheck.forEach((key) => {
-    env[key] = expand(env[key], variablesMap);
+    env[key] = expand(env[key]!, variablesMap);
   });
 
   return env;

diff --git a/dotenv/parse_test.ts b/dotenv/parse_test.ts
@@ -50,7 +50,7 @@ Deno.test("parse()", () => {
   );
 
   assertEquals(
-    JSON.parse(load.JSON).foo,
+    JSON.parse(load.JSON || JSON.stringify({})).foo,
     "bar",
     "inner quotes are maintained",
   );