Decouple publications package

packages/framework/src/Foundation/PageCollection.php

@@ -13,11 +13,6 @@
 use Hyde\Pages\HtmlPage;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Pages\MarkdownPost;
-use Hyde\Pages\VirtualPage;
-use Hyde\Publications\Models\PublicationListPage;
-use Hyde\Publications\Models\PublicationPage;
-use Hyde\Publications\Models\PublicationType;
-use Hyde\Publications\PublicationService;
 use Illuminate\Support\Collection;
 
 /**
@@ -89,10 +84,6 @@ protected function runDiscovery(): self
             $this->discoverPagesFor(DocumentationPage::class);
         }
 
-        if (Features::hasPublicationPages()) {
-            $this->discoverPublicationPages();
-        }
-
         foreach ($this->kernel->getRegisteredPageClasses() as $pageClass) {
             $this->discoverPagesFor($pageClass);
         }
@@ -127,48 +118,4 @@ protected function parsePagesFor(string $pageClass): Collection
 
         return $collection;
     }
-
-    protected function discoverPublicationPages(): void
-    {
-        PublicationService::getPublicationTypes()->each(function (PublicationType $type): void {
-            $this->discoverPublicationPagesForType($type);
-            $this->generatePublicationListingPageForType($type);
-        });
-    }
-
-    protected function discoverPublicationPagesForType(PublicationType $type): void
-    {
-        PublicationService::getPublicationsForPubType($type)->each(function (PublicationPage $publication): void {
-            $this->addPage($publication);
-        });
-    }
-
-    protected function generatePublicationListingPageForType(PublicationType $type): void
-    {
-        $page = new PublicationListPage($type);
-        $this->put($page->getSourcePath(), $page);
-
-        if ($type->usesPagination()) {
-            $this->generatePublicationPaginatedListingPagesForType($type);
-        }
-    }
-
-    /**
-     * @deprecated This method will be removed before merging into master.
-     *
-     * @internal This method will be removed before merging into master.
-     */
-    protected function generatePublicationPaginatedListingPagesForType(PublicationType $type): void
-    {
-        $paginator = $type->getPaginator();
-
-        foreach (range(1, $paginator->totalPages()) as $page) {
-            $paginator->setCurrentPage($page);
-            $listingPage = new VirtualPage("{$type->getDirectory()}/page-$page", [
-                'publicationType' => $type, 'paginatorPage' => $page,
-                'title' => $type->name.' - Page '.$page,
-            ], view: $type->listTemplate);
-            $this->put($listingPage->getSourcePath(), $listingPage);
-        }
-    }
 }

packages/framework/src/Framework/Actions/SourceFileParser.php

@@ -8,9 +8,6 @@
 use Hyde\Pages\BladePage;
 use Hyde\Pages\Concerns\BaseMarkdownPage;
 use Hyde\Pages\Concerns\HydePage;
