Skip to content

Commit 450e41c

Browse files
committed
Refactor code-style
1 parent 83b7f5a commit 450e41c

File tree

4 files changed

+95
-93
lines changed

4 files changed

+95
-93
lines changed

Diff for: index.js

+22-11
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,27 @@
1-
'use strict';
1+
'use strict'
22

3-
var assign = require('object-assign');
3+
var assign = require('object-assign')
44

5+
module.exports = u
56

6-
module.exports = function u (type, props, value) {
7-
if (value == null && (typeof props != 'object' || Array.isArray(props))) {
8-
value = props;
9-
props = {};
7+
function u(type, props, value) {
8+
var node
9+
10+
if (
11+
(value === null || value === undefined) &&
12+
(typeof props !== 'object' || Array.isArray(props))
13+
) {
14+
value = props
15+
props = {}
16+
}
17+
18+
node = assign({type: String(type)}, props)
19+
20+
if (Array.isArray(value)) {
21+
node.children = value
22+
} else if (value !== null && value !== undefined) {
23+
node.value = String(value)
1024
}
1125

12-
return assign({}, props, { type: String(type) },
13-
value != null && (Array.isArray(value)
14-
? { children: value }
15-
: { value: String(value) }));
16-
};
26+
return node
27+
}

Diff for: package.json

+16-1
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,24 @@
2929
"object-assign": "^4.1.0"
3030
},
3131
"devDependencies": {
32-
"tape": "^4.2.0"
32+
"prettier": "^1.14.2",
33+
"tape": "^4.2.0",
34+
"xo": "^0.22.0"
3335
},
3436
"scripts": {
37+
"format": "prettier --write '**/*.js' && xo --fix",
3538
"test": "tape test/*.js"
39+
},
40+
"prettier": {
41+
"tabWidth": 2,
42+
"useTabs": false,
43+
"singleQuote": true,
44+
"bracketSpacing": false,
45+
"semi": false,
46+
"trailingComma": "none"
47+
},
48+
"xo": {
49+
"prettier": true,
50+
"esnext": false
3651
}
3752
}

Diff for: readme.md

+21-35
Original file line numberDiff line numberDiff line change
@@ -17,52 +17,38 @@ Helper for creating [unist][] trees with [hyperscript][]-like syntax.
1717
## Example
1818

1919
```js
20-
var u = require('unist-builder');
21-
22-
u('root', [
23-
u('subtree', { id: 1 }),
24-
u('subtree', { id: 2 }, [
25-
u('node', [
26-
u('leaf', 'leaf-1'),
27-
u('leaf', 'leaf-2')
28-
]),
29-
u('leaf', { id: 3 }, 'leaf-3')
20+
var u = require('unist-builder')
21+
22+
var tree = u('root', [
23+
u('subtree', {id: 1}),
24+
u('subtree', {id: 2}, [
25+
u('node', [u('leaf', 'leaf-1'), u('leaf', 'leaf-2')]),
26+
u('leaf', {id: 3}, 'leaf-3')
3027
])
3128
])
29+
30+
console.dir(tree, {depth: null})
3231
```
3332

3433
results in the following tree:
3534

36-
```json
35+
```js
3736
{
38-
"type": "root",
39-
"children": [
37+
type: 'root',
38+
children: [
39+
{type: 'subtree', id: 1},
4040
{
41-
"type": "subtree",
42-
"id": 1
43-
},
44-
{
45-
"type": "subtree",
46-
"id": 2,
47-
"children": [
41+
type: 'subtree',
42+
id: 2,
43+
children: [
4844
{
49-
"type": "node",
50-
"children": [
51-
{
52-
"type": "leaf",
53-
"value": "leaf-1"
54-
},
55-
{
56-
"type": "leaf",
57-
"value": "leaf-2"
58-
}
45+
type: 'node',
46+
children: [
47+
{type: 'leaf', value: 'leaf-1'},
48+
{type: 'leaf', value: 'leaf-2'}
5949
]
6050
},
61-
{
62-
"type": "leaf",
63-
"id": 3,
64-
"value": "leaf-3"
65-
}
51+
{type: 'leaf', id: 3, value: 'leaf-3'}
6652
]
6753
}
6854
]

Diff for: test/test.js

+36-46
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,40 @@
1-
'use strict';
1+
'use strict'
22

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

5-
var test = require('tape');
5+
var test = require('tape')
66

7+
test(function(t) {
8+
t.deepEqual(
9+
u('root', [
10+
u('subtree', {id: 1}),
11+
u('subtree', {id: 2}, [
12+
u('node', [u('leaf', 'leaf-1'), u('leaf', 'leaf-2'), u('leaf', '')]),
13+
u('leaf', {id: 3}, 'leaf-3')
14+
])
15+
]),
16+
{
17+
type: 'root',
18+
children: [
19+
{type: 'subtree', id: 1},
20+
{
21+
type: 'subtree',
22+
id: 2,
23+
children: [
24+
{
25+
type: 'node',
26+
children: [
27+
{type: 'leaf', value: 'leaf-1'},
28+
{type: 'leaf', value: 'leaf-2'},
29+
{type: 'leaf', value: ''}
30+
]
31+
},
32+
{type: 'leaf', id: 3, value: 'leaf-3'}
33+
]
34+
}
35+
]
36+
}
37+
)
738

8-
test(function (t) {
9-
var ast = u('root', [
10-
u('subtree', { id: 1 }),
11-
u('subtree', { id: 2 }, [
12-
u('node', [
13-
u('leaf', 'leaf-1'),
14-
u('leaf', 'leaf-2'),
15-
u('leaf', '')
16-
]),
17-
u('leaf', { id: 3 }, 'leaf-3')
18-
])
19-
]);
20-
21-
t.deepEqual(ast, {
22-
type: 'root',
23-
children: [{
24-
type: 'subtree',
25-
id: 1
26-
}, {
27-
type: 'subtree',
28-
id: 2,
29-
children: [{
30-
type: 'node',
31-
children: [{
32-
type: 'leaf',
33-
value: 'leaf-1'
34-
}, {
35-
type: 'leaf',
36-
value: 'leaf-2'
37-
}, {
38-
type: 'leaf',
39-
value: ''
40-
}]
41-
}, {
42-
type: 'leaf',
43-
id: 3,
44-
value: 'leaf-3'
45-
}]
46-
}]
47-
});
48-
49-
t.end();
50-
});
39+
t.end()
40+
})

0 commit comments

Comments
 (0)