Skip to content

Commit b06388e

Browse files
committed
Use ESM
1 parent 588f976 commit b06388e

Some content is hidden

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

51 files changed

+427
-596
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
.DS_Store
22
*.log
3-
.nyc_output/
43
coverage/
54
node_modules/
65
yarn.lock

.prettierignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
coverage/
22
*.html
3-
*.json
43
*.md

index.js

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,14 @@
1-
'use strict'
2-
3-
module.exports = toMdast
4-
5-
var has = require('hast-util-has-property')
6-
var minify = require('rehype-minify-whitespace')
7-
var convert = require('unist-util-is/convert')
8-
var visit = require('unist-util-visit')
9-
var xtend = require('xtend')
10-
var one = require('./lib/one')
11-
var handlers = require('./lib/handlers')
12-
var own = require('./lib/util/own')
1+
import {hasProperty} from 'hast-util-has-property'
2+
import minify from 'rehype-minify-whitespace'
3+
import {convert} from 'unist-util-is'
4+
import {visit} from 'unist-util-visit'
5+
import {one} from './lib/one.js'
6+
import {handlers} from './lib/handlers/index.js'
7+
import {own} from './lib/util/own.js'
138

149
var block = convert(['heading', 'paragraph', 'root'])
1510

16-
function toMdast(tree, options) {
11+
export function toMdast(tree, options) {
1712
var settings = options || {}
1813
var byId = {}
1914
var mdast
@@ -24,7 +19,9 @@ function toMdast(tree, options) {
2419
h.wrapText = true
2520
h.qNesting = 0
2621

27-
h.handlers = settings.handlers ? xtend(handlers, settings.handlers) : handlers
22+
h.handlers = settings.handlers
23+
? {...handlers, ...settings.handlers}
24+
: handlers
2825
h.augment = augment
2926

3027
h.document = settings.document
@@ -54,7 +51,7 @@ function toMdast(tree, options) {
5451
props = {}
5552
}
5653

57-
result = xtend({type: type}, props)
54+
result = {type, ...props}
5855

5956
if (typeof children === 'string') {
6057
result.value = children
@@ -76,7 +73,7 @@ function toMdast(tree, options) {
7673
}
7774

7875
function onelement(node) {
79-
var id = has(node, 'id') && String(node.properties.id).toUpperCase()
76+
var id = hasProperty(node, 'id') && String(node.properties.id).toUpperCase()
8077

8178
if (id && !own.call(byId, id)) {
8279
byId[id] = node

lib/all.js

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
1-
'use strict'
1+
import {one} from './one.js'
22

3-
module.exports = all
4-
5-
var one = require('./one')
6-
7-
function all(h, parent) {
3+
export function all(h, parent) {
84
var nodes = parent.children || []
95
var values = []
106
var index = -1

lib/handlers/link.js renamed to lib/handlers/a.js

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
1-
'use strict'
1+
import {all} from '../all.js'
2+
import {resolve} from '../util/resolve.js'
23

3-
module.exports = link
4-
5-
var all = require('../all')
6-
var resolve = require('../util/resolve')
7-
8-
function link(h, node) {
4+
export function a(h, node) {
95
return h(
106
node,
117
'link',

lib/handlers/base.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
'use strict'
2-
3-
module.exports = base
4-
5-
function base(h, node) {
1+
export function base(h, node) {
62
if (!h.baseFound) {
73
h.frozenBaseUrl = node.properties.href
84
h.baseFound = true

lib/handlers/blockquote.js

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
1-
'use strict'
1+
import {wrapChildren} from '../util/wrap-children.js'
22

3-
module.exports = blockquote
4-
5-
var wrapChildren = require('../util/wrap-children')
6-
7-
function blockquote(h, node) {
3+
export function blockquote(h, node) {
84
return h(node, 'blockquote', wrapChildren(h, node))
95
}
Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
'use strict'
2-
3-
module.exports = br
4-
5-
function br(h, node) {
1+
export function br(h, node) {
62
return h.wrapText ? h(node, 'break') : h(node, 'text', ' ')
73
}

lib/handlers/code.js

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,26 @@
1-
'use strict'
2-
3-
module.exports = code
4-
5-
var has = require('hast-util-has-property')
6-
var convert = require('hast-util-is-element/convert')
7-
var toText = require('hast-util-to-text')
8-
var trim = require('trim-trailing-lines')
9-
var wrapText = require('../util/wrap-text')
1+
import {hasProperty} from 'hast-util-has-property'
2+
import {convertElement} from 'hast-util-is-element'
3+
import {toText} from 'hast-util-to-text'
4+
import {trimTrailingLines} from 'trim-trailing-lines'
5+
import {wrapText} from '../util/wrap-text.js'
106

117
var prefix = 'language-'
128

13-
var pre = convert('pre')
14-
var isCode = convert('code')
9+
var pre = convertElement('pre')
10+
var isCode = convertElement('code')
1511

16-
function code(h, node) {
12+
export function code(h, node) {
1713
var children = node.children
1814
var index = -1
1915
var classList
2016
var lang
2117

2218
if (pre(node)) {
2319
while (++index < children.length) {
24-
if (isCode(children[index]) && has(children[index], 'className')) {
20+
if (
21+
isCode(children[index]) &&
22+
hasProperty(children[index], 'className')
23+
) {
2524
classList = children[index].properties.className
2625
break
2726
}
@@ -43,6 +42,6 @@ function code(h, node) {
4342
node,
4443
'code',
4544
{lang: lang || null, meta: null},
46-
trim(wrapText(h, toText(node)))
45+
trimTrailingLines(wrapText(h, toText(node)))
4746
)
4847
}

lib/handlers/comment.js

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
1-
'use strict'
1+
import {wrapText} from '../util/wrap-text.js'
22

3-
module.exports = comment
4-
5-
var wrapText = require('../util/wrap-text')
6-
7-
function comment(h, node) {
3+
export function comment(h, node) {
84
return h(node, 'html', '<!--' + wrapText(h, node.value) + '-->')
95
}

0 commit comments

Comments
 (0)