add context provider

Author: azjezz

src/Nuxed/Asset/Context/Context.hack

@@ -1,7 +1,14 @@
 namespace Nuxed\Asset\Context;
 
-class Context implements IContext {
-  public function __construct(private string $basePath, private bool $secure) {}
+final class Context implements IContext {
+  private function __construct(
+    private string $basePath,
+    private bool $secure,
+  ) {}
+
+  public static function create(string $base_path, bool $secure): Context {
+    return new Context($base_path, $secure);
+  }
 
   /**
    * {@inheritdoc}

src/Nuxed/Asset/Context/ContextProvider.hack

@@ -0,0 +1,20 @@
+namespace Nuxed\Asset\Context;
+
+final class ContextProvider implements IContextProvider {
+    private function __construct(private IContext $context) {}
+
+    public static function create(
+        string $base_path,
+        bool $secure,
+    ): ContextProvider {
+        return new ContextProvider(Context::create($base_path, $secure));
+    }
+
+    public static function forContext(IContext $context): ContextProvider {
+        return new ContextProvider($context);
+    }
+
+    public function getContext(): IContext {
+        return $this->context;
+    }
+}

src/Nuxed/Asset/Context/IContextProvider.hack

@@ -0,0 +1,8 @@
+namespace Nuxed\Asset\Context;
+
+interface IContextProvider {
+    /**
+     * Provide context.
+     */
+    public function getContext(): IContext;
+}

src/Nuxed/Asset/Package.hack

@@ -7,13 +7,19 @@ use namespace HH\Lib\Str;
  */
 <<__Sealed(UrlPackage::class, PathPackage::class)>>
 class Package implements IPackage {
-  private Context\IContext $context;
+  private (function(): Context\IContext) $contextProvider;
 
   public function __construct(
     private VersionStrategy\IVersionStrategy $versionStrategy,
-    ?Context\IContext $context = null,
+    ?Context\IContextProvider $contextProvider = null,
   ) {
-    $this->context = $context ?? new Context\NullContext();
+    $this->contextProvider = (): Context\IContext ==> {
+      if ($contextProvider is nonnull) {
+        return $contextProvider->getContext();
+      }
+
+      return new Context\NullContext();
+    };
   }
 
   /**
@@ -35,7 +41,7 @@ class Package implements IPackage {
   }
 
   protected function getContext(): Context\IContext {
-    return $this->context;
+    return ($this->contextProvider)();
   }
 
   protected function getVersionStrategy(): VersionStrategy\IVersionStrategy {

src/Nuxed/Asset/PathPackage.hack

@@ -1,7 +1,6 @@
 namespace Nuxed\Asset;
 
 use namespace HH\Lib\Str;
-use type Nuxed\Asset\Context\IContext;
 use type Nuxed\Asset\VersionStrategy\IVersionStrategy;
 
 /**
@@ -21,10 +20,9 @@ final class PathPackage extends Package {
   public function __construct(
     string $basePath,
     IVersionStrategy $versionStrategy,
-    ?IContext $context = null,
+    ?Context\IContextProvider $contextProvider = null,
   ) {
-    $context ??= new Context\NullContext();
-    parent::__construct($versionStrategy, $context);
+    parent::__construct($versionStrategy, $contextProvider);
 
     if ('' === $basePath) {
       $this->basePath = '/';

src/Nuxed/Asset/UrlPackage.hack

@@ -26,10 +26,9 @@ final class UrlPackage extends Package {
   public function __construct(
     Container<string> $baseUrls,
     VersionStrategy\IVersionStrategy $versionStrategy,
-    ?Context\IContext $context = null,
+    ?Context\IContextProvider $contextProvider = null,
   ) {
-    $context ??= new Context\NullContext();
-    parent::__construct($versionStrategy, $context);
+    parent::__construct($versionStrategy, $contextProvider);
 
     if (C\is_empty($baseUrls)) {
       throw new Exception\LogicException(

tests/Nuxed/Asset/PathPackageTest.hack

@@ -51,7 +51,7 @@ class PathPackageTest extends HackTest {
     $package = new Asset\PathPackage(
       $basePath,
       new Asset\VersionStrategy\StaticVersionStrategy('v1', $format),
-      $this->getContext($basePathRequest),
+      $this->getContextProvider($basePathRequest),
     );
     expect(await $package->getUrl($path))->toBeSame($expected);
   }
@@ -80,14 +80,17 @@ class PathPackageTest extends HackTest {
     $package = new Asset\PathPackage(
       '/subdirectory',
       $versionStrategy,
-      $this->getContext('/bar'),
+      $this->getContextProvider('/bar'),
     );
     expect(await $package->getUrl('main.css'))->toBeSame(
       'https://cdn.com/bar/main.css?',
     );
   }
 
-  private function getContext(string $basePath): Asset\Context\IContext {
-    return new Asset\Context\Context($basePath, false);
+  private function getContextProvider(
+    string $base_path,
+    bool $secure = false,
+  ): Asset\Context\IContextProvider {
+    return Asset\Context\ContextProvider::create($base_path, $secure);
   }
 }

tests/Nuxed/Asset/UrlPackageTest.hack

@@ -148,7 +148,7 @@ class UrlPackageTest extends HackTest {
     $package = new Asset\UrlPackage(
       $baseUrls,
       new Asset\VersionStrategy\StaticVersionStrategy('v1'),
-      $this->getContext($secure),
+      $this->getContextProvider($secure),
     );
     expect(await $package->getUrl($path))->toBeSame($expected);
   }
@@ -250,7 +250,9 @@ class UrlPackageTest extends HackTest {
     ];
   }
 
-  private function getContext(bool $secure): Asset\Context\IContext {
-    return new Asset\Context\Context('', $secure);
+  private function getContextProvider(
+    bool $secure,
+  ): Asset\Context\IContextProvider {
+    return Asset\Context\ContextProvider::create('', $secure);
   }
 }