Change types to use mdast types

Closes GH-37.

Co-authored-by: Christian Murphy <christian.murphy.42@gmail.com>

Author: wooorm

lib/handle/list-item.js

@@ -20,7 +20,7 @@ export function listItem(node, parent, context) {
   /** @type {string} */
   let bullet = checkBullet(context)
 
-  if (parent && parent.ordered) {
+  if (parent && parent.type === 'list' && parent.ordered) {
     bullet =
       (typeof parent.start === 'number' && parent.start > -1
         ? parent.start

lib/join.js

@@ -17,10 +17,8 @@ function joinDefaults(left, right, parent, context) {
       Boolean(left.ordered) === Boolean(right.ordered)) ||
     // Indented code after list or another indented code.
     (right.type === 'code' &&
-      // @ts-expect-error: hush.
       formatCodeAsIndented(right, context) &&
       (left.type === 'list' ||
-        // @ts-expect-error: hush.
         (left.type === right.type && formatCodeAsIndented(left, context))))
   ) {
     return false
@@ -35,7 +33,6 @@ function joinDefaults(left, right, parent, context) {
       (left.type === right.type ||
         right.type === 'definition' ||
         // Paragraph followed by a setext heading.
-        // @ts-expect-error: hush.
         (right.type === 'heading' && formatHeadingAsSetext(right, context)))
     ) {
       return

lib/types.js

@@ -1,6 +1,9 @@
 /**
- * @typedef {import('unist').Node} Node
- * @typedef {import('unist').Parent} Parent
+ * @typedef {import('unist').Parent} UnistParent
+ * @typedef {import('mdast').Root} Root
+ * @typedef {import('mdast').Content} Content
+ * @typedef {Root|Content} Node
+ * @typedef {Extract<Node, UnistParent>} Parent
  */
 
 /**

lib/util/container-flow.js

@@ -1,6 +1,6 @@
 /**
- * @typedef {import('unist').Parent} Parent
- * @typedef {import('unist').Node} Node
+ * @typedef {import('../types.js').Node} Node
+ * @typedef {import('../types.js').Parent} Parent
  * @typedef {import('../types.js').Join} Join
  * @typedef {import('../types.js').Context} Context
  */

lib/util/container-phrasing.js

@@ -1,6 +1,6 @@
 /**
- * @typedef {import('unist').Node} Node
- * @typedef {import('unist').Parent} Parent
+ * @typedef {import('../types.js').Node} Node
+ * @typedef {import('../types.js').Parent} Parent
  * @typedef {import('../types.js').SafeOptions} SafeOptions
  * @typedef {import('../types.js').Context} Context
  */