chore: add specification parameter to composed command, allow generator array

Author: vardumper

bin/ext-html

@@ -39,8 +39,8 @@ $app->command('generate:all [generator] [dest] [--overwrite-existing=] [--specif
     (new BatchGeneratorCommand())($generator, $dest, $input, $output, (bool) $overwriteExisting, $specification);
 })->descriptions('Generates templates. Uses a given generator. Requires a Generator Name (eg. html, twig) and a destination path for the generated templates. You can also provide a list of generators separated by comma.', ['generator' => 'name of the generator(s)', 'dest' => 'destination path']);
 
-$app->command('generate:composed [generator] [dest] [--overwrite-existing=]', function ($generator, $dest, InputInterface $input, OutputInterface $output, $overwriteExisting = false) {
-    return (new GenerateComposedCommand())($generator, $dest, $input, $output, (bool) $overwriteExisting);
+$app->command('generate:composed [generator] [dest] [--overwrite-existing=] [--specification=]', function ($generator, $dest, InputInterface $input, OutputInterface $output, $overwriteExisting = false, $specification = null) {
+    return (new GenerateComposedCommand())($generator, $dest, $input, $output, (bool) $overwriteExisting, $specification);
 })->descriptions('Generates composed component templates showing valid parent-child relationships based on content model metadata', ['generator' => 'name of the generator (nextjs, storybook, twig)', 'dest' => 'destination path']);
 
 $app->command('merge:specs [import] [dest]', function ($import, $dest, InputInterface $input, OutputInterface $output) {

clover.xml

@@ -25,6 +25,7 @@ php vendor/bin/ext-html make:classes a # only generates the Html\Element\Anchor
 php vendor/bin/ext-html make:classes # generates all classes, no enums
 php vendor/bin/ext-html make:all # generates both enums and classes
 php vendor/bin/ext-html generate:all twig,storybook templates # generates all twig templates and storybook stories, and saved them into templates folder
+php vendor/bin/ext-html generate:composed twig,storybook templates # generates composed templates based on content model (eg <table> with <tr>, <td>, etc), and saves them into templates folder
 php vendor/bin/ext-html merge:specs custom/schema.yaml destination/path.yaml # merges a custom regex or element-based specification into the html5.yaml file
 php vendor/bin/ext-html watch source/path dest/path # component builder. watches for component yaml changes, and generates templates on the fly
 ```

docs/code-generation.md

@@ -27,7 +27,7 @@ class BatchGeneratorCommand extends Command
     use ClassResolverTrait;
     use GeneratorResolverTrait;
 
-    private const HTML_DEFINITION_PATH = __DIR__ . '/../Resources/specifications/html5.yaml';
+    private const HTML_DEFINITION_PATH = __DIR__ . '/../Resources/specifications/html5-with-aria.yaml';
 
     private ?array $data = null;
     private SymfonyStyle $io;

src/Command/BatchGeneratorCommand.php

@@ -12,13 +12,15 @@
 use Html\TemplateGenerator\StorybookJSGenerator;
 use Html\TemplateGenerator\TwigGenerator;
 use Html\Trait\ClassResolverTrait;
+use Html\Trait\GeneratorResolverTrait;
 use ReflectionClass;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
+use Symfony\Component\Yaml\Yaml;
 
 /**
  * Generate composed component templates showing valid parent-child relationships
@@ -30,13 +32,19 @@
 class GenerateComposedCommand extends Command
 {
     use ClassResolverTrait;
+    use GeneratorResolverTrait;
+
+    private const HTML_DEFINITION_PATH = __DIR__ . '/../Resources/specifications/html5-with-aria.yaml';
+
+    private ?array $data = null;
 
     public function __invoke(
         string $generator,
         string $dest,
         InputInterface $input,
         OutputInterface $output,
-        bool $overwriteExisting = false
+        bool $overwriteExisting = false,
+        ?string $specification = null
     ): int {
         $io = new SymfonyStyle($input, $output);
 
@@ -45,74 +53,88 @@ public function __invoke(
             return Command::FAILURE;
         }
 
-        // Instantiate the appropriate generator
-        $generatorInstance = match ($generator) {
-            'nextjs' => new NextJSGenerator(),
-            'storybook' => new StorybookJSGenerator(),
-            'twig' => new TwigGenerator(),
-            default => null,
-        };
-
-        if ($generatorInstance === null) {
-            $io->error("Unsupported generator '{$generator}'. Supported generators: nextjs, storybook, twig");
-            return Command::FAILURE;
+        if (! \str_contains($generator, ',')) {
+            $generators = [$generator];
+        } else {
+            $generators = \explode(',', $generator);
         }
 
-        // Check if generator supports composed element rendering
-        if (!method_exists($generatorInstance, 'renderComposedElement')) {
-            $io->error("Generator '{$generator}' does not support composed element rendering.");
+        $specificationPath = $input->getOption('specification');
+        if (! $this->loadHtmlDefinitions($specificationPath)) {
             return Command::FAILURE;
         }
-
-        $baseClasses = [InlineElement::class, BlockElement::class, VoidElement::class];
-        $elements = [];
-        foreach ($baseClasses as $baseClass) {
-            $elements = array_merge($elements, $this->getClassesExtendingClass($baseClass));
-        }
-
-        $dom = HTMLDocumentDelegator::createEmpty();
-        $generatedCount = 0;
-        $skippedCount = 0;
-
-        // Create content directory
-        $contentDir = rtrim($dest, \DIRECTORY_SEPARATOR) . \DIRECTORY_SEPARATOR . $generator . \DIRECTORY_SEPARATOR . 'composed';
-        if (! is_dir($contentDir)) {
-            mkdir($contentDir, 0755, true);
-        }
-
-        foreach ($elements as $className) {
-            /** @var class-string<\Html\Interface\HTMLElementInterface> $className */
-            $elementInstance = $className::create($dom);
-
-            // Check if element has SPECIFIC child requirements (not empty $parentOf)
-            // Skip elements that can contain any content
-            $ref = new ReflectionClass($className);
-            $parentOf = $ref->getStaticPropertyValue('parentOf', []);
-
-            if (empty($parentOf)) {
-                $skippedCount++;
-                continue;
+        // // Instantiate the appropriate generator
+        // $generatorInstance = match ($generator) {
+        //     'nextjs' => new NextJSGenerator(),
+        //     'storybook' => new StorybookJSGenerator(),
+        //     'twig' => new TwigGenerator(),
+        //     default => null,
+        // };
+
+        // if ($generatorInstance === null) {
+        //     $io->error("Unsupported generator '{$generator}'. Supported generators: nextjs, storybook, twig");
+        //     return Command::FAILURE;
+        // }
+
+        $templateGenerators = $this->getGenerators($generators);
+        foreach ($templateGenerators as $name => $generatorInstance) {
+
+            // Check if generator supports composed element rendering
+            if (!method_exists($generatorInstance, 'renderComposedElement')) {
+                $io->error("Generator '{$generator}' does not support composed element rendering.");
+                return Command::FAILURE;
             }
 
-            $output = $generatorInstance->renderComposedElement($elementInstance);
-            if ($output === null) {
-                $skippedCount++;
-                continue;
+            $baseClasses = [InlineElement::class, BlockElement::class, VoidElement::class];
+            $elements = [];
+            foreach ($baseClasses as $baseClass) {
+                $elements = array_merge($elements, $this->getClassesExtendingClass($baseClass));
             }
 
-            $elementShortName = $ref->getShortName();
-            $fileName = $elementInstance::QUALIFIED_NAME . '.composed.' . $generatorInstance->getExtension();
-            $outFile = $contentDir . \DIRECTORY_SEPARATOR . $fileName;
+            $dom = HTMLDocumentDelegator::createEmpty();
+            $generatedCount = 0;
+            $skippedCount = 0;
 
-            if (file_exists($outFile) && ! $overwriteExisting) {
-                $io->warning("File '{$outFile}' already exists. Skipping.");
-                $skippedCount++;
-                continue;
+            // Create content directory
+            $contentDir = rtrim($dest, \DIRECTORY_SEPARATOR) . \DIRECTORY_SEPARATOR . $generator . \DIRECTORY_SEPARATOR . 'composed';
+            if (! is_dir($contentDir)) {
+                mkdir($contentDir, 0755, true);
             }
 
-            file_put_contents($outFile, $output);
-            $io->success("Generated: {$outFile}");
-            $generatedCount++;
+            foreach ($elements as $className) {
+                /** @var class-string<\Html\Interface\HTMLElementInterface> $className */
+                $elementInstance = $className::create($dom);
+
+                // Check if element has SPECIFIC child requirements (not empty $parentOf)
+                // Skip elements that can contain any content
+                $ref = new ReflectionClass($className);
+                $parentOf = $ref->getStaticPropertyValue('parentOf', []);
+
+                if (empty($parentOf)) {
+                    $skippedCount++;
+                    continue;
+                }
+
+                $output = $generatorInstance->renderComposedElement($elementInstance);
+                if ($output === null) {
+                    $skippedCount++;
+                    continue;
+                }
+
+                $elementShortName = $ref->getShortName();
+                $fileName = $elementInstance::QUALIFIED_NAME . '.composed.' . $generatorInstance->getExtension();
+                $outFile = $contentDir . \DIRECTORY_SEPARATOR . $fileName;
+
+                if (file_exists($outFile) && ! $overwriteExisting) {
+                    $io->warning("File '{$outFile}' already exists. Skipping.");
+                    $skippedCount++;
+                    continue;
+                }
+
+                file_put_contents($outFile, $output);
+                $io->success("Generated: {$outFile}");
+                $generatedCount++;
+            }
         }
 
         $io->success("Generated {$generatedCount} composed templates (specific composition patterns only). Skipped {$skippedCount} elements.");
@@ -142,4 +164,24 @@ public function configure(): void
                 false
             );
     }
+
+    private function loadHtmlDefinitions(?string $specificationPath): bool
+    {
+        if ($specificationPath !== null) {
+            if (! is_file($specificationPath)) {
+                $this->io->error('Specification file not found at ' . $specificationPath);
+                return false;
+            }
+            $this->data = Yaml::parseFile($specificationPath);
+            return true;
+        }
+
+        if (! is_file(self::HTML_DEFINITION_PATH)) {
+            $this->io->error('HTML definition file not found.');
+            return false;
+        }
+
+        $this->data = Yaml::parseFile(self::HTML_DEFINITION_PATH);
+        return true;
+    }
 }

src/Command/GenerateComposedCommand.php

@@ -1,19 +1,49 @@
 <?php
-
 /**
  * This file is auto-generated. Do not edit manually.
  *
  * Article - The article element represents a self-contained composition in a document, page, application, or site, which is intended to be independently distributable or reusable.
- *
- * @generated 2025-11-02 22:39:29
+ * 
+ * @generated 2025-11-05 11:58:47
+ * @category HTML
+ * @package vardumper/extended-htmldocument
  * @subpackage Html\Element\Block
  * @link https://vardumper.github.io/extended-htmldocument/
  * @see https://developer.mozilla.org/en-US/docs/Web/HTML/Element/article
  */
-
 namespace Html\Element\Block;
 
 use Html\Element\BlockElement;
+use Html\Element\Block\Aside;
+use Html\Element\Block\Audio;
+use Html\Element\Block\Blockquote;
+use Html\Element\Block\Body;
+use Html\Element\Block\DefinitionList;
+use Html\Element\Block\DeletedText;
+use Html\Element\Block\Division;
+use Html\Element\Block\Embed;
+use Html\Element\Block\Figure;
+use Html\Element\Block\Form;
+use Html\Element\Block\Heading1;
+use Html\Element\Block\Heading2;
+use Html\Element\Block\Heading3;
+use Html\Element\Block\Heading4;
+use Html\Element\Block\Heading5;
+use Html\Element\Block\Heading6;
+use Html\Element\Block\InlineFrame;
+use Html\Element\Block\InsertedText;
+use Html\Element\Block\Main;
+use Html\Element\Block\Map;
+use Html\Element\Block\Navigation;
+use Html\Element\Block\ObjectElement;
+use Html\Element\Block\OrderedList;
+use Html\Element\Block\Paragraph;
+use Html\Element\Block\Picture;
+use Html\Element\Block\PreformattedText;
+use Html\Element\Block\Section;
+use Html\Element\Block\Table;
+use Html\Element\Block\UnorderedList;
+use Html\Element\Block\Video;
 use Html\Element\Inline\Abbreviation;
 use Html\Element\Inline\Anchor;
 use Html\Element\Inline\BidirectionalIsolation;
@@ -45,9 +75,8 @@
 use Html\Element\Void\WordBreakOpportunity;
 use Html\Enum\AriaBusyEnum;
 use Html\Enum\RoleEnum;
-use Html\Mapping\Element;
 use Html\Trait\GlobalAttribute;
-use InvalidArgumentException;
+use Html\Mapping\Element;
 
 #[Element('article')]
 class Article extends BlockElement
@@ -70,7 +99,6 @@ class Article extends BlockElement
     use GlobalAttribute\TitleTrait;
     use GlobalAttribute\TranslateTrait;
     use GlobalAttribute\PopoverTrait;
-
     /**
      * The HTML element name
      */
@@ -96,7 +124,7 @@ class Article extends BlockElement
      * @var array<string>
      */
     public static array $childOf = [
-        self::class,
+        Article::class,
         Aside::class,
         Blockquote::class,
         Body::class,
@@ -115,7 +143,7 @@ class Article extends BlockElement
         Anchor::class,
         Abbreviation::class,
         Area::class,
-        self::class,
+        Article::class,
         Audio::class,
         Bold::class,
         BidirectionalIsolation::class,
@@ -168,36 +196,31 @@ class Article extends BlockElement
         WordBreakOpportunity::class,
     ];
 
-    /**
-     * Defines the semantic purpose of an element for assistive technologies.
-     */
+
+    /** Defines the semantic purpose of an element for assistive technologies. */
     public ?RoleEnum $role = null;
 
-    /**
-     * Identifies the element(s) whose contents or presence are controlled by this element. Value is a list of IDs separated by a space
-     */
+    /** Identifies the element(s) whose contents or presence are controlled by this element. Value is a list of IDs separated by a space */
     public ?string $ariaControls = null;
 
-    /**
-     * Identifies the element(s) that describes the object. Value is a list of IDs separated by a space
-     */
+    /** Identifies the element(s) that describes the object. Value is a list of IDs separated by a space */
     public ?string $ariaDescribedby = null;
 
-    /**
-     * Identifies the element(s) that labels the current element. Value is a list of IDs separated by a space
-     */
+    /** Identifies the element(s) that labels the current element. Value is a list of IDs separated by a space */
     public ?string $ariaLabelledby = null;
 
-    /**
+    /** 
      * The aria-busy attribute is used to indicate whether an element is currently busy or not.
+     * @category HTML attribute
      * @example false
      */
     public ?AriaBusyEnum $ariaBusy = null;
 
+
     public function setRole(string|RoleEnum $role): static
     {
         if (is_string($role)) {
-            $role = RoleEnum::tryFrom($role) ?? throw new InvalidArgumentException('Invalid value for $role.');
+            $role = RoleEnum::tryFrom($role) ?? throw new \InvalidArgumentException("Invalid value for \$role.");
         }
         $this->role = $role;
         $this->delegated->setAttribute('role', (string) $role->value);
@@ -249,9 +272,7 @@ public function getAriaLabelledby(): ?string
     public function setAriaBusy(string|AriaBusyEnum $ariaBusy): static
     {
         if (is_string($ariaBusy)) {
-            $ariaBusy = AriaBusyEnum::tryFrom($ariaBusy) ?? throw new InvalidArgumentException(
-                'Invalid value for $ariaBusy.'
-            );
+            $ariaBusy = AriaBusyEnum::tryFrom($ariaBusy) ?? throw new \InvalidArgumentException("Invalid value for \$ariaBusy.");
         }
         $this->ariaBusy = $ariaBusy;
         $this->delegated->setAttribute('aria-busy', (string) $ariaBusy->value);
@@ -263,4 +284,6 @@ public function getAriaBusy(): ?AriaBusyEnum
     {
         return $this->ariaBusy;
     }
+
+
 }