@jdeighan/env 8.0.13 → 8.0.17

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@jdeighan/env",
 	"type": "module",
-	"version": "8.0.13",
+	"version": "8.0.17",
 	"description": "enhanced syntax for .env files",
 	"main": "./src/EnvLoaderEx.js",
 	"exports": {
@@ -31,8 +31,8 @@
 	},
 	"homepage": "https://github.com/johndeighan/env#readme",
 	"dependencies": {
-		"@jdeighan/coffee-utils": "^4.0.22",
-		"@jdeighan/string-input": "^8.0.15",
+		"@jdeighan/coffee-utils": "^4.1.7",
+		"@jdeighan/string-input": "^8.0.20",
 		"coffeescript": "^2.6.1",
 		"cross-env": "^7.0.3"
 	}

package/src/EnvLoaderEx.coffee

@@ -3,12 +3,12 @@
 import pathlib from 'path'
 
 import {
-	assert, undef, pass, error, rtrim, isArray, isFunction, rtrunc, escapeStr,
+	assert, undef, pass, error, rtrim, isArray, isFunction,
+	rtrunc, escapeStr, croak,
 	} from '@jdeighan/coffee-utils'
 import {log} from '@jdeighan/coffee-utils/log'
 import {debug} from '@jdeighan/coffee-utils/debug'
 import {slurp, pathTo, mkpath} from '@jdeighan/coffee-utils/fs'
