Refactor package iteration by introducing forEachPackage helper in BmmSchemaCollection and updating writers for reuse.

Author: sebastian-iancu

src/BmmSchemaCollection.php

@@ -6,6 +6,7 @@
 
 use Cadasto\OpenEHR\BMM\Helper\Collection;
 use Cadasto\OpenEHR\BMM\Model\AbstractBmmClass;
+use Cadasto\OpenEHR\BMM\Model\BmmPackage;
 use Cadasto\OpenEHR\BMM\Model\BmmSchema;
 use OpenEHR\BmmPublisher\Helper\ResourcesDir;
 use Psr\Log\LoggerInterface;
@@ -63,6 +64,30 @@ public function load(string $filename): void
         $this->schemas->add($schema);
     }
 
+    /**
+     * Walk all packages (up to 3 levels deep) across all loaded schemas.
+     *
+     * @param callable(BmmPackage, BmmSchema, string): void $callback receives (package, schema, namePrefix)
+     */
+    public function forEachPackage(callable $callback): void
+    {
+        /** @var BmmSchema $schema */
+        foreach ($this->schemas as $schema) {
+            /** @var BmmPackage $package */
+            foreach ($schema->packages as $package) {
+                $callback($package, $schema, '');
+                /** @var BmmPackage $subPackage */
+                foreach ($package->packages as $subPackage) {
+                    $callback($subPackage, $schema, $package->name . '.');
+                    /** @var BmmPackage $subSubPackage */
+                    foreach ($subPackage->packages as $subSubPackage) {
+                        $callback($subSubPackage, $schema, $package->name . '.' . $subPackage->name . '.');
+                    }
+                }
+            }
+        }
+    }
+
     public function count(): int
     {
         return $this->schemas->count();

src/Writer/Asciidoc.php

@@ -43,23 +43,8 @@ public static function outputDir(): string
 
     public function __invoke(): void
     {
-        $logger = $this->schemas->logger;
         Filesystem::assureDir(self::outputDir());
-        /** @var BmmSchema $schema */
-        foreach ($this->schemas as $schema) {
-            /** @var BmmPackage $package */
-            foreach ($schema->packages as $package) {
-                $this->writePackage($package, $schema, '');
-                /** @var BmmPackage $subPackage */
-                foreach ($package->packages as $subPackage) {
-                    $this->writePackage($subPackage, $schema, $package->name . '.');
-                    /** @var BmmPackage $subSubPackage */
-                    foreach ($subPackage->packages as $subSubPackage) {
-                        $this->writePackage($subSubPackage, $schema, $package->name . '.' . $subPackage->name . '.');
-                    }
-                }
-            }
-        }
+        $this->schemas->forEachPackage($this->writePackage(...));
     }
 
     private function writePackage(BmmPackage $package, BmmSchema $schema, string $namePrefix): void

src/Writer/BmmJsonSplit.php

@@ -26,23 +26,8 @@ public static function outputDir(): string
 
     public function __invoke(): void
     {
-        $logger = $this->schemas->logger;
         Filesystem::assureDir(self::outputDir());
-        /** @var BmmSchema $schema */
-        foreach ($this->schemas as $schema) {
-            /** @var BmmPackage $package */
-            foreach ($schema->packages as $package) {
-                $this->writePackage($package, $schema, '');
-                /** @var BmmPackage $subPackage */
-                foreach ($package->packages as $subPackage) {
-                    $this->writePackage($subPackage, $schema, $package->name . '.');
-                    /** @var BmmPackage $subSubPackage */
-                    foreach ($subPackage->packages as $subSubPackage) {
-                        $this->writePackage($subSubPackage, $schema, $package->name . '.' . $subPackage->name . '.');
-                    }
-                }
-            }
-        }
+        $this->schemas->forEachPackage($this->writePackage(...));
     }
 
     private function writePackage(BmmPackage $package, BmmSchema $schema, string $namePrefix): void

src/Writer/PlantUml.php

@@ -30,23 +30,8 @@ public static function outputDir(): string
 
     public function __invoke(): void
     {
-        $logger = $this->schemas->logger;
         Filesystem::assureDir(self::outputDir());
-        /** @var BmmSchema $schema */
-        foreach ($this->schemas as $schema) {
-            /** @var BmmPackage $package */
-            foreach ($schema->packages as $package) {
-                $this->writePackage($package, $schema, '');
-                /** @var BmmPackage $subPackage */
-                foreach ($package->packages as $subPackage) {
-                    $this->writePackage($subPackage, $schema, $package->name . '.');
-                    /** @var BmmPackage $subSubPackage */
-                    foreach ($subPackage->packages as $subSubPackage) {
-                        $this->writePackage($subSubPackage, $schema, $package->name . '.' . $subPackage->name . '.');
-                    }
-                }
-            }
-        }
+        $this->schemas->forEachPackage($this->writePackage(...));
     }
 
     private function writePackage(BmmPackage $package, BmmSchema $schema, string $namePrefix): void