@karmaniverous/get-dotenv 3.1.13 → 3.1.15

package/dist/default/lib/dotenvExpand.js

@@ -3,13 +3,13 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.dotenvExpand = void 0;
+exports.dotenvExpandAll = exports.dotenvExpand = void 0;
 // like String.prototype.search but returns the last index
 const _searchLast = (str, rgx) => {
   const matches = Array.from(str.matchAll(rgx));
   return matches.length > 0 ? matches.slice(-1)[0].index : -1;
 };
-const _interpolate = envValue => {
+const _interpolate = (envValue, ref) => {
   // find the last unescaped dollar sign in the
   // value so that we can evaluate it
   const lastUnescapedDollarSignIndex = _searchLast(envValue, /(?!(?<=\\))\$/g);
@@ -36,16 +36,32 @@ const _interpolate = envValue => {
   const match = rightMostGroup.match(matchGroup);
   if (match != null) {
     const [, group, variableName, defaultValue] = match;
-    return _interpolate(envValue.replace(group, process.env[variableName] || defaultValue || ''));
+    return _interpolate(envValue.replace(group, ref[variableName] || defaultValue || ''), ref);
   }
   return envValue;
 };
 const _resolveEscapeSequences = value => {
   return value.replace(/\\\$/g, '$');
 };
-const dotenvExpand = value => {
+const dotenvExpand = function (value) {
+  let ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : process.env;
   if (!value || value === 'undefined') return;
-  const result = _resolveEscapeSequences(_interpolate(value));
+  const result = _resolveEscapeSequences(_interpolate(value, ref));
   return result.length ? result : undefined;
 };
-exports.dotenvExpand = dotenvExpand;
+exports.dotenvExpand = dotenvExpand;
+const dotenvExpandAll = _ref => {
+  let {
+    vars = {},
+    progressive = false,
+    ref = process.env
+  } = _ref;
+  return Object.keys(vars).reduce((acc, key) => {
+    acc[key] = dotenvExpand(vars[key], {
+      ...ref,
+      ...(progressive ? acc : {})
+    });
+    return acc;
+  }, {});
+};
+exports.dotenvExpandAll = dotenvExpandAll;

package/dist/default/lib/getDotenv.js

@@ -4,11 +4,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getDotenvSync = exports.getDotenv = void 0;
-var _dotenvExpand = require("dotenv-expand");
 var _fsExtra = _interopRequireDefault(require("fs-extra"));
 var _lodash = _interopRequireDefault(require("lodash.pickby"));
 var _path = _interopRequireDefault(require("path"));
 var _nanoid = require("nanoid");
+var _dotenvExpand = require("./dotenvExpand.js");
 var _options = require("./options.js");
 var _readDotenv = require("./readDotenv.js");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -94,17 +94,15 @@ const getDotenv = async function () {
     };
   }, {});
   const outputKey = (0, _nanoid.nanoid)();
-  const {
-    parsed: dotenv
-  } = (0, _dotenvExpand.expand)({
-    ignoreProcessEnv: true,
-    parsed: {
+  const dotenv = (0, _dotenvExpand.dotenvExpandAll)({
+    vars: {
       ...loaded,
       ...vars,
       ...(outputPath ? {
         [outputKey]: outputPath
       } : {})
-    }
+    },
+    progressive: true
   });
 
   // Process dynamic variables.
@@ -187,17 +185,15 @@ const getDotenvSync = function () {
     };
   }, {});
   const outputKey = (0, _nanoid.nanoid)();
-  const {
-    parsed: dotenv
-  } = (0, _dotenvExpand.expand)({
-    ignoreProcessEnv: true,
-    parsed: {
+  const dotenv = (0, _dotenvExpand.dotenvExpandAll)({
+    vars: {
       ...loaded,
       ...vars,
       ...(outputPath ? {
         [outputKey]: outputPath
       } : {})
-    }
+    },
+    progressive: true
   });
 
   // Process dynamic variables.

package/dist/default/lib/index.js

@@ -9,6 +9,12 @@ Object.defineProperty(exports, "dotenvExpand", {
     return _dotenvExpand.dotenvExpand;
   }
 });
+Object.defineProperty(exports, "dotenvExpandAll", {
+  enumerable: true,
+  get: function () {
+    return _dotenvExpand.dotenvExpandAll;
+  }
+});
 Object.defineProperty(exports, "getDotenv", {
   enumerable: true,
   get: function () {

package/lib/dotenvExpand.js

@@ -4,7 +4,7 @@ const _searchLast = (str, rgx) => {
   return matches.length > 0 ? matches.slice(-1)[0].index : -1;
 };
 
-const _interpolate = (envValue) => {
+const _interpolate = (envValue, ref) => {
   // find the last unescaped dollar sign in the
   // value so that we can evaluate it
   const lastUnescapedDollarSignIndex = _searchLast(envValue, /(?!(?<=\\))\$/g);
@@ -34,7 +34,8 @@ const _interpolate = (envValue) => {
     const [, group, variableName, defaultValue] = match;
 
     return _interpolate(
-      envValue.replace(group, process.env[variableName] || defaultValue || '')
+      envValue.replace(group, ref[variableName] || defaultValue || ''),
+      ref
     );
   }
 
@@ -45,8 +46,18 @@ const _resolveEscapeSequences = (value) => {
   return value.replace(/\\\$/g, '$');
 };
 
-export const dotenvExpand = (value) => {
+export const dotenvExpand = (value, ref = process.env) => {
   if (!value || value === 'undefined') return;
-  const result = _resolveEscapeSequences(_interpolate(value));
+  const result = _resolveEscapeSequences(_interpolate(value, ref));
   return result.length ? result : undefined;
 };
+
+export const dotenvExpandAll = ({
+  vars = {},
+  progressive = false,
+  ref = process.env,
+}) =>
+  Object.keys(vars).reduce((acc, key) => {
+    acc[key] = dotenvExpand(vars[key], { ...ref, ...(progressive ? acc : {}) });
+    return acc;
+  }, {});

package/lib/getDotenv.js

@@ -1,11 +1,11 @@
 // npm imports
-import { expand } from 'dotenv-expand';
 import fs from 'fs-extra';
 import pickBy from 'lodash.pickby';
 import path from 'path';
 import { nanoid } from 'nanoid';
 
 // lib imports
+import { dotenvExpandAll } from './dotenvExpand.js';
 import { getdotenvDefaultOptions } from './options.js';
 import { readDotenv, readDotenvSync } from './readDotenv.js';
 
@@ -110,13 +110,14 @@ export const getDotenv = async (options = {}) => {
   }, {});
 
   const outputKey = nanoid();
-  const { parsed: dotenv } = expand({
-    ignoreProcessEnv: true,
-    parsed: {
+
+  const dotenv = dotenvExpandAll({
+    vars: {
       ...loaded,
       ...vars,
       ...(outputPath ? { [outputKey]: outputPath } : {}),
     },
+    progressive: true,
   });
 
   // Process dynamic variables.
@@ -227,13 +228,14 @@ export const getDotenvSync = (options = {}) => {
   }, {});
 
   const outputKey = nanoid();
-  const { parsed: dotenv } = expand({
-    ignoreProcessEnv: true,
-    parsed: {
+
+  const dotenv = dotenvExpandAll({
+    vars: {
       ...loaded,
       ...vars,
       ...(outputPath ? { [outputKey]: outputPath } : {}),
     },
+    progressive: true,
   });
 
   // Process dynamic variables.

package/lib/index.js

@@ -1,3 +1,3 @@
-export { dotenvExpand } from './dotenvExpand.js';
+export { dotenvExpand, dotenvExpandAll } from './dotenvExpand.js';
 export { getDotenv, getDotenvSync } from './getDotenv.js';
 export { getDotenvCli } from './getDotenvCli.js';

package/package.json

@@ -3,7 +3,7 @@
   "bin": {
     "getdotenv": "bin/getdotenv/index.js"
   },
-  "version": "3.1.13",
+  "version": "3.1.15",
   "publishConfig": {
     "access": "public"
   },
@@ -38,8 +38,7 @@
   "dependencies": {
     "commander": "^11.0.0",
     "dotenv": "^16.3.1",
-    "dotenv-expand": "^10.0.0",
-    "execa": "^7.2.0",
+    "execa": "^8.0.1",
     "fs-extra": "^11.1.1",
     "lodash.frompairs": "^4.0.1",
     "lodash.pick": "^4.4.0",
@@ -48,15 +47,15 @@
     "pkg-dir": "^7.0.0"
   },
   "devDependencies": {
-    "@babel/cli": "^7.22.10",
-    "@babel/core": "^7.22.10",
-    "@babel/eslint-parser": "^7.22.10",
-    "@babel/preset-env": "^7.22.10",
-    "@babel/register": "^7.22.5",
-    "@types/node": "^20.5.0",
-    "chai": "^4.3.7",
+    "@babel/cli": "^7.22.15",
+    "@babel/core": "^7.22.15",
+    "@babel/eslint-parser": "^7.22.15",
+    "@babel/preset-env": "^7.22.15",
+    "@babel/register": "^7.22.15",
+    "@types/node": "^20.5.9",
+    "chai": "^4.3.8",
     "concat-md": "^0.5.1",
-    "eslint": "^8.47.0",
+    "eslint": "^8.48.0",
     "eslint-plugin-mocha": "^10.1.0",
     "eslint-plugin-promise": "^6.1.1",
     "jsdoc-to-markdown": "^8.0.0",