Skip to content

Commit 02ce0b1

Browse files
committed
Add JSDoc based types
1 parent 1480585 commit 02ce0b1

File tree

5 files changed

+55
-48
lines changed

5 files changed

+55
-48
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
coverage/
22
node_modules/
33
*.log
4+
*.d.ts
45
.DS_Store
56
yarn.lock

index.js

Lines changed: 14 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,23 @@
1-
import mdxExpressionFromMarkdown from 'mdast-util-mdx-expression/from-markdown.js'
2-
import mdxExpressionToMarkdown from 'mdast-util-mdx-expression/to-markdown.js'
3-
import mdxJsxFromMarkdown from 'mdast-util-mdx-jsx/from-markdown.js'
4-
import mdxJsxToMarkdown from 'mdast-util-mdx-jsx/to-markdown.js'
5-
import mdxjsEsmFromMarkdown from 'mdast-util-mdxjs-esm/from-markdown.js'
6-
import mdxjsEsmToMarkdown from 'mdast-util-mdxjs-esm/to-markdown.js'
1+
/**
2+
* @typedef {import('mdast-util-from-markdown').Extension} FromMarkdownExtension
3+
* @typedef {import('mdast-util-to-markdown').Options} ToMarkdownExtension
4+
*/
75

8-
const own = {}.hasOwnProperty
6+
import {
7+
mdxExpressionFromMarkdown,
8+
mdxExpressionToMarkdown
9+
} from 'mdast-util-mdx-expression'
10+
import {mdxJsxFromMarkdown, mdxJsxToMarkdown} from 'mdast-util-mdx-jsx'
11+
import {mdxjsEsmFromMarkdown, mdxjsEsmToMarkdown} from 'mdast-util-mdxjs-esm'
912

10-
export const mdxFromMarkdown = configure([
13+
/** @type {FromMarkdownExtension[]} */
14+
export const mdxFromMarkdown = [
1115
mdxExpressionFromMarkdown,
1216
mdxJsxFromMarkdown,
1317
mdxjsEsmFromMarkdown
14-
])
15-
16-
function configure(extensions) {
17-
const config = {canContainEols: []}
18-
let index = -1
19-
20-
while (++index < extensions.length) {
21-
extension(config, extensions[index])
22-
}
23-
24-
return config
25-
}
26-
27-
function extension(config, extension) {
28-
let key
29-
let left
30-
31-
for (key in extension) {
32-
if (own.call(extension, key)) {
33-
left = own.call(config, key) ? config[key] : (config[key] = {})
34-
const right = extension[key]
35-
36-
if (key === 'canContainEols') {
37-
config[key] = [].concat(left, right)
38-
} else {
39-
Object.assign(left, right)
40-
}
41-
}
42-
}
43-
}
18+
]
4419

20+
/** @type {ToMarkdownExtension} */
4521
export const mdxToMarkdown = {
4622
extensions: [mdxExpressionToMarkdown, mdxJsxToMarkdown, mdxjsEsmToMarkdown]
4723
}

package.json

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,30 +30,38 @@
3030
"sideEffects": false,
3131
"type": "module",
3232
"main": "index.js",
33+
"types": "index.d.ts",
3334
"files": [
35+
"index.d.ts",
3436
"index.js"
3537
],
3638
"dependencies": {
37-
"mdast-util-mdx-expression": "~0.1.0",
38-
"mdast-util-mdx-jsx": "~0.1.0",
39-
"mdast-util-mdxjs-esm": "~0.1.0"
39+
"mdast-util-mdx-expression": "^1.0.0",
40+
"mdast-util-mdx-jsx": "^1.0.0",
41+
"mdast-util-mdxjs-esm": "^1.0.0"
4042
},
4143
"devDependencies": {
44+
"@types/tape": "^4.0.0",
4245
"c8": "^7.0.0",
43-
"mdast-util-from-markdown": "^0.8.0",
44-
"micromark-extension-mdx": "^0.2.0",
45-
"micromark-extension-mdxjs": "^0.3.0",
46+
"mdast-util-from-markdown": "^1.0.0",
47+
"mdast-util-to-markdown": "^1.0.0",
48+
"micromark-extension-mdx": "^1.0.0",
49+
"micromark-extension-mdxjs": "^1.0.0",
4650
"prettier": "^2.0.0",
4751
"remark-cli": "^9.0.0",
4852
"remark-preset-wooorm": "^8.0.0",
53+
"rimraf": "^3.0.0",
4954
"tape": "^5.0.0",
55+
"type-coverage": "^2.0.0",
56+
"typescript": "^4.0.0",
5057
"xo": "^0.39.0"
5158
},
5259
"scripts": {
60+
"build": "rimraf \"*.d.ts\" && tsc && type-coverage",
5361
"format": "remark . -qfo && prettier . -w --loglevel warn && xo --fix",
5462
"test-api": "node --conditions development test.js",
5563
"test-coverage": "c8 --check-coverage --branches 100 --functions 100 --lines 100 --statements 100 --reporter lcov node --conditions development test.js",
56-
"test": "npm run format && npm run test-coverage"
64+
"test": "npm run build && npm run format && npm run test-coverage"
5765
},
5866
"prettier": {
5967
"tabWidth": 2,
@@ -70,5 +78,11 @@
7078
"plugins": [
7179
"preset-wooorm"
7280
]
81+
},
82+
"typeCoverage": {
83+
"atLeast": 100,
84+
"detail": true,
85+
"strict": true,
86+
"ignoreCatch": true
7387
}
7488
}

test.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import test from 'tape'
2-
import fromMarkdown from 'mdast-util-from-markdown'
3-
import toMarkdown from 'mdast-util-to-markdown'
4-
import mdxjs from 'micromark-extension-mdxjs'
2+
import {fromMarkdown} from 'mdast-util-from-markdown'
3+
import {toMarkdown} from 'mdast-util-to-markdown'
4+
import {mdxjs} from 'micromark-extension-mdxjs'
55
import {mdxFromMarkdown, mdxToMarkdown} from './index.js'
66

77
test('markdown -> mdast', (t) => {

tsconfig.json

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"include": ["*.js"],
3+
"compilerOptions": {
4+
"target": "ES2020",
5+
"lib": ["ES2020"],
6+
"module": "ES2020",
7+
"moduleResolution": "node",
8+
"allowJs": true,
9+
"checkJs": true,
10+
"declaration": true,
11+
"emitDeclarationOnly": true,
12+
"allowSyntheticDefaultImports": true,
13+
"skipLibCheck": true,
14+
"strict": true
15+
}
16+
}

0 commit comments

Comments
 (0)