fix: dot notation when line break after process.env (#425)

Chrilleweb · web-flow · commit fdfe46a2435e · 2026-05-26T21:42:25.000+02:00
* chore(deps): updated dev depen and pnpm

* chore: updated pnpm

* fix: dot notation when line break after process.env

* fix(cli): adjusted --explain ui

* fix: prevent extra blank line when adding missing keys to empty .env files

* chore: removed trust downgrade

* chore: updated node version in workflow
diff --git a/.changeset/bright-parrots-start.md b/.changeset/bright-parrots-start.md
@@ -0,0 +1,5 @@
+---
+'dotenv-diff': patch
+---
+
+adjustet --explain ui
diff --git a/.changeset/little-dolls-walk.md b/.changeset/little-dolls-walk.md
@@ -0,0 +1,5 @@
+---
+'dotenv-diff': patch
+---
+
+detects dot notation when line break appears after process.env
diff --git a/.changeset/polite-pants-cheer.md b/.changeset/polite-pants-cheer.md
@@ -0,0 +1,5 @@
+---
+'dotenv-diff': patch
+---
+
+prevent extra blank line when adding missing keys to empty .env files
diff --git a/.github/workflows/build-test-lint.yml b/.github/workflows/build-test-lint.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Install pnpm
         uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093
         with:
-          version: 10.33.0
+          version: 11.3.0
           run_install: false
 
       - name: Install dependencies
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -34,7 +34,7 @@ jobs:
       - name: Install pnpm
         uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093
         with:
-          version: 10.33.0
+          version: 11.3.0
 
       - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e
         with:
diff --git a/.github/workflows/test-coverage.yml b/.github/workflows/test-coverage.yml
@@ -20,11 +20,11 @@ jobs:
 
       - uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093
         with:
-          version: 10.33.0
+          version: 11.3.0
 
       - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e
         with:
-          node-version: 20
+          node-version: 24
           cache: 'pnpm'
 
       - run: pnpm install --frozen-lockfile
diff --git a/package.json b/package.json
@@ -32,18 +32,18 @@
     "@repo/eslint-config": "workspace:*",
     "@repo/tsconfig": "workspace:*",
     "@repo/vitest": "workspace:*",
-    "@types/node": "^25.9.0",
+    "@types/node": "^25.9.1",
     "@types/prompts": "^2.4.9",
-    "@typescript-eslint/eslint-plugin": "^8.59.3",
-    "@typescript-eslint/parser": "^8.59.3",
-    "@vitest/coverage-v8": "4.1.6",
+    "@typescript-eslint/eslint-plugin": "^8.59.4",
+    "@typescript-eslint/parser": "^8.59.4",
+    "@vitest/coverage-v8": "4.1.7",
     "eslint": "^10.4.0",
     "husky": "^9.1.7",
     "lint-staged": "^17.0.5",
     "prettier": "^3.8.3",
     "turbo": "^2.9.14",
     "typescript": "^6.0.3",
-    "vitest": "^4.1.6"
+    "vitest": "^4.1.7"
   },
-  "packageManager": "pnpm@10.33.0"
+  "packageManager": "pnpm@11.3.0"
 }
diff --git a/packages/@repo/eslint-config/package.json b/packages/@repo/eslint-config/package.json
@@ -12,8 +12,8 @@
     "format": "prettier --write \"**/*.{ts,js,json,md,yml}\""
   },
   "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "^8.59.3",
-    "@typescript-eslint/parser": "^8.59.3",
+    "@typescript-eslint/eslint-plugin": "^8.59.4",
+    "@typescript-eslint/parser": "^8.59.4",
     "eslint": "^10.4.0"
   }
 }
