@karmaniverous/get-dotenv 3.1.11 → 3.1.12

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. package/README.md +1 -0
  2. package/dist/default/lib/getDotenv.js +7 -4
  3. package/dist/default/lib/options.js +1 -4
  4. package/lib/getDotenv.js +17 -4
  5. package/lib/options.js +2 -3
  6. package/package.json +1 -1
package/README.md CHANGED
@@ -225,6 +225,7 @@ get-dotenv options type
225
225
 
226
226
  | Name | Type | Description |
227
227
  | --- | --- | --- |
228
+ | [defaultEnv] | <code>string</code> | default target environment |
228
229
  | [dotenvToken] | <code>string</code> | token indicating a dotenv file |
229
230
  | [dynamicPath] | <code>string</code> | path to file exporting an object keyed to dynamic variable functions |
230
231
  | [env] | <code>string</code> | target environment |
package/dist/default/lib/getDotenv.js CHANGED
@@ -25,6 +25,7 @@ const pruneVars = (getdotenvDefaultOptions, options) => (0, _lodash.default)({
25
25
  * get-dotenv options type
26
26
  *
27
27
  * @typedef {Object} GetDotenvOptions
28
+ * @property {string} [defaultEnv] - default target environment
28
29
  * @property {string} [dotenvToken] - token indicating a dotenv file
29
30
  * @property {string} [dynamicPath] - path to file exporting an object keyed to dynamic variable functions
30
31
  * @property {string} [env] - target environment
@@ -56,6 +57,7 @@ const getDotenv = async function () {
56
57
  let options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
57
58
  // Apply defaults.
58
59
  let {
60
+ defaultEnv,
59
61
  dotenvToken,
60
62
  dynamicPath,
61
63
  env,
@@ -79,9 +81,9 @@ const getDotenv = async function () {
79
81
  // Read .env files.
80
82
  const loaded = await paths.reduce(async (e, p) => {
81
83
  let publicGlobal = excludePublic || excludeGlobal ? {} : (0, _readDotenv.readDotenv)(_path.default.resolve(p, dotenvToken));
82
- let publicEnv = excludePublic || excludeEnv ? {} : (0, _readDotenv.readDotenv)(_path.default.resolve(p, `${dotenvToken}.${env}`));
84
+ let publicEnv = excludePublic || excludeEnv ? {} : (0, _readDotenv.readDotenv)(_path.default.resolve(p, `${dotenvToken}.${env ?? defaultEnv}`));
83
85
  let privateGlobal = excludePrivate || excludeGlobal ? {} : (0, _readDotenv.readDotenv)(_path.default.resolve(p, `${dotenvToken}.${privateToken}`));
84
- let privateEnv = excludePrivate || excludeEnv ? {} : (0, _readDotenv.readDotenv)(_path.default.resolve(p, `${dotenvToken}.${env}.${privateToken}`));
86
+ let privateEnv = excludePrivate || excludeEnv ? {} : (0, _readDotenv.readDotenv)(_path.default.resolve(p, `${dotenvToken}.${env ?? defaultEnv}.${privateToken}`));
85
87
  [e, publicGlobal, publicEnv, privateGlobal, privateEnv] = await Promise.all([e, publicGlobal, publicEnv, privateGlobal, privateEnv]);
86
88
  return {
87
89
  ...e,
@@ -149,6 +151,7 @@ const getDotenvSync = function () {
149
151
  let options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
150
152
  // Apply defaults.
151
153
  let {
154
+ defaultEnv,
152
155
  dotenvToken,
153
156
  dynamicPath,
154
157
  env,
@@ -172,9 +175,9 @@ const getDotenvSync = function () {
172
175
  // Read .env files.
173
176
  const loaded = paths.reduce((e, p) => {
174
177
  let publicGlobal = excludePublic || excludeGlobal ? {} : (0, _readDotenv.readDotenvSync)(_path.default.resolve(p, dotenvToken));
175
- let publicEnv = excludePublic || excludeEnv ? {} : (0, _readDotenv.readDotenvSync)(_path.default.resolve(p, `${dotenvToken}.${env}`));
178
+ let publicEnv = excludePublic || excludeEnv ? {} : (0, _readDotenv.readDotenvSync)(_path.default.resolve(p, `${dotenvToken}.${env ?? defaultEnv}`));
176
179
  let privateGlobal = excludePrivate || excludeGlobal ? {} : (0, _readDotenv.readDotenvSync)(_path.default.resolve(p, `${dotenvToken}.${privateToken}`));
177
- let privateEnv = excludePrivate || excludeEnv ? {} : (0, _readDotenv.readDotenvSync)(_path.default.resolve(p, `${dotenvToken}.${env}.${privateToken}`));
180
+ let privateEnv = excludePrivate || excludeEnv ? {} : (0, _readDotenv.readDotenvSync)(_path.default.resolve(p, `${dotenvToken}.${env ?? defaultEnv}.${privateToken}`));
178
181
  return {
179
182
  ...e,
180
183
  ...publicGlobal,
package/dist/default/lib/options.js CHANGED
@@ -24,8 +24,6 @@ const cliDefaultOptionsLocal = (await _fsExtra.default.exists(cliDefaultOptionsL
24
24
  exports.cliDefaultOptionsLocal = cliDefaultOptionsLocal;
25
25
  const cli2getdotenvOptions = function () {
26
26
  let {
27
- env,
28
- defaultEnv,
29
27
  paths,
30
28
  pathsDelimiter,
31
29
  pathsDelimiterPattern,
@@ -37,8 +35,7 @@ const cli2getdotenvOptions = function () {
37
35
  ...rest
38
36
  } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
39
37
  return {
40
- ...(0, _lodash2.default)(rest, ['dotenvToken', 'dynamicPath', 'excludeDynamic', 'excludeEnv', 'excludeGlobal', 'excludePrivate', 'excludePublic', 'loadProcess', 'log', 'outputPath', 'privateToken']),
41
- env: env ?? defaultEnv,
38
+ ...(0, _lodash2.default)(rest, ['defaultEnv', 'dotenvToken', 'dynamicPath', 'env', 'excludeDynamic', 'excludeEnv', 'excludeGlobal', 'excludePrivate', 'excludePublic', 'loadProcess', 'log', 'outputPath', 'privateToken']),
42
39
  paths: paths?.split(pathsDelimiterPattern ? RegExp(pathsDelimiterPattern) : pathsDelimiter) ?? [],
43
40
  vars: (0, _lodash.default)(vars?.split(varsDelimiterPattern ? RegExp(varsDelimiterPattern) : varsDelimiter).map(v => v.split(varsAssignorPattern ? RegExp(varsAssignorPattern) : varsAssignor)))
44
41
  };
package/lib/getDotenv.js CHANGED
@@ -22,6 +22,7 @@ const pruneVars = (getdotenvDefaultOptions, options) =>
22
22
  * get-dotenv options type
23
23
  *
24
24
  * @typedef {Object} GetDotenvOptions
25
+ * @property {string} [defaultEnv] - default target environment
25
26
  * @property {string} [dotenvToken] - token indicating a dotenv file
26
27
  * @property {string} [dynamicPath] - path to file exporting an object keyed to dynamic variable functions
27
28
  * @property {string} [env] - target environment
@@ -52,6 +53,7 @@ const pruneVars = (getdotenvDefaultOptions, options) =>
52
53
  export const getDotenv = async (options = {}) => {
53
54
  // Apply defaults.
54
55
  let {
56
+ defaultEnv,
55
57
  dotenvToken,
56
58
  dynamicPath,
57
59
  env,
@@ -79,7 +81,7 @@ export const getDotenv = async (options = {}) => {
79
81
  let publicEnv =
80
82
  excludePublic || excludeEnv
81
83
  ? {}
82
- : readDotenv(path.resolve(p, `${dotenvToken}.${env}`));
84
+ : readDotenv(path.resolve(p, `${dotenvToken}.${env ?? defaultEnv}`));
83
85
  let privateGlobal =
84
86
  excludePrivate || excludeGlobal
85
87
  ? {}
@@ -87,7 +89,12 @@ export const getDotenv = async (options = {}) => {
87
89
  let privateEnv =
88
90
  excludePrivate || excludeEnv
89
91
  ? {}
90
- : readDotenv(path.resolve(p, `${dotenvToken}.${env}.${privateToken}`));
92
+ : readDotenv(
93
+ path.resolve(
94
+ p,
95
+ `${dotenvToken}.${env ?? defaultEnv}.${privateToken}`
96
+ )
97
+ );
91
98
 
92
99
  [e, publicGlobal, publicEnv, privateGlobal, privateEnv] = await Promise.all(
93
100
  [e, publicGlobal, publicEnv, privateGlobal, privateEnv]
@@ -165,6 +172,7 @@ export const getDotenv = async (options = {}) => {
165
172
  export const getDotenvSync = (options = {}) => {
166
173
  // Apply defaults.
167
174
  let {
175
+ defaultEnv,
168
176
  dotenvToken,
169
177
  dynamicPath,
170
178
  env,
@@ -192,7 +200,9 @@ export const getDotenvSync = (options = {}) => {
192
200
  let publicEnv =
193
201
  excludePublic || excludeEnv
194
202
  ? {}
195
- : readDotenvSync(path.resolve(p, `${dotenvToken}.${env}`));
203
+ : readDotenvSync(
204
+ path.resolve(p, `${dotenvToken}.${env ?? defaultEnv}`)
205
+ );
196
206
  let privateGlobal =
197
207
  excludePrivate || excludeGlobal
198
208
  ? {}
@@ -201,7 +211,10 @@ export const getDotenvSync = (options = {}) => {
201
211
  excludePrivate || excludeEnv
202
212
  ? {}
203
213
  : readDotenvSync(
204
- path.resolve(p, `${dotenvToken}.${env}.${privateToken}`)
214
+ path.resolve(
215
+ p,
216
+ `${dotenvToken}.${env ?? defaultEnv}.${privateToken}`
217
+ )
205
218
  );
206
219
 
207
220
  return {
package/lib/options.js CHANGED
@@ -32,8 +32,6 @@ export const cliDefaultOptionsLocal = (await fs.exists(
32
32
  : {};
33
33
 
34
34
  export const cli2getdotenvOptions = ({
35
- env,
36
- defaultEnv,
37
35
  paths,
38
36
  pathsDelimiter,
39
37
  pathsDelimiterPattern,
@@ -45,8 +43,10 @@ export const cli2getdotenvOptions = ({
45
43
  ...rest
46
44
  } = {}) => ({
47
45
  ...pick(rest, [
46
+ 'defaultEnv',
48
47
  'dotenvToken',
49
48
  'dynamicPath',
49
+ 'env',
50
50
  'excludeDynamic',
51
51
  'excludeEnv',
52
52
  'excludeGlobal',
@@ -57,7 +57,6 @@ export const cli2getdotenvOptions = ({
57
57
  'outputPath',
58
58
  'privateToken',
59
59
  ]),
60
- env: env ?? defaultEnv,
61
60
  paths:
62
61
  paths?.split(
63
62
  pathsDelimiterPattern ? RegExp(pathsDelimiterPattern) : pathsDelimiter
package/package.json CHANGED
@@ -3,7 +3,7 @@
3
3
  "bin": {
4
4
  "getdotenv": "bin/getdotenv/index.js"
5
5
  },
6
- "version": "3.1.11",
6
+ "version": "3.1.12",
7
7
  "publishConfig": {
8
8
  "access": "public"
9
9
  },