dynenv 1.3.2 → 1.4.2

package/README.md

@@ -2,12 +2,12 @@
 
 Dynamically loads environment variables from modules and then spawns a child process with them
 
-It's like  [dotenv](https://github.com/motdotla/dotenv), but instead of .env files, you require modules!
+It's like [dotenv](https://github.com/motdotla/dotenv), but instead of .env files, you require modules!
 
 ## Usage
 
 Add `dynenv` as a dev dependency using your particular package manager:
-```json
+```sh
 npm install dynenv --save-dev
 yarn add dynenv --dev
 ```

package/index.js

@@ -1,80 +1,9 @@
 #!/usr/bin/env node
-const spawn = require('cross-spawn');
-const { readdir } = require('fs');
-const { join, resolve, sep } = require('path');
+import { parseArgs } from './lib/parseArgs.js';
+import { requireFiles } from './lib/requireFiles.js';
+import { spawnNextCommand } from './lib/spawnNextCommand.js';
 
-parseArgs()
-	.then(state => requireFiles(state))
-	.then(state => process.exitCode = spawnNextCommand(state).status)
+parseArgs(process.argv.slice(2))
+  .then(state => requireFiles(state, process.env))
+  .then(state => process.exitCode = spawnNextCommand(state).status)
 ;
-
-async function parseArgs() {
-	const args = process.argv.slice(2);
-	const barrier = args.indexOf('--');
-	if (-1 === barrier) {
-		const modules = await listDirectory('./node_modules/');
-		for (const parentDirectory of modules.filter(m => m.indexOf(`${sep}@`) >= 0)) {
-			modules.push(...await listDirectory(parentDirectory));
-		}
-		const filesToRequire = [];
-		for (const module of modules) {
-			const packageJSON = safeRequire(resolve(module, 'package.json'));
-			if (packageJSON && packageJSON.dynenv) {
-				filesToRequire.push(resolve(module, packageJSON.dynenv));
-			}
-		}
-		return {
-			filesToRequire,
-			nextCommand: args[0],
-			nextCommandArgs: args.slice(1),
-		};
-	}
-	else {
-		return {
-			filesToRequire: args.slice(0, barrier),
-			nextCommand: args[barrier + 1],
-			nextCommandArgs: args.slice(barrier + 2),
-		};
-	}
-}
-
-function listDirectory(ref) {
-	return new Promise((resolve, reject) => {
-		readdir(ref, (err, results) => err
-			? reject(err)
-			: resolve(results.map(result => join(ref, result))),
-		);
-	});
-}
-
-async function requireFiles(state) {
-	state.env = Object.assign({}, process.env);
-	for (const fileToRequire of state.filesToRequire) {
-		const exports = safeRequire(fileToRequire.startsWith('./')
-			? resolve(fileToRequire)
-			: fileToRequire);
-		const newEnv = typeof exports === 'function'
-			? await exports()
-			: exports;
-		if (newEnv) {
-			Object.assign(state.env, newEnv);
-		}
-	}
-	return state;
-}
-
-function safeRequire(ref) {
-	try {
-		return require(ref);
-	}
-	catch (err) {
-		return null;
-	}
-}
-
-function spawnNextCommand({ nextCommand, nextCommandArgs, env }) {
-	return spawn.sync(nextCommand, nextCommandArgs, {
-		stdio: 'inherit',
-		env,
-	});
-}

package/lib/listDirectory.js

@@ -0,0 +1,11 @@
+import { readdir } from 'fs';
+import { join } from 'path';
+
+export function listDirectory(ref) {
+  return new Promise((resolve, reject) => {
+    readdir(ref, (err, results) => err
+      ? reject(err)
+      : resolve(results.map(result => join(ref, result))),
+    );
+  });
+}

package/lib/parseArgs.js

@@ -0,0 +1,32 @@
+import { resolve, sep } from 'path';
+import { listDirectory } from './listDirectory.js';
+import { safeRequire } from './safeRequire.js';
+
+export async function parseArgs(args) {
+  const barrier = args.indexOf('--');
+  if (-1 === barrier) {
+    const modules = await listDirectory('./node_modules/');
+    for (const parentDirectory of modules.filter(m => m.indexOf(`${sep}@`) >= 0)) {
+      modules.push(...await listDirectory(parentDirectory));
+    }
+    const filesToRequire = [];
+    for (const module of modules) {
+      const packageJSON = safeRequire(resolve(module, 'package.json'));
+      if (packageJSON && packageJSON.dynenv) {
+        filesToRequire.push(resolve(module, packageJSON.dynenv));
+      }
+    }
+    return {
+      filesToRequire,
+      nextCommand: args[0],
+      nextCommandArgs: args.slice(1),
+    };
+  }
+  else {
+    return {
+      filesToRequire: args.slice(0, barrier),
+      nextCommand: args[barrier + 1],
+      nextCommandArgs: args.slice(barrier + 2),
+    };
+  }
+}

package/lib/requireFiles.js

@@ -0,0 +1,18 @@
+import { resolve } from 'path';
+import { safeRequire } from './safeRequire.js';
+
+export async function requireFiles(state, initialEnv) {
+  state.env = Object.assign({}, initialEnv);
+  for (const fileToRequire of state.filesToRequire) {
+    const exports = safeRequire(fileToRequire.startsWith('./')
+      ? resolve(fileToRequire)
+      : fileToRequire);
+    const newEnv = typeof exports === 'function'
+      ? await exports()
+      : exports;
+    if (newEnv) {
+      Object.assign(state.env, newEnv);
+    }
+  }
+  return state;
+}

package/lib/safeRequire.js

@@ -0,0 +1,14 @@
+import { createRequire } from 'module';
+
+// Create a CommonJS-compatible require that works from ESM context
+const requireCompat = createRequire(import.meta.url);
+
+export function safeRequire(ref) {
+  try {
+    return requireCompat(ref);
+  }
+  catch (err) {
+    console.error(err);
+    return null;
+  }
+}

package/lib/spawnNextCommand.js

@@ -0,0 +1,8 @@
+import { sync } from 'cross-spawn';
+
+export function spawnNextCommand({ nextCommand, nextCommandArgs, env }) {
+  return sync(nextCommand, nextCommandArgs, {
+    stdio: 'inherit',
+    env,
+  });
+}

package/package.json

@@ -1,5 +1,5 @@
 {
-	"version": "1.3.2",
+	"version": "1.4.2",
 	"name": "dynenv",
 	"description": "Dynamically loads environment variables from modules and then spawns a child process with them",
 	"author": "Dawson Toth",
@@ -7,33 +7,40 @@
 		"dotenv"
 	],
 	"homepage": ".",
-	"license": "",
+	"type": "module",
+	"license": "ISC",
+	"publishConfig": {
+		"registry": "https://registry.npmjs.org/",
+		"tag": "latest",
+		"provenance": true
+	},
 	"repository": "github:dawsontoth/dynenv",
 	"main": "index.js",
 	"bin": {
 		"dynenv": "./index.js"
 	},
-	"scripts": {},
+	"scripts": {
+		"test": "vitest",
+		"test:ci": "vitest run",
+		"test:coverage": "vitest run --coverage",
+		"lint": "eslint .",
+		"lint:fix": "eslint . --fix"
+	},
 	"dependencies": {
 		"cross-spawn": "^7.0.3"
 	},
 	"devDependencies": {
+		"@eslint/js": "^9.39.1",
+		"@semantic-release/commit-analyzer": "^13.0.1",
 		"@semantic-release/git": "^10.0.1",
-		"semantic-release": "^23.0.0"
-	},
-	"plugins": [
-		"@semantic-release/commit-analyzer",
-		"@semantic-release/release-notes-generator",
-		[
-			"@semantic-release/git",
-			{
-				"assets": [
-					"dist/**/*.{js,css}",
-					"docs",
-					"package.json"
-				],
-				"message": "chore(release): ${nextRelease.version} [skip ci]\n\n${nextRelease.notes}"
-			}
-		]
-	]
+		"@semantic-release/github": "^12.0.2",
+		"@semantic-release/npm": "^13.1.1",
+		"@semantic-release/release-notes-generator": "^14.1.0",
+		"@vitest/coverage-v8": "^4.0.8",
+		"conventional-changelog-conventionalcommits": "^9.1.0",
+		"eslint": "^9.39.1",
+		"globals": "^16.5.0",
+		"semantic-release": "^25.0.2",
+		"vitest": "^4.0.8"
+	}
 }