@projectwallace/css-parser 0.18.0 → 0.18.2

package/dist/parse-selector.js

@@ -1,7 +1,7 @@
-import { t as Lexer } from "./tokenize-BiRLfVbm.js";
+import { t as Lexer } from "./tokenize-DK24ACbY.js";
 import { l as CSSDataArena } from "./arena-CFwM4uQs.js";
 import { a as is_whitespace, n as is_combinator, o as str_equals } from "./parse-dimension-ouWXNHdx.js";
-import { t as CSSNode } from "./css-node-B3EzCweR.js";
+import { t as CSSNode } from "./css-node-Cf8K9nWd.js";
 import { n as skip_whitespace_and_comments_forward, r as skip_whitespace_forward, t as skip_whitespace_and_comments_backward } from "./parse-utils-D7srNG13.js";
 import { ANplusBParser } from "./parse-anplusb.js";
 //#region src/parse-selector.ts
@@ -69,7 +69,7 @@ var SelectorParser = class {
 			if (this.lexer.token_type === 9) {
 				let ch = this.source.charCodeAt(this.lexer.token_start);
 				if (ch === 62 || ch === 43 || ch === 126) {
-					let combinator = this.create_node_at(27, this.lexer.token_start, this.lexer.token_end, this.lexer.token_line, this.lexer.token_column);
+					let combinator = this.create_node(27, this.lexer.token_start, this.lexer.token_end);
 					first_component = combinator;
 					chain_tail = combinator;
 					this.skip_whitespace();
@@ -205,12 +205,13 @@ var SelectorParser = class {
 		}
 		this.lexer.next_token_fast(false);
 		if (this.lexer.token_type === 9) {
-			if (is_combinator(this.source.charCodeAt(this.lexer.token_start))) return this.create_node_at(27, this.lexer.token_start, this.lexer.token_end, this.lexer.token_line, this.lexer.token_column);
+			let ch = this.source.charCodeAt(this.lexer.token_start);
+			if (is_combinator(ch)) return this.create_node(27, this.lexer.token_start, this.lexer.token_end);
 		}
 		if (has_whitespace) {
 			this.lexer.restore_position(saved_whitespace_start);
 			this.skip_whitespace();
-			return this.create_node_at(27, saved_whitespace_start.pos, this.lexer.pos, saved_whitespace_start.line, saved_whitespace_start.column);
+			return this.create_node(27, saved_whitespace_start.pos, this.lexer.pos, saved_whitespace_start.line, saved_whitespace_start.column);
 		}
 		this.lexer.restore_position(saved_whitespace_start);
 		return null;
@@ -293,7 +294,8 @@ var SelectorParser = class {
 				else pos++;
 			}
 		} else while (pos < end) {
-			if (is_whitespace(this.source.charCodeAt(pos))) break;
+			let c = this.source.charCodeAt(pos);
+			if (is_whitespace(c)) break;
 			pos++;
 		}
 		value_end = pos;
@@ -433,44 +435,23 @@ var SelectorParser = class {
 		}
 		return -1;
 	}
-	create_node(type, start, end) {
-		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) {
+	create_node(type, start, end, line = this.lexer.token_line, column = this.lexer.token_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;
 	}
 	skip_whitespace() {
-		while (this.lexer.pos < this.selector_end) {
-			let ch = this.source.charCodeAt(this.lexer.pos);
-			if (is_whitespace(ch)) {
-				this.lexer.advance();
-				continue;
-			}
-			if (ch === 47 && this.lexer.pos + 1 < this.selector_end && this.source.charCodeAt(this.lexer.pos + 1) === 42) {
-				this.lexer.advance(2);
-				while (this.lexer.pos < this.selector_end) {
-					if (this.source.charCodeAt(this.lexer.pos) === 42 && this.lexer.pos + 1 < this.selector_end && this.source.charCodeAt(this.lexer.pos + 1) === 47) {
-						this.lexer.advance(2);
-						break;
-					}
-					this.lexer.advance();
-				}
-				continue;
-			}
-			break;
-		}
+		this.lexer.skip_whitespace_in_range(this.selector_end);
 	}
 };
 function parse_selector_list(source) {
 	const arena = new CSSDataArena(CSSDataArena.capacity_for_source(source.length));
 	const selector_index = new SelectorParser(arena, source).parse_selector(0, source.length);
-	if (selector_index === null) return new CSSNode(arena, source, arena.create_node(20, 0, 0, 1, 1));
+	if (selector_index === null) {
+		const empty = arena.create_node(20, 0, 0, 1, 1);
+		return new CSSNode(arena, source, empty);
+	}
 	return new CSSNode(arena, source, selector_index);
 }
 function parse_selector(source) {

package/dist/parse-value.d.ts

@@ -1,5 +1,5 @@
 import { l as CSSDataArena } from "./arena-Bx5vp6Sl.js";
-import { q as Value } from "./node-types-BRnQyc9B.js";
+import { q as Value } from "./node-types-D41wr72y.js";
 //#region src/parse-value.d.ts
 /** @internal */
 declare class ValueParser {

package/dist/parse-value.js

@@ -1,6 +1,6 @@
 import { l as CSSDataArena } from "./arena-CFwM4uQs.js";
-import { t as CSSNode } from "./css-node-B3EzCweR.js";
-import { t as ValueNodeParser } from "./value-node-parser-CZ47v3hp.js";
+import { t as CSSNode } from "./css-node-Cf8K9nWd.js";
+import { t as ValueNodeParser } from "./value-node-parser-jRoWXgOr.js";
 //#region src/parse-value.ts
 /** @internal */
 var ValueParser = class {
@@ -28,7 +28,8 @@ var ValueParser = class {
 */
 function parse_value(value_string) {
 	const arena = new CSSDataArena(CSSDataArena.capacity_for_source(value_string.length));
-	return new CSSNode(arena, value_string, new ValueParser(arena, value_string).parse_value(0, value_string.length, 1, 1));
+	const value_node_index = new ValueParser(arena, value_string).parse_value(0, value_string.length, 1, 1);
+	return new CSSNode(arena, value_string, value_node_index);
 }
 //#endregion
 export { ValueParser, parse_value };

package/dist/parse.d.ts

@@ -1,6 +1,6 @@
 import { l as CSSDataArena } from "./arena-Bx5vp6Sl.js";
-import { t as CommentInfo } from "./tokenize-DeZYFa9R.js";
-import { z as StyleSheet } from "./node-types-BRnQyc9B.js";
+import { t as CommentInfo } from "./tokenize-CDEnYcVG.js";
+import { z as StyleSheet } from "./node-types-D41wr72y.js";
 //#region src/parse.d.ts
 interface ParserOptions {
   parse_values?: boolean;
@@ -27,6 +27,7 @@ declare class Parser {
   private is_eof;
   parse(): StyleSheet;
   private parse_rule;
+  private parse_block_children;
   private parse_style_rule;
   private parse_selector;
   private parse_declaration;

package/dist/parse.js

@@ -1,7 +1,7 @@
-import { t as Lexer } from "./tokenize-BiRLfVbm.js";
+import { t as Lexer } from "./tokenize-DK24ACbY.js";
 import { l as CSSDataArena } from "./arena-CFwM4uQs.js";
-import { t as CSSNode } from "./css-node-B3EzCweR.js";
-import { i as trim_boundaries } from "./parse-utils-D7srNG13.js";
+import { t as CSSNode } from "./css-node-Cf8K9nWd.js";
+import { i as trim_boundaries, t as skip_whitespace_and_comments_backward } from "./parse-utils-D7srNG13.js";
 import { SelectorParser } from "./parse-selector.js";
 import { AtRulePreludeParser } from "./parse-atrule-prelude.js";
 import { DeclarationParser } from "./parse-declaration.js";
@@ -79,35 +79,24 @@ var Parser = class {
 		if (this.peek_type() === 3) return this.parse_atrule();
 		return this.parse_style_rule();
 	}
-	parse_style_rule() {
-		if (this.is_eof()) return null;
-		let rule_start = this.lexer.token_start;
-		let rule_line = this.lexer.token_line;
-		let rule_column = this.lexer.token_column;
-		let style_rule = this.arena.create_node(2, rule_start, 0, rule_line, rule_column);
-		let selector = this.parse_selector();
-		if (this.peek_type() !== 23) return null;
-		let block_start = this.lexer.token_end;
-		this.next_token();
-		this.arena.set_flag(style_rule, 8);
-		let block_line = this.lexer.token_line;
-		let block_column = this.lexer.token_column;
-		let block_node = this.arena.create_node(7, block_start, 0, block_line, block_column);
+	parse_block_children(owner, declarations_only) {
 		let first_child = 0;
 		let last_child = 0;
 		while (!this.is_eof()) {
 			let token_type = this.peek_type();
 			if (token_type === 24) break;
 			let child = null;
-			if (token_type === 3) {
+			if (!declarations_only && token_type === 3) {
 				child = this.parse_atrule();
 				if (child === null) this.next_token();
 			} else {
 				child = this.parse_declaration();
-				if (child === null) {
+				if (child !== null) this.arena.set_flag(owner, 32);
+				else if (declarations_only) this.next_token();
+				else {
 					child = this.parse_style_rule();
 					if (child === null) this.next_token();
-				} else this.arena.set_flag(style_rule, 32);
+				}
 			}
 			if (child !== null) {
 				if (first_child === 0) first_child = child;
@@ -115,6 +104,23 @@ var Parser = class {
 				last_child = child;
 			}
 		}
+		return first_child;
+	}
+	parse_style_rule() {
+		if (this.is_eof()) return null;
+		let rule_start = this.lexer.token_start;
+		let rule_line = this.lexer.token_line;
+		let rule_column = this.lexer.token_column;
+		let style_rule = this.arena.create_node(2, rule_start, 0, rule_line, rule_column);
+		let selector = this.parse_selector();
+		if (this.peek_type() !== 23) return null;
+		let block_start = this.lexer.token_end;
+		this.next_token();
+		this.arena.set_flag(style_rule, 8);
+		let block_line = this.lexer.token_line;
+		let block_column = this.lexer.token_column;
+		let block_node = this.arena.create_node(7, block_start, 0, block_line, block_column);
+		let first_child = this.parse_block_children(style_rule, false);
 		let block_end = this.lexer.token_start;
 		let rule_end = this.lexer.token_end;
 		if (this.peek_type() === 24) {
@@ -138,8 +144,9 @@ var Parser = class {
 		let selector_line = this.lexer.token_line;
 		let selector_column = this.lexer.token_column;
 		let last_end = this.lexer.token_end;
-		while (!this.is_eof() && this.peek_type() !== 23) {
-			last_end = this.lexer.token_end;
+		if (this.peek_type() !== 23) {
+			this.lexer.skip_to_unquoted(123);
+			last_end = skip_whitespace_and_comments_backward(this.source, this.lexer.pos, selector_start);
 			this.next_token();
 		}
 		if (this.parse_selectors_enabled && this.selector_parser) {
@@ -151,13 +158,11 @@ var Parser = class {
 	}
 	parse_declaration() {
 		const token_type = this.peek_type();
-		if (token_type === 1 || token_type === 3 || token_type === 4) return this.declaration_parser.parse_declaration_with_lexer(this.lexer, this.source.length);
 		if (token_type === 9 || token_type === 21 || token_type === 22 || token_type === 19 || token_type === 20 || token_type === 18 || token_type === 16) {
 			const char_code = this.source.charCodeAt(this.lexer.token_start);
 			if (char_code === 46 || char_code === 62 || char_code === 43 || char_code === 126 || char_code === 38) return null;
-			return this.declaration_parser.parse_declaration_with_lexer(this.lexer, this.source.length);
-		}
-		return null;
+		} else if (token_type !== 1 && token_type !== 3 && token_type !== 4) return null;
+		return this.declaration_parser.parse_declaration_with_lexer(this.lexer, this.source.length);
 	}
 	parse_atrule() {
 		if (this.peek_type() !== 3) return null;
@@ -200,39 +205,8 @@ var Parser = class {
 			let block_line = this.lexer.token_line;
 			let block_column = this.lexer.token_column;
 			let block_node = this.arena.create_node(7, block_start, 0, block_line, block_column);
-			let has_declarations = this.atrule_has_declarations(at_rule_name);
-			let first_child = 0;
-			let last_child = 0;
-			if (has_declarations) while (!this.is_eof()) {
-				if (this.peek_type() === 24) break;
-				let declaration = this.parse_declaration();
-				if (declaration === null) this.next_token();
-				else {
-					if (first_child === 0) first_child = declaration;
-					else this.arena.set_next_sibling(last_child, declaration);
-					last_child = declaration;
-				}
-			}
-			else while (!this.is_eof()) {
-				let token_type = this.peek_type();
-				if (token_type === 24) break;
-				let child = null;
-				if (token_type === 3) {
-					child = this.parse_atrule();
-					if (child === null) this.next_token();
-				} else {
-					child = this.parse_declaration();
-					if (child === null) {
-						child = this.parse_style_rule();
-						if (child === null) this.next_token();
-					}
-				}
-				if (child !== null) {
-					if (first_child === 0) first_child = child;
-					else this.arena.set_next_sibling(last_child, child);
-					last_child = child;
-				}
-			}
+			let declarations_only = this.atrule_has_declarations(at_rule_name);
+			let first_child = this.parse_block_children(at_rule, declarations_only);
 			if (this.peek_type() === 24) {
 				let block_end = this.lexer.token_start;
 				last_end = this.lexer.token_end;

package/dist/{tokenize-DeZYFa9R.d.ts → tokenize-CDEnYcVG.d.ts}

@@ -72,6 +72,28 @@ declare class Lexer {
   seek(pos: number, line: number, column?: number): void;
   next_token_fast(skip_whitespace?: boolean): TokenType;
   private _scan_newlines;
+  private _skip_comment;
+  /**
+   * Fast-forward to the next `target` char that isn't inside a string or comment, without
+   * fully tokenizing what's in between — used by callers that only need to know *where a
+   * construct ends* (e.g. a selector's `{`), since the sub-parser for that construct
+   * re-tokenizes the span properly afterward.
+   *
+   * Strings go through consume_string and comments through _skip_comment, so escapes and
+   * on_comment callbacks behave identically to real tokenization. Ordinary characters cost
+   * one SKIP_SCAN_INTERESTING lookup each, same as consume_ident_or_function's inner loop.
+   *
+   * Returns true with this.pos at target, or false with this.pos at source_length.
+   */
+  skip_to_unquoted(target: number): boolean;
+  /**
+   * Same approach as skip_to_unquoted, but stops at any of `; { } ( ) !` — the stop
+   * characters parse-declaration.ts's value scan needs (paren depth, statement end,
+   * !important). The caller decides what each one means; this only locates the next one.
+   *
+   * Returns the stop character's code (this.pos left at it), or 0 at `end` if none found.
+   */
+  skip_to_declaration_stop(end: number): number;
   consume_whitespace(start_line: number, start_column: number): TokenType;
   consume_string(quote: number, start_line: number, start_column: number): TokenType;
   consume_hex_escape(): void;