[TASK] Implement ContentBlocks cache

The whole ContentBlockDefinitionCollection object is now
cached.

Classes/Builder/ContentBlockBuilder.php

@@ -80,7 +80,7 @@ public function create(LoadedContentBlock $contentBlock): void
     protected function initializeRegistries(LoadedContentBlock $contentBlock): void
     {
         $this->contentBlockRegistry->register($contentBlock);
-        $tableDefinitionCollection = $this->tableDefinitionCollectionFactory->createUncached();
+        $tableDefinitionCollection = $this->tableDefinitionCollectionFactory->createUncached($this->contentBlockRegistry);
         $automaticLanguageKeysRegistry = $tableDefinitionCollection->getAutomaticLanguageKeysRegistry();
         $this->languageFileGenerator->setAutomaticLanguageKeysRegistry($automaticLanguageKeysRegistry);
     }

Classes/Definition/Factory/CompilationResult.php

@@ -0,0 +1,47 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the TYPO3 CMS project.
+ *
+ * It is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, either version 2
+ * of the License, or any later version.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ *
+ * The TYPO3 project - inspiring people to share!
+ */
+
+namespace TYPO3\CMS\ContentBlocks\Definition\Factory;
+
+use TYPO3\CMS\ContentBlocks\Registry\AutomaticLanguageKeysRegistry;
+
+final class CompilationResult
+{
+    public function __construct(
+        private readonly AutomaticLanguageKeysRegistry $automaticLanguageKeys,
+        /**
+         * @var array<string, array>
+         */
+        private readonly array $parentReferences,
+        private readonly array $mergedTableDefinitions,
+    ) {}
+
+    public function getAutomaticLanguageKeys(): AutomaticLanguageKeysRegistry
+    {
+        return $this->automaticLanguageKeys;
+    }
+
+    public function getParentReferences(): array
+    {
+        return $this->parentReferences;
+    }
+
+    public function getMergedTableDefinitions(): array
+    {
+        return $this->mergedTableDefinitions;
+    }
+}

Classes/Definition/Factory/InitializeContentBlockCache.php

@@ -0,0 +1,34 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the TYPO3 CMS project.
+ *
+ * It is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, either version 2
+ * of the License, or any later version.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ *
+ * The TYPO3 project - inspiring people to share!
+ */
+
+namespace TYPO3\CMS\ContentBlocks\Definition\Factory;
+
+/**
+ * The Content Blocks cache is lazy and needs to be initialized
+ * as soon as bootstrapping is complete.
+ */
+class InitializeContentBlockCache
+{
+    public function __construct(
+        protected readonly TableDefinitionCollectionFactory $tableDefinitionCollectionFactory
+    ) {}
+
+    public function __invoke(): void
+    {
+        $this->tableDefinitionCollectionFactory->initializeCache();
+    }
+}

Classes/Generator/SqlGenerator.php

