feat: ✨ Rewrite UEberToolComponentLoader, skip components from module, and non dist themes

Author: webflo

packages/uebertool-companion/modules/uebertool_twig_loader/src/Template/Loader/UEberToolComponentLoader.php

@@ -3,9 +3,11 @@
 namespace Drupal\uebertool_twig_loader\Template\Loader;
 
 use Drupal\Core\Asset\LibraryDiscoveryInterface;
+use Drupal\Core\Extension\ThemeHandlerInterface;
 use Drupal\Core\Theme\ComponentPluginManager;
 use Drupal\Core\Render\Component\Exception\ComponentNotFoundException;
 use Drupal\Core\Template\Loader\ComponentLoader;
+use Drupal\Core\Theme\ExtensionType;
 use Twig\Source;
 use Twig\Loader\LoaderInterface;
 
@@ -18,38 +20,36 @@ public function __construct(
     protected ComponentLoader $prototype,
     protected ComponentPluginManager $pluginManager,
     protected LibraryDiscoveryInterface $libraryDiscovery,
+    protected ThemeHandlerInterface $themeHandler,
   ) {}
 
   /**
    * {@inheritdoc}
    */
   public function getSourceContext($name): Source {
-    try {
-      $component = $this->pluginManager->find($name);
-      $path = $component->getTemplatePath();
-      $themeName = explode($component::DERIVATIVE_SEPARATOR, $component->getPluginId())[0];
-      $distThemeName = "{$themeName}_dist";
-    }
-    catch (ComponentNotFoundException $e) {
-      return new Source('', $name, '');
-    }
-    $original_code = file_get_contents($path);
+    $source = $this->prototype->getSourceContext($name);
 
-    $prefix = '';
+    // Skip empty/non-existing components.
+    if ($source->getCode() === '' && $source->getPath() === '') {
+      return $source;
+    }
 
-    $componentName = $component->getDerivativeId();
-    $libraryName = "sdc--{$componentName}";
+    $component = $this->pluginManager->find($name);
+    $pluginDefinition = $component->getPluginDefinition();
+    $distThemeName = "{$pluginDefinition['provider']}_dist";
 
-    $prefix = '';
-    if (!str_starts_with($path, 'core/')) {
-      $prefix = $this->libraryDiscovery->getLibraryByName($distThemeName, $libraryName)
-        ? "{{ attach_library('{$distThemeName}/{$libraryName}') }}"
-        : '';
+    // Only components from themes with a '_dist' theme get special treatment.
+    if ($pluginDefinition['extension_type'] === ExtensionType::Theme && $this->themeHandler->themeExists($distThemeName)) {
+      $componentName = $component->getDerivativeId();
+      $libraryName = "sdc--{$componentName}";
+      $hasLibrary = $this->libraryDiscovery->getLibraryByName($distThemeName, $libraryName);
+      if ($hasLibrary) {
+        $prefix = "{{ attach_library('{$distThemeName}/{$libraryName}') }}";
+        $source = new Source($prefix . $source->getCode(), $source->getName(), $source->getPath());
+      }
     }
 
-    $code = $prefix . $original_code;
-
-    return new Source($code, $name, $path);
+    return $source;
   }
 
   /**

packages/uebertool-companion/modules/uebertool_twig_loader/uebertool_twig_loader.services.yml

@@ -14,3 +14,4 @@ services:
       - '@.inner'
       - '@plugin.manager.sdc'
       - '@library.discovery'
+      - '@theme_handler'