Skip to content

Commit 3a854ba

Browse files
evilebottnawievilebottnawi
authored
style: integrate prettier
1 parent 0f2b227 commit 3a854ba

26 files changed

+1345
-897
lines changed

‎.editorconfig‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,16 @@
11
root = true
22

33
[*]
4-
indent_style = tab
5-
indent_size = 4
64
charset = utf-8
7-
trim_trailing_whitespace = true
8-
insert_final_newline = true
9-
max_line_length = 233
10-
11-
[*.json]
12-
indent_style = space
13-
indent_size = 2
14-
15-
[*.yml]
165
indent_style = space
176
indent_size = 2
7+
end_of_line = lf
8+
insert_final_newline = true
9+
trim_trailing_whitespace = true
1810

1911
[test/cases/parsing/bom/bomfile.{css,js}]
2012
charset = utf-8-bom
2113

2214
[*.md]
15+
insert_final_newline = true
2316
trim_trailing_whitespace = false

‎.eslintrc.json‎

Lines changed: 31 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,35 @@
11
{
2-
"root": true,
3-
"plugins": ["node"],
4-
"extends": ["eslint:recommended", "plugin:node/recommended"],
5-
"env": {
6-
"node": true
7-
},
8-
"rules": {
9-
"quotes": ["error", "double"],
10-
"no-undef": "error",
11-
"no-extra-semi": "error",
12-
"semi": "error",
13-
"no-template-curly-in-string": "error",
14-
"no-caller": "error",
15-
"yoda": "error",
16-
"eqeqeq": "error",
17-
"global-require": "off",
18-
"brace-style": "error",
19-
"eol-last": "error",
20-
"indent": ["error", "tab", { "SwitchCase": 1 }],
21-
"no-extra-bind": "warn",
22-
"no-empty": "off",
23-
"no-multiple-empty-lines": "error",
24-
"no-multi-spaces": "error",
25-
"no-process-exit": "warn",
26-
"space-in-parens": "error",
27-
"no-trailing-spaces": "error",
28-
"no-use-before-define": "off",
29-
"no-unused-vars": ["error", {"args": "none"}],
30-
"key-spacing": "error",
31-
"space-infix-ops": "error",
32-
"no-unsafe-negation": "error",
33-
"no-loop-func": "warn",
34-
"space-before-function-paren": ["error", "never"],
35-
"space-before-blocks": "error",
36-
"object-curly-spacing": ["error", "always"],
37-
"keyword-spacing": ["error", {
38-
"after": false,
39-
"overrides": {
40-
"try": {"after": true},
41-
"else": {"after": true},
42-
"throw": {"after": true},
43-
"case": {"after": true},
44-
"return": {"after": true},
45-
"finally": {"after": true},
46-
"do": {"after": true}
47-
}
48-
}],
49-
"no-console": "off",
50-
"valid-jsdoc": "error",
51-
"no-var": "error",
52-
"prefer-const": "error",
53-
"prefer-arrow-callback": "error",
2+
"root": true,
3+
"plugins": ["node", "prettier"],
4+
"extends": ["eslint:recommended", "plugin:node/recommended"],
5+
"env": {
6+
"node": true
7+
},
8+
"rules": {
9+
"no-template-curly-in-string": "error",
10+
"no-caller": "error",
11+
"yoda": "error",
12+
"eqeqeq": "error",
13+
"no-extra-bind": "error",
14+
"no-process-exit": "error",
15+
"no-loop-func": "error",
16+
"no-console": "off",
17+
"valid-jsdoc": "error",
18+
"no-var": "error",
19+
"prefer-const": "error",
20+
"prefer-arrow-callback": "error",
5421
"object-shorthand": "error",
22+
5523
// Allow to use `assert` module
56-
"node/no-deprecated-api": "off"
57-
}
24+
"node/no-deprecated-api": "off",
25+
26+
"prettier/prettier": [
27+
"error",
28+
{
29+
"singleQuote": true,
30+
"trailingComma": "es5",
31+
"arrowParens": "always"
32+
}
33+
]
34+
}
5835
}

‎.prettierrc‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"singleQuote": true,
3+
"trailingComma": "es5",
4+
"arrowParens": "always"
5+
}

