project title

mbostock · mbostock · commit f59f3cfaa6b2 · 2023-11-09T12:42:18.000-08:00
diff --git a/docs/.observablehq/config.ts b/docs/.observablehq/config.ts
@@ -1,4 +1,5 @@
 export default {
+  title: "Observable CLI",
   pages: [
     {path: "/index", name: "Overview"},
     {path: "/getting-started", name: "Getting started"},
diff --git a/docs/index.md b/docs/index.md
@@ -1,7 +1,3 @@
----
-title: Overview
----
-
 # Observable CLI
 
 ```js
diff --git a/src/build.ts b/src/build.ts
@@ -4,6 +4,7 @@ import {basename, dirname, join, normalize, relative} from "node:path";
 import {cwd} from "node:process";
 import {fileURLToPath} from "node:url";
 import {parseArgs} from "node:util";
+import {readConfig} from "./config.js";
 import {Loader} from "./dataloader.js";
 import {prepareOutput, visitFiles, visitMarkdownFiles} from "./files.js";
 import {readPages} from "./navigation.js";
@@ -28,6 +29,7 @@ export async function build(context: CommandContext = makeCommandContext()) {
   }
 
   // Render .md files, building a list of file attachments as we go.
+  const config = await readConfig(sourceRoot);
   const pages = await readPages(sourceRoot);
   const files: string[] = [];
   const resolver = await makeCLIResolver();
@@ -40,6 +42,7 @@ export async function build(context: CommandContext = makeCommandContext()) {
       root: sourceRoot,
       path,
       pages,
+      title: config?.title,
       resolver
     });
     files.push(...render.files.map((f) => join(dirname(sourceFile), f.name)));
diff --git a/src/config.ts b/src/config.ts
@@ -1,9 +1,9 @@
 import {stat} from "node:fs/promises";
 import {join} from "node:path";
-import {type RenderOptions} from "./render.js";
 
 export interface Config {
-  pages?: RenderOptions["pages"];
+  title?: string;
+  pages?: {path: string; name: string}[];
 }
 
 export async function readConfig(root: string): Promise<Config | undefined> {
diff --git a/src/preview.ts b/src/preview.ts
@@ -6,6 +6,7 @@ import {fileURLToPath} from "node:url";
 import {parseArgs} from "node:util";
 import send from "send";
 import {type WebSocket, WebSocketServer} from "ws";
+import {readConfig} from "./config.js";
 import {Loader} from "./dataloader.js";
 import {HttpError, isHttpError, isNodeError} from "./error.js";
 import {maybeStat} from "./files.js";
@@ -118,6 +119,7 @@ class Server {
                 root: this.root,
                 path: pathname,
                 pages,
+                title: (await readConfig(this.root))?.title,
                 resolver: this._resolver!
               })
             ).html
diff --git a/src/render.ts b/src/render.ts
@@ -1,4 +1,5 @@
 import {dirname, join} from "node:path";
+import {type Config} from "./config.js";
 import {computeHash} from "./hash.js";
 import {resolveImport} from "./javascript/imports.js";
 import {type FileReference, type ImportReference} from "./javascript.js";
@@ -10,10 +11,9 @@ export interface Render {
   imports: ImportReference[];
 }
 
-export interface RenderOptions {
+export interface RenderOptions extends Config {
   root: string;
   path: string;
-  pages?: {path: string; name: string}[];
   resolver: (cell: CellPiece) => CellPiece;
 }
 
@@ -49,14 +49,19 @@ type RenderInternalOptions =
 
 function render(
   parseResult: ParseResult,
-  {path, pages, preview, hash, resolver}: RenderOptions & RenderInternalOptions
+  {path, pages, title, preview, hash, resolver}: RenderOptions & RenderInternalOptions
 ): string {
   const showSidebar = pages && pages.length > 1;
   return `<!DOCTYPE html>
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
 ${
-  parseResult.title ? `<title>${escapeData(parseResult.title)}</title>\n` : ""
+  parseResult.title || title
+    ? `<title>${[parseResult.title, parseResult.title === title ? null : title]
+        .filter((title): title is string => !!title)
+        .map((title) => escapeData(title))
+        .join(" | ")}</title>\n`
+    : ""
 }<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
 <link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css2?family=Source+Serif+Pro:ital,wght@0,400;0,600;0,700;1,400;1,600;1,700&display=swap">
 <link rel="stylesheet" type="text/css" href="/_observablehq/style.css">

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`export default {`
	`2`	`+ title: "Observable CLI",`
`2`	`3`	`pages: [`
`3`	`4`	`{path: "/index", name: "Overview"},`
`4`	`5`	`{path: "/getting-started", name: "Getting started"},`
-Original file line number
+Diff line change
@@ @@ -1,7 +1,3 @@ @@
 ----
 -title: Overview
 ----
+-
 # Observable CLI
 ```js