Replace line-column with vfile-location

TrySound · TrySound · commit 96d7e76e7896 · 2020-11-21T19:15:57.000+03:00
vfile-location is dependency free and quite fresh package. https://github.com/vfile/vfile-location line-column has outdated dependencies and was not touched in 5 years. https://github.com/io-monad/line-column
diff --git a/lib/input.d.ts b/lib/input.d.ts
@@ -126,5 +126,7 @@ export default class Input {
    *
    * @param offset Source offset.
    */
-  fromOffset (offset: number): { line: number; col: number } | null
+  fromOffset (
+    offset: number
+  ): { offset?: number; line?: number; column?: number }
 }
diff --git a/lib/input.js b/lib/input.js
@@ -3,7 +3,7 @@
 let { fileURLToPath, pathToFileURL } = require('url')
 let { resolve, isAbsolute } = require('path')
 let { nanoid } = require('nanoid/non-secure')
-let lineColumn = require('line-column')
+let vfileLocation = require('vfile-location')
 
 let terminalHighlight = require('./terminal-highlight')
 let CssSyntaxError = require('./css-syntax-error')
@@ -50,8 +50,8 @@ class Input {
   }
 
   fromOffset (offset) {
-    let finder = lineColumn(this.css)
-    this.fromOffset = i => finder.fromIndex(i)
+    let finder = vfileLocation(this.css)
+    this.fromOffset = i => finder.toPoint(i)
     return this.fromOffset(offset)
   }
 
@@ -60,7 +60,7 @@ class Input {
     if (!column) {
       let pos = this.fromOffset(line)
       line = pos.line
-      column = pos.col
+      column = pos.column
     }
     let origin = this.origin(line, column)
     if (origin) {
diff --git a/lib/parser.js b/lib/parser.js
@@ -376,12 +376,7 @@ class Parser {
   // Helpers
 
   getPosition (offset) {
-    let pos = this.input.fromOffset(offset)
-    return {
-      offset,
-      line: pos.line,
-      column: pos.col
-    }
+    return this.input.fromOffset(offset)
   }
 
   init (node, offset) {
diff --git a/package.json b/package.json
@@ -39,9 +39,9 @@
   "repository": "postcss/postcss",
   "dependencies": {
     "colorette": "^1.2.1",
-    "line-column": "^1.0.2",
     "nanoid": "^3.1.16",
-    "source-map": "^0.6.1"
+    "source-map": "^0.6.1",
+    "vfile-location": "^3.2.0"
   },
   "devDependencies": {
     "@logux/eslint-config": "^42.2.2",
diff --git a/yarn.lock b/yarn.lock
@@ -11037,6 +11037,11 @@ vfile-location@^2.0.0:
   resolved "https://registry.yarnpkg.com/vfile-location/-/vfile-location-2.0.6.tgz#8a274f39411b8719ea5728802e10d9e0dff1519e"
   integrity sha512-sSFdyCP3G6Ka0CEmN83A2YCMKIieHx0EDaj5IDP4g1pa5ZJ4FJDvpO0WODLxo4LUX4oe52gmSCK7Jw4SBghqxA==
 
+vfile-location@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/vfile-location/-/vfile-location-3.2.0.tgz#d8e41fbcbd406063669ebf6c33d56ae8721d0f3c"
+  integrity sha512-aLEIZKv/oxuCDZ8lkJGhuhztf/BW4M+iHdCwglA/eWc+vtuRFJj8EtgceYFX4LRjOhCAAiNHsKGssC6onJ+jbA==
+
 vfile-message@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-1.1.1.tgz#5833ae078a1dfa2d96e9647886cd32993ab313e1"

Original file line number	Diff line number	Diff line change
`@@ -126,5 +126,7 @@ export default class Input {`
`126`	`126`	`*`
`127`	`127`	`* @param offset Source offset.`
`128`	`128`	`*/`
`129`		`- fromOffset (offset: number): { line: number; col: number } \| null`
	`129`	`+ fromOffset (`
	`130`	`+ offset: number`
	`131`	`+ ): { offset?: number; line?: number; column?: number }`
`130`	`132`	`}`