feature: non-html views

Author: g105b

router.default.php

@@ -4,15 +4,11 @@
 use Gt\Http\Request;
 use GT\Routing\BaseRouter;
 use GT\Routing\Method\Any;
-use GT\Routing\Method\Get;
-use GT\Routing\Method\Post;
 use GT\Routing\Path\FileMatch\BasicFileMatch;
 use GT\Routing\Path\FileMatch\MagicFileMatch;
 use GT\Routing\Path\PathMatcher;
-use GT\Routing\Path\DynamicPath;
-use GT\WebEngine\View\BaseView;
 use GT\WebEngine\View\HTMLView;
-use GT\WebEngine\View\NullView;
+use GT\WebEngine\View\JSONView;
 
 class DefaultRouter extends BaseRouter {
 	#[Any(name: "page-route", accept: "text/html,application/xhtml+xml")]
@@ -118,7 +114,7 @@ public function api(
 	):void {
 		$pathMatcher = new PathMatcher("api");
 		$this->pathMatcherFilter($pathMatcher);
-		$this->setViewClass(NullView::class);
+		$this->setViewClass(JSONView::class);
 		$sortNestLevelCallback = fn(string $a, string $b) =>
 		substr_count($a, "/") > substr_count($b, "/")
 			? 1

src/Dispatch/Dispatcher.php

@@ -23,6 +23,7 @@
 use Gt\Http\Stream;
 use GT\Input\Input;
 use GT\Input\InputData\InputData;
+use Gt\Json\Schema\JsonDocument;
 use GT\Routing\Assembly;
 use Gt\Routing\BaseRouter;
 use GT\Routing\Path\DynamicPath;
@@ -58,8 +59,8 @@ class Dispatcher {
 
 	private Injector $injector;
 	private NullView|JSONView|HTMLView $view;
-	private HTMLDocument/*|NullViewModel*/ $viewModel;
-	private ViewModelProcessor $viewModelProcessor;
+	private HTMLDocument|JsonDocument $viewModel;
+	private ?ViewModelProcessor $viewModelProcessor;
 	private BaseRouter $router;
 	private ?SessionInit $sessionInit = null;
 	private Assembly $logicAssembly;
@@ -186,7 +187,8 @@ public function __construct(
 			$this->config->getString("view.partial_directory"),
 		);
 		$this->viewModelProcessor = $viewModelInit->getViewModelProcessor();
-		$this->viewModelInitCallback = fn() => $viewModelInit->initHTMLDocument(
+		$this->viewModelInitCallback = $this->viewModel instanceof HTMLDocument
+		? fn() => $viewModelInit->initHTMLDocument(
 			$this->serviceContainer->get(Binder::class),
 			$this->serviceContainer->get(HTMLAttributeBinder::class),
 			$this->serviceContainer->get(ListBinder::class),
@@ -196,7 +198,8 @@ public function __construct(
 			$this->serviceContainer->get(HTMLAttributeCollection::class),
 			$this->serviceContainer->get(ListElementCollection::class),
 			$this->serviceContainer->get(BindableCache::class),
-		);
+		)
+		: fn() => null;
 
 		$this->logicExecutor = $logicExecutor ?? new LogicExecutor(
 			$appNamespace,
@@ -369,12 +372,12 @@ public function processResponse(
 	):void {
 		$dynamicPath = $this->serviceContainer->get(DynamicPath::class);
 
-		$this->viewModelProcessor->processDynamicPath(
+		$this->viewModelProcessor?->processDynamicPath(
 			$this->viewModel,
 			$dynamicPath,
 		);
 
-		$logicAssemblyComponentList = $this->viewModelProcessor->processPartialContent(
+		$logicAssemblyComponentList = $this->viewModelProcessor?->processPartialContent(
 			$this->viewModel,
 		);
 
@@ -384,7 +387,7 @@ public function processResponse(
 			$this->bindErrorDetails($errorThrowable);
 		}
 
-		foreach($logicAssemblyComponentList as $logicAssemblyComponent) {
+		foreach($logicAssemblyComponentList ?? [] as $logicAssemblyComponent) {
 			$assembly = $logicAssemblyComponent->assembly;
 			$componentElement = $logicAssemblyComponent->component;
 			$this->serviceContainer->set($componentElement);

src/Init/RouterInit.php

@@ -4,6 +4,7 @@
 use Gt\Dom\HTMLDocument;
 use GT\Http\Request;
 use GT\Http\Response;
+use Gt\Json\Schema\JsonDocument;
 use Gt\Routing\Assembly;
 use Gt\Routing\BaseRouter;
 use Gt\Routing\Path\DynamicPath;
@@ -17,7 +18,7 @@ class RouterInit {
 	private BaseRouter $baseRouter;
 	private NullView|HTMLView|JSONView $view;
 // TODO: What other viewModels are there?
-	private HTMLDocument $viewModel;
+	private HTMLDocument|JsonDocument $viewModel;
 	private DynamicPath $dynamicPath;
 	private Assembly $viewAssembly;
 	private Assembly $logicAssembly;
@@ -79,7 +80,7 @@ public function getView():NullView|HTMLView|JSONView {
 		return $this->view;
 	}
 
-	public function getViewModel():HTMLDocument {
+	public function getViewModel():HTMLDocument|JsonDocument {
 		return $this->viewModel;
 	}
 

src/Init/ViewModelInit.php

@@ -14,6 +14,7 @@
 use Gt\DomTemplate\ListElementCollection;
 use Gt\DomTemplate\PlaceholderBinder;
 use Gt\DomTemplate\TableBinder;
+use Gt\Json\Schema\JsonDocument;
 use GT\WebEngine\Logic\HTMLDocumentProcessor;
 use GT\WebEngine\Logic\ViewModelProcessor;
 
@@ -22,7 +23,7 @@ class ViewModelInit {
 	private bool $initialised = false;
 
 	public function __construct(
-		HTMLDocument $model,
+		HTMLDocument|JsonDocument $model,
 		string $componentDirectory,
 		string $partialDirectory,
 	) {
@@ -87,7 +88,7 @@ public function initHTMLDocument(
 		);
 	}
 
-	public function getViewModelProcessor():ViewModelProcessor {
-		return $this->viewModelProcessor;
+	public function getViewModelProcessor():?ViewModelProcessor {
+		return $this->viewModelProcessor ?? null;
 	}
 }

src/Service/DefaultServiceLoader.php

@@ -32,6 +32,10 @@ public function __construct(
 		$this->uniqid = uniqid(more_entropy: true);
 	}
 
+	public function loadConfig():Config {
+		return $this->config;
+	}
+
 	public function loadResponseHeaders():ResponseHeaders {
 		$response = $this->container->get(Response::class);
 		return $response->headers;

src/View/JSONView.php

@@ -1,12 +1,14 @@
 <?php
 namespace GT\WebEngine\View;
 
+use Gt\Json\Schema\JsonDocument;
+
 /**
  * This file is just stubbed out for now, and does not need unit tests writing
  * for it until the structured object document feature is planned out properly.
  */
 class JSONView extends BaseView {
-	public function createViewModel():JSONDocument {
-		// TODO: Implement createViewModel() method.
+	public function createViewModel():JsonDocument {
+		return new JsonDocument();
 	}
 }

src/View/NullView.php

@@ -6,8 +6,8 @@
  * for it until the structured object document feature is planned out properly.
  */
 class NullView extends BaseView {
-	public function createViewModel():mixed {
+	public function createViewModel():null {
 		// TODO: Implement createViewModel() method.
-		return "";
+		return null;
 	}
 }