Update unified, vfile, etc

Author: wooorm

index.js

@@ -2,7 +2,7 @@ import process from 'node:process'
 import path from 'node:path'
 // @ts-expect-error: hush
 import gitDiffTree from 'git-diff-tree'
-import {findUpOne} from 'vfile-find-up'
+import {findUp} from 'vfile-find-up'
 
 const own = {}.hasOwnProperty
 
@@ -61,7 +61,7 @@ export default function diff() {
     if (own.call(cache, base)) {
       tick(cache[base])
     } else {
-      findUpOne('.git', file.dirname, (error, git) => {
+      findUp('.git', file.dirname, (error, git) => {
         // Never happens.
         /* c8 ignore next */
         if (error) return next(error)

package.json

@@ -35,25 +35,25 @@
   ],
   "dependencies": {
     "git-diff-tree": "^1.0.0",
-    "vfile-find-up": "^6.0.0"
+    "vfile-find-up": "^7.0.0"
   },
   "devDependencies": {
+    "@types/nlcst": "^2.0.0",
     "@types/rimraf": "^3.0.0",
     "@types/tape": "^5.0.0",
     "c8": "^8.0.0",
-    "nlcst-to-string": "^3.0.0",
+    "nlcst-to-string": "^4.0.0",
+    "parse-english": "^7.0.0",
     "prettier": "^3.0.0",
     "remark-cli": "^11.0.0",
     "remark-preset-wooorm": "^9.0.0",
-    "retext-english": "^4.0.0",
-    "retext-stringify": "^3.0.0",
     "rimraf": "^3.0.0",
     "tape": "^5.0.0",
-    "to-vfile": "^7.0.0",
+    "to-vfile": "^8.0.0",
     "type-coverage": "^2.0.0",
     "typescript": "^5.0.0",
-    "unified": "^10.0.0",
-    "unist-util-visit": "^4.0.0",
+    "unified": "^11.0.0",
+    "unist-util-visit": "^5.0.0",
     "xo": "^0.56.0"
   },
   "scripts": {

test/index.js

@@ -4,7 +4,7 @@ import fs from 'node:fs'
 import path from 'node:path'
 import {promisify} from 'node:util'
 import test from 'tape'
-import {toVFile} from 'to-vfile'
+import {toVFile, write} from 'to-vfile'
 import rimraf from 'rimraf'
 import {processor} from './processor.js'
 
@@ -69,15 +69,15 @@ test('diff() (travis)', async (t) => {
     'should set messages'
   )
 
-  await toVFile.write(fileOne)
+  await write(fileOne)
 
   await exec('git add example.txt')
   await exec('git commit -m one')
   const resultInitial = await exec('git rev-parse HEAD')
   const initial = resultInitial.stdout.trim()
 
   // Change files.
-  await toVFile.write({path: 'example.txt', value: stepTwo})
+  await write({path: 'example.txt', value: stepTwo})
   await exec('git add example.txt')
   await exec('git commit -m two')
   const resultFinal = await exec('git rev-parse HEAD')
@@ -117,8 +117,8 @@ test('diff() (travis)', async (t) => {
   )
 
   // New file.
-  await toVFile.write({path: 'example.txt', value: stepThree})
-  await toVFile.write({path: 'new.txt', value: other})
+  await write({path: 'example.txt', value: stepThree})
+  await write({path: 'new.txt', value: other})
   await exec('git add example.txt new.txt')
   await exec('git commit -m three')
   const resultNew = await exec('git rev-parse HEAD')
@@ -168,12 +168,12 @@ test('diff() (GitHub Actions)', async (t) => {
 
   await exec('git init')
   // Add initial file.
-  await toVFile.write({path: 'example.txt', value: stepOne})
+  await write({path: 'example.txt', value: stepOne})
   await exec('git add example.txt')
   await exec('git commit -m one')
 
   // Change file.
-  await toVFile.write({path: 'example.txt', value: stepTwo})
+  await write({path: 'example.txt', value: stepTwo})
   await exec('git add example.txt')
   await exec('git commit -m two')
   const resultInitial = await exec('git rev-parse HEAD')
@@ -197,10 +197,10 @@ test('diff() (GitHub Actions)', async (t) => {
   await exec('git checkout -b other-branch')
 
   // Change file.
-  await toVFile.write({path: 'example.txt', value: stepThree})
+  await write({path: 'example.txt', value: stepThree})
   await exec('git add example.txt')
   await exec('git commit -m three')
-  await toVFile.write({path: 'example.txt', value: stepFour})
+  await write({path: 'example.txt', value: stepFour})
   await exec('git add example.txt')
   await exec('git commit -m four')
   const final = await exec('git rev-parse HEAD')

test/processor.js

@@ -1,13 +1,43 @@
+/**
+ * @typedef {import('nlcst').Root} Root
+ */
+
 import {unified} from 'unified'
-import retextEnglish from 'retext-english'
-import retextStringify from 'retext-stringify'
-import {visit} from 'unist-util-visit'
 import {toString} from 'nlcst-to-string'
+import {ParseEnglish} from 'parse-english'
+import {visit} from 'unist-util-visit'
 import unifiedDiff from '../index.js'
 
+// To do: use `retext-english`, `retext-stringify` when they are released.
+// import retextEnglish from 'retext-english'
+// import retextStringify from 'retext-stringify'
+
 export const processor = unified()
-  .use(retextEnglish)
-  .use(retextStringify)
+  .use(
+    /** @type {import('unified').Plugin<[], string, Root>} */
+    // @ts-expect-error: TS doesn’t understand `this`.
+    function () {
+      this.parser = parser
+      /** @type {import('unified').Parser<Root>} */
+      function parser(value) {
+        const parser = new ParseEnglish()
+        const node = parser.parse(value)
+        return node
+      }
+    }
+  )
+  .use(
+    /** @type {import('unified').Plugin<[], Root, string>} */
+    // @ts-expect-error: TS doesn’t understand `this`.
+    function () {
+      // @ts-expect-error: TS doesn’t understand `this`.
+      this.compiler = compiler
+      /** @type {import('unified').Compiler<Root, string>} */
+      function compiler(node) {
+        return toString(node)
+      }
+    }
+  )
   .use(() => (tree, file) => {
     visit(tree, 'WordNode', (node) => {
       if (/lorem/i.test(toString(node))) {