Skip to content

Commit 3e56862

Browse files
committed
Refactor code-style
1 parent 6ca7310 commit 3e56862

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+963
-915
lines changed

.prettierignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
coverage/
2+
hast-util-to-html.js
3+
hast-util-to-html.min.js

index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
'use strict';
2-
module.exports = require('./lib');
1+
'use strict'
2+
module.exports = require('./lib')

lib/all.js

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

3-
var one = require('./one');
3+
var one = require('./one')
44

5-
module.exports = all;
5+
module.exports = all
66

77
/* Stringify all children of `parent`. */
88
function all(ctx, parent) {
9-
var children = parent && parent.children;
10-
var length = children && children.length;
11-
var index = -1;
12-
var results = [];
9+
var children = parent && parent.children
10+
var length = children && children.length
11+
var index = -1
12+
var results = []
1313

1414
while (++index < length) {
15-
results[index] = one(ctx, children[index], index, parent);
15+
results[index] = one(ctx, children[index], index, parent)
1616
}
1717

18-
return results.join('');
18+
return results.join('')
1919
}

lib/comment.js

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

3-
module.exports = comment;
3+
module.exports = comment
44

55
/* Stringify a comment `node`. */
66
function comment(ctx, node) {
7-
return '<!--' + node.value + '-->';
7+
return '<!--' + node.value + '-->'
88
}

lib/doctype.js

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

3-
module.exports = doctype;
3+
module.exports = doctype
44

55
/* Stringify a doctype `node`. */
66
function doctype(ctx, node) {
7-
var pub = node.public;
8-
var sys = node.system;
9-
var val = '<!DOCTYPE';
7+
var pub = node.public
8+
var sys = node.system
9+
var val = '<!DOCTYPE'
1010

1111
if (!node.name) {
12-
return val + '>';
12+
return val + '>'
1313
}
1414

15-
val += ' ' + node.name;
15+
val += ' ' + node.name
1616

1717
if (pub != null) {
18-
val += ' PUBLIC ' + smart(pub);
18+
val += ' PUBLIC ' + smart(pub)
1919
} else if (sys != null) {
20-
val += ' SYSTEM';
20+
val += ' SYSTEM'
2121
}
2222

2323
if (sys != null) {
24-
val += ' ' + smart(sys);
24+
val += ' ' + smart(sys)
2525
}
2626

27-
return val + '>';
27+
return val + '>'
2828
}
2929

3030
function smart(value) {
31-
var quote = value.indexOf('"') === -1 ? '"' : '\'';
32-
return quote + value + quote;
31+
var quote = value.indexOf('"') === -1 ? '"' : "'"
32+
return quote + value + quote
3333
}

lib/element.js

Lines changed: 84 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -1,198 +1,196 @@
1-
'use strict';
1+
'use strict'
22

3-
var xtend = require('xtend');
4-
var spaces = require('space-separated-tokens').stringify;
5-
var commas = require('comma-separated-tokens').stringify;
6-
var information = require('property-information');
7-
var entities = require('stringify-entities');
8-
var kebab = require('kebab-case');
9-
var ccount = require('ccount');
10-
var all = require('./all');
3+
var xtend = require('xtend')
4+
var spaces = require('space-separated-tokens').stringify
5+
var commas = require('comma-separated-tokens').stringify
6+
var information = require('property-information')
7+
var entities = require('stringify-entities')
8+
var kebab = require('kebab-case')
9+
var ccount = require('ccount')
10+
var all = require('./all')
1111

12-
module.exports = element;
12+
module.exports = element
1313

1414
/* Constants. */
15-
var DATA = 'data';
16-
var EMPTY = '';
15+
var DATA = 'data'
16+
var EMPTY = ''
1717

1818
/* Characters. */
19-
var SPACE = ' ';
20-
var DQ = '"';
21-
var SQ = '\'';
22-
var EQ = '=';
23-
var LT = '<';
24-
var GT = '>';
25-
var SO = '/';
19+
var SPACE = ' '
20+
var DQ = '"'
21+
var SQ = "'"
22+
var EQ = '='
23+
var LT = '<'
24+
var GT = '>'
25+
var SO = '/'
2626

2727
/* Stringify an element `node`. */
2828
function element(ctx, node, index, parent) {
29-
var name = node.tagName;
30-
var content = all(ctx, name === 'template' ? node.content : node);
31-
var selfClosing = ctx.voids.indexOf(name.toLowerCase()) !== -1;
32-
var attrs = attributes(ctx, node.properties);
33-
var omit = ctx.omit;
34-
var value = '';
29+
var name = node.tagName
30+
var content = all(ctx, name === 'template' ? node.content : node)
31+
var selfClosing = ctx.voids.indexOf(name.toLowerCase()) !== -1
32+
var attrs = attributes(ctx, node.properties)
33+
var omit = ctx.omit
34+
var value = ''
3535

3636
/* If the node is categorised as void, but it has
3737
* children, remove the categorisation. This
3838
* enables for example `menuitem`s, which are
3939
* void in W3C HTML but not void in WHATWG HTML, to
4040
* be stringified properly. */
41-
selfClosing = content ? false : selfClosing;
41+
selfClosing = content ? false : selfClosing
4242

4343
if (attrs || !omit || !omit.opening(node, index, parent)) {
44-
value = LT + name + (attrs ? SPACE + attrs : EMPTY);
44+
value = LT + name + (attrs ? SPACE + attrs : EMPTY)
4545

4646
if (selfClosing && ctx.close) {
4747
if (!ctx.tightClose || attrs.charAt(attrs.length - 1) === SO) {
48-
value += SPACE;
48+
value += SPACE
4949
}
5050

51-
value += SO;
51+
value += SO
5252
}
5353

54-
value += GT;
54+
value += GT
5555
}
5656

57-
value += content;
57+
value += content
5858

5959
if (!selfClosing && (!omit || !omit.closing(node, index, parent))) {
60-
value += LT + SO + name + GT;
60+
value += LT + SO + name + GT
6161
}
6262

63-
return value;
63+
return value
6464
}
6565

