From dbbefea69066a413cf739508799a83dfa5c5dd2c Mon Sep 17 00:00:00 2001
From: Tony Brix <tony@brix.ninja>
Date: Fri, 25 Aug 2023 23:58:42 -0600
Subject: [PATCH] fix: remove unknown from walkTokens return types

---
 src/Instance.ts      | 7 ++++---
 src/MarkedOptions.ts | 4 ++--
 src/marked.ts        | 4 ++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/Instance.ts b/src/Instance.ts
index 111d18c84f..0d6d93f116 100644
--- a/src/Instance.ts
+++ b/src/Instance.ts
@@ -14,6 +14,7 @@ import type { MarkedExtension, MarkedOptions } from './MarkedOptions.ts';
 import type { Token, Tokens, TokensList } from './Tokens.ts';
 
 export type ResultCallback = (error: Error | null, parseResult?: string) => undefined | void;
+export type MaybePromise = void | Promise<void>;
 
 type UnknownFunction = (...args: unknown[]) => unknown;
 type GenericRendererFunction = (...args: unknown[]) => string | false;
@@ -42,8 +43,8 @@ export class Marked {
   /**
    * Run callback for every token
    */
-  walkTokens <T = void>(tokens: Token[] | TokensList, callback: (token: Token) => T | T[]) {
-    let values: T[] = [];
+  walkTokens(tokens: Token[] | TokensList, callback: (token: Token) => MaybePromise | MaybePromise[]) {
+    let values: MaybePromise[] = [];
     for (const token of tokens) {
       values = values.concat(callback.call(this, token));
       switch (token.type) {
@@ -215,7 +216,7 @@ export class Marked {
         const walkTokens = this.defaults.walkTokens;
         const packWalktokens = pack.walkTokens;
         opts.walkTokens = function(token) {
-          let values: Array<Promise<void> | void | unknown> = [];
+          let values: MaybePromise[] = [];
           values.push(packWalktokens.call(this, token));
           if (walkTokens) {
             values = values.concat(walkTokens.call(this, token));
diff --git a/src/MarkedOptions.ts b/src/MarkedOptions.ts
index f726def3e4..c75fbadcf8 100644
--- a/src/MarkedOptions.ts
+++ b/src/MarkedOptions.ts
@@ -173,7 +173,7 @@ export interface MarkedExtension {
    * Each token is passed by reference so updates are persisted when passed to the parser.
    * The return value of the function is ignored.
    */
-  walkTokens?: ((token: Token) => void | unknown | Promise<void>) | undefined | null;
+  walkTokens?: ((token: Token) => void | Promise<void>) | undefined | null;
   /**
    * Generate closing slash for self-closing tags (<br/> instead of <br>)
    * @deprecated Deprecated in v5.0.0 use marked-xhtml to emit self-closing HTML tags for void elements (<br/>, <img/>, etc.) with a "/" as required by XHTML.
@@ -213,5 +213,5 @@ export interface MarkedOptions extends Omit<MarkedExtension, 'renderer' | 'token
   /**
    * walkTokens function returns array of values for Promise.all
    */
-  walkTokens?: null | ((token: Token) => void | (unknown | Promise<void>)[]);
+  walkTokens?: null | ((token: Token) => void | Promise<void> | (void | Promise<void>)[]);
 }
diff --git a/src/marked.ts b/src/marked.ts
index 629c1ae520..c85576e86a 100644
--- a/src/marked.ts
+++ b/src/marked.ts
@@ -13,7 +13,7 @@ import {
 } from './defaults.ts';
 import type { MarkedExtension, MarkedOptions } from './MarkedOptions.ts';
 import type { Token, TokensList } from './Tokens.ts';
-import type { ResultCallback } from './Instance.ts';
+import type { ResultCallback, MaybePromise } from './Instance.ts';
 
 const markedInstance = new Marked();
 
@@ -94,7 +94,7 @@ marked.use = function(...args: MarkedExtension[]) {
  * Run callback for every token
  */
 
-marked.walkTokens = function <T = void>(tokens: Token[] | TokensList, callback: (token: Token) => T | T[]) {
+marked.walkTokens = function(tokens: Token[] | TokensList, callback: (token: Token) => MaybePromise | MaybePromise[]) {
   return markedInstance.walkTokens(tokens, callback);
 };