-use Hyde\Publications\Models\PublicationPage;
-use Hyde\Publications\Models\PublicationType;
-use Illuminate\Support\Str;
 
 /**
  * Parses a source file and returns a new page model instance for it.
@@ -46,32 +43,13 @@ protected function constructPage(string $pageClass): HydePage|BladePage|BaseMark
             return $this->parseBladePage();
         }
 
-        if ($pageClass === PublicationPage::class) {
-            return $this->parsePublicationPage();
-        }
-
         if (is_subclass_of($pageClass, BaseMarkdownPage::class)) {
             return $this->parseMarkdownPage($pageClass);
         }
 
         return new $pageClass($this->identifier);
     }
 
-    protected function parsePublicationPage(): PublicationPage
-    {
-        /** @var \Hyde\Pages\Concerns\BaseMarkdownPage $pageClass */
-        $document = MarkdownFileParser::parse(
-            PublicationPage::sourcePath($this->identifier)
-        );
-
-        return new PublicationPage(
-            identifier: $this->identifier,
-            matter: $document->matter,
-            markdown: $document->markdown,
-            type: PublicationType::get(Str::before($this->identifier, '/'))
-        );
-    }
-
     protected function parseBladePage(): BladePage
     {
         return new BladePage(

packages/framework/tests/Feature/HydeExtensionFeatureTest.php

@@ -49,7 +49,11 @@ public function testBaseClassDiscoveryHandlers()
 
     public function testCanRegisterNewExtension()
     {
+        HydeKernel::setInstance(new HydeKernel());
+
+        $this->kernel = HydeKernel::getInstance();
         $this->kernel->registerExtension(HydeTestExtension::class);
+
         $this->assertSame([HydeTestExtension::class], $this->kernel->getRegisteredExtensions());
     }
 

packages/framework/tests/Feature/PageCollectionTest.php

@@ -4,7 +4,6 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use function copy;
 use Hyde\Foundation\HydeKernel;
 use Hyde\Foundation\PageCollection;
 use Hyde\Hyde;
@@ -13,8 +12,6 @@
 use Hyde\Pages\HtmlPage;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Pages\MarkdownPost;
-use Hyde\Publications\Models\PublicationListPage;
-use Hyde\Publications\Models\PublicationPage;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\File;
@@ -183,44 +180,4 @@ public function test_pages_with_custom_source_directories_are_discovered_properl
 
         File::deleteDirectory(Hyde::path('.source'));
     }
-
-    public function test_publication_pages_are_discovered()
-    {
-        mkdir(Hyde::path('publication'));
-        $this->createPublication();
-
-        $collection = PageCollection::boot(Hyde::getInstance())->getPages();
-        $this->assertCount(4, $collection); // Default pages + publication index + publication page
-        $this->assertInstanceOf(PublicationPage::class, $collection->get('publication/foo.md'));
-
-        File::deleteDirectory(Hyde::path('publication'));
-    }
-
-    public function test_listing_pages_for_publications_are_discovered()
-    {
-        mkdir(Hyde::path('publication'));
-        $this->createPublication();
-
-        $this->assertInstanceOf(
-            PublicationListPage::class,
-            PageCollection::boot(Hyde::getInstance())->getPage('publication/index')
-        );
-
-        File::deleteDirectory(Hyde::path('publication'));
-    }
-
-    protected function createPublication(): void
-    {
-        copy(Hyde::path('tests/fixtures/test-publication-schema.json'), Hyde::path('publication/schema.json'));
-        file_put_contents(Hyde::path('publication/foo.md'),
-            '---
-__canonical: canonical
-__createdAt: 2022-11-16 11:32:52
-foo: bar
----
-
-Hello World!
-'
-        );
-    }
 }

packages/framework/tests/Feature/PaginatorTest.php

@@ -273,6 +273,22 @@ public function testGetPageLinksWithBaseRoute()
         );
     }
 
