Skip to content

Commit 507b083

Browse files
committed
Refactor code-style
1 parent 65a57cd commit 507b083

File tree

5 files changed

+60
-73
lines changed

5 files changed

+60
-73
lines changed

index.js

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

3-
var remove = require('unist-util-remove');
3+
var remove = require('unist-util-remove')
44

5+
module.exports = squeeze
56

6-
module.exports = function (ast) {
7-
return remove(ast, { cascade: false }, isEmptyParagraph);
8-
};
7+
var whiteSpaceOnly = /^\s*$/
98

9+
function squeeze(ast) {
10+
return remove(ast, {cascade: false}, isEmptyParagraph)
11+
}
1012

1113
// Whether paragraph is empty or composed only of whitespace.
12-
function isEmptyParagraph (node) {
13-
return node.type == 'paragraph' && node.children.every(function (node) {
14-
return node.type == 'text' && /^\s*$/.test(node.value);
15-
});
14+
function isEmptyParagraph(node) {
15+
return node.type === 'paragraph' && node.children.every(isEmptyText)
16+
}
17+
18+
function isEmptyText(node) {
19+
return node.type === 'text' && whiteSpaceOnly.test(node.value)
1620
}

package.json

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,25 @@
3030
"unist-util-remove": "^1.0.0"
3131
},
3232
"devDependencies": {
33+
"prettier": "^1.14.2",
3334
"tape": "^4.0.0",
34-
"unist-builder": "^1.0.0"
35+
"unist-builder": "^1.0.0",
36+
"xo": "^0.22.0"
3537
},
3638
"scripts": {
39+
"format": "prettier --write \"**/*.js\" && xo --fix",
3740
"test": "tape test/*.js"
41+
},
42+
"prettier": {
43+
"tabWidth": 2,
44+
"useTabs": false,
45+
"singleQuote": true,
46+
"bracketSpacing": false,
47+
"semi": false,
48+
"trailingComma": "none"
49+
},
50+
"xo": {
51+
"prettier": true,
52+
"esnext": false
3853
}
3954
}

test/data/input.js

Lines changed: 12 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,20 @@
1-
'use strict';
1+
'use strict'
22

3-
var u = require('unist-builder');
3+
var u = require('unist-builder')
44

5-
6-
module.exports = function () {
5+
module.exports = function() {
76
return u('root', [
87
u('paragraph', []),
9-
u('paragraph', [
10-
u('text', 'first')
11-
]),
8+
u('paragraph', [u('text', 'first')]),
129
u('paragraph', []),
13-
u('paragraph', [
14-
u('text', ''),
15-
u('text', ' \n')
16-
]),
17-
u('paragraph', [
18-
u('text', 'second'),
19-
u('text', ' '),
20-
u('text', 'value')
21-
]),
10+
u('paragraph', [u('text', ''), u('text', ' \n')]),
11+
u('paragraph', [u('text', 'second'), u('text', ' '), u('text', 'value')]),
2212
u('paragraph', []),
23-
u('list', {
24-
ordered: false,
25-
start: null,
26-
loose: false
27-
}, [
28-
u('listItem', { loose: false }, [
29-
u('paragraph', [])
30-
]),
31-
u('listItem', { loose: false }, [
32-
u('paragraph', [
33-
u('text', ' '),
34-
u('text', ' ')
35-
])
13+
u('list', {ordered: false, start: null, loose: false}, [
14+
u('listItem', {loose: false}, [u('paragraph', [])]),
15+
u('listItem', {loose: false}, [
16+
u('paragraph', [u('text', ' '), u('text', ' ')])
3617
])
3718
])
38-
]);
39-
};
19+
])
20+
}

test/data/output.js

Lines changed: 10 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,14 @@
1-
'use strict';
1+
'use strict'
22

3-
var u = require('unist-builder');
3+
var u = require('unist-builder')
44

5-
6-
module.exports = function () {
5+
module.exports = function() {
76
return u('root', [
8-
u('paragraph', [
9-
u('text', 'first')
10-
]),
11-
u('paragraph', [
12-
u('text', 'second'),
13-
u('text', ' '),
14-
u('text', 'value')
15-
]),
16-
u('list', {
17-
ordered: false,
18-
start: null,
19-
loose: false
20-
}, [
21-
u('listItem', { loose: false }, []),
22-
u('listItem', { loose: false }, [])
7+
u('paragraph', [u('text', 'first')]),
8+
u('paragraph', [u('text', 'second'), u('text', ' '), u('text', 'value')]),
9+
u('list', {ordered: false, start: null, loose: false}, [
10+
u('listItem', {loose: false}, []),
11+
u('listItem', {loose: false}, [])
2312
])
24-
]);
25-
};
13+
])
14+
}

test/test.js

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

3-
var squeezeParagraphs = require('..'),
4-
input = require('./data/input'),
5-
output = require('./data/output');
3+
var test = require('tape')
4+
var output = require('./data/output')
5+
var input = require('./data/input')
6+
var squeezeParagraphs = require('..')
67

7-
var test = require('tape');
8-
9-
10-
test(function (t) {
11-
t.deepEqual(squeezeParagraphs(input()), output());
12-
t.end();
13-
});
8+
test(function(t) {
9+
t.deepEqual(squeezeParagraphs(input()), output())
10+
t.end()
11+
})

0 commit comments

Comments
 (0)