From f6b628d6b3baeefe8129ed256d13337fe0cfd163 Mon Sep 17 00:00:00 2001
From: Titus Wormer <tituswormer@gmail.com>
Date: Fri, 25 Aug 2023 14:51:06 +0200
Subject: [PATCH] Update `unified`, `unified-args`, `@types/hast`, etc

---
 package.json                                  |  14 +-
 packages/rehype-cli/cli.js                    |   2 +-
 packages/rehype-cli/package.json              |   2 +-
 packages/rehype-parse/lib/errors.js           | 278 ------------------
 packages/rehype-parse/lib/index.js            | 132 ++-------
 packages/rehype-parse/package.json            |   7 +-
 packages/rehype-parse/readme.md               |  65 +---
 packages/rehype-stringify/lib/index.js        |   4 +-
 packages/rehype-stringify/package.json        |   6 +-
 packages/rehype/package.json                  |   4 +-
 script/parse-error.js                         |  83 ------
 test/api.js                                   |  60 ++--
 test/cli.js                                   |  35 +--
 test/fixtures/adoption/index.json             |   4 +-
 .../element-loose-close-document/index.json   |   6 +-
 test/fixtures/html-in-svg-in-html/index.json  |   4 +-
 test/fixtures/svg-in-html/index.json          |  12 +-
 test/fixtures/verbose/index.json              |  10 +-
 test/fixtures/xhtml/index.json                |  12 +-
 test/parse-error.js                           |  54 ++--
 .../messages.json                             |  15 +-
 .../messages.json                             |  32 +-
 .../messages.json                             |  31 +-
 .../messages.json                             |  31 +-
 .../messages.json                             |  32 +-
 .../cdata-in-html-content/messages.json       |  16 +-
 .../messages.json                             |  32 +-
 .../messages.json                             |  15 +-
 .../messages.json                             |  16 +-
 .../control-character-reference/messages.json |  16 +-
 .../messages.json                             |  15 +-
 .../duplicate-attribute/messages.json         |  16 +-
 .../end-tag-with-attributes/messages.json     |  16 +-
 .../messages.json                             |  16 +-
 .../messages.json                             |  15 +-
 .../eof-before-tag-name/messages.json         |  16 +-
 test/parse-error/eof-in-cdata/messages.json   |  16 +-
 test/parse-error/eof-in-comment/messages.json |  16 +-
 test/parse-error/eof-in-doctype/messages.json |  31 +-
 .../messages.json                             |  15 +-
 .../messages.json                             |  31 +-
 test/parse-error/eof-in-tag/messages.json     |  16 +-
 .../incorrectly-closed-comment/messages.json  |  16 +-
 .../incorrectly-opened-comment/messages.json  |  38 +--
 .../messages.json                             |  16 +-
 .../messages.json                             |  32 +-
 .../misplaced-doctype/messages.json           |  15 +-
 .../messages.json                             |  15 +-
 .../missing-attribute-value/messages.json     |  16 +-
 .../missing-doctype-name/messages.json        |  31 +-
 .../messages.json                             |  16 +-
 .../messages.json                             |  16 +-
 .../parse-error/missing-doctype/messages.json |  15 +-
 .../missing-end-tag-name/messages.json        |  16 +-
 .../messages.json                             |  16 +-
 .../messages.json                             |  16 +-
 .../messages.json                             |  16 +-
 .../messages.json                             |  31 +-
 .../messages.json                             |  31 +-
 .../messages.json                             |  16 +-
 .../messages.json                             |  16 +-
 .../messages.json                             |  31 +-
 test/parse-error/nested-comment/messages.json |  16 +-
 .../nested-noscript-in-head/messages.json     |  30 +-
 .../non-conforming-doctype/messages.json      |  31 +-
 .../messages.json                             |  16 +-
 .../messages.json                             |  16 +-
 .../messages.json                             |  16 +-
 .../null-character-reference/messages.json    |  16 +-
 .../messages.json                             |  15 +-
 .../messages.json                             |  16 +-
 .../messages.json                             |  16 +-
 .../messages.json                             |  48 +--
 .../messages.json                             |  16 +-
 .../messages.json                             |  48 +--
 .../unexpected-null-character/messages.json   |  16 +-
 .../messages.json                             |  16 +-
 .../unexpected-solidus-in-tag/messages.json   |  16 +-
 .../messages.json                             |  16 +-
 79 files changed, 761 insertions(+), 1267 deletions(-)
 delete mode 100644 packages/rehype-parse/lib/errors.js
 delete mode 100644 script/parse-error.js

diff --git a/package.json b/package.json
index 33ed9938..f3d0ad28 100644
--- a/package.json
+++ b/package.json
@@ -20,19 +20,18 @@
     "@types/tape": "^5.0.0",
     "bail": "^2.0.0",
     "c8": "^8.0.0",
-    "hast-util-assert": "^3.0.0",
-    "mdast-zone": "^5.0.0",
+    "hast-util-assert": "^4.0.0",
     "prettier": "^3.0.0",
     "remark-cli": "^11.0.0",
     "remark-preset-wooorm": "^9.0.0",
     "tape": "^5.0.0",
-    "to-vfile": "^7.0.0",
+    "to-vfile": "^8.0.0",
     "type-coverage": "^2.0.0",
     "type-fest": "^4.0.0",
     "typescript": "^5.0.0",
