create-hollware 0.5.0 → 0.8.0

package/README.md

@@ -13,14 +13,16 @@ It copies the starter into `my-cms`, pins every Hollware package at its own vers
 its owner and a first personal token. Then it prints the token once, a link to set up your passkey
 for the admin, and the `claude mcp add` line that connects Claude Code to it.
 
-| Option             | What it does                                                    |
-| ------------------ | --------------------------------------------------------------- |
-| `--name <name>`    | The name of the Worker and of its database (default: the dir)   |
-| `--site <key>`     | The key of your site in `hollware.config.ts` (default: my-site) |
-| `--pm <npm\|pnpm>` | The package manager that installs (default: npm)                |
-| `--yes`            | Take the defaults; the directory is `my-hollware`               |
-| `--no-install`     | Only write the files                                            |
-| `--no-git`         | Do not run `git init`                                           |
+| Option             | What it does                                                      |
+| ------------------ | ----------------------------------------------------------------- |
+| `--name <name>`    | The name of the Worker and of its database (default: the dir)     |
+| `--site <key>`     | The key of your site, such as my-site (default: my-site)          |
+| `--preset <name>`  | What the site starts with: blog, docs or empty (default: blog)    |
+| `--locales <list>` | Its locales, comma-separated, the first the default (default: en) |
+| `--pm <npm\|pnpm>` | The package manager that installs (default: npm)                  |
+| `--yes`            | Take the defaults; the directory is `my-hollware`                 |
+| `--no-install`     | Only write the files                                              |
+| `--no-git`         | Do not run `git init`                                             |
 
 The directory must be new or empty. Node.js 24 or later.
 

package/dist/index.mjs

