fix: don't stop validation when value is undefined

Close #10
Julien-R44 · Jun 28, 2023 · 8ddf07a · 8ddf07a
1 parent 117af0c
commit 8ddf07a
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 2 deletions.
diff --git a/src/validators/builtin/index.ts b/src/validators/builtin/index.ts
@@ -28,7 +28,7 @@ export function builtinValidation(env: Record<string, string>, schema: PoppinsSc
       // Handle undefined aka optional results
       if (typeof res === 'undefined') {
         delete process.env[key]
-        return
+        continue
       }
 
       process.env[key] = res

diff --git a/src/validators/zod/index.ts b/src/validators/zod/index.ts
@@ -32,7 +32,7 @@ export async function zodValidation(env: Record<string, string>, schema: ZodSche
     // Handle undefined aka optional results
     if (typeof result.data === 'undefined') {
       delete process.env[key]
-      return
+      continue
     }
 
     process.env[key] = result.data

diff --git a/tests/common.spec.ts b/tests/common.spec.ts
@@ -191,4 +191,23 @@ test.group('vite-plugin-validate-env', (group) => {
     await plugin.config(viteConfig, viteEnvConfig)
     assert.equal(process.env.VITE_OPTIONAL, undefined)
   })
+
+  test('dont stop validation after undefined result', async ({ assert }) => {
+    assert.plan(2)
+
+    const plugin = ValidateEnv({
+      validator: 'builtin',
+      schema: {
+        VITE_OPTIONAL: Schema.number.optional(),
+        VITE_MY_VAR: Schema.string(),
+      },
+    })
+
+    await fs.add('.env.development', 'VITE_MY_VAR=hello')
+    // @ts-ignore
+    await plugin.config(viteConfig, viteEnvConfig)
+
+    assert.equal(process.env.VITE_OPTIONAL, undefined)
+    assert.equal(process.env.VITE_MY_VAR, 'hello')
+  })
 })
diff --git a/tests/zod.spec.ts b/tests/zod.spec.ts
@@ -144,4 +144,23 @@ test.group('Zod validation adaptater', (group) => {
     await plugin.config(viteConfig, viteEnvConfig)
     assert.equal(process.env.VITE_OPTIONAL_ZOD, undefined)
   })
+
+  test('dont stop validation after undefined result', async ({ assert }) => {
+    assert.plan(2)
+
+    const plugin = ValidateEnv({
+      validator: 'zod',
+      schema: {
+        VITE_OPTIONAL_ZOD: z.string().max(2).optional(),
+        VITE_MY_VAR: z.string(),
+      },
+    })
+
+    await fs.add(ENV_FILENAME, 'VITE_MY_VAR=hello')
+    // @ts-ignore
+    await plugin.config(viteConfig, viteEnvConfig)
+
+    assert.equal(process.env.VITE_OPTIONAL_ZOD, undefined)
+    assert.equal(process.env.VITE_MY_VAR, 'hello')
+  })
 })