Convert object

TrySound · TrySound · commit 3ef06ec6c993 · 2020-11-21T21:05:46.000+03:00
diff --git a/lib/input.d.ts b/lib/input.d.ts
@@ -126,7 +126,5 @@ export default class Input {
    *
    * @param offset Source offset.
    */
-  fromOffset (
-    offset: number
-  ): { offset?: number; line?: number; column?: number }
+  fromOffset (offset: number): { line: number; col: number } | null
 }
diff --git a/lib/input.js b/lib/input.js
@@ -51,7 +51,13 @@ class Input {
 
   fromOffset (offset) {
     let finder = vfileLocation(this.css)
-    this.fromOffset = i => finder.toPoint(i)
+    this.fromOffset = i => {
+      let position = finder.toPoint(i)
+      return {
+        line: position.line,
+        col: position.column
+      }
+    }
     return this.fromOffset(offset)
   }
 
@@ -60,7 +66,7 @@ class Input {
     if (!column) {
       let pos = this.fromOffset(line)
       line = pos.line
-      column = pos.column
+      column = pos.col
     }
     let origin = this.origin(line, column)
     if (origin) {
diff --git a/lib/parser.js b/lib/parser.js
@@ -376,7 +376,12 @@ class Parser {
   // Helpers
 
   getPosition (offset) {
-    return this.input.fromOffset(offset)
+    let pos = this.input.fromOffset(offset)
+    return {
+      offset,
+      line: pos.line,
+      column: pos.col
+    }
   }
 
   init (node, offset) {

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