@@ -28,7 +28,8 @@
 class SqlGenerator
 {
     public function __construct(
-        protected readonly ContentBlockLoader $contentBlockLoader
+        protected readonly ContentBlockLoader $contentBlockLoader,
+        protected readonly TableDefinitionCollectionFactory $tableDefinitionCollectionFactory,
     ) {}
 
     public function __invoke(AlterTableDefinitionStatementsEvent $event): void
@@ -41,8 +42,7 @@ public function __invoke(AlterTableDefinitionStatementsEvent $event): void
     public function generate(): array
     {
         $contentBlockRegistry = $this->contentBlockLoader->loadUncached();
-        $tableDefinitionFactory = new TableDefinitionCollectionFactory($contentBlockRegistry);
-        $tableDefinitionCollection = $tableDefinitionFactory->create();
+        $tableDefinitionCollection = $this->tableDefinitionCollectionFactory->createUncached($contentBlockRegistry);
         $sql = [];
         foreach ($tableDefinitionCollection as $tableDefinition) {
             foreach ($tableDefinition->getSqlColumnDefinitionCollection() as $column) {

Classes/ServiceProvider.php

@@ -22,7 +22,7 @@
 use TYPO3\CMS\ContentBlocks\Definition\ContentType\ContentElementDefinition;
 use TYPO3\CMS\ContentBlocks\Definition\ContentType\ContentType;
 use TYPO3\CMS\ContentBlocks\Definition\ContentType\PageTypeDefinition;
-use TYPO3\CMS\ContentBlocks\Definition\Factory\TableDefinitionCollectionFactory;
+use TYPO3\CMS\ContentBlocks\Definition\TableDefinitionCollection;
 use TYPO3\CMS\ContentBlocks\Generator\PageTsConfigGenerator;
 use TYPO3\CMS\ContentBlocks\Generator\TypoScriptGenerator;
 use TYPO3\CMS\ContentBlocks\Generator\UserTsConfigGenerator;
@@ -142,8 +142,7 @@ public static function getContentWhere(ContainerInterface $container): ContentWh
     public static function getContentBlockIcons(ContainerInterface $container): \ArrayObject
     {
         $arrayObject = new \ArrayObject();
-        $tableDefinitionCollectionFactory = $container->get(TableDefinitionCollectionFactory::class);
-        $tableDefinitionCollection = $tableDefinitionCollectionFactory->create();
+        $tableDefinitionCollection = $container->get(TableDefinitionCollection::class);
         foreach ($tableDefinitionCollection as $tableDefinition) {
             foreach ($tableDefinition->getContentTypeDefinitionCollection() ?? [] as $typeDefinition) {
                 $iconConfig = [
@@ -161,8 +160,7 @@ public static function getContentBlockIcons(ContainerInterface $container): \Arr
     public static function getContentBlockPageTypes(ContainerInterface $container): \ArrayObject
     {
         $arrayObject = new \ArrayObject();
-        $tableDefinitionCollectionFactory = $container->get(TableDefinitionCollectionFactory::class);
-        $tableDefinitionCollection = $tableDefinitionCollectionFactory->create();
+        $tableDefinitionCollection = $container->get(TableDefinitionCollection::class);
         if (!$tableDefinitionCollection->hasTable(ContentType::PAGE_TYPE->getTable())) {
             return $arrayObject;
         }
@@ -183,9 +181,8 @@ public static function getContentBlockTypoScript(ContainerInterface $container):
             return $arrayObject;
         }
 
-        $tableDefinitionCollectionFactory = $container->get(TableDefinitionCollectionFactory::class);
         $contentBlockRegistry = $container->get(ContentBlockRegistry::class);
-        $tableDefinitionCollection = $tableDefinitionCollectionFactory->create();
+        $tableDefinitionCollection = $container->get(TableDefinitionCollection::class);
         foreach ($tableDefinitionCollection as $tableDefinition) {
             foreach ($tableDefinition->getContentTypeDefinitionCollection() ?? [] as $typeDefinition) {
                 if ($tableDefinition->getContentType() === ContentType::CONTENT_ELEMENT) {
@@ -225,8 +222,7 @@ public static function getContentBlockUserTsConfig(ContainerInterface $container
             return $arrayObject;
         }
 
-        $tableDefinitionCollectionFactory = $container->get(TableDefinitionCollectionFactory::class);
-        $tableDefinitionCollection = $tableDefinitionCollectionFactory->create();
+        $tableDefinitionCollection = $container->get(TableDefinitionCollection::class);
         foreach ($tableDefinitionCollection as $tableDefinition) {
             foreach ($tableDefinition->getContentTypeDefinitionCollection() ?? [] as $typeDefinition) {
                 if ($typeDefinition instanceof PageTypeDefinition) {
@@ -251,8 +247,7 @@ public static function getContentBlockPageTsConfig(ContainerInterface $container
         }
 
         $languageFileRegistry = $container->get(LanguageFileRegistry::class);
-        $tableDefinitionCollectionFactory = $container->get(TableDefinitionCollectionFactory::class);
-        $tableDefinitionCollection = $tableDefinitionCollectionFactory->create();
+        $tableDefinitionCollection = $container->get(TableDefinitionCollection::class);
         foreach ($tableDefinitionCollection as $tableDefinition) {
             foreach ($tableDefinition->getContentTypeDefinitionCollection() ?? [] as $typeDefinition) {
                 if ($typeDefinition instanceof ContentElementDefinition) {
@@ -307,9 +302,7 @@ public static function getContentBlockParentFieldNames(ContainerInterface $conta
             return $arrayObject;
         }
 
-        $tableDefinitionCollectionFactory = $container->get(TableDefinitionCollectionFactory::class);
-        $tableDefinitionCollection = $tableDefinitionCollectionFactory->create();
-
+        $tableDefinitionCollection = $container->get(TableDefinitionCollection::class);
         $contentElementTable = ContentType::CONTENT_ELEMENT->getTable();
         if ($tableDefinitionCollection->hasTable($contentElementTable)) {
             $fieldNames = [];

Configuration/Services.yaml

@@ -11,6 +11,12 @@ services:
     resource: '../Classes/UserFunction/*'
     public: true
 
+  TYPO3\CMS\ContentBlocks\Definition\Factory\InitializeContentBlockCache:
+    tags:
+      - name: event.listener
+        identifier: 'content-blocks-initialize-cache'
+        event: TYPO3\CMS\Core\Core\Event\BootCompletedEvent
+
 # @todo change to BeforeTcaOverridesEvent for v13
   TYPO3\CMS\ContentBlocks\Generator\TcaGenerator:
     public: true
@@ -25,6 +31,7 @@ services:
       - name: event.listener
         identifier: 'content-blocks-typoscript'
         event: TYPO3\CMS\Core\Core\Event\BootCompletedEvent
+        after: 'content-blocks-initialize-cache'
 
 #  @todo Use BeforeLoadedPageTsConfigEvent in v13
   TYPO3\CMS\ContentBlocks\Generator\PageTsConfigGenerator:
@@ -41,6 +48,7 @@ services:
       - name: event.listener
         identifier: 'content-blocks-user-tsconfig'
         event: TYPO3\CMS\Core\Core\Event\BootCompletedEvent
+        after: 'content-blocks-initialize-cache'
 
   TYPO3\CMS\ContentBlocks\Generator\SqlGenerator:
     public: true
@@ -77,10 +85,22 @@ services:
     arguments:
       $cache: '@cache.core'
 
+  cache.content_blocks:
+    class: TYPO3\CMS\Core\Cache\Frontend\FrontendInterface
+    factory: ['@TYPO3\CMS\Core\Cache\CacheManager', 'getCache']
+    arguments: ['content_blocks']
+    lazy: true
+
+  TYPO3\CMS\ContentBlocks\Definition\Factory\TableDefinitionCollectionFactory:
+    arguments:
+      $cache: '@cache.content_blocks'
+
   TYPO3\CMS\ContentBlocks\Definition\TableDefinitionCollection:
+    public: true
     factory:
       - '@TYPO3\CMS\ContentBlocks\Definition\Factory\TableDefinitionCollectionFactory'
       - 'create'
+    arguments: ['@TYPO3\CMS\ContentBlocks\Registry\ContentBlockRegistry']
 
   TYPO3\CMS\ContentBlocks\Registry\ContentBlockRegistry:
     public: true