@@ -14,7 +14,9 @@ const USAGE = [
 	"",
 	"Options:",
 	"  --name <name>    The name of the Worker and of its database (default: the name of <dir>)",
-	"  --site <key>     The key of your site in hollware.config.ts (default: my-site)",
+	"  --site <key>     The key of your site, such as my-site; it never changes (default: my-site)",
+	"  --preset <name>  What the site starts with: blog, docs or empty (default: blog)",
+	"  --locales <list> Its locales, comma-separated, the first the default (default: en)",
 	"  --pm <npm|pnpm>  The package manager that installs (default: npm)",
 	"  --yes            Take the defaults: <dir> is my-hollware when it is not given",
 	"  --no-install     Do not install, migrate or make the site",
@@ -32,7 +34,7 @@ var CreateError = class extends Error {
 };
 /** A Worker's name: lowercase letters, digits and hyphens, as Cloudflare takes it. */
 const WORKER_NAME = /^[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?$/;
-/** A site key, as hollware.config.ts takes it. */
+/** A site key, as a site's definition takes it (ADR-033). */
 const SITE_KEY = /^[a-z0-9]+(?:-[a-z0-9]+)*$/;
 /** What `@hollware/*` and `hollware` say in the template's package.json. */
 const VERSION_PLACEHOLDER = "HOLLWARE_VERSION";
@@ -47,6 +49,8 @@ function readChoices(argv) {
 				options: {
 					name: { type: "string" },
 					site: { type: "string" },
+					preset: { type: "string" },
+					locales: { type: "string" },
 					pm: { type: "string" },
 					yes: { type: "boolean" },
 					"no-install": { type: "boolean" },
@@ -73,7 +77,8 @@ function readChoices(argv) {
 		site,
 		pm,
 		install: values["no-install"] !== true,
-		git: values["no-git"] !== true
+		git: values["no-git"] !== true,
+		initFlags: [...values.preset === void 0 ? [] : ["--preset", values.preset], ...values.locales === void 0 ? [] : ["--locales", values.locales]]
 	};
 }
 function replaceIn(path, replacements) {
@@ -91,7 +96,7 @@ function writeProject(io, target, choices) {
 		["\"database_name\": \"my-hollware\"", `"database_name": "${choices.name}"`],
 		["hollware-events", `${choices.name}-events`]
 	]);
-	for (const file of ["hollware.config.ts", "README.md"]) replaceIn(join(target, file), [["my-site", choices.site]]);
+	for (const file of ["README.md"]) replaceIn(join(target, file), [["my-site", choices.site]]);
 	if (choices.pm === "pnpm") writeFileSync(join(target, "pnpm-workspace.yaml"), PNPM_WORKSPACE);
 }
 /**
@@ -126,7 +131,7 @@ async function create(argv, io) {
 			`  cd ${choices.dir}`,
 			`  ${choices.pm} install`,
 			`  ${choices.pm} exec hollware migrate --local`,
-			`  ${choices.pm} exec hollware init --site ${choices.site} --local`
+			`  ${choices.pm} exec hollware init --site ${[choices.site, ...choices.initFlags].join(" ")} --local`
 		].join("\n"));
 		return 0;
 	}
@@ -138,6 +143,7 @@ async function create(argv, io) {
 		"init",
 		"--site",
 		choices.site,
+		...choices.initFlags,
 		"--local"
 	], target);
 	io.out(init.stdout.trim());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-hollware",
-  "version": "0.5.0",
+  "version": "0.8.0",
   "description": "Create a new Hollware project.",
   "homepage": "https://hollware.com",
   "bugs": {

package/template/AGENTS.md

@@ -1,14 +1,15 @@
 # AGENTS.md
 
-This is a Hollware project: a headless CMS on Cloudflare Workers. The content lives in D1 and is
-written over MCP; this repository holds only the config and the Worker.
+This is a Hollware project: a headless CMS on Cloudflare Workers. The content and the structure
+of the sites live in D1; this repository holds only the Worker.
 
-- `hollware.config.ts` is the source of truth for what content is valid. A change of a schema, a
-  route or a style guide changes what every agent may write; `describe_site` over MCP returns it.
-- `src/worker.ts` stays as it is: `createHollware(config)` is the whole Worker.
+- The structure of a site (its collections, the JSON Schema of their frontmatter, routes, rules,
+  style guides) is data: read it with `get_structure`, change it with `update_site` or
+  `set_collection` (they need `schema:admin`), or in the admin at `/admin/`. It applies at once;
+  nothing here changes and nothing is deployed.
+- `src/worker.ts` stays as it is: `createHollware()` is the whole Worker.
 - Content is never edited in files here. Write it through the MCP tools (`create_draft`,
   `update_draft`, `validate`, `publish`) of the Hollware at `HOLLWARE_PUBLIC_URL` + `/mcp`.
-- Run `pnpm test` and `pnpm exec wrangler types --check` after a change of the config or of
-  `wrangler.jsonc`, and `pnpm exec hollware doctor` when something does not work.
+- Run `pnpm test` and `pnpm exec wrangler types --check` after a change of `wrangler.jsonc`, and `pnpm exec hollware doctor` when something does not work.
 - Never commit a token. `hollware init` and `hollware token create` print one once.
 - Docs: https://hollware.com

package/template/README.md

@@ -1,14 +1,14 @@
 # My Hollware
 
 A [Hollware](https://hollware.com) project: a headless CMS on Cloudflare Workers that your agents
-write to over MCP. The config says what your content is; every write is checked against it.
+write to over MCP. Your sites, their collections and their rules live in the database: shape them
+in the admin, or let an agent do it, and every write is checked against them. No deploy.
 
 ## What is inside
 
 | Path                        | What it is                                                                         |
 | --------------------------- | ---------------------------------------------------------------------------------- |
-| `hollware.config.ts`        | Your sites and their collections: the schema of the frontmatter, routes, guidance  |
-| `src/worker.ts`             | The Worker: `createHollware(config)` builds it                                     |
+| `src/worker.ts`             | The Worker: `createHollware()` builds it                                           |
 | `wrangler.jsonc`            | The Worker, its D1 database, its KV namespace, its queues and its public URL       |
 | `vite.config.ts`            | Vite with the Cloudflare plugin, and the admin at `/admin/`                        |
 | `vitest.config.ts`, `test/` | Tests that run inside workerd                                                      |
@@ -26,7 +26,7 @@ its owner and a first token. To do it again on a new local database:
 
 ```sh
 pnpm exec hollware migrate --local
-pnpm exec hollware init --site my-site --local
+pnpm exec hollware init --site my-site --local   # --preset blog|docs|empty --locales en,es
 ```
 
 `init` prints a personal token once, and a link to set up your passkey for the admin. Give the

package/template/src/worker.ts

@@ -1,8 +1,8 @@
 import { createHollware } from '@hollware/server'
-import config from '../hollware.config.ts'
 
-// This file is the whole Worker: the config goes in, the Worker comes out.
-const hollware = createHollware(config)
+// This file is the whole Worker. Your sites, their collections and their rules live in the
+// database: shape them in the admin at /admin/, or have an agent do it over MCP. No deploy.
+const hollware = createHollware()
 
 // MCP for your agents at /mcp, behind a personal token.
 export default {
@@ -11,5 +11,5 @@ export default {
   queue: hollware.queue,
 } satisfies ExportedHandler<Env>
 
-// What your sites read over a service binding: four read-only methods, no network, no token.
+// What your sites read over a service binding: read-only methods, no network, no token.
 export class Hollware extends hollware.Hollware {}

package/template/test/worker.workerd.test.ts

@@ -1,14 +1,15 @@
+import { sitePreset } from '@hollware/core'
 import type { HollwareRpc } from '@hollware/server'
 import { env, exports } from 'cloudflare:workers'
 import { describe, expect, it } from 'vitest'
 
 import worker from '../src/worker.ts'
 
-// Fails when: src/worker.ts stops exporting `{ fetch: hollware.fetch }` of createHollware(config)
+// Fails when: src/worker.ts stops exporting `{ fetch: hollware.fetch }` of createHollware()
 // as the Worker, so that GET /health for the public URL of wrangler.jsonc (localhost:5199) stops
 // answering 200, or another Host stops being a 403; when it stops exporting the class `Hollware`
-// that sites read over a service binding, or builds it from another config than hollware.config.ts
-// (describeSite must answer the site `my-site`); or when the D1 binding of wrangler.jsonc stops
+// that sites read over a service binding, or stops serving the sites of the database (ADR-033:
+// describeSite must answer the site that `hollware init` makes); or when the D1 binding of wrangler.jsonc stops
 // pointing `migrations_dir` at the migrations of @hollware/server, so that its tables are missing.
 
 // A request made inside workerd has no Host header of its own: a browser or curl would send one.
@@ -45,7 +46,14 @@ describe('the Worker over HTTP', () => {
 })
 
 describe('the Hollware class', () => {
-  it('serves the site of hollware.config.ts over RPC', async () => {
+  it('serves the site of the database over RPC, as hollware init makes it', async () => {
+    const definition = sitePreset('blog', ['en', 'es'], 'en')
+    await env.DB.prepare(
+      "INSERT INTO sites (id, definition, version, created_at, updated_at) VALUES ('my-site', ?1, 1, 'now', 'now')",
+    )
+      .bind(JSON.stringify(definition))
+      .run()
+
     const answer = await rpc.describeSite('my-site')
 
     expect(answer).toMatchObject({
@@ -87,11 +95,14 @@ describe('the database', () => {
       'outbox',
       'passkeys',
       'publications',
+      'review_comments',
       'reviews',
       'revision_tags',
       'revisions',
       'schedules',
       'sessions',
+      'site_changes',
+      'site_secrets',
       'sites',
       'tokens',
       'users',

package/template/tsconfig.json

@@ -27,7 +27,6 @@
   },
   "include": [
     "worker-configuration.d.ts",
-    "hollware.config.ts",
     "src",
     "test"
   ]

package/template/hollware.config.ts

@@ -1,36 +0,0 @@
-import { defineCollection, defineConfig } from '@hollware/core'
-import * as z from 'zod'
-
-/**
- * The config of your Hollware: one site with a small bilingual blog. Agents read it with
- * `describe_site` before they write, so everything it says is what they follow: the shape of the
- * frontmatter, the routes of an entry per locale, and the style guide.
- *
- * `my-site` is the key of the site. Create it in your database with `hollware init --site my-site`.
- */
-const blog = defineCollection({
-  schema: z.object({
-    title: z.string().min(1),
-    description: z.string().min(1).max(160),
-    date: z.iso.date(),
-    tags: z.array(z.string().min(1)).min(1),
-    // The entries of one post in each language share this value.
-    translationGroup: z.string().regex(/^[a-z0-9]+(?:-[a-z0-9]+)*$/),
-  }),
-  routes: { en: '/blog/:slug/', es: '/es/blog/:slug/' },
-  translations: { groupBy: 'translationGroup' },
-  tags: 'tags',
-  sortBy: 'date',
-  styleGuide: 'Short paragraphs, one idea per section, and an example for every claim.',
-})
-
-export default defineConfig({
-  sites: {
-    'my-site': {
-      locales: ['en', 'es'],
-      defaultLocale: 'en',
-      collections: { blog },
-      styleGuide: 'Plain language, with the reader in the second person.',
-    },
-  },
-})