Skip to content

Commit 04f4ea5

Browse files
committed
Add prettier
1 parent 013d049 commit 04f4ea5

File tree

7 files changed

+204
-179
lines changed

7 files changed

+204
-179
lines changed

README.md

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -96,12 +96,11 @@ Return a list of environment variables based on a `spec`:
9696

9797
```javascript
9898
var config = getenv.multi({
99-
foo: "FOO", // throws if FOO doesn't exist
100-
bar: ["BAR", "defaultval"], // set a default value
101-
baz: ["BAZ", "defaultval", "string"], // parse into type
102-
quux: ["QUUX", undefined, "int"] // parse & throw
99+
foo: 'FOO', // throws if FOO doesn't exist
100+
bar: ['BAR', 'defaultval'], // set a default value
101+
baz: ['BAZ', 'defaultval', 'string'], // parse into type
102+
quux: ['QUUX', undefined, 'int'], // parse & throw
103103
});
104-
105104
```
106105

107106
### env.url(name, [fallback])
@@ -130,7 +129,7 @@ if (process.env.NODE_ENV === 'production') {
130129

131130
```javascript
132131
getenv.disableErrors();
133-
console.log(getenv("RANDOM"));
132+
console.log(getenv('RANDOM'));
134133
// undefined
135134
```
136135

@@ -140,32 +139,38 @@ Revert the effect of `disableErrors()`.
140139

141140
```javascript
142141
getenv.disableErrors();
143-
console.log(getenv("RANDOM"));
142+
console.log(getenv('RANDOM'));
144143
// undefined
145144

146145
getenv.enableErrors();
147-
console.log(getenv("RANDOM"));
146+
console.log(getenv('RANDOM'));
148147
// Error: GetEnv.Nonexistent: RANDOM does not exist and no fallback value provided.
149148
```
150149

151150
## Changelog
152151

153152
### v0.6.0
153+
154154
- Added getenv.boolish() support.
155155

156156
### v0.5.0
157+
157158
- Add getenv.url() support.
158159

159160
### v0.4.0
161+
160162
- Add getenv.disableFallbacks() support.
161163

162164
### v0.3.0
165+
163166
- Add getenv.multi() support.
164167

165168
### v0.2.0
169+
166170
- Rename git repository
167171

168172
### v0.1.0
173+
169174
- Initial release
170175

171176
## Authors

index.js

Lines changed: 34 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
var util = require("util");
2-
var url = require("url");
1+
var util = require('util');
2+
var url = require('url');
33

44
var fallbacksDisabled = false;
55
var throwError = true;
@@ -11,12 +11,17 @@ function _value(varName, fallback) {
1111
return value;
1212
}
1313
if (fallback === undefined) {
14-
throw new Error('GetEnv.Nonexistent: ' + varName + ' does not exist ' +
15-
'and no fallback value provided.');
14+
throw new Error(
15+
'GetEnv.Nonexistent: ' + varName + ' does not exist ' + 'and no fallback value provided.'
16+
);
1617
}
1718
if (fallbacksDisabled) {
18-
throw new Error('GetEnv.DisabledFallbacks: ' + varName + ' relying on fallback ' +
19-
'when fallbacks have been disabled');
19+
throw new Error(
20+
'GetEnv.DisabledFallbacks: ' +
21+
varName +
22+
' relying on fallback ' +
23+
'when fallbacks have been disabled'
24+
);
2025
}
2126
return '' + fallback;
2227
}
@@ -36,7 +41,7 @@ var convert = {
3641
return +value;
3742
},
3843
float: function(value) {
39-
var isInfinity = (+value === Infinity || +value === -Infinity);
44+
var isInfinity = +value === Infinity || +value === -Infinity;
4045
if (isInfinity) {
4146
throw new Error('GetEnv.Infinity: ' + value + ' is set to +/-Infinity.');
4247
}
@@ -49,39 +54,40 @@ var convert = {
4954
return +value;
5055
},
5156
bool: function(value) {
52-
var isBool = (value === 'true' || value === 'false');
57+
var isBool = value === 'true' || value === 'false';
5358
if (!isBool) {
5459
throw new Error('GetEnv.NoBoolean: ' + value + ' is not a boolean.');
5560
}
5661

57-
return (value === 'true')
62+
return value === 'true';
5863
},
5964
boolish: function(value) {
6065
try {
61-
return convert.bool(value)
62-
}
63-
catch(err) {
64-
var isBool = (value === '1' || value === '0');
66+
return convert.bool(value);
67+
} catch (err) {
68+
var isBool = value === '1' || value === '0';
6569
if (!isBool) {
6670
throw new Error('GetEnv.NoBoolean: ' + value + ' is not a boolean.');
6771
}
6872

69-
return (value === '1');
73+
return value === '1';
7074
}
7175
},
72-
url: url.parse
76+
url: url.parse,
7377
};
7478

