Use @types/nlcst

.gitignore

@@ -1,7 +1,11 @@
 node_modules/
 coverage/
-packages/*/*.d.ts
+packages/retext/*.d.ts
+packages/retext-dutch/lib/*.d.ts
+packages/retext-english/lib/*.d.ts
+packages/retext-latin/lib/*.d.ts
+packages/retext-stringify/lib/*.d.ts
+/*.d.ts
 .DS_Store
 *.log
-*.d.ts
 yarn.lock

package.json

@@ -10,12 +10,12 @@
   },
   "type": "module",
   "workspaces": [
-     "packages/retext-latin",
-     "packages/retext-english",
-     "packages/retext-dutch",
-     "packages/retext-stringify",
-     "packages/retext"
-   ],
+    "packages/retext-latin",
+    "packages/retext-english",
+    "packages/retext-dutch",
+    "packages/retext-stringify",
+    "packages/retext"
+  ],
   "devDependencies": {
     "@types/tape": "^4.0.0",
     "c8": "^7.0.0",
@@ -33,7 +33,6 @@
     "xo": "^0.44.0"
   },
   "scripts": {
-    "postinstall": "lerna bootstrap --no-ci",
     "build": "npm run build --workspaces && rimraf \"*.d.ts\" && tsc && type-coverage",
     "todo": "remark -qfo && ",
     "format": "prettier . -w --loglevel warn && xo --fix",

packages/retext-dutch/index.d.ts

@@ -0,0 +1,8 @@
+// This wrapper exists because JS in TS can’t export a `@type` of a function.
+import type {Root} from 'nlcst'
+import type {Plugin, ParserClass} from 'unified'
+
+export const Parser: ParserClass<Root>
+
+declare const retextDutch: Plugin<void[], string, Root>
+export default retextDutch

packages/retext-dutch/index.js

@@ -1,16 +1,4 @@
-/**
- * @typedef {import('unified').Plugin<[]>} Plugin
- */
+import retextDutch, {Parser} from './lib/index.js'
 
-import {unherit} from 'unherit'
-// @ts-expect-error: untyped.
-import {ParseDutch as Parser} from 'parse-dutch'
-
-// Untyped.
-// type-coverage:ignore-next-line
 export {Parser}
-
-/** @type {Plugin} */
-export default function retextDutch() {
-  Object.assign(this, {Parser: unherit(Parser)})
-}
+export default retextDutch

packages/retext-dutch/lib/index.js

@@ -0,0 +1,15 @@
+/**
+ * @typedef {import('nlcst').Root} Root
+ */
+
+import {unherit} from 'unherit'
+// @ts-expect-error: untyped.
+import {ParseDutch} from 'parse-dutch'
+
+/** @type {import('unified').ParserClass<Root>} */
+export const Parser = ParseDutch
+
+/** @type {import('unified').Plugin<void[], string, Root>} */
+export default function retextDutch() {
+  Object.assign(this, {Parser: unherit(ParseDutch)})
+}

packages/retext-dutch/package.json

