Skip to content

fix: order of partial loading #731

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
g105b merged 3 commits into from
Jul 25, 2026
+44 −14
Merged

fix: order of partial loading #731

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f477f6a
fix: order of partial loading
pixeldrift64 Jul 25, 2026
e4fecd0
test: add unit test for #730
g105b Jul 25, 2026
fb7e764
tweak: spaces -> tabs
pixeldrift64 Jul 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions src/Logic/HTMLDocumentProcessor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,20 @@ function processPartialContent(

$componentList = new LogicAssemblyComponentList();

try {
$partial = new PartialContent(implode(DIRECTORY_SEPARATOR, [
getcwd(),
$this->partialDirectory,
]));

$partialExpander = new PartialExpander(
$model,
$partial,
);
$partialExpander->expand();
}
catch(PartialContentDirectoryNotFoundException) {}

try {
// TODO: Handle other model types in sub-functions.
$partial = new PartialContent(implode(DIRECTORY_SEPARATOR, [
Expand Down Expand Up @@ -82,20 +96,6 @@ function processPartialContent(
}
catch(PartialContentDirectoryNotFoundException) {}

try {
$partial = new PartialContent(implode(DIRECTORY_SEPARATOR, [
getcwd(),
$this->partialDirectory,
]));

$partialExpander = new PartialExpander(
$model,
$partial,
);
$partialExpander->expand();
}
catch(PartialContentDirectoryNotFoundException) {}

return $componentList;
}

Expand Down
30 changes: 30 additions & 0 deletions test/phpunit/Logic/HTMLDocumentProcessorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,36 @@ public function testProcessPartialContent_expandsComponentsAndPartialsAndRegiste
self::assertSame("no-logic", TestLogHandler::$records[0]["context"]["component"]);
}

public function testProcessPartialContent_expandsAndRegistersComponentsFromPartial():void {
file_put_contents(
$this->componentDir . "/site-card.html",
"<article><form method='post'><button>Save</button></form></article>",
);
file_put_contents($this->componentDir . "/site-card.php", "<?php\n");
file_put_contents(
$this->partialDir . "/layout.html",
"<!doctype html><html><body><site-card></site-card><main data-partial></main></body></html>",
);

$document = new HTMLDocument(
"<!doctype html><!-- extends = layout --><h1>Page</h1>"
);
$processor = new HTMLDocumentProcessor(
ltrim(substr($this->componentDir, strlen(getcwd())), "/"),
ltrim(substr($this->partialDir, strlen(getcwd())), "/"),
);

$componentList = $processor->processPartialContent($document);

self::assertCount(1, $componentList);
self::assertSame("site-card", strtolower($componentList[0]->component->tagName));
self::assertSame(
"site-card",
$document->querySelector("site-card input[name='__component']")?->getAttribute("value"),
);
self::assertStringContainsString("<h1>Page</h1>", (string)$document);
}

public function testProcessPartialContent_ignoresMissingDirectories():void {
$document = new HTMLDocument("<!doctype html><body><site-card></site-card></body>");
$processor = new HTMLDocumentProcessor(
Expand Down
Loading