Merge pull request #154 from Chi-teck/sort-tag

[3.x] Add sort_namespaces filter and update sort tag
Chi-teck · May 17, 2024 · 7add204 · 7add204
2 parents 74c2dc6 + 09c4b1f
commit 7add204
Show file tree

Hide file tree

Showing 50 changed files with 156 additions and 102 deletions.
diff --git a/src/Twig/TwigEnvironment.php b/src/Twig/TwigEnvironment.php
@@ -26,13 +26,8 @@ public function __construct(FilesystemLoader $loader, array $options = []) {
 
     $this->addFilter(new TwigFilter('pluralize', [Utils::class, 'pluralize']));
     $this->addFilter(new TwigFilter('camelize', [Utils::class, 'camelize']));
-
-    $article = static function (string $input): string {
-      $first_char = \strtolower($input[0]);
-      $article = \in_array($first_char, ['a', 'e', 'i', 'o', 'u']) ? 'an' : 'a';
-      return $article . ' ' . $input;
-    };
-    $this->addFilter(new TwigFilter('article', $article));
+    $this->addFilter(new TwigFilter('sort_namespaces', [self::class, 'sortNamespaces']));
+    $this->addFilter(new TwigFilter('article', [self::class, 'article']));
 
     $u2h = static fn (string $input): string => \str_replace('_', '-', $input);
     $this->addFilter(new TwigFilter('u2h', $u2h));
@@ -64,4 +59,23 @@ public function tokenize(Source $source): TokenStream {
     return parent::tokenize($source);
   }
 
+  /**
+   * {@selfdoc}
+   */
+  public static function sortNamespaces(string $input): string {
+    $lines = \explode(\PHP_EOL, $input);
+    $lines = \array_unique($lines);
+    \sort($lines, \SORT_FLAG_CASE | \SORT_NATURAL);
+    return \trim(\implode(\PHP_EOL, $lines)) . \PHP_EOL;
+  }
+
+  /**
+   * {@selfdoc}
+   */
+  public static function article(string $input): string {
+    $first_char = \strtolower($input[0]);
+    $article = \in_array($first_char, ['a', 'e', 'i', 'o', 'u']) ? 'an' : 'a';
+    return $article . ' ' . $input;
+  }
+
 }
diff --git a/src/Twig/TwigSortSetNode.php b/src/Twig/TwigSortSetNode.php
@@ -4,12 +4,14 @@
 
 namespace DrupalCodeGenerator\Twig;
 
+use Twig\Attribute\YieldReady;
 use Twig\Compiler;
 use Twig\Node\Node;
 
 /**
  * A class that defines the compiler for 'sort' token.
  */
