Attributes

composer.json

@@ -10,15 +10,17 @@
 		}
 	],
 	"require": {
-		"php": ">= 8.1",
+		"php": ">= 8.2",
 		"21torr/bundle-helpers": "^2.1.2",
 		"21torr/cli": "^1.0",
 		"psr/log": "^3.0",
+		"symfony/cache-contracts": "^3.3",
 		"symfony/console": "^6.1",
 		"symfony/http-client": "^6.1",
 		"symfony/lock": "^6.2",
+		"symfony/property-access": "^6.3",
 		"symfony/rate-limiter": "^6.2",
-		"symfony/string": "^6.2",
+		"symfony/string": "^6.3",
 		"symfony/validator": "^6.1"
 	},
 	"require-dev": {

config/services.yaml

@@ -19,6 +19,5 @@ services:
         $managementToken: !abstract set via config
         $contentToken: !abstract set via config
 
-
-    Torr\Storyblok\Manager\ComponentManager:
-        $components: !tagged_locator { tag: 'storyblok.component.definition', default_index_method: 'getKey' }
+    Torr\Storyblok\Cache\DebugCacheFactory:
+        $isDebug: '%kernel.debug%'

src/Api/ContentApi.php

@@ -16,8 +16,8 @@
 use Torr\Storyblok\Exception\Story\InvalidDataException;
 use Torr\Storyblok\Manager\ComponentManager;
 use Torr\Storyblok\Release\ReleaseVersion;
-use Torr\Storyblok\Story\Story;
-use Torr\Storyblok\Story\StoryFactory;
+use Torr\Storyblok\Story\StandaloneNestedStory;
+use Torr\Storyblok\Hydrator\StoryHydrator;
 
 final class ContentApi implements ResetInterface
 {
@@ -31,7 +31,7 @@ final class ContentApi implements ResetInterface
 	public function __construct (
 		HttpClientInterface $client,
 		private readonly StoryblokConfig $config,
-		private readonly StoryFactory $storyFactory,
+		private readonly StoryHydrator $storyFactory,
 		private readonly ComponentManager $componentManager,
 		private readonly LoggerInterface $logger,
 	)
@@ -54,7 +54,7 @@ public function __construct (
 	public function fetchSingleStory (
 		string|int $identifier,
 		ReleaseVersion $version = ReleaseVersion::PUBLISHED,
-	) : ?Story
+	) : ?StandaloneNestedStory
 	{
 		try
 		{
@@ -102,14 +102,14 @@ public function fetchSingleStory (
 	 * This method provides certain commonly used named parameters, but also supports passing arbitrary parameters
 	 * in the parameter. Passing named parameters will always overwrite parameters in $query.
 	 *
-	 * @template TStory of Story
+	 * @template TStory of StandaloneNestedStory
 	 *
 	 * @param class-string<TStory> $storyType
 	 *
-	 * @throws ContentRequestFailedException
-	 * @throws UnknownStoryTypeException
-	 *
 	 * @return array<TStory>
+	 *@throws UnknownStoryTypeException
+	 *
+	 * @throws ContentRequestFailedException
 	 */
 	public function fetchStories (
 		string $storyType,
@@ -154,9 +154,9 @@ public function fetchStories (
 	 *
 	 * @param string|string[]|null $slug
 	 *
-	 * @throws ContentRequestFailedException
+	 * @return array<StandaloneNestedStory>
+	 *@throws ContentRequestFailedException
 	 *
-	 * @return array<Story>
 	 */
 	public function fetchAllStories (
 		string|array|null $slug,

src/Api/Data/PaginatedApiResult.php

@@ -2,12 +2,12 @@
 
 namespace Torr\Storyblok\Api\Data;
 
-use Torr\Storyblok\Story\Story;
+use Torr\Storyblok\Story\StandaloneNestedStory;
 
 final class PaginatedApiResult
 {
 	/**
-	 * @param array<Story> $stories
+	 * @param array<StandaloneNestedStory> $stories
 	 */
 	public function __construct (
 		public readonly int $perPage,

src/Api/ManagementApi.php

@@ -12,7 +12,7 @@
 use Torr\Storyblok\Api\Data\ComponentIdMap;
 use Torr\Storyblok\Config\StoryblokConfig;
 use Torr\Storyblok\Exception\Api\ApiRequestFailedException;
-use Torr\Storyblok\Folder\FolderData;
+use Torr\Storyblok\Data\Folder\FolderData;
 
 final class ManagementApi
 {

src/Cache/DebugCache.php

@@ -0,0 +1,46 @@
+<?php declare(strict_types=1);
+
+namespace Torr\Storyblok\Cache;
+
+use Symfony\Contracts\Cache\CacheInterface;
+
+/**
+ * @template DataType of mixed
+ */
+final class DebugCache
+{
+	private bool $hasLocaleCache = false;
+	private mixed $localCache = null;
+	/** @var callable */
+	private mixed $itemGenerator;
+
+	public function __construct (
+		private readonly CacheInterface $cache,
+		private readonly string $cacheKey,
+		callable $itemGenerator,
+		private readonly bool $isDebug,
+	)
+	{
+		$this->itemGenerator = $itemGenerator;
+	}
+
+
+	/**
+	 * @return DataType
+	 */
+	public function get () : mixed
+	{
+		if ($this->isDebug)
+		{
+			if ($this->hasLocaleCache)
+			{
+				return $this->localCache;
+			}
+
+			$this->hasLocaleCache = true;
+			return $this->localCache = ($this->itemGenerator)();
+		}
+
+		return $this->cache->get($this->cacheKey, $this->itemGenerator);
+	}
+}

src/Cache/DebugCacheFactory.php

@@ -0,0 +1,32 @@
+<?php declare(strict_types=1);
+
+namespace Torr\Storyblok\Cache;
+
+use Symfony\Contracts\Cache\CacheInterface;
+
+final readonly class DebugCacheFactory
+{
+	/**
+	 */
+	public function __construct (
+		private CacheInterface $cache,
+		private bool $isDebug,
+	) {}
+
+
+	/**
+	 * Creates a new debug cache
+	 */
+	public function createCache (
+		string $cacheKey,
+		callable $itemGenerator,
+	) : DebugCache
+	{
+		return new DebugCache(
+			$this->cache,
+			$cacheKey,
+			$itemGenerator,
+			$this->isDebug,
+		);
+	}
+}

src/Command/DebugCommand.php

@@ -0,0 +1,67 @@
+<?php declare(strict_types=1);
+
+namespace Torr\Storyblok\Command;
+
+use Symfony\Component\Console\Attribute\AsCommand;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Torr\Cli\Console\Style\TorrStyle;
+use Torr\Storyblok\Api\ContentApi;
+use Torr\Storyblok\Manager\ComponentManager;
+use Torr\Storyblok\Release\ReleaseVersion;
+
+#[AsCommand("storyblok:debug")]
+final class DebugCommand extends Command
+{
+	/**
+	 * @inheritDoc
+	 */
+	public function __construct (
+		private readonly ComponentManager $componentManager,
+		private readonly ContentApi $contentApi,
+	)
+	{
+		parent::__construct();
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	protected function configure ()
+	{
+		$this
+			->addOption("fetch")
+			->addOption("sync");
+	}
+
+
+	/**
+	 * @inheritDoc
+	 */
+	protected function execute (InputInterface $input, OutputInterface $output) : int
+	{
+		$io = new TorrStyle($input, $output);
+		$io->title("Storyblok: Debug");
+
+		if ($input->getOption("fetch"))
+		{
+			$stories = $this->contentApi->fetchAllStories(null, version: ReleaseVersion::DRAFT);
+			dd($stories);
+		}
+
+		$definitions = $this->componentManager->getDefinitions();
+		dump($definitions);
+
+		if ($input->getOption("sync"))
+		{
+			foreach ($definitions->getComponents() as $component)
+			{
+				$io->section($component->definition->name);
+				dump($component->generateManagementApiData());
+			}
+		}
+
+		return self::SUCCESS;
+	}
+}