Skip to content

Commit d305dd7

Browse files
committed
Fix to add support for null
1 parent 28b54f6 commit d305dd7

File tree

1 file changed

+22
-17
lines changed

1 file changed

+22
-17
lines changed

index.js

Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,19 @@
33
*
44
* @typedef {[number, number]} RangeLike
55
*
6-
* @typedef {Object} PointLike
7-
* @property {number} [line]
8-
* @property {number} [column]
6+
* @typedef PointLike
7+
* @property {number|null|undefined} [line]
8+
* @property {number|null|undefined} [column]
99
*
10-
* @typedef {Object} LocLike
11-
* @property {PointLike} [start]
12-
* @property {PointLike} [end]
10+
* @typedef LocLike
11+
* @property {PointLike|null|undefined} [start]
12+
* @property {PointLike|null|undefined} [end]
1313
*
14-
* @typedef {Object} NodeLike
15-
* @property {LocLike} [loc]
16-
* @property {RangeLike} [range]
17-
* @property {number} [start]
18-
* @property {number} [end]
14+
* @typedef NodeLike
15+
* @property {LocLike|null|undefined} [loc]
16+
* @property {RangeLike|null|undefined} [range]
17+
* @property {number|null|undefined} [start]
18+
* @property {number|null|undefined} [end]
1919
*/
2020

2121
/**
@@ -37,29 +37,34 @@ export function positionFromEstree(value) {
3737
start: {
3838
// @ts-expect-error: return no point / no position next major.
3939
line:
40-
loc.start && loc.start.line !== undefined && loc.start.line > -1
40+
loc.start && typeof loc.start.line === 'number' && loc.start.line > -1
4141
? loc.start.line
4242
: undefined,
4343
// @ts-expect-error: return no point / no position next major.
4444
column:
45-
loc.start && loc.start.column !== undefined && loc.start.column > -1
45+
loc.start &&
46+
typeof loc.start.column === 'number' &&
47+
loc.start.column > -1
4648
? loc.start.column + 1
4749
: undefined,
4850
offset:
49-
startOffset !== undefined && startOffset > -1 ? startOffset : undefined
51+
typeof startOffset === 'number' && startOffset > -1
52+
? startOffset
53+
: undefined
5054
},
5155
end: {
5256
// @ts-expect-error: return no point / no position next major.
5357
line:
54-
loc.end && loc.end.line !== undefined && loc.end.line > -1
58+
loc.end && typeof loc.end.line === 'number' && loc.end.line > -1
5559
? loc.end.line
5660
: undefined,
5761
// @ts-expect-error: return no point / no position next major.
5862
column:
59-
loc.end && loc.end.column !== undefined && loc.end.column > -1
63+
loc.end && typeof loc.end.column === 'number' && loc.end.column > -1
6064
? loc.end.column + 1
6165
: undefined,
62-
offset: endOffset !== undefined && endOffset > -1 ? endOffset : undefined
66+
offset:
67+
typeof endOffset === 'number' && endOffset > -1 ? endOffset : undefined
6368
}
6469
}
6570
}

0 commit comments

Comments
 (0)