Skip to content

Commit 3a608bc

Browse files
committed
Add JSDoc based types
1 parent e98723b commit 3a608bc

File tree

5 files changed

+90
-4
lines changed

5 files changed

+90
-4
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
.DS_Store
2+
*.d.ts
23
*.log
34
coverage/
45
node_modules/

index.js

Lines changed: 54 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,56 @@
1+
/**
2+
* @typedef {string|number|boolean} MarkerParameterValue
3+
* @typedef {Object.<string, MarkerParameterValue>} MarkerParameters
4+
*
5+
* @typedef HtmlNode
6+
* @property {'html'} type
7+
* @property {string} value
8+
*
9+
* @typedef CommentNode
10+
* @property {'comment'} type
11+
* @property {string} value
12+
*
13+
* @typedef Marker
14+
* @property {string} name
15+
* @property {string} attributes
16+
* @property {MarkerParameters|null} parameters
17+
* @property {HtmlNode|CommentNode} node
18+
*/
19+
120
var commentExpression = /\s*([a-zA-Z\d-]+)(\s+([\s\S]*))?\s*/
221

322
var markerExpression = new RegExp(
423
'(\\s*<!--' + commentExpression.source + '-->\\s*)'
524
)
625

7-
// Parse a comment marker.
26+
/**
27+
* Parse a comment marker.
28+
* @param {unknown} node
29+
* @returns {Marker|null}
30+
*/
831
export function commentMarker(node) {
32+
/** @type {RegExpMatchArray} */
933
var match
34+
/** @type {number} */
1035
var offset
36+
/** @type {MarkerParameters} */
1137
var parameters
1238

13-
if (node && (node.type === 'html' || node.type === 'comment')) {
39+
if (
40+
node &&
41+
typeof node === 'object' &&
42+
// @ts-ignore hush
43+
(node.type === 'html' || node.type === 'comment')
44+
) {
45+
// @ts-ignore hush
1446
match = node.value.match(
47+
// @ts-ignore hush
1548
node.type === 'comment' ? commentExpression : markerExpression
1649
)
1750

51+
// @ts-ignore hush
1852
if (match && match[0].length === node.value.length) {
53+
// @ts-ignore hush
1954
offset = node.type === 'comment' ? 1 : 2
2055
parameters = parseParameters(match[offset + 1] || '')
2156

@@ -24,6 +59,7 @@ export function commentMarker(node) {
2459
name: match[offset],
2560
attributes: match[offset + 2] || '',
2661
parameters,
62+
// @ts-ignore hush
2763
node
2864
}
2965
}
@@ -33,8 +69,14 @@ export function commentMarker(node) {
3369
return null
3470
}
3571

36-
// Parse `value` into an object.
72+
/**
73+
* Parse `value` into an object.
74+
*
75+
* @param {string} value
76+
* @returns {MarkerParameters|null}
77+
*/
3778
function parseParameters(value) {
79+
/** @type {MarkerParameters} */
3880
var parameters = {}
3981

4082
return value
@@ -46,8 +88,16 @@ function parseParameters(value) {
4688
? null
4789
: parameters
4890

91+
/**
92+
* @param {string} _
93+
* @param {string} $1
94+
* @param {string} $2
95+
* @param {string} $3
96+
* @param {string} $4
97+
*/
4998
// eslint-disable-next-line max-params
50-
function replacer($0, $1, $2, $3, $4) {
99+
function replacer(_, $1, $2, $3, $4) {
100+
/** @type {MarkerParameterValue} */
51101
var value = $2 || $3 || $4 || ''
52102

53103
if (value === 'true' || value === '') {

package.json

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,27 @@
2626
"sideEffects": false,
2727
"type": "module",
2828
"main": "index.js",
29+
"types": "index.d.ts",
2930
"files": [
31+
"index.d.ts",
3032
"index.js"
3133
],
3234
"devDependencies": {
35+
"@types/tape": "^4.0.0",
36+
"@types/unist": "^2.0.0",
3337
"c8": "^7.0.0",
3438
"prettier": "^2.0.0",
3539
"remark-cli": "^9.0.0",
3640
"remark-preset-wooorm": "^8.0.0",
41+
"rimraf": "^3.0.0",
3742
"tape": "^5.0.0",
43+
"type-coverage": "^2.0.0",
44+
"typescript": "^4.0.0",
3845
"xo": "^0.38.0"
3946
},
4047
"scripts": {
48+
"prepack": "npm run build && npm run format",
49+
"build": "rimraf \"*.d.ts\" && tsc && type-coverage",
4150
"format": "remark . -qfo && prettier . -w --loglevel warn && xo --fix",
4251
"test-api": "node test.js",
4352
"test-coverage": "c8 --check-coverage --branches 100 --functions 100 --lines 100 --statements 100 --reporter lcov node test.js",
@@ -62,5 +71,10 @@
6271
"plugins": [
6372
"preset-wooorm"
6473
]
74+
},
75+
"typeCoverage": {
76+
"atLeast": 100,
77+
"detail": true,
78+
"strict": true
6579
}
6680
}

test.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
1+
/**
2+
* @typedef {import('unist').Node} Node
3+
*/
4+
15
import test from 'tape'
26
import {commentMarker} from './index.js'
37

48
test('commentMaker(node)', function (t) {
9+
/** @type {Node} */
510
var node
611

712
t.equal(commentMarker(), null, 'should work without node')
@@ -154,6 +159,7 @@ test('commentMaker(node)', function (t) {
154159
})
155160

156161
test('comment node', function (t) {
162+
/** @type {Node} */
157163
var node
158164

159165
t.equal(

tsconfig.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
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+
}
15+
}

0 commit comments

Comments
 (0)