7579
function converter(type) {
7680
return function(varName, fallback) {
77-
if(typeof varName == 'string') { // default
81+
if (typeof varName == 'string') {
82+
// default
7883
var value = _value(varName, fallback);
7984
return convert[type](value);
80-
} else { // multibert!
85+
} else {
86+
// multibert!
8187
return getenv.multi(varName);
8288
}
8389
};
84-
};
90+
}
8591

8692
var getenv = converter('string');
8793

@@ -101,22 +107,25 @@ getenv.array = function array(varName, type, fallback) {
101107
getenv.multi = function multi(spec) {
102108
var key, value;
103109
var result = {};
104-
for(var key in spec) {
110+
for (var key in spec) {
105111
var value = spec[key];
106-
if(util.isArray(value)) { // default value & typecast
107-
switch(value.length) {
112+
if (util.isArray(value)) {
113+
// default value & typecast
114+
switch (value.length) {
108115
case 1: // no default value
109116
case 2: // no type casting
110117
result[key] = getenv(value[0], value[1]); // dirty, when case 1: value[1] is undefined
111-
break;
118+
break;
112119
case 3: // with typecast
113120
result[key] = getenv[value[2]](value[0], value[1]);
114121
break;
115-
default: // wtf?
116-
throw('getenv.multi(): invalid spec');
122+
default:
123+
// wtf?
124+
throw 'getenv.multi(): invalid spec';
117125
break;
118126
}
119-
} else { // value or throw
127+
} else {
128+
// value or throw
120129
result[key] = getenv(value);
121130
}
122131
}

package.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,16 @@
1717
},
1818
"main": "index.js",
1919
"scripts": {
20+
"prettier": "prettier --write *.{js,md} **/*.js",
2021
"test": "make test"
2122
},
2223
"engines": {
2324
"node": ">=6"
2425
},
2526
"dependencies": {},
26-
"devDependencies": {},
27+
"devDependencies": {
28+
"prettier": "^1.18.2"
29+
},
2730
"keywords": [
2831
"env",
2932
"environment",

prettier.config.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
module.exports = {
2+
arrowParens: 'always',
3+
printWidth: 100,
4+
singleQuote: true,
5+
trailingComma: 'es5',
6+
};

test/disableErrors.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ tests['getenv.disableErrors() should disable any errors'] = function() {
1010
assert(getenv.string('url'), undefined);
1111
};
1212

13-
tests['getenv.enableErrors() should enable errors'] = function () {
13+
tests['getenv.enableErrors() should enable errors'] = function() {
1414
getenv.enableErrors();
1515
assert.throws(function() {
1616
getenv.string('url');
1717
});
1818
assert.strictEqual(getenv.string('url', 'http://localhost'), 'http://localhost');
19-
}
19+
};
2020

2121
Object.keys(tests).forEach(function(key) {
2222
console.log('Test: %s', key);

test/fallbacks.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ tests['getenv.disableFallbacks() makes relying on fallbacks an error'] = functio
1313
getenv.enableFallbacks();
1414
};
1515

16-
1716
Object.keys(tests).forEach(function(key) {
1817
console.log('Test: %s', key);
1918
tests[key]();

0 commit comments

Comments
 (0)