build(deps): add @flex-development/vfile-location

- https://github.com/flex-development/vfile-location

Signed-off-by: Lexus Drumgold <[email protected]>

Author: unicornware

package.json

@@ -83,6 +83,7 @@
     "@flex-development/docast": "1.0.0-alpha.17",
     "@flex-development/tutils": "6.0.0-alpha.25",
     "@flex-development/unist-util-visit": "1.1.0",
+    "@flex-development/vfile-location": "1.0.0",
     "@types/mdast": "4.0.3",
     "debug": "4.3.4",
     "devlop": "1.1.0",
@@ -105,7 +106,7 @@
     "@flex-development/mkbuild": "1.0.0-alpha.23",
     "@flex-development/mlly": "1.0.0-alpha.18",
     "@flex-development/pathe": "2.0.0",
-    "@flex-development/unist-util-types": "1.3.1",
+    "@flex-development/unist-util-types": "1.4.0",
     "@html-eslint/eslint-plugin": "0.24.0",
     "@html-eslint/parser": "0.24.0",
     "@types/chai": "4.3.14",
@@ -169,7 +170,7 @@
     "yaml-eslint-parser": "1.2.2"
   },
   "resolutions": {
-    "@flex-development/unist-util-types": "1.3.1",
+    "@flex-development/unist-util-types": "1.4.0",
     "@types/mdast": "4.0.3",
     "@types/unist": "3.0.2",
     "chai": "5.1.0",

src/__tests__/location.spec.ts

@@ -3,7 +3,7 @@
  * @module docast-util-from-docs/tests/unit-d/Reader
  */
 
-import type Location from '#src/location'
+import type { Location } from '@flex-development/vfile-location'
 import type TestSubject from '../reader'
 
 describe('unit-d:Reader', () => {

src/__tests__/reader.spec-d.ts

@@ -3,18 +3,18 @@
  * @module docast-util-from-docs/interfaces/tests/unit-d/LexerOptions
  */
 
-import type { Point } from '@flex-development/docast'
 import type { Nilable } from '@flex-development/tutils'
+import type { Point } from '@flex-development/vfile-location'
 import type TestSubject from '../options-lexer'
 
 describe('unit-d:interfaces/LexerOptions', () => {
-  it('should match [from?: Nilable<Point>]', () => {
+  it('should match [from?: Point | null | undefined]', () => {
     expectTypeOf<TestSubject>()
       .toHaveProperty('from')
       .toEqualTypeOf<Nilable<Point>>()
   })
 
-  it('should match [multiline?: Nilable<boolean>]', () => {
+  it('should match [multiline?: boolean | null | undefined]', () => {
     expectTypeOf<TestSubject>()
       .toHaveProperty('multiline')
       .toEqualTypeOf<Nilable<boolean>>()

src/interfaces/__tests__/options-lexer.spec-d.ts

@@ -3,26 +3,25 @@
  * @module docast-util-from-docs/interfaces/LexerOptions
  */
 
-import type { Point } from '@flex-development/docast'
-import type { Nilable } from '@flex-development/tutils'
+import type { Point } from '@flex-development/vfile-location'
 
 /**
  * Lexer configuration options.
  */
 interface LexerOptions {
   /**
-   * Start point.
+   * Point before first character in source file.
    *
    * Node positions will be relative to this point.
    *
    * @see {@linkcode Point}
    */
-  from?: Nilable<Point>
+  from?: Point | null | undefined
 
   /**
    * Allow multiline comments.
    */
-  multiline?: Nilable<boolean>
+  multiline?: boolean | null | undefined
 }
 
 export type { LexerOptions as default }

src/interfaces/options-lexer.ts

@@ -3,19 +3,19 @@
  * @module docast-util-from-docs/lexer
  */
 
-import type { Point } from '@flex-development/docast'
-import type { Nilable, Optional } from '@flex-development/tutils'
+import type { Optional } from '@flex-development/tutils'
+import type { Point } from '@flex-development/vfile-location'
 import debug from 'debug'
 import { ok } from 'devlop'
-import type { VFile } from 'vfile'
+import type { VFile, Value } from 'vfile'
 import { TokenKind as kinds } from './enums'
 import type { LexerOptions } from './interfaces'
 import Reader from './reader'
 import Token from './token'
 import type { Character, CharacterMatch } from './types'
 
 /**
- * Source document tokenizer.
+ * Docblock tokenizer.
  *
  * @class
  */
@@ -66,7 +66,7 @@ class Lexer {
   protected readonly options: Readonly<LexerOptions>
 
   /**
-   * Source document reader.
+   * Character reader.
    *
    * @see {@linkcode Reader}
    *
@@ -102,19 +102,20 @@ class Lexer {
   protected readonly tokens: Token[]
 
   /**
-   * Create a new document tokenizer.
+   * Create a new docblock tokenizer.
    *
    * @see {@linkcode LexerOptions}
    * @see {@linkcode VFile}
+   * @see {@linkcode Value}
    *
-   * @param {VFile | string} source - Source document or file
-   * @param {Nilable<LexerOptions>?} [options] - Lexer options
+   * @param {Value | VFile} value - Source document or file
+   * @param {(LexerOptions | null)?} [options] - Lexer options
    */
-  constructor(source: VFile | string, options?: Nilable<LexerOptions>) {
+  constructor(value: Value | VFile, options?: LexerOptions | null) {
     this.comment = false
     this.debug = debug('docast-util-from-docs:lexer')
     this.options = Object.freeze(options ??= {})
-    this.reader = new Reader(source, this.options.from)
+    this.reader = new Reader(value, this.options.from)
     this.tokens = []
 
     this.head = this.tokenize()
@@ -321,7 +322,7 @@ class Lexer {
    * @return {Point} Current point in document
    */
   protected now(): Point {
-    return this.reader.point(this.reader.from.offset + this.reader.index)
+    return this.reader.point(this.reader.start.offset + this.reader.index)
   }
 
   /**