+#[YieldReady]
 final class TwigSortSetNode extends Node {
 
   /**
@@ -18,12 +20,13 @@ final class TwigSortSetNode extends Node {
   public function compile(Compiler $compiler): void {
     $compiler
       ->addDebugInfo($this)
-      ->write("ob_start();\n")
-      ->subcompile($this->getNode('body'))
-      ->write('$data = explode("\n", ob_get_clean());' . "\n")
+      ->write('$data = ')
+      ->subcompile($this->getNode('ref'))
+      ->raw(";\n")
+      ->write('$data = explode("\n", $data);' . "\n")
       ->write('$data = array_unique($data);' . "\n")
       ->write('sort($data, SORT_FLAG_CASE|SORT_NATURAL);' . "\n")
-      ->write('echo ltrim(implode("\n", $data)) . "\n";' . "\n");
+      ->write('yield ltrim(implode("\n", $data)) . "\n";' . "\n");
   }
 
 }
diff --git a/src/Twig/TwigSortTokenParser.php b/src/Twig/TwigSortTokenParser.php
@@ -4,6 +4,9 @@
 
 namespace DrupalCodeGenerator\Twig;
 
+use Twig\Node\Expression\TempNameExpression;
+use Twig\Node\Node;
+use Twig\Node\SetNode;
 use Twig\Token;
 use Twig\TokenParser\AbstractTokenParser;
 
@@ -15,16 +18,25 @@ final class TwigSortTokenParser extends AbstractTokenParser {
   /**
    * {@inheritdoc}
    */
-  public function parse(Token $token): TwigSortSetNode {
-
+  public function parse(Token $token): Node {
+    \trigger_error('The sort tag is deprecated in 3.6.0 and will be removed in 4.x, use the sort_namespaces twig filter.', \E_USER_WARNING);
     $this->parser->getStream()->expect(Token::BLOCK_END_TYPE);
     $body = $this->parser->subparse(
       static fn (Token $token): bool => $token->test('endsort'),
       TRUE,
     );
     $this->parser->getStream()->expect(Token::BLOCK_END_TYPE);
 
-    return new TwigSortSetNode(['body' => $body], [], $token->getLine(), $this->getTag());
+    $lineno = $token->getLine();
+    $name = $this->parser->getVarName();
+
+    $ref = new TempNameExpression($name, $lineno);
+    $ref->setAttribute('always_defined', TRUE);
+
+    return new Node([
+      new SetNode(TRUE, $ref, $body, $lineno, $this->getTag()),
+      new TwigSortSetNode(['ref' => $ref], [], $lineno, $this->getTag()),
+    ]);
   }
 
   /**

diff --git a/templates/Drush/_symfony-command/command.twig b/templates/Drush/_symfony-command/command.twig
@@ -5,15 +5,15 @@ declare(strict_types=1);
 
 namespace Drupal\{{ machine_name }}\Command;
 
-{% sort %}
+{% apply sort_namespaces %}
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
   {% if services %}
 {{ di.use(services) }}
   {% endif %}
-{% endsort %}
+{% endapply %}
 
 // phpcs:disable Drupal.Commenting.ClassComment.Missing
 #[AsCommand(

diff --git a/templates/Entity/_configuration-entity/src/Entity/Example.php.twig b/templates/Entity/_configuration-entity/src/Entity/Example.php.twig
@@ -4,10 +4,10 @@ declare(strict_types=1);
 
 namespace Drupal\{{ machine_name }}\Entity;
 
-{% sort %}
+{% apply sort_namespaces %}
 use Drupal\Core\Config\Entity\ConfigEntityBase;
 use Drupal\{{ machine_name }}\{{ class_prefix }}Interface;
-{% endsort %}
+{% endapply %}
 
 /**
  * Defines the {{ entity_type_label|lower }} entity type.

diff --git a/templates/Entity/_content-entity/model.module.twig b/templates/Entity/_content-entity/model.module.twig
@@ -7,12 +7,12 @@ declare(strict_types=1);
  * Provides {{ entity_type_label|article|lower }} entity type.
  */
 
-{% sort %}
+{% apply sort_namespaces %}
 use Drupal\Core\Render\Element;
   {% if author_base_field %}
 use Drupal\user\UserInterface;
   {% endif %}
-{% endsort %}
+{% endapply %}
 
 /**
  * Implements hook_theme().

diff --git a/templates/Entity/_content-entity/src/Entity/Example.php.twig b/templates/Entity/_content-entity/src/Entity/Example.php.twig
@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace Drupal\{{ machine_name }}\Entity;
 
-{% sort %}
+{% apply sort_namespaces %}
   {% if not revisionable %}
 use Drupal\Core\Entity\ContentEntityBase;
   {% endif %}
@@ -25,7 +25,7 @@ use Drupal\user\EntityOwnerTrait;
   {% if changed_base_field %}
 use Drupal\Core\Entity\EntityChangedTrait;
   {% endif %}
-{% endsort %}
+{% endapply %}
 
 /**
  * Defines the {{ entity_type_label|lower }} entity class.

diff --git a/templates/Entity/_content-entity/src/Form/ExampleTypeForm.php.twig b/templates/Entity/_content-entity/src/Form/ExampleTypeForm.php.twig
@@ -4,12 +4,12 @@ declare(strict_types=1);
 
 namespace Drupal\{{ machine_name }}\Form;
 
-{% sort %}
+{% apply sort_namespaces %}
 use Drupal\Core\Entity\BundleEntityFormBase;
 use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\{{ machine_name }}\Entity\{{ class }}Type;
-{% endsort %}
+{% endapply %}
 
 /**
  * Form handler for {{ entity_type_label|lower }} type forms.

diff --git a/templates/Plugin/Field/_widget/widget.twig b/templates/Plugin/Field/_widget/widget.twig
@@ -5,7 +5,7 @@ declare(strict_types=1);
 
 namespace Drupal\{{ machine_name }}\Plugin\Field\FieldWidget;
 
-{% sort %}
+{% apply sort_namespaces %}
 use Drupal\Core\Field\FieldItemListInterface;
 use Drupal\Core\Field\WidgetBase;
 use Drupal\Core\Form\FormStateInterface;
@@ -14,7 +14,7 @@ use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
   {% endif %}
-{% endsort %}
+{% endapply %}
 
 /**
  * Defines the '{{ plugin_id }}' field widget.

diff --git a/templates/Plugin/Migrate/_destination/destination.twig b/templates/Plugin/Migrate/_destination/destination.twig
@@ -5,7 +5,7 @@ declare(strict_types=1);
 
 namespace Drupal\{{ machine_name }}\Plugin\migrate\destination;
 
-{% sort %}
+{% apply sort_namespaces %}
 use Drupal\migrate\Plugin\migrate\destination\DestinationBase;
 use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\Row;
@@ -14,7 +14,7 @@ use Drupal\migrate\Row;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
   {% endif %}
-{% endsort %}
+{% endapply %}
 
 /**
  * The '{{ plugin_id }}' destination plugin.

diff --git a/templates/Plugin/Migrate/_process/process.twig b/templates/Plugin/Migrate/_process/process.twig
@@ -5,7 +5,7 @@ declare(strict_types=1);
 
 namespace Drupal\{{ machine_name }}\Plugin\migrate\process;
 
-{% sort %}
+{% apply sort_namespaces %}
 use Drupal\migrate\MigrateExecutableInterface;
 use Drupal\migrate\ProcessPluginBase;
 use Drupal\migrate\Row;
@@ -14,7 +14,7 @@ use Drupal\migrate\Row;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
   {% endif %}
-{% endsort %}
+{% endapply %}
 
 /**
  * Provides {{ plugin_id|article }} plugin.

diff --git a/templates/Plugin/Views/_argument-default/argument-default.twig b/templates/Plugin/Views/_argument-default/argument-default.twig
@@ -5,7 +5,7 @@ declare(strict_types=1);
 
 namespace Drupal\{{ machine_name }}\Plugin\views\argument_default;
 
-{% sort %}
+{% apply sort_namespaces %}
 use Drupal\Core\Cache\Cache;
 use Drupal\Core\Cache\CacheableDependencyInterface;
   {% if configurable %}
@@ -16,7 +16,7 @@ use Drupal\views\Plugin\views\argument_default\ArgumentDefaultPluginBase;
 {{ di.use(services) }}
 use Symfony\Component\DependencyInjection\ContainerInterface;
   {% endif %}
-{% endsort %}
+{% endapply %}
 
 /**
  * @todo Add plugin description here.

diff --git a/templates/Plugin/Views/_field/field.twig b/templates/Plugin/Views/_field/field.twig
@@ -5,7 +5,7 @@ declare(strict_types=1);
 
 namespace Drupal\{{ machine_name }}\Plugin\views\field;
 
-{% sort %}
+{% apply sort_namespaces %}
 use Drupal\Component\Render\MarkupInterface;
 use Drupal\views\Plugin\views\field\FieldPluginBase;
 use Drupal\views\ResultRow;
@@ -16,7 +16,7 @@ use Drupal\Core\Form\FormStateInterface;
 {{ di.use(services) }}
 use Symfony\Component\DependencyInjection\ContainerInterface;
   {% endif %}
-{% endsort %}
+{% endapply %}
 
 /**
  * Provides {{ plugin_label }} field handler.

diff --git a/templates/Plugin/_action/action.twig b/templates/Plugin/_action/action.twig
@@ -5,7 +5,7 @@ declare(strict_types=1);
 
 namespace Drupal\{{ machine_name }}\Plugin\Action;
 
-{% sort %}
+{% apply sort_namespaces %}
 use Drupal\Core\Access\AccessResultInterface;
 use Drupal\Core\Entity\ContentEntityInterface;
   {% if configurable %}
@@ -21,7 +21,7 @@ use Drupal\Core\Session\AccountInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
   {% endif %}
-{% endsort %}
+{% endapply %}
 
 /**
  * Provides {{ plugin_label|article }} action.

diff --git a/templates/Plugin/_block/block.twig b/templates/Plugin/_block/block.twig
@@ -5,7 +5,7 @@ declare(strict_types=1);
 
 namespace Drupal\{{ machine_name }}\Plugin\Block;
 
-{% sort %}
+{% apply sort_namespaces %}
   {% if access %}
 use Drupal\Core\Access\AccessResult;
 use Drupal\Core\Session\AccountInterface;
@@ -19,7 +19,7 @@ use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
   {% endif %}
-{% endsort %}
+{% endapply %}
 
 /**
  * Provides {{ plugin_label|article|lower }} block.

diff --git a/templates/Plugin/_condition/condition.twig b/templates/Plugin/_condition/condition.twig
@@ -5,15 +5,15 @@ declare(strict_types=1);
 
 namespace Drupal\{{ machine_name }}\Plugin\Condition;
 
-{% sort %}
+{% apply sort_namespaces %}
 use Drupal\Core\Condition\ConditionPluginBase;
 use Drupal\Core\Form\FormStateInterface;
   {% if services %}
 {{ di.use(services) }}
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
   {% endif %}
-{% endsort %}
+{% endapply %}
 
 /**
  * Provides a '{{ plugin_label }}' condition.

diff --git a/templates/Plugin/_constraint/validator.twig b/templates/Plugin/_constraint/validator.twig
@@ -5,7 +5,7 @@ declare(strict_types=1);
 
 namespace Drupal\{{ machine_name }}\Plugin\Validation\Constraint;
 
-{% sort %}
+{% apply sort_namespaces %}
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
   {% if input_type == 'item' %}
@@ -20,7 +20,7 @@ use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
   {% endif %}
-{% endsort %}
+{% endapply %}
 
 /**
  * Validates the {{ plugin_label }} constraint.

diff --git a/templates/Plugin/_entity-reference-selection/entity-reference-selection.twig b/templates/Plugin/_entity-reference-selection/entity-reference-selection.twig
@@ -4,13 +4,13 @@ declare(strict_types=1);
 
 namespace Drupal\{{ machine_name }}\Plugin\EntityReferenceSelection;
 
-{% sort %}
+{% apply sort_namespaces %}
 use Drupal\Core\Entity\Query\QueryInterface;
 {% if configurable %}
 use Drupal\Core\Form\FormStateInterface;
 {% endif %}
 use {{ base_class_full }}{% if base_class == class %} as Base{{ base_class }}{% endif %};
-{% endsort %}
+{% endapply %}
 
 /**
  * @todo Add plugin description here.

diff --git a/templates/Plugin/_filter/filter.twig b/templates/Plugin/_filter/filter.twig
@@ -5,7 +5,7 @@ declare(strict_types=1);
 
 namespace Drupal\{{ machine_name }}\Plugin\Filter;
 
-{% sort %}
+{% apply sort_namespaces %}
   {% if configurable %}
 use Drupal\Core\Form\FormStateInterface;
   {% endif %}
@@ -16,7 +16,7 @@ use Drupal\filter\Plugin\FilterBase;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
   {% endif %}
-{% endsort %}
+{% endapply %}
 
 /**
  * @todo Add filter description here.