Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions examples/basic/content/docs/features.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
title: Features
description: Overview of Chronicle features
order: 2
draft: true
---

# Features
Expand Down
23 changes: 21 additions & 2 deletions packages/chronicle/src/lib/source.ts
Original file line number Diff line number Diff line change
Expand Up @@ -174,17 +174,31 @@ function sortTreeByOrder(tree: Root, pages: { url: string; data: unknown }[], me
return { ...tree, children: sortNodes(tree.children, pageOrderMap, folderOrderMap) };
}

function filterDraftsFromTree(tree: Root, draftUrls: Set<string>): Root {
function filterNodes(nodes: Node[]): Node[] {
return nodes
.filter(n => n.type !== NodeType.Page || !draftUrls.has(n.url))
.map(n => n.type === NodeType.Folder
? { ...n, children: filterNodes(n.children) } as Folder
: n
);
}
return { ...tree, children: filterNodes(tree.children) };
}

export async function getPageTree(): Promise<Root> {
if (cachedTree) return cachedTree;
const s = await getSource();
const metaFiles = buildFiles().filter(f => f.type === 'meta') as { path: string; data: Record<string, unknown> }[];
cachedTree = sortTreeByOrder(s.pageTree as Root, s.getPages(), metaFiles);
const sorted = sortTreeByOrder(s.pageTree as Root, s.getPages(), metaFiles);
const draftUrls = new Set(s.getPages().filter(p => isDraft(p)).map(p => p.url));
cachedTree = draftUrls.size > 0 ? filterDraftsFromTree(sorted, draftUrls) : sorted;
return cachedTree;
}

export async function getPages() {
const s = await getSource();
return s.getPages();
return s.getPages().filter(p => !isDraft(p));
}

export async function getPage(slugs?: string[]) {
Expand Down Expand Up @@ -254,10 +268,15 @@ export function extractFrontmatter(page: { data: unknown }, fallbackTitle?: stri
order: d.order as number | undefined,
icon: d.icon as string | undefined,
lastModified: d.lastModified as string | undefined,
draft: d.draft as boolean | undefined,
_readingTime: d._readingTime as number | undefined,
};
}

export function isDraft(page: { data: unknown }): boolean {
return (page.data as Record<string, unknown>).draft === true;
}

export function getRelativePath(page: { data: unknown }): string {
return ((page.data as Record<string, unknown>)._relativePath as string) ?? '';
}
Expand Down
4 changes: 2 additions & 2 deletions packages/chronicle/src/server/api/page.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { defineHandler, HTTPError } from 'nitro';
import { getPage, getPageNav, extractFrontmatter, getRelativePath, getOriginalPath } from '@/lib/source';
import { getPage, getPageNav, extractFrontmatter, getRelativePath, getOriginalPath, isDraft } from '@/lib/source';

export default defineHandler(async event => {
const slugParam = event.url.searchParams.get('slug') ?? '';
const slug = slugParam ? slugParam.split(',').filter(Boolean) : [];
const page = await getPage(slug);

if (!page) {
if (!page || isDraft(page)) {
throw new HTTPError({ status: 404, message: 'Page not found' });
}

Expand Down
6 changes: 4 additions & 2 deletions packages/chronicle/src/server/entry-server.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { getApiConfigsForVersion, loadConfig } from '@/lib/config';
import { loadApiSpecs } from '@/lib/openapi';
import { PageProvider } from '@/lib/page-context';
import { resolveRoute, RouteType } from '@/lib/route-resolver';
import { getPageTree, getPage, getPageNav, loadPageModule, extractFrontmatter, getRelativePath, getOriginalPath } from '@/lib/source';
import { getPageTree, getPage, getPageNav, loadPageModule, extractFrontmatter, getRelativePath, getOriginalPath, isDraft } from '@/lib/source';
import { getFirstApiUrl } from '@/lib/api-routes';
import { StatusCodes } from 'http-status-codes';
import { resolveDocsRedirect } from '@/lib/tree-utils';
Expand Down Expand Up @@ -44,10 +44,12 @@ export default {
: [];
const apiSpecs = apiConfigs.length ? await loadApiSpecs(apiConfigs) : [];

const [tree, page] = await Promise.all([
const [tree, rawPage] = await Promise.all([
getPageTree(),
route.type === RouteType.DocsPage ? getPage(route.slug) : Promise.resolve(null),
]);
const page = rawPage && isDraft(rawPage) ? null : rawPage;

// SSR redirects for index pages
if (route.type === RouteType.ApiIndex) {
const firstUrl = getFirstApiUrl(apiSpecs);
Expand Down
1 change: 1 addition & 0 deletions packages/chronicle/src/types/content.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ export interface Frontmatter {
order?: number
icon?: string
lastModified?: string
draft?: boolean
_readingTime?: number
}

Expand Down
Loading