@karmaniverous/get-dotenv 2.5.0 → 2.6.1

package/bin/getdotenv/index.js

@@ -2,11 +2,11 @@
 
 // Import npm packages.
 import spawn from 'cross-spawn';
-import _ from 'lodash';
 import { parseArgsStringToArgv } from 'string-argv';
 
 // Import package exports.
 import {
+  dotenvExpand,
   getAwsSsoCredentials,
   getDotenv,
   parseBranch,
@@ -15,11 +15,6 @@ import {
 // Create CLI.
 import { program } from 'commander';
 
-const envMerge = (value) =>
-  !_.isUndefined(value) && value.startsWith('$')
-    ? process.env[value.slice(1)]
-    : value;
-
 // CLI description.
 program
   .name('getdotenv')
@@ -62,17 +57,17 @@ program
   .option(
     '-d, --default-environment <string>',
     'default environment (prefix with $ to use environment variable)',
-    envMerge
+    dotenvExpand
   )
   .option(
     '-b, --branch-to-default',
     'derive default environment from the current git branch (default: false)',
-    envMerge
+    dotenvExpand
   )
   .option(
     '-e, --environment <string>',
     'designated environment (prefix with $ to use environment variable)',
-    envMerge
+    dotenvExpand
   )
   .option(
     '-n, --exclude-env',
@@ -101,8 +96,7 @@ program
   )
   .option(
     '-a, --aws-sso-profile <string>',
-    'local AWS SSO profile (follows dotenv-expand rules)',
-    envMerge
+    'local AWS SSO profile (follows dotenv-expand rules)'
   );
 
 // Parse CLI options from command line.
@@ -152,7 +146,7 @@ await getDotenv({
 });
 
 // Get AWS SSO credentials.
-if (awsSsoProfile) getAwsSsoCredentials(awsSsoProfile);
+if (awsSsoProfile) getAwsSsoCredentials(dotenvExpand(awsSsoProfile));
 
 // Execute shell command.
 if (command || program.args.length) {

package/dist/default/lib/dotenvExpand.js

@@ -0,0 +1,47 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+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 => {
+  // find the last unescaped dollar sign in the
+  // value so that we can evaluate it
+  const lastUnescapedDollarSignIndex = _searchLast(envValue, /(?!(?<=\\))\$/g);
+
+  // If we couldn't match any unescaped dollar sign
+  // let's return the string as is
+  if (lastUnescapedDollarSignIndex === -1) return envValue;
+
+  // This is the right-most group of variables in the string
+  const rightMostGroup = envValue.slice(lastUnescapedDollarSignIndex);
+
+  /**
+   * This finds the inner most variable/group divided
+   * by variable name and default value (if present)
+   * (
+   *   (?!(?<=\\))\$        // only match dollar signs that are not escaped
+   *   {?                   // optional opening curly brace
+   *     ([\w]+)            // match the variable name
+   *     (?::-([^}\\]*))?   // match an optional default value
+   *   }?                   // optional closing curly brace
+   * )
+   */
+  const matchGroup = /((?!(?<=\\))\${?([\w]+)(?::-([^}\\]*))?}?)/;
+  const match = rightMostGroup.match(matchGroup);
+  if (match != null) {
+    const [, group, variableName, defaultValue] = match;
+    return _interpolate(envValue.replace(group, process.env[variableName] || defaultValue || ''));
+  }
+  return envValue;
+};
+const _resolveEscapeSequences = value => {
+  return value.replace(/\\\$/g, '$');
+};
+const dotenvExpand = value => value ? _resolveEscapeSequences(_interpolate(value)) : value;
+exports.dotenvExpand = dotenvExpand;

package/dist/default/lib/index.js

@@ -3,6 +3,12 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+Object.defineProperty(exports, "dotenvExpand", {
+  enumerable: true,
+  get: function () {
+    return _dotenvExpand.dotenvExpand;
+  }
+});
 Object.defineProperty(exports, "getAwsSsoCredentials", {
   enumerable: true,
   get: function () {
@@ -27,6 +33,7 @@ Object.defineProperty(exports, "parseBranch", {
     return _parseBranch.parseBranch;
   }
 });
+var _dotenvExpand = require("./dotenvExpand.js");
 var _getAwsSsoCredentials = require("./getAwsSsoCredentials.js");
 var _getDotenv = require("./getDotenv.js");
 var _parseBranch = require("./parseBranch.js");

package/lib/dotenvExpand.js

@@ -0,0 +1,49 @@
+// 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) => {
+  // find the last unescaped dollar sign in the
+  // value so that we can evaluate it
+  const lastUnescapedDollarSignIndex = _searchLast(envValue, /(?!(?<=\\))\$/g);
+
+  // If we couldn't match any unescaped dollar sign
+  // let's return the string as is
+  if (lastUnescapedDollarSignIndex === -1) return envValue;
+
+  // This is the right-most group of variables in the string
+  const rightMostGroup = envValue.slice(lastUnescapedDollarSignIndex);
+
+  /**
+   * This finds the inner most variable/group divided
+   * by variable name and default value (if present)
+   * (
+   *   (?!(?<=\\))\$        // only match dollar signs that are not escaped
+   *   {?                   // optional opening curly brace
+   *     ([\w]+)            // match the variable name
+   *     (?::-([^}\\]*))?   // match an optional default value
+   *   }?                   // optional closing curly brace
+   * )
+   */
+  const matchGroup = /((?!(?<=\\))\${?([\w]+)(?::-([^}\\]*))?}?)/;
+  const match = rightMostGroup.match(matchGroup);
+
+  if (match != null) {
+    const [, group, variableName, defaultValue] = match;
+
+    return _interpolate(
+      envValue.replace(group, process.env[variableName] || defaultValue || '')
+    );
+  }
+
+  return envValue;
+};
+
+const _resolveEscapeSequences = (value) => {
+  return value.replace(/\\\$/g, '$');
+};
+
+export const dotenvExpand = (value) =>
+  value ? _resolveEscapeSequences(_interpolate(value)) : value;

package/lib/index.js

@@ -1,3 +1,4 @@
+export { dotenvExpand } from './dotenvExpand.js';
 export { getAwsSsoCredentials } from './getAwsSsoCredentials.js';
 export { getDotenv, getDotenvSync } from './getDotenv.js';
 export { parseBranch } from './parseBranch.js';

package/package.json

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