Merge remote-tracking branch 'origin/master'

Author: g105b

src/HTMLAttributeBinder.php

@@ -33,8 +33,9 @@ public function bind(
 			$element = $element->documentElement;
 		}
 
-		$bindValue = $this->normalizeBindValue($value);
+		$bindValue = $this->standardiseBindValue($value);
 		$attributesToRemove = [];
+		$attributeUpdates = [];
 		foreach($element->attributes as $attributeName => $attribute) {
 			/** @var Attr $attribute */
 			$this->markBoundElement($element, $attribute, $key, $bindValue);
@@ -43,7 +44,7 @@ public function bind(
 			}
 
 			$bindProperty = $this->getBindProperty($element, $attributeName);
-			$modifier = $this->resolveModifier($key, $attribute->value);
+			[$modifier, $remainingExpressions] = $this->resolveModifier($key, $attribute->value);
 			if($modifier === false) {
 				continue;
 			}
@@ -57,10 +58,19 @@ public function bind(
 			$this->appendDebugInfo($element, $bindProperty);
 			$element->setAttribute("data-bound", "");
 			if(!$attribute->ownerElement->hasAttribute("data-rebind")) {
-				$attributesToRemove[] = $attributeName;
+				if($remainingExpressions === []) {
+					$attributesToRemove[] = $attributeName;
+				}
+				else {
+					$attributeUpdates[$attributeName] = implode("; ", $remainingExpressions);
+				}
 			}
 		}
 
+		foreach($attributeUpdates as $attributeName => $attributeValue) {
+			$element->setAttribute($attributeName, $attributeValue);
+		}
+
 		foreach($attributesToRemove as $attributeName) {
 			$element->removeAttribute($attributeName);
 		}
@@ -96,7 +106,7 @@ public function expandAttributes(Element $element):void {
 		}
 	}
 
