Update types for changes in micromark-util-types

syntax-tree · May 30, 2023 · 13430aa · 13430aa
1 parent cd10e59
commit 13430aa
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/dev/index.d.ts b/dev/index.d.ts
@@ -75,4 +75,16 @@ export interface CompileData {
   referenceType?: 'collapsed' | 'full' | undefined
 }
 
+declare module 'micromark-util-types' {
+  // eslint-disable-next-line @typescript-eslint/consistent-type-definitions
+  interface TokenTypeMap {
+    listItem: 'listItem'
+  }
+
+  // eslint-disable-next-line @typescript-eslint/consistent-type-definitions
+  interface Token {
+    _spread?: boolean
+  }
+}
+
 export {fromMarkdown} from './lib/index.js'
diff --git a/dev/lib/index.js b/dev/lib/index.js
@@ -192,7 +192,6 @@ export const fromMarkdown =
 
       return compiler(options)(
         postprocess(
-          // @ts-expect-error: micromark types need to accept `null`.
           parse(options).document().write(preprocess()(value, encoding, true))
         )
       )
@@ -504,7 +503,6 @@ function compiler(options) {
             firstBlankLineIndex &&
             (!lineIndex || firstBlankLineIndex < lineIndex)
           ) {
-            // @ts-expect-error Patched.
             listItem._spread = true
           }
 
@@ -523,9 +521,10 @@ function compiler(options) {
         if (event[1].type === types.listItemPrefix) {
           listItem = {
             type: 'listItem',
-            // @ts-expect-error Patched
             _spread: false,
-            start: Object.assign({}, event[1].start)
+            start: Object.assign({}, event[1].start),
+            // @ts-expect-error: we’ll add `end` in a second.
+            end: undefined
           }
           // @ts-expect-error: `listItem` is most definitely defined, TS...
           events.splice(index, 0, ['enter', listItem, event[2]])
@@ -537,7 +536,6 @@ function compiler(options) {
       }
     }
 
-    // @ts-expect-error Patched.
     events[start][1]._spread = listSpread
     return length
   }
@@ -1339,7 +1337,6 @@ function compiler(options) {
       type: 'list',
       ordered: token.type === 'listOrdered',
       start: null,
-      // @ts-expect-error Patched.
       spread: token._spread,
       children: []
     }
@@ -1352,7 +1349,6 @@ function compiler(options) {
   function listItem(token) {
     return {
       type: 'listItem',
-      // @ts-expect-error Patched.
       spread: token._spread,
       checked: null,
       children: []