-import {hPrivEnv, hPrivEnvCallbacks} from '@jdeighan/coffee-utils/privenv'
 import {PLLParser} from '@jdeighan/string-input'
 
 hDefCallbacks = {
@@ -276,27 +276,18 @@ export loadEnvFile = (filepath, hOptions={}) ->
 # ---------------------------------------------------------------------------
 # Load environment from .env file
 
-export loadEnvFrom = (searchDir, rootName='DIR_ROOT', hOptions={}) ->
+export loadEnvFrom = (searchDir, hOptions={}) ->
 	# --- valid options:
 	#        onefile - load only the first file found
 	#        hCallbacks - getVar, setVar, clearVar, clearAll, names
 
-	debug "enter loadEnvFrom('#{searchDir}', rootName=#{rootName})"
+	debug "enter loadEnvFrom('#{searchDir}')"
 	path = pathTo('.env', searchDir, "up")
 	if ! path?
 		debug "return from loadEnvFrom() - no .env file found"
 		return
 	debug "found .env file: #{path}"
 
-	# --- Don't set root directory if it's already defined
-	if rootName && ! process.env[rootName]
-		root = mkpath(rtrunc(path, 5))
-		debug "set env var #{rootName} to #{root}"
-		if hOptions.hCallbacks
-			hOptions.hCallbacks.setVar(rootName, root)
-		else
-			hDefCallbacks.setVar(rootName, root)
-
 	lPaths = [path]    # --- build an array of paths
 	if ! hOptions.onefile
 		# --- search upward for .env files, but process top down
@@ -310,27 +301,16 @@ export loadEnvFrom = (searchDir, rootName='DIR_ROOT', hOptions={}) ->
 	return
 
 # ---------------------------------------------------------------------------
-# Instead of loading into process.env,
-# this loads into hPrivEnv from '@jdeighan/coffee-utils/privenv'
-
-export loadPrivEnvFrom = (rootDir, rootName='DIR_ROOT', hInit=undef) ->
-
-	hPrivEnvCallbacks.clearAll()
-
-	# --- Load any vars found in hInit
-	if hInit?
-		for name,value of hInit
-			hPrivEnvCallbacks.setVar name, value
-
-	if rootName
-		hPrivEnvCallbacks.setVar rootName, rootDir
-	loadEnvFrom(rootDir, rootName, {hCallbacks: hPrivEnvCallbacks})
-	return
-
-# ---------------------------------------------------------------------------
+# Load environment
 
-# --- Auto-load private environment if true env var DIR_ROOT is set
+export loadEnv = (hOptions={}) ->
+	# --- valid options:
+	#        onefile - load only the first file found
+	#        hCallbacks - getVar, setVar, clearVar, clearAll, names
 
-if process.env.DIR_ROOT
-	rootDir = process.env.DIR_ROOT
-	loadPrivEnvFrom process.env.DIR_ROOT
+	debug "enter loadEnv()"
+	dir = process.env.DIR_ROOT
+	if dir
+		loadEnvFrom(dir, hOptions)
+	else
+		croak "env var DIR_ROOT not set!"

package/src/EnvLoaderEx.js

@@ -1,6 +1,6 @@
 // Generated by CoffeeScript 2.6.1
 // EnvLoaderEx.coffee
-var hDefCallbacks, rootDir;
+var hDefCallbacks;
 
 import pathlib from 'path';
 
@@ -13,7 +13,8 @@ import {
   isArray,
   isFunction,
   rtrunc,
-  escapeStr
+  escapeStr,
+  croak
 } from '@jdeighan/coffee-utils';
 
 import {
@@ -30,11 +31,6 @@ import {
   mkpath
 } from '@jdeighan/coffee-utils/fs';
 
-import {
-  hPrivEnv,
-  hPrivEnvCallbacks
-} from '@jdeighan/coffee-utils/privenv';
-
 import {
   PLLParser
 } from '@jdeighan/string-input';
@@ -287,28 +283,18 @@ export var loadEnvFile = function(filepath, hOptions = {}) {
 
 // ---------------------------------------------------------------------------
 // Load environment from .env file
-export var loadEnvFrom = function(searchDir, rootName = 'DIR_ROOT', hOptions = {}) {
-  var i, lPaths, len, path, root;
+export var loadEnvFrom = function(searchDir, hOptions = {}) {
+  var i, lPaths, len, path;
   // --- valid options:
   //        onefile - load only the first file found
   //        hCallbacks - getVar, setVar, clearVar, clearAll, names
-  debug(`enter loadEnvFrom('${searchDir}', rootName=${rootName})`);
+  debug(`enter loadEnvFrom('${searchDir}')`);
   path = pathTo('.env', searchDir, "up");
   if (path == null) {
     debug("return from loadEnvFrom() - no .env file found");
     return;
   }
   debug(`found .env file: ${path}`);
-  // --- Don't set root directory if it's already defined
-  if (rootName && !process.env[rootName]) {
-    root = mkpath(rtrunc(path, 5));
-    debug(`set env var ${rootName} to ${root}`);
-    if (hOptions.hCallbacks) {
-      hOptions.hCallbacks.setVar(rootName, root);
-    } else {
-      hDefCallbacks.setVar(rootName, root);
-    }
-  }
   lPaths = [path]; // --- build an array of paths
   if (!hOptions.onefile) {
     // --- search upward for .env files, but process top down
@@ -325,30 +311,17 @@ export var loadEnvFrom = function(searchDir, rootName = 'DIR_ROOT', hOptions = {
 };
 
 // ---------------------------------------------------------------------------
-// Instead of loading into process.env,
-// this loads into hPrivEnv from '@jdeighan/coffee-utils/privenv'
-export var loadPrivEnvFrom = function(rootDir, rootName = 'DIR_ROOT', hInit = undef) {
-  var name, value;
-  hPrivEnvCallbacks.clearAll();
-  // --- Load any vars found in hInit
-  if (hInit != null) {
-    for (name in hInit) {
-      value = hInit[name];
-      hPrivEnvCallbacks.setVar(name, value);
-    }
-  }
-  if (rootName) {
-    hPrivEnvCallbacks.setVar(rootName, rootDir);
+// Load environment
+export var loadEnv = function(hOptions = {}) {
+  var dir;
+  // --- valid options:
+  //        onefile - load only the first file found
+  //        hCallbacks - getVar, setVar, clearVar, clearAll, names
+  debug("enter loadEnv()");
+  dir = process.env.DIR_ROOT;
+  if (dir) {
+    return loadEnvFrom(dir, hOptions);
+  } else {
+    return croak("env var DIR_ROOT not set!");
   }
-  loadEnvFrom(rootDir, rootName, {
-    hCallbacks: hPrivEnvCallbacks
-  });
 };
-
-// ---------------------------------------------------------------------------
-
-// --- Auto-load private environment if true env var DIR_ROOT is set
-if (process.env.DIR_ROOT) {
-  rootDir = process.env.DIR_ROOT;
-  loadPrivEnvFrom(process.env.DIR_ROOT);
-}