‎appveyor.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ environment:
1010

1111
clone_depth: 10
1212

13-
version: "{build}"
13+
version: '{build}'
1414
build: off
1515
deploy: off
1616

@@ -29,4 +29,4 @@ cache:
2929
test_script:
3030
- node --version
3131
- npm --version
32-
- cmd: "yarn travis"
32+
- cmd: 'yarn travis'

‎lib/getCurrentRequest.js‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
1-
"use strict";
1+
'use strict';
22

33
function getCurrentRequest(loaderContext) {
4-
if(loaderContext.currentRequest)
5-
return loaderContext.currentRequest;
6-
const request = loaderContext.loaders
7-
.slice(loaderContext.loaderIndex)
8-
.map(obj => obj.request)
9-
.concat([loaderContext.resource]);
10-
return request.join("!");
4+
if (loaderContext.currentRequest) {
5+
return loaderContext.currentRequest;
6+
}
7+
8+
const request = loaderContext.loaders
9+
.slice(loaderContext.loaderIndex)
10+
.map((obj) => obj.request)
11+
.concat([loaderContext.resource]);
12+
13+
return request.join('!');
1114
}
1215

1316
module.exports = getCurrentRequest;

‎lib/getHashDigest.js‎

Lines changed: 53 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,69 @@
1-
"use strict";
1+
'use strict';
22

33
const baseEncodeTables = {
4-
26: "abcdefghijklmnopqrstuvwxyz",
5-
32: "123456789abcdefghjkmnpqrstuvwxyz", // no 0lio
6-
36: "0123456789abcdefghijklmnopqrstuvwxyz",
7-
49: "abcdefghijkmnopqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ", // no lIO
8-
52: "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ",
9-
58: "123456789abcdefghijkmnopqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ", // no 0lIO
10-
62: "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ",
11-
64: "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-_"
4+
26: 'abcdefghijklmnopqrstuvwxyz',
5+
32: '123456789abcdefghjkmnpqrstuvwxyz', // no 0lio
6+
36: '0123456789abcdefghijklmnopqrstuvwxyz',
7+
49: 'abcdefghijkmnopqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ', // no lIO
8+
52: 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ',
9+
58: '123456789abcdefghijkmnopqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ', // no 0lIO
10+
62: '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ',
11+
64: '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-_',
1212
};
1313

1414
function encodeBufferToBase(buffer, base) {
15-
const encodeTable = baseEncodeTables[base];
16-
if(!encodeTable) throw new Error("Unknown encoding base" + base);
15+
const encodeTable = baseEncodeTables[base];
16+
if (!encodeTable) {
17+
throw new Error('Unknown encoding base' + base);
18+
}
1719

18-
const readLength = buffer.length;
20+
const readLength = buffer.length;
21+
const Big = require('big.js');
1922

20-
const Big = require("big.js");
21-
Big.RM = Big.DP = 0;
22-
let b = new Big(0);
23-
for(let i = readLength - 1; i >= 0; i--) {
24-
b = b.times(256).plus(buffer[i]);
25-
}
23+
Big.RM = Big.DP = 0;
24+
let b = new Big(0);
2625

27-
let output = "";
28-
while(b.gt(0)) {
29-
output = encodeTable[b.mod(base)] + output;
30-
b = b.div(base);
31-
}
26+
for (let i = readLength - 1; i >= 0; i--) {
27+
b = b.times(256).plus(buffer[i]);
28+
}
3229

33-
Big.DP = 20;
34-
Big.RM = 1;
30+
let output = '';
31+
while (b.gt(0)) {
32+
output = encodeTable[b.mod(base)] + output;
33+
b = b.div(base);
34+
}
3535

36-
return output;
36+
Big.DP = 20;
37+
Big.RM = 1;
38+
39+
return output;
3740
}
3841

