@projectwallace/css-parser 0.6.6 → 0.7.0

package/dist/parse-anplusb.js

@@ -1,5 +1,9 @@
-import { L as Lexer, T as TOKEN_IDENT, h as TOKEN_DELIM, k as TOKEN_DIMENSION, i as TOKEN_NUMBER } from './lexer-CtBKgfVv.js';
-import { ao as CHAR_MINUS_HYPHEN, a5 as CHAR_PLUS, am as skip_whitespace_forward, I as NODE_SELECTOR_NTH, C as CSSNode, Z as CSSDataArena } from './css-node-D-Ht4S_n.js';
+import { Lexer } from './lexer.js';
+import { NTH_SELECTOR, CSSDataArena } from './arena.js';
+import { TOKEN_IDENT, TOKEN_DELIM, TOKEN_DIMENSION, TOKEN_NUMBER } from './token-types.js';
+import { CHAR_MINUS_HYPHEN, CHAR_PLUS } from './string-utils.js';
+import { skip_whitespace_forward } from './parse-utils.js';
+import { CSSNode } from './css-node.js';
 
 class ANplusBParser {
   lexer;
@@ -20,7 +24,6 @@ class ANplusBParser {
     this.expr_end = end;
     this.lexer.pos = start;
     this.lexer.line = line;
-    let a = null;
     let b = null;
     let a_start = start;
     let a_end = start;
@@ -35,10 +38,9 @@ class ANplusBParser {
     if (this.lexer.token_type === TOKEN_IDENT) {
       const text = this.source.substring(this.lexer.token_start, this.lexer.token_end).toLowerCase();
       if (text === "odd" || text === "even") {
-        a = this.source.substring(this.lexer.token_start, this.lexer.token_end);
         a_start = this.lexer.token_start;
         a_end = this.lexer.token_end;
-        return this.create_anplusb_node(node_start, a, null, a_start, a_end, 0, 0);
+        return this.create_anplusb_node(node_start, a_start, a_end, 0, 0);
       }
       const first_char = this.source.charCodeAt(this.lexer.token_start);
       const second_char = this.lexer.token_end > this.lexer.token_start + 1 ? this.source.charCodeAt(this.lexer.token_start + 1) : 0;
@@ -46,16 +48,14 @@ class ANplusBParser {
         if (this.lexer.token_end > this.lexer.token_start + 2) {
           const third_char = this.source.charCodeAt(this.lexer.token_start + 2);
           if (third_char === CHAR_MINUS_HYPHEN) {
-            a = "-n";
             a_start = this.lexer.token_start;
             a_end = this.lexer.token_start + 2;
             b = this.source.substring(this.lexer.token_start + 2, this.lexer.token_end);
             b_start = this.lexer.token_start + 2;
             b_end = this.lexer.token_end;
-            return this.create_anplusb_node(node_start, a, b, a_start, a_end, b_start, b_end);
+            return this.create_anplusb_node(node_start, a_start, a_end, b_start, b_end);
           }
         }
-        a = "-n";
         a_start = this.lexer.token_start;
         a_end = this.lexer.token_start + 2;
         b = this.parse_b_part();
@@ -63,22 +63,20 @@ class ANplusBParser {
           b_start = this.lexer.token_start;
           b_end = this.lexer.token_end;
         }
-        return this.create_anplusb_node(node_start, a, b, a_start, a_end, b_start, b_end);
+        return this.create_anplusb_node(node_start, a_start, a_end, b !== null ? b_start : 0, b !== null ? b_end : 0);
       }
       if (first_char === 110) {
         if (this.lexer.token_end > this.lexer.token_start + 1) {
           const second_char2 = this.source.charCodeAt(this.lexer.token_start + 1);
           if (second_char2 === CHAR_MINUS_HYPHEN) {
-            a = "n";
             a_start = this.lexer.token_start;
             a_end = this.lexer.token_start + 1;
             b = this.source.substring(this.lexer.token_start + 1, this.lexer.token_end);
             b_start = this.lexer.token_start + 1;
             b_end = this.lexer.token_end;
-            return this.create_anplusb_node(node_start, a, b, a_start, a_end, b_start, b_end);
+            return this.create_anplusb_node(node_start, a_start, a_end, b_start, b_end);
           }
         }
-        a = "n";
         a_start = this.lexer.token_start;
         a_end = this.lexer.token_start + 1;
         b = this.parse_b_part();
@@ -86,7 +84,7 @@ class ANplusBParser {
           b_start = this.lexer.token_start;
           b_end = this.lexer.token_end;
         }
-        return this.create_anplusb_node(node_start, a, b, a_start, a_end, b_start, b_end);
+        return this.create_anplusb_node(node_start, a_start, a_end, b !== null ? b_start : 0, b !== null ? b_end : 0);
       }
       return null;
     }
@@ -97,7 +95,6 @@ class ANplusBParser {
         const text = this.source.substring(this.lexer.token_start, this.lexer.token_end);
         const first_char = text.charCodeAt(0);
         if (first_char === 110) {
-          a = "+n";
           a_start = saved.pos - 1;
           a_end = this.lexer.token_start + 1;
           if (this.lexer.token_end > this.lexer.token_start + 1) {
@@ -106,7 +103,7 @@ class ANplusBParser {
               b = this.source.substring(this.lexer.token_start + 1, this.lexer.token_end);
               b_start = this.lexer.token_start + 1;
               b_end = this.lexer.token_end;
-              return this.create_anplusb_node(node_start, a, b, a_start, a_end, b_start, b_end);
+              return this.create_anplusb_node(node_start, a_start, a_end, b_start, b_end);
             }
           }
           b = this.parse_b_part();
@@ -114,7 +111,7 @@ class ANplusBParser {
             b_start = this.lexer.token_start;
             b_end = this.lexer.token_end;
           }
-          return this.create_anplusb_node(node_start, a, b, a_start, a_end, b_start, b_end);
+          return this.create_anplusb_node(node_start, a_start, a_end, b !== null ? b_start : 0, b !== null ? b_end : 0);
         }
       }
       this.lexer.restore_position(saved);
@@ -123,7 +120,6 @@ class ANplusBParser {
       const token_text = this.source.substring(this.lexer.token_start, this.lexer.token_end);
       const n_index = token_text.toLowerCase().indexOf("n");
       if (n_index !== -1) {
-        a = token_text.substring(0, n_index + 1);
         a_start = this.lexer.token_start;
         a_end = this.lexer.token_start + n_index + 1;
         if (n_index + 1 < token_text.length) {
@@ -132,7 +128,7 @@ class ANplusBParser {
             b = remainder;
             b_start = this.lexer.token_start + n_index + 1;
             b_end = this.lexer.token_end;
-            return this.create_anplusb_node(node_start, a, b, a_start, a_end, b_start, b_end);
+            return this.create_anplusb_node(node_start, a_start, a_end, b_start, b_end);
           }
         }
         b = this.parse_b_part();
@@ -140,7 +136,7 @@ class ANplusBParser {
           b_start = this.lexer.token_start;
           b_end = this.lexer.token_end;
         }
-        return this.create_anplusb_node(node_start, a, b, a_start, a_end, b_start, b_end);
+        return this.create_anplusb_node(node_start, a_start, a_end, b_start, b_end);
       }
     }
     if (this.lexer.token_type === TOKEN_NUMBER) {
@@ -148,7 +144,7 @@ class ANplusBParser {
       b = num_text;
       b_start = this.lexer.token_start;
       b_end = this.lexer.token_end;
-      return this.create_anplusb_node(node_start, a, b, a_start, a_end, b_start, b_end);
+      return this.create_anplusb_node(node_start, 0, 0, b_start, b_end);
     }
     return null;
   }
@@ -192,18 +188,20 @@ class ANplusBParser {
   skip_whitespace() {
     this.lexer.pos = skip_whitespace_forward(this.source, this.lexer.pos, this.expr_end);
   }
-  create_anplusb_node(start, a, b, a_start, a_end, b_start, b_end) {
-    const node = this.arena.create_node();
-    this.arena.set_type(node, NODE_SELECTOR_NTH);
-    this.arena.set_start_offset(node, start);
-    this.arena.set_length(node, this.lexer.pos - start);
-    this.arena.set_start_line(node, this.lexer.line);
-    if (a !== null) {
-      this.arena.set_content_start(node, a_start);
+  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
+    );
+    if (a_end > a_start) {
+      this.arena.set_content_start_delta(node, a_start - start);
       this.arena.set_content_length(node, a_end - a_start);
     }
-    if (b !== null) {
-      this.arena.set_value_start(node, b_start);
+    if (b_end > b_start) {
+      this.arena.set_value_start_delta(node, b_start - start);
       this.arena.set_value_length(node, b_end - b_start);
     }
     return node;

package/dist/parse-atrule-prelude.d.ts

@@ -1,29 +1,4 @@
-import { CSSDataArena } from './arena';
 import { CSSNode } from './css-node';
-export declare class AtRulePreludeParser {
-    private lexer;
-    private arena;
-    private source;
-    private prelude_end;
-    constructor(arena: CSSDataArena, source: string);
-    parse_prelude(at_rule_name: string, start: number, end: number, line?: number, column?: number): number[];
-    private parse_media_query_list;
-    private create_node;
-    private is_and_or_not;
-    private parse_single_media_query;
-    private parse_media_feature;
-    private parse_container_query;
-    private parse_supports_query;
-    private parse_layer_names;
-    private parse_identifier;
-    private parse_import_prelude;
-    private parse_import_url;
-    private parse_import_layer;
-    private parse_import_supports;
-    private skip_whitespace;
-    private peek_token_type;
-    private next_token;
-}
 /**
  * Parse an at-rule prelude string and return an array of AST nodes
  * @param at_rule_name - The name of the at-rule (e.g., "media", "supports", "layer")

package/dist/parse-atrule-prelude.js

@@ -1,5 +1,9 @@
-import { L as Lexer, q as TOKEN_COMMA, T as TOKEN_IDENT, t as TOKEN_LEFT_PAREN, u as TOKEN_RIGHT_PAREN, l as TOKEN_WHITESPACE, f as TOKEN_URL, a as TOKEN_FUNCTION, d as TOKEN_STRING, y as TOKEN_EOF } from './lexer-CtBKgfVv.js';
-import { Z as CSSDataArena, C as CSSNode, an as str_equals, U as NODE_PRELUDE_OPERATOR, O as NODE_PRELUDE_MEDIA_TYPE, L as NODE_PRELUDE_MEDIA_QUERY, M as NODE_PRELUDE_MEDIA_FEATURE, a3 as trim_boundaries, S as NODE_PRELUDE_IDENTIFIER, P as NODE_PRELUDE_CONTAINER_QUERY, Q as NODE_PRELUDE_SUPPORTS_QUERY, R as NODE_PRELUDE_LAYER_NAME, V as NODE_PRELUDE_IMPORT_URL, W as NODE_PRELUDE_IMPORT_LAYER, X as NODE_PRELUDE_IMPORT_SUPPORTS, am as skip_whitespace_forward } from './css-node-D-Ht4S_n.js';
+import { Lexer } from './lexer.js';
+import { CSSDataArena, PRELUDE_OPERATOR, MEDIA_TYPE, MEDIA_QUERY, MEDIA_FEATURE, IDENTIFIER, CONTAINER_QUERY, SUPPORTS_QUERY, LAYER_NAME, URL } from './arena.js';
+import { TOKEN_COMMA, TOKEN_IDENT, TOKEN_LEFT_PAREN, TOKEN_RIGHT_PAREN, TOKEN_WHITESPACE, TOKEN_URL, TOKEN_FUNCTION, TOKEN_STRING, TOKEN_EOF } from './token-types.js';
+import { str_equals } from './string-utils.js';
+import { trim_boundaries, skip_whitespace_forward } from './parse-utils.js';
+import { CSSNode } from './css-node.js';
 
 class AtRulePreludeParser {
   lexer;
@@ -46,29 +50,29 @@ class AtRulePreludeParser {
         nodes.push(query);
       }
       this.skip_whitespace();
-      if (this.peek_token_type() === TOKEN_COMMA) {
-        this.next_token();
+      const saved = this.lexer.save_position();
+      this.next_token();
+      if (this.lexer.token_type !== TOKEN_COMMA) {
+        this.lexer.restore_position(saved);
       }
     }
     return nodes;
   }
   create_node(type, start, end) {
-    let node = this.arena.create_node();
-    this.arena.set_type(node, type);
-    this.arena.set_start_offset(node, start);
-    this.arena.set_length(node, end - start);
-    this.arena.set_start_line(node, this.lexer.token_line);
-    this.arena.set_start_column(node, this.lexer.token_column);
-    return node;
+    return this.arena.create_node(
+      type,
+      start,
+      end - start,
+      this.lexer.token_line,
+      this.lexer.token_column
+    );
   }
   is_and_or_not(str) {
-    if (str.length > 3 || str.length < 2) return false;
     return str_equals("and", str) || str_equals("or", str) || str_equals("not", str);
   }
   // Parse a single media query: screen and (min-width: 768px)
   parse_single_media_query() {
     let query_start = this.lexer.pos;
-    this.lexer.line;
     this.skip_whitespace();
     if (this.lexer.pos >= this.prelude_end) return null;
     let token_start = this.lexer.pos;
@@ -96,10 +100,10 @@ class AtRulePreludeParser {
       } else if (token_type === TOKEN_IDENT) {
         let text = this.source.substring(this.lexer.token_start, this.lexer.token_end);
         if (this.is_and_or_not(text)) {
-          let op = this.create_node(NODE_PRELUDE_OPERATOR, this.lexer.token_start, this.lexer.token_end);
+          let op = this.create_node(PRELUDE_OPERATOR, this.lexer.token_start, this.lexer.token_end);
           components.push(op);
         } else {
-          let media_type = this.create_node(NODE_PRELUDE_MEDIA_TYPE, this.lexer.token_start, this.lexer.token_end);
+          let media_type = this.create_node(MEDIA_TYPE, this.lexer.token_start, this.lexer.token_end);
           components.push(media_type);
         }
       } else {
@@ -107,16 +111,13 @@ class AtRulePreludeParser {
       }
     }
     if (components.length === 0) return null;
-    let query_node = this.create_node(NODE_PRELUDE_MEDIA_QUERY, query_start, this.lexer.pos);
-    for (let component of components) {
-      this.arena.append_child(query_node, component);
-    }
+    let query_node = this.create_node(MEDIA_QUERY, query_start, this.lexer.pos);
+    this.arena.append_children(query_node, components);
     return query_node;
   }
   // Parse media feature: (min-width: 768px)
   parse_media_feature() {
     let feature_start = this.lexer.token_start;
-    this.lexer.token_line;
     let depth = 1;
     let content_start = this.lexer.pos;
     while (this.lexer.pos < this.prelude_end && depth > 0) {
@@ -131,10 +132,10 @@ class AtRulePreludeParser {
     if (depth !== 0) return null;
     let content_end = this.lexer.token_start;
     let feature_end = this.lexer.token_end;
-    let feature = this.create_node(NODE_PRELUDE_MEDIA_FEATURE, feature_start, feature_end);
+    let feature = this.create_node(MEDIA_FEATURE, feature_start, feature_end);
     let trimmed = trim_boundaries(this.source, content_start, content_end);
     if (trimmed) {
-      this.arena.set_value_start(feature, trimmed[0]);
+      this.arena.set_value_start_delta(feature, trimmed[0] - feature_start);
       this.arena.set_value_length(feature, trimmed[1] - trimmed[0]);
     }
     return feature;
@@ -143,7 +144,6 @@ class AtRulePreludeParser {
   parse_container_query() {
     let nodes = [];
     let query_start = this.lexer.pos;
-    this.lexer.line;
     let components = [];
     while (this.lexer.pos < this.prelude_end) {
       this.skip_whitespace();
@@ -158,19 +158,17 @@ class AtRulePreludeParser {
       } else if (token_type === TOKEN_IDENT) {
         let text = this.source.substring(this.lexer.token_start, this.lexer.token_end);
         if (this.is_and_or_not(text)) {
-          let op = this.create_node(NODE_PRELUDE_OPERATOR, this.lexer.token_start, this.lexer.token_end);
+          let op = this.create_node(PRELUDE_OPERATOR, this.lexer.token_start, this.lexer.token_end);
           components.push(op);
         } else {
-          let name = this.create_node(NODE_PRELUDE_IDENTIFIER, this.lexer.token_start, this.lexer.token_end);
+          let name = this.create_node(IDENTIFIER, this.lexer.token_start, this.lexer.token_end);
           components.push(name);
         }
       }
     }
     if (components.length === 0) return [];
-    let query_node = this.create_node(NODE_PRELUDE_CONTAINER_QUERY, query_start, this.lexer.pos);
-    for (let component of components) {
-      this.arena.append_child(query_node, component);
-    }
+    let query_node = this.create_node(CONTAINER_QUERY, query_start, this.lexer.pos);
+    this.arena.append_children(query_node, components);
     nodes.push(query_node);
     return nodes;
   }
@@ -184,7 +182,6 @@ class AtRulePreludeParser {
       let token_type = this.lexer.token_type;
       if (token_type === TOKEN_LEFT_PAREN) {
         let feature_start = this.lexer.token_start;
-        this.lexer.token_line;
         let depth = 1;
         let content_start = this.lexer.pos;
         while (this.lexer.pos < this.prelude_end && depth > 0) {
@@ -199,10 +196,10 @@ class AtRulePreludeParser {
         if (depth === 0) {
           let content_end = this.lexer.token_start;
           let feature_end = this.lexer.token_end;
-          let query = this.create_node(NODE_PRELUDE_SUPPORTS_QUERY, feature_start, feature_end);
+          let query = this.create_node(SUPPORTS_QUERY, feature_start, feature_end);
           let trimmed = trim_boundaries(this.source, content_start, content_end);
           if (trimmed) {
-            this.arena.set_value_start(query, trimmed[0]);
+            this.arena.set_value_start_delta(query, trimmed[0] - feature_start);
             this.arena.set_value_length(query, trimmed[1] - trimmed[0]);
           }
           nodes.push(query);
@@ -210,7 +207,7 @@ class AtRulePreludeParser {
       } else if (token_type === TOKEN_IDENT) {
         let text = this.source.substring(this.lexer.token_start, this.lexer.token_end);
         if (this.is_and_or_not(text)) {
-          let op = this.create_node(NODE_PRELUDE_OPERATOR, this.lexer.token_start, this.lexer.token_end);
+          let op = this.create_node(PRELUDE_OPERATOR, this.lexer.token_start, this.lexer.token_end);
           nodes.push(op);
         }
       }
@@ -226,7 +223,7 @@ class AtRulePreludeParser {
       this.next_token();
       let token_type = this.lexer.token_type;
       if (token_type === TOKEN_IDENT) {
-        let layer = this.create_node(NODE_PRELUDE_LAYER_NAME, this.lexer.token_start, this.lexer.token_end);
+        let layer = this.create_node(LAYER_NAME, this.lexer.token_start, this.lexer.token_end);
         nodes.push(layer);
       } else if (token_type === TOKEN_COMMA) {
         continue;
@@ -242,7 +239,7 @@ class AtRulePreludeParser {
     if (this.lexer.pos >= this.prelude_end) return [];
     this.next_token();
     if (this.lexer.token_type !== TOKEN_IDENT) return [];
-    let ident = this.create_node(NODE_PRELUDE_IDENTIFIER, this.lexer.token_start, this.lexer.token_end);
+    let ident = this.create_node(IDENTIFIER, this.lexer.token_start, this.lexer.token_end);
     return [ident];
   }
   // Parse @import prelude: url() [layer] [supports()] [media-query-list]
@@ -283,7 +280,6 @@ class AtRulePreludeParser {
     }
     let url_start = this.lexer.token_start;
     let url_end = this.lexer.token_end;
-    this.lexer.token_line;
     if (this.lexer.token_type === TOKEN_FUNCTION) {
       let paren_depth = 1;
       while (this.lexer.pos < this.prelude_end && paren_depth > 0) {
@@ -300,7 +296,7 @@ class AtRulePreludeParser {
         }
       }
     }
-    let url_node = this.create_node(NODE_PRELUDE_IMPORT_URL, url_start, url_end);
+    let url_node = this.create_node(URL, url_start, url_end);
     return url_node;
   }
   // Parse import layer: layer or layer(name)
@@ -315,7 +311,6 @@ class AtRulePreludeParser {
       if (str_equals("layer", text)) {
         let layer_start = this.lexer.token_start;
         let layer_end = this.lexer.token_end;
-        this.lexer.token_line;
         let content_start = 0;
         let content_length = 0;
         if (this.lexer.token_type === TOKEN_FUNCTION) {
@@ -336,11 +331,11 @@ class AtRulePreludeParser {
             }
           }
         }
-        let layer_node = this.create_node(NODE_PRELUDE_IMPORT_LAYER, layer_start, layer_end);
+        let layer_node = this.create_node(LAYER_NAME, layer_start, layer_end);
         if (content_length > 0) {
           let trimmed = trim_boundaries(this.source, content_start, content_start + content_length);
           if (trimmed) {
-            this.arena.set_content_start(layer_node, trimmed[0]);
+            this.arena.set_content_start_delta(layer_node, trimmed[0] - layer_start);
             this.arena.set_content_length(layer_node, trimmed[1] - trimmed[0]);
           }
         }
@@ -358,7 +353,6 @@ class AtRulePreludeParser {
       let text = this.source.substring(this.lexer.token_start, this.lexer.token_end - 1);
       if (str_equals("supports", text)) {
         let supports_start = this.lexer.token_start;
-        this.lexer.token_line;
         let paren_depth = 1;
         let supports_end = this.lexer.token_end;
         while (this.lexer.pos < this.prelude_end && paren_depth > 0) {
@@ -374,7 +368,7 @@ class AtRulePreludeParser {
             break;
           }
         }
-        let supports_node = this.create_node(NODE_PRELUDE_IMPORT_SUPPORTS, supports_start, supports_end);
+        let supports_node = this.create_node(SUPPORTS_QUERY, supports_start, supports_end);
         return supports_node;
       }
     }

package/dist/parse-selector.d.ts

@@ -1,34 +1,4 @@
-import { CSSDataArena } from './arena';
 import { CSSNode } from './css-node';
-export declare class SelectorParser {
-    private lexer;
-    private arena;
-    private source;
-    private selector_end;
-    constructor(arena: CSSDataArena, source: string);
-    parse_selector(start: number, end: number, line?: number, column?: number, allow_relative?: boolean): number | null;
-    private parse_selector_list;
-    private parse_complex_selector;
-    private parse_compound_selector;
-    private parse_simple_selector;
-    private parse_namespace_local_part;
-    private parse_type_or_namespace_selector;
-    private parse_universal_or_namespace_selector;
-    private parse_empty_namespace_selector;
-    private try_parse_combinator;
-    private parse_class_selector;
-    private parse_attribute_selector;
-    private parse_attribute_content;
-    private parse_pseudo;
-    private parse_pseudo_function;
-    private parse_pseudo_function_after_colon;
-    private is_nth_pseudo;
-    private parse_lang_identifiers;
-    private parse_nth_expression;
-    private find_of_keyword;
-    private create_node;
-    private skip_whitespace;
-}
 /**
  * Parse a CSS selector string and return an AST
  * @param source - The CSS selector to parse (e.g., "div.class > p#id")