From 0e9fc7052d616a6c71a4980bde4b6a62d257babc Mon Sep 17 00:00:00 2001
From: Christian Murphy <christian.murphy.42@gmail.com>
Date: Thu, 3 Mar 2022 20:14:17 -0700
Subject: [PATCH 1/7] add `ignore-scripts` to `.npmrc`

---
 .npmrc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.npmrc b/.npmrc
index 43c97e7..9951b11 100644
--- a/.npmrc
+++ b/.npmrc
@@ -1 +1,2 @@
 package-lock=false
+ignore-scripts=true

From dd64740abb2e56e1b6888e868a15177bba1c0cfd Mon Sep 17 00:00:00 2001
From: Titus Wormer <tituswormer@gmail.com>
Date: Fri, 1 Apr 2022 11:56:10 +0200
Subject: [PATCH 2/7] Update dev-dependencies

---
 package.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index ba7f317..73ca84a 100644
--- a/package.json
+++ b/package.json
@@ -72,16 +72,16 @@
     "c8": "^7.0.0",
     "estree-util-build-jsx": "^2.0.0",
     "prettier": "^2.0.0",
-    "remark-cli": "^9.0.0",
-    "remark-preset-wooorm": "^8.0.0",
+    "remark-cli": "^10.0.0",
+    "remark-preset-wooorm": "^9.0.0",
     "rimraf": "^3.0.0",
     "svg-tag-names": "^3.0.0",
     "tape": "^5.0.0",
-    "tsd": "^0.17.0",
+    "tsd": "^0.19.0",
     "type-coverage": "^2.0.0",
     "typescript": "^4.0.0",
     "unist-builder": "^3.0.0",
