diff --git a/packages/remark-lint-blockquote-indentation/index.js b/packages/remark-lint-blockquote-indentation/index.js index c537b96d..666319cb 100644 --- a/packages/remark-lint-blockquote-indentation/index.js +++ b/packages/remark-lint-blockquote-indentation/index.js @@ -47,9 +47,9 @@ import {lintRule} from 'unified-lint-rule' import plural from 'pluralize' -import visit from 'unist-util-visit' -import position from 'unist-util-position' -import generated from 'unist-util-generated' +import {visit} from 'unist-util-visit' +import {pointStart} from 'unist-util-position' +import {generated} from 'unist-util-generated' const remarkLintBlockquoteIndentation = lintRule( 'remark-lint:blockquote-indentation', @@ -85,7 +85,7 @@ function blockquoteIndentation(tree, file, option) { plural('space', abs) + ' between block quote and content' - file.message(reason, position.start(node.children[0])) + file.message(reason, pointStart(node.children[0])) } } else { preferred = check(node) @@ -94,5 +94,5 @@ function blockquoteIndentation(tree, file, option) { } function check(node) { - return position.start(node.children[0]).column - position.start(node).column + return pointStart(node.children[0]).column - pointStart(node).column } diff --git a/packages/remark-lint-blockquote-indentation/package.json b/packages/remark-lint-blockquote-indentation/package.json index bc7a5829..7ed8308d 100644 --- a/packages/remark-lint-blockquote-indentation/package.json +++ b/packages/remark-lint-blockquote-indentation/package.json @@ -31,9 +31,9 @@ "dependencies": { "pluralize": "^8.0.0", "unified-lint-rule": "^1.0.0", - "unist-util-generated": "^1.1.0", - "unist-util-position": "^3.0.0", - "unist-util-visit": "^2.0.0" + "unist-util-generated": "^2.0.0", + "unist-util-position": "^4.0.0", + "unist-util-visit": "^4.0.0" }, "xo": false } diff --git a/packages/remark-lint-checkbox-character-style/index.js b/packages/remark-lint-checkbox-character-style/index.js index 8cf0a8f9..43b7c2ce 100644 --- a/packages/remark-lint-checkbox-character-style/index.js +++ b/packages/remark-lint-checkbox-character-style/index.js @@ -70,9 +70,9 @@ */ import {lintRule} from 'unified-lint-rule' -import visit from 'unist-util-visit' -import position from 'unist-util-position' -import generated from 'unist-util-generated' +import {visit} from 'unist-util-visit' +import {pointStart, pointEnd} from 'unist-util-position' +import {generated} from 'unist-util-generated' const remarkLintCheckboxCharacterStyle = lintRule( 'remark-lint:checkbox-character-style', @@ -81,9 +81,6 @@ const remarkLintCheckboxCharacterStyle = lintRule( export default remarkLintCheckboxCharacterStyle -var start = position.start -var end = position.end - var checked = {x: true, X: true} var unchecked = {' ': true, '\t': true} var types = {true: 'checked', false: 'unchecked'} @@ -127,7 +124,8 @@ function checkboxCharacterStyle(tree, file, option) { // A list item cannot be checked and empty, according to GFM, but // theoretically it makes sense to get the end if that were possible. /* c8 ignore next */ - point = node.children.length === 0 ? end(node) : start(node.children[0]) + point = + node.children.length === 0 ? pointEnd(node) : pointStart(node.children[0]) // Move back to before `] `. point.offset -= 2 point.column -= 2 diff --git a/packages/remark-lint-checkbox-character-style/package.json b/packages/remark-lint-checkbox-character-style/package.json index 9001ad8a..920d29cd 100644 --- a/packages/remark-lint-checkbox-character-style/package.json +++ b/packages/remark-lint-checkbox-character-style/package.json @@ -31,9 +31,9 @@ ], "dependencies": { "unified-lint-rule": "^1.0.0", - "unist-util-generated": "^1.1.0", - "unist-util-position": "^3.0.0", - "unist-util-visit": "^2.0.0" + "unist-util-generated": "^2.0.0", + "unist-util-position": "^4.0.0", + "unist-util-visit": "^4.0.0" }, "xo": false } diff --git a/packages/remark-lint-checkbox-content-indent/index.js b/packages/remark-lint-checkbox-content-indent/index.js index 71e39d59..ef3766e9 100644 --- a/packages/remark-lint-checkbox-content-indent/index.js +++ b/packages/remark-lint-checkbox-content-indent/index.js @@ -28,10 +28,10 @@ */ import {lintRule} from 'unified-lint-rule' -import vfileLocation from 'vfile-location' -import visit from 'unist-util-visit' -import position from 'unist-util-position' -import generated from 'unist-util-generated' +import {location} from 'vfile-location' +import {visit} from 'unist-util-visit' +import {pointStart, pointEnd} from 'unist-util-position' +import {generated} from 'unist-util-generated' const remarkLintCheckboxContentIndent = lintRule( 'remark-lint:checkbox-content-indent', @@ -40,14 +40,11 @@ const remarkLintCheckboxContentIndent = lintRule( export default remarkLintCheckboxContentIndent -var start = position.start -var end = position.end - var reason = 'Checkboxes should be followed by a single character' function checkboxContentIndent(tree, file) { var contents = String(file) - var location = vfileLocation(file) + var loc = location(file) visit(tree, 'listItem', visitor) @@ -65,7 +62,8 @@ function checkboxContentIndent(tree, file) { // A list item cannot be checked and empty, according to GFM, but // theoretically it makes sense to get the end if that were possible. /* c8 ignore next */ - point = node.children.length === 0 ? end(node) : start(node.children[0]) + point = + node.children.length === 0 ? pointEnd(node) : pointStart(node.children[0]) // Assume we start with a checkbox, because well, `checked` is set. value = /\[([\t xX])]/.exec( @@ -84,8 +82,8 @@ function checkboxContentIndent(tree, file) { if (final - initial > 0) { file.message(reason, { - start: location.toPosition(initial), - end: location.toPosition(final) + start: loc.toPoint(initial), + end: loc.toPoint(final) }) } } diff --git a/packages/remark-lint-checkbox-content-indent/package.json b/packages/remark-lint-checkbox-content-indent/package.json index 205cf344..5eb12bb8 100644 --- a/packages/remark-lint-checkbox-content-indent/package.json +++ b/packages/remark-lint-checkbox-content-indent/package.json @@ -31,10 +31,10 @@ ], "dependencies": { "unified-lint-rule": "^1.0.0", - "unist-util-generated": "^1.1.0", - "unist-util-position": "^3.0.0", - "unist-util-visit": "^2.0.0", - "vfile-location": "^3.0.0" + "unist-util-generated": "^2.0.0", + "unist-util-position": "^4.0.0", + "unist-util-visit": "^4.0.0", + "vfile-location": "^4.0.0" }, "xo": false } diff --git a/packages/remark-lint-code-block-style/index.js b/packages/remark-lint-code-block-style/index.js index 69962d36..99982bec 100644 --- a/packages/remark-lint-code-block-style/index.js +++ b/packages/remark-lint-code-block-style/index.js @@ -93,9 +93,9 @@ */ import {lintRule} from 'unified-lint-rule' -import visit from 'unist-util-visit' -import position from 'unist-util-position' -import generated from 'unist-util-generated' +import {visit} from 'unist-util-visit' +import {pointStart, pointEnd} from 'unist-util-position' +import {generated} from 'unist-util-generated' const remarkLintCodeBlockStyle = lintRule( 'remark-lint:code-block-style', @@ -104,9 +104,6 @@ const remarkLintCodeBlockStyle = lintRule( export default remarkLintCodeBlockStyle -var start = position.start -var end = position.end - var styles = {null: true, fenced: true, indented: true} function codeBlockStyle(tree, file, option) { @@ -133,8 +130,8 @@ function codeBlockStyle(tree, file, option) { return null } - initial = start(node).offset - final = end(node).offset + initial = pointStart(node).offset + final = pointEnd(node).offset current = node.lang || /^\s*([~`])\1{2,}/.test(contents.slice(initial, final)) diff --git a/packages/remark-lint-code-block-style/package.json b/packages/remark-lint-code-block-style/package.json index 904a0932..c0245c91 100644 --- a/packages/remark-lint-code-block-style/package.json +++ b/packages/remark-lint-code-block-style/package.json @@ -29,9 +29,9 @@ ], "dependencies": { "unified-lint-rule": "^1.0.0", - "unist-util-generated": "^1.1.0", - "unist-util-position": "^3.0.0", - "unist-util-visit": "^2.0.0" + "unist-util-generated": "^2.0.0", + "unist-util-position": "^4.0.0", + "unist-util-visit": "^4.0.0" }, "xo": false } diff --git a/packages/remark-lint-definition-case/index.js b/packages/remark-lint-definition-case/index.js index ea368a3b..39fb5c1c 100644 --- a/packages/remark-lint-definition-case/index.js +++ b/packages/remark-lint-definition-case/index.js @@ -20,9 +20,9 @@ */ import {lintRule} from 'unified-lint-rule' -import visit from 'unist-util-visit' -import position from 'unist-util-position' -import generated from 'unist-util-generated' +import {visit} from 'unist-util-visit' +import {pointStart, pointEnd} from 'unist-util-position' +import {generated} from 'unist-util-generated' const remarkLintDefinitionCase = lintRule( 'remark-lint:definition-case', @@ -40,8 +40,8 @@ function definitionCase(tree, file) { visit(tree, ['definition', 'footnoteDefinition'], check) function check(node) { - var start = position.start(node).offset - var end = position.end(node).offset + var start = pointStart(node).offset + var end = pointEnd(node).offset var value if (!generated(node)) { diff --git a/packages/remark-lint-definition-case/package.json b/packages/remark-lint-definition-case/package.json index 01925ea5..1e5a594a 100644 --- a/packages/remark-lint-definition-case/package.json +++ b/packages/remark-lint-definition-case/package.json @@ -29,9 +29,9 @@ ], "dependencies": { "unified-lint-rule": "^1.0.0", - "unist-util-generated": "^1.1.0", - "unist-util-position": "^3.0.0", - "unist-util-visit": "^2.0.0" + "unist-util-generated": "^2.0.0", + "unist-util-position": "^4.0.0", + "unist-util-visit": "^4.0.0" }, "xo": false } diff --git a/packages/remark-lint-definition-spacing/index.js b/packages/remark-lint-definition-spacing/index.js index ba9e71d8..20d5aed5 100644 --- a/packages/remark-lint-definition-spacing/index.js +++ b/packages/remark-lint-definition-spacing/index.js @@ -20,9 +20,9 @@ */ import {lintRule} from 'unified-lint-rule' -import visit from 'unist-util-visit' -import position from 'unist-util-position' -import generated from 'unist-util-generated' +import {visit} from 'unist-util-visit' +import {pointStart, pointEnd} from 'unist-util-position' +import {generated} from 'unist-util-generated' const remarkLintDefinitionSpacing = lintRule( 'remark-lint:definition-spacing', @@ -40,8 +40,8 @@ function definitionSpacing(tree, file) { visit(tree, ['definition', 'footnoteDefinition'], check) function check(node) { - var start = position.start(node).offset - var end = position.end(node).offset + var start = pointStart(node).offset + var end = pointEnd(node).offset if ( !generated(node) && diff --git a/packages/remark-lint-definition-spacing/package.json b/packages/remark-lint-definition-spacing/package.json index 5bbc2b18..5b5a9dca 100644 --- a/packages/remark-lint-definition-spacing/package.json +++ b/packages/remark-lint-definition-spacing/package.json @@ -29,9 +29,9 @@ ], "dependencies": { "unified-lint-rule": "^1.0.0", - "unist-util-generated": "^1.1.0", - "unist-util-position": "^3.0.0", - "unist-util-visit": "^2.0.0" + "unist-util-generated": "^2.0.0", + "unist-util-position": "^4.0.0", + "unist-util-visit": "^4.0.0" }, "xo": false } diff --git a/packages/remark-lint-emphasis-marker/index.js b/packages/remark-lint-emphasis-marker/index.js index 15158042..f6d480b1 100644 --- a/packages/remark-lint-emphasis-marker/index.js +++ b/packages/remark-lint-emphasis-marker/index.js @@ -61,9 +61,9 @@ */ import {lintRule} from 'unified-lint-rule' -import visit from 'unist-util-visit' -import position from 'unist-util-position' -import generated from 'unist-util-generated' +import {visit} from 'unist-util-visit' +import {pointStart} from 'unist-util-position' +import {generated} from 'unist-util-generated' const remarkLintEmphasisMarker = lintRule( 'remark-lint:emphasis-marker', @@ -93,7 +93,7 @@ function emphasisMarker(tree, file, option) { var marker if (!generated(node)) { - marker = contents.charAt(position.start(node).offset) + marker = contents.charAt(pointStart(node).offset) if (preferred) { if (marker !== preferred) { diff --git a/packages/remark-lint-emphasis-marker/package.json b/packages/remark-lint-emphasis-marker/package.json index c8139512..98d3da1a 100644 --- a/packages/remark-lint-emphasis-marker/package.json +++ b/packages/remark-lint-emphasis-marker/package.json @@ -29,9 +29,9 @@ ], "dependencies": { "unified-lint-rule": "^1.0.0", - "unist-util-generated": "^1.1.0", - "unist-util-position": "^3.0.0", - "unist-util-visit": "^2.0.0" + "unist-util-generated": "^2.0.0", + "unist-util-position": "^4.0.0", + "unist-util-visit": "^4.0.0" }, "xo": false } diff --git a/packages/remark-lint-fenced-code-flag/index.js b/packages/remark-lint-fenced-code-flag/index.js index 805ca933..6da302da 100644 --- a/packages/remark-lint-fenced-code-flag/index.js +++ b/packages/remark-lint-fenced-code-flag/index.js @@ -65,9 +65,9 @@ */ import {lintRule} from 'unified-lint-rule' -import visit from 'unist-util-visit' -import position from 'unist-util-position' -import generated from 'unist-util-generated' +import {visit} from 'unist-util-visit' +import {pointStart, pointEnd} from 'unist-util-position' +import {generated} from 'unist-util-generated' const remarkLintFencedCodeFlag = lintRule( 'remark-lint:fenced-code-flag', @@ -76,9 +76,6 @@ const remarkLintFencedCodeFlag = lintRule( export default remarkLintFencedCodeFlag -var start = position.start -var end = position.end - var fence = /^ {0,3}([~`])\1{2,}/ var reasonIncorrect = 'Incorrect code language flag' var reasonMissing = 'Missing code language flag' @@ -109,7 +106,7 @@ function fencedCodeFlag(tree, file, option) { file.message(reasonIncorrect, node) } } else { - value = contents.slice(start(node).offset, end(node).offset) + value = contents.slice(pointStart(node).offset, pointEnd(node).offset) if (!allowEmpty && fence.test(value)) { file.message(reasonMissing, node) diff --git a/packages/remark-lint-fenced-code-flag/package.json b/packages/remark-lint-fenced-code-flag/package.json index e6ab3a3b..19daa884 100644 --- a/packages/remark-lint-fenced-code-flag/package.json +++ b/packages/remark-lint-fenced-code-flag/package.json @@ -31,9 +31,9 @@ ], "dependencies": { "unified-lint-rule": "^1.0.0", - "unist-util-generated": "^1.1.0", - "unist-util-position": "^3.0.0", - "unist-util-visit": "^2.0.0" + "unist-util-generated": "^2.0.0", + "unist-util-position": "^4.0.0", + "unist-util-visit": "^4.0.0" }, "xo": false } diff --git a/packages/remark-lint-fenced-code-marker/index.js b/packages/remark-lint-fenced-code-marker/index.js index 59432415..d407b3ee 100644 --- a/packages/remark-lint-fenced-code-marker/index.js +++ b/packages/remark-lint-fenced-code-marker/index.js @@ -82,9 +82,9 @@ */ import {lintRule} from 'unified-lint-rule' -import visit from 'unist-util-visit' -import position from 'unist-util-position' -import generated from 'unist-util-generated' +import {visit} from 'unist-util-visit' +import {pointStart} from 'unist-util-position' +import {generated} from 'unist-util-generated' const remarkLintFencedCodeMarker = lintRule( 'remark-lint:fenced-code-marker', @@ -120,7 +120,7 @@ function fencedCodeMarker(tree, file, option) { var label if (!generated(node)) { - start = position.start(node).offset + start = pointStart(node).offset marker = contents .slice(start, start + 4) .replace(/^\s+/, '') diff --git a/packages/remark-lint-fenced-code-marker/package.json b/packages/remark-lint-fenced-code-marker/package.json index bf7adf11..c938c385 100644 --- a/packages/remark-lint-fenced-code-marker/package.json +++ b/packages/remark-lint-fenced-code-marker/package.json @@ -30,9 +30,9 @@ ], "dependencies": { "unified-lint-rule": "^1.0.0", - "unist-util-generated": "^1.1.0", - "unist-util-position": "^3.0.0", - "unist-util-visit": "^2.0.0" + "unist-util-generated": "^2.0.0", + "unist-util-position": "^4.0.0", + "unist-util-visit": "^4.0.0" }, "xo": false } diff --git a/packages/remark-lint-final-definition/index.js b/packages/remark-lint-final-definition/index.js index bcf95403..5ea1fabb 100644 --- a/packages/remark-lint-final-definition/index.js +++ b/packages/remark-lint-final-definition/index.js @@ -37,9 +37,9 @@ */ import {lintRule} from 'unified-lint-rule' -import visit from 'unist-util-visit' -import position from 'unist-util-position' -import generated from 'unist-util-generated' +import {visit} from 'unist-util-visit' +import {pointStart} from 'unist-util-position' +import {generated} from 'unist-util-generated' const remarkLintFinalDefinition = lintRule( 'remark-lint:final-definition', @@ -48,15 +48,13 @@ const remarkLintFinalDefinition = lintRule( export default remarkLintFinalDefinition -var start = position.start - function finalDefinition(tree, file) { var last = null visit(tree, visitor, true) function visitor(node) { - var line = start(node).line + var line = pointStart(node).line // Ignore generated and HTML comment nodes. if ( diff --git a/packages/remark-lint-final-definition/package.json b/packages/remark-lint-final-definition/package.json index 9f2ef386..665bf74b 100644 --- a/packages/remark-lint-final-definition/package.json +++ b/packages/remark-lint-final-definition/package.json @@ -30,9 +30,9 @@ ], "dependencies": { "unified-lint-rule": "^1.0.0", - "unist-util-generated": "^1.1.0", - "unist-util-position": "^3.0.0", - "unist-util-visit": "^2.0.0" + "unist-util-generated": "^2.0.0", + "unist-util-position": "^4.0.0", + "unist-util-visit": "^4.0.0" }, "xo": false } diff --git a/packages/remark-lint-first-heading-level/index.js b/packages/remark-lint-first-heading-level/index.js index 7a5984f6..57472c05 100644 --- a/packages/remark-lint-first-heading-level/index.js +++ b/packages/remark-lint-first-heading-level/index.js @@ -78,8 +78,8 @@ */ import {lintRule} from 'unified-lint-rule' -import visit from 'unist-util-visit' -import generated from 'unist-util-generated' +import {visit, EXIT} from 'unist-util-visit' +import {generated} from 'unist-util-generated' const remarkLintFirstHeadingLevel = lintRule( 'remark-lint:first-heading-level', @@ -113,7 +113,7 @@ function firstHeadingLevel(tree, file, option) { ) } - return visit.EXIT + return EXIT } } } diff --git a/packages/remark-lint-first-heading-level/package.json b/packages/remark-lint-first-heading-level/package.json index e0fb52f7..a8777a6d 100644 --- a/packages/remark-lint-first-heading-level/package.json +++ b/packages/remark-lint-first-heading-level/package.json @@ -31,8 +31,8 @@ ], "dependencies": { "unified-lint-rule": "^1.0.0", - "unist-util-generated": "^1.1.0", - "unist-util-visit": "^2.0.0" + "unist-util-generated": "^2.0.0", + "unist-util-visit": "^4.0.0" }, "xo": false } diff --git a/packages/remark-lint-hard-break-spaces/index.js b/packages/remark-lint-hard-break-spaces/index.js index 9b5404ab..6d61ee03 100644 --- a/packages/remark-lint-hard-break-spaces/index.js +++ b/packages/remark-lint-hard-break-spaces/index.js @@ -22,9 +22,9 @@ */ import {lintRule} from 'unified-lint-rule' -import visit from 'unist-util-visit' -import position from 'unist-util-position' -import generated from 'unist-util-generated' +import {visit} from 'unist-util-visit' +import {pointStart, pointEnd} from 'unist-util-position' +import {generated} from 'unist-util-generated' const remarkLintHardBreakSpaces = lintRule( 'remark-lint:hard-break-spaces', @@ -45,7 +45,7 @@ function hardBreakSpaces(tree, file) { if (!generated(node)) { value = contents - .slice(position.start(node).offset, position.end(node).offset) + .slice(pointStart(node).offset, pointEnd(node).offset) .split('\n', 1)[0] .replace(/\r$/, '') diff --git a/packages/remark-lint-hard-break-spaces/package.json b/packages/remark-lint-hard-break-spaces/package.json index 5f324dc3..d2d224d7 100644 --- a/packages/remark-lint-hard-break-spaces/package.json +++ b/packages/remark-lint-hard-break-spaces/package.json @@ -31,9 +31,9 @@ ], "dependencies": { "unified-lint-rule": "^1.0.0", - "unist-util-generated": "^1.1.0", - "unist-util-position": "^3.0.0", - "unist-util-visit": "^2.0.0" + "unist-util-generated": "^2.0.0", + "unist-util-position": "^4.0.0", + "unist-util-visit": "^4.0.0" }, "xo": false } diff --git a/packages/remark-lint-heading-increment/index.js b/packages/remark-lint-heading-increment/index.js index 82a0993b..4670df39 100644 --- a/packages/remark-lint-heading-increment/index.js +++ b/packages/remark-lint-heading-increment/index.js @@ -24,8 +24,8 @@ */ import {lintRule} from 'unified-lint-rule' -import visit from 'unist-util-visit' -import generated from 'unist-util-generated' +import {visit} from 'unist-util-visit' +import {generated} from 'unist-util-generated' const remarkLintHeadingIncrement = lintRule( 'remark-lint:heading-increment', diff --git a/packages/remark-lint-heading-increment/package.json b/packages/remark-lint-heading-increment/package.json index e9bbbf70..e42c774f 100644 --- a/packages/remark-lint-heading-increment/package.json +++ b/packages/remark-lint-heading-increment/package.json @@ -30,8 +30,8 @@ ], "dependencies": { "unified-lint-rule": "^1.0.0", - "unist-util-generated": "^1.1.0", - "unist-util-visit": "^2.0.0" + "unist-util-generated": "^2.0.0", + "unist-util-visit": "^4.0.0" }, "xo": false } diff --git a/packages/remark-lint-heading-style/index.js b/packages/remark-lint-heading-style/index.js index 5990e70a..06606471 100644 --- a/packages/remark-lint-heading-style/index.js +++ b/packages/remark-lint-heading-style/index.js @@ -67,9 +67,9 @@ */ import {lintRule} from 'unified-lint-rule' -import visit from 'unist-util-visit' -import headingStyle from 'mdast-util-heading-style' -import generated from 'unist-util-generated' +import {visit} from 'unist-util-visit' +import {headingStyle} from 'mdast-util-heading-style' +import {generated} from 'unist-util-generated' var types = ['atx', 'atx-closed', 'setext'] diff --git a/packages/remark-lint-heading-style/package.json b/packages/remark-lint-heading-style/package.json index 5a237c6c..ffc09200 100644 --- a/packages/remark-lint-heading-style/package.json +++ b/packages/remark-lint-heading-style/package.json @@ -30,10 +30,10 @@ "index.js" ], "dependencies": { - "mdast-util-heading-style": "^1.0.2", + "mdast-util-heading-style": "^2.0.0", "unified-lint-rule": "^1.0.0", - "unist-util-generated": "^1.1.0", - "unist-util-visit": "^2.0.0" + "unist-util-generated": "^2.0.0", + "unist-util-visit": "^4.0.0" }, "xo": false } diff --git a/packages/remark-lint-linebreak-style/index.js b/packages/remark-lint-linebreak-style/index.js index b3d335a8..08debcf0 100644 --- a/packages/remark-lint-linebreak-style/index.js +++ b/packages/remark-lint-linebreak-style/index.js @@ -46,7 +46,7 @@ */ import {lintRule} from 'unified-lint-rule' -import location from 'vfile-location' +import {location} from 'vfile-location' const remarkLintLinebreakStyle = lintRule( 'remark-lint:linebreak-style', @@ -62,7 +62,7 @@ function linebreakStyle(tree, file, option) { var preferred = typeof option === 'string' && option !== 'consistent' ? option : null var content = String(file) - var position = location(content).toPosition + var toPoint = location(content).toPoint var index = content.indexOf('\n') var type var reason @@ -83,7 +83,7 @@ function linebreakStyle(tree, file, option) { escaped[type] + '`)' - file.message(reason, position(index)) + file.message(reason, toPoint(index)) } } else { preferred = type diff --git a/packages/remark-lint-linebreak-style/package.json b/packages/remark-lint-linebreak-style/package.json index 0861e8ec..f776b353 100644 --- a/packages/remark-lint-linebreak-style/package.json +++ b/packages/remark-lint-linebreak-style/package.json @@ -34,7 +34,7 @@ ], "dependencies": { "unified-lint-rule": "^1.0.0", - "vfile-location": "^3.0.0" + "vfile-location": "^4.0.0" }, "xo": false } diff --git a/packages/remark-lint-link-title-style/index.js b/packages/remark-lint-link-title-style/index.js index 47d44d23..5f8dcbd1 100644 --- a/packages/remark-lint-link-title-style/index.js +++ b/packages/remark-lint-link-title-style/index.js @@ -87,10 +87,10 @@ */ import {lintRule} from 'unified-lint-rule' -import vfileLocation from 'vfile-location' -import visit from 'unist-util-visit' -import position from 'unist-util-position' -import generated from 'unist-util-generated' +import {location} from 'vfile-location' +import {visit} from 'unist-util-visit' +import {pointStart, pointEnd} from 'unist-util-position' +import {generated} from 'unist-util-generated' const remarkLintLinkTitleStyle = lintRule( 'remark-lint:link-title-style', @@ -101,9 +101,6 @@ export default remarkLintLinkTitleStyle var own = {}.hasOwnProperty -var start = position.start -var end = position.end - var markers = { '"': '"', "'": "'", @@ -112,7 +109,7 @@ var markers = { function linkTitleStyle(tree, file, option) { var contents = String(file) - var location = vfileLocation(file) + var loc = location(file) var preferred = typeof option === 'string' && option !== 'consistent' ? option : null @@ -143,9 +140,9 @@ function linkTitleStyle(tree, file, option) { return } - last = end(node).offset - 1 + last = pointEnd(node).offset - 1 tail = node.children ? node.children[node.children.length - 1] : null - begin = tail ? end(tail) : start(node) + begin = tail ? pointEnd(tail) : pointStart(node) if (node.type !== 'definition') { last-- @@ -188,8 +185,8 @@ function linkTitleStyle(tree, file, option) { '` as a quote' file.message(reason, { - start: location.toPosition(first), - end: location.toPosition(last + 1) + start: loc.toPoint(first), + end: loc.toPoint(last + 1) }) } } else { diff --git a/packages/remark-lint-link-title-style/package.json b/packages/remark-lint-link-title-style/package.json index 1ddccdeb..1f2f76d8 100644 --- a/packages/remark-lint-link-title-style/package.json +++ b/packages/remark-lint-link-title-style/package.json @@ -31,10 +31,10 @@ ], "dependencies": { "unified-lint-rule": "^1.0.0", - "unist-util-generated": "^1.1.0", - "unist-util-position": "^3.0.0", - "unist-util-visit": "^2.0.0", - "vfile-location": "^3.0.0" + "unist-util-generated": "^2.0.0", + "unist-util-position": "^4.0.0", + "unist-util-visit": "^4.0.0", + "vfile-location": "^4.0.0" }, "xo": false } diff --git a/packages/remark-lint-list-item-bullet-indent/index.js b/packages/remark-lint-list-item-bullet-indent/index.js index 10cb4a14..734d3488 100644 --- a/packages/remark-lint-list-item-bullet-indent/index.js +++ b/packages/remark-lint-list-item-bullet-indent/index.js @@ -36,8 +36,8 @@ import {lintRule} from 'unified-lint-rule' import plural from 'pluralize' -import visit from 'unist-util-visit' -import generated from 'unist-util-generated' +import {visit} from 'unist-util-visit' +import {generated} from 'unist-util-generated' const remarkLintListItemBulletIndent = lintRule( 'remark-lint:list-item-bullet-indent', diff --git a/packages/remark-lint-list-item-bullet-indent/package.json b/packages/remark-lint-list-item-bullet-indent/package.json index ece81e72..36566714 100644 --- a/packages/remark-lint-list-item-bullet-indent/package.json +++ b/packages/remark-lint-list-item-bullet-indent/package.json @@ -31,8 +31,8 @@ "dependencies": { "pluralize": "^8.0.0", "unified-lint-rule": "^1.0.0", - "unist-util-generated": "^1.1.0", - "unist-util-visit": "^2.0.0" + "unist-util-generated": "^2.0.0", + "unist-util-visit": "^4.0.0" }, "xo": false } diff --git a/packages/remark-lint-list-item-content-indent/index.js b/packages/remark-lint-list-item-content-indent/index.js index dff0861e..1b2a5a52 100644 --- a/packages/remark-lint-list-item-content-indent/index.js +++ b/packages/remark-lint-list-item-content-indent/index.js @@ -23,9 +23,9 @@ import {lintRule} from 'unified-lint-rule' import plural from 'pluralize' -import visit from 'unist-util-visit' -import position from 'unist-util-position' -import generated from 'unist-util-generated' +import {visit} from 'unist-util-visit' +import {pointStart} from 'unist-util-position' +import {generated} from 'unist-util-generated' const remarkLintListItemContentIndent = lintRule( 'remark-lint:list-item-content-indent', @@ -34,8 +34,6 @@ const remarkLintListItemContentIndent = lintRule( export default remarkLintListItemContentIndent -var start = position.start - function listItemContentIndent(tree, file) { var contents = String(file) @@ -58,7 +56,7 @@ function listItemContentIndent(tree, file) { return } - begin = start(item) + begin = pointStart(item) column = begin.column // Get indentation for the first child. Only the first item can have a @@ -97,7 +95,7 @@ function listItemContentIndent(tree, file) { plural('space', abs) file.message(reason, { - line: start(item).line, + line: pointStart(item).line, column: column }) } diff --git a/packages/remark-lint-list-item-content-indent/package.json b/packages/remark-lint-list-item-content-indent/package.json index 12506061..e1d24b7f 100644 --- a/packages/remark-lint-list-item-content-indent/package.json +++ b/packages/remark-lint-list-item-content-indent/package.json @@ -32,9 +32,9 @@ "dependencies": { "pluralize": "^8.0.0", "unified-lint-rule": "^1.0.0", - "unist-util-generated": "^1.1.0", - "unist-util-position": "^3.0.0", - "unist-util-visit": "^2.0.0" + "unist-util-generated": "^2.0.0", + "unist-util-position": "^4.0.0", + "unist-util-visit": "^4.0.0" }, "xo": false } diff --git a/packages/remark-lint-list-item-indent/index.js b/packages/remark-lint-list-item-indent/index.js index 028a0531..23b58e6b 100644 --- a/packages/remark-lint-list-item-indent/index.js +++ b/packages/remark-lint-list-item-indent/index.js @@ -105,9 +105,9 @@ import {lintRule} from 'unified-lint-rule' import plural from 'pluralize' -import visit from 'unist-util-visit' -import position from 'unist-util-position' -import generated from 'unist-util-generated' +import {visit} from 'unist-util-visit' +import {pointStart} from 'unist-util-position' +import {generated} from 'unist-util-generated' const remarkLintListItemIndent = lintRule( 'remark-lint:list-item-indent', @@ -116,8 +116,6 @@ const remarkLintListItemIndent = lintRule( export default remarkLintListItemIndent -var start = position.start - var styles = {'tab-size': true, mixed: true, space: true} function listItemIndent(tree, file, option) { @@ -143,7 +141,7 @@ function listItemIndent(tree, file, option) { function visitItem(item) { var head = item.children[0] - var final = start(head) + var final = pointStart(head) var marker var bulletSize var style @@ -152,7 +150,7 @@ function listItemIndent(tree, file, option) { var abs marker = contents - .slice(start(item).offset, final.offset) + .slice(pointStart(item).offset, final.offset) .replace(/\[[x ]?]\s*$/i, '') bulletSize = marker.replace(/\s+$/, '').length diff --git a/packages/remark-lint-list-item-indent/package.json b/packages/remark-lint-list-item-indent/package.json index f79c10bd..a79826df 100644 --- a/packages/remark-lint-list-item-indent/package.json +++ b/packages/remark-lint-list-item-indent/package.json @@ -31,9 +31,9 @@ "dependencies": { "pluralize": "^8.0.0", "unified-lint-rule": "^1.0.0", - "unist-util-generated": "^1.1.0", - "unist-util-position": "^3.0.0", - "unist-util-visit": "^2.0.0" + "unist-util-generated": "^2.0.0", + "unist-util-position": "^4.0.0", + "unist-util-visit": "^4.0.0" }, "xo": false } diff --git a/packages/remark-lint-list-item-spacing/index.js b/packages/remark-lint-list-item-spacing/index.js index 0843cb4f..a2651880 100644 --- a/packages/remark-lint-list-item-spacing/index.js +++ b/packages/remark-lint-list-item-spacing/index.js @@ -108,9 +108,9 @@ */ import {lintRule} from 'unified-lint-rule' -import visit from 'unist-util-visit' -import position from 'unist-util-position' -import generated from 'unist-util-generated' +import {visit} from 'unist-util-visit' +import {pointStart, pointEnd} from 'unist-util-position' +import {generated} from 'unist-util-generated' const remarkLintListItemSpacing = lintRule( 'remark-lint:list-item-spacing', @@ -119,9 +119,6 @@ const remarkLintListItemSpacing = lintRule( export default remarkLintListItemSpacing -var start = position.start -var end = position.end - var reasonLoose = 'Missing new line after list item' var reasonTight = 'Extraneous new line after list item' @@ -159,10 +156,10 @@ function listItemSpacing(tree, file, option) { while (++index < length) { next = children[index] - if (start(next).line - end(child).line < 2 !== tight) { + if (pointStart(next).line - pointEnd(child).line < 2 !== tight) { file.message(tight ? reasonTight : reasonLoose, { - start: end(child), - end: start(next) + start: pointEnd(child), + end: pointStart(next) }) } @@ -183,7 +180,7 @@ function inferBlankLine(node) { next = children[index] // All children in `listItem`s are block. - if (start(next).line - end(child).line > 1) { + if (pointStart(next).line - pointEnd(child).line > 1) { return true } @@ -195,5 +192,9 @@ function inferBlankLine(node) { function inferMultiline(node) { var children = node.children - return end(children[children.length - 1]).line - start(children[0]).line > 0 + return ( + pointEnd(children[children.length - 1]).line - + pointStart(children[0]).line > + 0 + ) } diff --git a/packages/remark-lint-list-item-spacing/package.json b/packages/remark-lint-list-item-spacing/package.json index 093cb9ee..71cfbd7b 100644 --- a/packages/remark-lint-list-item-spacing/package.json +++ b/packages/remark-lint-list-item-spacing/package.json @@ -31,9 +31,9 @@ ], "dependencies": { "unified-lint-rule": "^1.0.0", - "unist-util-generated": "^1.1.0", - "unist-util-position": "^3.0.0", - "unist-util-visit": "^2.0.0" + "unist-util-generated": "^2.0.0", + "unist-util-position": "^4.0.0", + "unist-util-visit": "^4.0.0" }, "xo": false } diff --git a/packages/remark-lint-maximum-heading-length/index.js b/packages/remark-lint-maximum-heading-length/index.js index a6e2bd30..20f186c8 100644 --- a/packages/remark-lint-maximum-heading-length/index.js +++ b/packages/remark-lint-maximum-heading-length/index.js @@ -26,9 +26,9 @@ */ import {lintRule} from 'unified-lint-rule' -import visit from 'unist-util-visit' -import generated from 'unist-util-generated' -import toString from 'mdast-util-to-string' +import {visit} from 'unist-util-visit' +import {generated} from 'unist-util-generated' +import {toString} from 'mdast-util-to-string' const remarkLintMaximumHeadingLength = lintRule( 'remark-lint:maximum-heading-length', diff --git a/packages/remark-lint-maximum-heading-length/package.json b/packages/remark-lint-maximum-heading-length/package.json index aaa48aac..4bd151e5 100644 --- a/packages/remark-lint-maximum-heading-length/package.json +++ b/packages/remark-lint-maximum-heading-length/package.json @@ -28,10 +28,10 @@ "index.js" ], "dependencies": { - "mdast-util-to-string": "^1.0.2", + "mdast-util-to-string": "^3.0.0", "unified-lint-rule": "^1.0.0", - "unist-util-generated": "^1.1.0", - "unist-util-visit": "^2.0.0" + "unist-util-generated": "^2.0.0", + "unist-util-visit": "^4.0.0" }, "xo": false } diff --git a/packages/remark-lint-maximum-line-length/index.js b/packages/remark-lint-maximum-line-length/index.js index 97ca1187..3f1940e6 100644 --- a/packages/remark-lint-maximum-line-length/index.js +++ b/packages/remark-lint-maximum-line-length/index.js @@ -91,9 +91,9 @@ */ import {lintRule} from 'unified-lint-rule' -import visit from 'unist-util-visit' -import position from 'unist-util-position' -import generated from 'unist-util-generated' +import {visit} from 'unist-util-visit' +import {pointStart, pointEnd} from 'unist-util-position' +import {generated} from 'unist-util-generated' const remarkLintMaximumLineLength = lintRule( 'remark-lint:maximum-line-length', @@ -102,9 +102,6 @@ const remarkLintMaximumLineLength = lintRule( export default remarkLintMaximumLineLength -var start = position.start -var end = position.end - function maximumLineLength(tree, file, option) { var preferred = typeof option === 'number' && !isNaN(option) ? option : 80 var content = String(file) @@ -148,8 +145,8 @@ function maximumLineLength(tree, file, option) { return } - initial = start(node) - final = end(node) + initial = pointStart(node) + final = pointEnd(node) // Not allowing when starting after the border, or ending before it. if (initial.column > preferred || final.column < preferred) { @@ -159,7 +156,7 @@ function maximumLineLength(tree, file, option) { // Not allowing when there’s whitespace after the link. if ( next && - start(next).line === initial.line && + pointStart(next).line === initial.line && (!next.value || /^(.+?[ \t].+?)/.test(next.value)) ) { return @@ -172,7 +169,7 @@ function maximumLineLength(tree, file, option) { // Hard to test, as we only run this case on `position: true`. /* c8 ignore next 3 */ if (!generated(node)) { - allowList(start(node).line - 1, end(node).line) + allowList(pointStart(node).line - 1, pointEnd(node).line) } } diff --git a/packages/remark-lint-maximum-line-length/package.json b/packages/remark-lint-maximum-line-length/package.json index a868fcfa..f369dbfa 100644 --- a/packages/remark-lint-maximum-line-length/package.json +++ b/packages/remark-lint-maximum-line-length/package.json @@ -29,9 +29,9 @@ ], "dependencies": { "unified-lint-rule": "^1.0.0", - "unist-util-generated": "^1.1.0", - "unist-util-position": "^3.0.0", - "unist-util-visit": "^2.0.0" + "unist-util-generated": "^2.0.0", + "unist-util-position": "^4.0.0", + "unist-util-visit": "^4.0.0" }, "xo": false } diff --git a/packages/remark-lint-no-auto-link-without-protocol/index.js b/packages/remark-lint-no-auto-link-without-protocol/index.js index c693afdf..3eeb83fb 100644 --- a/packages/remark-lint-no-auto-link-without-protocol/index.js +++ b/packages/remark-lint-no-auto-link-without-protocol/index.js @@ -34,10 +34,10 @@ */ import {lintRule} from 'unified-lint-rule' -import visit from 'unist-util-visit' -import position from 'unist-util-position' -import generated from 'unist-util-generated' -import toString from 'mdast-util-to-string' +import {visit} from 'unist-util-visit' +import {pointStart, pointEnd} from 'unist-util-position' +import {generated} from 'unist-util-generated' +import {toString} from 'mdast-util-to-string' const remarkLintNoAutoLinkWithoutProtocol = lintRule( 'remark-lint:no-auto-link-without-protocol', @@ -46,9 +46,6 @@ const remarkLintNoAutoLinkWithoutProtocol = lintRule( export default remarkLintNoAutoLinkWithoutProtocol -var start = position.start -var end = position.end - // Protocol expression. // See: . var protocol = /^[a-z][a-z+.-]+:\/?/i @@ -65,8 +62,9 @@ function noAutoLinkWithoutProtocol(tree, file) { children = node.children if ( - start(node).column === start(children[0]).column - 1 && - end(node).column === end(children[children.length - 1]).column + 1 && + pointStart(node).column === pointStart(children[0]).column - 1 && + pointEnd(node).column === + pointEnd(children[children.length - 1]).column + 1 && !protocol.test(toString(node)) ) { file.message(reason, node) diff --git a/packages/remark-lint-no-auto-link-without-protocol/package.json b/packages/remark-lint-no-auto-link-without-protocol/package.json index 77e40fd6..9be8aafe 100644 --- a/packages/remark-lint-no-auto-link-without-protocol/package.json +++ b/packages/remark-lint-no-auto-link-without-protocol/package.json @@ -29,11 +29,11 @@ "index.js" ], "dependencies": { - "mdast-util-to-string": "^1.0.2", + "mdast-util-to-string": "^3.0.0", "unified-lint-rule": "^1.0.0", - "unist-util-generated": "^1.1.0", - "unist-util-position": "^3.0.0", - "unist-util-visit": "^2.0.0" + "unist-util-generated": "^2.0.0", + "unist-util-position": "^4.0.0", + "unist-util-visit": "^4.0.0" }, "xo": false } diff --git a/packages/remark-lint-no-blockquote-without-marker/index.js b/packages/remark-lint-no-blockquote-without-marker/index.js index 7a5175da..03739b68 100644 --- a/packages/remark-lint-no-blockquote-without-marker/index.js +++ b/packages/remark-lint-no-blockquote-without-marker/index.js @@ -50,10 +50,10 @@ */ import {lintRule} from 'unified-lint-rule' -import vfileLocation from 'vfile-location' -import visit from 'unist-util-visit' -import position from 'unist-util-position' -import generated from 'unist-util-generated' +import {location} from 'vfile-location' +import {visit} from 'unist-util-visit' +import {pointStart, pointEnd} from 'unist-util-position' +import {generated} from 'unist-util-generated' const remarkLintNoBlockquoteWithoutMarker = lintRule( 'remark-lint:no-blockquote-without-marker', @@ -66,7 +66,7 @@ var reason = 'Missing marker in block quote' function noBlockquoteWithoutMarker(tree, file) { var contents = String(file) - var location = vfileLocation(file) + var loc = location(file) visit(tree, 'blockquote', visitor) @@ -77,13 +77,13 @@ function noBlockquoteWithoutMarker(tree, file) { var offset if (node.type === 'paragraph' && !generated(node)) { - line = position.start(node).line - end = position.end(node).line - column = position.start(node).column + line = pointStart(node).line + end = pointEnd(node).line + column = pointStart(node).column // Skip past the first line. while (++line <= end) { - offset = location.toOffset({line: line, column: column}) + offset = loc.toOffset({line: line, column: column}) if (/>[\t ]+$/.test(contents.slice(offset - 5, offset))) { continue diff --git a/packages/remark-lint-no-blockquote-without-marker/package.json b/packages/remark-lint-no-blockquote-without-marker/package.json index ff12d4c9..c9a71fae 100644 --- a/packages/remark-lint-no-blockquote-without-marker/package.json +++ b/packages/remark-lint-no-blockquote-without-marker/package.json @@ -30,10 +30,10 @@ ], "dependencies": { "unified-lint-rule": "^1.0.0", - "unist-util-generated": "^1.0.0", - "unist-util-position": "^3.0.0", - "unist-util-visit": "^2.0.0", - "vfile-location": "^3.0.0" + "unist-util-generated": "^2.0.0", + "unist-util-position": "^4.0.0", + "unist-util-visit": "^4.0.0", + "vfile-location": "^4.0.0" }, "xo": false } diff --git a/packages/remark-lint-no-consecutive-blank-lines/index.js b/packages/remark-lint-no-consecutive-blank-lines/index.js index 329089d8..433ea53a 100644 --- a/packages/remark-lint-no-consecutive-blank-lines/index.js +++ b/packages/remark-lint-no-consecutive-blank-lines/index.js @@ -42,9 +42,9 @@ import {lintRule} from 'unified-lint-rule' import plural from 'pluralize' -import visit from 'unist-util-visit' -import position from 'unist-util-position' -import generated from 'unist-util-generated' +import {visit} from 'unist-util-visit' +import {pointStart, pointEnd} from 'unist-util-position' +import {generated} from 'unist-util-generated' const remarkLintNoConsecutiveBlankLines = lintRule( 'remark-lint:no-consecutive-blank-lines', @@ -66,7 +66,7 @@ function noConsecutiveBlankLines(tree, file) { if (head && !generated(head)) { // Compare parent and first child. - compare(position.start(node), position.start(head), 0) + compare(pointStart(node), pointStart(head), 0) // Compare between each child. children.forEach(visitChild) @@ -75,7 +75,7 @@ function noConsecutiveBlankLines(tree, file) { // Compare parent and last child. if (tail !== head && !generated(tail)) { - compare(position.end(node), position.end(tail), 1) + compare(pointEnd(node), pointEnd(tail), 1) } } } @@ -106,7 +106,7 @@ function noConsecutiveBlankLines(tree, file) { var previous = all[index - 1] if (previous && !generated(previous) && !generated(child)) { - compare(position.end(previous), position.start(child), 2) + compare(pointEnd(previous), pointStart(child), 2) } } } diff --git a/packages/remark-lint-no-consecutive-blank-lines/package.json b/packages/remark-lint-no-consecutive-blank-lines/package.json index dc738122..36d79ad8 100644 --- a/packages/remark-lint-no-consecutive-blank-lines/package.json +++ b/packages/remark-lint-no-consecutive-blank-lines/package.json @@ -30,9 +30,9 @@ "dependencies": { "pluralize": "^8.0.0", "unified-lint-rule": "^1.0.0", - "unist-util-generated": "^1.1.0", - "unist-util-position": "^3.0.0", - "unist-util-visit": "^2.0.0" + "unist-util-generated": "^2.0.0", + "unist-util-position": "^4.0.0", + "unist-util-visit": "^4.0.0" }, "xo": false } diff --git a/packages/remark-lint-no-duplicate-defined-urls/index.js b/packages/remark-lint-no-duplicate-defined-urls/index.js index 40aa638d..53cf258c 100644 --- a/packages/remark-lint-no-duplicate-defined-urls/index.js +++ b/packages/remark-lint-no-duplicate-defined-urls/index.js @@ -22,10 +22,10 @@ */ import {lintRule} from 'unified-lint-rule' -import position from 'unist-util-position' -import generated from 'unist-util-generated' -import stringify from 'unist-util-stringify-position' -import visit from 'unist-util-visit' +import {pointStart} from 'unist-util-position' +import {generated} from 'unist-util-generated' +import {stringifyPosition} from 'unist-util-stringify-position' +import {visit} from 'unist-util-visit' const remarkLintNoDuplicateDefinedUrls = lintRule( 'remark-lint:no-duplicate-defined-urls', @@ -51,7 +51,7 @@ function noDuplicateDefinedUrls(tree, file) { if (duplicate && duplicate.type) { file.message( - reason + ' (' + stringify(position.start(duplicate)) + ')', + reason + ' (' + stringifyPosition(pointStart(duplicate)) + ')', node ) } diff --git a/packages/remark-lint-no-duplicate-defined-urls/package.json b/packages/remark-lint-no-duplicate-defined-urls/package.json index 3a51bbe6..f27c93db 100644 --- a/packages/remark-lint-no-duplicate-defined-urls/package.json +++ b/packages/remark-lint-no-duplicate-defined-urls/package.json @@ -30,10 +30,10 @@ ], "dependencies": { "unified-lint-rule": "^1.0.0", - "unist-util-generated": "^1.0.0", - "unist-util-position": "^3.0.0", - "unist-util-stringify-position": "^2.0.0", - "unist-util-visit": "^2.0.0" + "unist-util-generated": "^2.0.0", + "unist-util-position": "^4.0.0", + "unist-util-stringify-position": "^3.0.0", + "unist-util-visit": "^4.0.0" }, "xo": false } diff --git a/packages/remark-lint-no-duplicate-definitions/index.js b/packages/remark-lint-no-duplicate-definitions/index.js index 709b9c73..b3a0abea 100644 --- a/packages/remark-lint-no-duplicate-definitions/index.js +++ b/packages/remark-lint-no-duplicate-definitions/index.js @@ -22,10 +22,10 @@ */ import {lintRule} from 'unified-lint-rule' -import position from 'unist-util-position' -import generated from 'unist-util-generated' -import stringify from 'unist-util-stringify-position' -import visit from 'unist-util-visit' +import {pointStart} from 'unist-util-position' +import {generated} from 'unist-util-generated' +import {stringifyPosition} from 'unist-util-stringify-position' +import {visit} from 'unist-util-visit' const remarkLintNoDuplicateDefinitions = lintRule( 'remark-lint:no-duplicate-definitions', @@ -51,7 +51,7 @@ function noDuplicateDefinitions(tree, file) { if (duplicate && duplicate.type) { file.message( - reason + ' (' + stringify(position.start(duplicate)) + ')', + reason + ' (' + stringifyPosition(pointStart(duplicate)) + ')', node ) } diff --git a/packages/remark-lint-no-duplicate-definitions/package.json b/packages/remark-lint-no-duplicate-definitions/package.json index c3b41158..8fbdde23 100644 --- a/packages/remark-lint-no-duplicate-definitions/package.json +++ b/packages/remark-lint-no-duplicate-definitions/package.json @@ -29,10 +29,10 @@ ], "dependencies": { "unified-lint-rule": "^1.0.0", - "unist-util-generated": "^1.1.0", - "unist-util-position": "^3.0.0", - "unist-util-stringify-position": "^2.0.0", - "unist-util-visit": "^2.0.0" + "unist-util-generated": "^2.0.0", + "unist-util-position": "^4.0.0", + "unist-util-stringify-position": "^3.0.0", + "unist-util-visit": "^4.0.0" }, "xo": false } diff --git a/packages/remark-lint-no-duplicate-headings-in-section/index.js b/packages/remark-lint-no-duplicate-headings-in-section/index.js index 97018c6b..084be1f9 100644 --- a/packages/remark-lint-no-duplicate-headings-in-section/index.js +++ b/packages/remark-lint-no-duplicate-headings-in-section/index.js @@ -55,11 +55,11 @@ */ import {lintRule} from 'unified-lint-rule' -import position from 'unist-util-position' -import generated from 'unist-util-generated' -import visit from 'unist-util-visit' -import stringify from 'unist-util-stringify-position' -import toString from 'mdast-util-to-string' +import {pointStart} from 'unist-util-position' +import {generated} from 'unist-util-generated' +import {visit} from 'unist-util-visit' +import {stringifyPosition} from 'unist-util-stringify-position' +import {toString} from 'mdast-util-to-string' const remarkLintNoDuplicateHeadingsInSection = lintRule( 'remark-lint:no-duplicate-headings-in-section', @@ -84,7 +84,7 @@ function noDuplicateHeadingsInSection(tree, file) { if (!generated(node) && duplicate) { file.message( - reason + ' (' + stringify(position.start(duplicate)) + ')', + reason + ' (' + stringifyPosition(pointStart(duplicate)) + ')', node ) } diff --git a/packages/remark-lint-no-duplicate-headings-in-section/package.json b/packages/remark-lint-no-duplicate-headings-in-section/package.json index ffb18e4c..d622e93a 100644 --- a/packages/remark-lint-no-duplicate-headings-in-section/package.json +++ b/packages/remark-lint-no-duplicate-headings-in-section/package.json @@ -29,12 +29,12 @@ "index.js" ], "dependencies": { - "mdast-util-to-string": "^1.0.2", + "mdast-util-to-string": "^3.0.0", "unified-lint-rule": "^1.0.0", - "unist-util-generated": "^1.1.0", - "unist-util-position": "^3.0.0", - "unist-util-stringify-position": "^2.0.0", - "unist-util-visit": "^2.0.0" + "unist-util-generated": "^2.0.0", + "unist-util-position": "^4.0.0", + "unist-util-stringify-position": "^3.0.0", + "unist-util-visit": "^4.0.0" }, "xo": false } diff --git a/packages/remark-lint-no-duplicate-headings/index.js b/packages/remark-lint-no-duplicate-headings/index.js index 5081b1a2..d309683f 100644 --- a/packages/remark-lint-no-duplicate-headings/index.js +++ b/packages/remark-lint-no-duplicate-headings/index.js @@ -27,11 +27,11 @@ */ import {lintRule} from 'unified-lint-rule' -import position from 'unist-util-position' -import generated from 'unist-util-generated' -import visit from 'unist-util-visit' -import stringify from 'unist-util-stringify-position' -import toString from 'mdast-util-to-string' +import {pointStart} from 'unist-util-position' +import {generated} from 'unist-util-generated' +import {visit} from 'unist-util-visit' +import {stringifyPosition} from 'unist-util-stringify-position' +import {toString} from 'mdast-util-to-string' const remarkLintNoDuplicateHeadings = lintRule( 'remark-lint:no-duplicate-headings', @@ -57,7 +57,7 @@ function noDuplicateHeadings(tree, file) { if (duplicate && duplicate.type === 'heading') { file.message( - reason + ' (' + stringify(position.start(duplicate)) + ')', + reason + ' (' + stringifyPosition(pointStart(duplicate)) + ')', node ) } diff --git a/packages/remark-lint-no-duplicate-headings/package.json b/packages/remark-lint-no-duplicate-headings/package.json index 9c904e28..34e889b7 100644 --- a/packages/remark-lint-no-duplicate-headings/package.json +++ b/packages/remark-lint-no-duplicate-headings/package.json @@ -28,12 +28,12 @@ "index.js" ], "dependencies": { - "mdast-util-to-string": "^1.0.2", + "mdast-util-to-string": "^3.0.0", "unified-lint-rule": "^1.0.0", - "unist-util-generated": "^1.1.0", - "unist-util-position": "^3.0.0", - "unist-util-stringify-position": "^2.0.0", - "unist-util-visit": "^2.0.0" + "unist-util-generated": "^2.0.0", + "unist-util-position": "^4.0.0", + "unist-util-stringify-position": "^3.0.0", + "unist-util-visit": "^4.0.0" }, "xo": false } diff --git a/packages/remark-lint-no-emphasis-as-heading/index.js b/packages/remark-lint-no-emphasis-as-heading/index.js index 01665955..cdce5fe0 100644 --- a/packages/remark-lint-no-emphasis-as-heading/index.js +++ b/packages/remark-lint-no-emphasis-as-heading/index.js @@ -30,8 +30,8 @@ */ import {lintRule} from 'unified-lint-rule' -import visit from 'unist-util-visit' -import generated from 'unist-util-generated' +import {visit} from 'unist-util-visit' +import {generated} from 'unist-util-generated' const remarkLintNoEmphasisAsHeading = lintRule( 'remark-lint:no-emphasis-as-heading', diff --git a/packages/remark-lint-no-emphasis-as-heading/package.json b/packages/remark-lint-no-emphasis-as-heading/package.json index 53c0c2f9..957d1010 100644 --- a/packages/remark-lint-no-emphasis-as-heading/package.json +++ b/packages/remark-lint-no-emphasis-as-heading/package.json @@ -29,8 +29,8 @@ ], "dependencies": { "unified-lint-rule": "^1.0.0", - "unist-util-generated": "^1.1.0", - "unist-util-visit": "^2.0.0" + "unist-util-generated": "^2.0.0", + "unist-util-visit": "^4.0.0" }, "xo": false } diff --git a/packages/remark-lint-no-empty-url/index.js b/packages/remark-lint-no-empty-url/index.js index 5fd06b9c..b2f94cb6 100644 --- a/packages/remark-lint-no-empty-url/index.js +++ b/packages/remark-lint-no-empty-url/index.js @@ -25,8 +25,8 @@ */ import {lintRule} from 'unified-lint-rule' -import visit from 'unist-util-visit' -import generated from 'unist-util-generated' +import {visit} from 'unist-util-visit' +import {generated} from 'unist-util-generated' const remarkLintNoEmptyUrl = lintRule('remark-lint:no-empty-url', noEmptyURL) diff --git a/packages/remark-lint-no-empty-url/package.json b/packages/remark-lint-no-empty-url/package.json index ea3b1341..40c967cd 100644 --- a/packages/remark-lint-no-empty-url/package.json +++ b/packages/remark-lint-no-empty-url/package.json @@ -31,8 +31,8 @@ ], "dependencies": { "unified-lint-rule": "^1.0.0", - "unist-util-generated": "^1.1.0", - "unist-util-visit": "^2.0.0" + "unist-util-generated": "^2.0.0", + "unist-util-visit": "^4.0.0" }, "xo": false } diff --git a/packages/remark-lint-no-heading-content-indent/index.js b/packages/remark-lint-no-heading-content-indent/index.js index 25777dc5..cafd3f88 100644 --- a/packages/remark-lint-no-heading-content-indent/index.js +++ b/packages/remark-lint-no-heading-content-indent/index.js @@ -47,11 +47,11 @@ */ import {lintRule} from 'unified-lint-rule' -import visit from 'unist-util-visit' -import headingStyle from 'mdast-util-heading-style' +import {visit} from 'unist-util-visit' +import {headingStyle} from 'mdast-util-heading-style' import plural from 'pluralize' -import position from 'unist-util-position' -import generated from 'unist-util-generated' +import {pointStart, pointEnd} from 'unist-util-position' +import {generated} from 'unist-util-generated' const remarkLintNoHeadingContentIndent = lintRule( 'remark-lint:no-heading-content-indent', @@ -60,9 +60,6 @@ const remarkLintNoHeadingContentIndent = lintRule( export default remarkLintNoHeadingContentIndent -var start = position.start -var end = position.end - function noHeadingContentIndent(tree, file) { visit(tree, 'heading', visitor) @@ -85,14 +82,14 @@ function noHeadingContentIndent(tree, file) { type = headingStyle(node, 'atx') if (type === 'atx' || type === 'atx-closed') { - head = start(children[0]).column + head = pointStart(children[0]).column // Ignore empty headings. if (!head) { return } - diff = head - start(node).column - 1 - depth + diff = head - pointStart(node).column - 1 - depth if (diff) { abs = Math.abs(diff) @@ -104,15 +101,15 @@ function noHeadingContentIndent(tree, file) { plural('space', abs) + ' before this heading’s content' - file.message(reason, start(children[0])) + file.message(reason, pointStart(children[0])) } } // Closed ATX headings always must have a space between their content and // the final hashes, thus, there is no `add x spaces`. if (type === 'atx-closed') { - final = end(children[children.length - 1]) - diff = end(node).column - final.column - 1 - depth + final = pointEnd(children[children.length - 1]) + diff = pointEnd(node).column - final.column - 1 - depth if (diff) { reason = diff --git a/packages/remark-lint-no-heading-content-indent/package.json b/packages/remark-lint-no-heading-content-indent/package.json index adf470d2..08e63128 100644 --- a/packages/remark-lint-no-heading-content-indent/package.json +++ b/packages/remark-lint-no-heading-content-indent/package.json @@ -29,12 +29,12 @@ "index.js" ], "dependencies": { - "mdast-util-heading-style": "^1.0.2", + "mdast-util-heading-style": "^2.0.0", "pluralize": "^8.0.0", "unified-lint-rule": "^1.0.0", - "unist-util-generated": "^1.1.0", - "unist-util-position": "^3.0.0", - "unist-util-visit": "^2.0.0" + "unist-util-generated": "^2.0.0", + "unist-util-position": "^4.0.0", + "unist-util-visit": "^4.0.0" }, "xo": false } diff --git a/packages/remark-lint-no-heading-indent/index.js b/packages/remark-lint-no-heading-indent/index.js index 738ee0fc..021c2dd7 100644 --- a/packages/remark-lint-no-heading-indent/index.js +++ b/packages/remark-lint-no-heading-indent/index.js @@ -48,9 +48,9 @@ import {lintRule} from 'unified-lint-rule' import plural from 'pluralize' -import visit from 'unist-util-visit' -import position from 'unist-util-position' -import generated from 'unist-util-generated' +import {visit} from 'unist-util-visit' +import {pointStart} from 'unist-util-position' +import {generated} from 'unist-util-generated' const remarkLintNoHeadingIndent = lintRule( 'remark-lint:no-heading-indent', @@ -59,8 +59,6 @@ const remarkLintNoHeadingIndent = lintRule( export default remarkLintNoHeadingIndent -var start = position.start - function noHeadingIndent(tree, file) { visit(tree, 'heading', visitor) @@ -73,12 +71,12 @@ function noHeadingIndent(tree, file) { return } - diff = start(node).column - 1 + diff = pointStart(node).column - 1 if (diff) { file.message( 'Remove ' + diff + ' ' + plural('space', diff) + ' before this heading', - start(node) + pointStart(node) ) } } diff --git a/packages/remark-lint-no-heading-indent/package.json b/packages/remark-lint-no-heading-indent/package.json index daee2ea1..37258a16 100644 --- a/packages/remark-lint-no-heading-indent/package.json +++ b/packages/remark-lint-no-heading-indent/package.json @@ -30,9 +30,9 @@ "dependencies": { "pluralize": "^8.0.0", "unified-lint-rule": "^1.0.0", - "unist-util-generated": "^1.1.0", - "unist-util-position": "^3.0.0", - "unist-util-visit": "^2.0.0" + "unist-util-generated": "^2.0.0", + "unist-util-position": "^4.0.0", + "unist-util-visit": "^4.0.0" }, "xo": false } diff --git a/packages/remark-lint-no-heading-like-paragraph/index.js b/packages/remark-lint-no-heading-like-paragraph/index.js index 720964e4..8c8b57d9 100644 --- a/packages/remark-lint-no-heading-like-paragraph/index.js +++ b/packages/remark-lint-no-heading-like-paragraph/index.js @@ -24,8 +24,8 @@ */ import {lintRule} from 'unified-lint-rule' -import visit from 'unist-util-visit' -import generated from 'unist-util-generated' +import {visit} from 'unist-util-visit' +import {generated} from 'unist-util-generated' const remarkLintNoHeadingLikeParagraph = lintRule( 'remark-lint:no-heading-like-paragraph', diff --git a/packages/remark-lint-no-heading-like-paragraph/package.json b/packages/remark-lint-no-heading-like-paragraph/package.json index 271ad8a1..ac4512e3 100644 --- a/packages/remark-lint-no-heading-like-paragraph/package.json +++ b/packages/remark-lint-no-heading-like-paragraph/package.json @@ -29,8 +29,8 @@ ], "dependencies": { "unified-lint-rule": "^1.0.0", - "unist-util-generated": "^1.1.0", - "unist-util-visit": "^2.0.0" + "unist-util-generated": "^2.0.0", + "unist-util-visit": "^4.0.0" }, "xo": false } diff --git a/packages/remark-lint-no-heading-punctuation/index.js b/packages/remark-lint-no-heading-punctuation/index.js index 632a7ca6..642f4f2d 100644 --- a/packages/remark-lint-no-heading-punctuation/index.js +++ b/packages/remark-lint-no-heading-punctuation/index.js @@ -41,9 +41,9 @@ */ import {lintRule} from 'unified-lint-rule' -import visit from 'unist-util-visit' -import generated from 'unist-util-generated' -import toString from 'mdast-util-to-string' +import {visit} from 'unist-util-visit' +import {generated} from 'unist-util-generated' +import {toString} from 'mdast-util-to-string' const remarkLintNoHeadingPunctuation = lintRule( 'remark-lint:no-heading-punctuation', diff --git a/packages/remark-lint-no-heading-punctuation/package.json b/packages/remark-lint-no-heading-punctuation/package.json index 93faf51b..d817d7b4 100644 --- a/packages/remark-lint-no-heading-punctuation/package.json +++ b/packages/remark-lint-no-heading-punctuation/package.json @@ -29,9 +29,9 @@ ], "dependencies": { "unified-lint-rule": "^1.0.0", - "mdast-util-to-string": "^1.0.2", - "unist-util-generated": "^1.1.0", - "unist-util-visit": "^2.0.0" + "mdast-util-to-string": "^3.0.0", + "unist-util-generated": "^2.0.0", + "unist-util-visit": "^4.0.0" }, "xo": false } diff --git a/packages/remark-lint-no-html/index.js b/packages/remark-lint-no-html/index.js index 48c89648..b537fc01 100644 --- a/packages/remark-lint-no-html/index.js +++ b/packages/remark-lint-no-html/index.js @@ -25,8 +25,8 @@ */ import {lintRule} from 'unified-lint-rule' -import visit from 'unist-util-visit' -import generated from 'unist-util-generated' +import {visit} from 'unist-util-visit' +import {generated} from 'unist-util-generated' const remarkLintNoHtml = lintRule('remark-lint:no-html', noHTML) diff --git a/packages/remark-lint-no-html/package.json b/packages/remark-lint-no-html/package.json index ca316d0f..6dd7d79b 100644 --- a/packages/remark-lint-no-html/package.json +++ b/packages/remark-lint-no-html/package.json @@ -28,8 +28,8 @@ ], "dependencies": { "unified-lint-rule": "^1.0.0", - "unist-util-generated": "^1.1.0", - "unist-util-visit": "^2.0.0" + "unist-util-generated": "^2.0.0", + "unist-util-visit": "^4.0.0" }, "xo": false } diff --git a/packages/remark-lint-no-inline-padding/index.js b/packages/remark-lint-no-inline-padding/index.js index 8e1504e5..36559a95 100644 --- a/packages/remark-lint-no-inline-padding/index.js +++ b/packages/remark-lint-no-inline-padding/index.js @@ -23,9 +23,9 @@ */ import {lintRule} from 'unified-lint-rule' -import visit from 'unist-util-visit' -import generated from 'unist-util-generated' -import toString from 'mdast-util-to-string' +import {visit} from 'unist-util-visit' +import {generated} from 'unist-util-generated' +import {toString} from 'mdast-util-to-string' const remarkLintNoInlinePadding = lintRule( 'remark-lint:no-inline-padding', diff --git a/packages/remark-lint-no-inline-padding/package.json b/packages/remark-lint-no-inline-padding/package.json index cf021913..ef78e06a 100644 --- a/packages/remark-lint-no-inline-padding/package.json +++ b/packages/remark-lint-no-inline-padding/package.json @@ -28,10 +28,10 @@ "index.js" ], "dependencies": { - "mdast-util-to-string": "^1.0.2", + "mdast-util-to-string": "^3.0.0", "unified-lint-rule": "^1.0.0", - "unist-util-generated": "^1.1.0", - "unist-util-visit": "^2.0.0" + "unist-util-generated": "^2.0.0", + "unist-util-visit": "^4.0.0" }, "xo": false } diff --git a/packages/remark-lint-no-literal-urls/index.js b/packages/remark-lint-no-literal-urls/index.js index 884d3a42..bf818286 100644 --- a/packages/remark-lint-no-literal-urls/index.js +++ b/packages/remark-lint-no-literal-urls/index.js @@ -32,10 +32,10 @@ */ import {lintRule} from 'unified-lint-rule' -import visit from 'unist-util-visit' -import position from 'unist-util-position' -import generated from 'unist-util-generated' -import toString from 'mdast-util-to-string' +import {visit} from 'unist-util-visit' +import {pointStart, pointEnd} from 'unist-util-position' +import {generated} from 'unist-util-generated' +import {toString} from 'mdast-util-to-string' const remarkLintNoLiteralUrls = lintRule( 'remark-lint:no-literal-urls', @@ -44,8 +44,6 @@ const remarkLintNoLiteralUrls = lintRule( export default remarkLintNoLiteralUrls -var start = position.start -var end = position.end var mailto = 'mailto:' var reason = 'Don’t use literal URLs without angle brackets' @@ -58,8 +56,9 @@ function noLiteralURLs(tree, file) { if ( !generated(node) && - start(node).column === start(children[0]).column && - end(node).column === end(children[children.length - 1]).column && + pointStart(node).column === pointStart(children[0]).column && + pointEnd(node).column === + pointEnd(children[children.length - 1]).column && (node.url === mailto + value || node.url === value) ) { file.message(reason, node) diff --git a/packages/remark-lint-no-literal-urls/package.json b/packages/remark-lint-no-literal-urls/package.json index 1bf11a8b..c0b870cc 100644 --- a/packages/remark-lint-no-literal-urls/package.json +++ b/packages/remark-lint-no-literal-urls/package.json @@ -28,11 +28,11 @@ "index.js" ], "dependencies": { - "mdast-util-to-string": "^1.0.2", + "mdast-util-to-string": "^3.0.0", "unified-lint-rule": "^1.0.0", - "unist-util-generated": "^1.1.0", - "unist-util-position": "^3.0.0", - "unist-util-visit": "^2.0.0" + "unist-util-generated": "^2.0.0", + "unist-util-position": "^4.0.0", + "unist-util-visit": "^4.0.0" }, "xo": false } diff --git a/packages/remark-lint-no-missing-blank-lines/index.js b/packages/remark-lint-no-missing-blank-lines/index.js index 32bf63ea..ee5283b6 100644 --- a/packages/remark-lint-no-missing-blank-lines/index.js +++ b/packages/remark-lint-no-missing-blank-lines/index.js @@ -64,9 +64,9 @@ */ import {lintRule} from 'unified-lint-rule' -import visit from 'unist-util-visit' -import position from 'unist-util-position' -import generated from 'unist-util-generated' +import {visit} from 'unist-util-visit' +import {pointStart, pointEnd} from 'unist-util-position' +import {generated} from 'unist-util-generated' const remarkLintNoMissingBlankLines = lintRule( 'remark-lint:no-missing-blank-lines', @@ -107,7 +107,7 @@ function noMissingBlankLines(tree, file, option) { if ( next && types.indexOf(next.type) !== -1 && - position.start(next).line === position.end(node).line + 1 + pointStart(next).line === pointEnd(node).line + 1 ) { file.message(reason, next) } diff --git a/packages/remark-lint-no-missing-blank-lines/package.json b/packages/remark-lint-no-missing-blank-lines/package.json index afc90fbf..3ef35508 100644 --- a/packages/remark-lint-no-missing-blank-lines/package.json +++ b/packages/remark-lint-no-missing-blank-lines/package.json @@ -29,9 +29,9 @@ ], "dependencies": { "unified-lint-rule": "^1.0.0", - "unist-util-generated": "^1.1.0", - "unist-util-position": "^3.0.0", - "unist-util-visit": "^2.0.0" + "unist-util-generated": "^2.0.0", + "unist-util-position": "^4.0.0", + "unist-util-visit": "^4.0.0" }, "xo": false } diff --git a/packages/remark-lint-no-multiple-toplevel-headings/index.js b/packages/remark-lint-no-multiple-toplevel-headings/index.js index 95d7928b..fdd0e9ab 100644 --- a/packages/remark-lint-no-multiple-toplevel-headings/index.js +++ b/packages/remark-lint-no-multiple-toplevel-headings/index.js @@ -26,10 +26,10 @@ */ import {lintRule} from 'unified-lint-rule' -import visit from 'unist-util-visit' -import position from 'unist-util-position' -import generated from 'unist-util-generated' -import stringify from 'unist-util-stringify-position' +import {visit} from 'unist-util-visit' +import {pointStart} from 'unist-util-position' +import {generated} from 'unist-util-generated' +import {stringifyPosition} from 'unist-util-stringify-position' const remarkLintNoMultipleToplevelHeadings = lintRule( 'remark-lint:no-multiple-toplevel-headings', @@ -52,7 +52,7 @@ function noMultipleToplevelHeadings(tree, file, option) { node ) } else { - duplicate = stringify(position.start(node)) + duplicate = stringifyPosition(pointStart(node)) } } } diff --git a/packages/remark-lint-no-multiple-toplevel-headings/package.json b/packages/remark-lint-no-multiple-toplevel-headings/package.json index 1ae13732..dc8f4562 100644 --- a/packages/remark-lint-no-multiple-toplevel-headings/package.json +++ b/packages/remark-lint-no-multiple-toplevel-headings/package.json @@ -29,10 +29,10 @@ ], "dependencies": { "unified-lint-rule": "^1.0.0", - "unist-util-generated": "^1.1.0", - "unist-util-position": "^3.0.0", - "unist-util-stringify-position": "^2.0.0", - "unist-util-visit": "^2.0.0" + "unist-util-generated": "^2.0.0", + "unist-util-position": "^4.0.0", + "unist-util-stringify-position": "^3.0.0", + "unist-util-visit": "^4.0.0" }, "xo": false } diff --git a/packages/remark-lint-no-paragraph-content-indent/index.js b/packages/remark-lint-no-paragraph-content-indent/index.js index e9b55c59..7dcfd683 100644 --- a/packages/remark-lint-no-paragraph-content-indent/index.js +++ b/packages/remark-lint-no-paragraph-content-indent/index.js @@ -72,9 +72,9 @@ */ import {lintRule} from 'unified-lint-rule' -import visit from 'unist-util-visit' -import position from 'unist-util-position' -import vfileLocation from 'vfile-location' +import {visit, SKIP} from 'unist-util-visit' +import {pointStart, pointEnd} from 'unist-util-position' +import {location} from 'vfile-location' const remarkLintNoParagraphContentIndent = lintRule( 'remark-lint:no-paragraph-content-indent', @@ -87,13 +87,13 @@ var reason = 'Expected no indentation in paragraph content' function noParagraphContentIndent(tree, file) { var content = String(file) - var location = vfileLocation(content) + var loc = location(content) visit(tree, 'paragraph', visitor) function visitor(node, _, parent) { - var line = position.start(node).line - var end = position.end(node).line + var line = pointStart(node).line + var end = pointEnd(node).line var column var offset var lineColumn @@ -101,9 +101,9 @@ function noParagraphContentIndent(tree, file) { if (parent && parent.type === 'root') { column = 1 } else if (parent && parent.type === 'blockquote') { - column = position.start(parent).column + 2 + column = pointStart(parent).column + 2 } else if (parent && parent.type === 'listItem') { - column = position.start(parent.children[0]).column + column = pointStart(parent.children[0]).column // Skip past the first line if we’re the first child of a list item. if (parent.children[0] === node) { @@ -117,7 +117,7 @@ function noParagraphContentIndent(tree, file) { } while (line <= end) { - offset = location.toOffset({line: line, column: column}) + offset = loc.toOffset({line: line, column: column}) lineColumn = offset while (/[ \t]/.test(content.charAt(offset - 1))) { @@ -135,13 +135,13 @@ function noParagraphContentIndent(tree, file) { } if (lineColumn !== offset) { - file.message(reason, location.toPosition(offset)) + file.message(reason, loc.toPoint(offset)) } } line++ } - return visit.SKIP + return SKIP } } diff --git a/packages/remark-lint-no-paragraph-content-indent/package.json b/packages/remark-lint-no-paragraph-content-indent/package.json index 0549bae5..58ecbf7b 100644 --- a/packages/remark-lint-no-paragraph-content-indent/package.json +++ b/packages/remark-lint-no-paragraph-content-indent/package.json @@ -30,9 +30,9 @@ ], "dependencies": { "unified-lint-rule": "^1.0.0", - "unist-util-position": "^3.0.0", - "unist-util-visit": "^2.0.0", - "vfile-location": "^3.0.0" + "unist-util-position": "^4.0.0", + "unist-util-visit": "^4.0.0", + "vfile-location": "^4.0.0" }, "xo": false } diff --git a/packages/remark-lint-no-reference-like-url/index.js b/packages/remark-lint-no-reference-like-url/index.js index dffe9bae..1471cec0 100644 --- a/packages/remark-lint-no-reference-like-url/index.js +++ b/packages/remark-lint-no-reference-like-url/index.js @@ -24,8 +24,8 @@ */ import {lintRule} from 'unified-lint-rule' -import generated from 'unist-util-generated' -import visit from 'unist-util-visit' +import {generated} from 'unist-util-generated' +import {visit} from 'unist-util-visit' const remarkLintNoReferenceLikeUrl = lintRule( 'remark-lint:no-reference-like-url', diff --git a/packages/remark-lint-no-reference-like-url/package.json b/packages/remark-lint-no-reference-like-url/package.json index dadcb74a..b65bf320 100644 --- a/packages/remark-lint-no-reference-like-url/package.json +++ b/packages/remark-lint-no-reference-like-url/package.json @@ -30,8 +30,8 @@ ], "dependencies": { "unified-lint-rule": "^1.0.0", - "unist-util-generated": "^1.1.0", - "unist-util-visit": "^2.0.0" + "unist-util-generated": "^2.0.0", + "unist-util-visit": "^4.0.0" }, "xo": false } diff --git a/packages/remark-lint-no-shell-dollars/index.js b/packages/remark-lint-no-shell-dollars/index.js index 4ba291f9..3690bd7c 100644 --- a/packages/remark-lint-no-shell-dollars/index.js +++ b/packages/remark-lint-no-shell-dollars/index.js @@ -54,8 +54,8 @@ */ import {lintRule} from 'unified-lint-rule' -import visit from 'unist-util-visit' -import generated from 'unist-util-generated' +import {visit} from 'unist-util-visit' +import {generated} from 'unist-util-generated' const remarkLintNoShellDollars = lintRule( 'remark-lint:no-shell-dollars', diff --git a/packages/remark-lint-no-shell-dollars/package.json b/packages/remark-lint-no-shell-dollars/package.json index ba858587..1a40e353 100644 --- a/packages/remark-lint-no-shell-dollars/package.json +++ b/packages/remark-lint-no-shell-dollars/package.json @@ -29,8 +29,8 @@ ], "dependencies": { "unified-lint-rule": "^1.0.0", - "unist-util-generated": "^1.1.0", - "unist-util-visit": "^2.0.0" + "unist-util-generated": "^2.0.0", + "unist-util-visit": "^4.0.0" }, "xo": false } diff --git a/packages/remark-lint-no-shortcut-reference-image/index.js b/packages/remark-lint-no-shortcut-reference-image/index.js index ca322953..f795e3d4 100644 --- a/packages/remark-lint-no-shortcut-reference-image/index.js +++ b/packages/remark-lint-no-shortcut-reference-image/index.js @@ -30,8 +30,8 @@ */ import {lintRule} from 'unified-lint-rule' -import visit from 'unist-util-visit' -import generated from 'unist-util-generated' +import {visit} from 'unist-util-visit' +import {generated} from 'unist-util-generated' const remarkLintNoShortcutReferenceImage = lintRule( 'remark-lint:no-shortcut-reference-image', diff --git a/packages/remark-lint-no-shortcut-reference-image/package.json b/packages/remark-lint-no-shortcut-reference-image/package.json index 5645a755..102a36d3 100644 --- a/packages/remark-lint-no-shortcut-reference-image/package.json +++ b/packages/remark-lint-no-shortcut-reference-image/package.json @@ -30,8 +30,8 @@ ], "dependencies": { "unified-lint-rule": "^1.0.0", - "unist-util-generated": "^1.1.0", - "unist-util-visit": "^2.0.0" + "unist-util-generated": "^2.0.0", + "unist-util-visit": "^4.0.0" }, "xo": false } diff --git a/packages/remark-lint-no-shortcut-reference-link/index.js b/packages/remark-lint-no-shortcut-reference-link/index.js index 9152cf84..cc741408 100644 --- a/packages/remark-lint-no-shortcut-reference-link/index.js +++ b/packages/remark-lint-no-shortcut-reference-link/index.js @@ -30,8 +30,8 @@ */ import {lintRule} from 'unified-lint-rule' -import visit from 'unist-util-visit' -import generated from 'unist-util-generated' +import {visit} from 'unist-util-visit' +import {generated} from 'unist-util-generated' const remarkLintNoShortcutReferenceLink = lintRule( 'remark-lint:no-shortcut-reference-link', diff --git a/packages/remark-lint-no-shortcut-reference-link/package.json b/packages/remark-lint-no-shortcut-reference-link/package.json index 6f604d7f..d711f73d 100644 --- a/packages/remark-lint-no-shortcut-reference-link/package.json +++ b/packages/remark-lint-no-shortcut-reference-link/package.json @@ -30,8 +30,8 @@ ], "dependencies": { "unified-lint-rule": "^1.0.0", - "unist-util-generated": "^1.1.0", - "unist-util-visit": "^2.0.0" + "unist-util-generated": "^2.0.0", + "unist-util-visit": "^4.0.0" }, "xo": false } diff --git a/packages/remark-lint-no-table-indentation/index.js b/packages/remark-lint-no-table-indentation/index.js index c642f930..f605e0e5 100644 --- a/packages/remark-lint-no-table-indentation/index.js +++ b/packages/remark-lint-no-table-indentation/index.js @@ -58,9 +58,9 @@ */ import {lintRule} from 'unified-lint-rule' -import visit from 'unist-util-visit' -import position from 'unist-util-position' -import vfileLocation from 'vfile-location' +import {visit, SKIP} from 'unist-util-visit' +import {pointStart, pointEnd} from 'unist-util-position' +import {location} from 'vfile-location' const remarkLintNoTableIndentation = lintRule( 'remark-lint:no-table-indentation', @@ -73,13 +73,13 @@ var reason = 'Do not indent table rows' function noTableIndentation(tree, file) { var content = String(file) - var location = vfileLocation(content) + var loc = location(content) visit(tree, 'table', visitor) function visitor(node, _, parent) { - var line = position.start(node).line - var end = position.end(node).line + var line = pointStart(node).line + var end = pointEnd(node).line var column var offset var lineColumn @@ -87,9 +87,9 @@ function noTableIndentation(tree, file) { if (parent && parent.type === 'root') { column = 1 } else if (parent && parent.type === 'blockquote') { - column = position.start(parent).column + 2 + column = pointStart(parent).column + 2 } else if (parent && parent.type === 'listItem') { - column = position.start(parent.children[0]).column + column = pointStart(parent.children[0]).column // Skip past the first line if we’re the first child of a list item. /* c8 ignore next 3 */ @@ -104,7 +104,7 @@ function noTableIndentation(tree, file) { } while (line <= end) { - offset = location.toOffset({line: line, column: column}) + offset = loc.toOffset({line: line, column: column}) lineColumn = offset while (/[ \t]/.test(content.charAt(offset - 1))) { @@ -119,13 +119,13 @@ function noTableIndentation(tree, file) { } if (lineColumn !== offset) { - file.message(reason, location.toPosition(offset)) + file.message(reason, loc.toPoint(offset)) } } line++ } - return visit.SKIP + return SKIP } } diff --git a/packages/remark-lint-no-table-indentation/package.json b/packages/remark-lint-no-table-indentation/package.json index 89e0ac5d..fc6dcc84 100644 --- a/packages/remark-lint-no-table-indentation/package.json +++ b/packages/remark-lint-no-table-indentation/package.json @@ -29,9 +29,9 @@ ], "dependencies": { "unified-lint-rule": "^1.0.0", - "unist-util-position": "^3.0.0", - "unist-util-visit": "^2.0.0", - "vfile-location": "^3.0.0" + "unist-util-position": "^4.0.0", + "unist-util-visit": "^4.0.0", + "vfile-location": "^4.0.0" }, "xo": false } diff --git a/packages/remark-lint-no-tabs/index.js b/packages/remark-lint-no-tabs/index.js index b58a7b8e..dd1e6e97 100644 --- a/packages/remark-lint-no-tabs/index.js +++ b/packages/remark-lint-no-tabs/index.js @@ -51,7 +51,7 @@ */ import {lintRule} from 'unified-lint-rule' -import location from 'vfile-location' +import {location} from 'vfile-location' const remarkLintNoTabs = lintRule('remark-lint:no-tabs', noTabs) @@ -61,11 +61,11 @@ var reason = 'Use spaces instead of tabs' function noTabs(tree, file) { var content = String(file) - var position = location(file).toPosition + var toPoint = location(file).toPoint var index = content.indexOf('\t') while (index !== -1) { - file.message(reason, position(index)) + file.message(reason, toPoint(index)) index = content.indexOf('\t', index + 1) } } diff --git a/packages/remark-lint-no-tabs/package.json b/packages/remark-lint-no-tabs/package.json index e74c6aa3..0c17ad80 100644 --- a/packages/remark-lint-no-tabs/package.json +++ b/packages/remark-lint-no-tabs/package.json @@ -28,7 +28,7 @@ ], "dependencies": { "unified-lint-rule": "^1.0.0", - "vfile-location": "^3.0.0" + "vfile-location": "^4.0.0" }, "xo": false } diff --git a/packages/remark-lint-no-undefined-references/index.js b/packages/remark-lint-no-undefined-references/index.js index 7274728e..06f527b2 100644 --- a/packages/remark-lint-no-undefined-references/index.js +++ b/packages/remark-lint-no-undefined-references/index.js @@ -62,12 +62,12 @@ * 17:23-17:26: Found reference to undefined definition */ -import collapseWhiteSpace from 'collapse-white-space' -import vfileLocation from 'vfile-location' +import {collapseWhiteSpace} from 'collapse-white-space' +import {location} from 'vfile-location' import {lintRule} from 'unified-lint-rule' -import generated from 'unist-util-generated' -import position from 'unist-util-position' -import visit from 'unist-util-visit' +import {generated} from 'unist-util-generated' +import {pointStart, pointEnd} from 'unist-util-position' +import {visit, SKIP, EXIT} from 'unist-util-visit' const remarkLintNoUndefinedReferences = lintRule( 'remark-lint:no-undefined-references', @@ -88,7 +88,7 @@ function normalize(s) { function noUndefinedReferences(tree, file, option) { var contents = String(file) - var location = vfileLocation(file) + var loc = location(file) var lineEnding = /(\r?\n|\r)[\t ]*(>[\t ]*)*/g var allow = ((option || {}).allow || []).map(normalize) var map = {} @@ -120,7 +120,7 @@ function noUndefinedReferences(tree, file, option) { ranges.forEach(handleRange) - return visit.SKIP + return SKIP function onchild(child) { var start @@ -142,17 +142,17 @@ function noUndefinedReferences(tree, file, option) { // Can’t have links in links, so reset ranges. if (child.type === 'link' || child.type === 'linkReference') { ranges = [] - return visit.SKIP + return SKIP } // Enter non-text. if (child.type !== 'text') return - start = position.start(child).offset - end = position.end(child).offset + start = pointStart(child).offset + end = pointEnd(child).offset // Bail if there’s no positional info. - if (!end) return visit.EXIT + if (!end) return EXIT source = contents.slice(start, end) lines = [[start, '']] @@ -247,8 +247,8 @@ function noUndefinedReferences(tree, file, option) { .slice(range[0 + offset] + 1, range[1 + offset] - 1) .replace(lineEnding, ' '), position: { - start: location.toPosition(range[0]), - end: location.toPosition(range[range.length - 1]) + start: loc.toPoint(range[0]), + end: loc.toPoint(range[range.length - 1]) } }) } diff --git a/packages/remark-lint-no-undefined-references/package.json b/packages/remark-lint-no-undefined-references/package.json index fbbeec19..752d9427 100644 --- a/packages/remark-lint-no-undefined-references/package.json +++ b/packages/remark-lint-no-undefined-references/package.json @@ -28,12 +28,12 @@ "index.js" ], "dependencies": { - "collapse-white-space": "^1.0.4", + "collapse-white-space": "^2.0.0", "unified-lint-rule": "^1.0.0", - "unist-util-generated": "^1.1.0", - "unist-util-position": "^3.1.0", - "unist-util-visit": "^2.0.0", - "vfile-location": "^3.1.0" + "unist-util-generated": "^2.0.0", + "unist-util-position": "^4.0.0", + "unist-util-visit": "^4.0.0", + "vfile-location": "^4.0.0" }, "xo": false } diff --git a/packages/remark-lint-no-unneeded-full-reference-image/index.js b/packages/remark-lint-no-unneeded-full-reference-image/index.js index bb271335..7474c0d7 100644 --- a/packages/remark-lint-no-unneeded-full-reference-image/index.js +++ b/packages/remark-lint-no-unneeded-full-reference-image/index.js @@ -38,9 +38,9 @@ */ import {lintRule} from 'unified-lint-rule' -import visit from 'unist-util-visit' -import generated from 'unist-util-generated' -import collapseWhiteSpace from 'collapse-white-space' +import {visit} from 'unist-util-visit' +import {generated} from 'unist-util-generated' +import {collapseWhiteSpace} from 'collapse-white-space' const remarkLintNoUnneededFullReferenceImage = lintRule( 'remark-lint:no-unneeded-full-reference-image', diff --git a/packages/remark-lint-no-unneeded-full-reference-image/package.json b/packages/remark-lint-no-unneeded-full-reference-image/package.json index e1fd7581..d6e8fbf6 100644 --- a/packages/remark-lint-no-unneeded-full-reference-image/package.json +++ b/packages/remark-lint-no-unneeded-full-reference-image/package.json @@ -30,10 +30,10 @@ "index.js" ], "dependencies": { - "collapse-white-space": "^1.0.0", + "collapse-white-space": "^2.0.0", "unified-lint-rule": "^1.0.0", - "unist-util-generated": "^1.1.0", - "unist-util-visit": "^2.0.0" + "unist-util-generated": "^2.0.0", + "unist-util-visit": "^4.0.0" }, "xo": false } diff --git a/packages/remark-lint-no-unneeded-full-reference-link/index.js b/packages/remark-lint-no-unneeded-full-reference-link/index.js index e112deb0..cffee7ae 100644 --- a/packages/remark-lint-no-unneeded-full-reference-link/index.js +++ b/packages/remark-lint-no-unneeded-full-reference-link/index.js @@ -44,9 +44,9 @@ */ import {lintRule} from 'unified-lint-rule' -import visit from 'unist-util-visit' -import generated from 'unist-util-generated' -import collapseWhiteSpace from 'collapse-white-space' +import {visit} from 'unist-util-visit' +import {generated} from 'unist-util-generated' +import {collapseWhiteSpace} from 'collapse-white-space' const remarkLintNoUnneededFullReferenceLink = lintRule( 'remark-lint:no-unneeded-full-reference-link', diff --git a/packages/remark-lint-no-unneeded-full-reference-link/package.json b/packages/remark-lint-no-unneeded-full-reference-link/package.json index 298a5e32..4a918520 100644 --- a/packages/remark-lint-no-unneeded-full-reference-link/package.json +++ b/packages/remark-lint-no-unneeded-full-reference-link/package.json @@ -30,10 +30,10 @@ "index.js" ], "dependencies": { - "collapse-white-space": "^1.0.0", + "collapse-white-space": "^2.0.0", "unified-lint-rule": "^1.0.0", - "unist-util-generated": "^1.1.0", - "unist-util-visit": "^2.0.0" + "unist-util-generated": "^2.0.0", + "unist-util-visit": "^4.0.0" }, "xo": false } diff --git a/packages/remark-lint-no-unused-definitions/index.js b/packages/remark-lint-no-unused-definitions/index.js index 74964460..9542d60b 100644 --- a/packages/remark-lint-no-unused-definitions/index.js +++ b/packages/remark-lint-no-unused-definitions/index.js @@ -22,8 +22,8 @@ */ import {lintRule} from 'unified-lint-rule' -import generated from 'unist-util-generated' -import visit from 'unist-util-visit' +import {generated} from 'unist-util-generated' +import {visit} from 'unist-util-visit' const remarkLintNoUnusedDefinitions = lintRule( 'remark-lint:no-unused-definitions', diff --git a/packages/remark-lint-no-unused-definitions/package.json b/packages/remark-lint-no-unused-definitions/package.json index 23e8e195..2f1ce936 100644 --- a/packages/remark-lint-no-unused-definitions/package.json +++ b/packages/remark-lint-no-unused-definitions/package.json @@ -28,8 +28,8 @@ ], "dependencies": { "unified-lint-rule": "^1.0.0", - "unist-util-generated": "^1.1.0", - "unist-util-visit": "^2.0.0" + "unist-util-generated": "^2.0.0", + "unist-util-visit": "^4.0.0" }, "xo": false } diff --git a/packages/remark-lint-ordered-list-marker-style/index.js b/packages/remark-lint-ordered-list-marker-style/index.js index 2b274262..d4a9aa39 100644 --- a/packages/remark-lint-ordered-list-marker-style/index.js +++ b/packages/remark-lint-ordered-list-marker-style/index.js @@ -50,9 +50,9 @@ */ import {lintRule} from 'unified-lint-rule' -import visit from 'unist-util-visit' -import position from 'unist-util-position' -import generated from 'unist-util-generated' +import {visit} from 'unist-util-visit' +import {pointStart} from 'unist-util-position' +import {generated} from 'unist-util-generated' const remarkLintOrderedListMarkerStyle = lintRule( 'remark-lint:ordered-list-marker-style', @@ -61,8 +61,6 @@ const remarkLintOrderedListMarkerStyle = lintRule( export default remarkLintOrderedListMarkerStyle -var start = position.start - var styles = { ')': true, '.': true, @@ -96,7 +94,7 @@ function orderedListMarkerStyle(tree, file, option) { if (!generated(child)) { marker = contents - .slice(start(child).offset, start(child.children[0]).offset) + .slice(pointStart(child).offset, pointStart(child.children[0]).offset) .replace(/\s|\d/g, '') .replace(/\[[x ]?]\s*$/i, '') diff --git a/packages/remark-lint-ordered-list-marker-style/package.json b/packages/remark-lint-ordered-list-marker-style/package.json index 421f5877..5a5d5eb5 100644 --- a/packages/remark-lint-ordered-list-marker-style/package.json +++ b/packages/remark-lint-ordered-list-marker-style/package.json @@ -30,9 +30,9 @@ ], "dependencies": { "unified-lint-rule": "^1.0.0", - "unist-util-generated": "^1.1.0", - "unist-util-position": "^3.0.0", - "unist-util-visit": "^2.0.0" + "unist-util-generated": "^2.0.0", + "unist-util-position": "^4.0.0", + "unist-util-visit": "^4.0.0" }, "xo": false } diff --git a/packages/remark-lint-ordered-list-marker-value/index.js b/packages/remark-lint-ordered-list-marker-value/index.js index 94dc3cb2..aa2f3cbc 100644 --- a/packages/remark-lint-ordered-list-marker-value/index.js +++ b/packages/remark-lint-ordered-list-marker-value/index.js @@ -127,9 +127,9 @@ */ import {lintRule} from 'unified-lint-rule' -import visit from 'unist-util-visit' -import position from 'unist-util-position' -import generated from 'unist-util-generated' +import {visit} from 'unist-util-visit' +import {pointStart} from 'unist-util-position' +import {generated} from 'unist-util-generated' const remarkLintOrderedListMarkerValue = lintRule( 'remark-lint:ordered-list-marker-value', @@ -138,8 +138,6 @@ const remarkLintOrderedListMarkerValue = lintRule( export default remarkLintOrderedListMarkerValue -var start = position.start - var styles = {ordered: true, single: true, one: true} function orderedListMarkerValue(tree, file, option) { @@ -179,7 +177,7 @@ function orderedListMarkerValue(tree, file, option) { marker = Number( contents - .slice(start(child).offset, start(child.children[0]).offset) + .slice(pointStart(child).offset, pointStart(child.children[0]).offset) .replace(/[\s.)]/g, '') .replace(/\[[x ]?]\s*$/i, '') ) diff --git a/packages/remark-lint-ordered-list-marker-value/package.json b/packages/remark-lint-ordered-list-marker-value/package.json index 158acc34..41c15120 100644 --- a/packages/remark-lint-ordered-list-marker-value/package.json +++ b/packages/remark-lint-ordered-list-marker-value/package.json @@ -30,9 +30,9 @@ ], "dependencies": { "unified-lint-rule": "^1.0.0", - "unist-util-generated": "^1.1.0", - "unist-util-position": "^3.0.0", - "unist-util-visit": "^2.0.0" + "unist-util-generated": "^2.0.0", + "unist-util-position": "^4.0.0", + "unist-util-visit": "^4.0.0" }, "xo": false } diff --git a/packages/remark-lint-rule-style/index.js b/packages/remark-lint-rule-style/index.js index 6fbe27e7..f30d5462 100644 --- a/packages/remark-lint-rule-style/index.js +++ b/packages/remark-lint-rule-style/index.js @@ -56,17 +56,14 @@ */ import {lintRule} from 'unified-lint-rule' -import visit from 'unist-util-visit' -import position from 'unist-util-position' -import generated from 'unist-util-generated' +import {visit} from 'unist-util-visit' +import {pointStart, pointEnd} from 'unist-util-position' +import {generated} from 'unist-util-generated' const remarkLintRuleStyle = lintRule('remark-lint:rule-style', ruleStyle) export default remarkLintRuleStyle -var start = position.start -var end = position.end - function ruleStyle(tree, file, option) { var contents = String(file) var preferred = @@ -81,8 +78,8 @@ function ruleStyle(tree, file, option) { visit(tree, 'thematicBreak', visitor) function visitor(node) { - var initial = start(node).offset - var final = end(node).offset + var initial = pointStart(node).offset + var final = pointEnd(node).offset var rule if (!generated(node)) { diff --git a/packages/remark-lint-rule-style/package.json b/packages/remark-lint-rule-style/package.json index 4ae181a7..9701119f 100644 --- a/packages/remark-lint-rule-style/package.json +++ b/packages/remark-lint-rule-style/package.json @@ -30,9 +30,9 @@ ], "dependencies": { "unified-lint-rule": "^1.0.0", - "unist-util-generated": "^1.1.0", - "unist-util-position": "^3.0.0", - "unist-util-visit": "^2.0.0" + "unist-util-generated": "^2.0.0", + "unist-util-position": "^4.0.0", + "unist-util-visit": "^4.0.0" }, "xo": false } diff --git a/packages/remark-lint-strikethrough-marker/index.js b/packages/remark-lint-strikethrough-marker/index.js index 5b39b7fb..aaafaacb 100644 --- a/packages/remark-lint-strikethrough-marker/index.js +++ b/packages/remark-lint-strikethrough-marker/index.js @@ -55,9 +55,9 @@ */ import {lintRule} from 'unified-lint-rule' -import visit from 'unist-util-visit' -import position from 'unist-util-position' -import generated from 'unist-util-generated' +import {visit} from 'unist-util-visit' +import {pointStart} from 'unist-util-position' +import {generated} from 'unist-util-generated' const remarkLintStrikethroughMarker = lintRule( 'remark-lint:strikethrough-marker', @@ -87,7 +87,7 @@ function strikethroughMarker(tree, file, option) { var marker if (!generated(node)) { - var offset = position.start(node).offset + var offset = pointStart(node).offset marker = contents.slice(offset, offset + 2) === '~~' ? contents.slice(offset, offset + 2) diff --git a/packages/remark-lint-strikethrough-marker/package.json b/packages/remark-lint-strikethrough-marker/package.json index 5ed8d705..d6ef0534 100644 --- a/packages/remark-lint-strikethrough-marker/package.json +++ b/packages/remark-lint-strikethrough-marker/package.json @@ -30,9 +30,9 @@ ], "dependencies": { "unified-lint-rule": "^1.0.0", - "unist-util-generated": "^1.1.0", - "unist-util-position": "^3.0.0", - "unist-util-visit": "^2.0.0" + "unist-util-generated": "^2.0.0", + "unist-util-position": "^4.0.0", + "unist-util-visit": "^4.0.0" }, "xo": false } diff --git a/packages/remark-lint-strong-marker/index.js b/packages/remark-lint-strong-marker/index.js index eecdfd79..0312b0bf 100644 --- a/packages/remark-lint-strong-marker/index.js +++ b/packages/remark-lint-strong-marker/index.js @@ -52,9 +52,9 @@ */ import {lintRule} from 'unified-lint-rule' -import visit from 'unist-util-visit' -import position from 'unist-util-position' -import generated from 'unist-util-generated' +import {visit} from 'unist-util-visit' +import {pointStart} from 'unist-util-position' +import {generated} from 'unist-util-generated' const remarkLintStrongMarker = lintRule( 'remark-lint:strong-marker', @@ -81,7 +81,7 @@ function strongMarker(tree, file, option) { visit(tree, 'strong', visitor) function visitor(node) { - var marker = contents.charAt(position.start(node).offset) + var marker = contents.charAt(pointStart(node).offset) if (!generated(node)) { if (preferred) { diff --git a/packages/remark-lint-strong-marker/package.json b/packages/remark-lint-strong-marker/package.json index 4e83bfe6..d67a9ecf 100644 --- a/packages/remark-lint-strong-marker/package.json +++ b/packages/remark-lint-strong-marker/package.json @@ -30,9 +30,9 @@ ], "dependencies": { "unified-lint-rule": "^1.0.0", - "unist-util-generated": "^1.1.0", - "unist-util-position": "^3.0.0", - "unist-util-visit": "^2.0.0" + "unist-util-generated": "^2.0.0", + "unist-util-position": "^4.0.0", + "unist-util-visit": "^4.0.0" }, "xo": false } diff --git a/packages/remark-lint-table-cell-padding/index.js b/packages/remark-lint-table-cell-padding/index.js index 3b4e080c..6f3a4139 100644 --- a/packages/remark-lint-table-cell-padding/index.js +++ b/packages/remark-lint-table-cell-padding/index.js @@ -155,9 +155,9 @@ */ import {lintRule} from 'unified-lint-rule' -import visit from 'unist-util-visit' -import position from 'unist-util-position' -import generated from 'unist-util-generated' +import {visit, SKIP} from 'unist-util-visit' +import {pointStart, pointEnd} from 'unist-util-position' +import {generated} from 'unist-util-generated' const remarkLintTableCellPadding = lintRule( 'remark-lint:table-cell-padding', @@ -166,9 +166,6 @@ const remarkLintTableCellPadding = lintRule( export default remarkLintTableCellPadding -var start = position.start -var end = position.end - var styles = {null: true, padded: true, compact: true} function tableCellPadding(tree, file, option) { @@ -213,13 +210,13 @@ function tableCellPadding(tree, file, option) { cell = cells[column] if (cell && cell.children.length !== 0) { - contentStart = start(cell.children[0]).offset - contentEnd = end(cell.children[cell.children.length - 1]).offset + contentStart = pointStart(cell.children[0]).offset + contentEnd = pointEnd(cell.children[cell.children.length - 1]).offset entries.push({ node: cell, - start: contentStart - start(cell).offset - (column ? 0 : 1), - end: end(cell).offset - contentEnd - 1, + start: contentStart - pointStart(cell).offset - (column ? 0 : 1), + end: pointEnd(cell).offset - contentEnd - 1, column: column }) @@ -247,7 +244,7 @@ function tableCellPadding(tree, file, option) { checkSide('end', entry, style, sizes) } - return visit.SKIP + return SKIP } function checkSide(side, entry, style, sizes) { @@ -284,13 +281,13 @@ function tableCellPadding(tree, file, option) { } if (side === 'start') { - point = start(cell) + point = pointStart(cell) if (!column) { point.column++ point.offset++ } } else { - point = end(cell) + point = pointEnd(cell) point.column-- point.offset-- } @@ -301,7 +298,7 @@ function tableCellPadding(tree, file, option) { function size(node) { return ( - end(node.children[node.children.length - 1]).offset - - start(node.children[0]).offset + pointEnd(node.children[node.children.length - 1]).offset - + pointStart(node.children[0]).offset ) } diff --git a/packages/remark-lint-table-cell-padding/package.json b/packages/remark-lint-table-cell-padding/package.json index b4e2facc..ea56f6ba 100644 --- a/packages/remark-lint-table-cell-padding/package.json +++ b/packages/remark-lint-table-cell-padding/package.json @@ -30,9 +30,9 @@ ], "dependencies": { "unified-lint-rule": "^1.0.0", - "unist-util-generated": "^1.1.0", - "unist-util-position": "^3.0.0", - "unist-util-visit": "^2.0.0" + "unist-util-generated": "^2.0.0", + "unist-util-position": "^4.0.0", + "unist-util-visit": "^4.0.0" }, "xo": false } diff --git a/packages/remark-lint-table-pipe-alignment/index.js b/packages/remark-lint-table-pipe-alignment/index.js index 8c927183..4b452134 100644 --- a/packages/remark-lint-table-pipe-alignment/index.js +++ b/packages/remark-lint-table-pipe-alignment/index.js @@ -44,9 +44,9 @@ */ import {lintRule} from 'unified-lint-rule' -import visit from 'unist-util-visit' -import position from 'unist-util-position' -import generated from 'unist-util-generated' +import {visit} from 'unist-util-visit' +import {pointStart, pointEnd} from 'unist-util-position' +import {generated} from 'unist-util-generated' const remarkLintTablePipeAlignment = lintRule( 'remark-lint:table-pipe-alignment', @@ -55,9 +55,6 @@ const remarkLintTablePipeAlignment = lintRule( export default remarkLintTablePipeAlignment -var start = position.start -var end = position.end - var reason = 'Misaligned table fence' function tablePipeAlignment(tree, file) { @@ -85,7 +82,7 @@ function tablePipeAlignment(tree, file) { while (++index < length) { row = rows[index] - begin = start(row) + begin = pointStart(row) cells = row.children columns = cells.length column = -2 // Start without a first cell. @@ -96,8 +93,8 @@ function tablePipeAlignment(tree, file) { nextIndex = column + 1 next = cells[nextIndex] - initial = cell ? end(cell).offset : start(row).offset - final = next ? start(next).offset : end(row).offset + initial = cell ? pointEnd(cell).offset : pointStart(row).offset + final = next ? pointStart(next).offset : pointEnd(row).offset fence = contents.slice(initial, final) pos = initial + fence.indexOf('|') - begin.offset + 1 diff --git a/packages/remark-lint-table-pipe-alignment/package.json b/packages/remark-lint-table-pipe-alignment/package.json index 837a1ded..3f1bbe03 100644 --- a/packages/remark-lint-table-pipe-alignment/package.json +++ b/packages/remark-lint-table-pipe-alignment/package.json @@ -31,9 +31,9 @@ ], "dependencies": { "unified-lint-rule": "^1.0.0", - "unist-util-generated": "^1.1.0", - "unist-util-position": "^3.0.0", - "unist-util-visit": "^2.0.0" + "unist-util-generated": "^2.0.0", + "unist-util-position": "^4.0.0", + "unist-util-visit": "^4.0.0" }, "xo": false } diff --git a/packages/remark-lint-table-pipes/index.js b/packages/remark-lint-table-pipes/index.js index b7a3fb8b..e53bb7e0 100644 --- a/packages/remark-lint-table-pipes/index.js +++ b/packages/remark-lint-table-pipes/index.js @@ -38,17 +38,14 @@ */ import {lintRule} from 'unified-lint-rule' -import visit from 'unist-util-visit' -import position from 'unist-util-position' -import generated from 'unist-util-generated' +import {visit} from 'unist-util-visit' +import {pointStart, pointEnd} from 'unist-util-position' +import {generated} from 'unist-util-generated' const remarkLintTablePipes = lintRule('remark-lint:table-pipes', tablePipes) export default remarkLintTablePipes -var start = position.start -var end = position.end - var reasonStart = 'Missing initial pipe in table fence' var reasonEnd = 'Missing final pipe in table fence' @@ -67,12 +64,12 @@ function tablePipes(tree, file) { row = rows[index] if (!generated(row)) { - if (contents.charCodeAt(start(row).offset) !== 124) { - file.message(reasonStart, start(row)) + if (contents.charCodeAt(pointStart(row).offset) !== 124) { + file.message(reasonStart, pointStart(row)) } - if (contents.charCodeAt(end(row).offset - 1) !== 124) { - file.message(reasonEnd, end(row)) + if (contents.charCodeAt(pointEnd(row).offset - 1) !== 124) { + file.message(reasonEnd, pointEnd(row)) } } } diff --git a/packages/remark-lint-table-pipes/package.json b/packages/remark-lint-table-pipes/package.json index d096888f..5329b8d1 100644 --- a/packages/remark-lint-table-pipes/package.json +++ b/packages/remark-lint-table-pipes/package.json @@ -30,9 +30,9 @@ ], "dependencies": { "unified-lint-rule": "^1.0.0", - "unist-util-generated": "^1.1.0", - "unist-util-position": "^3.0.0", - "unist-util-visit": "^2.0.0" + "unist-util-generated": "^2.0.0", + "unist-util-position": "^4.0.0", + "unist-util-visit": "^4.0.0" }, "xo": false } diff --git a/packages/remark-lint-unordered-list-marker-style/index.js b/packages/remark-lint-unordered-list-marker-style/index.js index b3ea08b0..0054d9ff 100644 --- a/packages/remark-lint-unordered-list-marker-style/index.js +++ b/packages/remark-lint-unordered-list-marker-style/index.js @@ -67,9 +67,9 @@ */ import {lintRule} from 'unified-lint-rule' -import visit from 'unist-util-visit' -import position from 'unist-util-position' -import generated from 'unist-util-generated' +import {visit} from 'unist-util-visit' +import {pointStart} from 'unist-util-position' +import {generated} from 'unist-util-generated' const remarkLintUnorderedListMarkerStyle = lintRule( 'remark-lint:unordered-list-marker-style', @@ -78,8 +78,6 @@ const remarkLintUnorderedListMarkerStyle = lintRule( export default remarkLintUnorderedListMarkerStyle -var start = position.start - var styles = { '-': true, '*': true, @@ -114,7 +112,7 @@ function unorderedListMarkerStyle(tree, file, option) { if (!generated(child)) { marker = contents - .slice(start(child).offset, start(child.children[0]).offset) + .slice(pointStart(child).offset, pointStart(child.children[0]).offset) .replace(/\[[x ]?]\s*$/i, '') .replace(/\s/g, '') diff --git a/packages/remark-lint-unordered-list-marker-style/package.json b/packages/remark-lint-unordered-list-marker-style/package.json index 2df3603b..4bcabd59 100644 --- a/packages/remark-lint-unordered-list-marker-style/package.json +++ b/packages/remark-lint-unordered-list-marker-style/package.json @@ -30,9 +30,9 @@ ], "dependencies": { "unified-lint-rule": "^1.0.0", - "unist-util-generated": "^1.1.0", - "unist-util-position": "^3.0.0", - "unist-util-visit": "^2.0.0" + "unist-util-generated": "^2.0.0", + "unist-util-position": "^4.0.0", + "unist-util-visit": "^4.0.0" }, "xo": false }