-
+
+
{objects.map((object, index) => {
const root = object.path === '/';
const children = childrenOf(objects, object.path);
- const Tag = object.href ? 'a' : 'button';
return
{!root &&
}
-
item.path === object.path) + 1}
- aria-selected={object.path === initialObject.path}
- tabindex={object.href ? 0 : -1}
+ aria-selected={object.path === currentPath}
+ aria-current={object.path === currentPath ? 'page' : undefined}
+ tabindex="0"
>
{root ? : <>{object.name}{children.length > 0 && −}}
-
+ :
{object.name}}
+
+ {!root && children.length > 0 &&
}
;
})}
-
+
diff --git a/site/src/content.config.ts b/site/src/content.config.ts
index cd94c01..58fdaef 100644
--- a/site/src/content.config.ts
+++ b/site/src/content.config.ts
@@ -4,8 +4,8 @@ import { glob } from 'astro/loaders';
const book = defineCollection({
loader: glob({
base: '../contents',
- pattern: '**/*.md',
- // Keep source filenames stable, including chapter numbers and draft paths.
+ pattern: ['**/*.md', '!draft/**'],
+ // Keep published source filenames stable; drafts remain source-only.
generateId: ({ entry }) => entry.replace(/\.md$/, ''),
}),
});
diff --git a/site/src/layouts/Site.astro b/site/src/layouts/Site.astro
index 559aebf..d39d155 100644
--- a/site/src/layouts/Site.astro
+++ b/site/src/layouts/Site.astro
@@ -1,23 +1,27 @@
---
+import { ClientRouter } from 'astro:transitions';
import '../styles/global.css';
import { href, repository } from '../lib/book';
-interface Props { title?: string; description?: string; book?: boolean; landing?: boolean; }
-const { title = 'Web Interface Protocol', description = 'デジタル環境を、発見・観測・操作できるWorldspaceへ。WIPのコンセプトと仕様を読む。', book = false, landing = false } = Astro.props;
+interface Props { title?: string; description?: string; book?: boolean; landing?: boolean; intro?: boolean; }
+const { title = 'Worldspace Interface Protocol', description = 'デジタル環境を、発見・観測・操作できるWorldspaceへ。WIPのコンセプトと仕様を読む。', book = false, landing = true, intro = false } = Astro.props;
const canonical = Astro.site ? new URL(Astro.url.pathname, Astro.site) : undefined;
---
-
+
- {landing && }
+ window.__wipVisited = true;
+
{title} · WIP
@@ -32,7 +36,7 @@ const canonical = Astro.site ? new URL(Astro.url.pathname, Astro.site) : undefin
本文へスキップ
- {!landing && }
+ {!landing && }
diff --git a/site/src/lib/book.ts b/site/src/lib/book.ts
index 8c77806..6fa9d30 100644
--- a/site/src/lib/book.ts
+++ b/site/src/lib/book.ts
@@ -19,5 +19,5 @@ export function sourceHref(document: Document): string {
return `${repository}/src/branch/main/contents/${document.id.split('/').map(encodeURIComponent).join('/')}.md`;
}
export async function documents(): Promise
{
- return (await getCollection('book')).sort((a, b) => a.id.localeCompare(b.id, 'en', { numeric: true }));
+ return (await getCollection('book', (entry) => !isDraft(entry))).sort((a, b) => a.id.localeCompare(b.id, 'en', { numeric: true }));
}
diff --git a/site/src/lib/landing-tree.ts b/site/src/lib/landing-tree.ts
index 6f01b85..e53e280 100644
--- a/site/src/lib/landing-tree.ts
+++ b/site/src/lib/landing-tree.ts
@@ -2,7 +2,6 @@ export interface DocumentSource {
id: string;
title: string;
href: string;
- html: string;
}
export interface TreeNode {
@@ -12,7 +11,6 @@ export interface TreeNode {
depth: number;
title?: string;
href?: string;
- html?: string;
}
// Mirror the content directory. No authored taxonomy, summaries or demo data.
@@ -25,7 +23,7 @@ export function documentTree(documents: readonly DocumentSource[]): TreeNode[] {
const path = `${parent === '/' ? '' : parent}/${name}`;
const file = index === segments.length - 1;
if (!nodes.some((node) => node.path === path)) {
- nodes.push({ name, path, parent, depth: index + 2, ...(file ? { title: document.title, href: document.href, html: document.html } : {}) });
+ nodes.push({ name, path, parent, depth: index + 2, ...(file ? { title: document.title, href: document.href } : {}) });
}
parent = path;
});
@@ -34,6 +32,35 @@ export function documentTree(documents: readonly DocumentSource[]): TreeNode[] {
return [nodes[0], ...visit('/')];
}
+// Display numbered sections beneath their chapter without changing file paths,
+// links, or the physical directory tree used by directory indexes and routes.
+export function chapterTree(documents: readonly DocumentSource[]): TreeNode[] {
+ const nodes = documentTree(documents);
+ const numbered = nodes.filter((node) => node.href).flatMap((node) => {
+ const number = node.name.match(/^(\d+(?:\.\d+)*)-/)?.[1];
+ return number ? [{ node, number, directory: node.parent! }] : [];
+ });
+ for (const { node, number, directory } of numbered) {
+ const separator = number.lastIndexOf('.');
+ if (separator < 0) continue;
+ const parent = numbered.find((candidate) => candidate.directory === directory && candidate.number === number.slice(0, separator));
+ if (parent) node.parent = parent.node.path;
+ }
+ const visit = (parent: TreeNode): TreeNode[] => childrenOf(nodes, parent.path).flatMap((node) => {
+ node.depth = parent.depth + 1;
+ return [node, ...visit(node)];
+ });
+ return [nodes[0], ...visit(nodes[0])];
+}
+
+// The public explorer has a single book/ container below the site root.
+export function bookTree(documents: readonly DocumentSource[]): TreeNode[] {
+ const [root, ...chapters] = chapterTree(documents);
+ return [root, { name: 'book/', path: '/book', parent: '/', depth: 2 }, ...chapters.map((node) => ({
+ ...node, parent: node.parent === '/' ? '/book' : node.parent, depth: node.depth + 1,
+ }))];
+}
+
export const childrenOf = (nodes: readonly TreeNode[], path: string) => nodes.filter((node) => node.parent === path);
export function visibleNodes(nodes: readonly TreeNode[], collapsed: ReadonlySet): TreeNode[] {
@@ -50,10 +77,10 @@ export function visibleNodes(nodes: readonly TreeNode[], collapsed: ReadonlySet<
export function treePrefix(node: TreeNode, nodes: readonly TreeNode[], visible: readonly TreeNode[] = nodes): string {
if (!node.parent) return '';
const isLast = (item: TreeNode) => childrenOf(visible, item.parent!).at(-1)?.path === item.path;
- let prefix = isLast(node) ? '└── ' : '├── ';
+ let prefix = isLast(node) ? '└─ ' : '├─ ';
let parent = nodes.find((item) => item.path === node.parent);
while (parent?.parent) {
- prefix = (isLast(parent) ? ' ' : '│ ') + prefix;
+ prefix = (isLast(parent) ? ' ' : '│ ') + prefix;
parent = nodes.find((item) => item.path === parent!.parent);
}
return prefix;
diff --git a/site/src/pages/404.astro b/site/src/pages/404.astro
index b1d9dcf..7cb48ed 100644
--- a/site/src/pages/404.astro
+++ b/site/src/pages/404.astro
@@ -1,7 +1,10 @@
---
import Site from '../layouts/Site.astro';
+import Landing from '../components/Landing.astro';
import { href } from '../lib/book';
---
- 404 / NOT FOUND
このページは見つかりません。
Bookの目次から、お探しの章へ移動できます。
Bookの目次へ →
+
+ 404 / NOT FOUND
このページは見つかりません。
Bookの目次から、お探しの章へ移動できます。
Bookの目次へ →
+
diff --git a/site/src/pages/book/[...slug].astro b/site/src/pages/book/[...slug].astro
index 9f0e05f..d9647af 100644
--- a/site/src/pages/book/[...slug].astro
+++ b/site/src/pages/book/[...slug].astro
@@ -1,36 +1,27 @@
---
import { render } from 'astro:content';
import Site from '../../layouts/Site.astro';
-import ChapterNav from '../../components/ChapterNav.astro';
-import { documents, bookHref, title, isDraft, sourceHref, href, type Document } from '../../lib/book';
+import Landing from '../../components/Landing.astro';
+import DirectoryIndex from '../../components/DirectoryIndex.astro';
+import { documents, bookHref, title, isDraft, type Document } from '../../lib/book';
+import { documentTree } from '../../lib/landing-tree';
export async function getStaticPaths() {
- return (await documents()).map((entry) => ({ params: { slug: entry.id }, props: { entry } }));
+ const entries = await documents();
+ const folders = documentTree(entries.map((entry) => ({ id: entry.id, title: title(entry), href: bookHref(entry.id) })))
+ .filter((node) => !node.href && node.path !== '/');
+ return [
+ ...entries.map((entry) => ({ params: { slug: entry.id }, props: { entry, path: `/${entry.id}.md` } })),
+ ...folders.map((node) => ({ params: { slug: node.path.slice(1) }, props: { path: node.path } })),
+ ];
}
-interface Props { entry: Document; }
-const { entry } = Astro.props;
-const entries = await documents();
-const { Content, headings } = await render(entry);
-const draft = isDraft(entry);
-const sequence = entries.filter((item) => isDraft(item) === draft);
-const position = sequence.findIndex((item) => item.id === entry.id);
-const previous = sequence[position - 1];
-const next = sequence[position + 1];
-const toc = headings.filter((heading) => heading.depth === 2 || heading.depth === 3);
+interface Props { entry?: Document; path: string; }
+const { entry, path } = Astro.props;
+const rendered = entry ? await render(entry) : undefined;
+const Content = rendered?.Content;
+const label = entry ? title(entry) : `${path.slice(1)}/`;
---
-
-
-
-
-
- 章を選ぶ
このページの目次
-
-
-
-
- THE WIP BOOK
- 世界の見方から、
通信の約束まで。
- WIPのコンセプト、共通モデル、ClientとHostの契約を、ひとつの流れで読むためのリファレンスです。
- 第1章から読む →
-
- 仕様を読む {chapters.length} chapters
- {chapters.map((entry) => - {title(entry)}↗
)}
-
-
- WORK IN PROGRESS
- 草案と未解決事項
- API設計や投影方針を検討する文書です。正本とは分けて掲載し、確定したProtocolの契約と混同しません。
-
-
- ← WIPについて
-
-