-    "xo": "^0.42.0"
+    "xo": "^0.48.0"
   },
   "scripts": {
     "prepack": "npm run build && npm run format",

From e70ba2a0bf664f16c45a7947514dc754dae5452d Mon Sep 17 00:00:00 2001
From: Titus Wormer <tituswormer@gmail.com>
Date: Fri, 1 Apr 2022 12:01:13 +0200
Subject: [PATCH 3/7] Refactor code-style

---
 lib/core.js  | 28 ++++++++++++++--------------
 package.json |  4 ++--
 readme.md    |  4 ++--
 test/core.js |  2 +-
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/lib/core.js b/lib/core.js
index d1d22f5..767ed9b 100644
--- a/lib/core.js
+++ b/lib/core.js
@@ -9,14 +9,14 @@
  *
  * @typedef {Root|Element} HResult
  * @typedef {string|number} HStyleValue
- * @typedef {Object.<string, HStyleValue>} HStyle
+ * @typedef {Record<string, HStyleValue>} HStyle
  * @typedef {string|number|boolean|null|undefined} HPrimitiveValue
- * @typedef {Array.<string|number>} HArrayValue
+ * @typedef {Array<string|number>} HArrayValue
  * @typedef {HPrimitiveValue|HArrayValue} HPropertyValue
  * @typedef {{[property: string]: HPropertyValue|HStyle}} HProperties
  *
  * @typedef {string|number|null|undefined} HPrimitiveChild
- * @typedef {Array.<Node|HPrimitiveChild>} HArrayChild
+ * @typedef {Array<Node|HPrimitiveChild>} HArrayChild
  * @typedef {Node|HPrimitiveChild|HArrayChild} HChild
  */
 
@@ -32,7 +32,7 @@ const own = {}.hasOwnProperty
 /**
  * @param {Schema} schema
  * @param {string} defaultTagName
- * @param {Array.<string>} [caseSensitive]
+ * @param {Array<string>} [caseSensitive]
  */
 export function core(schema, defaultTagName, caseSensitive) {
   const adjust = caseSensitive && createAdjustMap(caseSensitive)
@@ -41,9 +41,9 @@ export function core(schema, defaultTagName, caseSensitive) {
     /**
      * @type {{
      *   (): Root
-     *   (selector: null|undefined, ...children: HChild[]): Root
-     *   (selector: string, properties?: HProperties, ...children: HChild[]): Element
-     *   (selector: string, ...children: HChild[]): Element
+     *   (selector: null|undefined, ...children: Array<HChild>): Root
+     *   (selector: string, properties?: HProperties, ...children: Array<HChild>): Element
+     *   (selector: string, ...children: Array<HChild>): Element
      * }}
      */
     (
@@ -52,7 +52,7 @@ export function core(schema, defaultTagName, caseSensitive) {
        *
        * @param {string|null} [selector]
        * @param {HProperties|HChild} [properties]
-       * @param {HChild[]} children
+       * @param {Array<HChild>} children
        * @returns {HResult}
        */
       function (selector, properties, ...children) {
@@ -179,7 +179,7 @@ function addProperty(schema, properties, key, value) {
   }
 
   if (Array.isArray(result)) {
-    /** @type {Array.<string|number>} */
+    /** @type {Array<string|number>} */
     const finalResult = []
 
     while (++index < result.length) {
@@ -200,7 +200,7 @@ function addProperty(schema, properties, key, value) {
 }
 
 /**
- * @param {Array.<Child>} nodes
+ * @param {Array<Child>} nodes
  * @param {HChild} value
  * @returns {void}
  */
@@ -256,7 +256,7 @@ function parsePrimitive(info, name, value) {
  * @returns {string}
  */
 function style(value) {
-  /** @type {Array.<string>} */
+  /** @type {Array<string>} */
   const result = []
   /** @type {string} */
   let key
@@ -271,11 +271,11 @@ function style(value) {
 }
 
 /**
- * @param {Array.<string>} values
- * @returns {Object.<string, string>}
+ * @param {Array<string>} values
+ * @returns {Record<string, string>}
  */
 function createAdjustMap(values) {
-  /** @type {Object.<string, string>} */
+  /** @type {Record<string, string>} */
   const result = {}
   let index = -1
 
diff --git a/package.json b/package.json
index 73ca84a..100864c 100644
--- a/package.json
+++ b/package.json
@@ -88,8 +88,8 @@
     "build": "rimraf \"{script/**,test/**,}*.d.ts\" \"lib/{core,html,index,runtime-html,runtime-svg,runtime,svg-case-sensitive-tag-names,svg}.d.ts\" && tsc && tsd && type-coverage",
     "generate": "node script/generate-jsx && node script/build",
     "format": "remark . -qfo && prettier . -w --loglevel warn && xo --fix",
-    "test-api": "node test/index.js",
-    "test-coverage": "c8 --check-coverage --branches 100 --functions 100 --lines 100 --statements 100 --reporter lcov node test/index.js",
+    "test-api": "node --conditions development test/index.js",
+    "test-coverage": "c8 --check-coverage --100 --reporter lcov npm run test-api",
     "test": "npm run build && npm run generate && npm run format && npm run test-coverage"
   },
   "prettier": {
diff --git a/readme.md b/readme.md
index 027966a..e39de42 100644
--- a/readme.md
+++ b/readme.md
@@ -171,14 +171,14 @@ When nullish, builds a [`Root`][root] instead.
 
 ###### `properties`
 
-Map of properties (`Object.<*>`, optional).
+Map of properties (`Record<string, any>`, optional).
 Keys should match either the HTML attribute name, or the DOM property name, but
 are case-insensitive.
 Cannot be given when building a [`Root`][root].
 
 ###### `children`
 
-(Lists of) children (`string`, `number`, `Node`, `Array.<children>`, optional).
+(Lists of) children (`string`, `number`, `Node`, `Array<children>`, optional).
 When strings or numbers are encountered, they are mapped to [`Text`][text]
 nodes.
 If [`Root`][root] nodes are given, their children are used instead.
diff --git a/test/core.js b/test/core.js
index 07dc9f7..c0247ec 100644
--- a/test/core.js
+++ b/test/core.js
@@ -776,7 +776,7 @@ test('hastscript', (t) => {
           {type: 'text', value: 'bar'}
         ]
       },
-      'should support `Array.<string>` for a `Text`s'
+      'should support `Array<string>` for a `Text`s'
     )
 
     t.deepEqual(

From 2f8c133920fa57405815de3f3cdc21d1bc892444 Mon Sep 17 00:00:00 2001
From: Titus Wormer <tituswormer@gmail.com>
Date: Fri, 1 Apr 2022 16:15:07 +0200
Subject: [PATCH 4/7] Add improved docs

---
 example.js     |  21 ++++++
 html.js        |   4 +-
 index.js       |   4 +-
 lib/core.js    |   2 +
 lib/index.js   |   4 +-
 lib/runtime.js |   2 +-
 lib/svg.js     |   4 +-
 readme.md      | 199 +++++++++++++++++++++++++------------------------
 svg.js         |   4 +-
 9 files changed, 134 insertions(+), 110 deletions(-)
 create mode 100644 example.js

diff --git a/example.js b/example.js
new file mode 100644
index 0000000..7f79c4f
--- /dev/null
+++ b/example.js
@@ -0,0 +1,21 @@
+import {h, s} from './index.js'
+
+// Children as an array:
+console.log(
+  h('.foo#some-id', [
+    h('span', 'some text'),
+    h('input', {type: 'text', value: 'foo'}),
+    h('a.alpha', {class: 'bravo charlie', download: 'download'}, [
+      'delta',
+      'echo'
+    ])
+  ])
+)
+
+// SVG:
+console.log(
+  s('svg', {xmlns: 'http://www.w3.org/2000/svg', viewbox: '0 0 500 500'}, [
+    s('title', 'SVG `<circle>` element'),
+    s('circle', {cx: 120, cy: 120, r: 100})
+  ])
+)
diff --git a/html.js b/html.js
index 2abe80c..8cfe365 100644
--- a/html.js
+++ b/html.js
@@ -1,6 +1,6 @@
 /**
- * @typedef {import('./lib/index.js').Child} Child Acceptable child value
- * @typedef {import('./lib/index.js').Properties} Properties Acceptable properties value.
+ * @typedef {import('./lib/index.js').Child} Child
+ * @typedef {import('./lib/index.js').Properties} Properties
  */
 
 export {h} from './lib/html.js'
diff --git a/index.js b/index.js
index c5b0522..c2181f7 100644
--- a/index.js
+++ b/index.js
@@ -1,6 +1,6 @@
 /**
- * @typedef {import('./lib/index.js').Child} Child Acceptable child value
- * @typedef {import('./lib/index.js').Properties} Properties Acceptable properties value.
+ * @typedef {import('./lib/index.js').Child} Child
+ * @typedef {import('./lib/index.js').Properties} Properties
  */
 
 export {h, s} from './lib/index.js'
diff --git a/lib/core.js b/lib/core.js
index 767ed9b..48ae826 100644
--- a/lib/core.js
+++ b/lib/core.js
@@ -14,10 +14,12 @@
  * @typedef {Array<string|number>} HArrayValue
  * @typedef {HPrimitiveValue|HArrayValue} HPropertyValue
  * @typedef {{[property: string]: HPropertyValue|HStyle}} HProperties
+ *   Acceptable properties value.
  *
  * @typedef {string|number|null|undefined} HPrimitiveChild
  * @typedef {Array<Node|HPrimitiveChild>} HArrayChild
  * @typedef {Node|HPrimitiveChild|HArrayChild} HChild
+ *   Acceptable child value
  */
 
 import {find, normalize} from 'property-information'
diff --git a/lib/index.js b/lib/index.js
index 5e87b79..681441b 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1,6 +1,6 @@
 /**
- * @typedef {import('./core.js').HChild} Child Acceptable child value
- * @typedef {import('./core.js').HProperties} Properties Acceptable properties value.
+ * @typedef {import('./core.js').HChild} Child
+ * @typedef {import('./core.js').HProperties} Properties
  */
 
 export {h} from './html.js'
diff --git a/lib/runtime.js b/lib/runtime.js
index 7062781..5b0ed6c 100644
--- a/lib/runtime.js
+++ b/lib/runtime.js
@@ -8,7 +8,7 @@
  * @typedef {import('./core.js').HStyle} HStyle
  * @typedef {import('./core.js').core} Core
  *
- * @typedef {{[x: string]: HPropertyValue|HStyle|HChild}} JSXProps
+ * @typedef {Record<string, HPropertyValue|HStyle|HChild>} JSXProps
  */
 
 /**
diff --git a/lib/svg.js b/lib/svg.js
index b04a847..0d89ff6 100644
--- a/lib/svg.js
+++ b/lib/svg.js
@@ -1,6 +1,6 @@
 /**
- * @typedef {import('./core.js').HChild} Child Acceptable child value
- * @typedef {import('./core.js').HProperties} Properties Acceptable properties value.
+ * @typedef {import('./core.js').HChild} Child
+ * @typedef {import('./core.js').HProperties} Properties
  *
  * @typedef {import('./jsx-classic').Element} s.JSX.Element
  * @typedef {import('./jsx-classic').IntrinsicAttributes} s.JSX.IntrinsicAttributes
diff --git a/readme.md b/readme.md
index e39de42..d31b8de 100644
--- a/readme.md
+++ b/readme.md
@@ -8,31 +8,70 @@
 [![Backers][backers-badge]][collective]
 [![Chat][chat-badge]][chat]
 
-[**hast**][hast] utility to create [*trees*][tree] in HTML or SVG.
-
-Similar to [`hyperscript`][hyperscript], [`virtual-dom/h`][virtual-hyperscript],
-[`React.createElement`][react], and [Vue’s `createElement`][vue],
-but for [**hast**][hast].
-
-Use [`unist-builder`][u] to create any [**unist**][unist] tree.
+[hast][] utility to create trees with ease.
+
+## Contents
+
+*   [What is this?](#what-is-this)
+*   [When should I use this?](#when-should-i-use-this)
+*   [Install](#install)
+*   [Use](#use)
+*   [API](#api)
+    *   [`h(selector?[, properties][, …children])`](#hselector-properties-children)
+    *   [`s(selector?[, properties][, …children])`](#sselector-properties-children)
+*   [JSX](#jsx)
+*   [Types](#types)
+*   [Compatibility](#compatibility)
+*   [Security](#security)
+*   [Related](#related)
+*   [Contribute](#contribute)
+*   [License](#license)
+
+## What is this?
+
+This package is a hyperscript interface (like `createElement` from React and
+`h` from Vue and such) to help with creating hast trees.
+
+## When should I use this?
+
+You can use this utility in your project when you generate hast syntax trees
+with code.
+It helps because it replaces most of the repetition otherwise needed in a syntax
+tree with function calls.
+It also helps as it improves the attributes you pass by turning them into the
+form that is required by hast.
+
+You can instead use [`unist-builder`][u] when creating any unist nodes and
+[`xastscript`][x] when creating xast (XML) nodes.
 
 ## Install
 
-This package is [ESM only](https://gist.github.com/sindresorhus/a39789f98801d908bbc7ff3ecc99d99c):
-Node 12+ is needed to use it and it must be `import`ed instead of `require`d.
-
-[npm][]:
+This package is [ESM only][esm].
+In Node.js (version 12.20+, 14.14+, or 16.0+), install with [npm][]:
 
 ```sh
 npm install hastscript
 ```
 
+In Deno with [`esm.sh`][esmsh]:
+
+```js
+import {h} from 'https://esm.sh/hastscript@7'
+```
+
+In browsers with [`esm.sh`][esmsh]:
+
+```html
+<script type="module">
+  import {h} from 'https://esm.sh/hastscript@7?bundle'
+</script>
+```
+
 ## Use
 
 ```js
 import {h, s} from 'hastscript'
 
-// Children as an array:
 console.log(
   h('.foo#some-id', [
     h('span', 'some text'),
@@ -44,18 +83,6 @@ console.log(
   ])
 )
 
-// Children as arguments:
-console.log(
-  h(
-    'form',
-    {method: 'POST'},
-    h('input', {type: 'text', name: 'foo'}),
-    h('input', {type: 'text', name: 'bar'}),
-    h('input', {type: 'submit', value: 'send'})
-  )
-)
-
-// SVG:
 console.log(
   s('svg', {xmlns: 'http://www.w3.org/2000/svg', viewbox: '0 0 500 500'}, [
     s('title', 'SVG `<circle>` element'),
@@ -92,31 +119,6 @@ Yields:
     }
   ]
 }
-{
-  type: 'element',
-  tagName: 'form',
-  properties: {method: 'POST'},
-  children: [
-    {
-      type: 'element',
-      tagName: 'input',
-      properties: {type: 'text', name: 'foo'},
-      children: []
-    },
-    {
-      type: 'element',
-      tagName: 'input',
-      properties: {type: 'text', name: 'bar'},
-      children: []
-    },
-    {
-      type: 'element',
-      tagName: 'input',
-      properties: {type: 'submit', value: 'send'},
-      children: []
-    }
-  ]
-}
 {
   type: 'element',
   tagName: 'svg',
@@ -140,9 +142,13 @@ Yields:
 
 ## API
 
-This package exports the following identifiers: `h` and `s`.
+This package exports the identifiers `h` and `s`.
 There is no default export.
 
+The export map supports the automatic JSX runtime.
+You can pass `hastscript/html` (or `hastscript`) or `hastscript/svg` to your
+build tool (TypeScript, Babel, SWC) as with an `importSource` option or similar.
+
 ### `h(selector?[, properties][, …children])`
 
 ### `s(selector?[, properties][, …children])`
@@ -153,7 +159,7 @@ Create virtual [**hast**][hast] [*trees*][tree] for HTML or SVG.
 
 *   `h(): root`
 *   `h(null[, …children]): root`
-*   `h(name[, properties][, …children]): element`
+*   `h(selector[, properties][, …children]): element`
 
 (and the same for `s`).
 
@@ -190,11 +196,9 @@ If [`Root`][root] nodes are given, their children are used instead.
 ## JSX
 
 `hastscript` can be used with JSX.
-Either use the automatic runtime set to `hastscript/html`, `hastscript/svg`,
-or `hastscript` (shortcut for HTML).
-
-Or import `h` or `s` yourself and define it as the pragma (plus set the fragment
-to `null`).
+Either use the automatic runtime set to `hastscript/html` (or `hastscript`) or
+`hastscript/svg` or import `h` or `s` yourself and define it as the pragma (plus
+set the fragment to `null`).
 
 The example above can then be written like so, using inline pragmas, so
 that SVG can be used too:
@@ -203,7 +207,6 @@ that SVG can be used too:
 
 ```jsx
 /** @jsxImportSource hastscript */
-
 console.log(
   <div class="foo" id="some-id">
     <span>some text</span>
@@ -213,14 +216,6 @@ console.log(
     </a>
   </div>
 )
-
-console.log(
-  <form method="POST">
-    <input type="text" name="foo" />
-    <input type="text" name="bar" />
-    <input type="submit" name="send" />
-  </form>
-)
 ```
 
 `example-svg.jsx`:
@@ -235,20 +230,16 @@ console.log(
 )
 ```
 
-Because JSX does not allow dots (`.`) or number signs (`#`) in tag names, you
-have to pass class names and IDs in as attributes.
+> 👉 **Note**: while `h` supports dots (`.`) for classes or number signs (`#`)
+> for IDs in `selector`, those are not supported in JSX.
 
 You can use [`estree-util-build-jsx`][build-jsx] to compile JSX away.
 
-You could also use [bublé][], but it’s not ideal (`jsxFragment` is currently
-only available on the API, not the CLI, and it only allows a single pragma).
-
 For [Babel][], use [`@babel/plugin-transform-react-jsx`][babel-jsx] and either
 pass `pragma: 'h'` and `pragmaFrag: 'null'`, or pass `importSource:
 'hastscript'`.
-This is less ideal because it allows a single pragma.
-
-Babel also lets you configure this in a script:
+This is not perfect as it allows only a single pragma.
+Alternatively, Babel also lets you configure this with a comment:
 
 ```jsx
 /** @jsx s @jsxFrag null */
@@ -257,9 +248,21 @@ import {s} from 'hastscript'
 console.log(<rect />)
 ```
 
-This is useful because it allows using *both* `html` and `svg`, although in
+This is useful because it allows using *both* `html` and `svg` when used in
 different files.
 
+## Types
+
+This package is fully typed with [TypeScript][].
+It exports the additional types `Child` and `Properties`.
+
+## Compatibility
+
+Projects maintained by the unified collective are compatible with all maintained
+versions of Node.js.
+As of now, that is Node.js 12.20+, 14.14+, and 16.0+.
+Our projects sometimes work with older versions, but this is not guaranteed.
+
 ## Security
 
 Use of `hastscript` can open you up to a [cross-site scripting (XSS)][xss]
@@ -268,7 +271,7 @@ The following example shows how a script is injected that runs when loaded in a
 browser.
 
 ```js
-const tree = {type: 'root', children: []}
+const tree = h()
 
 tree.children.push(h('script', 'alert(1)'))
 ```
@@ -283,7 +286,7 @@ The following example shows how an image is injected that fails loading and
 therefore runs code in a browser.
 
 ```js
-const tree = {type: 'root', children: []}
+const tree = h()
 
 // Somehow someone injected these properties instead of an expected `src` and
 // `alt`:
@@ -302,7 +305,7 @@ The following example shows how code can run in a browser because someone stored
 an object in a database instead of the expected string.
 
 ```js
-const tree = {type: 'root', children: []}
+const tree = h()
 
 // Somehow this isn’t the expected `'wooorm'`.
 const username = {
@@ -321,28 +324,28 @@ Yields:
 ```
 
 Either do not use user input in `hastscript` or use
-[`hast-util-santize`][sanitize].
+[`hast-util-santize`][hast-util-sanitize].
 
 ## Related
 
 *   [`unist-builder`](https://github.com/syntax-tree/unist-builder)
-    — Create any unist tree
+    — create unist trees
 *   [`xastscript`](https://github.com/syntax-tree/xastscript)
-    — Create a xast tree
+    — create xast trees
 *   [`hast-to-hyperscript`](https://github.com/syntax-tree/hast-to-hyperscript)
-    — Convert a Node to React, Virtual DOM, Hyperscript, and more
+    — turn hast into React, Preact, Vue, etc
 *   [`hast-util-from-dom`](https://github.com/syntax-tree/hast-util-from-dom)
-    — Transform a DOM tree to hast
+    — turn DOM trees into hast
 *   [`hast-util-select`](https://github.com/syntax-tree/hast-util-select)
     — `querySelector`, `querySelectorAll`, and `matches`
 *   [`hast-util-to-html`](https://github.com/syntax-tree/hast-util-to-html)
-    — Stringify nodes to HTML
+    — turn hast into HTML
 *   [`hast-util-to-dom`](https://github.com/syntax-tree/hast-util-to-dom)
-    — Transform to a DOM tree
+    — turn hast into DOM trees
 
 ## Contribute
 
-See [`contributing.md` in `syntax-tree/.github`][contributing] for ways to get
+See [`contributing.md`][contributing] in [`syntax-tree/.github`][health] for
 started.
 See [`support.md`][support] for ways to get help.
 
@@ -384,25 +387,23 @@ abide by its terms.
 
 [npm]: https://docs.npmjs.com/cli/install
 
-[license]: license
+[esm]: https://gist.github.com/sindresorhus/a39789f98801d908bbc7ff3ecc99d99c
 
-[author]: https://wooorm.com
-
-[contributing]: https://github.com/syntax-tree/.github/blob/HEAD/contributing.md
+[esmsh]: https://esm.sh
 
-[support]: https://github.com/syntax-tree/.github/blob/HEAD/support.md
+[typescript]: https://www.typescriptlang.org
 
-[coc]: https://github.com/syntax-tree/.github/blob/HEAD/code-of-conduct.md
+[license]: license
 
-[hyperscript]: https://github.com/dominictarr/hyperscript
+[author]: https://wooorm.com
 
-[virtual-hyperscript]: https://github.com/Matt-Esch/virtual-dom/tree/HEAD/virtual-hyperscript
+[health]: https://github.com/syntax-tree/.github
 
-[react]: https://reactjs.org/docs/glossary.html#react-elements
+[contributing]: https://github.com/syntax-tree/.github/blob/main/contributing.md
 
-[vue]: https://vuejs.org/v2/guide/render-function.html#createElement-Arguments
+[support]: https://github.com/syntax-tree/.github/blob/main/support.md
 
-[unist]: https://github.com/syntax-tree/unist
+[coc]: https://github.com/syntax-tree/.github/blob/main/code-of-conduct.md
 
 [tree]: https://github.com/syntax-tree/unist#tree
 
@@ -416,9 +417,9 @@ abide by its terms.
 
 [u]: https://github.com/syntax-tree/unist-builder
 
-[build-jsx]: https://github.com/wooorm/estree-util-build-jsx
+[x]: https://github.com/syntax-tree/xastscript
 
-[bublé]: https://github.com/Rich-Harris/buble
+[build-jsx]: https://github.com/wooorm/estree-util-build-jsx
 
 [babel]: https://github.com/babel/babel
 
@@ -428,4 +429,4 @@ abide by its terms.
 
 [xss]: https://en.wikipedia.org/wiki/Cross-site_scripting
 
-[sanitize]: https://github.com/syntax-tree/hast-util-sanitize
+[hast-util-sanitize]: https://github.com/syntax-tree/hast-util-sanitize
diff --git a/svg.js b/svg.js
index 0576ff1..e35ceea 100644
--- a/svg.js
+++ b/svg.js
@@ -1,6 +1,6 @@
 /**
- * @typedef {import('./lib/index.js').Child} Child Acceptable child value
- * @typedef {import('./lib/index.js').Properties} Properties Acceptable properties value.
+ * @typedef {import('./lib/index.js').Child} Child
+ * @typedef {import('./lib/index.js').Properties} Properties
  */
 
 export {s} from './lib/svg.js'

From 8ab2c5f5702235495f09e1a7b5a23e8ac32931b8 Mon Sep 17 00:00:00 2001
From: Titus Wormer <tituswormer@gmail.com>
Date: Mon, 10 Oct 2022 20:12:21 +0200
Subject: [PATCH 5/7] Update dev-dependencies

---
 .github/workflows/main.yml | 2 +-
 lib/jsx-automatic.d.ts     | 5 +++--
 lib/jsx-classic.d.ts       | 5 +++--
 package.json               | 6 +++---
 test-d/automatic-h.tsx     | 2 +-
 test-d/automatic-s.tsx     | 2 +-
 test-d/classic-h.tsx       | 2 +-
 test-d/classic-s.tsx       | 2 +-
 test-d/files.ts            | 2 +-
 test-d/index.ts            | 2 +-
 10 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index fe284ad..69924a4 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -17,5 +17,5 @@ jobs:
     strategy:
       matrix:
         node:
-          - lts/erbium
+          - lts/fermium
           - node
diff --git a/lib/jsx-automatic.d.ts b/lib/jsx-automatic.d.ts
index cf7a71c..4b8d37d 100644
--- a/lib/jsx-automatic.d.ts
+++ b/lib/jsx-automatic.d.ts
@@ -1,4 +1,4 @@
-import {HProperties, HChild, HResult} from './core.js'
+import type {HProperties, HChild, HResult} from './core.js'
 
 export namespace JSX {
   /**
@@ -18,7 +18,7 @@ export namespace JSX {
    *
    * This **must** be an interface.
    */
-  // eslint-disable-next-line @typescript-eslint/consistent-indexed-object-style
+  // eslint-disable-next-line @typescript-eslint/consistent-indexed-object-style, @typescript-eslint/consistent-type-definitions
   interface IntrinsicElements {
     [name: string]:
       | HProperties
@@ -33,6 +33,7 @@ export namespace JSX {
   /**
    * The key of this interface defines as what prop children are passed.
    */
+  // eslint-disable-next-line @typescript-eslint/consistent-type-definitions
   interface ElementChildrenAttribute {
     /**
      * Only the key matters, not the value.
diff --git a/lib/jsx-classic.d.ts b/lib/jsx-classic.d.ts
index 1b720d7..69ca32f 100644
--- a/lib/jsx-classic.d.ts
+++ b/lib/jsx-classic.d.ts
@@ -1,4 +1,4 @@
-import {HProperties, HChild, HResult} from './core.js'
+import type {HProperties, HChild, HResult} from './core.js'
 
 /**
  * This unique symbol is declared to specify the key on which JSX children are passed, without conflicting
@@ -23,7 +23,7 @@ export type IntrinsicAttributes = never
  *
  * This **must** be an interface.
  */
-// eslint-disable-next-line @typescript-eslint/consistent-indexed-object-style
+// eslint-disable-next-line @typescript-eslint/consistent-indexed-object-style, @typescript-eslint/consistent-type-definitions
 export interface IntrinsicElements {
   [name: string]:
     | HProperties
@@ -38,6 +38,7 @@ export interface IntrinsicElements {
 /**
  * The key of this interface defines as what prop children are passed.
  */
+// eslint-disable-next-line @typescript-eslint/consistent-type-definitions
 export interface ElementChildrenAttribute {
   /**
    * Only the key matters, not the value.
diff --git a/package.json b/package.json
index 100864c..f6aca2c 100644
--- a/package.json
+++ b/package.json
@@ -72,16 +72,16 @@
     "c8": "^7.0.0",
     "estree-util-build-jsx": "^2.0.0",
     "prettier": "^2.0.0",
-    "remark-cli": "^10.0.0",
+    "remark-cli": "^11.0.0",
     "remark-preset-wooorm": "^9.0.0",
     "rimraf": "^3.0.0",
     "svg-tag-names": "^3.0.0",
     "tape": "^5.0.0",
-    "tsd": "^0.19.0",
+    "tsd": "^0.24.0",
     "type-coverage": "^2.0.0",
     "typescript": "^4.0.0",
     "unist-builder": "^3.0.0",
-    "xo": "^0.48.0"
+    "xo": "^0.52.0"
   },
   "scripts": {
     "prepack": "npm run build && npm run format",
diff --git a/test-d/automatic-h.tsx b/test-d/automatic-h.tsx
index a45c8df..223799a 100644
--- a/test-d/automatic-h.tsx
+++ b/test-d/automatic-h.tsx
@@ -2,7 +2,7 @@
 /* @jsxImportSource .. */
 
 import {expectType, expectError} from 'tsd'
-import {Root, Element} from 'hast'
+import type {Root, Element} from 'hast'
 import {h} from '../index.js'
 import {Fragment, jsx, jsxs} from '../jsx-runtime.js'
 
diff --git a/test-d/automatic-s.tsx b/test-d/automatic-s.tsx
index a7ccf46..41b8af2 100644
--- a/test-d/automatic-s.tsx
+++ b/test-d/automatic-s.tsx
@@ -2,7 +2,7 @@
 /* @jsxImportSource ../svg */
 
 import {expectType, expectError} from 'tsd'
-import {Root, Element} from 'hast'
+import type {Root, Element} from 'hast'
 import {s} from '../index.js'
 
 type Result = Element | Root
diff --git a/test-d/classic-h.tsx b/test-d/classic-h.tsx
index 6b143c0..819f0f2 100644
--- a/test-d/classic-h.tsx
+++ b/test-d/classic-h.tsx
@@ -1,7 +1,7 @@
 /* @jsx h */
 /* @jsxFrag null */
 import {expectType, expectError} from 'tsd'
-import {Root, Element} from 'hast'
+import type {Root, Element} from 'hast'
 import {h} from '../index.js'
 
 type Result = Element | Root
diff --git a/test-d/classic-s.tsx b/test-d/classic-s.tsx
index 9431f7b..48efedd 100644
--- a/test-d/classic-s.tsx
+++ b/test-d/classic-s.tsx
@@ -1,7 +1,7 @@
 /* @jsx s */
 /* @jsxFrag null */
 import {expectType, expectError} from 'tsd'
-import {Root, Element} from 'hast'
+import type {Root, Element} from 'hast'
 import {s} from '../index.js'
 
 type Result = Element | Root
diff --git a/test-d/files.ts b/test-d/files.ts
index 5d6c415..5340b5e 100644
--- a/test-d/files.ts
+++ b/test-d/files.ts
@@ -1,5 +1,5 @@
 import {expectType} from 'tsd'
-import {Root} from 'hast'
+import type {Root} from 'hast'
 import {h as hFromRoot} from '../html.js'
 import {s as sFromRoot} from '../svg.js'
 import {h as hFromIndex, s as sFromIndex} from '../index.js'
diff --git a/test-d/index.ts b/test-d/index.ts
index c55abf7..3ef145e 100644
--- a/test-d/index.ts
+++ b/test-d/index.ts
@@ -1,5 +1,5 @@
 import {expectType, expectError} from 'tsd'
-import {Root, Element} from 'hast'
+import type {Root, Element} from 'hast'
 import {h, s} from '../index.js'
 import {h as hFromRoot} from '../html.js'
 import {s as sFromRoot} from '../svg.js'

From 464b23dad457acc7f2c7817fce950b9cb5367b3b Mon Sep 17 00:00:00 2001
From: Titus Wormer <tituswormer@gmail.com>
Date: Mon, 10 Oct 2022 20:15:31 +0200
Subject: [PATCH 6/7] Add export of `Result` type

Closes GH-18.
---
 index.js     | 1 +
 lib/index.js | 1 +
 readme.md    | 6 +++++-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/index.js b/index.js
index c2181f7..91f126c 100644
--- a/index.js
+++ b/index.js
@@ -1,6 +1,7 @@
 /**
  * @typedef {import('./lib/index.js').Child} Child
  * @typedef {import('./lib/index.js').Properties} Properties
+ * @typedef {import('./lib/index.js').Result} Result
  */
 
 export {h, s} from './lib/index.js'
diff --git a/lib/index.js b/lib/index.js
index 681441b..2b0c85b 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1,6 +1,7 @@
 /**
  * @typedef {import('./core.js').HChild} Child
  * @typedef {import('./core.js').HProperties} Properties
+ * @typedef {import('./core.js').HResult} Result
  */
 
 export {h} from './html.js'
diff --git a/readme.md b/readme.md
index d31b8de..1184c2a 100644
--- a/readme.md
+++ b/readme.md
@@ -254,7 +254,11 @@ different files.
 ## Types
 
 This package is fully typed with [TypeScript][].
-It exports the additional types `Child` and `Properties`.
+It exports the additional types:
+
+*   `Child` — valid value used as a child
+*   `Properties` — valid properties passed to an element
+*   `Result` — output of a `h` (or `s`) call
 
 ## Compatibility
 

From 092557f4703bcf1b51412fcecfa7c9cd98bd28dd Mon Sep 17 00:00:00 2001
From: Titus Wormer <tituswormer@gmail.com>
Date: Mon, 10 Oct 2022 20:15:58 +0200
Subject: [PATCH 7/7] 7.1.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index f6aca2c..f7f5a80 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hastscript",
-  "version": "7.0.2",
+  "version": "7.1.0",
   "description": "hast utility to create trees",
   "license": "MIT",
   "keywords": [