Refactor to remove some ts-expect-errors

packages/retext-dutch/index.d.ts

@@ -4,6 +4,10 @@ import type {Plugin} from 'unified'
 // See `parse-latin`.
 type Extension<Node extends Nodes> = (node: Node) => undefined | void
 
+// Note: we have to use manual types here,
+// instead of getting them from `lib/index.js`,
+// because TS generates wrong types for functions that use `this`.
+// TS makes them into classes which is incorrect.
 /**
  * Add support for parsing Dutch natural language.
  *

packages/retext-dutch/lib/index.js

@@ -1,24 +1,29 @@
 /**
  * @import {Root} from 'nlcst'
- * @import {Parser, Processor} from 'unified'
+ * @import {Processor} from 'unified'
  */
 
 import {ParseDutch} from 'parse-dutch'
 
 /**
  * Add support for parsing Dutch natural language.
  *
+ * @this {Processor<Root>}
+ *   Processor.
  * @returns {undefined}
  *   Nothing.
  */
 export default function retextDutch() {
-  // @ts-expect-error -- TS in JSDoc doesn’t understand `this`.
-  // eslint-disable-next-line unicorn/no-this-assignment
-  const self = /** @type {Processor<Root>} */ (this)
+  const self = this
 
   self.parser = parser
 
-  /** @type {Parser<Root>} */
+  /**
+   * @param {string} value
+   *   Document.
+   * @returns {Root}
+   *   Tree.
+   */
   function parser(value) {
     const parser = new ParseDutch()
     add(parser.tokenizeParagraphPlugins, self.data('nlcstParagraphExtensions'))

packages/retext-dutch/package.json

@@ -61,6 +61,9 @@
         }
       }
     ],
-    "prettier": true
+    "prettier": true,
+    "rules": {
+      "unicorn/no-this-assignment": "off"
+    }
   }
 }

packages/retext-english/index.d.ts

@@ -4,6 +4,10 @@ import type {Plugin} from 'unified'
 // See `parse-latin`.
 type Extension<Node extends Nodes> = (node: Node) => undefined | void
 
+// Note: we have to use manual types here,
+// instead of getting them from `lib/index.js`,
+// because TS generates wrong types for functions that use `this`.
+// TS makes them into classes which is incorrect.
 /**
  * Add support for parsing English natural language.
  *

packages/retext-english/lib/index.js

@@ -1,24 +1,29 @@
 /**
  * @import {Root} from 'nlcst'
- * @import {Parser, Processor} from 'unified'
+ * @import {Processor} from 'unified'
  */
 
 import {ParseEnglish} from 'parse-english'
 
 /**
  * Add support for parsing English natural language.
  *
+ * @this {Processor<Root>}
+ *   Processor.
  * @returns {undefined}
  *   Nothing.
  */
 export default function retextEnglish() {
-  // @ts-expect-error -- TS in JSDoc doesn’t understand `this`.
-  // eslint-disable-next-line unicorn/no-this-assignment
-  const self = /** @type {Processor<Root>} */ (this)
+  const self = this
 
   self.parser = parser
 
-  /** @type {Parser<Root>} */
+  /**
+   * @param {string} value
+   *   Document.
+   * @returns {Root}
+   *   Tree.
+   */
   function parser(value) {
     const parser = new ParseEnglish()
     add(parser.tokenizeParagraphPlugins, self.data('nlcstParagraphExtensions'))

packages/retext-english/package.json

@@ -61,6 +61,9 @@
         }
       }
     ],
-    "prettier": true
+    "prettier": true,
+    "rules": {
+      "unicorn/no-this-assignment": "off"
+    }
   }
 }

packages/retext-latin/index.d.ts

@@ -4,6 +4,10 @@ import type {Plugin} from 'unified'
 // See `parse-latin`.
 type Extension<Node extends Nodes> = (node: Node) => undefined | void
 
+// Note: we have to use manual types here,
+// instead of getting them from `lib/index.js`,
+// because TS generates wrong types for functions that use `this`.
+// TS makes them into classes which is incorrect.
 /**
  * Add support for parsing Latin-script natural language.
  *

packages/retext-latin/lib/index.js

@@ -8,17 +8,22 @@ import {ParseLatin} from 'parse-latin'
 /**
  * Add support for parsing Latin-script natural language.
  *
+ * @this {Processor<Root>}
+ *   Processor.
  * @returns {undefined}
  *   Nothing.
  */
 export default function retextLatin() {
-  // @ts-expect-error -- TS in JSDoc doesn’t understand `this`.
-  // eslint-disable-next-line unicorn/no-this-assignment
-  const self = /** @type {Processor<Root>} */ (this)
+  const self = this
 
   self.parser = parser
 
-  /** @type {Parser<Root>} */
+  /**
+   * @param {string} value
+   *   Document.
+   * @returns {Root}
+   *   Tree.
+   */
   function parser(value) {
     const parser = new ParseLatin()
     add(parser.tokenizeParagraphPlugins, self.data('nlcstParagraphExtensions'))

packages/retext-latin/package.json

@@ -61,6 +61,9 @@
         }
       }
     ],
-    "prettier": true
+    "prettier": true,
+    "rules": {
+      "unicorn/no-this-assignment": "off"
+    }
   }
 }

packages/retext-stringify/index.d.ts

@@ -1,6 +1,10 @@
 import type {Root} from 'nlcst'
 import type {Plugin} from 'unified'
 
+// Note: we have to use manual types here,
+// instead of getting them from `lib/index.js`,
+// because TS generates wrong types for functions that use `this`.
+// TS makes them into classes which is incorrect.
 /**
  * Add support for serializing natural language.
  *

packages/retext-stringify/lib/index.js

@@ -1,28 +1,28 @@
 /**
  * @import {Root} from 'nlcst'
- * @import {Compiler, Processor} from 'unified'
+ * @import {Processor} from 'unified'
  */
 
 import {toString} from 'nlcst-to-string'
 
 /**
  * Add support for serializing natural language.
  *
+ * @this {Processor<undefined, undefined, undefined, Root, string>}
+ *   Processor.
  * @returns {undefined}
  *   Nothing.
  */
 export default function retextStringify() {
-  // eslint-disable-next-line unicorn/no-this-assignment
-  const self =
-    /** @type {Processor<undefined, undefined, undefined, Root, string>} */ (
-      // @ts-expect-error -- TS in JSDoc doesn’t understand `this`.
-      this
-    )
-
-  self.compiler = compiler
+  this.compiler = compiler
 }
 
-/** @type {Compiler<Root, string>} */
+/**
+ * @param {Root} tree
+ *   Tree.
+ * @returns {string}
+ *   Document.
+ */
 function compiler(tree) {
   return toString(tree)
 }