@@ -33,16 +33,18 @@
   "main": "index.js",
   "types": "index.d.ts",
   "files": [
+    "lib/",
     "index.d.ts",
     "index.js"
   ],
   "dependencies": {
+    "@types/nlcst": "^1.0.0",
     "parse-dutch": "^5.0.0",
     "unherit": "^3.0.0",
     "unified": "^10.0.0"
   },
   "scripts": {
-    "build": "rimraf \"*.d.ts\" && tsc && type-coverage"
+    "build": "rimraf \"lib/**/*.d.ts\" && tsc && type-coverage"
   },
   "xo": false,
   "typeCoverage": {

packages/retext-dutch/tsconfig.json

@@ -1,4 +1,4 @@
 {
   "extends": "../../tsconfig.json",
-  "include": ["*.js"]
+  "include": ["lib/**/*.js"]
 }

packages/retext-english/index.d.ts

@@ -0,0 +1,8 @@
+// This wrapper exists because JS in TS can’t export a `@type` of a function.
+import type {Root} from 'nlcst'
+import type {Plugin, ParserClass} from 'unified'
+
+export const Parser: ParserClass<Root>
+
+declare const retextEnglish: Plugin<void[], string, Root>
+export default retextEnglish

packages/retext-english/index.js

@@ -1,16 +1,4 @@
-/**
- * @typedef {import('unified').Plugin<[]>} Plugin
- */
+import retextEnglish, {Parser} from './lib/index.js'
 
-import {unherit} from 'unherit'
-// @ts-expect-error: untyped.
-import {ParseEnglish as Parser} from 'parse-english'
-
-// Untyped.
-// type-coverage:ignore-next-line
 export {Parser}
-
-/** @type {Plugin} */
-export default function retextEnglish() {
-  Object.assign(this, {Parser: unherit(Parser)})
-}
+export default retextEnglish

packages/retext-english/lib/index.js

@@ -0,0 +1,15 @@
+/**
+ * @typedef {import('nlcst').Root} Root
+ */
+
+import {unherit} from 'unherit'
+// @ts-expect-error: untyped.
+import {ParseEnglish} from 'parse-english'
+
+/** @type {import('unified').ParserClass<Root>} */
+export const Parser = ParseEnglish
+
+/** @type {import('unified').Plugin<void[], string, Root>} */
+export default function retextEnglish() {
+  Object.assign(this, {Parser: unherit(ParseEnglish)})
+}

packages/retext-english/package.json

@@ -33,16 +33,18 @@
   "main": "index.js",
   "types": "index.d.ts",
   "files": [
+    "lib/",
     "index.d.ts",
     "index.js"
   ],
   "dependencies": {
+    "@types/nlcst": "^1.0.0",
     "parse-english": "^5.0.0",
     "unherit": "^3.0.0",
     "unified": "^10.0.0"
   },
   "scripts": {
-    "build": "rimraf \"*.d.ts\" && tsc && type-coverage"
+    "build": "rimraf \"lib/**/*.d.ts\" && tsc && type-coverage"
   },
   "xo": false,
   "typeCoverage": {

packages/retext-english/tsconfig.json

@@ -1,4 +1,4 @@
 {
   "extends": "../../tsconfig.json",
-  "include": ["*.js"]
+  "include": ["lib/**/*.js"]
 }

packages/retext-latin/index.d.ts

@@ -0,0 +1,8 @@
+// This wrapper exists because JS in TS can’t export a `@type` of a function.
+import type {Root} from 'nlcst'
+import type {Plugin, ParserClass} from 'unified'
+
+export const Parser: ParserClass<Root>
+
+declare const retextLatin: Plugin<void[], string, Root>
+export default retextLatin

packages/retext-latin/index.js

@@ -1,16 +1,4 @@
-/**
- * @typedef {import('unified').Plugin<[]>} Plugin
- */
+import retextLatin, {Parser} from './lib/index.js'
 
-import {unherit} from 'unherit'
-// @ts-expect-error: untyped.
-import {ParseLatin as Parser} from 'parse-latin'
-
-// Untyped.
-// type-coverage:ignore-next-line
 export {Parser}
-
-/** @type {Plugin} */
-export default function retextLatin() {
-  Object.assign(this, {Parser: unherit(Parser)})
-}
+export default retextLatin

packages/retext-latin/lib/index.js

@@ -0,0 +1,15 @@
+/**
+ * @typedef {import('nlcst').Root} Root
+ */
+
+import {unherit} from 'unherit'
+// @ts-expect-error: untyped.
+import {ParseLatin} from 'parse-latin'
+
+/** @type {import('unified').ParserClass<Root>} */
+export const Parser = ParseLatin
+
+/** @type {import('unified').Plugin<void[], string, Root>} */
+export default function retextLatin() {
+  Object.assign(this, {Parser: unherit(ParseLatin)})
+}

packages/retext-latin/package.json

@@ -33,16 +33,18 @@
   "main": "index.js",
   "types": "index.d.ts",
   "files": [
+    "lib/",
     "index.d.ts",
     "index.js"
   ],
   "dependencies": {
+    "@types/nlcst": "^1.0.0",
     "parse-latin": "^5.0.0",
     "unherit": "^3.0.0",
     "unified": "^10.0.0"
   },
   "scripts": {
-    "build": "rimraf \"*.d.ts\" && tsc && type-coverage"
+    "build": "rimraf \"lib/**/*.d.ts\" && tsc && type-coverage"
   },
   "xo": false,
   "typeCoverage": {

packages/retext-latin/tsconfig.json

@@ -1,4 +1,4 @@
 {
   "extends": "../../tsconfig.json",
-  "include": ["*.js"]
+  "include": ["lib/**/*.js"]
 }

packages/retext-stringify/index.d.ts

@@ -0,0 +1,6 @@
+// This wrapper exists because JS in TS can’t export a `@type` of a function.
+import type {Root} from 'nlcst'
+import type {Plugin} from 'unified'
+
+declare const retextStringify: Plugin<void[], Root, string>
+export default retextStringify

packages/retext-stringify/index.js

@@ -1,19 +1,3 @@
-/**
- * @typedef {import('unified').Plugin<[]>} Plugin
- * @typedef {import('unist').Node} Node
- */
+import retextStringify from './lib/index.js'
 
-import {toString} from 'nlcst-to-string'
-
-/** @type {Plugin} */
-export default function retextStringify() {
-  Object.assign(this, {Compiler})
-}
-
-/**
- * @param {Node} tree
- * @returns {string}
- */
-function Compiler(tree) {
-  return toString(tree)
-}
+export default retextStringify

packages/retext-stringify/lib/index.js

@@ -0,0 +1,15 @@
+/**
+ * @typedef {import('nlcst').Root} Root
+ */
+
+import {toString} from 'nlcst-to-string'
+
+/** @type {import('unified').Plugin<void[], Root, string>} */
+export default function retextStringify() {
+  Object.assign(this, {Compiler})
+}
+
+/** @type {import('unified').CompilerFunction<Root, string>} */
+function Compiler(tree) {
+  return toString(tree)
+}

packages/retext-stringify/package.json

@@ -35,16 +35,17 @@
   "main": "index.js",
   "types": "index.d.ts",
   "files": [
+    "lib/",
     "index.d.ts",
     "index.js"
   ],
   "dependencies": {
-    "@types/unist": "^2.0.0",
+    "@types/nlcst": "^1.0.0",
     "nlcst-to-string": "^3.0.0",
     "unified": "^10.0.0"
   },
   "scripts": {
-    "build": "rimraf \"*.d.ts\" && tsc && type-coverage"
+    "build": "rimraf \"lib/**/*.d.ts\" && tsc && type-coverage"
   },
   "xo": false,
   "typeCoverage": {

packages/retext-stringify/tsconfig.json

@@ -1,4 +1,4 @@
 {
   "extends": "../../tsconfig.json",
-  "include": ["*.js"]
+  "include": ["lib/**/*.js"]
 }

packages/retext/package.json

@@ -36,6 +36,7 @@
     "index.js"
   ],
   "dependencies": {
+    "@types/nlcst": "^1.0.0",
     "retext-latin": "^3.0.0",
     "retext-stringify": "^3.0.0",
     "unified": "^10.0.0"

test.js

@@ -1,9 +1,15 @@
+/**
+ * @typedef {import('nlcst').Root} Root
+ * @typedef {import('nlcst').Content} Content
+ * @typedef {Root|Content} Node
+ */
+
 import test from 'tape'
 import {removePosition} from 'unist-util-remove-position'
 import {assert} from 'nlcst-test'
 import {u} from 'unist-builder'
-import {unified} from './packages/retext/node_modules/unified/index.js'
-import {retext} from './packages/retext/index.js'
+import {unified} from 'unified'
+import {retext} from 'retext'
 
 const parsers = ['latin', 'english', 'dutch']
 
@@ -39,7 +45,7 @@ function eachParser(name) {
 
     const fp = './packages/retext-' + name + '/index.js'
 
-    /** @type {import('./packages/retext/node_modules/unified').Plugin<[]>} */
+    /** @type {import('unified').Plugin<void[], string, Root>} */
     // type-coverage:ignore-next-line
     const plugin = (await import(fp)).default