@projectwallace/css-parser 0.8.1 → 0.8.3

package/dist/parse-value.js

@@ -17,10 +17,11 @@ class ValueParser {
   }
   // Parse a declaration value range into value nodes
   // Returns array of value node indices
-  parse_value(start, end) {
+  parse_value(start, end, start_line, start_column) {
     this.value_end = end;
     this.lexer.pos = start;
-    this.lexer.line = 1;
+    this.lexer.line = start_line;
+    this.lexer.column = start_column;
     let nodes = [];
     while (this.lexer.pos < this.value_end) {
       this.lexer.next_token_fast(false);
@@ -80,8 +81,8 @@ class ValueParser {
       node_type,
       start,
       end - start,
-      this.lexer.line,
-      this.lexer.column
+      this.lexer.token_line,
+      this.lexer.token_column
     );
     this.arena.set_content_length(node, end - start);
     return node;
@@ -104,8 +105,8 @@ class ValueParser {
       start,
       0,
       // length unknown yet
-      this.lexer.line,
-      this.lexer.column
+      this.lexer.token_line,
+      this.lexer.token_column
     );
     this.arena.set_content_start_delta(node, 0);
     this.arena.set_content_length(node, name_end - start);
@@ -153,9 +154,7 @@ class ValueParser {
       let token_type = this.lexer.token_type;
       if (token_type === TOKEN_EOF) break;
       if (this.lexer.token_start >= this.value_end) break;
-      if (token_type === TOKEN_LEFT_PAREN || token_type === TOKEN_FUNCTION) {
-        paren_depth++;
-      } else if (token_type === TOKEN_RIGHT_PAREN) {
+      if (token_type === TOKEN_RIGHT_PAREN) {
         paren_depth--;
         if (paren_depth === 0) {
           content_end = this.lexer.token_start;
@@ -181,8 +180,8 @@ class ValueParser {
       start,
       0,
       // length unknown yet
-      this.lexer.line,
-      this.lexer.column
+      this.lexer.token_line,
+      this.lexer.token_column
     );
     let children = [];
     let paren_depth = 1;
@@ -213,7 +212,7 @@ class ValueParser {
 function parse_value(value_string) {
   const arena = new CSSDataArena(CSSDataArena.capacity_for_source(value_string.length));
   const value_parser = new ValueParser(arena, value_string);
-  const node_indices = value_parser.parse_value(0, value_string.length);
+  const node_indices = value_parser.parse_value(0, value_string.length, 1, 1);
   return node_indices.map((index) => new CSSNode(arena, value_string, index));
 }
 

package/dist/parse.js

@@ -213,6 +213,8 @@ class Parser {
     this.arena.set_content_start_delta(declaration, 0);
     this.arena.set_content_length(declaration, prop_end - prop_start);
     let value_start = this.lexer.token_start;
+    let value_start_line = this.lexer.token_line;
+    let value_start_column = this.lexer.token_column;
     let value_end = value_start;
     let has_important = false;
     let last_end = this.lexer.token_end;
@@ -242,7 +244,7 @@ class Parser {
       this.arena.set_value_start_delta(declaration, trimmed[0] - prop_start);
       this.arena.set_value_length(declaration, trimmed[1] - trimmed[0]);
       if (this.parse_values_enabled && this.value_parser) {
-        let valueNodes = this.value_parser.parse_value(trimmed[0], trimmed[1]);
+        let valueNodes = this.value_parser.parse_value(value_start, trimmed[1], value_start_line, value_start_column);
         this.arena.append_children(declaration, valueNodes);
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@projectwallace/css-parser",
-	"version": "0.8.1",
+	"version": "0.8.3",
 	"description": "High-performance CSS lexer and parser, optimized for CSS inspection and analysis",
 	"author": "Bart Veneman <bat@projectwallace.com>",
 	"license": "MIT",