@jdeighan/env 8.0.1 → 8.0.5

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@jdeighan/env",
 	"type": "module",
-	"version": "8.0.1",
+	"version": "8.0.5",
 	"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.11",
-		"@jdeighan/string-input": "^8.0.1",
+		"@jdeighan/coffee-utils": "^4.0.14",
+		"@jdeighan/string-input": "^8.0.4",
 		"coffeescript": "^2.6.1",
 		"cross-env": "^7.0.3"
 	}

package/src/EnvLoaderEx.coffee

@@ -1,10 +1,9 @@
 # EnvLoaderEx.coffee
 
-import {strict as assert} from 'assert'
-import {dirname, resolve, parse as parse_fname} from 'path'
+import pathlib from 'path'
 
 import {
-	undef, pass, error, rtrim, isArray, isFunction, rtrunc, escapeStr,
+	assert, undef, pass, error, rtrim, isArray, isFunction, rtrunc, escapeStr,
 	} from '@jdeighan/coffee-utils'
 import {log} from '@jdeighan/coffee-utils/log'
 import {debug} from '@jdeighan/coffee-utils/debug'
@@ -301,7 +300,7 @@ export loadEnvFrom = (searchDir, rootName='DIR_ROOT', hOptions={}) ->
 	lPaths = [path]    # --- build an array of paths
 	if ! hOptions.onefile
 		# --- search upward for .env files, but process top down
-		while path = pathTo('.env', resolve(rtrunc(path, 5), '..'), "up")
+		while path = pathTo('.env', pathlib.resolve(rtrunc(path, 5), '..'), "up")
 			debug "found .env file: #{path}"
 			lPaths.unshift path
 
@@ -314,7 +313,7 @@ export loadEnvFrom = (searchDir, rootName='DIR_ROOT', hOptions={}) ->
 # Instead of loading into process.env,
 # this loads into hPrivEnv from '@jdeighan/coffee-utils/privenv'
 
-export loadPrivEnvFrom = (searchDir, rootName='DIR_ROOT', hInit=undef) ->
+export loadPrivEnvFrom = (rootDir, rootName='DIR_ROOT', hInit=undef) ->
 
 	hPrivEnvCallbacks.clearAll()
 
@@ -323,14 +322,15 @@ export loadPrivEnvFrom = (searchDir, rootName='DIR_ROOT', hInit=undef) ->
 		for name,value of hInit
 			hPrivEnvCallbacks.setVar name, value
 
-	loadEnvFrom(searchDir, rootName, {hCallbacks: hPrivEnvCallbacks})
+	if rootName
+		hPrivEnvCallbacks.setVar rootName, rootDir
+	loadEnvFrom(rootDir, rootName, {hCallbacks: hPrivEnvCallbacks})
 	return
 
 # ---------------------------------------------------------------------------
 
 # --- Auto-load private environment if true env var DIR_ROOT is set
 
-if process.env.DIR_ROOT?
+if process.env.DIR_ROOT
 	rootDir = process.env.DIR_ROOT
-	log "env var DIR_ROOT = '#{rootDir}'"
-	loadPrivEnvFrom rootDir
+	loadPrivEnvFrom process.env.DIR_ROOT

package/src/EnvLoaderEx.js

@@ -2,17 +2,10 @@
 // EnvLoaderEx.coffee
 var hDefCallbacks, rootDir;
 
-import {
-  strict as assert
-} from 'assert';
-
-import {
-  dirname,
-  resolve,
-  parse as parse_fname
-} from 'path';
+import pathlib from 'path';
 
 import {
+  assert,
   undef,
   pass,
   error,
@@ -319,7 +312,7 @@ export var loadEnvFrom = function(searchDir, rootName = 'DIR_ROOT', hOptions = {
   lPaths = [path]; // --- build an array of paths
   if (!hOptions.onefile) {
     // --- search upward for .env files, but process top down
-    while (path = pathTo('.env', resolve(rtrunc(path, 5), '..'), "up")) {
+    while (path = pathTo('.env', pathlib.resolve(rtrunc(path, 5), '..'), "up")) {
       debug(`found .env file: ${path}`);
       lPaths.unshift(path);
     }
@@ -334,7 +327,7 @@ 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(searchDir, rootName = 'DIR_ROOT', hInit = undef) {
+export var loadPrivEnvFrom = function(rootDir, rootName = 'DIR_ROOT', hInit = undef) {
   var name, value;
   hPrivEnvCallbacks.clearAll();
   // --- Load any vars found in hInit
@@ -344,7 +337,10 @@ export var loadPrivEnvFrom = function(searchDir, rootName = 'DIR_ROOT', hInit =
       hPrivEnvCallbacks.setVar(name, value);
     }
   }
-  loadEnvFrom(searchDir, rootName, {
+  if (rootName) {
+    hPrivEnvCallbacks.setVar(rootName, rootDir);
+  }
+  loadEnvFrom(rootDir, rootName, {
     hCallbacks: hPrivEnvCallbacks
   });
 };
@@ -352,8 +348,7 @@ export var loadPrivEnvFrom = function(searchDir, rootName = 'DIR_ROOT', hInit =
 // ---------------------------------------------------------------------------
 
 // --- Auto-load private environment if true env var DIR_ROOT is set
-if (process.env.DIR_ROOT != null) {
+if (process.env.DIR_ROOT) {
   rootDir = process.env.DIR_ROOT;
-  log(`env var DIR_ROOT = '${rootDir}'`);
-  loadPrivEnvFrom(rootDir);
+  loadPrivEnvFrom(process.env.DIR_ROOT);
 }