@karmaniverous/get-dotenv 3.1.10 → 3.1.12

package/README.md

@@ -225,6 +225,7 @@ get-dotenv options type
 
 | Name | Type | Description |
 | --- | --- | --- |
+| [defaultEnv] | <code>string</code> | default target environment |
 | [dotenvToken] | <code>string</code> | token indicating a dotenv file |
 | [dynamicPath] | <code>string</code> | path to file exporting an object keyed to dynamic variable functions |
 | [env] | <code>string</code> | target environment |

package/dist/default/lib/getDotenv.js

@@ -25,6 +25,7 @@ const pruneVars = (getdotenvDefaultOptions, options) => (0, _lodash.default)({
  * get-dotenv options type
  *
  * @typedef {Object} GetDotenvOptions
+ * @property {string} [defaultEnv] - default target environment
  * @property {string} [dotenvToken] - token indicating a dotenv file
  * @property {string} [dynamicPath] - path to file exporting an object keyed to dynamic variable functions
  * @property {string} [env] - target environment
@@ -56,6 +57,7 @@ const getDotenv = async function () {
   let options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   // Apply defaults.
   let {
+    defaultEnv,
     dotenvToken,
     dynamicPath,
     env,
@@ -79,9 +81,9 @@ const getDotenv = async function () {
   // Read .env files.
   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 publicEnv = excludePublic || excludeEnv ? {} : (0, _readDotenv.readDotenv)(_path.default.resolve(p, `${dotenvToken}.${env ?? defaultEnv}`));
     let privateGlobal = excludePrivate || excludeGlobal ? {} : (0, _readDotenv.readDotenv)(_path.default.resolve(p, `${dotenvToken}.${privateToken}`));
-    let privateEnv = excludePrivate || excludeEnv ? {} : (0, _readDotenv.readDotenv)(_path.default.resolve(p, `${dotenvToken}.${env}.${privateToken}`));
+    let privateEnv = excludePrivate || excludeEnv ? {} : (0, _readDotenv.readDotenv)(_path.default.resolve(p, `${dotenvToken}.${env ?? defaultEnv}.${privateToken}`));
     [e, publicGlobal, publicEnv, privateGlobal, privateEnv] = await Promise.all([e, publicGlobal, publicEnv, privateGlobal, privateEnv]);
     return {
       ...e,
@@ -149,6 +151,7 @@ const getDotenvSync = function () {
   let options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   // Apply defaults.
   let {
+    defaultEnv,
     dotenvToken,
     dynamicPath,
     env,
@@ -172,9 +175,9 @@ const getDotenvSync = function () {
   // Read .env files.
   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 publicEnv = excludePublic || excludeEnv ? {} : (0, _readDotenv.readDotenvSync)(_path.default.resolve(p, `${dotenvToken}.${env ?? defaultEnv}`));
     let privateGlobal = excludePrivate || excludeGlobal ? {} : (0, _readDotenv.readDotenvSync)(_path.default.resolve(p, `${dotenvToken}.${privateToken}`));
-    let privateEnv = excludePrivate || excludeEnv ? {} : (0, _readDotenv.readDotenvSync)(_path.default.resolve(p, `${dotenvToken}.${env}.${privateToken}`));
+    let privateEnv = excludePrivate || excludeEnv ? {} : (0, _readDotenv.readDotenvSync)(_path.default.resolve(p, `${dotenvToken}.${env ?? defaultEnv}.${privateToken}`));
     return {
       ...e,
       ...publicGlobal,

package/dist/default/lib/getDotenvCli.js

@@ -124,6 +124,7 @@ const getDotenvCli = function () {
     let {
       command,
       debugOff,
+      excludeAll,
       excludeAllOff,
       excludeDynamicOff,
       excludeEnvOff,

package/dist/default/lib/options.js

@@ -24,8 +24,6 @@ const cliDefaultOptionsLocal = (await _fsExtra.default.exists(cliDefaultOptionsL
 exports.cliDefaultOptionsLocal = cliDefaultOptionsLocal;
 const cli2getdotenvOptions = function () {
   let {
-    env,
-    defaultEnv,
     paths,
     pathsDelimiter,
     pathsDelimiterPattern,
@@ -37,8 +35,7 @@ const cli2getdotenvOptions = function () {
     ...rest
   } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   return {
-    ...(0, _lodash2.default)(rest, ['dotenvToken', 'dynamicPath', 'excludeDynamic', 'excludeEnv', 'excludeGlobal', 'excludePrivate', 'excludePublic', 'loadProcess', 'log', 'outputPath', 'privateToken']),
-    env: env ?? defaultEnv,
+    ...(0, _lodash2.default)(rest, ['defaultEnv', 'dotenvToken', 'dynamicPath', 'env', 'excludeDynamic', 'excludeEnv', 'excludeGlobal', 'excludePrivate', 'excludePublic', 'loadProcess', 'log', 'outputPath', 'privateToken']),
     paths: paths?.split(pathsDelimiterPattern ? RegExp(pathsDelimiterPattern) : pathsDelimiter) ?? [],
     vars: (0, _lodash.default)(vars?.split(varsDelimiterPattern ? RegExp(varsDelimiterPattern) : varsDelimiter).map(v => v.split(varsAssignorPattern ? RegExp(varsAssignorPattern) : varsAssignor)))
   };

package/lib/getDotenv.js

@@ -22,6 +22,7 @@ const pruneVars = (getdotenvDefaultOptions, options) =>
  * get-dotenv options type
  *
  * @typedef {Object} GetDotenvOptions
+ * @property {string} [defaultEnv] - default target environment
  * @property {string} [dotenvToken] - token indicating a dotenv file
  * @property {string} [dynamicPath] - path to file exporting an object keyed to dynamic variable functions
  * @property {string} [env] - target environment
@@ -52,6 +53,7 @@ const pruneVars = (getdotenvDefaultOptions, options) =>
 export const getDotenv = async (options = {}) => {
   // Apply defaults.
   let {
+    defaultEnv,
     dotenvToken,
     dynamicPath,
     env,
@@ -79,7 +81,7 @@ export const getDotenv = async (options = {}) => {
     let publicEnv =
       excludePublic || excludeEnv
         ? {}
-        : readDotenv(path.resolve(p, `${dotenvToken}.${env}`));
+        : readDotenv(path.resolve(p, `${dotenvToken}.${env ?? defaultEnv}`));
     let privateGlobal =
       excludePrivate || excludeGlobal
         ? {}
@@ -87,7 +89,12 @@ export const getDotenv = async (options = {}) => {
     let privateEnv =
       excludePrivate || excludeEnv
         ? {}
-        : readDotenv(path.resolve(p, `${dotenvToken}.${env}.${privateToken}`));
+        : readDotenv(
+            path.resolve(
+              p,
+              `${dotenvToken}.${env ?? defaultEnv}.${privateToken}`
+            )
+          );
 
     [e, publicGlobal, publicEnv, privateGlobal, privateEnv] = await Promise.all(
       [e, publicGlobal, publicEnv, privateGlobal, privateEnv]
@@ -165,6 +172,7 @@ export const getDotenv = async (options = {}) => {
 export const getDotenvSync = (options = {}) => {
   // Apply defaults.
   let {
+    defaultEnv,
     dotenvToken,
     dynamicPath,
     env,
@@ -192,7 +200,9 @@ export const getDotenvSync = (options = {}) => {
     let publicEnv =
       excludePublic || excludeEnv
         ? {}
-        : readDotenvSync(path.resolve(p, `${dotenvToken}.${env}`));
+        : readDotenvSync(
+            path.resolve(p, `${dotenvToken}.${env ?? defaultEnv}`)
+          );
     let privateGlobal =
       excludePrivate || excludeGlobal
         ? {}
@@ -201,7 +211,10 @@ export const getDotenvSync = (options = {}) => {
       excludePrivate || excludeEnv
         ? {}
         : readDotenvSync(
-            path.resolve(p, `${dotenvToken}.${env}.${privateToken}`)
+            path.resolve(
+              p,
+              `${dotenvToken}.${env ?? defaultEnv}.${privateToken}`
+            )
           );
 
     return {

package/lib/getDotenvCli.js

@@ -346,6 +346,7 @@ export const getDotenvCli = ({
       let {
         command,
         debugOff,
+        excludeAll,
         excludeAllOff,
         excludeDynamicOff,
         excludeEnvOff,

package/lib/options.js

@@ -32,8 +32,6 @@ export const cliDefaultOptionsLocal = (await fs.exists(
   : {};
 
 export const cli2getdotenvOptions = ({
-  env,
-  defaultEnv,
   paths,
   pathsDelimiter,
   pathsDelimiterPattern,
@@ -45,8 +43,10 @@ export const cli2getdotenvOptions = ({
   ...rest
 } = {}) => ({
   ...pick(rest, [
+    'defaultEnv',
     'dotenvToken',
     'dynamicPath',
+    'env',
     'excludeDynamic',
     'excludeEnv',
     'excludeGlobal',
@@ -57,7 +57,6 @@ export const cli2getdotenvOptions = ({
     'outputPath',
     'privateToken',
   ]),
-  env: env ?? defaultEnv,
   paths:
     paths?.split(
       pathsDelimiterPattern ? RegExp(pathsDelimiterPattern) : pathsDelimiter

package/package.json

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