@projectwallace/css-parser 0.11.0 → 0.11.2

package/dist/parse-atrule-prelude.js

@@ -1,7 +1,7 @@
 import { Lexer } from './tokenize.js';
-import { CSSDataArena, PRELUDE_OPERATOR, MEDIA_TYPE, MEDIA_QUERY, MEDIA_FEATURE, FUNCTION, IDENTIFIER, CONTAINER_QUERY, SUPPORTS_QUERY, LAYER_NAME, URL, STRING, 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_URL, TOKEN_STRING, TOKEN_DIMENSION, TOKEN_PERCENTAGE, TOKEN_NUMBER } from './token-types.js';
-import { str_equals, CHAR_LESS_THAN, CHAR_GREATER_THAN, CHAR_EQUALS, CHAR_COLON, is_whitespace } from './string-utils.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 { CSSNode } from './css-node.js';
 
@@ -26,20 +26,23 @@ class AtRulePreludeParser {
   }
   // Dispatch to appropriate parser based on at-rule type
   parse_prelude_dispatch(at_rule_name) {
-    if (str_equals("media", at_rule_name)) {
+    let normalized_name = strip_vendor_prefix(at_rule_name);
+    if (str_equals("media", normalized_name)) {
       return this.parse_media_query_list();
-    } else if (str_equals("container", at_rule_name)) {
+    } else if (str_equals("container", normalized_name)) {
       return this.parse_container_query();
-    } else if (str_equals("supports", at_rule_name)) {
+    } else if (str_equals("supports", normalized_name)) {
       return this.parse_supports_query();
-    } else if (str_equals("layer", at_rule_name)) {
+    } else if (str_equals("layer", normalized_name)) {
       return this.parse_layer_names();
-    } else if (str_equals("keyframes", at_rule_name)) {
+    } else if (str_equals("keyframes", normalized_name)) {
       return this.parse_identifier();
-    } else if (str_equals("property", at_rule_name)) {
+    } else if (str_equals("property", normalized_name)) {
       return this.parse_identifier();
-    } else if (str_equals("import", at_rule_name)) {
+    } else if (str_equals("import", normalized_name)) {
       return this.parse_import_prelude();
+    } else if (str_equals("charset", normalized_name)) {
+      return this.parse_charset_prelude();
     }
     return [];
   }
@@ -303,6 +306,15 @@ class AtRulePreludeParser {
     let ident = this.create_node(IDENTIFIER, this.lexer.token_start, this.lexer.token_end);
     return [ident];
   }
+  // Parse @charset prelude: "UTF-8"
+  parse_charset_prelude() {
+    this.skip_whitespace();
+    if (this.lexer.pos >= this.prelude_end) return [];
+    this.next_token();
+    if (this.lexer.token_type !== TOKEN_STRING) return [];
+    let str = this.create_node(STRING, this.lexer.token_start, this.lexer.token_end);
+    return [str];
+  }
   // Parse @import prelude: url() [layer] [supports()] [media-query-list]
   // @import url("styles.css") layer(base) supports(display: grid) screen and (min-width: 768px);
   parse_import_prelude() {

package/dist/parse-selector.js

@@ -1,6 +1,6 @@
 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 { TOKEN_COMMENT, 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 } from './string-utils.js';
 import { ANplusBParser } from './parse-anplusb.js';
@@ -52,10 +52,29 @@ class SelectorParser {
       }
       this.skip_whitespace();
       if (this.lexer.pos >= this.selector_end) break;
-      this.lexer.next_token_fast(false);
-      let token_type = this.lexer.token_type;
+      let token_type = TOKEN_EOF;
+      while (this.lexer.pos < this.selector_end) {
+        this.lexer.next_token_fast(false);
+        token_type = this.lexer.token_type;
+        if (token_type === TOKEN_COMMENT) {
+          this.skip_whitespace();
+        } else {
+          break;
+        }
+      }
       if (token_type === TOKEN_COMMA) {
         this.skip_whitespace();
+        while (this.lexer.pos < this.selector_end) {
+          const saved = this.lexer.save_position();
+          this.lexer.next_token_fast(false);
+          token_type = this.lexer.token_type;
+          if (token_type === TOKEN_COMMENT) {
+            this.skip_whitespace();
+          } else {
+            this.lexer.restore_position(saved);
+            break;
+          }
+        }
         continue;
       } else {
         break;
@@ -81,7 +100,7 @@ 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(COMBINATOR, this.lexer.token_start, this.lexer.token_end);
+          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 {
@@ -237,40 +256,48 @@ class SelectorParser {
   // Parse combinator (>, +, ~, or descendant space)
   try_parse_combinator() {
     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.pos++;
+        this.lexer.advance();
       } else {
         break;
       }
     }
     if (this.lexer.pos >= this.selector_end) {
       this.lexer.pos = whitespace_start;
+      this.lexer.line = whitespace_start_line;
+      this.lexer.column = whitespace_start_column;
       return null;
     }
     this.lexer.next_token_fast(false);
     if (this.lexer.token_type === TOKEN_DELIM) {
       let ch = this.source.charCodeAt(this.lexer.token_start);
       if (is_combinator(ch)) {
-        return this.create_node(COMBINATOR, this.lexer.token_start, this.lexer.token_end);
+        return this.create_node_at(COMBINATOR, this.lexer.token_start, this.lexer.token_end, this.lexer.token_line, this.lexer.token_column);
       }
     }
     if (has_whitespace) {
       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.pos++;
+          this.lexer.advance();
         } else {
           break;
         }
       }
-      return this.create_node(COMBINATOR, whitespace_start, this.lexer.pos);
+      return this.create_node_at(COMBINATOR, whitespace_start, this.lexer.pos, whitespace_start_line, whitespace_start_column);
     }
     this.lexer.pos = whitespace_start;
+    this.lexer.line = whitespace_start_line;
+    this.lexer.column = whitespace_start_column;
     return null;
   }
   // Parse class selector (.classname)
@@ -572,7 +599,13 @@ class SelectorParser {
     return -1;
   }
   create_node(type, start, end) {
-    let node = this.arena.create_node(type, start, end - start, this.lexer.line, this.lexer.column);
+    let node = this.arena.create_node(type, start, end - start, this.lexer.token_line, this.lexer.token_column);
+    this.arena.set_content_start_delta(node, 0);
+    this.arena.set_content_length(node, end - start);
+    return node;
+  }
+  create_node_at(type, start, end, line, column) {
+    let node = this.arena.create_node(type, start, end - start, line, column);
     this.arena.set_content_start_delta(node, 0);
     this.arena.set_content_length(node, end - start);
     return node;

package/dist/parse.js

@@ -226,9 +226,9 @@ class Parser {
       this.arena.set_value_start_delta(at_rule, trimmed[0] - at_rule_start);
       this.arena.set_value_length(at_rule, trimmed[1] - trimmed[0]);
       if (this.prelude_parser) {
+        prelude_wrapper = this.arena.create_node(AT_RULE_PRELUDE, trimmed[0], trimmed[1] - trimmed[0], at_rule_line, at_rule_column);
         let prelude_nodes = this.prelude_parser.parse_prelude(at_rule_name, trimmed[0], trimmed[1], at_rule_line, at_rule_column);
         if (prelude_nodes.length > 0) {
-          prelude_wrapper = this.arena.create_node(AT_RULE_PRELUDE, trimmed[0], trimmed[1] - trimmed[0], at_rule_line, at_rule_column);
           this.arena.append_children(prelude_wrapper, prelude_nodes);
         }
       }

package/dist/string-utils.d.ts

@@ -82,3 +82,18 @@ export declare function is_vendor_prefixed(source: string, start: number, end: n
  * - `color` → false
  */
 export declare function is_custom(str: string): boolean;
+/**
+ * Strip vendor prefix from a string
+ *
+ * @param str - The string to strip vendor prefix from
+ * @returns The string without vendor prefix, or original string if no prefix found
+ *
+ * Examples:
+ * - `-webkit-keyframes` → `keyframes`
+ * - `-moz-appearance` → `appearance`
+ * - `-ms-filter` → `filter`
+ * - `-o-border-image` → `border-image`
+ * - `keyframes` → `keyframes` (no change)
+ * - `--custom-property` → `--custom-property` (custom property, not vendor prefix)
+ */
+export declare function strip_vendor_prefix(str: string): string;

package/dist/string-utils.js

@@ -114,5 +114,16 @@ function is_custom(str) {
   if (str.length < 3) return false;
   return str.charCodeAt(0) === CHAR_MINUS_HYPHEN && str.charCodeAt(1) === CHAR_MINUS_HYPHEN;
 }
+function strip_vendor_prefix(str) {
+  if (!is_vendor_prefixed(str)) {
+    return str;
+  }
+  for (let i = 2; i < str.length; i++) {
+    if (str.charCodeAt(i) === CHAR_MINUS_HYPHEN) {
+      return str.substring(i + 1);
+    }
+  }
+  return str;
+}
 
-export { CHAR_AMPERSAND, CHAR_ASTERISK, CHAR_CARET, CHAR_CARRIAGE_RETURN, CHAR_COLON, CHAR_DOLLAR, CHAR_DOUBLE_QUOTE, CHAR_EQUALS, CHAR_FORM_FEED, CHAR_FORWARD_SLASH, CHAR_GREATER_THAN, CHAR_LESS_THAN, CHAR_MINUS_HYPHEN, CHAR_NEWLINE, CHAR_PERIOD, CHAR_PIPE, CHAR_PLUS, CHAR_SINGLE_QUOTE, CHAR_SPACE, CHAR_TAB, CHAR_TILDE, is_combinator, is_custom, is_digit, is_vendor_prefixed, is_whitespace, str_equals, str_index_of, str_starts_with };
+export { CHAR_AMPERSAND, CHAR_ASTERISK, CHAR_CARET, CHAR_CARRIAGE_RETURN, CHAR_COLON, CHAR_DOLLAR, CHAR_DOUBLE_QUOTE, CHAR_EQUALS, CHAR_FORM_FEED, CHAR_FORWARD_SLASH, CHAR_GREATER_THAN, CHAR_LESS_THAN, CHAR_MINUS_HYPHEN, CHAR_NEWLINE, CHAR_PERIOD, CHAR_PIPE, CHAR_PLUS, CHAR_SINGLE_QUOTE, CHAR_SPACE, CHAR_TAB, CHAR_TILDE, is_combinator, is_custom, is_digit, is_vendor_prefixed, is_whitespace, str_equals, str_index_of, str_starts_with, strip_vendor_prefix };

package/package.json

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