Update @types/hast, utilities

Author: wooorm

lib/index.js

@@ -1,10 +1,9 @@
 /**
  * @typedef {import('hast').Root} Root
- * @typedef {import('hast').Content} Content
+ * @typedef {import('hast').Nodes} Nodes
  */
 
 /**
- * @typedef {Root | Content} Node
  * @typedef {string | number} ConditionalPrimitive
  *   Basic class names.
  * @typedef {Record<string, boolean>} ConditionalMap
@@ -36,13 +35,13 @@ const own = {}.hasOwnProperty
 export const classnames =
   /**
    * @type {(
-   *   (<T extends Node>(node: T, ...conditionals: Array<Conditional>) => T) &
+   *   (<T extends Nodes>(node: T, ...conditionals: Array<Conditional>) => T) &
    *   ((...conditionals: Array<Conditional>) => Array<string>)
    * )}
    */
   (
     /**
-     * @param {Node | Conditional | null | undefined} [node]
+     * @param {Nodes | Conditional | null | undefined} [node]
      * @param {Array<Conditional>} conditionals
      */
     function (node, ...conditionals) {
@@ -55,8 +54,6 @@ export const classnames =
       if (isNode(node)) {
         if (node.type !== 'element') throw new Error('Expected element node')
 
-        if (!node.properties) node.properties = {}
-
         if (node.properties.className) {
           // @ts-expect-error Assume `classname` is `Array<string>`
           add(map, node.properties.className)
@@ -117,8 +114,8 @@ function add(result, conditional) {
 }
 
 /**
- * @param {Node | Conditional} [value]
- * @returns {value is Node}
+ * @param {Nodes | Conditional} [value]
+ * @returns {value is Nodes}
  */
 function isNode(value) {
   return Boolean(value && typeof value === 'object' && 'type' in value)

package.json

@@ -34,19 +34,19 @@
     "index.js"
   ],
   "dependencies": {
-    "@types/hast": "^2.0.0",
+    "@types/hast": "^3.0.0",
     "space-separated-tokens": "^2.0.0"
   },
   "devDependencies": {
     "@types/node": "^20.0.0",
     "c8": "^8.0.0",
-    "hastscript": "^7.0.0",
+    "hastscript": "^8.0.0",
     "prettier": "^3.0.0",
     "remark-cli": "^11.0.0",
     "remark-preset-wooorm": "^9.0.0",
     "type-coverage": "^2.0.0",
     "typescript": "^5.0.0",
-    "unist-builder": "^3.0.0",
+    "unist-builder": "^4.0.0",
     "xo": "^0.55.0"
   },
   "scripts": {

test.js

@@ -72,12 +72,6 @@ test('classnames', () => {
     'should merge w/ current classnames'
   )
 
-  assert.deepEqual(
-    classnames(u('element', {tagName: 'a'}, []), ['alpha']),
-    h('a.alpha'),
-    'should not fail if an element is missing properties'
-  )
-
   assert.deepEqual(
     classnames(h('a'), 'alpha', {bravo: true, charlie: false}, ['delta', 123]),
     h('a.123.alpha.bravo.delta'),