Update unified

lib/configuration.js

@@ -1,9 +1,10 @@
 /**
- * @typedef {import('unified').Settings} Settings
- * @typedef {import('unified').Plugin} Plugin
- * @typedef {import('unified').PluginTuple} PluginTuple
+ * @typedef {import('unified').Plugin<unknown[]>} Plugin
+ * @typedef {import('unified').PluginTuple<unknown[]>} PluginTuple
  * @typedef {import('unified').PluggableList} PluggableList
  *
+ * @typedef {Record<string, unknown>} Settings
+ *
  * @typedef {Record<string, Settings|null|undefined>} PluginIdObject
  * @typedef {Array<string|[string, ...unknown[]]>} PluginIdList
  *
@@ -205,7 +206,7 @@ export class Configuration {
 async function loadScriptOrModule(_, filePath) {
   // C8 bug on Node@12
   /* c8 ignore next 4 */
-  // @ts-expect-error: Should be a config.
+  // @ts-expect-error: Assume it matches config.
   // type-coverage:ignore-next-line
   return loadFromAbsolutePath(filePath, this.cwd)
 }
@@ -214,7 +215,7 @@ async function loadScriptOrModule(_, filePath) {
 async function loadYaml(buf, filePath) {
   // C8 bug on Node@12
   /* c8 ignore next 4 */
-  // @ts-expect-error: Should be a config.
+  // @ts-expect-error: Assume it matches config.
   return jsYaml.load(String(buf), {filename: path.basename(filePath)})
 }
 
@@ -225,9 +226,10 @@ async function loadJson(buf, filePath) {
 
   // C8 bug on Node@12
   /* c8 ignore next 7 */
-  // @ts-expect-error: Should be a config.
+  // @ts-expect-error: Assume it matches config.
   return path.basename(filePath) === 'package.json'
-    ? // @ts-expect-error: `this` is the configuration context.
+    ? // @ts-expect-error: `this` is the configuration context, TS doesn’t like
+      // `this` on callbacks.
       // type-coverage:ignore-next-line
       result[this.packageField]
     : result
@@ -282,7 +284,7 @@ async function merge(target, raw, options) {
 
       // Keep order sequential instead of parallel.
       /* eslint-disable no-await-in-loop */
-      // @ts-expect-error: fine.
+      // @ts-expect-error: Spreading is fine.
       // type-coverage:ignore-next-line
       await (Array.isArray(value) ? use(...value) : use(value, undefined))
       /* eslint-enable no-await-in-loop */
@@ -376,7 +378,6 @@ async function merge(target, raw, options) {
   function addPlugin(plugin, value) {
     const entry = find(target.plugins, plugin)
 
-    // To do: <https://github.com/unifiedjs/unified/pull/145>.
     if (value === null) {
       value = undefined
     }

lib/file-pipeline/configure.js

@@ -64,7 +64,6 @@ export function configure(context, file, next) {
       )
 
       try {
-        // @ts-expect-error: unified types are wrong.
         context.processor.use(plugin, options, context.fileSet)
         /* Should not happen anymore! */
         /* c8 ignore next 3 */

lib/file-pipeline/stringify.js

@@ -62,10 +62,9 @@ export function stringify(context, file) {
   if (value === undefined || value === null) {
     // Empty.
   } else if (typeof value === 'string' || isBuffer(value)) {
-    // @ts-expect-error: fine.
+    // @ts-expect-error: `isBuffer` checks buffer.
     file.value = value
   } else {
-    // @ts-expect-error: non-string compiler.
     file.result = value
   }
 

lib/file-pipeline/transform.js

@@ -21,7 +21,7 @@ export function transform(context, file, next) {
     next()
   } else {
     debug('Transforming document `%s`', file.path)
-    // @ts-expect-error: `tree` is defined.
+    // @ts-expect-error: `tree` is defined at this point.
     context.processor.run(context.tree, file, (error, node) => {
       debug('Transformed document (error: %s)', error)
       context.tree = node

lib/find-up.js

@@ -209,7 +209,7 @@ export class FindUp {
        */
       function found(error, result) {
         /** @type {Callback[]} */
-        // @ts-expect-error: always a list.
+        // @ts-expect-error: always a list if found.
         const cbs = self.cache[directory]
         self.cache[directory] = error || result
         applyAll(cbs, error || result)

lib/finder.js

@@ -46,10 +46,9 @@ export function finder(input, options, callback) {
     // Glob errors are unusual.
     // other errors are on the vfile results.
     /* c8 ignore next 2 */
-    if (error) {
+    if (error || !result) {
       callback(error)
     } else {
-      // @ts-expect-error: either `error` or `result` is given.
       callback(null, {oneFileMode: oneFileMode(result), files: result.output})
     }
   })
@@ -124,10 +123,9 @@ function expand(input, options, next) {
   function done1(error, files) {
     // `search` currently does not give errors.
     /* c8 ignore next 2 */
-    if (error) {
+    if (error || !files) {
       next(error)
     } else {
-      // @ts-expect-error: either `error` or `files` are given.
       next(null, {input: paths, output: files})
     }
   }

lib/index.js

@@ -1,5 +1,6 @@
 /**
  * @typedef {import('vfile').VFile} VFile
+ * @typedef {import('unified').Processor} Processor
  * @typedef {import('./file-set.js').FileSet} FileSet
  * @typedef {import('./file-set.js').Completer} Completer
  * @typedef {import('./ignore.js').ResolveFrom} ResolveFrom
@@ -58,7 +59,7 @@
  *
  * @typedef Options
  *   Options for unified engine
- * @property {import('unified').Processor<>} processor
+ * @property {Processor} processor
  *   Unified processor to transform files
  * @property {string} [cwd]
  *   Directory to search files in, load plugins from, and more.
@@ -181,10 +182,11 @@ import {fileSetPipeline} from './file-set-pipeline/index.js'
 export function engine(options, callback) {
   /** @type {Settings} */
   const settings = {}
+  /** @type {NodeJS.ReadStream} */
+  // @ts-expect-error: `PassThrough` sure is readable.
   let stdin = new PassThrough()
 
   try {
-    // @ts-expect-error: fine.
     stdin = process.stdin
     // Obscure bug in Node (seen on Windows).
     // See: <https://github.com/nodejs/node/blob/f856234/lib/internal/process/stdio.js#L82>,

package.json

@@ -67,7 +67,7 @@
     "tape": "^5.0.0",
     "type-coverage": "^2.0.0",
     "typescript": "^4.0.0",
-    "unified": "^10.0.0-beta.1",
+    "unified": "^10.0.0",
     "vfile": "^5.0.0",
     "vfile-reporter-json": "^3.0.0",
     "vfile-reporter-pretty": "^6.0.0",

test/completers.js

@@ -1,4 +1,5 @@
 /**
+ * @typedef {import('unified').Plugin<[unknown, FileSet]>} FileSetPlugin
  * @typedef {import('../index.js').FileSet} FileSet
  */
 
@@ -28,10 +29,7 @@ test('completers', (t) => {
         processor: noop,
         streamError: stderr.stream,
         plugins: [
-          /**
-           * @param {unknown} _
-           * @param {FileSet} set
-           */
+          /** @type {FileSetPlugin} */
           function (_, set) {
             t.equal(typeof set, 'object', 'should pass a set')
             t.equal(typeof set.use, 'function', 'should have a `use` method')
@@ -104,10 +102,7 @@ test('completers', (t) => {
         processor: noop,
         streamError: stderr.stream,
         plugins: [
-          /**
-           * @param {unknown} _
-           * @param {FileSet} set
-           */
+          /** @type {FileSetPlugin} */
           function (_, set) {
             set.add('bar.text')
           }

test/configuration-default.js

@@ -21,8 +21,9 @@ test('`defaultConfig`', (t) => {
 
     engine(
       {
-        // @ts-expect-error: unified types are wrong.
-        processor: noop().use(addTest),
+        processor: noop().use(function () {
+          Object.assign(this, {t})
+        }),
         streamError: stderr.stream,
         cwd: path.join(fixtures, 'config-default'),
         files: ['.'],
@@ -38,12 +39,6 @@ test('`defaultConfig`', (t) => {
         )
       }
     )
-
-    function addTest() {
-      // Used in test.
-      // type-coverage:ignore-next-line
-      this.t = t
-    }
   })
 
   t.test('should use found otherwise', (t) => {
@@ -53,8 +48,9 @@ test('`defaultConfig`', (t) => {
 
     engine(
       {
-        // @ts-expect-error: unified types are wrong.
-        processor: noop().use(addTest),
+        processor: noop().use(function () {
+          Object.assign(this, {t})
+        }),
         streamError: stderr.stream,
         cwd: path.join(fixtures, 'config-default'),
         files: ['.'],
@@ -70,11 +66,5 @@ test('`defaultConfig`', (t) => {
         )
       }
     )
-
-    function addTest() {
-      // Used in test.
-      // type-coverage:ignore-next-line
-      this.t = t
-    }
   })
 })

test/configuration-plugins.js

@@ -17,8 +17,9 @@ test('configuration', (t) => {
 
     engine(
       {
-        // @ts-expect-error: unified types are wrong.
-        processor: noop().use(addTest),
+        processor: noop().use(function () {
+          Object.assign(this, {t})
+        }),
         cwd: path.join(fixtures, 'config-plugins-cascade'),
         streamError: stderr.stream,
         files: ['.'],
@@ -34,12 +35,6 @@ test('configuration', (t) => {
         )
       }
     )
-
-    function addTest() {
-      // Used in test.
-      // type-coverage:ignore-next-line
-      this.t = t
-    }
   })
 
   t.test('should support an ESM plugin w/ an `.mjs` extname', (t) => {
@@ -50,8 +45,9 @@ test('configuration', (t) => {
 
     engine(
       {
-        // @ts-expect-error: unified types are wrong.
-        processor: noop().use(addTest),
+        processor: noop().use(function () {
+          Object.assign(this, {t})
+        }),
         cwd: path.join(fixtures, 'config-plugins-esm-mjs'),
         streamError: stderr.stream,
         files: ['one.txt'],
@@ -65,12 +61,6 @@ test('configuration', (t) => {
         )
       }
     )
-
-    function addTest() {
-      // Used in test.
-      // type-coverage:ignore-next-line
-      this.t = t
-    }
   })
 
   t.test('should support an ESM plugin w/ a `.js` extname', (t) => {
@@ -81,8 +71,9 @@ test('configuration', (t) => {
 
     engine(
       {
-        // @ts-expect-error: unified types are wrong.
-        processor: noop().use(addTest),
+        processor: noop().use(function () {
+          Object.assign(this, {t})
+        }),
         cwd: path.join(fixtures, 'config-plugins-esm-js'),
         streamError: stderr.stream,
         files: ['one.txt'],
@@ -96,12 +87,6 @@ test('configuration', (t) => {
         )
       }
     )
-
-    function addTest() {
-      // Used in test.
-      // type-coverage:ignore-next-line
-      this.t = t
-    }
   })
 
   t.test('should handle failing plugins', (t) => {