3942
function getHashDigest(buffer, hashType, digestType, maxLength) {
40-
hashType = hashType || "md5";
41-
maxLength = maxLength || 9999;
42-
const hash = require("crypto").createHash(hashType);
43-
hash.update(buffer);
44-
if(digestType === "base26" || digestType === "base32" || digestType === "base36" ||
45-
digestType === "base49" || digestType === "base52" || digestType === "base58" ||
46-
digestType === "base62" || digestType === "base64") {
47-
return encodeBufferToBase(hash.digest(), digestType.substr(4)).substr(0, maxLength);
48-
} else {
49-
return hash.digest(digestType || "hex").substr(0, maxLength);
50-
}
43+
hashType = hashType || 'md5';
44+
maxLength = maxLength || 9999;
45+
46+
const hash = require('crypto').createHash(hashType);
47+
48+
hash.update(buffer);
49+
50+
if (
51+
digestType === 'base26' ||
52+
digestType === 'base32' ||
53+
digestType === 'base36' ||
54+
digestType === 'base49' ||
55+
digestType === 'base52' ||
56+
digestType === 'base58' ||
57+
digestType === 'base62' ||
58+
digestType === 'base64'
59+
) {
60+
return encodeBufferToBase(hash.digest(), digestType.substr(4)).substr(
61+
0,
62+
maxLength
63+
);
64+
} else {
65+
return hash.digest(digestType || 'hex').substr(0, maxLength);
66+
}
5167
}
5268

5369
module.exports = getHashDigest;

‎lib/getOptions.js‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
1-
"use strict";
1+
'use strict';
22

3-
const parseQuery = require("./parseQuery");
3+
const parseQuery = require('./parseQuery');
44

55
function getOptions(loaderContext) {
6-
const query = loaderContext.query;
7-
if(typeof query === "string" && query !== "") {
8-
return parseQuery(loaderContext.query);
9-
}
10-
if(!query || typeof query !== "object") {
11-
// Not object-like queries are not supported.
12-
return null;
13-
}
14-
return query;
6+
const query = loaderContext.query;
7+
8+
if (typeof query === 'string' && query !== '') {
9+
return parseQuery(loaderContext.query);
10+
}
11+
12+
if (!query || typeof query !== 'object') {
13+
// Not object-like queries are not supported.
14+
return null;
15+
}
16+
17+
return query;
1518
}
1619

1720
module.exports = getOptions;

‎lib/getRemainingRequest.js‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
1-
"use strict";
1+
'use strict';
22

33
function getRemainingRequest(loaderContext) {
4-
if(loaderContext.remainingRequest)
5-
return loaderContext.remainingRequest;
6-
const request = loaderContext.loaders
7-
.slice(loaderContext.loaderIndex + 1)
8-
.map(obj => obj.request)
9-
.concat([loaderContext.resource]);
10-
return request.join("!");
4+
if (loaderContext.remainingRequest) {
5+
return loaderContext.remainingRequest;
6+
}
7+
8+
const request = loaderContext.loaders
9+
.slice(loaderContext.loaderIndex + 1)
10+
.map((obj) => obj.request)
11+
.concat([loaderContext.resource]);
12+
13+
return request.join('!');
1114
}
1215

1316
module.exports = getRemainingRequest;

‎lib/index.js‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
"use strict";
1+
'use strict';
22

3-
const getOptions = require("./getOptions");
4-
const parseQuery = require("./parseQuery");
5-
const stringifyRequest = require("./stringifyRequest");
6-
const getRemainingRequest = require("./getRemainingRequest");
7-
const getCurrentRequest = require("./getCurrentRequest");
8-
const isUrlRequest = require("./isUrlRequest");
9-
const urlToRequest = require("./urlToRequest");
10-
const parseString = require("./parseString");
11-
const getHashDigest = require("./getHashDigest");
12-
const interpolateName = require("./interpolateName");
3+
const getOptions = require('./getOptions');
4+
const parseQuery = require('./parseQuery');
5+
const stringifyRequest = require('./stringifyRequest');
6+
const getRemainingRequest = require('./getRemainingRequest');
7+
const getCurrentRequest = require('./getCurrentRequest');
8+
const isUrlRequest = require('./isUrlRequest');
9+
const urlToRequest = require('./urlToRequest');
10+
const parseString = require('./parseString');
11+
const getHashDigest = require('./getHashDigest');
12+
const interpolateName = require('./interpolateName');
1313

1414
exports.getOptions = getOptions;
1515
exports.parseQuery = parseQuery;

0 commit comments

Comments
 (0)