diff --git a/packages/cli/src/core/scan/patterns.ts b/packages/cli/src/core/scan/patterns.ts
@@ -53,7 +53,8 @@ export function buildSveltekitAliasPatterns(
 export const ENV_PATTERNS: Pattern[] = [
   /**
    * Matches process.env.KEY references in source code.
-   * Supports both dot notation and bracket notation.
+   * Supports both dot notation and bracket notation, including whitespace
+   * and line breaks between `env` and the accessor.
    *
    * Examples:
    *   process.env.MY_KEY
@@ -63,7 +64,7 @@ export const ENV_PATTERNS: Pattern[] = [
   {
     name: 'process.env' as const,
     regex:
-      /process\.env\.([A-Z_][A-Z0-9_]*)|process\.env\[['"]([A-Z_][A-Z0-9_]*)['"]]/g,
+      /process\.env\s*\.([A-Z_][A-Z0-9_]*)|process\.env\s*\[['"]([A-Z_][A-Z0-9_]*)['"]]/g,
     processor: (match) => {
       // match[1] covers dot notation: process.env.KEY
       // match[2] covers bracket notation: process.env['KEY']
@@ -103,7 +104,8 @@ export const ENV_PATTERNS: Pattern[] = [
 
   /**
    * Matches import.meta.env.KEY references in source code.
-   * Supports both dot notation and bracket notation.
+   * Supports both dot notation and bracket notation, including whitespace
+   * and line breaks between `env` and the accessor.
    *
    * Examples:
    *   import.meta.env.MY_KEY
@@ -113,7 +115,7 @@ export const ENV_PATTERNS: Pattern[] = [
   {
     name: 'import.meta.env' as const,
     regex:
-      /import\.meta\.env\.([A-Z_][A-Z0-9_]*)|import\.meta\.env\[['"]([A-Z_][A-Z0-9_]*)['"]]/g,
+      /import\.meta\.env\s*\.([A-Z_][A-Z0-9_]*)|import\.meta\.env\s*\[['"]([A-Z_][A-Z0-9_]*)['"]]/g,
     processor: (match) => {
       const variable = match[1] || match[2];
       return variable ? [variable] : [];
diff --git a/packages/cli/src/services/fixEnv.ts b/packages/cli/src/services/fixEnv.ts
@@ -79,11 +79,9 @@ export function applyFixes(options: ApplyFixesOptions): {
   if (missingKeys.length) {
     const content = fs.readFileSync(envPath, 'utf-8');
     const eol = content.includes('\r\n') ? '\r\n' : '\n';
+    const separator = content.length > 0 && !content.endsWith('\n') ? eol : '';
     const newContent =
-      content +
-      (content.endsWith('\n') ? '' : eol) +
-      missingKeys.map((k) => `${k}=`).join(eol) +
-      eol;
+      content + separator + missingKeys.map((k) => `${k}=`).join(eol) + eol;
     fs.writeFileSync(envPath, newContent);
     result.addedEnv = missingKeys;
   }
diff --git a/packages/cli/src/ui/scan/printExplain.ts b/packages/cli/src/ui/scan/printExplain.ts
@@ -154,9 +154,10 @@ function printChecks(checks: {
 }): void {
   printRow('Checks', formatCheck('Defined', checks.isDefined, 'error'));
   printContinuation(formatCheck('Used', checks.isUsed, 'warning'));
-  printContinuation(
-    formatCheck('Not duplicated', !checks.isDuplicated, 'warning'),
-  );
+
+  if (checks.isDuplicated) {
+    printContinuation(warning('⚠ Key is duplicated'));
+  }
 
   if (checks.isIgnored) {
     printContinuation(warning('⚠ Key is ignored'));
diff --git a/packages/cli/test/unit/cli/run.test.ts b/packages/cli/test/unit/cli/run.test.ts
@@ -62,6 +62,7 @@ import { setupGlobalConfig } from '../../../src/ui/shared/setupGlobalConfig.js';
 import { loadConfig } from '../../../src/config/loadConfig.js';
 import { runInit } from '../../../src/commands/init.js';
 import { explainKey } from '../../../src/commands/explain.js';
+import { DEFAULT_ENV_FILE } from '../../../src/config/constants.js';
 
 function createBaseOptions(overrides: Partial<Options> = {}): Options {
   return {
@@ -387,6 +388,24 @@ describe('run', () => {
     existsSpy.mockRestore();
   });
 
+  it('uses DEFAULT_ENV_FILE envPath when no env flag and default env file exists', async () => {
+    const program = {
+      parse: vi.fn(),
+      opts: vi.fn(() => ({ compare: false })),
+    } as unknown as Command;
+
+    mockNormalizeOptions.mockReturnValue(createBaseOptions({ compare: false }));
+    const existsSpy = vi.spyOn(fs, 'existsSync').mockReturnValue(true);
+    mockScanUsage.mockResolvedValue({ exitWithError: false });
+
+    await run(program);
+
+    expect(mockScanUsage).toHaveBeenCalledWith(
+      expect.objectContaining({ envPath: DEFAULT_ENV_FILE }),
+    );
+    existsSpy.mockRestore();
+  });
+
   it('prints JSON report output and uses collect callback in compare mode', async () => {
     const program = {
       parse: vi.fn(),
diff --git a/packages/cli/test/unit/core/scan/patterns.test.ts b/packages/cli/test/unit/core/scan/patterns.test.ts
@@ -54,6 +54,34 @@ describe('scanFile - Pattern Detection', () => {
         pattern: 'process.env',
       });
     });
+
+    it('detects dot notation when line break appears after process.env', () => {
+      const code = `
+        const connectionString = process.env
+          .EXPO_PUBLIC_AZURE_METRICS_CONNECTION_STRING as string;
+      `;
+      const result = scanFile('test.ts', code, baseOpts);
+
+      expect(result).toHaveLength(1);
+      expect(result[0]).toMatchObject({
+        variable: 'EXPO_PUBLIC_AZURE_METRICS_CONNECTION_STRING',
+        pattern: 'process.env',
+      });
+    });
+
+    it('detects bracket notation when line break appears after process.env', () => {
+      const code = `
+        const val = process.env
+          ["MY_KEY"];
+      `;
+      const result = scanFile('test.ts', code, baseOpts);
+
+      expect(result).toHaveLength(1);
+      expect(result[0]).toMatchObject({
+        variable: 'MY_KEY',
+        pattern: 'process.env',
+      });
+    });
   });
 
   describe('Node.js Destructuring', () => {
diff --git a/packages/cli/test/unit/services/fixEnv.test.ts b/packages/cli/test/unit/services/fixEnv.test.ts
@@ -117,6 +117,19 @@ describe('applyFixes', () => {
     expect(env).toContain('B=');
   });
 
+  it('starts on first line when adding missing keys to an empty file', () => {
+    fs.writeFileSync(envPath, '');
+
+    applyFixes({
+      envPath,
+      missingKeys: ['A', 'B'],
+      duplicateKeys: [],
+    });
+
+    const env = fs.readFileSync(envPath, 'utf-8');
+    expect(env).toBe('A=\nB=\n');
+  });
+
   it('handles duplicateKeys list even if no duplicates exist in file', () => {
     fs.writeFileSync(envPath, 'A=1\nB=2\n');
 
diff --git a/packages/cli/test/unit/ui/scan/printExplain.test.ts b/packages/cli/test/unit/ui/scan/printExplain.test.ts
@@ -246,7 +246,8 @@ describe('printExplain', () => {
       }),
     );
 
-    expect(allOutput.join('\n')).toContain('✘');
+    expect(allOutput.join('\n')).toContain('⚠ Key is duplicated');
+    expect(allOutput.join('\n')).not.toContain('Not duplicated');
   });
 
   it('shows ⚠ warning when isIgnored is true', () => {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +'dotenv-diff': patch
 +---
++
 +adjustet --explain ui
Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,8 @@`
`12`	`12`	`"format": "prettier --write \"*/.{ts,js,json,md,yml}\""`
`13`	`13`	`},`
`14`	`14`	`"devDependencies": {`
`15`		`- "@typescript-eslint/eslint-plugin": "^8.59.3",`
`16`		`- "@typescript-eslint/parser": "^8.59.3",`
	`15`	`+ "@typescript-eslint/eslint-plugin": "^8.59.4",`
	`16`	`+ "@typescript-eslint/parser": "^8.59.4",`
`17`	`17`	`"eslint": "^10.4.0"`
`18`	`18`	`}`
`19`	`19`	`}`