Make generators lazy

yiisoft · Oct 8, 2023 · 780a5f4 · 780a5f4
1 parent 83d964f
commit 780a5f4
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 11 deletions.
diff --git a/config/di.php b/config/di.php
@@ -20,10 +20,10 @@
         foreach ($generators as $generator) {
             $class = $generator['class'];
             /**
-             * @var $generator GeneratorInterface
+             * @var $loader Closure(): GeneratorInterface
              */
-            $generator = $injector->make($class, $generator['parameters'] ?? []);
-            $generatorsInstances[] = $generator;
+            $loader = fn() => $injector->make($class, $generator['parameters'] ?? []);
+            $generatorsInstances[$class] = $loader;
         }
         return new Gii($generatorsInstances);
     },

diff --git a/src/Gii.php b/src/Gii.php
@@ -4,19 +4,19 @@
 
 namespace Yiisoft\Yii\Gii;
 
+use Closure;
 use Yiisoft\Yii\Gii\Exception\GeneratorNotFoundException;
 
+/**
+ * @psalm-import-type LazyGenerator from GiiInterface
+ */
 final class Gii implements GiiInterface
 {
     /**
-     * @param array<string, GeneratorInterface> $generators
+     * @param array<string, LazyGenerator|GeneratorInterface> $generators
      */
     public function __construct(private array $generators)
     {
-        $this->generators = array_combine(
-            array_map(fn (GeneratorInterface $generator) => $generator::getId(), $generators),
-            array_values($this->generators)
-        );
     }
 
     public function addGenerator(GeneratorInterface $generator): void
@@ -30,11 +30,14 @@ public function getGenerator(string $id): GeneratorInterface
             throw new GeneratorNotFoundException('Generator "' . $id . '" not found');
         }
 
-        return $this->generators[$id];
+        return $this->generators[$id] instanceof Closure ? $this->generators[$id]() : $this->generators[$id];
     }
 
     public function getGenerators(): array
     {
-        return $this->generators;
+        return array_map(
+            fn (Closure|GeneratorInterface $generator) => $generator instanceof Closure ? $generator() : $generator,
+            $this->generators
+        );
     }
 }
diff --git a/src/GiiInterface.php b/src/GiiInterface.php
@@ -4,12 +4,16 @@
 
 namespace Yiisoft\Yii\Gii;
 
+use Closure;
 use Yiisoft\Yii\Gii\Exception\GeneratorNotFoundException;
 
+/**
+ * @psalm-type LazyGenerator = Closure(): GeneratorInterface
+ */
 interface GiiInterface
 {
     /**
-     * @param GeneratorInterface $generator
+     * @psalm-param GeneratorInterface $generator
      */
     public function addGenerator(GeneratorInterface $generator): void;