@projectwallace/css-parser 0.12.0 → 0.12.2

package/dist/parse-anplusb.js

@@ -2,7 +2,7 @@ import { Lexer } from './tokenize.js';
 import { NTH_SELECTOR, CSSDataArena } from './arena.js';
 import { TOKEN_IDENT, TOKEN_DELIM, TOKEN_DIMENSION, TOKEN_NUMBER } from './token-types.js';
 import { str_equals, CHAR_MINUS_HYPHEN, CHAR_PLUS, str_index_of } from './string-utils.js';
-import { skip_whitespace_forward } from './parse-utils.js';
+import { skip_whitespace_and_comments_forward } from './parse-utils.js';
 import { CSSNode } from './css-node.js';
 
 class ANplusBParser {
@@ -186,7 +186,7 @@ class ANplusBParser {
     return null;
   }
   skip_whitespace() {
-    this.lexer.pos = skip_whitespace_forward(this.source, this.lexer.pos, this.expr_end);
+    this.lexer.pos = skip_whitespace_and_comments_forward(this.source, this.lexer.pos, this.expr_end);
   }
   create_anplusb_node(start, a_start, a_end, b_start, b_end) {
     const node = this.arena.create_node(NTH_SELECTOR, start, this.lexer.pos - start, this.lexer.line, 1);

package/dist/parse-atrule-prelude.js

@@ -2,7 +2,7 @@ import { Lexer } from './tokenize.js';
 import { CSSDataArena, PRELUDE_OPERATOR, MEDIA_TYPE, MEDIA_QUERY, MEDIA_FEATURE, FUNCTION, IDENTIFIER, CONTAINER_QUERY, SUPPORTS_QUERY, LAYER_NAME, STRING, URL, DIMENSION, NUMBER, FEATURE_RANGE } from './arena.js';
 import { TOKEN_COMMA, TOKEN_IDENT, TOKEN_LEFT_PAREN, TOKEN_RIGHT_PAREN, TOKEN_FUNCTION, TOKEN_EOF, TOKEN_WHITESPACE, TOKEN_STRING, TOKEN_URL, TOKEN_DIMENSION, TOKEN_PERCENTAGE, TOKEN_NUMBER } from './token-types.js';
 import { strip_vendor_prefix, str_equals, CHAR_LESS_THAN, CHAR_GREATER_THAN, CHAR_EQUALS, CHAR_COLON, is_whitespace } from './string-utils.js';
-import { trim_boundaries, skip_whitespace_forward } from './parse-utils.js';
+import { skip_whitespace_and_comments_forward, trim_boundaries } from './parse-utils.js';
 import { CSSNode } from './css-node.js';
 
 class AtRulePreludeParser {
@@ -134,23 +134,31 @@ class AtRulePreludeParser {
     let content_end = this.lexer.token_start;
     let feature_end = this.lexer.token_end;
     let has_comparison = false;
-    for (let i = content_start; i < content_end; i++) {
+    let i = content_start;
+    while (i < content_end) {
+      i = skip_whitespace_and_comments_forward(this.source, i, content_end);
+      if (i >= content_end) break;
       let ch = this.source.charCodeAt(i);
       if (ch === CHAR_LESS_THAN || ch === CHAR_GREATER_THAN || ch === CHAR_EQUALS) {
         has_comparison = true;
         break;
       }
+      i++;
     }
     if (has_comparison) {
       return this.parse_feature_range(feature_start, feature_end, content_start, content_end);
     }
     let feature = this.create_node(MEDIA_FEATURE, feature_start, feature_end);
     let colon_pos = -1;
-    for (let i = content_start; i < content_end; i++) {
-      if (this.source.charCodeAt(i) === CHAR_COLON) {
-        colon_pos = i;
+    let j = content_start;
+    while (j < content_end) {
+      j = skip_whitespace_and_comments_forward(this.source, j, content_end);
+      if (j >= content_end) break;
+      if (this.source.charCodeAt(j) === CHAR_COLON) {
+        colon_pos = j;
         break;
       }
+      j++;
     }
     if (colon_pos !== -1) {
       let name_trimmed = trim_boundaries(this.source, content_start, colon_pos);
@@ -458,9 +466,9 @@ class AtRulePreludeParser {
     this.lexer.restore_position(saved);
     return null;
   }
-  // Helper: Skip whitespace
+  // Helper: Skip whitespace and comments
   skip_whitespace() {
-    this.lexer.pos = skip_whitespace_forward(this.source, this.lexer.pos, this.prelude_end);
+    this.lexer.pos = skip_whitespace_and_comments_forward(this.source, this.lexer.pos, this.prelude_end);
   }
   // Helper: Peek at next token type without consuming
   peek_token_type() {
@@ -524,7 +532,7 @@ class AtRulePreludeParser {
     let feature_name_end = -1;
     let pos = content_start;
     while (pos < content_end) {
-      pos = skip_whitespace_forward(this.source, pos, content_end);
+      pos = skip_whitespace_and_comments_forward(this.source, pos, content_end);
       if (pos >= content_end) break;
       let ch = this.source.charCodeAt(pos);
       if (ch === CHAR_LESS_THAN || ch === CHAR_GREATER_THAN || ch === CHAR_EQUALS) {

package/dist/parse-selector.js

@@ -2,7 +2,7 @@ import { Lexer } from './tokenize.js';
 import { CSSDataArena, SELECTOR_LIST, SELECTOR, COMBINATOR, NESTING_SELECTOR, ID_SELECTOR, TYPE_SELECTOR, UNIVERSAL_SELECTOR, CLASS_SELECTOR, ATTRIBUTE_SELECTOR, ATTR_OPERATOR_NONE, ATTR_FLAG_NONE, ATTR_OPERATOR_EQUAL, ATTR_OPERATOR_TILDE_EQUAL, ATTR_OPERATOR_PIPE_EQUAL, ATTR_OPERATOR_CARET_EQUAL, ATTR_OPERATOR_DOLLAR_EQUAL, ATTR_OPERATOR_STAR_EQUAL, ATTR_FLAG_CASE_INSENSITIVE, ATTR_FLAG_CASE_SENSITIVE, PSEUDO_ELEMENT_SELECTOR, PSEUDO_CLASS_SELECTOR, FLAG_HAS_PARENS, LANG_SELECTOR, NTH_OF_SELECTOR } from './arena.js';
 import { TOKEN_COMMA, TOKEN_DELIM, TOKEN_EOF, TOKEN_WHITESPACE, TOKEN_FUNCTION, TOKEN_COLON, TOKEN_LEFT_BRACKET, TOKEN_HASH, TOKEN_IDENT, TOKEN_RIGHT_BRACKET, TOKEN_LEFT_PAREN, TOKEN_RIGHT_PAREN, TOKEN_STRING } from './token-types.js';
 import { skip_whitespace_and_comments_forward, skip_whitespace_and_comments_backward, skip_whitespace_forward } from './parse-utils.js';
-import { CHAR_GREATER_THAN, CHAR_PLUS, CHAR_TILDE, CHAR_PERIOD, CHAR_ASTERISK, CHAR_AMPERSAND, CHAR_PIPE, CHAR_SPACE, CHAR_TAB, CHAR_NEWLINE, CHAR_CARRIAGE_RETURN, CHAR_FORM_FEED, is_combinator, is_whitespace, CHAR_EQUALS, CHAR_CARET, CHAR_DOLLAR, CHAR_SINGLE_QUOTE, CHAR_DOUBLE_QUOTE, CHAR_COLON, str_equals, CHAR_FORWARD_SLASH } from './string-utils.js';
+import { CHAR_GREATER_THAN, CHAR_PLUS, CHAR_TILDE, CHAR_PERIOD, CHAR_ASTERISK, CHAR_AMPERSAND, CHAR_PIPE, is_combinator, is_whitespace, CHAR_EQUALS, CHAR_CARET, CHAR_DOLLAR, CHAR_SINGLE_QUOTE, CHAR_DOUBLE_QUOTE, CHAR_COLON, str_equals, CHAR_FORWARD_SLASH } from './string-utils.js';
 import { ANplusBParser } from './parse-anplusb.js';
 import { CSSNode } from './css-node.js';
 
@@ -38,7 +38,13 @@ class SelectorParser {
       let selector_column = this.lexer.column;
       let complex_selector = this.parse_complex_selector(allow_relative);
       if (complex_selector !== null) {
-        let selector_wrapper = this.arena.create_node(SELECTOR, selector_start, this.lexer.pos - selector_start, selector_line, selector_column);
+        let selector_wrapper = this.arena.create_node(
+          SELECTOR,
+          selector_start,
+          this.lexer.pos - selector_start,
+          selector_line,
+          selector_column
+        );
         this.arena.set_content_start_delta(selector_wrapper, 0);
         this.arena.set_content_length(selector_wrapper, this.lexer.pos - selector_start);
         let last_component = complex_selector;
@@ -81,7 +87,13 @@ class SelectorParser {
       if (token_type === TOKEN_DELIM) {
         let ch = this.source.charCodeAt(this.lexer.token_start);
         if (ch === CHAR_GREATER_THAN || ch === CHAR_PLUS || ch === CHAR_TILDE) {
-          let combinator = this.create_node_at(COMBINATOR, this.lexer.token_start, this.lexer.token_end, this.lexer.token_line, this.lexer.token_column);
+          let combinator = this.create_node_at(
+            COMBINATOR,
+            this.lexer.token_start,
+            this.lexer.token_end,
+            this.lexer.token_line,
+            this.lexer.token_column
+          );
           components.push(combinator);
           this.skip_whitespace();
         } else {
@@ -210,22 +222,30 @@ class SelectorParser {
   // Parse type selector or namespace selector (ns|E or ns|*)
   // Called when we've seen an IDENT token
   parse_type_or_namespace_selector(start, end) {
+    const saved = this.lexer.save_position();
+    this.skip_whitespace();
     if (this.lexer.pos < this.selector_end && this.source.charCodeAt(this.lexer.pos) === CHAR_PIPE) {
       this.lexer.pos++;
       let node = this.parse_namespace_local_part(start, start, end - start);
       if (node !== null) return node;
       this.lexer.pos = end;
+    } else {
+      this.lexer.restore_position(saved);
     }
     return this.create_node(TYPE_SELECTOR, start, end);
   }
   // Parse universal selector or namespace selector (*|E or *|*)
   // Called when we've seen a * DELIM token
   parse_universal_or_namespace_selector(start, end) {
+    const saved = this.lexer.save_position();
+    this.skip_whitespace();
     if (this.lexer.pos < this.selector_end && this.source.charCodeAt(this.lexer.pos) === CHAR_PIPE) {
       this.lexer.pos++;
       let node = this.parse_namespace_local_part(start, start, end - start);
       if (node !== null) return node;
       this.lexer.pos = end;
+    } else {
+      this.lexer.restore_position(saved);
     }
     return this.create_node(UNIVERSAL_SELECTOR, start, end);
   }
@@ -239,16 +259,9 @@ class SelectorParser {
     let whitespace_start = this.lexer.pos;
     let whitespace_start_line = this.lexer.line;
     let whitespace_start_column = this.lexer.column;
-    let has_whitespace = false;
-    while (this.lexer.pos < this.selector_end) {
-      let ch = this.source.charCodeAt(this.lexer.pos);
-      if (ch === CHAR_SPACE || ch === CHAR_TAB || ch === CHAR_NEWLINE || ch === CHAR_CARRIAGE_RETURN || ch === CHAR_FORM_FEED) {
-        has_whitespace = true;
-        this.lexer.advance();
-      } else {
-        break;
-      }
-    }
+    let has_whitespace = this.lexer.pos < this.selector_end;
+    this.skip_whitespace();
+    has_whitespace = has_whitespace && this.lexer.pos > whitespace_start;
     if (this.lexer.pos >= this.selector_end) {
       this.lexer.pos = whitespace_start;
       this.lexer.line = whitespace_start_line;
@@ -266,14 +279,7 @@ class SelectorParser {
       this.lexer.pos = whitespace_start;
       this.lexer.line = whitespace_start_line;
       this.lexer.column = whitespace_start_column;
-      while (this.lexer.pos < this.selector_end) {
-        let ch = this.source.charCodeAt(this.lexer.pos);
-        if (ch === CHAR_SPACE || ch === CHAR_TAB || ch === CHAR_NEWLINE || ch === CHAR_CARRIAGE_RETURN || ch === CHAR_FORM_FEED) {
-          this.lexer.advance();
-        } else {
-          break;
-        }
-      }
+      this.skip_whitespace();
       return this.create_node_at(COMBINATOR, whitespace_start, this.lexer.pos, whitespace_start_line, whitespace_start_column);
     }
     this.lexer.pos = whitespace_start;
@@ -422,10 +428,14 @@ class SelectorParser {
   // Parse pseudo-class or pseudo-element (:hover, ::before)
   parse_pseudo(start) {
     const saved = this.lexer.save_position();
+    const saved_ws = this.lexer.save_position();
+    this.skip_whitespace();
     let is_pseudo_element = false;
     if (this.lexer.pos < this.selector_end && this.source.charCodeAt(this.lexer.pos) === CHAR_COLON) {
       is_pseudo_element = true;
       this.lexer.pos++;
+    } else {
+      this.lexer.restore_position(saved_ws);
     }
     this.lexer.next_token_fast(false);
     let token_type = this.lexer.token_type;
@@ -566,16 +576,22 @@ class SelectorParser {
       return anplusb_parser.parse_anplusb(start, end, this.lexer.line);
     }
   }
-  // Find the position of standalone "of" keyword
+  // Find the position of standalone "of" keyword (case-insensitive)
   find_of_keyword(start, end) {
-    for (let i = start; i < end - 1; i++) {
-      if (this.source.charCodeAt(i) === 111 && this.source.charCodeAt(i + 1) === 102) {
+    let i = start;
+    while (i < end - 1) {
+      i = skip_whitespace_and_comments_forward(this.source, i, end);
+      if (i >= end - 1) break;
+      let ch1 = this.source.charCodeAt(i);
+      let ch2 = this.source.charCodeAt(i + 1);
+      if ((ch1 === 111 || ch1 === 79) && (ch2 === 102 || ch2 === 70)) {
         let before_ok = i === start || is_whitespace(this.source.charCodeAt(i - 1));
         let after_ok = i + 2 >= end || is_whitespace(this.source.charCodeAt(i + 2));
         if (before_ok && after_ok) {
           return i;
         }
       }
+      i++;
     }
     return -1;
   }

package/package.json

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