@jdeighan/env 9.1.18 → 9.1.21

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@jdeighan/env",
 	"type": "module",
-	"version": "9.1.18",
+	"version": "9.1.21",
 	"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": "^7.0.19",
-		"@jdeighan/mapper": "^14.0.8",
+		"@jdeighan/coffee-utils": "^7.0.22",
+		"@jdeighan/mapper": "^15.0.2",
 		"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,
+	assert, undef, pass, error, rtrim, isArray, isHash, 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 {slurp, pathTo, mkpath, parseSource} from '@jdeighan/coffee-utils/fs'
 import {TreeMapper} from '@jdeighan/mapper/tree'
 
 hDefCallbacks = {
@@ -259,10 +259,13 @@ export class EnvLoader extends TreeMapper
 # ---------------------------------------------------------------------------
 # Load environment from a string
 
-export loadEnvString = (contents, hOptions={}, source=undef) ->
+export loadEnvString = (contents, hOptions) ->
 
-	debug "enter loadEnvString()"
-	env = new EnvLoader(contents, source, hOptions)
+	debug "enter loadEnvString()", hOptions
+	assert isHash(hOptions),\
+			"loadEnvString(): 2nd arg not a hash #{typeof hOptions}"
+	assert hOptions.source, "loadEnvString(): Missing source"
+	env = new EnvLoader(contents, hOptions.source, hOptions)
 	env.load()
 	debug "return from loadEnvString()"
 	return
@@ -274,20 +277,24 @@ export loadEnvFile = (filepath, hOptions={}) ->
 
 	debug "enter loadEnvFile #{filepath}"
 	contents = slurp filepath
-	loadEnvString contents, hOptions, filepath
+	hOptions.source = filepath
+	loadEnvString contents, hOptions
 	debug "return from loadEnvFile"
 	return
 
 # ---------------------------------------------------------------------------
 # Load environment from .env file
 
-export loadEnvFrom = (searchDir, hOptions={}) ->
+export loadEnvFrom = (source, hOptions={}) ->
 	# --- valid options:
 	#        onefile - load only the first file found
 	#        hCallbacks - getVar, setVar, clearVar, clearAll, names
 
-	debug "enter loadEnvFrom '#{searchDir}'"
-	path = pathTo('.env', searchDir, "up")
+	source = mkpath(source)
+	debug "enter loadEnvFrom '#{source}'"
+	hSourceInfo = parseSource(source)
+	debug 'hSourceInfo', hSourceInfo
+	path = pathTo('.env', source, "up")
 	if ! path?
 		debug "return from loadEnvFrom() - no .env file found"
 		return

package/src/EnvLoaderEx.js

@@ -11,6 +11,7 @@ import {
   error,
   rtrim,
   isArray,
+  isHash,
   isFunction,
   rtrunc,
   escapeStr,
@@ -28,7 +29,8 @@ import {
 import {
   slurp,
   pathTo,
-  mkpath
+  mkpath,
+  parseSource
 } from '@jdeighan/coffee-utils/fs';
 
 import {
@@ -269,10 +271,12 @@ export var EnvLoader = class EnvLoader extends TreeMapper {
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // Load environment from a string
-export var loadEnvString = function(contents, hOptions = {}, source = undef) {
+export var loadEnvString = function(contents, hOptions) {
   var env;
-  debug("enter loadEnvString()");
-  env = new EnvLoader(contents, source, hOptions);
+  debug("enter loadEnvString()", hOptions);
+  assert(isHash(hOptions), `loadEnvString(): 2nd arg not a hash ${typeof hOptions}`);
+  assert(hOptions.source, "loadEnvString(): Missing source");
+  env = new EnvLoader(contents, hOptions.source, hOptions);
   env.load();
   debug("return from loadEnvString()");
 };
@@ -283,19 +287,23 @@ export var loadEnvFile = function(filepath, hOptions = {}) {
   var contents;
   debug(`enter loadEnvFile ${filepath}`);
   contents = slurp(filepath);
-  loadEnvString(contents, hOptions, filepath);
+  hOptions.source = filepath;
+  loadEnvString(contents, hOptions);
   debug("return from loadEnvFile");
 };
 
 // ---------------------------------------------------------------------------
 // Load environment from .env file
-export var loadEnvFrom = function(searchDir, hOptions = {}) {
-  var filepath, i, lPaths, len, path;
+export var loadEnvFrom = function(source, hOptions = {}) {
+  var filepath, hSourceInfo, i, lPaths, len, path;
   // --- valid options:
   //        onefile - load only the first file found
   //        hCallbacks - getVar, setVar, clearVar, clearAll, names
-  debug(`enter loadEnvFrom '${searchDir}'`);
-  path = pathTo('.env', searchDir, "up");
+  source = mkpath(source);
+  debug(`enter loadEnvFrom '${source}'`);
+  hSourceInfo = parseSource(source);
+  debug('hSourceInfo', hSourceInfo);
+  path = pathTo('.env', source, "up");
   if (path == null) {
     debug("return from loadEnvFrom() - no .env file found");
     return;