@projectwallace/css-parser 0.17.0 → 0.18.0

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

@@ -7,6 +7,7 @@ declare class AtRulePreludeParser {
   private arena;
   private source;
   private prelude_end;
+  private value_node_parser;
   constructor(arena: CSSDataArena, source: string);
   parse_prelude(at_rule_name: string, start: number, end: number, line?: number, column?: number): number[];
   private parse_prelude_dispatch;
@@ -30,7 +31,6 @@ declare class AtRulePreludeParser {
   private skip_whitespace;
   private peek_token_type;
   private next_token;
-  private parse_value_token;
   private parse_feature_value;
   private parse_namespace_prelude;
   private parse_scope_prelude;

package/dist/parse-atrule-prelude.js

@@ -1,8 +1,9 @@
 import { t as Lexer } from "./tokenize-BiRLfVbm.js";
 import { l as CSSDataArena } from "./arena-CFwM4uQs.js";
-import { a as is_whitespace, l as strip_vendor_prefix, o as str_equals } from "./parse-dimension-ouWXNHdx.js";
+import { l as strip_vendor_prefix, o as str_equals } from "./parse-dimension-ouWXNHdx.js";
 import { t as CSSNode } from "./css-node-B3EzCweR.js";
 import { i as trim_boundaries, n as skip_whitespace_and_comments_forward } from "./parse-utils-D7srNG13.js";
+import { t as ValueNodeParser } from "./value-node-parser-CZ47v3hp.js";
 //#region src/parse-atrule-prelude.ts
 /** @internal */
 var AtRulePreludeParser = class {
@@ -10,11 +11,13 @@ var AtRulePreludeParser = class {
 	arena;
 	source;
 	prelude_end;
+	value_node_parser;
 	constructor(arena, source) {
 		this.arena = arena;
 		this.source = source;
 		this.lexer = new Lexer(source);
 		this.prelude_end = 0;
+		this.value_node_parser = new ValueNodeParser(arena, source);
 	}
 	parse_prelude(at_rule_name, start, end, line = 1, column = 1) {
 		this.prelude_end = end;
@@ -107,7 +110,7 @@ var AtRulePreludeParser = class {
 		while (this.lexer.pos < this.prelude_end && depth > 0) {
 			this.next_token();
 			let token_type = this.lexer.token_type;
-			if (token_type === 21) depth++;
+			if (token_type === 21 || token_type === 2) depth++;
 			else if (token_type === 22) depth--;
 		}
 		if (depth !== 0) return null;
@@ -224,7 +227,7 @@ var AtRulePreludeParser = class {
 				while (this.lexer.pos < this.prelude_end && depth > 0) {
 					this.next_token();
 					let inner_token_type = this.lexer.token_type;
-					if (inner_token_type === 21) depth++;
+					if (inner_token_type === 21 || inner_token_type === 2) depth++;
 					else if (inner_token_type === 22) depth--;
 				}
 				if (depth === 0) {
@@ -470,39 +473,8 @@ var AtRulePreludeParser = class {
 		}
 		return this.lexer.next_token_fast(false);
 	}
-	parse_value_token() {
-		switch (this.lexer.token_type) {
-			case 1: return this.create_node(10, this.lexer.token_start, this.lexer.token_end);
-			case 10: return this.create_node(11, this.lexer.token_start, this.lexer.token_end);
-			case 11:
-			case 12: return this.create_node(12, this.lexer.token_start, this.lexer.token_end);
-			case 5: return this.create_node(13, this.lexer.token_start, this.lexer.token_end);
-			default: return null;
-		}
-	}
 	parse_feature_value(start, end) {
-		const saved_position = this.lexer.save_position();
-		this.lexer.seek(start, this.lexer.line, this.lexer.column);
-		let first_node = 0;
-		let last_node = 0;
-		while (this.lexer.pos < end) {
-			this.lexer.next_token_fast(false);
-			if (this.lexer.token_start >= end) break;
-			let all_whitespace = true;
-			for (let i = this.lexer.token_start; i < this.lexer.token_end && i < end; i++) if (!is_whitespace(this.source.charCodeAt(i))) {
-				all_whitespace = false;
-				break;
-			}
-			if (all_whitespace) continue;
-			let node = this.parse_value_token();
-			if (node !== null) {
-				if (first_node === 0) first_node = node;
-				else this.arena.set_next_sibling(last_node, node);
-				last_node = node;
-			}
-		}
-		this.lexer.restore_position(saved_position);
-		return first_node;
+		return this.value_node_parser.parse_chain(start, end, this.lexer.line, this.lexer.column);
 	}
 	parse_namespace_prelude() {
 		let nodes = [];
@@ -531,7 +503,7 @@ var AtRulePreludeParser = class {
 				let depth = 1;
 				while (this.lexer.pos < this.prelude_end && depth > 0) {
 					this.next_token();
-					if (this.lexer.token_type === 21) depth++;
+					if (this.lexer.token_type === 21 || this.lexer.token_type === 2) depth++;
 					else if (this.lexer.token_type === 22) depth--;
 				}
 				let content_end = this.lexer.token_start;

package/dist/parse-value.d.ts

@@ -3,19 +3,10 @@ import { q as Value } from "./node-types-BRnQyc9B.js";
 //#region src/parse-value.d.ts
 /** @internal */
 declare class ValueParser {
-  private lexer;
+  private nodes;
   private arena;
-  private source;
-  private value_end;
   constructor(arena: CSSDataArena, source: string);
   parse_value(start: number, end: number, start_line: number, start_column: number): number;
-  private is_whitespace_inline;
-  private parse_value_node;
-  private create_node;
-  private create_operator_node;
-  private parse_operator_node;
-  private parse_function_node;
-  private parse_parenthesis_node;
 }
 /**
  * Parse a CSS declaration value string and return a VALUE node

package/dist/parse-value.js

@@ -1,181 +1,25 @@
-import { t as Lexer } from "./tokenize-BiRLfVbm.js";
 import { l as CSSDataArena } from "./arena-CFwM4uQs.js";
-import { a as is_whitespace, o as str_equals } from "./parse-dimension-ouWXNHdx.js";
 import { t as CSSNode } from "./css-node-B3EzCweR.js";
+import { t as ValueNodeParser } from "./value-node-parser-CZ47v3hp.js";
 //#region src/parse-value.ts
 /** @internal */
 var ValueParser = class {
-	lexer;
+	nodes;
 	arena;
-	source;
-	value_end;
 	constructor(arena, source) {
 		this.arena = arena;
-		this.source = source;
-		this.lexer = new Lexer(source);
-		this.value_end = 0;
+		this.nodes = new ValueNodeParser(arena, source);
 	}
 	parse_value(start, end, start_line, start_column) {
-		this.value_end = end;
-		this.lexer.seek(start, start_line, start_column);
-		let first_node = 0;
-		let last_node = 0;
-		while (this.lexer.pos < this.value_end) {
-			this.lexer.next_token_fast(false);
-			if (this.lexer.token_start >= this.value_end) break;
-			if (this.lexer.token_type === 26) break;
-			if (this.is_whitespace_inline()) continue;
-			let node = this.parse_value_node();
-			if (node !== null) {
-				if (first_node === 0) first_node = node;
-				else this.arena.set_next_sibling(last_node, node);
-				last_node = node;
-			}
-		}
+		let first_node = this.nodes.parse_chain(start, end, start_line, start_column);
 		if (first_node === 0) return this.arena.create_node(50, start, 0, start_line, start_column);
+		let last_node = this.nodes.last_chain_node;
 		let first_node_start = this.arena.get_start_offset(first_node);
 		let last_node_end = this.arena.get_start_offset(last_node) + this.arena.get_length(last_node);
 		let value_node = this.arena.create_node(50, first_node_start, last_node_end - first_node_start, start_line, start_column);
 		this.arena.set_first_child(value_node, first_node);
 		return value_node;
 	}
-	is_whitespace_inline() {
-		if (this.lexer.token_start >= this.lexer.token_end) return false;
-		for (let i = this.lexer.token_start; i < this.lexer.token_end; i++) if (!is_whitespace(this.source.charCodeAt(i))) return false;
-		return true;
-	}
-	parse_value_node() {
-		let token_type = this.lexer.token_type;
-		let start = this.lexer.token_start;
-		let end = this.lexer.token_end;
-		switch (token_type) {
-			case 1: return this.create_node(10, start, end);
-			case 10: return this.create_node(11, start, end);
-			case 11:
-			case 12: return this.create_node(12, start, end);
-			case 5: return this.create_node(13, start, end);
-			case 4: return this.create_node(14, start, end);
-			case 27: return this.create_node(19, start, end);
-			case 2: return this.parse_function_node(start, end);
-			case 9: return this.parse_operator_node(start, end);
-			case 18: return this.create_node(16, start, end);
-			case 21: return this.parse_parenthesis_node(start, end);
-			default: return null;
-		}
-	}
-	create_node(node_type, start, end) {
-		let node = this.arena.create_node(node_type, start, end - start, this.lexer.token_line, this.lexer.token_column);
-		this.arena.set_content_length(node, end - start);
-		return node;
-	}
-	create_operator_node(start, end) {
-		return this.create_node(16, start, end);
-	}
-	parse_operator_node(start, end) {
-		let ch = this.source.charCodeAt(start);
-		if (ch === 43 || ch === 45 || ch === 42 || ch === 47) return this.create_operator_node(start, end);
-		return null;
-	}
-	parse_function_node(start, end) {
-		let name_end = end - 1;
-		let func_name_substr = this.source.substring(start, name_end);
-		let node = this.arena.create_node(str_equals("url", func_name_substr) ? 18 : 15, start, 0, 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);
-		if (str_equals("url", func_name_substr) || str_equals("src", func_name_substr)) {
-			let save_pos = this.lexer.save_position();
-			this.lexer.next_token_fast(false);
-			while (this.is_whitespace_inline() && this.lexer.pos < this.value_end) this.lexer.next_token_fast(false);
-			let first_token_type = this.lexer.token_type;
-			this.lexer.restore_position(save_pos);
-			if (first_token_type === 5) {} else {
-				let paren_depth = 1;
-				let func_end = end;
-				let content_start = end;
-				let content_end = end;
-				while (paren_depth > 0) {
-					this.lexer.next_token_fast(false);
-					let token_type = this.lexer.token_type;
-					if (token_type === 26) break;
-					if (token_type === 21 || token_type === 2) paren_depth++;
-					else if (token_type === 22) {
-						paren_depth--;
-						if (paren_depth === 0) {
-							content_end = this.lexer.token_start;
-							func_end = this.lexer.token_end;
-							break;
-						}
-					}
-				}
-				this.arena.set_length(node, func_end - start);
-				this.arena.set_value_start_delta(node, content_start - start);
-				this.arena.set_value_length(node, content_end - content_start);
-				return node;
-			}
-		}
-		let first_arg = 0;
-		let last_arg = 0;
-		let paren_depth = 1;
-		let func_end = end;
-		let content_start = end;
-		let content_end = end;
-		while (this.lexer.pos < this.value_end && paren_depth > 0) {
-			this.lexer.next_token_fast(false);
-			let token_type = this.lexer.token_type;
-			if (token_type === 26) break;
-			if (this.lexer.token_start >= this.value_end) break;
-			if (token_type === 22) {
-				paren_depth--;
-				if (paren_depth === 0) {
-					content_end = this.lexer.token_start;
-					func_end = this.lexer.token_end;
-					break;
-				}
-			}
-			if (this.is_whitespace_inline()) continue;
-			let arg_node = this.parse_value_node();
-			if (arg_node !== null) {
-				if (first_arg === 0) first_arg = arg_node;
-				else this.arena.set_next_sibling(last_arg, arg_node);
-				last_arg = arg_node;
-			}
-		}
-		this.arena.set_length(node, func_end - start);
-		this.arena.set_value_start_delta(node, content_start - start);
-		this.arena.set_value_length(node, content_end - content_start);
-		if (first_arg !== 0) this.arena.set_first_child(node, first_arg);
-		return node;
-	}
-	parse_parenthesis_node(start, end) {
-		let node = this.arena.create_node(17, start, 0, this.lexer.token_line, this.lexer.token_column);
-		let first_child = 0;
-		let last_child = 0;
-		let paren_depth = 1;
-		let paren_end = end;
-		while (this.lexer.pos < this.value_end && paren_depth > 0) {
-			this.lexer.next_token_fast(false);
-			let token_type = this.lexer.token_type;
-			if (token_type === 26) break;
-			if (this.lexer.token_start >= this.value_end) break;
-			if (token_type === 22) {
-				paren_depth--;
-				if (paren_depth === 0) {
-					paren_end = this.lexer.token_end;
-					break;
-				}
-			}
-			if (this.is_whitespace_inline()) continue;
-			let child_node = this.parse_value_node();
-			if (child_node !== null) {
-				if (first_child === 0) first_child = child_node;
-				else this.arena.set_next_sibling(last_child, child_node);
-				last_child = child_node;
-			}
-		}
-		this.arena.set_length(node, paren_end - start);
-		if (first_child !== 0) this.arena.set_first_child(node, first_child);
-		return node;
-	}
 };
 /**
 * Parse a CSS declaration value string and return a VALUE node

package/dist/value-node-parser-CZ47v3hp.js

@@ -0,0 +1,176 @@
+import { t as Lexer } from "./tokenize-BiRLfVbm.js";
+import "./arena-CFwM4uQs.js";
+import { a as is_whitespace, o as str_equals } from "./parse-dimension-ouWXNHdx.js";
+//#region src/value-node-parser.ts
+/** @internal */
+var ValueNodeParser = class {
+	lexer;
+	arena;
+	source;
+	end = 0;
+	last_chain_node = 0;
+	constructor(arena, source) {
+		this.arena = arena;
+		this.source = source;
+		this.lexer = new Lexer(source);
+	}
+	parse_chain(start, end, start_line, start_column) {
+		this.end = end;
+		this.lexer.seek(start, start_line, start_column);
+		let first_node = 0;
+		let last_node = 0;
+		while (this.lexer.pos < this.end) {
+			this.lexer.next_token_fast(false);
+			if (this.lexer.token_start >= this.end) break;
+			if (this.lexer.token_type === 26) break;
+			if (this.is_whitespace_inline()) continue;
+			let node = this.parse_value_node();
+			if (node !== null) {
+				if (first_node === 0) first_node = node;
+				else this.arena.set_next_sibling(last_node, node);
+				last_node = node;
+			}
+		}
+		this.last_chain_node = last_node;
+		return first_node;
+	}
+	is_whitespace_inline() {
+		if (this.lexer.token_start >= this.lexer.token_end) return false;
+		for (let i = this.lexer.token_start; i < this.lexer.token_end; i++) if (!is_whitespace(this.source.charCodeAt(i))) return false;
+		return true;
+	}
+	parse_value_node() {
+		let token_type = this.lexer.token_type;
+		let start = this.lexer.token_start;
+		let end = this.lexer.token_end;
+		switch (token_type) {
+			case 1: return this.create_node(10, start, end);
+			case 10: return this.create_node(11, start, end);
+			case 11:
+			case 12: return this.create_node(12, start, end);
+			case 5: return this.create_node(13, start, end);
+			case 4: return this.create_node(14, start, end);
+			case 27: return this.create_node(19, start, end);
+			case 2: return this.parse_function_node(start, end);
+			case 9: return this.parse_operator_node(start, end);
+			case 18: return this.create_node(16, start, end);
+			case 21: return this.parse_parenthesis_node(start, end);
+			default: return null;
+		}
+	}
+	create_node(node_type, start, end) {
+		let node = this.arena.create_node(node_type, start, end - start, this.lexer.token_line, this.lexer.token_column);
+		this.arena.set_content_length(node, end - start);
+		return node;
+	}
+	create_operator_node(start, end) {
+		return this.create_node(16, start, end);
+	}
+	parse_operator_node(start, end) {
+		let ch = this.source.charCodeAt(start);
+		if (ch === 43 || ch === 45 || ch === 42 || ch === 47) return this.create_operator_node(start, end);
+		return null;
+	}
+	parse_function_node(start, end) {
+		let name_end = end - 1;
+		let func_name_substr = this.source.substring(start, name_end);
+		let node = this.arena.create_node(str_equals("url", func_name_substr) ? 18 : 15, start, 0, 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);
+		if (str_equals("url", func_name_substr) || str_equals("src", func_name_substr)) {
+			let save_pos = this.lexer.save_position();
+			this.lexer.next_token_fast(false);
+			while (this.is_whitespace_inline() && this.lexer.pos < this.end) this.lexer.next_token_fast(false);
+			let first_token_type = this.lexer.token_type;
+			this.lexer.restore_position(save_pos);
+			if (first_token_type === 5) {} else {
+				let paren_depth = 1;
+				let func_end = end;
+				let content_start = end;
+				let content_end = end;
+				while (paren_depth > 0) {
+					this.lexer.next_token_fast(false);
+					let token_type = this.lexer.token_type;
+					if (token_type === 26) break;
+					if (token_type === 21 || token_type === 2) paren_depth++;
+					else if (token_type === 22) {
+						paren_depth--;
+						if (paren_depth === 0) {
+							content_end = this.lexer.token_start;
+							func_end = this.lexer.token_end;
+							break;
+						}
+					}
+				}
+				this.arena.set_length(node, func_end - start);
+				this.arena.set_value_start_delta(node, content_start - start);
+				this.arena.set_value_length(node, content_end - content_start);
+				return node;
+			}
+		}
+		let first_arg = 0;
+		let last_arg = 0;
+		let paren_depth = 1;
+		let func_end = end;
+		let content_start = end;
+		let content_end = end;
+		while (this.lexer.pos < this.end && paren_depth > 0) {
+			this.lexer.next_token_fast(false);
+			let token_type = this.lexer.token_type;
+			if (token_type === 26) break;
+			if (this.lexer.token_start >= this.end) break;
+			if (token_type === 22) {
+				paren_depth--;
+				if (paren_depth === 0) {
+					content_end = this.lexer.token_start;
+					func_end = this.lexer.token_end;
+					break;
+				}
+			}
+			if (this.is_whitespace_inline()) continue;
+			let arg_node = this.parse_value_node();
+			if (arg_node !== null) {
+				if (first_arg === 0) first_arg = arg_node;
+				else this.arena.set_next_sibling(last_arg, arg_node);
+				last_arg = arg_node;
+			}
+		}
+		this.arena.set_length(node, func_end - start);
+		this.arena.set_value_start_delta(node, content_start - start);
+		this.arena.set_value_length(node, content_end - content_start);
+		if (first_arg !== 0) this.arena.set_first_child(node, first_arg);
+		return node;
+	}
+	parse_parenthesis_node(start, end) {
+		let node = this.arena.create_node(17, start, 0, this.lexer.token_line, this.lexer.token_column);
+		let first_child = 0;
+		let last_child = 0;
+		let paren_depth = 1;
+		let paren_end = end;
+		while (this.lexer.pos < this.end && paren_depth > 0) {
+			this.lexer.next_token_fast(false);
+			let token_type = this.lexer.token_type;
+			if (token_type === 26) break;
+			if (this.lexer.token_start >= this.end) break;
+			if (token_type === 22) {
+				paren_depth--;
+				if (paren_depth === 0) {
+					paren_end = this.lexer.token_end;
+					break;
+				}
+			}
+			if (this.is_whitespace_inline()) continue;
+			let child_node = this.parse_value_node();
+			if (child_node !== null) {
+				if (first_child === 0) first_child = child_node;
+				else this.arena.set_next_sibling(last_child, child_node);
+				last_child = child_node;
+			}
+		}
+		this.arena.set_length(node, paren_end - start);
+		if (first_child !== 0) this.arena.set_first_child(node, first_child);
+		return node;
+	}
+};
+//#endregion
+export { ValueNodeParser as t };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@projectwallace/css-parser",
-  "version": "0.17.0",
+  "version": "0.18.0",
   "description": "High-performance CSS lexer and parser, optimized for CSS inspection and analysis",
   "keywords": [
     "ast",