@glimt/record 0.0.10 → 0.0.12

package/dist/record.umd.cjs

@@ -2107,7 +2107,7 @@ let Node$4$1 = class Node2 {
     let index2 = this.parent.index(this);
     return this.parent.nodes[index2 + 1];
   }
-  positionBy(opts) {
+  positionBy(opts = {}) {
     let pos = this.source.start;
     if (opts.index) {
       pos = this.positionInside(opts.index);
@@ -2136,27 +2136,38 @@ let Node$4$1 = class Node2 {
         column += 1;
       }
     }
-    return { column, line };
+    return { column, line, offset: end };
   }
   prev() {
     if (!this.parent) return void 0;
     let index2 = this.parent.index(this);
     return this.parent.nodes[index2 - 1];
   }
-  rangeBy(opts) {
+  rangeBy(opts = {}) {
+    let inputString = "document" in this.source.input ? this.source.input.document : this.source.input.css;
     let start = {
       column: this.source.start.column,
-      line: this.source.start.line
+      line: this.source.start.line,
+      offset: sourceOffset$1(inputString, this.source.start)
     };
     let end = this.source.end ? {
       column: this.source.end.column + 1,
-      line: this.source.end.line
+      line: this.source.end.line,
+      offset: typeof this.source.end.offset === "number" ? (
+        // `source.end.offset` is exclusive, so we don't need to add 1
+        this.source.end.offset
+      ) : (
+        // Since line/column in this.source.end is inclusive,
+        // the `sourceOffset(... , this.source.end)` returns an inclusive offset.
+        // So, we add 1 to convert it to exclusive.
+        sourceOffset$1(inputString, this.source.end) + 1
+      )
     } : {
       column: start.column + 1,
-      line: start.line
+      line: start.line,
+      offset: start.offset + 1
     };
     if (opts.word) {
-      let inputString = "document" in this.source.input ? this.source.input.document : this.source.input.css;
       let stringRepresentation = inputString.slice(
         sourceOffset$1(inputString, this.source.start),
         sourceOffset$1(inputString, this.source.end)
@@ -2164,15 +2175,14 @@ let Node$4$1 = class Node2 {
       let index2 = stringRepresentation.indexOf(opts.word);
       if (index2 !== -1) {
         start = this.positionInside(index2);
-        end = this.positionInside(
-          index2 + opts.word.length
-        );
+        end = this.positionInside(index2 + opts.word.length);
       }
     } else {
       if (opts.start) {
         start = {
           column: opts.start.column,
-          line: opts.start.line
+          line: opts.start.line,
+          offset: sourceOffset$1(inputString, opts.start)
         };
       } else if (opts.index) {
         start = this.positionInside(opts.index);
@@ -2180,7 +2190,8 @@ let Node$4$1 = class Node2 {
       if (opts.end) {
         end = {
           column: opts.end.column,
-          line: opts.end.line
+          line: opts.end.line,
+          offset: sourceOffset$1(inputString, opts.end)
         };
       } else if (typeof opts.endIndex === "number") {
         end = this.positionInside(opts.endIndex);
@@ -2189,7 +2200,11 @@ let Node$4$1 = class Node2 {
       }
     }
     if (end.line < start.line || end.line === start.line && end.column <= start.column) {
-      end = { column: start.column + 1, line: start.line };
+      end = {
+        column: start.column + 1,
+        line: start.line,
+        offset: start.offset + 1
+      };
     }
     return { end, start };
   }
@@ -2253,6 +2268,7 @@ let Node$4$1 = class Node2 {
       } else if (typeof value === "object" && value.toJSON) {
         fixed[name] = value.toJSON(null, inputs);
       } else if (name === "source") {
+        if (value == null) continue;
         let inputId = inputs.get(value.input);
         if (inputId == null) {
           inputId = inputsNextIndex;
@@ -2287,7 +2303,7 @@ let Node$4$1 = class Node2 {
     });
     return result2;
   }
-  warn(result2, text, opts) {
+  warn(result2, text, opts = {}) {
     let data = { node: this };
     for (let i2 in opts) data[i2] = opts[i2];
     return result2.warn(text, data);
@@ -2868,9 +2884,21 @@ let { fileURLToPath: fileURLToPath$1, pathToFileURL: pathToFileURL$1$1 } = requi
 let CssSyntaxError$1$1 = cssSyntaxError$1;
 let PreviousMap$1$1 = previousMap$1;
 let terminalHighlight$2 = require$$2$1;
-let fromOffsetCache$1 = Symbol("fromOffsetCache");
+let lineToIndexCache$1 = Symbol("lineToIndexCache");
 let sourceMapAvailable$1$1 = Boolean(SourceMapConsumer$1$1 && SourceMapGenerator$1$1);
 let pathAvailable$1$1 = Boolean(resolve$1$1 && isAbsolute$1);
+function getLineToIndex$1(input2) {
+  if (input2[lineToIndexCache$1]) return input2[lineToIndexCache$1];
+  let lines = input2.css.split("\n");
+  let lineToIndex = new Array(lines.length);
+  let prevIndex = 0;
+  for (let i2 = 0, l2 = lines.length; i2 < l2; i2++) {
+    lineToIndex[i2] = prevIndex;
+    prevIndex += lines[i2].length + 1;
+  }
+  input2[lineToIndexCache$1] = lineToIndex;
+  return lineToIndex;
+}
 let Input$4$1 = class Input {
   get from() {
     return this.file || this.id;
@@ -2909,30 +2937,37 @@ let Input$4$1 = class Input {
     if (this.map) this.map.file = this.from;
   }
   error(message, line, column, opts = {}) {
-    let endColumn, endLine, result2;
+    let endColumn, endLine, endOffset, offset, result2;
     if (line && typeof line === "object") {
       let start = line;
       let end = column;
       if (typeof start.offset === "number") {
-        let pos = this.fromOffset(start.offset);
+        offset = start.offset;
+        let pos = this.fromOffset(offset);
         line = pos.line;
         column = pos.col;
       } else {
         line = start.line;
         column = start.column;
+        offset = this.fromLineAndColumn(line, column);
       }
       if (typeof end.offset === "number") {
-        let pos = this.fromOffset(end.offset);
+        endOffset = end.offset;
+        let pos = this.fromOffset(endOffset);
         endLine = pos.line;
         endColumn = pos.col;
       } else {
         endLine = end.line;
         endColumn = end.column;
+        endOffset = this.fromLineAndColumn(end.line, end.column);
       }
     } else if (!column) {
-      let pos = this.fromOffset(line);
+      offset = line;
+      let pos = this.fromOffset(offset);
       line = pos.line;
       column = pos.col;
+    } else {
+      offset = this.fromLineAndColumn(line, column);
     }
     let origin = this.origin(line, column, endLine, endColumn);
     if (origin) {
@@ -2954,7 +2989,7 @@ let Input$4$1 = class Input {
         opts.plugin
       );
     }
-    result2.input = { column, endColumn, endLine, line, source: this.css };
+    result2.input = { column, endColumn, endLine, endOffset, line, offset, source: this.css };
     if (this.file) {
       if (pathToFileURL$1$1) {
         result2.input.url = pathToFileURL$1$1(this.file).toString();
@@ -2963,21 +2998,14 @@ let Input$4$1 = class Input {
     }
     return result2;
   }
+  fromLineAndColumn(line, column) {
+    let lineToIndex = getLineToIndex$1(this);
+    let index2 = lineToIndex[line - 1];
+    return index2 + column - 1;
+  }
   fromOffset(offset) {
-    let lastLine, lineToIndex;
-    if (!this[fromOffsetCache$1]) {
-      let lines = this.css.split("\n");
-      lineToIndex = new Array(lines.length);
-      let prevIndex = 0;
-      for (let i2 = 0, l2 = lines.length; i2 < l2; i2++) {
-        lineToIndex[i2] = prevIndex;
-        prevIndex += lines[i2].length + 1;
-      }
-      this[fromOffsetCache$1] = lineToIndex;
-    } else {
-      lineToIndex = this[fromOffsetCache$1];
-    }
-    lastLine = lineToIndex[lineToIndex.length - 1];
+    let lineToIndex = getLineToIndex$1(this);
+    let lastLine = lineToIndex[lineToIndex.length - 1];
     let min = 0;
     if (offset >= lastLine) {
       min = lineToIndex.length - 1;
@@ -4339,7 +4367,7 @@ let Result$3$1 = class Result {
     this.messages = [];
     this.root = root2;
     this.opts = opts;
-    this.css = void 0;
+    this.css = "";
     this.map = void 0;
   }
   toString() {
@@ -4951,7 +4979,7 @@ let NoWorkResult2$1 = noWorkResult$1;
 let Root$1$1 = root$1;
 let Processor$1$1 = class Processor {
   constructor(plugins = []) {
-    this.version = "8.5.3";
+    this.version = "8.5.4";
     this.plugins = this.normalize(plugins);
   }
   normalize(plugins) {
@@ -5712,7 +5740,7 @@ let Node$4 = class Node3 {
     let index2 = this.parent.index(this);
     return this.parent.nodes[index2 + 1];
   }
-  positionBy(opts) {
+  positionBy(opts = {}) {
     let pos = this.source.start;
     if (opts.index) {
       pos = this.positionInside(opts.index);
@@ -5741,27 +5769,38 @@ let Node$4 = class Node3 {
         column += 1;
       }
     }
-    return { column, line };
+    return { column, line, offset: end };
   }
   prev() {
     if (!this.parent) return void 0;
     let index2 = this.parent.index(this);
     return this.parent.nodes[index2 - 1];
   }
-  rangeBy(opts) {
+  rangeBy(opts = {}) {
+    let inputString = "document" in this.source.input ? this.source.input.document : this.source.input.css;
     let start = {
       column: this.source.start.column,
-      line: this.source.start.line
+      line: this.source.start.line,
+      offset: sourceOffset(inputString, this.source.start)
     };
     let end = this.source.end ? {
       column: this.source.end.column + 1,
-      line: this.source.end.line
+      line: this.source.end.line,
+      offset: typeof this.source.end.offset === "number" ? (
+        // `source.end.offset` is exclusive, so we don't need to add 1
+        this.source.end.offset
+      ) : (
+        // Since line/column in this.source.end is inclusive,
+        // the `sourceOffset(... , this.source.end)` returns an inclusive offset.
+        // So, we add 1 to convert it to exclusive.
+        sourceOffset(inputString, this.source.end) + 1
+      )
     } : {
       column: start.column + 1,
-      line: start.line
+      line: start.line,
+      offset: start.offset + 1
     };
     if (opts.word) {
-      let inputString = "document" in this.source.input ? this.source.input.document : this.source.input.css;
       let stringRepresentation = inputString.slice(
         sourceOffset(inputString, this.source.start),
         sourceOffset(inputString, this.source.end)
@@ -5769,15 +5808,14 @@ let Node$4 = class Node3 {
       let index2 = stringRepresentation.indexOf(opts.word);
       if (index2 !== -1) {
         start = this.positionInside(index2);
-        end = this.positionInside(
-          index2 + opts.word.length
-        );
+        end = this.positionInside(index2 + opts.word.length);
       }
     } else {
       if (opts.start) {
         start = {
           column: opts.start.column,
-          line: opts.start.line
+          line: opts.start.line,
+          offset: sourceOffset(inputString, opts.start)
         };
       } else if (opts.index) {
         start = this.positionInside(opts.index);
@@ -5785,7 +5823,8 @@ let Node$4 = class Node3 {
       if (opts.end) {
         end = {
           column: opts.end.column,
-          line: opts.end.line
+          line: opts.end.line,
+          offset: sourceOffset(inputString, opts.end)
         };
       } else if (typeof opts.endIndex === "number") {
         end = this.positionInside(opts.endIndex);
@@ -5794,7 +5833,11 @@ let Node$4 = class Node3 {
       }
     }
     if (end.line < start.line || end.line === start.line && end.column <= start.column) {
-      end = { column: start.column + 1, line: start.line };
+      end = {
+        column: start.column + 1,
+        line: start.line,
+        offset: start.offset + 1
+      };
     }
     return { end, start };
   }
@@ -5858,6 +5901,7 @@ let Node$4 = class Node3 {
       } else if (typeof value === "object" && value.toJSON) {
         fixed[name] = value.toJSON(null, inputs);
       } else if (name === "source") {
+        if (value == null) continue;
         let inputId = inputs.get(value.input);
         if (inputId == null) {
           inputId = inputsNextIndex;
@@ -5892,7 +5936,7 @@ let Node$4 = class Node3 {
     });
     return result2;
   }
-  warn(result2, text, opts) {
+  warn(result2, text, opts = {}) {
     let data = { node: this };
     for (let i2 in opts) data[i2] = opts[i2];
     return result2.warn(text, data);
@@ -6473,9 +6517,21 @@ let { fileURLToPath, pathToFileURL: pathToFileURL$1 } = require$$2;
 let CssSyntaxError$1 = cssSyntaxError;
 let PreviousMap$1 = previousMap;
 let terminalHighlight = require$$2;
-let fromOffsetCache = Symbol("fromOffsetCache");
+let lineToIndexCache = Symbol("lineToIndexCache");
 let sourceMapAvailable$1 = Boolean(SourceMapConsumer$1 && SourceMapGenerator$1);
 let pathAvailable$1 = Boolean(resolve$1 && isAbsolute);
+function getLineToIndex(input2) {
+  if (input2[lineToIndexCache]) return input2[lineToIndexCache];
+  let lines = input2.css.split("\n");
+  let lineToIndex = new Array(lines.length);
+  let prevIndex = 0;
+  for (let i2 = 0, l2 = lines.length; i2 < l2; i2++) {
+    lineToIndex[i2] = prevIndex;
+    prevIndex += lines[i2].length + 1;
+  }
+  input2[lineToIndexCache] = lineToIndex;
+  return lineToIndex;
+}
 let Input$4 = class Input2 {
   get from() {
     return this.file || this.id;
@@ -6514,30 +6570,37 @@ let Input$4 = class Input2 {
     if (this.map) this.map.file = this.from;
   }
   error(message, line, column, opts = {}) {
-    let endColumn, endLine, result2;
+    let endColumn, endLine, endOffset, offset, result2;
     if (line && typeof line === "object") {
       let start = line;
       let end = column;
       if (typeof start.offset === "number") {
-        let pos = this.fromOffset(start.offset);
+        offset = start.offset;
+        let pos = this.fromOffset(offset);
         line = pos.line;
         column = pos.col;
       } else {
         line = start.line;
         column = start.column;
+        offset = this.fromLineAndColumn(line, column);
       }
       if (typeof end.offset === "number") {
-        let pos = this.fromOffset(end.offset);
+        endOffset = end.offset;
+        let pos = this.fromOffset(endOffset);
         endLine = pos.line;
         endColumn = pos.col;
       } else {
         endLine = end.line;
         endColumn = end.column;
+        endOffset = this.fromLineAndColumn(end.line, end.column);
       }
     } else if (!column) {
-      let pos = this.fromOffset(line);
+      offset = line;
+      let pos = this.fromOffset(offset);
       line = pos.line;
       column = pos.col;
+    } else {
+      offset = this.fromLineAndColumn(line, column);
     }
     let origin = this.origin(line, column, endLine, endColumn);
     if (origin) {
@@ -6559,7 +6622,7 @@ let Input$4 = class Input2 {
         opts.plugin
       );
     }
-    result2.input = { column, endColumn, endLine, line, source: this.css };
+    result2.input = { column, endColumn, endLine, endOffset, line, offset, source: this.css };
     if (this.file) {
       if (pathToFileURL$1) {
         result2.input.url = pathToFileURL$1(this.file).toString();
@@ -6568,21 +6631,14 @@ let Input$4 = class Input2 {
     }
     return result2;
   }
+  fromLineAndColumn(line, column) {
+    let lineToIndex = getLineToIndex(this);
+    let index2 = lineToIndex[line - 1];
+    return index2 + column - 1;
+  }
   fromOffset(offset) {
-    let lastLine, lineToIndex;
-    if (!this[fromOffsetCache]) {
-      let lines = this.css.split("\n");
-      lineToIndex = new Array(lines.length);
-      let prevIndex = 0;
-      for (let i2 = 0, l2 = lines.length; i2 < l2; i2++) {
-        lineToIndex[i2] = prevIndex;
-        prevIndex += lines[i2].length + 1;
-      }
-      this[fromOffsetCache] = lineToIndex;
-    } else {
-      lineToIndex = this[fromOffsetCache];
-    }
-    lastLine = lineToIndex[lineToIndex.length - 1];
+    let lineToIndex = getLineToIndex(this);
+    let lastLine = lineToIndex[lineToIndex.length - 1];
     let min = 0;
     if (offset >= lastLine) {
       min = lineToIndex.length - 1;
@@ -7944,7 +8000,7 @@ let Result$3 = class Result2 {
     this.messages = [];
     this.root = root2;
     this.opts = opts;
-    this.css = void 0;
+    this.css = "";
     this.map = void 0;
   }
   toString() {
@@ -8556,7 +8612,7 @@ let NoWorkResult22 = noWorkResult;
 let Root$1 = root;
 let Processor$1 = class Processor2 {
   constructor(plugins = []) {
-    this.version = "8.5.3";
+    this.version = "8.5.4";
     this.plugins = this.normalize(plugins);
   }
   normalize(plugins) {