6666
/* Stringify all attributes. */
6767
function attributes(ctx, props) {
68-
var values = [];
69-
var key;
70-
var value;
71-
var result;
72-
var length;
73-
var index;
74-
var last;
68+
var values = []
69+
var key
70+
var value
71+
var result
72+
var length
73+
var index
74+
var last
7575

7676
for (key in props) {
77-
value = props[key];
77+
value = props[key]
7878

7979
if (value == null) {
80-
continue;
80+
continue
8181
}
8282

83-
result = attribute(ctx, key, value);
83+
result = attribute(ctx, key, value)
8484

8585
if (result) {
86-
values.push(result);
86+
values.push(result)
8787
}
8888
}
8989

90-
length = values.length;
91-
index = -1;
90+
length = values.length
91+
index = -1
9292

9393
while (++index < length) {
94-
result = values[index];
95-
last = ctx.tight && result.charAt(result.length - 1);
94+
result = values[index]
95+
last = ctx.tight && result.charAt(result.length - 1)
9696

9797
/* In tight mode, don’t add a space after quoted attributes. */
9898
if (index !== length - 1 && last !== DQ && last !== SQ) {
99-
values[index] = result + SPACE;
99+
values[index] = result + SPACE
100100
}
101101
}
102102

103-
return values.join(EMPTY);
103+
return values.join(EMPTY)
104104
}
105105

106106
/* Stringify one attribute. */
107107
function attribute(ctx, key, value) {
108-
var info = information(key) || {};
109-
var name;
108+
var info = information(key) || {}
109+
var name
110110

111111
if (
112112
value == null ||
113113
(typeof value === 'number' && isNaN(value)) ||
114114
(!value && info.boolean) ||
115115
(value === false && info.overloadedBoolean)
116116
) {
117-
return EMPTY;
117+
return EMPTY
118118
}
119119

120-
name = attributeName(ctx, key);
120+
name = attributeName(ctx, key)
121121

122122
if ((value && info.boolean) || (value === true && info.overloadedBoolean)) {
123-
return name;
123+
return name
124124
}
125125

126-
return name + attributeValue(ctx, key, value);
126+
return name + attributeValue(ctx, key, value)
127127
}
128128

129129
/* Stringify the attribute name. */
130130
function attributeName(ctx, key) {
131-
var info = information(key) || {};
132-
var name = info.name || kebab(key);
131+
var info = information(key) || {}
132+
var name = info.name || kebab(key)
133133

134134
if (
135135
name.slice(0, DATA.length) === DATA &&
136136
/\d/.test(name.charAt(DATA.length))
137137
) {
138-
name = DATA + '-' + name.slice(4);
138+
name = DATA + '-' + name.slice(4)
139139
}
140140

141-
return entities(name, xtend(ctx.entities, {
142-
subset: ctx.NAME
143-
}));
141+
return entities(name, xtend(ctx.entities, {subset: ctx.NAME}))
144142
}
145143

146144
/* Stringify the attribute value. */
147145
function attributeValue(ctx, key, value) {
148-
var info = information(key) || {};
149-
var options = ctx.entities;
150-
var quote = ctx.quote;
151-
var alternative = ctx.alternative;
152-
var unquoted;
146+
var info = information(key) || {}
147+
var options = ctx.entities
148+
var quote = ctx.quote
149+
var alternative = ctx.alternative
150+
var unquoted
153151

154152
if (typeof value === 'object' && 'length' in value) {
155153
/* `spaces` doesn’t accept a second argument, but it’s
156154
* given here just to keep the code cleaner. */
157155
value = (info.commaSeparated ? commas : spaces)(value, {
158156
padLeft: !ctx.tightLists
159-
});
157+
})
160158
}
161159

162-
value = String(value);
160+
value = String(value)
163161

164162
if (value || !ctx.collapseEmpty) {
165-
unquoted = value;
163+
unquoted = value
166164

167165
/* Check unquoted value. */
168166
if (ctx.unquoted) {
169-
unquoted = entities(value, xtend(options, {
170-
subset: ctx.UNQUOTED,
171-
attribute: true
172-
}));
167+
unquoted = entities(
168+
value,
169+
xtend(options, {subset: ctx.UNQUOTED, attribute: true})
170+
)
173171
}
174172

175173
/* If `value` contains entities when unquoted... */
176174
if (!ctx.unquoted || unquoted !== value) {
177175
/* If the alternative is less common than `quote`, switch. */
178-
if (
179-
alternative &&
180-
ccount(value, quote) > ccount(value, alternative)
181-
) {
182-
quote = alternative;
176+
if (alternative && ccount(value, quote) > ccount(value, alternative)) {
177+
quote = alternative
183178
}
184179

185-
value = entities(value, xtend(options, {
186-
subset: quote === SQ ? ctx.SINGLE_QUOTED : ctx.DOUBLE_QUOTED,
187-
attribute: true
188-
}));
180+
value = entities(
181+
value,
182+
xtend(options, {
183+
subset: quote === SQ ? ctx.SINGLE_QUOTED : ctx.DOUBLE_QUOTED,
184+
attribute: true
185+
})
186+
)
189187

190-
value = quote + value + quote;
188+
value = quote + value + quote
191189
}
192190

193191
/* Don’t add a `=` for unquoted empties. */
194-
value = value ? EQ + value : value;
192+
value = value ? EQ + value : value
195193
}
196194

197-
return value;
195+
return value
198196
}

0 commit comments

Comments
 (0)