-	private function normalizeBindValue(mixed $value):mixed {
+	private function standardiseBindValue(mixed $value):mixed {
 		if(is_scalar($value) || is_iterable($value)) {
 			return $value;
 		}
@@ -156,26 +166,54 @@ private function getBindProperty(
 		return substr($attributeName, strpos($attributeName, ":") + 1);
 	}
 
+	/** @return array{0:string|false|null, 1:array<int, string>} */
 	private function resolveModifier(
 		?string $key,
 		string $attributeValue,
-	):string|false|null {
+	):array {
 		if(is_null($key)) {
-			return $attributeValue === ""
-				? null
-				: false;
+			return [
+				$attributeValue === ""
+					? null
+					: false,
+				[],
+			];
+		}
+
+		$matchingExpression = null;
+		$remainingExpressions = [];
+		foreach($this->splitBindExpressions($attributeValue) as $expression) {
+			$trimmedExpression = ltrim($expression, ":!?");
+			$trimmedExpression = strtok($trimmedExpression, " ");
+			$bindKey = $this->extractBindKey($trimmedExpression);
+			if(is_null($matchingExpression) && ($key === $bindKey || $bindKey === "@")) {
+				$matchingExpression = $expression;
+				continue;
+			}
+
+			$remainingExpressions[] = $expression;
 		}
 
-		$trimmedAttrValue = ltrim($attributeValue, ":!?");
-		$trimmedAttrValue = strtok($trimmedAttrValue, " ");
-		$bindKey = $this->extractBindKey($trimmedAttrValue);
-		if($key !== $bindKey && $bindKey !== "@") {
-			return false;
+		if(is_null($matchingExpression)) {
+			return [false, []];
 		}
 
-		return $attributeValue !== $trimmedAttrValue
-			? $attributeValue
-			: null;
+		return [
+			$matchingExpression !== ltrim($matchingExpression, ":!?")
+				? $matchingExpression
+				: null,
+			$remainingExpressions,
+		];
+	}
+
+	/** @return array<int, string> */
+	private function splitBindExpressions(string $attributeValue):array {
+		return array_values(
+			array_filter(
+				array_map("trim", explode(";", $attributeValue)),
+				fn(string $expression):bool => $expression !== "",
+			),
+		);
 	}
 
 	private function defaultListBindingName(Element $element):string {
@@ -312,7 +350,9 @@ private function bindClassProperty(
 			return;
 		}
 
-		$element->classList->add($bindValue);
+		foreach($this->prepareTokenListValues($bindValue) as $className) {
+			$element->classList->add($className);
+		}
 	}
 
 	private function bindRemoveProperty(
@@ -350,8 +390,8 @@ private function handleModifier(
 		string $modifier,
 		mixed $bindValue
 	):void {
-		$modifierChar = $modifier[0];
-		$modifierValue = substr($modifier, 1);
+		$modifierChar = $this->getModifierType($modifier);
+		$modifierValue = $this->getModifierBody($modifier);
 		$condition = null;
 		if(false !== $spacePos = strpos($modifierValue, " ")) {
 			$modifierValue = substr($modifierValue, $spacePos + 1);
@@ -368,16 +408,20 @@ private function handleModifier(
 		switch($modifierChar) {
 		case ":":
 			$tokenList = $this->getTokenList($element, $attribute);
+			$tokenNames = $this->resolveTokenNames($modifier, $bindValue);
+			if($this->isInverseModifier($modifier)) {
+				$bindValue = !$bindValue;
+			}
 			if($bindValue) {
-				$tokenList->add($modifierValue);
+				$tokenList->add(...$tokenNames);
 			}
 			else {
-				$tokenList->remove($modifierValue);
+				$tokenList->remove(...$tokenNames);
 			}
 			break;
 
 		case "?":
-			if($modifierValue[0] === "!") {
+			if($this->isInverseModifier($modifier)) {
 				$bindValue = !$bindValue;
 			}
 
@@ -422,16 +466,84 @@ private function extractBindKey(string $bindExpression):string {
 	}
 
 	private function extractModifierExpression(string $modifier):string {
-		$modifierValue = substr($modifier, 1);
-		$modifierValue = ltrim($modifierValue, "!");
+		$modifierValue = $this->getModifierBody($modifier);
 		return strtok($modifierValue, " ") ?: "";
 	}
 
+	/** @return array<int, string> */
+	private function resolveTokenNames(string $modifier, mixed $bindValue):array {
+		$tokenNames = $this->extractModifierTokens($modifier);
+		if($tokenNames) {
+			return $tokenNames;
+		}
+
+		if(is_bool($bindValue)) {
+			$bindExpression = $this->extractModifierExpression($modifier);
+			return [$this->extractBindKey($bindExpression)];
+		}
+
+		return $this->prepareTokenListValues($bindValue);
+	}
+
+	/** @return array<int, string> */
+	private function extractModifierTokens(string $modifier):array {
+		$modifierValue = $this->getModifierBody($modifier);
+		$spacePos = strpos($modifierValue, " ");
+		if($spacePos === false) {
+			return [];
+		}
+
+		return $this->prepareTokenListValues(substr($modifierValue, $spacePos + 1));
+	}
+
+	private function getModifierType(string $modifier):string {
+		foreach(str_split($modifier) as $char) {
+			if($char === ":" || $char === "?") {
+				return $char;
+			}
+		}
+
+		return $modifier[0];
+	}
+
+	private function isInverseModifier(string $modifier):bool {
+		return str_contains($modifier, "!");
+	}
+
+	private function getModifierBody(string $modifier):string {
+		$modifierType = $this->getModifierType($modifier);
+		$modifierValue = ltrim($modifier, "!");
+		if(str_starts_with($modifierValue, $modifierType)) {
+			return ltrim(substr($modifierValue, 1), "!");
+		}
+
+		return ltrim(substr($modifier, 1), "!");
+	}
+
 	private function extractCondition(string $bindExpression):?string {
 		$parts = explode("=", $bindExpression, 2);
 		return $parts[1] ?? null;
 	}
 
+	/** @return array<int, string> */
+	private function prepareTokenListValues(mixed $bindValue):array {
+		if(is_iterable($bindValue)) {
+			$tokenList = [];
+			foreach($bindValue as $tokenValue) {
+				array_push($tokenList, ...$this->prepareTokenListValues($tokenValue));
+			}
+
+			return array_values(array_unique($tokenList));
+		}
+
+		if(!is_scalar($bindValue) && !$bindValue instanceof \Stringable) {
+			return [];
+		}
+
+		$tokenList = preg_split('/\s+/', trim((string)$bindValue)) ?: [];
+		return array_values(array_filter($tokenList, fn(string $token):bool => $token !== ""));
+	}
+
 	private function valueMatchesCondition(mixed $bindValue, string $condition):bool {
 		if(is_bool($bindValue)) {
 			$bindValue = (int)$bindValue;