@karmaniverous/get-dotenv 3.0.0 → 3.0.1

package/README.md

@@ -272,6 +272,7 @@ get-dotenv options type
 | [outputPath] | <code>string</code> | if populated, writes consolidated .env file to this path (follows [dotenv-expand rules](https://github.com/motdotla/dotenv-expand/blob/master/tests/.env)) |
 | [paths] | <code>Array.&lt;string&gt;</code> | array of input directory paths |
 | [privateToken] | <code>string</code> | token indicating private variables |
+| [vars] | <code>object</code> | explicit variables to include |
 
 
 ---

package/dist/default/lib/getCli.js

@@ -139,14 +139,14 @@ const getCli = function () {
       paths,
       pathsDelimiter,
       suppressDotenv,
-      vars,
+      vars: varsStr,
       varsDelimiter,
       varsAssignor,
       ...rest
     } = options;
 
     // Parse vars.
-    if (vars !== null && vars !== void 0 && vars.length) Object.assign(process.env, (0, _lodash.default)(vars.split(new RegExp(varsDelimiter)).map(v => v.split(new RegExp(varsAssignor)))));
+    const vars = varsStr !== null && varsStr !== void 0 && varsStr.length ? (0, _lodash.default)(varsStr.split(new RegExp(varsDelimiter)).map(v => v.split(new RegExp(varsAssignor)))) : undefined;
 
     // Execute getdotenv.
     if ((_paths = paths) !== null && _paths !== void 0 && _paths.length && !suppressDotenv) {
@@ -155,7 +155,8 @@ const getCli = function () {
       var dotenv = await (0, _getDotenv.getDotenv)({
         ...rest,
         loadProcess: true,
-        paths
+        paths,
+        vars
       });
     }
 

package/dist/default/lib/getDotenv.js

@@ -34,6 +34,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  * @property {string} [outputPath] - if populated, writes consolidated .env file to this path (follows {@link https://github.com/motdotla/dotenv-expand/blob/master/tests/.env dotenv-expand rules})
  * @property {string[]} [paths] - array of input directory paths
  * @property {string} [privateToken] - token indicating private variables
+ * @property {object} [vars] - explicit variables to include
  */
 
 /**
@@ -63,14 +64,15 @@ const getDotenv = async function () {
     logger,
     outputPath,
     paths,
-    privateToken
+    privateToken,
+    vars = {}
   } = {
     ..._dotenvDefaults.dotenvDefaults,
     ...options
   };
 
   // Read .env files.
-  const parsed = await paths.reduce(async (e, p) => {
+  const loaded = await paths.reduce(async (e, p) => {
     let publicGlobal = excludePublic || excludeGlobal ? {} : (0, _readDotenv.readDotenv)(_path.default.resolve(p, dotenvToken));
     let publicEnv = excludePublic || excludeEnv ? {} : (0, _readDotenv.readDotenv)(_path.default.resolve(p, `${dotenvToken}.${env}`));
     let privateGlobal = excludePrivate || excludeGlobal ? {} : (0, _readDotenv.readDotenv)(_path.default.resolve(p, `${dotenvToken}.${privateToken}`));
@@ -90,7 +92,8 @@ const getDotenv = async function () {
   } = (0, _dotenvExpand.expand)({
     ignoreProcessEnv: true,
     parsed: {
-      ...parsed,
+      ...loaded,
+      ...vars,
       ...(outputPath ? {
         [outputKey]: outputPath
       } : {})
@@ -169,14 +172,15 @@ const getDotenvSync = function () {
     log,
     outputPath,
     paths,
-    privateToken
+    privateToken,
+    vars
   } = {
     ..._dotenvDefaults.dotenvDefaults,
     ...options
   };
 
   // Read .env files.
-  const parsed = paths.reduce((e, p) => {
+  const loaded = paths.reduce((e, p) => {
     let publicGlobal = excludePublic || excludeGlobal ? {} : (0, _readDotenv.readDotenvSync)(_path.default.resolve(p, dotenvToken));
     let publicEnv = excludePublic || excludeEnv ? {} : (0, _readDotenv.readDotenvSync)(_path.default.resolve(p, `${dotenvToken}.${env}`));
     let privateGlobal = excludePrivate || excludeGlobal ? {} : (0, _readDotenv.readDotenvSync)(_path.default.resolve(p, `${dotenvToken}.${privateToken}`));
@@ -195,7 +199,8 @@ const getDotenvSync = function () {
   } = (0, _dotenvExpand.expand)({
     ignoreProcessEnv: true,
     parsed: {
-      ...parsed,
+      ...loaded,
+      ...vars,
       ...(outputPath ? {
         [outputKey]: outputPath
       } : {})

package/lib/getCli.js

@@ -241,22 +241,20 @@ export const getCli = ({ defaultOptions = {}, preHook, postHook } = {}) => {
           paths,
           pathsDelimiter,
           suppressDotenv,
-          vars,
+          vars: varsStr,
           varsDelimiter,
           varsAssignor,
           ...rest
         } = options;
 
         // Parse vars.
-        if (vars?.length)
-          Object.assign(
-            process.env,
-            fromPairs(
-              vars
+        const vars = varsStr?.length
+          ? fromPairs(
+              varsStr
                 .split(new RegExp(varsDelimiter))
                 .map((v) => v.split(new RegExp(varsAssignor)))
             )
-          );
+          : undefined;
 
         // Execute getdotenv.
         if (paths?.length && !suppressDotenv) {
@@ -266,6 +264,7 @@ export const getCli = ({ defaultOptions = {}, preHook, postHook } = {}) => {
             ...rest,
             loadProcess: true,
             paths,
+            vars,
           });
         }
 

package/lib/getDotenv.js

@@ -27,6 +27,7 @@ import { readDotenv, readDotenvSync } from './readDotenv.js';
  * @property {string} [outputPath] - if populated, writes consolidated .env file to this path (follows {@link https://github.com/motdotla/dotenv-expand/blob/master/tests/.env dotenv-expand rules})
  * @property {string[]} [paths] - array of input directory paths
  * @property {string} [privateToken] - token indicating private variables
+ * @property {object} [vars] - explicit variables to include
  */
 
 /**
@@ -56,10 +57,11 @@ export const getDotenv = async (options = {}) => {
     outputPath,
     paths,
     privateToken,
+    vars = {},
   } = { ...dotenvDefaults, ...options };
 
   // Read .env files.
-  const parsed = await paths.reduce(async (e, p) => {
+  const loaded = await paths.reduce(async (e, p) => {
     let publicGlobal =
       excludePublic || excludeGlobal
         ? {}
@@ -94,7 +96,8 @@ export const getDotenv = async (options = {}) => {
   const { parsed: dotenv } = expand({
     ignoreProcessEnv: true,
     parsed: {
-      ...parsed,
+      ...loaded,
+      ...vars,
       ...(outputPath ? { [outputKey]: outputPath } : {}),
     },
   });
@@ -182,10 +185,11 @@ export const getDotenvSync = (options = {}) => {
     outputPath,
     paths,
     privateToken,
+    vars,
   } = { ...dotenvDefaults, ...options };
 
   // Read .env files.
-  const parsed = paths.reduce((e, p) => {
+  const loaded = paths.reduce((e, p) => {
     let publicGlobal =
       excludePublic || excludeGlobal
         ? {}
@@ -218,7 +222,8 @@ export const getDotenvSync = (options = {}) => {
   const { parsed: dotenv } = expand({
     ignoreProcessEnv: true,
     parsed: {
-      ...parsed,
+      ...loaded,
+      ...vars,
       ...(outputPath ? { [outputKey]: outputPath } : {}),
     },
   });

package/package.json

@@ -3,7 +3,7 @@
   "bin": {
     "getdotenv": "bin/getdotenv/index.js"
   },
-  "version": "3.0.0",
+  "version": "3.0.1",
   "publishConfig": {
     "access": "public"
   },