+    public function testFirstItemNumberOnPage()
+    {
+        $paginator = $this->makePaginator();
+        $this->assertSame(1, $paginator->firstItemNumberOnPage());
+        $this->assertSame(11, $paginator->setCurrentPage(2)->firstItemNumberOnPage());
+        $this->assertSame(21, $paginator->setCurrentPage(3)->firstItemNumberOnPage());
+        $this->assertSame(31, $paginator->setCurrentPage(4)->firstItemNumberOnPage());
+        $this->assertSame(41, $paginator->setCurrentPage(5)->firstItemNumberOnPage());
+
+        $paginator = $this->makePaginator(1, 100, 25);
+        $this->assertSame(1, $paginator->firstItemNumberOnPage());
+        $this->assertSame(26, $paginator->setCurrentPage(2)->firstItemNumberOnPage());
+        $this->assertSame(51, $paginator->setCurrentPage(3)->firstItemNumberOnPage());
+        $this->assertSame(76, $paginator->setCurrentPage(4)->firstItemNumberOnPage());
+    }
+
     protected function makePaginator(int $start = 1, int $end = 50, int $pageSize = 10): Paginator
     {
         return new Paginator(range($start, $end), $pageSize);

packages/framework/tests/Feature/SourceFileParserTest.php

@@ -4,15 +4,12 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use Hyde\Facades\Filesystem;
 use Hyde\Framework\Actions\SourceFileParser;
-use Hyde\Hyde;
 use Hyde\Pages\BladePage;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Pages\HtmlPage;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Pages\MarkdownPost;
-use Hyde\Publications\Models\PublicationPage;
 use Hyde\Testing\TestCase;
 
 /**
@@ -77,24 +74,6 @@ public function test_html_page_parser()
         $this->assertEquals('<h1>Foo Bar</h1>', $page->contents());
     }
 
-    public function test_publication_parser()
-    {
-        mkdir(Hyde::path('test-publication'));
-        copy(Hyde::path('tests/fixtures/test-publication-schema.json'), Hyde::path('test-publication/schema.json'));
-        copy(Hyde::path('tests/fixtures/test-publication.md'), Hyde::path('test-publication/foo.md'));
-
-        $parser = new SourceFileParser(PublicationPage::class, 'test-publication/foo');
-        $page = $parser->get();
-        $this->assertInstanceOf(PublicationPage::class, $page);
-        $this->assertEquals('test-publication/foo', $page->identifier);
-        $this->assertEquals('## Write something awesome.', $page->markdown);
-        $this->assertEquals('My Title', $page->title);
-        $this->assertEquals('My Title', $page->matter->get('title'));
-        $this->assertTrue($page->matter->has('__createdAt'));
-
-        Filesystem::deleteDirectory('test-publication');
-    }
-
     public function test_parsed_page_is_run_through_dynamic_constructor()
     {
         $this->markdown('_pages/foo.md', '# Foo Bar', ['title' => 'Foo Bar Baz']);

packages/publications/src/Actions/SeedsPublicationFiles.php

@@ -77,7 +77,7 @@ protected function getDateTimeValue(): string
         ));
     }
 
-    protected function getTextValue($lines): string
+    protected function getTextValue(int $lines): string
     {
         $value = '';
 
@@ -97,7 +97,7 @@ protected function generateFieldData(PublicationFieldDefinition $field): string|
             'float' => ((mt_rand() / mt_getrandmax()) * (200000)) + -100000,
             'image' => 'https://picsum.photos/id/'.rand(1, 1000).'/400/400',
             'integer' => rand(-100000, 100000),
-            'string' => substr($this->fakeSentence(10), 0, rand(0, 255)),
+            'string' => substr($this->fakeSentence(10), 0, rand(1, 255)),
             'tag' => $this->getTags($field->tagGroup),
             'text' => $this->getTextValue(rand(3, 20)),
             'url' => $this->fakeUrl(),
@@ -208,7 +208,7 @@ private function randomMarkdownLines(int $count): string
     {
         $lines = [];
         for ($i = 0; $i < $count; $i++) {
-            $lines[] = $this->fakeSentence(rand(0, 15));
+            $lines[] = $this->fakeSentence(rand(1, 15));
         }
 
         return implode("\n", $lines);

packages/publications/src/ValidatesPublicationField.php → packages/publications/src/Actions/ValidatesPublicationField.php

@@ -2,12 +2,14 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Publications;
+namespace Hyde\Publications\Actions;
 
 use function array_merge;
 use function collect;
 use Hyde\Publications\Models\PublicationFieldDefinition;
 use Hyde\Publications\Models\PublicationType;
+use Hyde\Publications\PublicationFieldTypes;
+use Hyde\Publications\PublicationService;
 use Illuminate\Contracts\Validation\Validator;
 use function validator;
 

packages/publications/src/Commands/MakePublicationCommand.php

@@ -6,7 +6,6 @@
 
 use Closure;
 use Hyde\Console\Commands\Helpers\InputStreamHandler;
-use Hyde\Console\Concerns\ValidatingCommand;
 use Hyde\Publications\Actions\CreatesNewPublicationPage;
 use Hyde\Publications\Models\PublicationFieldDefinition;
 use Hyde\Publications\Models\PublicationFieldValue;

packages/publications/src/Commands/MakePublicationTagCommand.php

@@ -5,7 +5,6 @@
 namespace Hyde\Publications\Commands;
 
 use Hyde\Console\Commands\Helpers\InputStreamHandler;
-use Hyde\Console\Concerns\ValidatingCommand;
 use Hyde\Framework\Services\DiscoveryService;
 use Hyde\Hyde;
 use Hyde\Publications\Models\PublicationTags;

packages/publications/src/Commands/MakePublicationTypeCommand.php

@@ -6,7 +6,6 @@
 
 use function array_keys;
 use function count;
-use Hyde\Console\Concerns\ValidatingCommand;
 use Hyde\Hyde;
 use Hyde\Publications\Actions\CreatesNewPublicationType;
 use Hyde\Publications\Models\PublicationFieldDefinition;

packages/publications/src/Commands/SeedPublicationCommand.php

@@ -4,7 +4,6 @@
 
 namespace Hyde\Publications\Commands;
 
-use Hyde\Console\Concerns\ValidatingCommand;
 use Hyde\Publications\Actions\SeedsPublicationFiles;
 use Hyde\Publications\Models\PublicationType;
 use Hyde\Publications\PublicationService;

packages/publications/src/Commands/ValidatePublicationsCommand.php

@@ -6,10 +6,9 @@
 
 use function count;
 use Exception;
-use Hyde\Console\Concerns\ValidatingCommand;
+use Hyde\Publications\Actions\ValidatesPublicationField;
 use Hyde\Publications\Models\PublicationFieldDefinition;
 use Hyde\Publications\PublicationService;
-use Hyde\Publications\ValidatesPublicationField;
 use InvalidArgumentException;
 use LaravelZero\Framework\Commands\Command;
 use function str_repeat;

packages/framework/src/Console/Concerns/ValidatingCommand.php → packages/publications/src/Commands/ValidatingCommand.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Console\Concerns;
+namespace Hyde\Publications\Commands;
 
 use function __;
 use function array_merge;

packages/publications/src/Models/PublicationPage.php

@@ -4,11 +4,14 @@
 
 namespace Hyde\Publications\Models;
 
+use Hyde\Framework\Actions\MarkdownFileParser;
+use Hyde\Framework\Concerns\ValidatesExistence;
 use Hyde\Markdown\Models\FrontMatter;
 use Hyde\Markdown\Models\Markdown;
 use Hyde\Pages\Concerns;
 use Hyde\Pages\Contracts\DynamicPage;
 use Hyde\Publications\Actions\PublicationPageCompiler;
+use Illuminate\Support\Str;
 use function str_starts_with;
 
 /**
@@ -19,6 +22,8 @@
  */
 class PublicationPage extends Concerns\BaseMarkdownPage implements DynamicPage
 {
+    use ValidatesExistence;
+
     public PublicationType $type;
 
     public static string $sourceDirectory = '';
@@ -42,6 +47,23 @@ public function compile(): string
         return $this->renderComponent();
     }
 
+    public static function parse(string $identifier): self
+    {
+        static::validateExistence(static::class, $identifier);
+
+        /** @var \Hyde\Pages\Concerns\BaseMarkdownPage $pageClass */
+        $document = MarkdownFileParser::parse(
+            PublicationPage::sourcePath($identifier)
+        );
+
+        return new PublicationPage(
+            identifier: $identifier,
+            matter: $document->matter,
+            markdown: $document->markdown,
+            type: PublicationType::get(Str::before($identifier, '/'))
+        );
+    }
+
     protected function renderComponent(): string
     {
         return PublicationPageCompiler::call($this);