Issue #3501508 by prudloff, smustgrave: Add a way to programmatically generate...

Issue #3501508 by prudloff, smustgrave: Add a way to programmatically generate bundle list cache tags

core/lib/Drupal/Core/Entity/EntityBase.php

@@ -483,7 +483,10 @@ public function getCacheContexts() {
   protected function getListCacheTagsToInvalidate() {
     $tags = $this->getEntityType()->getListCacheTags();
     if ($this->getEntityType()->hasKey('bundle')) {
-      $tags[] = $this->getEntityTypeId() . '_list:' . $this->bundle();
+      $tags = Cache::mergeTags(
+        $tags,
+        $this->getEntityType()->getBundleListCacheTags($this->bundle())
+      );
     }
     return $tags;
   }

core/lib/Drupal/Core/Entity/EntityType.php

@@ -865,6 +865,13 @@ public function getListCacheTags() {
     return $this->list_cache_tags;
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getBundleListCacheTags(string $bundle): array {
+    return [$this->id() . '_list:' . $bundle];
+  }
+
   /**
    * {@inheritdoc}
    */

core/lib/Drupal/Core/Entity/EntityTypeInterface.php

@@ -733,6 +733,17 @@ public function getListCacheContexts();
    */
   public function getListCacheTags();
 
+  /**
+   * The list cache tags associated with a specific bundle.
+   *
+   * Enables code listing entities of this type and bundle to ensure that newly created
+   * entities show up immediately.
+   *
+   * @return string[]
+   *   An array of the cache tags for this bundle.
+   */
+  public function getBundleListCacheTags(string $bundle): array;
+
   /**
    * Gets the key that is used to store configuration dependencies.
    *

core/tests/Drupal/Tests/Core/Entity/EntityTypeTest.php

@@ -487,4 +487,15 @@ public function testEntityClassImplements(): void {
     $this->assertFalse($entity_type->entityClassImplements(\DateTimeInterface::class));
   }
 
+  /**
+   * Tests the ::getBundleListCacheTags() method.
+   *
+   * @covers ::getBundleListCacheTags
+   */
+  public function testGetBundleListCacheTags(): void {
+    $entity_type = $this->setUpEntityType(['entity_keys' => ['id' => 'id']]);
+    $bundle = $this->randomMachineName();
+    $this->assertEquals([$entity_type->id() . '_list:' . $bundle], $entity_type->getBundleListCacheTags($bundle));
+  }
+
 }

core/tests/Drupal/Tests/Core/Entity/EntityUnitTest.php

@@ -102,6 +102,10 @@ protected function setUp(): void {
     $this->entityType->expects($this->any())
       ->method('getListCacheTags')
       ->willReturn([$this->entityTypeId . '_list']);
+    $this->entityType->expects($this->any())
+      ->method('getBundleListCacheTags')
+      ->with($this->entityTypeId)
+      ->willReturn([$this->entityTypeId . '_list:' . $this->entityTypeId]);
 
     $this->entityTypeManager = $this->createMock(EntityTypeManagerInterface::class);
     $this->entityTypeManager->expects($this->any())