feat: Implement ability to drop cache keys using combination of OR an…

…d AND logic

src/Caching/Cache.php

@@ -277,13 +277,13 @@ public function remove(mixed $key): void
 	 * Removes items from the cache by conditions.
 	 * Conditions are:
 	 * - Cache::Priority => (int) priority
-	 * - Cache::Tags => (array) tags
+	 * - Cache::Tags => (array) tags | CacheSelector
 	 * - Cache::All => true
 	 */
 	public function clean(?array $conditions = null): void
 	{
 		$conditions = (array) $conditions;
-		if (isset($conditions[self::Tags])) {
+		if (isset($conditions[self::Tags]) && !$conditions[self::Tags] instanceof CacheSelector) {
 			$conditions[self::Tags] = array_values((array) $conditions[self::Tags]);
 		}
 

src/Caching/CacheSelector.php

@@ -0,0 +1,34 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Nette\Caching;
+
+class CacheSelector
+{
+	private array $conditions;
+
+
+	/**
+	 * Adds where condition, more calls appends with AND.
+	 * Pass tags as array to append with OR.
+	 *
+	 * Example:
+	 * (new CacheSelector())->where("animal")->where("dog")->where(["brown", "white"])
+	 * Creates condition looking for entities having tags animal and dog and (brown / white). Will not match entity, tagged animal, dog, black.
+	 *
+	 * @param  string|array  $tags  tag names to select
+	 */
+	public function where(string|array $tags): static
+	{
+		$this->conditions[] = $tags;
+
+		return $this;
+	}
+
+
+	public function getConditions(): array
+	{
+		return $this->conditions;
+	}
+}

src/Caching/Storages/SQLiteJournal.php

@@ -11,6 +11,7 @@
 
 use Nette;
 use Nette\Caching\Cache;
+use Nette\Caching\CacheSelector;
 
 
 /**
@@ -109,9 +110,20 @@ public function clean(array $conditions): ?array
 
 		$unions = $args = [];
 		if (!empty($conditions[Cache::Tags])) {
-			$tags = (array) $conditions[Cache::Tags];
-			$unions[] = 'SELECT DISTINCT key FROM tags WHERE tag IN (?' . str_repeat(', ?', count($tags) - 1) . ')';
-			$args = $tags;
+			if ($conditions[Cache::Tags] instanceof CacheSelector) {
+				$intersects = [];
+				foreach ($conditions[Cache::Tags]->getConditions() as $condition) {
+					$intersects[] = 'SELECT `key` FROM `tags` WHERE `tag` IN (?' . str_repeat(', ?', count((array) $condition) - 1) . ')';
+					is_array($condition)
+						? array_push($args, ...$condition)
+						: array_push($args, $condition);
+				}
+				$unions[] = implode(' INTERSECT ', $intersects);
+			} else {
+				$tags = (array) $conditions[Cache::Tags];
+				$unions[] = 'SELECT DISTINCT key FROM tags WHERE tag IN (?' . str_repeat(', ?', count($tags) - 1) . ')';
+				$args = $tags;
+			}
 		}
 
 		if (!empty($conditions[Cache::Priority])) {