-    "unified": "^10.0.0",
-    "unist-builder": "^3.0.0",
-    "unist-util-remove-position": "^4.0.0",
+    "unified": "^11.0.0",
+    "unist-builder": "^4.0.0",
+    "unist-util-remove-position": "^5.0.0",
     "xo": "^0.56.0"
   },
   "scripts": {
@@ -62,8 +61,7 @@
   },
   "remarkConfig": {
     "plugins": [
-      "preset-wooorm",
-      "./script/parse-error.js"
+      "preset-wooorm"
     ]
   },
   "typeCoverage": {
diff --git a/packages/rehype-cli/cli.js b/packages/rehype-cli/cli.js
index 597fdd2f..8e1d6c2d 100755
--- a/packages/rehype-cli/cli.js
+++ b/packages/rehype-cli/cli.js
@@ -10,7 +10,7 @@ const proc = require('rehype/package.json')
 const cli = require('./package.json')
 
 args({
-  processor: rehype(),
+  processor: rehype,
   name: proc.name,
   description: cli.description,
   version: [
diff --git a/packages/rehype-cli/package.json b/packages/rehype-cli/package.json
index 7ce64c3a..f711c278 100644
--- a/packages/rehype-cli/package.json
+++ b/packages/rehype-cli/package.json
@@ -30,7 +30,7 @@
   ],
   "dependencies": {
     "rehype": "^12.0.0",
-    "unified-args": "^9.0.0"
+    "unified-args": "^11.0.0"
   },
   "scripts": {
     "build": "tsc --build --clean && tsc --build && type-coverage"
diff --git a/packages/rehype-parse/lib/errors.js b/packages/rehype-parse/lib/errors.js
deleted file mode 100644
index 5c777395..00000000
--- a/packages/rehype-parse/lib/errors.js
+++ /dev/null
@@ -1,278 +0,0 @@
-export const errors = {
-  abandonedHeadElementChild: {
-    reason: 'Unexpected metadata element after head',
-    description:
-      'Unexpected element after head. Expected the element before `</head>`',
-    url: false
-  },
-  abruptClosingOfEmptyComment: {
-    reason: 'Unexpected abruptly closed empty comment',
-    description: 'Unexpected `>` or `->`. Expected `-->` to close comments'
-  },
-  abruptDoctypePublicIdentifier: {
-    reason: 'Unexpected abruptly closed public identifier',
-    description:
-      'Unexpected `>`. Expected a closing `"` or `\'` after the public identifier'
-  },
-  abruptDoctypeSystemIdentifier: {
-    reason: 'Unexpected abruptly closed system identifier',
-    description:
-      'Unexpected `>`. Expected a closing `"` or `\'` after the identifier identifier'
-  },
-  absenceOfDigitsInNumericCharacterReference: {
-    reason: 'Unexpected non-digit at start of numeric character reference',
-    description:
-      'Unexpected `%c`. Expected `[0-9]` for decimal references or `[0-9a-fA-F]` for hexadecimal references'
-  },
-  cdataInHtmlContent: {
-    reason: 'Unexpected CDATA section in HTML',
-    description:
-      'Unexpected `<![CDATA[` in HTML. Remove it, use a comment, or encode special characters instead'
-  },
-  characterReferenceOutsideUnicodeRange: {
-    reason: 'Unexpected too big numeric character reference',
-    description:
-      'Unexpectedly high character reference. Expected character references to be at most hexadecimal 10ffff (or decimal 1114111)'
-  },
-  closingOfElementWithOpenChildElements: {
-    reason: 'Unexpected closing tag with open child elements',
-    description:
-      'Unexpectedly closing tag. Expected other tags to be closed first',
-    url: false
-  },
-  controlCharacterInInputStream: {
-    reason: 'Unexpected control character',
-    description:
-      'Unexpected control character `%x`. Expected a non-control code point, 0x00, or ASCII whitespace'
-  },
-  controlCharacterReference: {
-    reason: 'Unexpected control character reference',
-    description:
-      'Unexpectedly control character in reference. Expected a non-control code point, 0x00, or ASCII whitespace'
-  },
-  disallowedContentInNoscriptInHead: {
-    reason: 'Disallowed content inside `<noscript>` in `<head>`',
-    description:
-      'Unexpected text character `%c`. Only use text in `<noscript>`s in `<body>`',
-    url: false
-  },
-  duplicateAttribute: {
-    reason: 'Unexpected duplicate attribute',
-    description:
-      'Unexpectedly double attribute. Expected attributes to occur only once'
-  },
-  endTagWithAttributes: {
-    reason: 'Unexpected attribute on closing tag',
-    description: 'Unexpected attribute. Expected `>` instead'
-  },
-  endTagWithTrailingSolidus: {
-    reason: 'Unexpected slash at end of closing tag',
-    description: 'Unexpected `%c-1`. Expected `>` instead'
-  },
-  endTagWithoutMatchingOpenElement: {
-    reason: 'Unexpected unopened end tag',
-    description: 'Unexpected end tag. Expected no end tag or another end tag',
-    url: false
-  },
-  eofBeforeTagName: {
-    reason: 'Unexpected end of file',
-    description: 'Unexpected end of file. Expected tag name instead'
-  },
-  eofInCdata: {
-    reason: 'Unexpected end of file in CDATA',
-    description: 'Unexpected end of file. Expected `]]>` to close the CDATA'
-  },
-  eofInComment: {
-    reason: 'Unexpected end of file in comment',
-    description: 'Unexpected end of file. Expected `-->` to close the comment'
-  },
-  eofInDoctype: {
-    reason: 'Unexpected end of file in doctype',
-    description:
-      'Unexpected end of file. Expected a valid doctype (such as `<!doctype html>`)'
-  },
-  eofInElementThatCanContainOnlyText: {
-    reason: 'Unexpected end of file in element that can only contain text',
-    description: 'Unexpected end of file. Expected text or a closing tag',
-    url: false
-  },
-  eofInScriptHtmlCommentLikeText: {
-    reason: 'Unexpected end of file in comment inside script',
-    description: 'Unexpected end of file. Expected `-->` to close the comment'
-  },
-  eofInTag: {
-    reason: 'Unexpected end of file in tag',
-    description: 'Unexpected end of file. Expected `>` to close the tag'
-  },
-  incorrectlyClosedComment: {
-    reason: 'Incorrectly closed comment',
-    description: 'Unexpected `%c-1`. Expected `-->` to close the comment'
-  },
-  incorrectlyOpenedComment: {
-    reason: 'Incorrectly opened comment',
-    description: 'Unexpected `%c`. Expected `<!--` to open the comment'
-  },
-  invalidCharacterSequenceAfterDoctypeName: {
-    reason: 'Invalid sequence after doctype name',
-    description: 'Unexpected sequence at `%c`. Expected `public` or `system`'
-  },
-  invalidFirstCharacterOfTagName: {
-    reason: 'Invalid first character in tag name',
-    description: 'Unexpected `%c`. Expected an ASCII letter instead'
-  },
-  misplacedDoctype: {
-    reason: 'Misplaced doctype',
-    description: 'Unexpected doctype. Expected doctype before head',
-    url: false
-  },
-  misplacedStartTagForHeadElement: {
-    reason: 'Misplaced `<head>` start tag',
-    description:
-      'Unexpected start tag `<head>`. Expected `<head>` directly after doctype',
-    url: false
-  },
-  missingAttributeValue: {
-    reason: 'Missing attribute value',
-    description:
-      'Unexpected `%c-1`. Expected an attribute value or no `%c-1` instead'
-  },
-  missingDoctype: {
-    reason: 'Missing doctype before other content',
-    description: 'Expected a `<!doctype html>` before anything else',
-    url: false
-  },
-  missingDoctypeName: {
-    reason: 'Missing doctype name',
-    description: 'Unexpected doctype end at `%c`. Expected `html` instead'
-  },
-  missingDoctypePublicIdentifier: {
-    reason: 'Missing public identifier in doctype',
-    description: 'Unexpected `%c`. Expected identifier for `public` instead'
-  },
-  missingDoctypeSystemIdentifier: {
-    reason: 'Missing system identifier in doctype',
-    description:
-      'Unexpected `%c`. Expected identifier for `system` instead (suggested: `"about:legacy-compat"`)'
-  },
-  missingEndTagName: {
-    reason: 'Missing name in end tag',
-    description: 'Unexpected `%c`. Expected an ASCII letter instead'
-  },
-  missingQuoteBeforeDoctypePublicIdentifier: {
-    reason: 'Missing quote before public identifier in doctype',
-    description: 'Unexpected `%c`. Expected `"` or `\'` instead'
-  },
-  missingQuoteBeforeDoctypeSystemIdentifier: {
-    reason: 'Missing quote before system identifier in doctype',
-    description: 'Unexpected `%c`. Expected `"` or `\'` instead'
-  },
-  missingSemicolonAfterCharacterReference: {
-    reason: 'Missing semicolon after character reference',
-    description: 'Unexpected `%c`. Expected `;` instead'
-  },
-  missingWhitespaceAfterDoctypePublicKeyword: {
-    reason: 'Missing whitespace after public identifier in doctype',
-    description: 'Unexpected `%c`. Expected ASCII whitespace instead'
-  },
-  missingWhitespaceAfterDoctypeSystemKeyword: {
-    reason: 'Missing whitespace after system identifier in doctype',
-    description: 'Unexpected `%c`. Expected ASCII whitespace instead'
-  },
-  missingWhitespaceBeforeDoctypeName: {
-    reason: 'Missing whitespace before doctype name',
-    description: 'Unexpected `%c`. Expected ASCII whitespace instead'
-  },
-  missingWhitespaceBetweenAttributes: {
-    reason: 'Missing whitespace between attributes',
-    description: 'Unexpected `%c`. Expected ASCII whitespace instead'
-  },
-  missingWhitespaceBetweenDoctypePublicAndSystemIdentifiers: {
-    reason:
-      'Missing whitespace between public and system identifiers in doctype',
-    description: 'Unexpected `%c`. Expected ASCII whitespace instead'
-  },
-  nestedComment: {
-    reason: 'Unexpected nested comment',
-    description: 'Unexpected `<!--`. Expected `-->`'
-  },
-  nestedNoscriptInHead: {
-    reason: 'Unexpected nested `<noscript>` in `<head>`',
-    description:
-      'Unexpected `<noscript>`. Expected a closing tag or a meta element',
-    url: false
-  },
-  nonConformingDoctype: {
-    reason: 'Unexpected non-conforming doctype declaration',
-    description:
-      'Expected `<!doctype html>` or `<!doctype html system "about:legacy-compat">`',
-    url: false
-  },
-  nonVoidHtmlElementStartTagWithTrailingSolidus: {
-    reason: 'Unexpected trailing slash on start tag of non-void element',
-    description: 'Unexpected `/`. Expected `>` instead'
-  },
-  noncharacterCharacterReference: {
-    reason:
-      'Unexpected noncharacter code point referenced by character reference',
-    description: 'Unexpected code point. Do not use noncharacters in HTML'
-  },
-  noncharacterInInputStream: {
-    reason: 'Unexpected noncharacter character',
-    description: 'Unexpected code point `%x`. Do not use noncharacters in HTML'
-  },
-  nullCharacterReference: {
-    reason: 'Unexpected NULL character referenced by character reference',
-    description: 'Unexpected code point. Do not use NULL characters in HTML'
-  },
-  openElementsLeftAfterEof: {
-    reason: 'Unexpected end of file',
-    description: 'Unexpected end of file. Expected closing tag instead',
-    url: false
-  },
-  surrogateCharacterReference: {
-    reason: 'Unexpected surrogate character referenced by character reference',
-    description:
-      'Unexpected code point. Do not use lone surrogate characters in HTML'
-  },
-  surrogateInInputStream: {
-    reason: 'Unexpected surrogate character',
-    description:
-      'Unexpected code point `%x`. Do not use lone surrogate characters in HTML'
-  },
-  unexpectedCharacterAfterDoctypeSystemIdentifier: {
-    reason: 'Invalid character after system identifier in doctype',
-    description: 'Unexpected character at `%c`. Expected `>`'
-  },
-  unexpectedCharacterInAttributeName: {
-    reason: 'Unexpected character in attribute name',
-    description:
-      'Unexpected `%c`. Expected whitespace, `/`, `>`, `=`, or probably an ASCII letter'
-  },
-  unexpectedCharacterInUnquotedAttributeValue: {
-    reason: 'Unexpected character in unquoted attribute value',
-    description: 'Unexpected `%c`. Quote the attribute value to include it'
-  },
-  unexpectedEqualsSignBeforeAttributeName: {
-    reason: 'Unexpected equals sign before attribute name',
-    description: 'Unexpected `%c`. Add an attribute name before it'
-  },
-  unexpectedNullCharacter: {
-    reason: 'Unexpected NULL character',
-    description:
-      'Unexpected code point `%x`. Do not use NULL characters in HTML'
-  },
-  unexpectedQuestionMarkInsteadOfTagName: {
-    reason: 'Unexpected question mark instead of tag name',
-    description: 'Unexpected `%c`. Expected an ASCII letter instead'
-  },
-  unexpectedSolidusInTag: {
-    reason: 'Unexpected slash in tag',
-    description:
-      'Unexpected `%c-1`. Expected it followed by `>` or in a quoted attribute value'
-  },
-  unknownNamedCharacterReference: {
-    reason: 'Unexpected unknown named character reference',
-    description:
-      'Unexpected character reference. Expected known named character references'
-  }
-}
diff --git a/packages/rehype-parse/lib/index.js b/packages/rehype-parse/lib/index.js
index 0a45fe89..2758514c 100644
--- a/packages/rehype-parse/lib/index.js
+++ b/packages/rehype-parse/lib/index.js
@@ -1,44 +1,27 @@
 /**
  * @typedef {import('hast').Root} Root
- * @typedef {Pick<import('hast-util-from-parse5').Options, 'space' | 'verbose'>} FromParse5Options
+ * @typedef {import('hast-util-from-html').Options} FromHtmlOptions
+ */
+
+/**
+ * @typedef {Omit<FromHtmlOptions, 'onerror'> & RehypeParseFields} Options
+ *   Options.
  *
- * @typedef {keyof errors} ErrorCode
- * @typedef {0|1|2|boolean|null|undefined} ErrorSeverity
- * @typedef {Partial<Record<ErrorCode, ErrorSeverity>>} ErrorFields
+ * @typedef RehypeParseFields
+ *   Extra fields.
+ * @property {boolean | null | undefined} [emitParseErrors=false]
+ *   Whether to emit parse errors while parsing (default: `false`).
  *
- * @typedef ParseFields
- * @property {boolean|undefined} [fragment=false]
- *   Specify whether to parse a fragment, instead of a complete document.
- *   In document mode, unopened `html`, `head`, and `body` elements are opened
- *   in just the right places.
- * @property {boolean|undefined} [emitParseErrors=false]
- *   > ⚠️ Parse errors are currently being added to HTML.
- *   > Not all errors emitted by parse5 (or rehype-parse) are specced yet.
+ *   > 👉 **Note**: parse errors are currently being added to HTML.
+ *   > Not all errors emitted by parse5 (or us) are specced yet.
  *   > Some documentation may still be missing.
- *
- *   Emit parse errors while parsing on the vfile.
- *   Setting this to `true` starts emitting HTML parse errors.
- *
- *   Specific rules can be turned off by setting them to `false` (or `0`).
- *   The default, when `emitParseErrors: true`, is `true` (or `1`), and means
- *   that rules emit as warnings.
- *   Rules can also be configured with `2`, to turn them into fatal errors.
- *
- * @typedef {FromParse5Options & ParseFields & ErrorFields} Options
  */
 
-// @ts-expect-error: remove when typed
-import Parser5 from 'parse5/lib/parser/index.js'
-import {fromParse5} from 'hast-util-from-parse5'
-import {errors} from './errors.js'
-
-const base = 'https://html.spec.whatwg.org/multipage/parsing.html#parse-error-'
-
-const fatalities = {2: true, 1: false, 0: null}
+import {fromHtml} from 'hast-util-from-html'
 
 /**
  * @this {import('unified').Processor}
- * @type {import('unified').Plugin<[Options?] | Array<void>, string, Root>}
+ * @type {import('unified').Plugin<[(Options | null | undefined)?], string, Root>}
  */
 export default function rehypeParse(options) {
   const processorSettings = /** @type {Options} */ (this.data('settings'))
@@ -46,81 +29,20 @@ export default function rehypeParse(options) {
 
   Object.assign(this, {Parser: parser})
 
-  /** @type {import('unified').ParserFunction<Root>} */
+  /** @type {import('unified').Parser<Root>} */
   function parser(doc, file) {
-    const fn = settings.fragment ? 'parseFragment' : 'parse'
-    const onParseError = settings.emitParseErrors ? onerror : null
-    const parse5 = new Parser5({
-      sourceCodeLocationInfo: true,
-      onParseError,
-      scriptingEnabled: false
+    return fromHtml(doc, {
+      ...settings,
+      onerror: settings.emitParseErrors
+        ? function (message) {
+            if (file.path) {
+              message.name = file.path + ':' + message.name
+              message.file = file.path
+            }
+
+            file.messages.push(message)
+          }
+        : undefined
     })
-
-    // @ts-expect-error: `parse5` returns document or fragment, which are always
-    // mapped to roots.
-    return fromParse5(parse5[fn](doc), {
-      space: settings.space,
-      file,
-      verbose: settings.verbose
-    })
-
-    /**
-     * @param {{code: string, startLine: number, startCol: number, startOffset: number, endLine: number, endCol: number, endOffset: number}} error
-     */
-    function onerror(error) {
-      const code = error.code
-      const name = camelcase(code)
-      const setting = settings[name]
-      const config = setting === undefined || setting === null ? true : setting
-      const level = typeof config === 'number' ? config : config ? 1 : 0
-      const start = {
-        line: error.startLine,
-        column: error.startCol,
-        offset: error.startOffset
-      }
-      const end = {
-        line: error.endLine,
-        column: error.endCol,
-        offset: error.endOffset
-      }
-      if (level) {
-        /* c8 ignore next */
-        const info = errors[name] || {reason: '', description: '', url: ''}
-        const message = file.message(format(info.reason), {start, end})
-        message.source = 'parse-error'
-        message.ruleId = code
-        message.fatal = fatalities[level]
-        message.note = format(info.description)
-        message.url = 'url' in info && info.url === false ? null : base + code
-      }
-
-      /**
-       * @param {string} value
-       * @returns {string}
-       */
-      function format(value) {
-        return value
-          .replace(/%c(?:-(\d+))?/g, (_, /** @type {string} */ $1) => {
-            const offset = $1 ? -Number.parseInt($1, 10) : 0
-            const char = doc.charAt(error.startOffset + offset)
-            return char === '`' ? '` ` `' : char
-          })
-          .replace(
-            /%x/g,
-            () =>
-              '0x' +
-              doc.charCodeAt(error.startOffset).toString(16).toUpperCase()
-          )
-      }
-    }
   }
 }
-
-/**
- * @param {string} value
- * @returns {ErrorCode}
- */
-function camelcase(value) {
-  // @ts-expect-error: this returns a valid error code.
-  return value.replace(/-[a-z]/g, ($0) => $0.charAt(1).toUpperCase())
-}
diff --git a/packages/rehype-parse/package.json b/packages/rehype-parse/package.json
index b5d93dfa..be7a4129 100644
--- a/packages/rehype-parse/package.json
+++ b/packages/rehype-parse/package.json
@@ -36,10 +36,9 @@
     "index.js"
   ],
   "dependencies": {
-    "@types/hast": "^2.0.0",
-    "hast-util-from-parse5": "^7.0.0",
-    "parse5": "^6.0.0",
-    "unified": "^10.0.0"
+    "@types/hast": "^3.0.0",
+    "hast-util-from-html": "^2.0.0",
+    "unified": "^11.0.0"
   },
   "scripts": {
     "build": "tsc --build --clean && tsc --build && type-coverage"
diff --git a/packages/rehype-parse/readme.md b/packages/rehype-parse/readme.md
index 00178654..30405d7b 100644
--- a/packages/rehype-parse/readme.md
+++ b/packages/rehype-parse/readme.md
@@ -154,70 +154,7 @@ Rules can also be configured with `2`, to turn them into fatal errors.
 
 The list of parse errors:
 
-<!-- parse-error start -->
-
-*   `abandonedHeadElementChild` — unexpected metadata element after head ([example](https://github.com/rehypejs/rehype/blob/main/test/parse-error/abandoned-head-element-child/index.html))
-*   [`abruptClosingOfEmptyComment`](https://html.spec.whatwg.org/multipage/parsing.html#parse-error-abrupt-closing-of-empty-comment) — unexpected abruptly closed empty comment ([example](https://github.com/rehypejs/rehype/blob/main/test/parse-error/abrupt-closing-of-empty-comment/index.html))
-*   [`abruptDoctypePublicIdentifier`](https://html.spec.whatwg.org/multipage/parsing.html#parse-error-abrupt-doctype-public-identifier) — unexpected abruptly closed public identifier ([example](https://github.com/rehypejs/rehype/blob/main/test/parse-error/abrupt-doctype-public-identifier/index.html))
-*   [`abruptDoctypeSystemIdentifier`](https://html.spec.whatwg.org/multipage/parsing.html#parse-error-abrupt-doctype-system-identifier) — unexpected abruptly closed system identifier ([example](https://github.com/rehypejs/rehype/blob/main/test/parse-error/abrupt-doctype-system-identifier/index.html))
-*   [`absenceOfDigitsInNumericCharacterReference`](https://html.spec.whatwg.org/multipage/parsing.html#parse-error-absence-of-digits-in-numeric-character-reference) — unexpected non-digit at start of numeric character reference ([example](https://github.com/rehypejs/rehype/blob/main/test/parse-error/absence-of-digits-in-numeric-character-reference/index.html))
-*   [`cdataInHtmlContent`](https://html.spec.whatwg.org/multipage/parsing.html#parse-error-cdata-in-html-content) — unexpected CDATA section in HTML ([example](https://github.com/rehypejs/rehype/blob/main/test/parse-error/cdata-in-html-content/index.html))
-*   [`characterReferenceOutsideUnicodeRange`](https://html.spec.whatwg.org/multipage/parsing.html#parse-error-character-reference-outside-unicode-range) — unexpected too big numeric character reference ([example](https://github.com/rehypejs/rehype/blob/main/test/parse-error/character-reference-outside-unicode-range/index.html))
-*   `closingOfElementWithOpenChildElements` — unexpected closing tag with open child elements ([example](https://github.com/rehypejs/rehype/blob/main/test/parse-error/closing-of-element-with-open-child-elements/index.html))
-*   [`controlCharacterInInputStream`](https://html.spec.whatwg.org/multipage/parsing.html#parse-error-control-character-in-input-stream) — unexpected control character ([example](https://github.com/rehypejs/rehype/blob/main/test/parse-error/control-character-in-input-stream/index.html))
-*   [`controlCharacterReference`](https://html.spec.whatwg.org/multipage/parsing.html#parse-error-control-character-reference) — unexpected control character reference ([example](https://github.com/rehypejs/rehype/blob/main/test/parse-error/control-character-reference/index.html))
-*   `disallowedContentInNoscriptInHead` — disallowed content inside `<noscript>` in `<head>` ([example](https://github.com/rehypejs/rehype/blob/main/test/parse-error/disallowed-content-in-noscript-in-head/index.html))
-*   [`duplicateAttribute`](https://html.spec.whatwg.org/multipage/parsing.html#parse-error-duplicate-attribute) — unexpected duplicate attribute ([example](https://github.com/rehypejs/rehype/blob/main/test/parse-error/duplicate-attribute/index.html))
-*   [`endTagWithAttributes`](https://html.spec.whatwg.org/multipage/parsing.html#parse-error-end-tag-with-attributes) — unexpected attribute on closing tag ([example](https://github.com/rehypejs/rehype/blob/main/test/parse-error/end-tag-with-attributes/index.html))
-*   [`endTagWithTrailingSolidus`](https://html.spec.whatwg.org/multipage/parsing.html#parse-error-end-tag-with-trailing-solidus) — unexpected slash at end of closing tag ([example](https://github.com/rehypejs/rehype/blob/main/test/parse-error/end-tag-with-trailing-solidus/index.html))
-*   `endTagWithoutMatchingOpenElement` — unexpected unopened end tag ([example](https://github.com/rehypejs/rehype/blob/main/test/parse-error/end-tag-without-matching-open-element/index.html))
-*   [`eofBeforeTagName`](https://html.spec.whatwg.org/multipage/parsing.html#parse-error-eof-before-tag-name) — unexpected end of file ([example](https://github.com/rehypejs/rehype/blob/main/test/parse-error/eof-before-tag-name/index.html))
-*   [`eofInCdata`](https://html.spec.whatwg.org/multipage/parsing.html#parse-error-eof-in-cdata) — unexpected end of file in CDATA ([example](https://github.com/rehypejs/rehype/blob/main/test/parse-error/eof-in-cdata/index.html))
-*   [`eofInComment`](https://html.spec.whatwg.org/multipage/parsing.html#parse-error-eof-in-comment) — unexpected end of file in comment ([example](https://github.com/rehypejs/rehype/blob/main/test/parse-error/eof-in-comment/index.html))
-*   [`eofInDoctype`](https://html.spec.whatwg.org/multipage/parsing.html#parse-error-eof-in-doctype) — unexpected end of file in doctype ([example](https://github.com/rehypejs/rehype/blob/main/test/parse-error/eof-in-doctype/index.html))
-*   `eofInElementThatCanContainOnlyText` — unexpected end of file in element that can only contain text ([example](https://github.com/rehypejs/rehype/blob/main/test/parse-error/eof-in-element-that-can-contain-only-text/index.html))
-*   [`eofInScriptHtmlCommentLikeText`](https://html.spec.whatwg.org/multipage/parsing.html#parse-error-eof-in-script-html-comment-like-text) — unexpected end of file in comment inside script ([example](https://github.com/rehypejs/rehype/blob/main/test/parse-error/eof-in-script-html-comment-like-text/index.html))
-*   [`eofInTag`](https://html.spec.whatwg.org/multipage/parsing.html#parse-error-eof-in-tag) — unexpected end of file in tag ([example](https://github.com/rehypejs/rehype/blob/main/test/parse-error/eof-in-tag/index.html))
-*   [`incorrectlyClosedComment`](https://html.spec.whatwg.org/multipage/parsing.html#parse-error-incorrectly-closed-comment) — incorrectly closed comment ([example](https://github.com/rehypejs/rehype/blob/main/test/parse-error/incorrectly-closed-comment/index.html))
-*   [`incorrectlyOpenedComment`](https://html.spec.whatwg.org/multipage/parsing.html#parse-error-incorrectly-opened-comment) — incorrectly opened comment ([example](https://github.com/rehypejs/rehype/blob/main/test/parse-error/incorrectly-opened-comment/index.html))
-*   [`invalidCharacterSequenceAfterDoctypeName`](https://html.spec.whatwg.org/multipage/parsing.html#parse-error-invalid-character-sequence-after-doctype-name) — invalid sequence after doctype name ([example](https://github.com/rehypejs/rehype/blob/main/test/parse-error/invalid-character-sequence-after-doctype-name/index.html))
-*   [`invalidFirstCharacterOfTagName`](https://html.spec.whatwg.org/multipage/parsing.html#parse-error-invalid-first-character-of-tag-name) — invalid first character in tag name ([example](https://github.com/rehypejs/rehype/blob/main/test/parse-error/invalid-first-character-of-tag-name/index.html))
-*   `misplacedDoctype` — misplaced doctype ([example](https://github.com/rehypejs/rehype/blob/main/test/parse-error/misplaced-doctype/index.html))
-*   `misplacedStartTagForHeadElement` — misplaced `<head>` start tag ([example](https://github.com/rehypejs/rehype/blob/main/test/parse-error/misplaced-start-tag-for-head-element/index.html))
-*   [`missingAttributeValue`](https://html.spec.whatwg.org/multipage/parsing.html#parse-error-missing-attribute-value) — missing attribute value ([example](https://github.com/rehypejs/rehype/blob/main/test/parse-error/missing-attribute-value/index.html))
-*   `missingDoctype` — missing doctype before other content ([example](https://github.com/rehypejs/rehype/blob/main/test/parse-error/missing-doctype/index.html))
-*   [`missingDoctypeName`](https://html.spec.whatwg.org/multipage/parsing.html#parse-error-missing-doctype-name) — missing doctype name ([example](https://github.com/rehypejs/rehype/blob/main/test/parse-error/missing-doctype-name/index.html))
-*   [`missingDoctypePublicIdentifier`](https://html.spec.whatwg.org/multipage/parsing.html#parse-error-missing-doctype-public-identifier) — missing public identifier in doctype ([example](https://github.com/rehypejs/rehype/blob/main/test/parse-error/missing-doctype-public-identifier/index.html))
-*   [`missingDoctypeSystemIdentifier`](https://html.spec.whatwg.org/multipage/parsing.html#parse-error-missing-doctype-system-identifier) — missing system identifier in doctype ([example](https://github.com/rehypejs/rehype/blob/main/test/parse-error/missing-doctype-system-identifier/index.html))
-*   [`missingEndTagName`](https://html.spec.whatwg.org/multipage/parsing.html#parse-error-missing-end-tag-name) — missing name in end tag ([example](https://github.com/rehypejs/rehype/blob/main/test/parse-error/missing-end-tag-name/index.html))
-*   [`missingQuoteBeforeDoctypePublicIdentifier`](https://html.spec.whatwg.org/multipage/parsing.html#parse-error-missing-quote-before-doctype-public-identifier) — missing quote before public identifier in doctype ([example](https://github.com/rehypejs/rehype/blob/main/test/parse-error/missing-quote-before-doctype-public-identifier/index.html))
-*   [`missingQuoteBeforeDoctypeSystemIdentifier`](https://html.spec.whatwg.org/multipage/parsing.html#parse-error-missing-quote-before-doctype-system-identifier) — missing quote before system identifier in doctype ([example](https://github.com/rehypejs/rehype/blob/main/test/parse-error/missing-quote-before-doctype-system-identifier/index.html))
-*   [`missingSemicolonAfterCharacterReference`](https://html.spec.whatwg.org/multipage/parsing.html#parse-error-missing-semicolon-after-character-reference) — missing semicolon after character reference ([example](https://github.com/rehypejs/rehype/blob/main/test/parse-error/missing-semicolon-after-character-reference/index.html))
-*   [`missingWhitespaceAfterDoctypePublicKeyword`](https://html.spec.whatwg.org/multipage/parsing.html#parse-error-missing-whitespace-after-doctype-public-keyword) — missing whitespace after public identifier in doctype ([example](https://github.com/rehypejs/rehype/blob/main/test/parse-error/missing-whitespace-after-doctype-public-keyword/index.html))
-*   [`missingWhitespaceAfterDoctypeSystemKeyword`](https://html.spec.whatwg.org/multipage/parsing.html#parse-error-missing-whitespace-after-doctype-system-keyword) — missing whitespace after system identifier in doctype ([example](https://github.com/rehypejs/rehype/blob/main/test/parse-error/missing-whitespace-after-doctype-system-keyword/index.html))
-*   [`missingWhitespaceBeforeDoctypeName`](https://html.spec.whatwg.org/multipage/parsing.html#parse-error-missing-whitespace-before-doctype-name) — missing whitespace before doctype name ([example](https://github.com/rehypejs/rehype/blob/main/test/parse-error/missing-whitespace-before-doctype-name/index.html))
-*   [`missingWhitespaceBetweenAttributes`](https://html.spec.whatwg.org/multipage/parsing.html#parse-error-missing-whitespace-between-attributes) — missing whitespace between attributes ([example](https://github.com/rehypejs/rehype/blob/main/test/parse-error/missing-whitespace-between-attributes/index.html))
-*   [`missingWhitespaceBetweenDoctypePublicAndSystemIdentifiers`](https://html.spec.whatwg.org/multipage/parsing.html#parse-error-missing-whitespace-between-doctype-public-and-system-identifiers) — missing whitespace between public and system identifiers in doctype ([example](https://github.com/rehypejs/rehype/blob/main/test/parse-error/missing-whitespace-between-doctype-public-and-system-identifiers/index.html))
-*   [`nestedComment`](https://html.spec.whatwg.org/multipage/parsing.html#parse-error-nested-comment) — unexpected nested comment ([example](https://github.com/rehypejs/rehype/blob/main/test/parse-error/nested-comment/index.html))
-*   `nestedNoscriptInHead` — unexpected nested `<noscript>` in `<head>` ([example](https://github.com/rehypejs/rehype/blob/main/test/parse-error/nested-noscript-in-head/index.html))
-*   `nonConformingDoctype` — unexpected non-conforming doctype declaration ([example](https://github.com/rehypejs/rehype/blob/main/test/parse-error/non-conforming-doctype/index.html))
-*   [`nonVoidHtmlElementStartTagWithTrailingSolidus`](https://html.spec.whatwg.org/multipage/parsing.html#parse-error-non-void-html-element-start-tag-with-trailing-solidus) — unexpected trailing slash on start tag of non-void element ([example](https://github.com/rehypejs/rehype/blob/main/test/parse-error/non-void-html-element-start-tag-with-trailing-solidus/index.html))
-*   [`noncharacterCharacterReference`](https://html.spec.whatwg.org/multipage/parsing.html#parse-error-noncharacter-character-reference) — unexpected noncharacter code point referenced by character reference ([example](https://github.com/rehypejs/rehype/blob/main/test/parse-error/noncharacter-character-reference/index.html))
-*   [`noncharacterInInputStream`](https://html.spec.whatwg.org/multipage/parsing.html#parse-error-noncharacter-in-input-stream) — unexpected noncharacter character ([example](https://github.com/rehypejs/rehype/blob/main/test/parse-error/noncharacter-in-input-stream/index.html))
-*   [`nullCharacterReference`](https://html.spec.whatwg.org/multipage/parsing.html#parse-error-null-character-reference) — unexpected NULL character referenced by character reference ([example](https://github.com/rehypejs/rehype/blob/main/test/parse-error/null-character-reference/index.html))
-*   `openElementsLeftAfterEof` — unexpected end of file ([example](https://github.com/rehypejs/rehype/blob/main/test/parse-error/open-elements-left-after-eof/index.html))
-*   [`surrogateCharacterReference`](https://html.spec.whatwg.org/multipage/parsing.html#parse-error-surrogate-character-reference) — unexpected surrogate character referenced by character reference ([example](https://github.com/rehypejs/rehype/blob/main/test/parse-error/surrogate-character-reference/index.html))
-*   [`surrogateInInputStream`](https://html.spec.whatwg.org/multipage/parsing.html#parse-error-surrogate-in-input-stream) — unexpected surrogate character
-*   [`unexpectedCharacterAfterDoctypeSystemIdentifier`](https://html.spec.whatwg.org/multipage/parsing.html#parse-error-unexpected-character-after-doctype-system-identifier) — invalid character after system identifier in doctype ([example](https://github.com/rehypejs/rehype/blob/main/test/parse-error/unexpected-character-after-doctype-system-identifier/index.html))
-*   [`unexpectedCharacterInAttributeName`](https://html.spec.whatwg.org/multipage/parsing.html#parse-error-unexpected-character-in-attribute-name) — unexpected character in attribute name ([example](https://github.com/rehypejs/rehype/blob/main/test/parse-error/unexpected-character-in-attribute-name/index.html))
-*   [`unexpectedCharacterInUnquotedAttributeValue`](https://html.spec.whatwg.org/multipage/parsing.html#parse-error-unexpected-character-in-unquoted-attribute-value) — unexpected character in unquoted attribute value ([example](https://github.com/rehypejs/rehype/blob/main/test/parse-error/unexpected-character-in-unquoted-attribute-value/index.html))
-*   [`unexpectedEqualsSignBeforeAttributeName`](https://html.spec.whatwg.org/multipage/parsing.html#parse-error-unexpected-equals-sign-before-attribute-name) — unexpected equals sign before attribute name ([example](https://github.com/rehypejs/rehype/blob/main/test/parse-error/unexpected-equals-sign-before-attribute-name/index.html))
-*   [`unexpectedNullCharacter`](https://html.spec.whatwg.org/multipage/parsing.html#parse-error-unexpected-null-character) — unexpected NULL character ([example](https://github.com/rehypejs/rehype/blob/main/test/parse-error/unexpected-null-character/index.html))
-*   [`unexpectedQuestionMarkInsteadOfTagName`](https://html.spec.whatwg.org/multipage/parsing.html#parse-error-unexpected-question-mark-instead-of-tag-name) — unexpected question mark instead of tag name ([example](https://github.com/rehypejs/rehype/blob/main/test/parse-error/unexpected-question-mark-instead-of-tag-name/index.html))
-*   [`unexpectedSolidusInTag`](https://html.spec.whatwg.org/multipage/parsing.html#parse-error-unexpected-solidus-in-tag) — unexpected slash in tag ([example](https://github.com/rehypejs/rehype/blob/main/test/parse-error/unexpected-solidus-in-tag/index.html))
-*   [`unknownNamedCharacterReference`](https://html.spec.whatwg.org/multipage/parsing.html#parse-error-unknown-named-character-reference) — unexpected unknown named character reference ([example](https://github.com/rehypejs/rehype/blob/main/test/parse-error/unknown-named-character-reference/index.html))
-
-<!-- parse-error end -->
+To do: remove this.
 
 ###### `options.verbose`
 
diff --git a/packages/rehype-stringify/lib/index.js b/packages/rehype-stringify/lib/index.js
index 7f88bab7..f10652e5 100644
--- a/packages/rehype-stringify/lib/index.js
+++ b/packages/rehype-stringify/lib/index.js
@@ -8,7 +8,7 @@ import {toHtml} from 'hast-util-to-html'
 
 /**
  * @this {import('unified').Processor}
- * @type {import('unified').Plugin<[Options?]|Array<void>, Node, string>}
+ * @type {import('unified').Plugin<[(Options | null | undefined)?], Node, string>}
  */
 export default function rehypeStringify(config) {
   const processorSettings = /** @type {Options} */ (this.data('settings'))
@@ -17,7 +17,7 @@ export default function rehypeStringify(config) {
   Object.assign(this, {Compiler: compiler})
 
   /**
-   * @type {import('unified').CompilerFunction<Node, string>}
+   * @type {import('unified').Compiler<Node, string>}
    */
   function compiler(tree) {
     return toHtml(tree, settings)
diff --git a/packages/rehype-stringify/package.json b/packages/rehype-stringify/package.json
index 9431fa31..fa3fe120 100644
--- a/packages/rehype-stringify/package.json
+++ b/packages/rehype-stringify/package.json
@@ -38,9 +38,9 @@
     "index.js"
   ],
   "dependencies": {
-    "@types/hast": "^2.0.0",
-    "hast-util-to-html": "^8.0.0",
-    "unified": "^10.0.0"
+    "@types/hast": "^3.0.0",
+    "hast-util-to-html": "^9.0.0",
+    "unified": "^11.0.0"
   },
   "scripts": {
     "build": "tsc --build --clean && tsc --build && type-coverage"
diff --git a/packages/rehype/package.json b/packages/rehype/package.json
index 44d0ba80..b45be3e0 100644
--- a/packages/rehype/package.json
+++ b/packages/rehype/package.json
@@ -17,10 +17,10 @@
     "process"
   ],
   "dependencies": {
-    "@types/hast": "^2.0.0",
+    "@types/hast": "^3.0.0",
     "rehype-parse": "^8.0.0",
     "rehype-stringify": "^9.0.0",
-    "unified": "^10.0.0"
+    "unified": "^11.0.0"
   },
   "homepage": "https://github.com/rehypejs/rehype",
   "repository": "https://github.com/rehypejs/rehype/tree/main/packages/rehype",
diff --git a/script/parse-error.js b/script/parse-error.js
deleted file mode 100644
index ce21ca8a..00000000
--- a/script/parse-error.js
+++ /dev/null
@@ -1,83 +0,0 @@
-/**
- * @typedef {import('mdast').Root} Root
- * @typedef {import('mdast').ListItem} ListItem
- * @typedef {import('mdast').PhrasingContent} PhrasingContent
- */
-
-import fs from 'node:fs'
-import {u} from 'unist-builder'
-import {unified} from 'unified'
-import parse from 'remark-parse'
-import {zone} from 'mdast-zone'
-import {errors} from '../packages/rehype-parse/lib/errors.js'
-
-const own = {}.hasOwnProperty
-
-/** @type {import('type-fest').PackageJson} */
-const pkg = JSON.parse(String(fs.readFileSync('package.json')))
-
-const repo = pkg.repository
-
-const whatwg =
-  'https://html.spec.whatwg.org/multipage/parsing.html#parse-error-'
-const base = 'https://github.com/' + repo + '/blob/main'
-
-/** @type {Partial<Record<keyof errors, boolean>>} */
-const ignoreFixture = {
-  surrogateInInputStream: true
-}
-
-/** @type {import('unified').Plugin<Array<void>, Root>} */
-export default function remarkParseErrors() {
-  return (tree) => {
-    zone(tree, 'parse-error', (start, _, end) => {
-      /** @type {Array<ListItem>} */
-      const list = []
-      /** @type {keyof errors} */
-      let key
-
-      for (key in errors) {
-        if (own.call(errors, key)) {
-          const info = errors[key]
-          const kebab = key.replace(/[A-Z]/g, ($0) => '-' + $0.toLowerCase())
-          const reason =
-            info.reason.charAt(0).toLowerCase() + info.reason.slice(1)
-          const descriptionRoot = /** @type {Root} */ (
-            unified().use(parse).parse(reason)
-          )
-          const headParagraph = descriptionRoot.children[0]
-
-          if (!headParagraph || headParagraph.type !== 'paragraph') {
-            throw new Error('Expected paragraph')
-          }
-
-          const head = u('inlineCode', key)
-          /** @type {Array<PhrasingContent>} */
-          const fields = [
-            'url' in info && info.url === false
-              ? head
-              : u('link', {url: whatwg + kebab}, [head]),
-            u('text', ' — '),
-            ...headParagraph.children
-          ]
-
-          if (!ignoreFixture[key]) {
-            fields.push(
-              u('text', ' ('),
-              u(
-                'link',
-                {url: base + '/test/parse-error/' + kebab + '/index.html'},
-                [u('text', 'example')]
-              ),
-              u('text', ')')
-            )
-          }
-
-          list.push(u('listItem', [u('paragraph', fields)]))
-        }
-      }
-
-      return [start, u('list', {ordered: false, spread: false}, list), end]
-    })
-  }
-}
diff --git a/test/api.js b/test/api.js
index 1f220126..72605d9b 100644
--- a/test/api.js
+++ b/test/api.js
@@ -56,6 +56,7 @@ test('rehype().parse(file)', (t) => {
 
   t.deepEqual(
     unified()
+      // @ts-expect-error: to do: type `settings`.
       .data('settings', {fragment: true})
       .use(rehypeParse, {fragment: false})
       .use(rehypeStringify)
@@ -67,6 +68,7 @@ test('rehype().parse(file)', (t) => {
 
   t.deepEqual(
     unified()
+      // @ts-expect-error: to do: type `settings`.
       .data('settings', {quote: '"'})
       .use(rehypeParse, {fragment: true})
       .use(rehypeStringify, {quote: "'"})
@@ -76,11 +78,14 @@ test('rehype().parse(file)', (t) => {
     'should prefer options given to `rehypeStringify` over `settings`'
   )
 
+  const tree = unified()
+    .use(rehypeParse, {fragment: true})
+    .parse('<img><span></span>')
+
+  removePosition(tree, {force: true})
+
   t.deepEqual(
-    removePosition(
-      unified().use(rehypeParse, {fragment: true}).parse('<img><span></span>'),
-      true
-    ),
+    tree,
     {
       type: 'root',
       children: [
@@ -102,11 +107,11 @@ test('rehype().parse(file)', (t) => {
     'should close void elements'
   )
 
+  const tree2 = unified().use(rehypeParse, fragment).parse('<foo><span></span>')
+  removePosition(tree2, {force: true})
+
   t.deepEqual(
-    removePosition(
-      unified().use(rehypeParse, fragment).parse('<foo><span></span>'),
-      true
-    ),
+    tree2,
     {
       type: 'root',
       children: [
@@ -164,7 +169,7 @@ test('rehype().stringify(ast, file, options?)', (t) => {
 
   t.equal(
     unified()
-      .use(rehypeStringify, {entities: {}})
+      .use(rehypeStringify, {characterReferences: {}})
       .stringify({
         type: 'root',
         children: [{type: 'text', value: 'alpha < bravo'}]
@@ -175,7 +180,7 @@ test('rehype().stringify(ast, file, options?)', (t) => {
 
   t.equal(
     unified()
-      .use(rehypeStringify, {entities: {useNamedReferences: true}})
+      .use(rehypeStringify, {characterReferences: {useNamedReferences: true}})
       .stringify({
         type: 'root',
         children: [{type: 'text', value: 'alpha < bravo'}]
@@ -189,7 +194,9 @@ test('rehype().stringify(ast, file, options?)', (t) => {
       .use(rehypeStringify)
       .stringify({
         type: 'root',
-        children: [{type: 'element', tagName: 'img', children: []}]
+        children: [
+          {type: 'element', tagName: 'img', properties: {}, children: []}
+        ]
       }),
     '<img>',
     'should not close void elements'
@@ -200,7 +207,9 @@ test('rehype().stringify(ast, file, options?)', (t) => {
       .use(rehypeStringify, {closeSelfClosing: true})
       .stringify({
         type: 'root',
-        children: [{type: 'element', tagName: 'img', children: []}]
+        children: [
+          {type: 'element', tagName: 'img', properties: {}, children: []}
+        ]
       }),
     '<img />',
     'should close void elements if `closeSelfClosing` is given'
@@ -211,7 +220,9 @@ test('rehype().stringify(ast, file, options?)', (t) => {
       .use(rehypeStringify)
       .stringify({
         type: 'root',
-        children: [{type: 'element', tagName: 'foo', children: []}]
+        children: [
+          {type: 'element', tagName: 'foo', properties: {}, children: []}
+        ]
       }),
     '<foo></foo>',
     'should not close unknown elements by default'
@@ -222,7 +233,9 @@ test('rehype().stringify(ast, file, options?)', (t) => {
       .use(rehypeStringify, {voids: ['foo']})
       .stringify({
         type: 'root',
-        children: [{type: 'element', tagName: 'foo', children: []}]
+        children: [
+          {type: 'element', tagName: 'foo', properties: {}, children: []}
+        ]
       }),
     '<foo>',
     'should close void elements if configured'
@@ -236,6 +249,7 @@ test('rehype().stringify(ast, file, options?)', (t) => {
 
   t.deepEqual(
     rehype()
+      // @ts-expect-error: to do: type `settings`.
       .data('settings', {emitParseErrors: true})
       .processSync('<!doctypehtml>')
       .messages.map(String),
@@ -246,6 +260,7 @@ test('rehype().stringify(ast, file, options?)', (t) => {
   t.deepEqual(
     rehype()
       .data('settings', {
+        // @ts-expect-error: to do: type `settings`.
         emitParseErrors: true,
         missingWhitespaceBeforeDoctypeName: false
       })
@@ -258,6 +273,7 @@ test('rehype().stringify(ast, file, options?)', (t) => {
   t.deepEqual(
     rehype()
       .data('settings', {
+        // @ts-expect-error: to do: type `settings`.
         emitParseErrors: true,
         missingWhitespaceBeforeDoctypeName: true
       })
@@ -270,6 +286,7 @@ test('rehype().stringify(ast, file, options?)', (t) => {
   t.deepEqual(
     rehype()
       .data('settings', {
+        // @ts-expect-error: to do: type `settings`.
         emitParseErrors: true,
         missingWhitespaceBeforeDoctypeName: 2
       })
@@ -281,6 +298,7 @@ test('rehype().stringify(ast, file, options?)', (t) => {
   t.deepEqual(
     rehype()
       .data('settings', {
+        // @ts-expect-error: to do: type `settings`.
         emitParseErrors: true,
         missingWhitespaceBeforeDoctypeName: 1
       })
@@ -336,6 +354,7 @@ test('fixtures', (t) => {
         result = fs.readFileSync(path.join(fp, 'result.html'), 'utf8')
       } catch {}
 
+      // @ts-expect-error: to do: type `settings`.
       const node = rehype().data('settings', config).parse(file)
 
       try {
@@ -352,6 +371,7 @@ test('fixtures', (t) => {
 
       st.deepEqual(tree, node, 'should parse `' + fixture + '`')
 
+      // @ts-expect-error: to do: type `settings`.
       const out = rehype().data('settings', config).stringify(node)
 
       if (result) {
@@ -360,12 +380,14 @@ test('fixtures', (t) => {
         st.equal(out, String(file), 'should stringify `' + fixture + '` exact')
       }
 
+      removePosition(node)
+
+      // @ts-expect-error: to do: type `settings`.
+      const expected = rehype().data('settings', config).parse(out)
+      removePosition(expected)
+
       if (config.reprocess !== false) {
-        st.deepEqual(
-          removePosition(node),
-          removePosition(rehype().data('settings', config).parse(out)),
-          'should re-parse `' + fixture + '`'
-        )
+        st.deepEqual(node, expected, 'should re-parse `' + fixture + '`')
       }
 
       st.end()
diff --git a/test/cli.js b/test/cli.js
index 3f435595..bb0a1ec8 100644
--- a/test/cli.js
+++ b/test/cli.js
@@ -23,31 +23,32 @@ test('rehype-cli', (t) => {
           '',
           'Options:',
           '',
+          '      --[no-]color                        specify color in report (on by default)',
+          '      --[no-]config                       search for configuration files (on by default)',
+          '  -e  --ext <extensions>                  specify extensions',
+          '      --file-path <path>                  specify path to process as',
+          '  -f  --frail                             exit with 1 on warnings',
           '  -h  --help                              output usage information',
-          '  -v  --version                           output version number',
+          '      --[no-]ignore                       search for ignore files (on by default)',
+          '  -i  --ignore-path <path>                specify ignore file',
+          '      --ignore-path-resolve-from cwd|dir  resolve patterns in `ignore-path` from its directory or cwd',
+          '      --ignore-pattern <globs>            specify ignore patterns',
+          '      --inspect                           output formatted syntax tree',
           '  -o  --output [path]                     specify output location',
+          '  -q  --quiet                             output only warnings and errors',
           '  -r  --rc-path <path>                    specify configuration file',
-          '  -i  --ignore-path <path>                specify ignore file',
+          '      --report <reporter>                 specify reporter',
           '  -s  --setting <settings>                specify settings',
-          '  -e  --ext <extensions>                  specify extensions',
-          '  -u  --use <plugins>                     use plugins',
-          '  -w  --watch                             watch for changes and reprocess',
-          '  -q  --quiet                             output only warnings and errors',
           '  -S  --silent                            output only errors',
-          '  -f  --frail                             exit with 1 on warnings',
-          '  -t  --tree                              specify input and output as syntax tree',
-          '      --report <reporter>                 specify reporter',
-          '      --file-path <path>                  specify path to process as',
-          '      --ignore-path-resolve-from dir|cwd  resolve patterns in `ignore-path` from its directory or cwd',
-          '      --ignore-pattern <globs>            specify ignore patterns',
           '      --silently-ignore                   do not fail when given ignored files',
+          '      --[no-]stdout                       specify writing to stdout (on by default)',
+          '  -t  --tree                              specify input and output as syntax tree',
           '      --tree-in                           specify input as syntax tree',
           '      --tree-out                          output syntax tree',
-          '      --inspect                           output formatted syntax tree',
-          '      --[no-]stdout                       specify writing to stdout (on by default)',
-          '      --[no-]color                        specify color in report (on by default)',
-          '      --[no-]config                       search for configuration files (on by default)',
-          '      --[no-]ignore                       search for ignore files (on by default)',
+          '  -u  --use <plugins>                     use plugins',
+          '      --verbose                           report extra info for messages',
+          '  -v  --version                           output version number',
+          '  -w  --watch                             watch for changes and reprocess',
           '',
           'Examples:',
           '',
diff --git a/test/fixtures/adoption/index.json b/test/fixtures/adoption/index.json
index b438d8b2..322de396 100644
--- a/test/fixtures/adoption/index.json
+++ b/test/fixtures/adoption/index.json
@@ -52,8 +52,8 @@
         },
         "end": {
           "line": 1,
-          "column": 10,
-          "offset": 9
+          "column": 17,
+          "offset": 16
         }
       }
     },
diff --git a/test/fixtures/element-loose-close-document/index.json b/test/fixtures/element-loose-close-document/index.json
index e8175cd5..015c4fa7 100644
--- a/test/fixtures/element-loose-close-document/index.json
+++ b/test/fixtures/element-loose-close-document/index.json
@@ -104,9 +104,9 @@
               "offset": 0
             },
             "end": {
-              "line": 7,
-              "column": 1,
-              "offset": 51
+              "line": 1,
+              "column": 20,
+              "offset": 19
             }
           }
         }
diff --git a/test/fixtures/html-in-svg-in-html/index.json b/test/fixtures/html-in-svg-in-html/index.json
index fc7286aa..355b4764 100644
--- a/test/fixtures/html-in-svg-in-html/index.json
+++ b/test/fixtures/html-in-svg-in-html/index.json
@@ -237,8 +237,8 @@
                 },
                 "end": {
                   "line": 15,
-                  "column": 5,
-                  "offset": 728
+                  "column": 21,
+                  "offset": 744
                 }
               }
             },
diff --git a/test/fixtures/svg-in-html/index.json b/test/fixtures/svg-in-html/index.json
index 38e9be74..93868497 100644
--- a/test/fixtures/svg-in-html/index.json
+++ b/test/fixtures/svg-in-html/index.json
@@ -244,9 +244,9 @@
               "offset": 90
             },
             "end": {
-              "line": 12,
-              "column": 1,
-              "offset": 235
+              "line": 10,
+              "column": 10,
+              "offset": 226
             }
           }
         }
@@ -258,9 +258,9 @@
           "offset": 16
         },
         "end": {
-          "line": 12,
-          "column": 1,
-          "offset": 235
+          "line": 11,
+          "column": 8,
+          "offset": 234
         }
       }
     }
diff --git a/test/fixtures/verbose/index.json b/test/fixtures/verbose/index.json
index 20486660..7ab15db9 100644
--- a/test/fixtures/verbose/index.json
+++ b/test/fixtures/verbose/index.json
@@ -38,18 +38,17 @@
                       "offset": 17
                     }
                   },
-                  "closing": null,
                   "properties": {
                     "src": {
                       "start": {
                         "line": 1,
-                        "column": 14,
-                        "offset": 13
+                        "column": 6,
+                        "offset": 5
                       },
                       "end": {
                         "line": 1,
-                        "column": 17,
-                        "offset": 16
+                        "column": 13,
+                        "offset": 12
                       }
                     }
                   }
@@ -120,7 +119,6 @@
                       "offset": 21
                     }
                   },
-                  "closing": null,
                   "properties": {}
                 }
               },
diff --git a/test/fixtures/xhtml/index.json b/test/fixtures/xhtml/index.json
index fc0c91c0..a045d8d2 100644
--- a/test/fixtures/xhtml/index.json
+++ b/test/fixtures/xhtml/index.json
@@ -206,9 +206,9 @@
               "offset": 140
             },
             "end": {
-              "line": 10,
-              "column": 1,
-              "offset": 194
+              "line": 8,
+              "column": 10,
+              "offset": 185
             }
           }
         }
@@ -220,9 +220,9 @@
           "offset": 39
         },
         "end": {
-          "line": 10,
-          "column": 1,
-          "offset": 194
+          "line": 9,
+          "column": 8,
+          "offset": 193
         }
       }
     }
diff --git a/test/parse-error.js b/test/parse-error.js
index 3da41286..07956ea9 100644
--- a/test/parse-error.js
+++ b/test/parse-error.js
@@ -1,23 +1,9 @@
 import fs from 'node:fs'
 import path from 'node:path'
+import process from 'node:process'
 import test from 'tape'
 import {toVFile, readSync} from 'to-vfile'
 import {rehype} from 'rehype'
-// @ts-expect-error: untyped.
-import p5errors from 'parse5/lib/common/error-codes.js'
-import {errors as rerrors} from 'rehype-parse/lib/errors.js'
-
-// Related to https://github.com/inikulin/parse5/issues/255
-// and https://github.com/inikulin/parse5/pull/257.
-test('coverage', (t) => {
-  t.deepEqual(
-    Object.keys(p5errors).sort(),
-    Object.keys(rerrors).sort(),
-    'all codes from parse5 should be covered by rehype-parse'
-  )
-
-  t.end()
-})
 
 test('parse-errors', (t) => {
   let index = -1
@@ -30,27 +16,28 @@ test('parse-errors', (t) => {
       value: '<!doctype html>\n' + String.fromCharCode(0xd8_00)
     })
 
+    // @ts-expect-error: to do: type settings.
     rehype().data('settings', {emitParseErrors: true}).parse(file)
 
     st.deepEqual(
       JSON.parse(JSON.stringify(file.messages)),
       [
         {
+          column: 1,
+          fatal: false,
           message: 'Unexpected surrogate character',
-          name: 'index.html:2:1-2:1',
-          reason: 'Unexpected surrogate character',
           line: 2,
-          column: 1,
-          position: {
+          name: 'index.html:2:1-2:1',
+          place: {
             start: {line: 2, column: 1, offset: 16},
             end: {line: 2, column: 1, offset: 16}
           },
-          source: 'parse-error',
+          reason: 'Unexpected surrogate character',
           ruleId: 'surrogate-in-input-stream',
-          file: 'index.html',
-          fatal: false,
+          source: 'hast-util-from-html',
           note: 'Unexpected code point `0xD800`. Do not use lone surrogate characters in HTML',
-          url: 'https://html.spec.whatwg.org/multipage/parsing.html#parse-error-surrogate-in-input-stream'
+          url: 'https://html.spec.whatwg.org/multipage/parsing.html#parse-error-surrogate-in-input-stream',
+          file: 'index.html'
         }
       ],
       'should emit messages'
@@ -78,18 +65,29 @@ test('parse-errors', (t) => {
     t.test(fixture, (st) => {
       const file = readSync(path.join(fp, 'index.html'), 'utf8')
       /** @type {Array<Error>} */
-      const messages = JSON.parse(
-        // @ts-expect-error: xo removes `utf8` (because it’s not needed), ts wants it.
-        fs.readFileSync(path.join(fp, 'messages.json'))
+      let expected = JSON.parse(
+        String(fs.readFileSync(path.join(fp, 'messages.json')))
       )
 
       file.dirname = ''
 
+      // @ts-expect-error: to do: type settings.
       rehype().data('settings', {emitParseErrors: true}).parse(file)
 
+      /** @type {Array<Error>} */
+      const actual = JSON.parse(JSON.stringify(file.messages))
+
+      if ('UPDATE' in process.env) {
+        expected = actual
+        fs.writeFileSync(
+          path.join(fp, 'messages.json'),
+          JSON.stringify(expected, undefined, 2) + '\n'
+        )
+      }
+
       st.deepEqual(
-        JSON.parse(JSON.stringify(file.messages)),
-        messages,
+        actual,
+        expected,
         'should emit messages for `' + fixture + '`'
       )
 
diff --git a/test/parse-error/abandoned-head-element-child/messages.json b/test/parse-error/abandoned-head-element-child/messages.json
index d97fd6d8..81557f56 100644
--- a/test/parse-error/abandoned-head-element-child/messages.json
+++ b/test/parse-error/abandoned-head-element-child/messages.json
@@ -1,11 +1,11 @@
 [
   {
+    "column": 1,
+    "fatal": false,
     "message": "Unexpected metadata element after head",
-    "name": "index.html:4:1-4:9",
-    "reason": "Unexpected metadata element after head",
     "line": 4,
-    "column": 1,
-    "position": {
+    "name": "index.html:4:1-4:9",
+    "place": {
       "start": {
         "line": 4,
         "column": 1,
@@ -17,11 +17,10 @@
         "offset": 76
       }
     },
-    "source": "parse-error",
+    "reason": "Unexpected metadata element after head",
     "ruleId": "abandoned-head-element-child",
-    "file": "index.html",
-    "fatal": false,
+    "source": "hast-util-from-html",
     "note": "Unexpected element after head. Expected the element before `</head>`",
-    "url": null
+    "file": "index.html"
   }
 ]
diff --git a/test/parse-error/abrupt-closing-of-empty-comment/messages.json b/test/parse-error/abrupt-closing-of-empty-comment/messages.json
index 56eb37f2..c073726b 100644
--- a/test/parse-error/abrupt-closing-of-empty-comment/messages.json
+++ b/test/parse-error/abrupt-closing-of-empty-comment/messages.json
@@ -1,11 +1,11 @@
 [
   {
+    "column": 15,
+    "fatal": false,
     "message": "Unexpected abruptly closed empty comment",
-    "name": "index.html:3:15-3:15",
-    "reason": "Unexpected abruptly closed empty comment",
     "line": 3,
-    "column": 15,
-    "position": {
+    "name": "index.html:3:15-3:15",
+    "place": {
       "start": {
         "line": 3,
         "column": 15,
@@ -17,20 +17,20 @@
         "offset": 77
       }
     },
-    "source": "parse-error",
+    "reason": "Unexpected abruptly closed empty comment",
     "ruleId": "abrupt-closing-of-empty-comment",
-    "file": "index.html",
-    "fatal": false,
+    "source": "hast-util-from-html",
     "note": "Unexpected `>` or `->`. Expected `-->` to close comments",
-    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-abrupt-closing-of-empty-comment"
+    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-abrupt-closing-of-empty-comment",
+    "file": "index.html"
   },
   {
+    "column": 20,
+    "fatal": false,
     "message": "Unexpected abruptly closed empty comment",
-    "name": "index.html:4:20-4:20",
-    "reason": "Unexpected abruptly closed empty comment",
     "line": 4,
-    "column": 20,
-    "position": {
+    "name": "index.html:4:20-4:20",
+    "place": {
       "start": {
         "line": 4,
         "column": 20,
@@ -42,11 +42,11 @@
         "offset": 99
       }
     },
-    "source": "parse-error",
+    "reason": "Unexpected abruptly closed empty comment",
     "ruleId": "abrupt-closing-of-empty-comment",
-    "file": "index.html",
-    "fatal": false,
+    "source": "hast-util-from-html",
     "note": "Unexpected `>` or `->`. Expected `-->` to close comments",
-    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-abrupt-closing-of-empty-comment"
+    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-abrupt-closing-of-empty-comment",
+    "file": "index.html"
   }
 ]
diff --git a/test/parse-error/abrupt-doctype-public-identifier/messages.json b/test/parse-error/abrupt-doctype-public-identifier/messages.json
index f90a37a6..5a20cdef 100644
--- a/test/parse-error/abrupt-doctype-public-identifier/messages.json
+++ b/test/parse-error/abrupt-doctype-public-identifier/messages.json
@@ -1,11 +1,11 @@
 [
   {
+    "column": 27,
+    "fatal": false,
     "message": "Unexpected abruptly closed public identifier",
-    "name": "index.html:1:27-1:27",
-    "reason": "Unexpected abruptly closed public identifier",
     "line": 1,
-    "column": 27,
-    "position": {
+    "name": "index.html:1:27-1:27",
+    "place": {
       "start": {
         "line": 1,
         "column": 27,
@@ -17,20 +17,20 @@
         "offset": 26
       }
     },
-    "source": "parse-error",
+    "reason": "Unexpected abruptly closed public identifier",
     "ruleId": "abrupt-doctype-public-identifier",
-    "file": "index.html",
-    "fatal": false,
+    "source": "hast-util-from-html",
     "note": "Unexpected `>`. Expected a closing `\"` or `'` after the public identifier",
-    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-abrupt-doctype-public-identifier"
+    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-abrupt-doctype-public-identifier",
+    "file": "index.html"
   },
   {
+    "column": 1,
+    "fatal": false,
     "message": "Unexpected non-conforming doctype declaration",
-    "name": "index.html:1:1-1:28",
-    "reason": "Unexpected non-conforming doctype declaration",
     "line": 1,
-    "column": 1,
-    "position": {
+    "name": "index.html:1:1-1:28",
+    "place": {
       "start": {
         "line": 1,
         "column": 1,
@@ -42,11 +42,10 @@
         "offset": 27
       }
     },
-    "source": "parse-error",
+    "reason": "Unexpected non-conforming doctype declaration",
     "ruleId": "non-conforming-doctype",
-    "file": "index.html",
-    "fatal": false,
+    "source": "hast-util-from-html",
     "note": "Expected `<!doctype html>` or `<!doctype html system \"about:legacy-compat\">`",
-    "url": null
+    "file": "index.html"
   }
 ]
diff --git a/test/parse-error/abrupt-doctype-system-identifier/messages.json b/test/parse-error/abrupt-doctype-system-identifier/messages.json
index 8ca81631..8fc61868 100644
--- a/test/parse-error/abrupt-doctype-system-identifier/messages.json
+++ b/test/parse-error/abrupt-doctype-system-identifier/messages.json
@@ -1,11 +1,11 @@
 [
   {
+    "column": 55,
+    "fatal": false,
     "message": "Unexpected abruptly closed system identifier",
-    "name": "index.html:1:55-1:55",
-    "reason": "Unexpected abruptly closed system identifier",
     "line": 1,
-    "column": 55,
-    "position": {
+    "name": "index.html:1:55-1:55",
+    "place": {
       "start": {
         "line": 1,
         "column": 55,
@@ -17,20 +17,20 @@
         "offset": 54
       }
     },
-    "source": "parse-error",
+    "reason": "Unexpected abruptly closed system identifier",
     "ruleId": "abrupt-doctype-system-identifier",
-    "file": "index.html",
-    "fatal": false,
+    "source": "hast-util-from-html",
     "note": "Unexpected `>`. Expected a closing `\"` or `'` after the identifier identifier",
-    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-abrupt-doctype-system-identifier"
+    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-abrupt-doctype-system-identifier",
+    "file": "index.html"
   },
   {
+    "column": 1,
+    "fatal": false,
     "message": "Unexpected non-conforming doctype declaration",
-    "name": "index.html:1:1-1:56",
-    "reason": "Unexpected non-conforming doctype declaration",
     "line": 1,
-    "column": 1,
-    "position": {
+    "name": "index.html:1:1-1:56",
+    "place": {
       "start": {
         "line": 1,
         "column": 1,
@@ -42,11 +42,10 @@
         "offset": 55
       }
     },
-    "source": "parse-error",
+    "reason": "Unexpected non-conforming doctype declaration",
     "ruleId": "non-conforming-doctype",
-    "file": "index.html",
-    "fatal": false,
+    "source": "hast-util-from-html",
     "note": "Expected `<!doctype html>` or `<!doctype html system \"about:legacy-compat\">`",
-    "url": null
+    "file": "index.html"
   }
 ]
diff --git a/test/parse-error/absence-of-digits-in-numeric-character-reference/messages.json b/test/parse-error/absence-of-digits-in-numeric-character-reference/messages.json
index 7e21d200..279664c2 100644
--- a/test/parse-error/absence-of-digits-in-numeric-character-reference/messages.json
+++ b/test/parse-error/absence-of-digits-in-numeric-character-reference/messages.json
@@ -1,11 +1,11 @@
 [
   {
+    "column": 3,
+    "fatal": false,
     "message": "Unexpected non-digit at start of numeric character reference",
-    "name": "index.html:3:3-3:3",
-    "reason": "Unexpected non-digit at start of numeric character reference",
     "line": 3,
-    "column": 3,
-    "position": {
+    "name": "index.html:3:3-3:3",
+    "place": {
       "start": {
         "line": 3,
         "column": 3,
@@ -17,20 +17,20 @@
         "offset": 82
       }
     },
-    "source": "parse-error",
+    "reason": "Unexpected non-digit at start of numeric character reference",
     "ruleId": "absence-of-digits-in-numeric-character-reference",
-    "file": "index.html",
-    "fatal": false,
+    "source": "hast-util-from-html",
     "note": "Unexpected `a`. Expected `[0-9]` for decimal references or `[0-9a-fA-F]` for hexadecimal references",
-    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-absence-of-digits-in-numeric-character-reference"
+    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-absence-of-digits-in-numeric-character-reference",
+    "file": "index.html"
   },
   {
+    "column": 4,
+    "fatal": false,
     "message": "Unexpected non-digit at start of numeric character reference",
-    "name": "index.html:4:4-4:4",
-    "reason": "Unexpected non-digit at start of numeric character reference",
     "line": 4,
-    "column": 4,
-    "position": {
+    "name": "index.html:4:4-4:4",
+    "place": {
       "start": {
         "line": 4,
         "column": 4,
@@ -42,11 +42,11 @@
         "offset": 90
       }
     },
-    "source": "parse-error",
+    "reason": "Unexpected non-digit at start of numeric character reference",
     "ruleId": "absence-of-digits-in-numeric-character-reference",
-    "file": "index.html",
-    "fatal": false,
+    "source": "hast-util-from-html",
     "note": "Unexpected `g`. Expected `[0-9]` for decimal references or `[0-9a-fA-F]` for hexadecimal references",
-    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-absence-of-digits-in-numeric-character-reference"
+    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-absence-of-digits-in-numeric-character-reference",
+    "file": "index.html"
   }
 ]
diff --git a/test/parse-error/cdata-in-html-content/messages.json b/test/parse-error/cdata-in-html-content/messages.json
index d2ad065a..7b923fa7 100644
--- a/test/parse-error/cdata-in-html-content/messages.json
+++ b/test/parse-error/cdata-in-html-content/messages.json
@@ -1,11 +1,11 @@
 [
   {
+    "column": 9,
+    "fatal": false,
     "message": "Unexpected CDATA section in HTML",
-    "name": "index.html:3:9-3:9",
-    "reason": "Unexpected CDATA section in HTML",
     "line": 3,
-    "column": 9,
-    "position": {
+    "name": "index.html:3:9-3:9",
+    "place": {
       "start": {
         "line": 3,
         "column": 9,
@@ -17,11 +17,11 @@
         "offset": 61
       }
     },
-    "source": "parse-error",
+    "reason": "Unexpected CDATA section in HTML",
     "ruleId": "cdata-in-html-content",
-    "file": "index.html",
-    "fatal": false,
+    "source": "hast-util-from-html",
     "note": "Unexpected `<![CDATA[` in HTML. Remove it, use a comment, or encode special characters instead",
-    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-cdata-in-html-content"
+    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-cdata-in-html-content",
+    "file": "index.html"
   }
 ]
diff --git a/test/parse-error/character-reference-outside-unicode-range/messages.json b/test/parse-error/character-reference-outside-unicode-range/messages.json
index 5d4057ed..1102f293 100644
--- a/test/parse-error/character-reference-outside-unicode-range/messages.json
+++ b/test/parse-error/character-reference-outside-unicode-range/messages.json
@@ -1,11 +1,11 @@
 [
   {
+    "column": 11,
+    "fatal": false,
     "message": "Unexpected too big numeric character reference",
-    "name": "index.html:3:11-3:11",
-    "reason": "Unexpected too big numeric character reference",
     "line": 3,
-    "column": 11,
-    "position": {
+    "name": "index.html:3:11-3:11",
+    "place": {
       "start": {
         "line": 3,
         "column": 11,
@@ -17,20 +17,20 @@
         "offset": 83
       }
     },
-    "source": "parse-error",
+    "reason": "Unexpected too big numeric character reference",
     "ruleId": "character-reference-outside-unicode-range",
-    "file": "index.html",
-    "fatal": false,
+    "source": "hast-util-from-html",
     "note": "Unexpectedly high character reference. Expected character references to be at most hexadecimal 10ffff (or decimal 1114111)",
-    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-character-reference-outside-unicode-range"
+    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-character-reference-outside-unicode-range",
+    "file": "index.html"
   },
   {
+    "column": 11,
+    "fatal": false,
     "message": "Unexpected too big numeric character reference",
-    "name": "index.html:4:11-4:11",
-    "reason": "Unexpected too big numeric character reference",
     "line": 4,
-    "column": 11,
-    "position": {
+    "name": "index.html:4:11-4:11",
+    "place": {
       "start": {
         "line": 4,
         "column": 11,
@@ -42,11 +42,11 @@
         "offset": 94
       }
     },
-    "source": "parse-error",
+    "reason": "Unexpected too big numeric character reference",
     "ruleId": "character-reference-outside-unicode-range",
-    "file": "index.html",
-    "fatal": false,
+    "source": "hast-util-from-html",
     "note": "Unexpectedly high character reference. Expected character references to be at most hexadecimal 10ffff (or decimal 1114111)",
-    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-character-reference-outside-unicode-range"
+    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-character-reference-outside-unicode-range",
+    "file": "index.html"
   }
 ]
diff --git a/test/parse-error/closing-of-element-with-open-child-elements/messages.json b/test/parse-error/closing-of-element-with-open-child-elements/messages.json
index 06b0ed92..db666a7d 100644
--- a/test/parse-error/closing-of-element-with-open-child-elements/messages.json
+++ b/test/parse-error/closing-of-element-with-open-child-elements/messages.json
@@ -1,11 +1,11 @@
 [
   {
+    "column": 19,
+    "fatal": false,
     "message": "Unexpected closing tag with open child elements",
-    "name": "index.html:3:19-3:30",
-    "reason": "Unexpected closing tag with open child elements",
     "line": 3,
-    "column": 19,
-    "position": {
+    "name": "index.html:3:19-3:30",
+    "place": {
       "start": {
         "line": 3,
         "column": 19,
@@ -17,11 +17,10 @@
         "offset": 104
       }
     },
-    "source": "parse-error",
+    "reason": "Unexpected closing tag with open child elements",
     "ruleId": "closing-of-element-with-open-child-elements",
-    "file": "index.html",
-    "fatal": false,
+    "source": "hast-util-from-html",
     "note": "Unexpectedly closing tag. Expected other tags to be closed first",
-    "url": null
+    "file": "index.html"
   }
 ]
diff --git a/test/parse-error/control-character-in-input-stream/messages.json b/test/parse-error/control-character-in-input-stream/messages.json
index 56142a94..c46ee8dd 100644
--- a/test/parse-error/control-character-in-input-stream/messages.json
+++ b/test/parse-error/control-character-in-input-stream/messages.json
@@ -1,11 +1,11 @@
 [
   {
+    "column": 1,
+    "fatal": false,
     "message": "Unexpected control character",
-    "name": "index.html:4:1-4:1",
-    "reason": "Unexpected control character",
     "line": 4,
-    "column": 1,
-    "position": {
+    "name": "index.html:4:1-4:1",
+    "place": {
       "start": {
         "line": 4,
         "column": 1,
@@ -17,11 +17,11 @@
         "offset": 111
       }
     },
-    "source": "parse-error",
+    "reason": "Unexpected control character",
     "ruleId": "control-character-in-input-stream",
-    "file": "index.html",
-    "fatal": false,
+    "source": "hast-util-from-html",
     "note": "Unexpected control character `0x7F`. Expected a non-control code point, 0x00, or ASCII whitespace",
-    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-control-character-in-input-stream"
+    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-control-character-in-input-stream",
+    "file": "index.html"
   }
 ]
diff --git a/test/parse-error/control-character-reference/messages.json b/test/parse-error/control-character-reference/messages.json
index 1a50c1f0..3a1743f5 100644
--- a/test/parse-error/control-character-reference/messages.json
+++ b/test/parse-error/control-character-reference/messages.json
@@ -1,11 +1,11 @@
 [
   {
+    "column": 7,
+    "fatal": false,
     "message": "Unexpected control character reference",
-    "name": "index.html:3:7-3:7",
-    "reason": "Unexpected control character reference",
     "line": 3,
-    "column": 7,
-    "position": {
+    "name": "index.html:3:7-3:7",
+    "place": {
       "start": {
         "line": 3,
         "column": 7,
@@ -17,11 +17,11 @@
         "offset": 65
       }
     },
-    "source": "parse-error",
+    "reason": "Unexpected control character reference",
     "ruleId": "control-character-reference",
-    "file": "index.html",
-    "fatal": false,
+    "source": "hast-util-from-html",
     "note": "Unexpectedly control character in reference. Expected a non-control code point, 0x00, or ASCII whitespace",
-    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-control-character-reference"
+    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-control-character-reference",
+    "file": "index.html"
   }
 ]
diff --git a/test/parse-error/disallowed-content-in-noscript-in-head/messages.json b/test/parse-error/disallowed-content-in-noscript-in-head/messages.json
index f6b8390b..0ae57bd7 100644
--- a/test/parse-error/disallowed-content-in-noscript-in-head/messages.json
+++ b/test/parse-error/disallowed-content-in-noscript-in-head/messages.json
@@ -1,11 +1,11 @@
 [
   {
+    "column": 11,
+    "fatal": false,
     "message": "Disallowed content inside `<noscript>` in `<head>`",
-    "name": "index.html:3:11-3:14",
-    "reason": "Disallowed content inside `<noscript>` in `<head>`",
     "line": 3,
-    "column": 11,
-    "position": {
+    "name": "index.html:3:11-3:14",
+    "place": {
       "start": {
         "line": 3,
         "column": 11,
@@ -17,11 +17,10 @@
         "offset": 83
       }
     },
-    "source": "parse-error",
+    "reason": "Disallowed content inside `<noscript>` in `<head>`",
     "ruleId": "disallowed-content-in-noscript-in-head",
-    "file": "index.html",
-    "fatal": false,
+    "source": "hast-util-from-html",
     "note": "Unexpected text character `h`. Only use text in `<noscript>`s in `<body>`",
-    "url": null
+    "file": "index.html"
   }
 ]
diff --git a/test/parse-error/duplicate-attribute/messages.json b/test/parse-error/duplicate-attribute/messages.json
index 5f3cd08c..762e9a46 100644
--- a/test/parse-error/duplicate-attribute/messages.json
+++ b/test/parse-error/duplicate-attribute/messages.json
@@ -1,11 +1,11 @@
 [
   {
+    "column": 15,
+    "fatal": false,
     "message": "Unexpected duplicate attribute",
-    "name": "index.html:2:15-2:15",
-    "reason": "Unexpected duplicate attribute",
     "line": 2,
-    "column": 15,
-    "position": {
+    "name": "index.html:2:15-2:15",
+    "place": {
       "start": {
         "line": 2,
         "column": 15,
@@ -17,11 +17,11 @@
         "offset": 30
       }
     },
-    "source": "parse-error",
+    "reason": "Unexpected duplicate attribute",
     "ruleId": "duplicate-attribute",
-    "file": "index.html",
-    "fatal": false,
+    "source": "hast-util-from-html",
     "note": "Unexpectedly double attribute. Expected attributes to occur only once",
-    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-duplicate-attribute"
+    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-duplicate-attribute",
+    "file": "index.html"
   }
 ]
diff --git a/test/parse-error/end-tag-with-attributes/messages.json b/test/parse-error/end-tag-with-attributes/messages.json
index a9463eef..ffb98581 100644
--- a/test/parse-error/end-tag-with-attributes/messages.json
+++ b/test/parse-error/end-tag-with-attributes/messages.json
@@ -1,11 +1,11 @@
 [
   {
+    "column": 45,
+    "fatal": false,
     "message": "Unexpected attribute on closing tag",
-    "name": "index.html:2:45-2:45",
-    "reason": "Unexpected attribute on closing tag",
     "line": 2,
-    "column": 45,
-    "position": {
+    "name": "index.html:2:45-2:45",
+    "place": {
       "start": {
         "line": 2,
         "column": 45,
@@ -17,11 +17,11 @@
         "offset": 60
       }
     },
-    "source": "parse-error",
+    "reason": "Unexpected attribute on closing tag",
     "ruleId": "end-tag-with-attributes",
-    "file": "index.html",
-    "fatal": false,
+    "source": "hast-util-from-html",
     "note": "Unexpected attribute. Expected `>` instead",
-    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-end-tag-with-attributes"
+    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-end-tag-with-attributes",
+    "file": "index.html"
   }
 ]
diff --git a/test/parse-error/end-tag-with-trailing-solidus/messages.json b/test/parse-error/end-tag-with-trailing-solidus/messages.json
index 54bb0e47..72ba1723 100644
--- a/test/parse-error/end-tag-with-trailing-solidus/messages.json
+++ b/test/parse-error/end-tag-with-trailing-solidus/messages.json
@@ -1,11 +1,11 @@
 [
   {
+    "column": 45,
+    "fatal": false,
     "message": "Unexpected slash at end of closing tag",
-    "name": "index.html:2:45-2:45",
-    "reason": "Unexpected slash at end of closing tag",
     "line": 2,
-    "column": 45,
-    "position": {
+    "name": "index.html:2:45-2:45",
+    "place": {
       "start": {
         "line": 2,
         "column": 45,
@@ -17,11 +17,11 @@
         "offset": 60
       }
     },
-    "source": "parse-error",
+    "reason": "Unexpected slash at end of closing tag",
     "ruleId": "end-tag-with-trailing-solidus",
-    "file": "index.html",
-    "fatal": false,
+    "source": "hast-util-from-html",
     "note": "Unexpected `/`. Expected `>` instead",
-    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-end-tag-with-trailing-solidus"
+    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-end-tag-with-trailing-solidus",
+    "file": "index.html"
   }
 ]
diff --git a/test/parse-error/end-tag-without-matching-open-element/messages.json b/test/parse-error/end-tag-without-matching-open-element/messages.json
index 44e43491..eb2bdc05 100644
--- a/test/parse-error/end-tag-without-matching-open-element/messages.json
+++ b/test/parse-error/end-tag-without-matching-open-element/messages.json
@@ -1,11 +1,11 @@
 [
   {
+    "column": 1,
+    "fatal": false,
     "message": "Unexpected unopened end tag",
-    "name": "index.html:3:1-3:12",
-    "reason": "Unexpected unopened end tag",
     "line": 3,
-    "column": 1,
-    "position": {
+    "name": "index.html:3:1-3:12",
+    "place": {
       "start": {
         "line": 3,
         "column": 1,
@@ -17,11 +17,10 @@
         "offset": 80
       }
     },
-    "source": "parse-error",
+    "reason": "Unexpected unopened end tag",
     "ruleId": "end-tag-without-matching-open-element",
-    "file": "index.html",
-    "fatal": false,
+    "source": "hast-util-from-html",
     "note": "Unexpected end tag. Expected no end tag or another end tag",
-    "url": null
+    "file": "index.html"
   }
 ]
diff --git a/test/parse-error/eof-before-tag-name/messages.json b/test/parse-error/eof-before-tag-name/messages.json
index 96430661..372fdab4 100644
--- a/test/parse-error/eof-before-tag-name/messages.json
+++ b/test/parse-error/eof-before-tag-name/messages.json
@@ -1,11 +1,11 @@
 [
   {
+    "column": 2,
+    "fatal": false,
     "message": "Unexpected end of file",
-    "name": "index.html:3:2-3:2",
-    "reason": "Unexpected end of file",
     "line": 3,
-    "column": 2,
-    "position": {
+    "name": "index.html:3:2-3:2",
+    "place": {
       "start": {
         "line": 3,
         "column": 2,
@@ -17,11 +17,11 @@
         "offset": 52
       }
     },
-    "source": "parse-error",
+    "reason": "Unexpected end of file",
     "ruleId": "eof-before-tag-name",
-    "file": "index.html",
-    "fatal": false,
+    "source": "hast-util-from-html",
     "note": "Unexpected end of file. Expected tag name instead",
-    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-eof-before-tag-name"
+    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-eof-before-tag-name",
+    "file": "index.html"
   }
 ]
diff --git a/test/parse-error/eof-in-cdata/messages.json b/test/parse-error/eof-in-cdata/messages.json
index 8a589ec4..11761d16 100644
--- a/test/parse-error/eof-in-cdata/messages.json
+++ b/test/parse-error/eof-in-cdata/messages.json
@@ -1,11 +1,11 @@
 [
   {
+    "column": 1,
+    "fatal": false,
     "message": "Unexpected end of file in CDATA",
-    "name": "index.html:4:1-4:1",
-    "reason": "Unexpected end of file in CDATA",
     "line": 4,
-    "column": 1,
-    "position": {
+    "name": "index.html:4:1-4:1",
+    "place": {
       "start": {
         "line": 4,
         "column": 1,
@@ -17,11 +17,11 @@
         "offset": 59
       }
     },
-    "source": "parse-error",
+    "reason": "Unexpected end of file in CDATA",
     "ruleId": "eof-in-cdata",
-    "file": "index.html",
-    "fatal": false,
+    "source": "hast-util-from-html",
     "note": "Unexpected end of file. Expected `]]>` to close the CDATA",
-    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-eof-in-cdata"
+    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-eof-in-cdata",
+    "file": "index.html"
   }
 ]
diff --git a/test/parse-error/eof-in-comment/messages.json b/test/parse-error/eof-in-comment/messages.json
index 165a33e1..e205864f 100644
--- a/test/parse-error/eof-in-comment/messages.json
+++ b/test/parse-error/eof-in-comment/messages.json
@@ -1,11 +1,11 @@
 [
   {
+    "column": 1,
+    "fatal": false,
     "message": "Unexpected end of file in comment",
-    "name": "index.html:4:1-4:1",
-    "reason": "Unexpected end of file in comment",
     "line": 4,
-    "column": 1,
-    "position": {
+    "name": "index.html:4:1-4:1",
+    "place": {
       "start": {
         "line": 4,
         "column": 1,
@@ -17,11 +17,11 @@
         "offset": 51
       }
     },
-    "source": "parse-error",
+    "reason": "Unexpected end of file in comment",
     "ruleId": "eof-in-comment",
-    "file": "index.html",
-    "fatal": false,
+    "source": "hast-util-from-html",
     "note": "Unexpected end of file. Expected `-->` to close the comment",
-    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-eof-in-comment"
+    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-eof-in-comment",
+    "file": "index.html"
   }
 ]
diff --git a/test/parse-error/eof-in-doctype/messages.json b/test/parse-error/eof-in-doctype/messages.json
index 8ae22d8f..fd627ae8 100644
--- a/test/parse-error/eof-in-doctype/messages.json
+++ b/test/parse-error/eof-in-doctype/messages.json
@@ -1,11 +1,11 @@
 [
   {
+    "column": 1,
+    "fatal": false,
     "message": "Unexpected end of file in doctype",
-    "name": "index.html:2:1-2:1",
-    "reason": "Unexpected end of file in doctype",
     "line": 2,
-    "column": 1,
-    "position": {
+    "name": "index.html:2:1-2:1",
+    "place": {
       "start": {
         "line": 2,
         "column": 1,
@@ -17,20 +17,20 @@
         "offset": 10
       }
     },
-    "source": "parse-error",
+    "reason": "Unexpected end of file in doctype",
     "ruleId": "eof-in-doctype",
-    "file": "index.html",
-    "fatal": false,
+    "source": "hast-util-from-html",
     "note": "Unexpected end of file. Expected a valid doctype (such as `<!doctype html>`)",
-    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-eof-in-doctype"
+    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-eof-in-doctype",
+    "file": "index.html"
   },
   {
+    "column": 1,
+    "fatal": false,
     "message": "Unexpected non-conforming doctype declaration",
-    "name": "index.html:1:1-2:2",
-    "reason": "Unexpected non-conforming doctype declaration",
     "line": 1,
-    "column": 1,
-    "position": {
+    "name": "index.html:1:1-2:2",
+    "place": {
       "start": {
         "line": 1,
         "column": 1,
@@ -42,11 +42,10 @@
         "offset": 11
       }
     },
-    "source": "parse-error",
+    "reason": "Unexpected non-conforming doctype declaration",
     "ruleId": "non-conforming-doctype",
-    "file": "index.html",
-    "fatal": false,
+    "source": "hast-util-from-html",
     "note": "Expected `<!doctype html>` or `<!doctype html system \"about:legacy-compat\">`",
-    "url": null
+    "file": "index.html"
   }
 ]
diff --git a/test/parse-error/eof-in-element-that-can-contain-only-text/messages.json b/test/parse-error/eof-in-element-that-can-contain-only-text/messages.json
index 3904c677..793b8964 100644
--- a/test/parse-error/eof-in-element-that-can-contain-only-text/messages.json
+++ b/test/parse-error/eof-in-element-that-can-contain-only-text/messages.json
@@ -1,11 +1,11 @@
 [
   {
+    "column": 1,
+    "fatal": false,
     "message": "Unexpected end of file in element that can only contain text",
-    "name": "index.html:4:1-4:1",
-    "reason": "Unexpected end of file in element that can only contain text",
     "line": 4,
-    "column": 1,
-    "position": {
+    "name": "index.html:4:1-4:1",
+    "place": {
       "start": {
         "line": 4,
         "column": 1,
@@ -17,11 +17,10 @@
         "offset": 84
       }
     },
-    "source": "parse-error",
+    "reason": "Unexpected end of file in element that can only contain text",
     "ruleId": "eof-in-element-that-can-contain-only-text",
-    "file": "index.html",
-    "fatal": false,
+    "source": "hast-util-from-html",
     "note": "Unexpected end of file. Expected text or a closing tag",
-    "url": null
+    "file": "index.html"
   }
 ]
diff --git a/test/parse-error/eof-in-script-html-comment-like-text/messages.json b/test/parse-error/eof-in-script-html-comment-like-text/messages.json
index 03eb0555..27645a9e 100644
--- a/test/parse-error/eof-in-script-html-comment-like-text/messages.json
+++ b/test/parse-error/eof-in-script-html-comment-like-text/messages.json
@@ -1,11 +1,11 @@
 [
   {
+    "column": 1,
+    "fatal": false,
     "message": "Unexpected end of file in comment inside script",
-    "name": "index.html:4:1-4:1",
-    "reason": "Unexpected end of file in comment inside script",
     "line": 4,
-    "column": 1,
-    "position": {
+    "name": "index.html:4:1-4:1",
+    "place": {
       "start": {
         "line": 4,
         "column": 1,
@@ -17,20 +17,20 @@
         "offset": 85
       }
     },
-    "source": "parse-error",
+    "reason": "Unexpected end of file in comment inside script",
     "ruleId": "eof-in-script-html-comment-like-text",
-    "file": "index.html",
-    "fatal": false,
+    "source": "hast-util-from-html",
     "note": "Unexpected end of file. Expected `-->` to close the comment",
-    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-eof-in-script-html-comment-like-text"
+    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-eof-in-script-html-comment-like-text",
+    "file": "index.html"
   },
   {
+    "column": 1,
+    "fatal": false,
     "message": "Unexpected end of file in element that can only contain text",
-    "name": "index.html:4:1-4:1",
-    "reason": "Unexpected end of file in element that can only contain text",
     "line": 4,
-    "column": 1,
-    "position": {
+    "name": "index.html:4:1-4:1",
+    "place": {
       "start": {
         "line": 4,
         "column": 1,
@@ -42,11 +42,10 @@
         "offset": 85
       }
     },
-    "source": "parse-error",
+    "reason": "Unexpected end of file in element that can only contain text",
     "ruleId": "eof-in-element-that-can-contain-only-text",
-    "file": "index.html",
-    "fatal": false,
+    "source": "hast-util-from-html",
     "note": "Unexpected end of file. Expected text or a closing tag",
-    "url": null
+    "file": "index.html"
   }
 ]
diff --git a/test/parse-error/eof-in-tag/messages.json b/test/parse-error/eof-in-tag/messages.json
index 0925d8c5..7a2891f7 100644
--- a/test/parse-error/eof-in-tag/messages.json
+++ b/test/parse-error/eof-in-tag/messages.json
@@ -1,11 +1,11 @@
 [
   {
+    "column": 1,
+    "fatal": false,
     "message": "Unexpected end of file in tag",
-    "name": "index.html:4:1-4:1",
-    "reason": "Unexpected end of file in tag",
     "line": 4,
-    "column": 1,
-    "position": {
+    "name": "index.html:4:1-4:1",
+    "place": {
       "start": {
         "line": 4,
         "column": 1,
@@ -17,11 +17,11 @@
         "offset": 47
       }
     },
-    "source": "parse-error",
+    "reason": "Unexpected end of file in tag",
     "ruleId": "eof-in-tag",
-    "file": "index.html",
-    "fatal": false,
+    "source": "hast-util-from-html",
     "note": "Unexpected end of file. Expected `>` to close the tag",
-    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-eof-in-tag"
+    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-eof-in-tag",
+    "file": "index.html"
   }
 ]
diff --git a/test/parse-error/incorrectly-closed-comment/messages.json b/test/parse-error/incorrectly-closed-comment/messages.json
index 064f34d5..0ae63a9e 100644
--- a/test/parse-error/incorrectly-closed-comment/messages.json
+++ b/test/parse-error/incorrectly-closed-comment/messages.json
@@ -1,11 +1,11 @@
 [
   {
+    "column": 9,
+    "fatal": false,
     "message": "Incorrectly closed comment",
-    "name": "index.html:3:9-3:9",
-    "reason": "Incorrectly closed comment",
     "line": 3,
-    "column": 9,
-    "position": {
+    "name": "index.html:3:9-3:9",
+    "place": {
       "start": {
         "line": 3,
         "column": 9,
@@ -17,11 +17,11 @@
         "offset": 66
       }
     },
-    "source": "parse-error",
+    "reason": "Incorrectly closed comment",
     "ruleId": "incorrectly-closed-comment",
-    "file": "index.html",
-    "fatal": false,
+    "source": "hast-util-from-html",
     "note": "Unexpected `!`. Expected `-->` to close the comment",
-    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-incorrectly-closed-comment"
+    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-incorrectly-closed-comment",
+    "file": "index.html"
   }
 ]
diff --git a/test/parse-error/incorrectly-opened-comment/messages.json b/test/parse-error/incorrectly-opened-comment/messages.json
index d048f032..a263eb51 100644
--- a/test/parse-error/incorrectly-opened-comment/messages.json
+++ b/test/parse-error/incorrectly-opened-comment/messages.json
@@ -1,11 +1,11 @@
 [
   {
+    "column": 3,
+    "fatal": false,
     "message": "Incorrectly opened comment",
-    "name": "index.html:3:3-3:3",
-    "reason": "Incorrectly opened comment",
     "line": 3,
-    "column": 3,
-    "position": {
+    "name": "index.html:3:3-3:3",
+    "place": {
       "start": {
         "line": 3,
         "column": 3,
@@ -17,36 +17,36 @@
         "offset": 60
       }
     },
-    "source": "parse-error",
+    "reason": "Incorrectly opened comment",
     "ruleId": "incorrectly-opened-comment",
-    "file": "index.html",
-    "fatal": false,
+    "source": "hast-util-from-html",
     "note": "Unexpected `f`. Expected `<!--` to open the comment",
-    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-incorrectly-opened-comment"
+    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-incorrectly-opened-comment",
+    "file": "index.html"
   },
   {
+    "column": 3,
+    "fatal": false,
     "message": "Incorrectly opened comment",
-    "name": "index.html:4:3-4:3",
-    "reason": "Incorrectly opened comment",
     "line": 4,
-    "column": 3,
-    "position": {
+    "name": "index.html:4:3-4:3",
+    "place": {
       "start": {
         "line": 4,
         "column": 3,
-        "offset": 68
+        "offset": 67
       },
       "end": {
         "line": 4,
         "column": 3,
-        "offset": 68
+        "offset": 67
       }
     },
-    "source": "parse-error",
+    "reason": "Incorrectly opened comment",
     "ruleId": "incorrectly-opened-comment",
-    "file": "index.html",
-    "fatal": false,
-    "note": "Unexpected `b`. Expected `<!--` to open the comment",
-    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-incorrectly-opened-comment"
+    "source": "hast-util-from-html",
+    "note": "Unexpected `-`. Expected `<!--` to open the comment",
+    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-incorrectly-opened-comment",
+    "file": "index.html"
   }
 ]
diff --git a/test/parse-error/invalid-character-sequence-after-doctype-name/messages.json b/test/parse-error/invalid-character-sequence-after-doctype-name/messages.json
index 188d7fcd..8f172eaa 100644
--- a/test/parse-error/invalid-character-sequence-after-doctype-name/messages.json
+++ b/test/parse-error/invalid-character-sequence-after-doctype-name/messages.json
@@ -1,11 +1,11 @@
 [
   {
+    "column": 16,
+    "fatal": false,
     "message": "Invalid sequence after doctype name",
-    "name": "index.html:1:16-1:16",
-    "reason": "Invalid sequence after doctype name",
     "line": 1,
-    "column": 16,
-    "position": {
+    "name": "index.html:1:16-1:16",
+    "place": {
       "start": {
         "line": 1,
         "column": 16,
@@ -17,11 +17,11 @@
         "offset": 15
       }
     },
-    "source": "parse-error",
+    "reason": "Invalid sequence after doctype name",
     "ruleId": "invalid-character-sequence-after-doctype-name",
-    "file": "index.html",
-    "fatal": false,
+    "source": "hast-util-from-html",
     "note": "Unexpected sequence at `b`. Expected `public` or `system`",
-    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-invalid-character-sequence-after-doctype-name"
+    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-invalid-character-sequence-after-doctype-name",
+    "file": "index.html"
   }
 ]
diff --git a/test/parse-error/invalid-first-character-of-tag-name/messages.json b/test/parse-error/invalid-first-character-of-tag-name/messages.json
index 02b0e092..beb7deb6 100644
--- a/test/parse-error/invalid-first-character-of-tag-name/messages.json
+++ b/test/parse-error/invalid-first-character-of-tag-name/messages.json
@@ -1,11 +1,11 @@
 [
   {
+    "column": 2,
+    "fatal": false,
     "message": "Invalid first character in tag name",
-    "name": "index.html:3:2-3:2",
-    "reason": "Invalid first character in tag name",
     "line": 3,
-    "column": 2,
-    "position": {
+    "name": "index.html:3:2-3:2",
+    "place": {
       "start": {
         "line": 3,
         "column": 2,
@@ -17,20 +17,20 @@
         "offset": 68
       }
     },
-    "source": "parse-error",
+    "reason": "Invalid first character in tag name",
     "ruleId": "invalid-first-character-of-tag-name",
-    "file": "index.html",
-    "fatal": false,
+    "source": "hast-util-from-html",
     "note": "Unexpected `4`. Expected an ASCII letter instead",
-    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-invalid-first-character-of-tag-name"
+    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-invalid-first-character-of-tag-name",
+    "file": "index.html"
   },
   {
+    "column": 7,
+    "fatal": false,
     "message": "Invalid first character in tag name",
-    "name": "index.html:3:7-3:7",
-    "reason": "Invalid first character in tag name",
     "line": 3,
-    "column": 7,
-    "position": {
+    "name": "index.html:3:7-3:7",
+    "place": {
       "start": {
         "line": 3,
         "column": 7,
@@ -42,11 +42,11 @@
         "offset": 73
       }
     },
-    "source": "parse-error",
+    "reason": "Invalid first character in tag name",
     "ruleId": "invalid-first-character-of-tag-name",
-    "file": "index.html",
-    "fatal": false,
+    "source": "hast-util-from-html",
     "note": "Unexpected `4`. Expected an ASCII letter instead",
-    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-invalid-first-character-of-tag-name"
+    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-invalid-first-character-of-tag-name",
+    "file": "index.html"
   }
 ]
diff --git a/test/parse-error/misplaced-doctype/messages.json b/test/parse-error/misplaced-doctype/messages.json
index 86aa6be5..f4f93a00 100644
--- a/test/parse-error/misplaced-doctype/messages.json
+++ b/test/parse-error/misplaced-doctype/messages.json
@@ -1,11 +1,11 @@
 [
   {
+    "column": 1,
+    "fatal": false,
     "message": "Misplaced doctype",
-    "name": "index.html:3:1-3:16",
-    "reason": "Misplaced doctype",
     "line": 3,
-    "column": 1,
-    "position": {
+    "name": "index.html:3:1-3:16",
+    "place": {
       "start": {
         "line": 3,
         "column": 1,
@@ -17,11 +17,10 @@
         "offset": 64
       }
     },
-    "source": "parse-error",
+    "reason": "Misplaced doctype",
     "ruleId": "misplaced-doctype",
-    "file": "index.html",
-    "fatal": false,
+    "source": "hast-util-from-html",
     "note": "Unexpected doctype. Expected doctype before head",
-    "url": null
+    "file": "index.html"
   }
 ]
diff --git a/test/parse-error/misplaced-start-tag-for-head-element/messages.json b/test/parse-error/misplaced-start-tag-for-head-element/messages.json
index 2c4b53e9..956fb9de 100644
--- a/test/parse-error/misplaced-start-tag-for-head-element/messages.json
+++ b/test/parse-error/misplaced-start-tag-for-head-element/messages.json
@@ -1,11 +1,11 @@
 [
   {
+    "column": 1,
+    "fatal": false,
     "message": "Misplaced `<head>` start tag",
-    "name": "index.html:3:1-3:7",
-    "reason": "Misplaced `<head>` start tag",
     "line": 3,
-    "column": 1,
-    "position": {
+    "name": "index.html:3:1-3:7",
+    "place": {
       "start": {
         "line": 3,
         "column": 1,
@@ -17,11 +17,10 @@
         "offset": 74
       }
     },
-    "source": "parse-error",
+    "reason": "Misplaced `<head>` start tag",
     "ruleId": "misplaced-start-tag-for-head-element",
-    "file": "index.html",
-    "fatal": false,
+    "source": "hast-util-from-html",
     "note": "Unexpected start tag `<head>`. Expected `<head>` directly after doctype",
-    "url": null
+    "file": "index.html"
   }
 ]
diff --git a/test/parse-error/missing-attribute-value/messages.json b/test/parse-error/missing-attribute-value/messages.json
index a735d332..b3941075 100644
--- a/test/parse-error/missing-attribute-value/messages.json
+++ b/test/parse-error/missing-attribute-value/messages.json
@@ -1,11 +1,11 @@
 [
   {
+    "column": 11,
+    "fatal": false,
     "message": "Missing attribute value",
-    "name": "index.html:2:11-2:11",
-    "reason": "Missing attribute value",
     "line": 2,
-    "column": 11,
-    "position": {
+    "name": "index.html:2:11-2:11",
+    "place": {
       "start": {
         "line": 2,
         "column": 11,
@@ -17,11 +17,11 @@
         "offset": 26
       }
     },
-    "source": "parse-error",
+    "reason": "Missing attribute value",
     "ruleId": "missing-attribute-value",
-    "file": "index.html",
-    "fatal": false,
+    "source": "hast-util-from-html",
     "note": "Unexpected `=`. Expected an attribute value or no `=` instead",
-    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-missing-attribute-value"
+    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-missing-attribute-value",
+    "file": "index.html"
   }
 ]
diff --git a/test/parse-error/missing-doctype-name/messages.json b/test/parse-error/missing-doctype-name/messages.json
index e99154af..5daf5891 100644
--- a/test/parse-error/missing-doctype-name/messages.json
+++ b/test/parse-error/missing-doctype-name/messages.json
@@ -1,11 +1,11 @@
 [
   {
+    "column": 10,
+    "fatal": false,
     "message": "Missing doctype name",
-    "name": "index.html:1:10-1:10",
-    "reason": "Missing doctype name",
     "line": 1,
-    "column": 10,
-    "position": {
+    "name": "index.html:1:10-1:10",
+    "place": {
       "start": {
         "line": 1,
         "column": 10,
@@ -17,20 +17,20 @@
         "offset": 9
       }
     },
-    "source": "parse-error",
+    "reason": "Missing doctype name",
     "ruleId": "missing-doctype-name",
-    "file": "index.html",
-    "fatal": false,
+    "source": "hast-util-from-html",
     "note": "Unexpected doctype end at `>`. Expected `html` instead",
-    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-missing-doctype-name"
+    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-missing-doctype-name",
+    "file": "index.html"
   },
   {
+    "column": 1,
+    "fatal": false,
     "message": "Unexpected non-conforming doctype declaration",
-    "name": "index.html:1:1-1:11",
-    "reason": "Unexpected non-conforming doctype declaration",
     "line": 1,
-    "column": 1,
-    "position": {
+    "name": "index.html:1:1-1:11",
+    "place": {
       "start": {
         "line": 1,
         "column": 1,
@@ -42,11 +42,10 @@
         "offset": 10
       }
     },
-    "source": "parse-error",
+    "reason": "Unexpected non-conforming doctype declaration",
     "ruleId": "non-conforming-doctype",
-    "file": "index.html",
-    "fatal": false,
+    "source": "hast-util-from-html",
     "note": "Expected `<!doctype html>` or `<!doctype html system \"about:legacy-compat\">`",
-    "url": null
+    "file": "index.html"
   }
 ]
diff --git a/test/parse-error/missing-doctype-public-identifier/messages.json b/test/parse-error/missing-doctype-public-identifier/messages.json
index 850b70a9..953f5715 100644
--- a/test/parse-error/missing-doctype-public-identifier/messages.json
+++ b/test/parse-error/missing-doctype-public-identifier/messages.json
@@ -1,11 +1,11 @@
 [
   {
+    "column": 22,
+    "fatal": false,
     "message": "Missing public identifier in doctype",
-    "name": "index.html:1:22-1:22",
-    "reason": "Missing public identifier in doctype",
     "line": 1,
-    "column": 22,
-    "position": {
+    "name": "index.html:1:22-1:22",
+    "place": {
       "start": {
         "line": 1,
         "column": 22,
@@ -17,11 +17,11 @@
         "offset": 21
       }
     },
-    "source": "parse-error",
+    "reason": "Missing public identifier in doctype",
     "ruleId": "missing-doctype-public-identifier",
-    "file": "index.html",
-    "fatal": false,
+    "source": "hast-util-from-html",
     "note": "Unexpected `>`. Expected identifier for `public` instead",
-    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-missing-doctype-public-identifier"
+    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-missing-doctype-public-identifier",
+    "file": "index.html"
   }
 ]
diff --git a/test/parse-error/missing-doctype-system-identifier/messages.json b/test/parse-error/missing-doctype-system-identifier/messages.json
index cf403966..35273dd3 100644
--- a/test/parse-error/missing-doctype-system-identifier/messages.json
+++ b/test/parse-error/missing-doctype-system-identifier/messages.json
@@ -1,11 +1,11 @@
 [
   {
+    "column": 22,
+    "fatal": false,
     "message": "Missing system identifier in doctype",
-    "name": "index.html:1:22-1:22",
-    "reason": "Missing system identifier in doctype",
     "line": 1,
-    "column": 22,
-    "position": {
+    "name": "index.html:1:22-1:22",
+    "place": {
       "start": {
         "line": 1,
         "column": 22,
@@ -17,11 +17,11 @@
         "offset": 21
       }
     },
-    "source": "parse-error",
+    "reason": "Missing system identifier in doctype",
     "ruleId": "missing-doctype-system-identifier",
-    "file": "index.html",
-    "fatal": false,
+    "source": "hast-util-from-html",
     "note": "Unexpected `>`. Expected identifier for `system` instead (suggested: `\"about:legacy-compat\"`)",
-    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-missing-doctype-system-identifier"
+    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-missing-doctype-system-identifier",
+    "file": "index.html"
   }
 ]
diff --git a/test/parse-error/missing-doctype/messages.json b/test/parse-error/missing-doctype/messages.json
index 7b3d658f..5ef655db 100644
--- a/test/parse-error/missing-doctype/messages.json
+++ b/test/parse-error/missing-doctype/messages.json
@@ -1,11 +1,11 @@
 [
   {
+    "column": 1,
+    "fatal": false,
     "message": "Missing doctype before other content",
-    "name": "index.html:1:1-1:1",
-    "reason": "Missing doctype before other content",
     "line": 1,
-    "column": 1,
-    "position": {
+    "name": "index.html:1:1-1:1",
+    "place": {
       "start": {
         "line": 1,
         "column": 1,
@@ -17,11 +17,10 @@
         "offset": 0
       }
     },
-    "source": "parse-error",
+    "reason": "Missing doctype before other content",
     "ruleId": "missing-doctype",
-    "file": "index.html",
-    "fatal": false,
+    "source": "hast-util-from-html",
     "note": "Expected a `<!doctype html>` before anything else",
-    "url": null
+    "file": "index.html"
   }
 ]
diff --git a/test/parse-error/missing-end-tag-name/messages.json b/test/parse-error/missing-end-tag-name/messages.json
index 8de201b6..134753c1 100644
--- a/test/parse-error/missing-end-tag-name/messages.json
+++ b/test/parse-error/missing-end-tag-name/messages.json
@@ -1,11 +1,11 @@
 [
   {
+    "column": 3,
+    "fatal": false,
     "message": "Missing name in end tag",
-    "name": "index.html:3:3-3:3",
-    "reason": "Missing name in end tag",
     "line": 3,
-    "column": 3,
-    "position": {
+    "name": "index.html:3:3-3:3",
+    "place": {
       "start": {
         "line": 3,
         "column": 3,
@@ -17,11 +17,11 @@
         "offset": 54
       }
     },
-    "source": "parse-error",
+    "reason": "Missing name in end tag",
     "ruleId": "missing-end-tag-name",
-    "file": "index.html",
-    "fatal": false,
+    "source": "hast-util-from-html",
     "note": "Unexpected `>`. Expected an ASCII letter instead",
-    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-missing-end-tag-name"
+    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-missing-end-tag-name",
+    "file": "index.html"
   }
 ]
diff --git a/test/parse-error/missing-quote-before-doctype-public-identifier/messages.json b/test/parse-error/missing-quote-before-doctype-public-identifier/messages.json
index e57afcde..fa4a9a03 100644
--- a/test/parse-error/missing-quote-before-doctype-public-identifier/messages.json
+++ b/test/parse-error/missing-quote-before-doctype-public-identifier/messages.json
@@ -1,11 +1,11 @@
 [
   {
+    "column": 23,
+    "fatal": false,
     "message": "Missing quote before public identifier in doctype",
-    "name": "index.html:1:23-1:23",
-    "reason": "Missing quote before public identifier in doctype",
     "line": 1,
-    "column": 23,
-    "position": {
+    "name": "index.html:1:23-1:23",
+    "place": {
       "start": {
         "line": 1,
         "column": 23,
@@ -17,11 +17,11 @@
         "offset": 22
       }
     },
-    "source": "parse-error",
+    "reason": "Missing quote before public identifier in doctype",
     "ruleId": "missing-quote-before-doctype-public-identifier",
-    "file": "index.html",
-    "fatal": false,
+    "source": "hast-util-from-html",
     "note": "Unexpected `b`. Expected `\"` or `'` instead",
-    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-missing-quote-before-doctype-public-identifier"
+    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-missing-quote-before-doctype-public-identifier",
+    "file": "index.html"
   }
 ]
diff --git a/test/parse-error/missing-quote-before-doctype-system-identifier/messages.json b/test/parse-error/missing-quote-before-doctype-system-identifier/messages.json
index 0aa3b5cb..ad625e20 100644
--- a/test/parse-error/missing-quote-before-doctype-system-identifier/messages.json
+++ b/test/parse-error/missing-quote-before-doctype-system-identifier/messages.json
@@ -1,11 +1,11 @@
 [
   {
+    "column": 23,
+    "fatal": false,
     "message": "Missing quote before system identifier in doctype",
-    "name": "index.html:1:23-1:23",
-    "reason": "Missing quote before system identifier in doctype",
     "line": 1,
-    "column": 23,
-    "position": {
+    "name": "index.html:1:23-1:23",
+    "place": {
       "start": {
         "line": 1,
         "column": 23,
@@ -17,11 +17,11 @@
         "offset": 22
       }
     },
-    "source": "parse-error",
+    "reason": "Missing quote before system identifier in doctype",
     "ruleId": "missing-quote-before-doctype-system-identifier",
-    "file": "index.html",
-    "fatal": false,
+    "source": "hast-util-from-html",
     "note": "Unexpected `b`. Expected `\"` or `'` instead",
-    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-missing-quote-before-doctype-system-identifier"
+    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-missing-quote-before-doctype-system-identifier",
+    "file": "index.html"
   }
 ]
diff --git a/test/parse-error/missing-semicolon-after-character-reference/messages.json b/test/parse-error/missing-semicolon-after-character-reference/messages.json
index eaab5390..830acb2d 100644
--- a/test/parse-error/missing-semicolon-after-character-reference/messages.json
+++ b/test/parse-error/missing-semicolon-after-character-reference/messages.json
@@ -1,11 +1,11 @@
 [
   {
+    "column": 5,
+    "fatal": false,
     "message": "Missing semicolon after character reference",
-    "name": "index.html:3:5-3:5",
-    "reason": "Missing semicolon after character reference",
     "line": 3,
-    "column": 5,
-    "position": {
+    "name": "index.html:3:5-3:5",
+    "place": {
       "start": {
         "line": 3,
         "column": 5,
@@ -17,11 +17,11 @@
         "offset": 79
       }
     },
-    "source": "parse-error",
+    "reason": "Missing semicolon after character reference",
     "ruleId": "missing-semicolon-after-character-reference",
-    "file": "index.html",
-    "fatal": false,
+    "source": "hast-util-from-html",
     "note": "Unexpected `i`. Expected `;` instead",
-    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-missing-semicolon-after-character-reference"
+    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-missing-semicolon-after-character-reference",
+    "file": "index.html"
   }
 ]
diff --git a/test/parse-error/missing-whitespace-after-doctype-public-keyword/messages.json b/test/parse-error/missing-whitespace-after-doctype-public-keyword/messages.json
index c9a552c3..198bafbc 100644
--- a/test/parse-error/missing-whitespace-after-doctype-public-keyword/messages.json
+++ b/test/parse-error/missing-whitespace-after-doctype-public-keyword/messages.json
@@ -1,11 +1,11 @@
 [
   {
+    "column": 22,
+    "fatal": false,
     "message": "Missing whitespace after public identifier in doctype",
-    "name": "index.html:1:22-1:22",
-    "reason": "Missing whitespace after public identifier in doctype",
     "line": 1,
-    "column": 22,
-    "position": {
+    "name": "index.html:1:22-1:22",
+    "place": {
       "start": {
         "line": 1,
         "column": 22,
@@ -17,20 +17,20 @@
         "offset": 21
       }
     },
-    "source": "parse-error",
+    "reason": "Missing whitespace after public identifier in doctype",
     "ruleId": "missing-whitespace-after-doctype-public-keyword",
-    "file": "index.html",
-    "fatal": false,
+    "source": "hast-util-from-html",
     "note": "Unexpected `\"`. Expected ASCII whitespace instead",
-    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-missing-whitespace-after-doctype-public-keyword"
+    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-missing-whitespace-after-doctype-public-keyword",
+    "file": "index.html"
   },
   {
+    "column": 1,
+    "fatal": false,
     "message": "Unexpected non-conforming doctype declaration",
-    "name": "index.html:1:1-1:30",
-    "reason": "Unexpected non-conforming doctype declaration",
     "line": 1,
-    "column": 1,
-    "position": {
+    "name": "index.html:1:1-1:30",
+    "place": {
       "start": {
         "line": 1,
         "column": 1,
@@ -42,11 +42,10 @@
         "offset": 29
       }
     },
-    "source": "parse-error",
+    "reason": "Unexpected non-conforming doctype declaration",
     "ruleId": "non-conforming-doctype",
-    "file": "index.html",
-    "fatal": false,
+    "source": "hast-util-from-html",
     "note": "Expected `<!doctype html>` or `<!doctype html system \"about:legacy-compat\">`",
-    "url": null
+    "file": "index.html"
   }
 ]
diff --git a/test/parse-error/missing-whitespace-after-doctype-system-keyword/messages.json b/test/parse-error/missing-whitespace-after-doctype-system-keyword/messages.json
index 6ba28dfd..a275f448 100644
--- a/test/parse-error/missing-whitespace-after-doctype-system-keyword/messages.json
+++ b/test/parse-error/missing-whitespace-after-doctype-system-keyword/messages.json
@@ -1,11 +1,11 @@
 [
   {
+    "column": 22,
+    "fatal": false,
     "message": "Missing whitespace after system identifier in doctype",
-    "name": "index.html:1:22-1:22",
-    "reason": "Missing whitespace after system identifier in doctype",
     "line": 1,
-    "column": 22,
-    "position": {
+    "name": "index.html:1:22-1:22",
+    "place": {
       "start": {
         "line": 1,
         "column": 22,
@@ -17,20 +17,20 @@
         "offset": 21
       }
     },
-    "source": "parse-error",
+    "reason": "Missing whitespace after system identifier in doctype",
     "ruleId": "missing-whitespace-after-doctype-system-keyword",
-    "file": "index.html",
-    "fatal": false,
+    "source": "hast-util-from-html",
     "note": "Unexpected `\"`. Expected ASCII whitespace instead",
-    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-missing-whitespace-after-doctype-system-keyword"
+    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-missing-whitespace-after-doctype-system-keyword",
+    "file": "index.html"
   },
   {
+    "column": 1,
+    "fatal": false,
     "message": "Unexpected non-conforming doctype declaration",
-    "name": "index.html:1:1-1:30",
-    "reason": "Unexpected non-conforming doctype declaration",
     "line": 1,
-    "column": 1,
-    "position": {
+    "name": "index.html:1:1-1:30",
+    "place": {
       "start": {
         "line": 1,
         "column": 1,
@@ -42,11 +42,10 @@
         "offset": 29
       }
     },
-    "source": "parse-error",
+    "reason": "Unexpected non-conforming doctype declaration",
     "ruleId": "non-conforming-doctype",
-    "file": "index.html",
-    "fatal": false,
+    "source": "hast-util-from-html",
     "note": "Expected `<!doctype html>` or `<!doctype html system \"about:legacy-compat\">`",
-    "url": null
+    "file": "index.html"
   }
 ]
diff --git a/test/parse-error/missing-whitespace-before-doctype-name/messages.json b/test/parse-error/missing-whitespace-before-doctype-name/messages.json
index 30091743..341a8df4 100644
--- a/test/parse-error/missing-whitespace-before-doctype-name/messages.json
+++ b/test/parse-error/missing-whitespace-before-doctype-name/messages.json
@@ -1,11 +1,11 @@
 [
   {
+    "column": 10,
+    "fatal": false,
     "message": "Missing whitespace before doctype name",
-    "name": "index.html:1:10-1:10",
-    "reason": "Missing whitespace before doctype name",
     "line": 1,
-    "column": 10,
-    "position": {
+    "name": "index.html:1:10-1:10",
+    "place": {
       "start": {
         "line": 1,
         "column": 10,
@@ -17,11 +17,11 @@
         "offset": 9
       }
     },
-    "source": "parse-error",
+    "reason": "Missing whitespace before doctype name",
     "ruleId": "missing-whitespace-before-doctype-name",
-    "file": "index.html",
-    "fatal": false,
+    "source": "hast-util-from-html",
     "note": "Unexpected `h`. Expected ASCII whitespace instead",
-    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-missing-whitespace-before-doctype-name"
+    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-missing-whitespace-before-doctype-name",
+    "file": "index.html"
   }
 ]
diff --git a/test/parse-error/missing-whitespace-between-attributes/messages.json b/test/parse-error/missing-whitespace-between-attributes/messages.json
index af98e6d1..dd2114c0 100644
--- a/test/parse-error/missing-whitespace-between-attributes/messages.json
+++ b/test/parse-error/missing-whitespace-between-attributes/messages.json
@@ -1,11 +1,11 @@
 [
   {
+    "column": 16,
+    "fatal": false,
     "message": "Missing whitespace between attributes",
-    "name": "index.html:2:16-2:16",
-    "reason": "Missing whitespace between attributes",
     "line": 2,
-    "column": 16,
-    "position": {
+    "name": "index.html:2:16-2:16",
+    "place": {
       "start": {
         "line": 2,
         "column": 16,
@@ -17,11 +17,11 @@
         "offset": 31
       }
     },
-    "source": "parse-error",
+    "reason": "Missing whitespace between attributes",
     "ruleId": "missing-whitespace-between-attributes",
-    "file": "index.html",
-    "fatal": false,
+    "source": "hast-util-from-html",
     "note": "Unexpected `c`. Expected ASCII whitespace instead",
-    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-missing-whitespace-between-attributes"
+    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-missing-whitespace-between-attributes",
+    "file": "index.html"
   }
 ]
diff --git a/test/parse-error/missing-whitespace-between-doctype-public-and-system-identifiers/messages.json b/test/parse-error/missing-whitespace-between-doctype-public-and-system-identifiers/messages.json
index 4a0852fb..bf04827d 100644
--- a/test/parse-error/missing-whitespace-between-doctype-public-and-system-identifiers/messages.json
+++ b/test/parse-error/missing-whitespace-between-doctype-public-and-system-identifiers/messages.json
@@ -1,11 +1,11 @@
 [
   {
+    "column": 28,
+    "fatal": false,
     "message": "Missing whitespace between public and system identifiers in doctype",
-    "name": "index.html:1:28-1:28",
-    "reason": "Missing whitespace between public and system identifiers in doctype",
     "line": 1,
-    "column": 28,
-    "position": {
+    "name": "index.html:1:28-1:28",
+    "place": {
       "start": {
         "line": 1,
         "column": 28,
@@ -17,20 +17,20 @@
         "offset": 27
       }
     },
-    "source": "parse-error",
+    "reason": "Missing whitespace between public and system identifiers in doctype",
     "ruleId": "missing-whitespace-between-doctype-public-and-system-identifiers",
-    "file": "index.html",
-    "fatal": false,
+    "source": "hast-util-from-html",
     "note": "Unexpected `\"`. Expected ASCII whitespace instead",
-    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-missing-whitespace-between-doctype-public-and-system-identifiers"
+    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-missing-whitespace-between-doctype-public-and-system-identifiers",
+    "file": "index.html"
   },
   {
+    "column": 1,
+    "fatal": false,
     "message": "Unexpected non-conforming doctype declaration",
-    "name": "index.html:1:1-1:34",
-    "reason": "Unexpected non-conforming doctype declaration",
     "line": 1,
-    "column": 1,
-    "position": {
+    "name": "index.html:1:1-1:34",
+    "place": {
       "start": {
         "line": 1,
         "column": 1,
@@ -42,11 +42,10 @@
         "offset": 33
       }
     },
-    "source": "parse-error",
+    "reason": "Unexpected non-conforming doctype declaration",
     "ruleId": "non-conforming-doctype",
-    "file": "index.html",
-    "fatal": false,
+    "source": "hast-util-from-html",
     "note": "Expected `<!doctype html>` or `<!doctype html system \"about:legacy-compat\">`",
-    "url": null
+    "file": "index.html"
   }
 ]
diff --git a/test/parse-error/nested-comment/messages.json b/test/parse-error/nested-comment/messages.json
index 8a71d7df..450b61bf 100644
--- a/test/parse-error/nested-comment/messages.json
+++ b/test/parse-error/nested-comment/messages.json
@@ -1,11 +1,11 @@
 [
   {
+    "column": 10,
+    "fatal": false,
     "message": "Unexpected nested comment",
-    "name": "index.html:3:10-3:10",
-    "reason": "Unexpected nested comment",
     "line": 3,
-    "column": 10,
-    "position": {
+    "name": "index.html:3:10-3:10",
+    "place": {
       "start": {
         "line": 3,
         "column": 10,
@@ -17,11 +17,11 @@
         "offset": 55
       }
     },
-    "source": "parse-error",
+    "reason": "Unexpected nested comment",
     "ruleId": "nested-comment",
-    "file": "index.html",
-    "fatal": false,
+    "source": "hast-util-from-html",
     "note": "Unexpected `<!--`. Expected `-->`",
-    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-nested-comment"
+    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-nested-comment",
+    "file": "index.html"
   }
 ]
diff --git a/test/parse-error/nested-noscript-in-head/messages.json b/test/parse-error/nested-noscript-in-head/messages.json
index 0f1cce6e..8c732486 100644
--- a/test/parse-error/nested-noscript-in-head/messages.json
+++ b/test/parse-error/nested-noscript-in-head/messages.json
@@ -1,11 +1,11 @@
 [
   {
+    "column": 3,
+    "fatal": false,
     "message": "Unexpected nested `<noscript>` in `<head>`",
-    "name": "index.html:5:3-5:13",
-    "reason": "Unexpected nested `<noscript>` in `<head>`",
     "line": 5,
-    "column": 3,
-    "position": {
+    "name": "index.html:5:3-5:13",
+    "place": {
       "start": {
         "line": 5,
         "column": 3,
@@ -17,20 +17,19 @@
         "offset": 120
       }
     },
-    "source": "parse-error",
+    "reason": "Unexpected nested `<noscript>` in `<head>`",
     "ruleId": "nested-noscript-in-head",
-    "file": "index.html",
-    "fatal": false,
+    "source": "hast-util-from-html",
     "note": "Unexpected `<noscript>`. Expected a closing tag or a meta element",
-    "url": null
+    "file": "index.html"
   },
   {
+    "column": 1,
+    "fatal": false,
     "message": "Unexpected unopened end tag",
-    "name": "index.html:6:1-6:12",
-    "reason": "Unexpected unopened end tag",
     "line": 6,
-    "column": 1,
-    "position": {
+    "name": "index.html:6:1-6:12",
+    "place": {
       "start": {
         "line": 6,
         "column": 1,
@@ -42,11 +41,10 @@
         "offset": 143
       }
     },
-    "source": "parse-error",
+    "reason": "Unexpected unopened end tag",
     "ruleId": "end-tag-without-matching-open-element",
-    "file": "index.html",
-    "fatal": false,
+    "source": "hast-util-from-html",
     "note": "Unexpected end tag. Expected no end tag or another end tag",
-    "url": null
+    "file": "index.html"
   }
 ]
diff --git a/test/parse-error/non-conforming-doctype/messages.json b/test/parse-error/non-conforming-doctype/messages.json
index e99154af..5daf5891 100644
--- a/test/parse-error/non-conforming-doctype/messages.json
+++ b/test/parse-error/non-conforming-doctype/messages.json
@@ -1,11 +1,11 @@
 [
   {
+    "column": 10,
+    "fatal": false,
     "message": "Missing doctype name",
-    "name": "index.html:1:10-1:10",
-    "reason": "Missing doctype name",
     "line": 1,
-    "column": 10,
-    "position": {
+    "name": "index.html:1:10-1:10",
+    "place": {
       "start": {
         "line": 1,
         "column": 10,
@@ -17,20 +17,20 @@
         "offset": 9
       }
     },
-    "source": "parse-error",
+    "reason": "Missing doctype name",
     "ruleId": "missing-doctype-name",
-    "file": "index.html",
-    "fatal": false,
+    "source": "hast-util-from-html",
     "note": "Unexpected doctype end at `>`. Expected `html` instead",
-    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-missing-doctype-name"
+    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-missing-doctype-name",
+    "file": "index.html"
   },
   {
+    "column": 1,
+    "fatal": false,
     "message": "Unexpected non-conforming doctype declaration",
-    "name": "index.html:1:1-1:11",
-    "reason": "Unexpected non-conforming doctype declaration",
     "line": 1,
-    "column": 1,
-    "position": {
+    "name": "index.html:1:1-1:11",
+    "place": {
       "start": {
         "line": 1,
         "column": 1,
@@ -42,11 +42,10 @@
         "offset": 10
       }
     },
-    "source": "parse-error",
+    "reason": "Unexpected non-conforming doctype declaration",
     "ruleId": "non-conforming-doctype",
-    "file": "index.html",
-    "fatal": false,
+    "source": "hast-util-from-html",
     "note": "Expected `<!doctype html>` or `<!doctype html system \"about:legacy-compat\">`",
-    "url": null
+    "file": "index.html"
   }
 ]
diff --git a/test/parse-error/non-void-html-element-start-tag-with-trailing-solidus/messages.json b/test/parse-error/non-void-html-element-start-tag-with-trailing-solidus/messages.json
index c39ef2b3..a6e783da 100644
--- a/test/parse-error/non-void-html-element-start-tag-with-trailing-solidus/messages.json
+++ b/test/parse-error/non-void-html-element-start-tag-with-trailing-solidus/messages.json
@@ -1,11 +1,11 @@
 [
   {
+    "column": 1,
+    "fatal": false,
     "message": "Unexpected trailing slash on start tag of non-void element",
-    "name": "index.html:2:1-2:9",
-    "reason": "Unexpected trailing slash on start tag of non-void element",
     "line": 2,
-    "column": 1,
-    "position": {
+    "name": "index.html:2:1-2:9",
+    "place": {
       "start": {
         "line": 2,
         "column": 1,
@@ -17,11 +17,11 @@
         "offset": 24
       }
     },
-    "source": "parse-error",
+    "reason": "Unexpected trailing slash on start tag of non-void element",
     "ruleId": "non-void-html-element-start-tag-with-trailing-solidus",
-    "file": "index.html",
-    "fatal": false,
+    "source": "hast-util-from-html",
     "note": "Unexpected `/`. Expected `>` instead",
-    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-non-void-html-element-start-tag-with-trailing-solidus"
+    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-non-void-html-element-start-tag-with-trailing-solidus",
+    "file": "index.html"
   }
 ]
diff --git a/test/parse-error/noncharacter-character-reference/messages.json b/test/parse-error/noncharacter-character-reference/messages.json
index 93cbe620..c409cac8 100644
--- a/test/parse-error/noncharacter-character-reference/messages.json
+++ b/test/parse-error/noncharacter-character-reference/messages.json
@@ -1,11 +1,11 @@
 [
   {
+    "column": 9,
+    "fatal": false,
     "message": "Unexpected noncharacter code point referenced by character reference",
-    "name": "index.html:3:9-3:9",
-    "reason": "Unexpected noncharacter code point referenced by character reference",
     "line": 3,
-    "column": 9,
-    "position": {
+    "name": "index.html:3:9-3:9",
+    "place": {
       "start": {
         "line": 3,
         "column": 9,
@@ -17,11 +17,11 @@
         "offset": 72
       }
     },
-    "source": "parse-error",
+    "reason": "Unexpected noncharacter code point referenced by character reference",
     "ruleId": "noncharacter-character-reference",
-    "file": "index.html",
-    "fatal": false,
+    "source": "hast-util-from-html",
     "note": "Unexpected code point. Do not use noncharacters in HTML",
-    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-noncharacter-character-reference"
+    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-noncharacter-character-reference",
+    "file": "index.html"
   }
 ]
diff --git a/test/parse-error/noncharacter-in-input-stream/messages.json b/test/parse-error/noncharacter-in-input-stream/messages.json
index be63d1f1..4d872d25 100644
--- a/test/parse-error/noncharacter-in-input-stream/messages.json
+++ b/test/parse-error/noncharacter-in-input-stream/messages.json
@@ -1,11 +1,11 @@
 [
   {
+    "column": 1,
+    "fatal": false,
     "message": "Unexpected noncharacter character",
-    "name": "index.html:3:1-3:1",
-    "reason": "Unexpected noncharacter character",
     "line": 3,
-    "column": 1,
-    "position": {
+    "name": "index.html:3:1-3:1",
+    "place": {
       "start": {
         "line": 3,
         "column": 1,
@@ -17,11 +17,11 @@
         "offset": 60
       }
     },
-    "source": "parse-error",
+    "reason": "Unexpected noncharacter character",
     "ruleId": "noncharacter-in-input-stream",
-    "file": "index.html",
-    "fatal": false,
+    "source": "hast-util-from-html",
     "note": "Unexpected code point `0xFDD0`. Do not use noncharacters in HTML",
-    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-noncharacter-in-input-stream"
+    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-noncharacter-in-input-stream",
+    "file": "index.html"
   }
 ]
diff --git a/test/parse-error/null-character-reference/messages.json b/test/parse-error/null-character-reference/messages.json
index b76c8acf..0e757091 100644
--- a/test/parse-error/null-character-reference/messages.json
+++ b/test/parse-error/null-character-reference/messages.json
@@ -1,11 +1,11 @@
 [
   {
+    "column": 6,
+    "fatal": false,
     "message": "Unexpected NULL character referenced by character reference",
-    "name": "index.html:3:6-3:6",
-    "reason": "Unexpected NULL character referenced by character reference",
     "line": 3,
-    "column": 6,
-    "position": {
+    "name": "index.html:3:6-3:6",
+    "place": {
       "start": {
         "line": 3,
         "column": 6,
@@ -17,11 +17,11 @@
         "offset": 61
       }
     },
-    "source": "parse-error",
+    "reason": "Unexpected NULL character referenced by character reference",
     "ruleId": "null-character-reference",
-    "file": "index.html",
-    "fatal": false,
+    "source": "hast-util-from-html",
     "note": "Unexpected code point. Do not use NULL characters in HTML",
-    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-null-character-reference"
+    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-null-character-reference",
+    "file": "index.html"
   }
 ]
diff --git a/test/parse-error/open-elements-left-after-eof/messages.json b/test/parse-error/open-elements-left-after-eof/messages.json
index 5327bb34..12229900 100644
--- a/test/parse-error/open-elements-left-after-eof/messages.json
+++ b/test/parse-error/open-elements-left-after-eof/messages.json
@@ -1,11 +1,11 @@
 [
   {
+    "column": 1,
+    "fatal": false,
     "message": "Unexpected end of file",
-    "name": "index.html:4:1-4:1",
-    "reason": "Unexpected end of file",
     "line": 4,
-    "column": 1,
-    "position": {
+    "name": "index.html:4:1-4:1",
+    "place": {
       "start": {
         "line": 4,
         "column": 1,
@@ -17,11 +17,10 @@
         "offset": 71
       }
     },
-    "source": "parse-error",
+    "reason": "Unexpected end of file",
     "ruleId": "open-elements-left-after-eof",
-    "file": "index.html",
-    "fatal": false,
+    "source": "hast-util-from-html",
     "note": "Unexpected end of file. Expected closing tag instead",
-    "url": null
+    "file": "index.html"
   }
 ]
diff --git a/test/parse-error/surrogate-character-reference/messages.json b/test/parse-error/surrogate-character-reference/messages.json
index 0df1883d..3692858a 100644
--- a/test/parse-error/surrogate-character-reference/messages.json
+++ b/test/parse-error/surrogate-character-reference/messages.json
@@ -1,11 +1,11 @@
 [
   {
+    "column": 9,
+    "fatal": false,
     "message": "Unexpected surrogate character referenced by character reference",
-    "name": "index.html:3:9-3:9",
-    "reason": "Unexpected surrogate character referenced by character reference",
     "line": 3,
-    "column": 9,
-    "position": {
+    "name": "index.html:3:9-3:9",
+    "place": {
       "start": {
         "line": 3,
         "column": 9,
@@ -17,11 +17,11 @@
         "offset": 69
       }
     },
-    "source": "parse-error",
+    "reason": "Unexpected surrogate character referenced by character reference",
     "ruleId": "surrogate-character-reference",
-    "file": "index.html",
-    "fatal": false,
+    "source": "hast-util-from-html",
     "note": "Unexpected code point. Do not use lone surrogate characters in HTML",
-    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-surrogate-character-reference"
+    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-surrogate-character-reference",
+    "file": "index.html"
   }
 ]
diff --git a/test/parse-error/unexpected-character-after-doctype-system-identifier/messages.json b/test/parse-error/unexpected-character-after-doctype-system-identifier/messages.json
index aa573450..a940164a 100644
--- a/test/parse-error/unexpected-character-after-doctype-system-identifier/messages.json
+++ b/test/parse-error/unexpected-character-after-doctype-system-identifier/messages.json
@@ -1,11 +1,11 @@
 [
   {
+    "column": 45,
+    "fatal": false,
     "message": "Invalid character after system identifier in doctype",
-    "name": "index.html:1:45-1:45",
-    "reason": "Invalid character after system identifier in doctype",
     "line": 1,
-    "column": 45,
-    "position": {
+    "name": "index.html:1:45-1:45",
+    "place": {
       "start": {
         "line": 1,
         "column": 45,
@@ -17,11 +17,11 @@
         "offset": 44
       }
     },
-    "source": "parse-error",
+    "reason": "Invalid character after system identifier in doctype",
     "ruleId": "unexpected-character-after-doctype-system-identifier",
-    "file": "index.html",
-    "fatal": false,
+    "source": "hast-util-from-html",
     "note": "Unexpected character at `b`. Expected `>`",
-    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-unexpected-character-after-doctype-system-identifier"
+    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-unexpected-character-after-doctype-system-identifier",
+    "file": "index.html"
   }
 ]
diff --git a/test/parse-error/unexpected-character-in-attribute-name/messages.json b/test/parse-error/unexpected-character-in-attribute-name/messages.json
index 9458a58e..979f03a8 100644
--- a/test/parse-error/unexpected-character-in-attribute-name/messages.json
+++ b/test/parse-error/unexpected-character-in-attribute-name/messages.json
@@ -1,11 +1,11 @@
 [
   {
+    "column": 9,
+    "fatal": false,
     "message": "Unexpected character in attribute name",
-    "name": "index.html:3:9-3:9",
-    "reason": "Unexpected character in attribute name",
     "line": 3,
-    "column": 9,
-    "position": {
+    "name": "index.html:3:9-3:9",
+    "place": {
       "start": {
         "line": 3,
         "column": 9,
@@ -17,20 +17,20 @@
         "offset": 78
       }
     },
-    "source": "parse-error",
+    "reason": "Unexpected character in attribute name",
     "ruleId": "unexpected-character-in-attribute-name",
-    "file": "index.html",
-    "fatal": false,
+    "source": "hast-util-from-html",
     "note": "Unexpected `<`. Expected whitespace, `/`, `>`, `=`, or probably an ASCII letter",
-    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-unexpected-character-in-attribute-name"
+    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-unexpected-character-in-attribute-name",
+    "file": "index.html"
   },
   {
+    "column": 16,
+    "fatal": false,
     "message": "Unexpected character in attribute name",
-    "name": "index.html:3:16-3:16",
-    "reason": "Unexpected character in attribute name",
     "line": 3,
-    "column": 16,
-    "position": {
+    "name": "index.html:3:16-3:16",
+    "place": {
       "start": {
         "line": 3,
         "column": 16,
@@ -42,20 +42,20 @@
         "offset": 85
       }
     },
-    "source": "parse-error",
+    "reason": "Unexpected character in attribute name",
     "ruleId": "unexpected-character-in-attribute-name",
-    "file": "index.html",
-    "fatal": false,
+    "source": "hast-util-from-html",
     "note": "Unexpected `'`. Expected whitespace, `/`, `>`, `=`, or probably an ASCII letter",
-    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-unexpected-character-in-attribute-name"
+    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-unexpected-character-in-attribute-name",
+    "file": "index.html"
   },
   {
+    "column": 20,
+    "fatal": false,
     "message": "Unexpected character in attribute name",
-    "name": "index.html:3:20-3:20",
-    "reason": "Unexpected character in attribute name",
     "line": 3,
-    "column": 20,
-    "position": {
+    "name": "index.html:3:20-3:20",
+    "place": {
       "start": {
         "line": 3,
         "column": 20,
@@ -67,11 +67,11 @@
         "offset": 89
       }
     },
-    "source": "parse-error",
+    "reason": "Unexpected character in attribute name",
     "ruleId": "unexpected-character-in-attribute-name",
-    "file": "index.html",
-    "fatal": false,
+    "source": "hast-util-from-html",
     "note": "Unexpected `'`. Expected whitespace, `/`, `>`, `=`, or probably an ASCII letter",
-    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-unexpected-character-in-attribute-name"
+    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-unexpected-character-in-attribute-name",
+    "file": "index.html"
   }
 ]
diff --git a/test/parse-error/unexpected-character-in-unquoted-attribute-value/messages.json b/test/parse-error/unexpected-character-in-unquoted-attribute-value/messages.json
index edd43483..8d5a3ed2 100644
--- a/test/parse-error/unexpected-character-in-unquoted-attribute-value/messages.json
+++ b/test/parse-error/unexpected-character-in-unquoted-attribute-value/messages.json
@@ -1,11 +1,11 @@
 [
   {
+    "column": 11,
+    "fatal": false,
     "message": "Unexpected character in unquoted attribute value",
-    "name": "index.html:3:11-3:11",
-    "reason": "Unexpected character in unquoted attribute value",
     "line": 3,
-    "column": 11,
-    "position": {
+    "name": "index.html:3:11-3:11",
+    "place": {
       "start": {
         "line": 3,
         "column": 11,
@@ -17,11 +17,11 @@
         "offset": 90
       }
     },
-    "source": "parse-error",
+    "reason": "Unexpected character in unquoted attribute value",
     "ruleId": "unexpected-character-in-unquoted-attribute-value",
-    "file": "index.html",
-    "fatal": false,
+    "source": "hast-util-from-html",
     "note": "Unexpected `` ` ``. Quote the attribute value to include it",
-    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-unexpected-character-in-unquoted-attribute-value"
+    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-unexpected-character-in-unquoted-attribute-value",
+    "file": "index.html"
   }
 ]
diff --git a/test/parse-error/unexpected-equals-sign-before-attribute-name/messages.json b/test/parse-error/unexpected-equals-sign-before-attribute-name/messages.json
index 9c018f8f..754ca52c 100644
--- a/test/parse-error/unexpected-equals-sign-before-attribute-name/messages.json
+++ b/test/parse-error/unexpected-equals-sign-before-attribute-name/messages.json
@@ -1,11 +1,11 @@
 [
   {
+    "column": 16,
+    "fatal": false,
     "message": "Unexpected equals sign before attribute name",
-    "name": "index.html:3:16-3:16",
-    "reason": "Unexpected equals sign before attribute name",
     "line": 3,
-    "column": 16,
-    "position": {
+    "name": "index.html:3:16-3:16",
+    "place": {
       "start": {
         "line": 3,
         "column": 16,
@@ -17,20 +17,20 @@
         "offset": 91
       }
     },
-    "source": "parse-error",
+    "reason": "Unexpected equals sign before attribute name",
     "ruleId": "unexpected-equals-sign-before-attribute-name",
-    "file": "index.html",
-    "fatal": false,
+    "source": "hast-util-from-html",
     "note": "Unexpected `=`. Add an attribute name before it",
-    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-unexpected-equals-sign-before-attribute-name"
+    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-unexpected-equals-sign-before-attribute-name",
+    "file": "index.html"
   },
   {
+    "column": 17,
+    "fatal": false,
     "message": "Unexpected character in attribute name",
-    "name": "index.html:3:17-3:17",
-    "reason": "Unexpected character in attribute name",
     "line": 3,
-    "column": 17,
-    "position": {
+    "name": "index.html:3:17-3:17",
+    "place": {
       "start": {
         "line": 3,
         "column": 17,
@@ -42,20 +42,20 @@
         "offset": 92
       }
     },
-    "source": "parse-error",
+    "reason": "Unexpected character in attribute name",
     "ruleId": "unexpected-character-in-attribute-name",
-    "file": "index.html",
-    "fatal": false,
+    "source": "hast-util-from-html",
     "note": "Unexpected `\"`. Expected whitespace, `/`, `>`, `=`, or probably an ASCII letter",
-    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-unexpected-character-in-attribute-name"
+    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-unexpected-character-in-attribute-name",
+    "file": "index.html"
   },
   {
+    "column": 21,
+    "fatal": false,
     "message": "Unexpected character in attribute name",
-    "name": "index.html:3:21-3:21",
-    "reason": "Unexpected character in attribute name",
     "line": 3,
-    "column": 21,
-    "position": {
+    "name": "index.html:3:21-3:21",
+    "place": {
       "start": {
         "line": 3,
         "column": 21,
@@ -67,11 +67,11 @@
         "offset": 96
       }
     },
-    "source": "parse-error",
+    "reason": "Unexpected character in attribute name",
     "ruleId": "unexpected-character-in-attribute-name",
-    "file": "index.html",
-    "fatal": false,
+    "source": "hast-util-from-html",
     "note": "Unexpected `\"`. Expected whitespace, `/`, `>`, `=`, or probably an ASCII letter",
-    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-unexpected-character-in-attribute-name"
+    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-unexpected-character-in-attribute-name",
+    "file": "index.html"
   }
 ]
diff --git a/test/parse-error/unexpected-null-character/messages.json b/test/parse-error/unexpected-null-character/messages.json
index b7ca3ff5..1b0a3ef7 100644
--- a/test/parse-error/unexpected-null-character/messages.json
+++ b/test/parse-error/unexpected-null-character/messages.json
@@ -1,11 +1,11 @@
 [
   {
+    "column": 1,
+    "fatal": false,
     "message": "Unexpected NULL character",
-    "name": "index.html:3:1-3:1",
-    "reason": "Unexpected NULL character",
     "line": 3,
-    "column": 1,
-    "position": {
+    "name": "index.html:3:1-3:1",
+    "place": {
       "start": {
         "line": 3,
         "column": 1,
@@ -17,11 +17,11 @@
         "offset": 57
       }
     },
-    "source": "parse-error",
+    "reason": "Unexpected NULL character",
     "ruleId": "unexpected-null-character",
-    "file": "index.html",
-    "fatal": false,
+    "source": "hast-util-from-html",
     "note": "Unexpected code point `0x0`. Do not use NULL characters in HTML",
-    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-unexpected-null-character"
+    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-unexpected-null-character",
+    "file": "index.html"
   }
 ]
diff --git a/test/parse-error/unexpected-question-mark-instead-of-tag-name/messages.json b/test/parse-error/unexpected-question-mark-instead-of-tag-name/messages.json
index c6c3cc12..c7c00737 100644
--- a/test/parse-error/unexpected-question-mark-instead-of-tag-name/messages.json
+++ b/test/parse-error/unexpected-question-mark-instead-of-tag-name/messages.json
@@ -1,11 +1,11 @@
 [
   {
+    "column": 2,
+    "fatal": false,
     "message": "Unexpected question mark instead of tag name",
-    "name": "index.html:3:2-3:2",
-    "reason": "Unexpected question mark instead of tag name",
     "line": 3,
-    "column": 2,
-    "position": {
+    "name": "index.html:3:2-3:2",
+    "place": {
       "start": {
         "line": 3,
         "column": 2,
@@ -17,11 +17,11 @@
         "offset": 77
       }
     },
-    "source": "parse-error",
+    "reason": "Unexpected question mark instead of tag name",
     "ruleId": "unexpected-question-mark-instead-of-tag-name",
-    "file": "index.html",
-    "fatal": false,
+    "source": "hast-util-from-html",
     "note": "Unexpected `?`. Expected an ASCII letter instead",
-    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-unexpected-question-mark-instead-of-tag-name"
+    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-unexpected-question-mark-instead-of-tag-name",
+    "file": "index.html"
   }
 ]
diff --git a/test/parse-error/unexpected-solidus-in-tag/messages.json b/test/parse-error/unexpected-solidus-in-tag/messages.json
index c65c0b3d..a97cacf2 100644
--- a/test/parse-error/unexpected-solidus-in-tag/messages.json
+++ b/test/parse-error/unexpected-solidus-in-tag/messages.json
@@ -1,11 +1,11 @@
 [
   {
+    "column": 8,
+    "fatal": false,
     "message": "Unexpected slash in tag",
-    "name": "index.html:2:8-2:8",
-    "reason": "Unexpected slash in tag",
     "line": 2,
-    "column": 8,
-    "position": {
+    "name": "index.html:2:8-2:8",
+    "place": {
       "start": {
         "line": 2,
         "column": 8,
@@ -17,11 +17,11 @@
         "offset": 23
       }
     },
-    "source": "parse-error",
+    "reason": "Unexpected slash in tag",
     "ruleId": "unexpected-solidus-in-tag",
-    "file": "index.html",
-    "fatal": false,
+    "source": "hast-util-from-html",
     "note": "Unexpected `/`. Expected it followed by `>` or in a quoted attribute value",
-    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-unexpected-solidus-in-tag"
+    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-unexpected-solidus-in-tag",
+    "file": "index.html"
   }
 ]
diff --git a/test/parse-error/unknown-named-character-reference/messages.json b/test/parse-error/unknown-named-character-reference/messages.json
index c9ce0ae1..c73b6854 100644
--- a/test/parse-error/unknown-named-character-reference/messages.json
+++ b/test/parse-error/unknown-named-character-reference/messages.json
@@ -1,11 +1,11 @@
 [
   {
+    "column": 7,
+    "fatal": false,
     "message": "Unexpected unknown named character reference",
-    "name": "index.html:3:7-3:7",
-    "reason": "Unexpected unknown named character reference",
     "line": 3,
-    "column": 7,
-    "position": {
+    "name": "index.html:3:7-3:7",
+    "place": {
       "start": {
         "line": 3,
         "column": 7,
@@ -17,11 +17,11 @@
         "offset": 71
       }
     },
-    "source": "parse-error",
+    "reason": "Unexpected unknown named character reference",
     "ruleId": "unknown-named-character-reference",
-    "file": "index.html",
-    "fatal": false,
+    "source": "hast-util-from-html",
     "note": "Unexpected character reference. Expected known named character references",
-    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-unknown-named-character-reference"
+    "url": "https://html.spec.whatwg.org/multipage/parsing.html#parse-error-unknown-named-character-reference",
+    "file": "index.html"
   }
 ]