@fougere/cli 0.2.0-alpha.2 → 0.3.0-alpha.0

package/fronds/scaffold/services/ProjectWriter.ts

@@ -1,6 +1,7 @@
 import { cpSync, existsSync, renameSync, readFileSync, writeFileSync, readdirSync } from 'node:fs';
 import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
+import { type Conventions, DEFAULT_CONVENTIONS, frondPackage } from '@fougere/core/node';
 
 /**
  * The monorepo's `packages/`, found by its workspace marker rather than counted
@@ -67,7 +68,7 @@ export default class ProjectWriter {
 
   /**
    * Put a frond template's directories at the project root. Only the directories: at the
-   * root the app's own `package.json` is the frond's, and `@frond/<name>` comes from the
+   * root the app's own `package.json` is the frond's, and `@fronds/<name>` comes from the
    * directory through the Nuxt module's alias, so the template's package would only
    * duplicate it under a second name.
    */
@@ -81,8 +82,8 @@ export default class ProjectWriter {
   }
 
   /** Add a frond (business hexagon) under fronds/<name>. */
-  addFrond(wsDir: string, template: string, name: string): { path: string } {
-    const dest = join(wsDir, 'fronds', name);
+  addFrond(wsDir: string, template: string, name: string, conventions: Conventions = DEFAULT_CONVENTIONS): { path: string } {
+    const dest = join(wsDir, conventions.fronds, name);
     cpSync(join(TEMPLATES, 'fronds', template), dest, { recursive: true });
     // Only the import name. Carrying the convention is what makes a frond — the scan
     // reads directories. `fougere.frond` IS read now (`scanner.ts`, `frondNameOf`), but
@@ -90,7 +91,7 @@ export default class ProjectWriter {
     const pkgPath = join(dest, 'package.json');
     if (existsSync(pkgPath)) {
       const pkg = JSON.parse(readFileSync(pkgPath, 'utf8')) as { name: string };
-      pkg.name = `@frond/${name}`;
+      pkg.name = frondPackage(name, conventions);
       writeFileSync(pkgPath, JSON.stringify(pkg, null, 2) + '\n');
     }
     return { path: dest };
@@ -119,11 +120,11 @@ export default class ProjectWriter {
    * A template cannot carry it: the frond is named at composition time (`blog:catalog`),
    * so a dependency written into `templates/apps/nuxt` would name the template instead
    * and resolve to nothing. Which is what happened — the generated app imported
-   * `@frond/blog` whatever you had called it, and did not start.
+   * `@fronds/blog` whatever you had called it, and did not start.
    *
    * `fronds/` and `apps/` are the registry, like `listTemplates`: nothing to declare.
    */
-  linkFronds(wsDir: string): void {
+  linkFronds(wsDir: string, conventions: Conventions = DEFAULT_CONVENTIONS): void {
     const dirs = (kind: string): string[] => {
       const dir = join(wsDir, kind);
       if (!existsSync(dir)) return [];
@@ -131,7 +132,7 @@ export default class ProjectWriter {
       return readdirSync(dir, { withFileTypes: true }).filter((e) => e.isDirectory()).map((e) => e.name);
     };
 
-    const fronds = dirs('fronds');
+    const fronds = dirs(conventions.fronds);
     if (fronds.length === 0) return;
 
     for (const app of dirs('apps')) {
@@ -140,7 +141,7 @@ export default class ProjectWriter {
 
       const pkg = JSON.parse(readFileSync(pkgPath, 'utf8')) as { dependencies?: Record<string, string> };
       pkg.dependencies ??= {};
-      for (const frond of fronds) pkg.dependencies[`@frond/${frond}`] = 'workspace:*';
+      for (const frond of fronds) pkg.dependencies[frondPackage(frond, conventions)] = 'workspace:*';
       writeFileSync(pkgPath, JSON.stringify(pkg, null, 2) + '\n');
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fougere/cli",
-  "version": "0.2.0-alpha.2",
+  "version": "0.3.0-alpha.0",
   "description": "The Fougere CLI — compose a workspace, serve a frond, call an operation.",
   "keywords": [
     "fougere",
@@ -40,11 +40,12 @@
     "consola": "^3.4.2",
     "jiti": "^2.4.2",
     "picocolors": "^1.1.1",
-    "@fougere/schema": "0.2.0-alpha.2",
-    "@fougere/container": "0.2.0-alpha.2",
-    "@fougere/core": "0.2.0-alpha.2",
-    "@fougere/defaults": "0.2.0-alpha.2",
-    "@fougere/transport-http": "0.2.0-alpha.2"
+    "@fougere/container": "0.3.0-alpha.0",
+    "@fougere/schema": "0.3.0-alpha.0",
+    "@fougere/adapter-sql": "0.3.0-alpha.0",
+    "@fougere/transport-http": "0.3.0-alpha.0",
+    "@fougere/core": "0.3.0-alpha.0",
+    "@fougere/defaults": "0.3.0-alpha.0"
   },
   "devDependencies": {
     "vitest": "^4.1.0"
@@ -53,7 +54,7 @@
     "access": "public"
   },
   "scripts": {
-    "build": "rm -rf dist && tsc && chmod +x dist/bin.js",
+    "build": "rm -rf dist && tsc && chmod +x dist/bin.js && node dist/bin.js build",
     "test": "vitest run",
     "test:watch": "vitest",
     "typecheck": "tsc --noEmit && tsc -p tsconfig.runtime.json && tsc -p tsconfig.templates.json"

package/templates/admin/fronds/admin/handlers/UserHandler.ts

@@ -13,7 +13,7 @@ export default class UserHandler extends Crud(User) {
     if (!user) {
       throw new FougereError({ code: ErrorCode.NOT_FOUND, message: `User '${id}' not found`, entity: 'user', operation: 'deactivate' });
     }
-    if ((user as { status?: string }).status === 'inactive') {
+    if (user.status === 'inactive') {
       throw new FougereError({ code: ErrorCode.CONFLICT, message: 'Already inactive', entity: 'user', operation: 'deactivate' });
     }
     return this.orm.update(id, { status: 'inactive' });
@@ -21,9 +21,7 @@ export default class UserHandler extends Crud(User) {
 
   /** Active users, projected to the card contract. */
   async active(): Promise<UserCard[]> {
-    const all = await this.orm.list();
-    return all
-      .filter((u) => (u as { status?: string }).status === 'active')
-      .map((u) => ({ id: String(u.id), name: String(u.name), status: 'active' })) as UserCard[];
+    const users = await this.orm.list({ where: { status: 'active' } });
+    return users.map(({ id, name, status }) => ({ id, name, status }));
   }
 }

package/templates/admin/fronds/admin/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@frond/admin",
+  "name": "@fronds/admin",
   "version": "0.0.1",
   "type": "module",
   "exports": {

package/templates/api/fronds/api/handlers/TaskHandler.ts

@@ -13,7 +13,7 @@ export default class TaskHandler extends Crud(Task) {
     if (!task) {
       throw new FougereError({ code: ErrorCode.NOT_FOUND, message: `Task '${id}' not found`, entity: 'task', operation: 'complete' });
     }
-    if ((task as { status?: string }).status === 'done') {
+    if (task.status === 'done') {
       throw new FougereError({ code: ErrorCode.CONFLICT, message: 'Already done', entity: 'task', operation: 'complete' });
     }
     return this.orm.update(id, { status: 'done' });
@@ -21,9 +21,7 @@ export default class TaskHandler extends Crud(Task) {
 
   /** Still-open tasks, projected to the card contract. */
   async open(): Promise<TaskCard[]> {
-    const all = await this.orm.list();
-    return all
-      .filter((t) => (t as { status?: string }).status === 'open')
-      .map((t) => ({ id: String(t.id), title: String(t.title), status: 'open' })) as TaskCard[];
+    const tasks = await this.orm.list({ where: { status: 'open' } });
+    return tasks.map(({ id, title, status }) => ({ id, title, status }));
   }
 }

package/templates/api/fronds/api/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@frond/api",
+  "name": "@fronds/api",
   "version": "0.0.1",
   "type": "module",
   "exports": {

package/templates/apps/nuxt/app/pages/index.vue

@@ -3,7 +3,7 @@
 // They take an ENTITY, so this page names none: what is composed here is yours, and a
 // scaffold that guessed at an entity shipped a page that could not run.
 //
-//   import Post from '@frond/<your-frond>/entities/Post'
+//   import Post from '@fronds/<your-frond>/entities/Post'
 //   const { items, loading } = await useQuery(Post, 'list')
 //   const { values, errors, submit } = useFormFor(Post)
 //   const { execute } = useCommand(Post, 'publish')

package/templates/blog/app/pages/posts/index.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import Post from '@frond/blog/entities/Post';
+import Post from '@fronds/blog/entities/Post';
 
 interface Card { id: string; title: string; status: string }
 const { items: posts, loading, error } = await useQuery<Card>(Post, 'published');

package/templates/blog/app/pages/posts/manage.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import Post from '@frond/blog/entities/Post';
+import Post from '@fronds/blog/entities/Post';
 
 interface Row { id: string; title: string; status: 'draft' | 'published' }
 const { items: posts, loading } = await useQuery<Row>(Post, 'list');

package/templates/blog/app/pages/posts/new.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import Post from '@frond/blog/entities/Post';
+import Post from '@fronds/blog/entities/Post';
 
 const { values, errors, submit, loading, error } = useFormFor(Post);
 

package/templates/blog/fronds/blog/handlers/PostHandler.ts

@@ -19,7 +19,7 @@ export default class PostHandler extends Crud(Post) {
     if (!post) {
       throw new FougereError({ code: ErrorCode.NOT_FOUND, message: `Post '${id}' not found`, entity: 'post', operation: 'publish' });
     }
-    if ((post as { status?: string }).status === 'published') {
+    if (post.status === 'published') {
       throw new FougereError({ code: ErrorCode.CONFLICT, message: 'Already published', entity: 'post', operation: 'publish' });
     }
     return this.orm.update(id, { status: 'published' });
@@ -27,9 +27,7 @@ export default class PostHandler extends Crud(Post) {
 
   /** Only published posts exist for the outside world, projected to the card. */
   async published(): Promise<PostCard[]> {
-    const all = await this.orm.list();
-    return all
-      .filter((p) => (p as { status?: string }).status === 'published')
-      .map((p) => ({ id: String(p.id), title: String(p.title), status: 'published' })) as PostCard[];
+    const posts = await this.orm.list({ where: { status: 'published' } });
+    return posts.map(({ id, title, status }) => ({ id, title, status }));
   }
 }

package/templates/blog/fronds/blog/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@frond/blog",
+  "name": "@fronds/blog",
   "version": "0.0.1",
   "type": "module",
   "exports": {

package/templates/flat/AGENTS.md

@@ -0,0 +1,14 @@
+# Working in this application
+
+This project is built with **Fougere**. Read `CLAUDE.md` for the model and architecture guidance
+that applies to every coding agent.
+
+## Required verification workflow
+
+After every change to handlers, entities, Fronds, configuration, or topology:
+
+1. Run `fougere check`.
+2. Fix every deterministic error it reports before continuing.
+3. Run the relevant tests, then run `pnpm typecheck`.
+
+`fougere check` is the Fougere model barrier; tests and TypeScript come after it passes.

package/templates/flat/CLAUDE.md

@@ -44,7 +44,18 @@ exist to add what a projection cannot derive — never to replace it.
 
 ## Reading data
 
-`EntityOrm`, injected by type, is the only data access:
+Storage is reached through a repository. Never inject `EntityOrm` directly into a handler,
+presenter or collector — the boot refuses it. With no repository file, ask for the default shape:
+
+```ts
+import type { RepositoryOf } from '@fougere/core';
+import Product from '../entities/Product.js';
+
+constructor(private products: RepositoryOf<Product>) {}
+```
+
+If the handler extends `Crud(Product)`, its inherited `this.orm` is already backed by that
+repository; do not add a constructor. The repository forwards the guarded storage gestures:
 
 ```
 list(options?)        every row — `options.where` filters, plus paging and sorting
@@ -56,10 +67,21 @@ create / update / delete
 
 Read a relation with `findAllBy`. Never read a whole table to filter it in memory.
 
+When a query deserves a domain name, add `repositories/ProductRepository.ts` with
+`class ProductRepository extends Repository(Product)`, put the query there, and inject
+`ProductRepository`. A repository is registered as a provider and remains the only route to storage.
+
 ## Checking your work
 
+After every change to handlers, entities, Fronds, configuration, or topology:
+
+1. Run `fougere check`.
+2. Fix every deterministic error it reports before continuing.
+3. Run the relevant tests, then run the project typecheck.
+
 ```bash
-npx tsc -p tsconfig.frond.json    # the compiler — free, immediate, and it catches most of it
+fougere check
+pnpm typecheck
 ```
 
-Run it. It is the first judge, and the cheapest.
+`fougere check` is the Fougere model barrier; tests and TypeScript come after it passes.

package/templates/frond/AGENTS.md

@@ -0,0 +1,14 @@
+# Working in this application
+
+This project is built with **Fougere**. Read `CLAUDE.md` for the model and architecture guidance
+that applies to every coding agent.
+
+## Required verification workflow
+
+After every change to handlers, entities, Fronds, configuration, or topology:
+
+1. Run `fougere check`.
+2. Fix every deterministic error it reports before continuing.
+3. Run the relevant tests, then run `npx tsc -p fronds --noEmit`.
+
+`fougere check` is the Fougere model barrier; tests and TypeScript come after it passes.

package/templates/frond/CLAUDE.md

@@ -44,7 +44,18 @@ exist to add what a projection cannot derive — never to replace it.
 
 ## Reading data
 
-`EntityOrm`, injected by type, is the only data access:
+Storage is reached through a repository. Never inject `EntityOrm` directly into a handler,
+presenter or collector — the boot refuses it. With no repository file, ask for the default shape:
+
+```ts
+import type { RepositoryOf } from '@fougere/core';
+import Product from '../entities/Product.js';
+
+constructor(private products: RepositoryOf<Product>) {}
+```
+
+If the handler extends `Crud(Product)`, its inherited `this.orm` is already backed by that
+repository; do not add a constructor. The repository forwards the guarded storage gestures:
 
 ```
 list(options?)        every row — `options.where` filters, plus paging and sorting
@@ -56,10 +67,21 @@ create / update / delete
 
 Read a relation with `findAllBy`. Never read a whole table to filter it in memory.
 
+When a query deserves a domain name, add `repositories/ProductRepository.ts` with
+`class ProductRepository extends Repository(Product)`, put the query there, and inject
+`ProductRepository`. A repository is registered as a provider and remains the only route to storage.
+
 ## Checking your work
 
+After every change to handlers, entities, Fronds, configuration, or topology:
+
+1. Run `fougere check`.
+2. Fix every deterministic error it reports before continuing.
+3. Run the relevant tests, then run the project typecheck.
+
 ```bash
-npx tsc -p fronds --noEmit    # the compiler — free, immediate, and it catches most of it
+fougere check
+npx tsc -p fronds --noEmit
 ```
 
-Run it. It is the first judge, and the cheapest.
+`fougere check` is the Fougere model barrier; tests and TypeScript come after it passes.

package/templates/frond/fronds/__name__/handlers/PostHandler.ts

@@ -10,7 +10,7 @@ export default class PostHandler extends Crud(Post) {
     if (!post) {
       throw new FougereError({ code: ErrorCode.NOT_FOUND, message: `Post '${id}' not found`, entity: 'post', operation: 'publish' });
     }
-    if ((post as { status?: string }).status === 'published') {
+    if (post.status === 'published') {
       throw new FougereError({ code: ErrorCode.CONFLICT, message: 'Already published', entity: 'post', operation: 'publish' });
     }
     return this.orm.update(id, { status: 'published' });
@@ -18,9 +18,7 @@ export default class PostHandler extends Crud(Post) {
 
   /** Only published posts, projected to the card. */
   async published(): Promise<PostCard[]> {
-    const all = await this.orm.list();
-    return all
-      .filter((p) => (p as { status?: string }).status === 'published')
-      .map((p) => ({ id: String(p.id), title: String(p.title), status: 'published' })) as PostCard[];
+    const posts = await this.orm.list({ where: { status: 'published' } });
+    return posts.map(({ id, title, status }) => ({ id, title, status }));
   }
 }

package/templates/frond/fronds/__name__/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@frond/__name__",
+  "name": "@fronds/__name__",
   "version": "0.0.1",
   "type": "module",
   "exports": {

package/templates/frond/serve.mjs

@@ -8,11 +8,12 @@
  * Nothing in the frond changes — only where it runs.
  */
 import { createJiti } from 'jiti';
-import { createLocalRunner, setModuleLoader, frondAliases, Logger } from '@fougere/core';
+import { createLocalRunner, Logger } from '@fougere/core';
+import { setModuleLoader, frondAliases } from '@fougere/core/node';
 import { bootAppFromConfig } from '@fougere/defaults';
 import { serve } from '@fougere/transport-http';
 
-// `frondAliases` is what makes `@frond/<neighbour>/entities/X.js` resolve — the
+// `frondAliases` is what makes `@fronds/<neighbour>/entities/X.js` resolve — the
 // named form a frond uses for its neighbour. A bare jiti loads frond sources but
 // not that convention, so a collector or handler importing across fronds dies here
 // while the same code works in-process.

package/templates/fronds/blank/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@frond/__name__",
+  "name": "@fronds/__name__",
   "version": "0.0.1",
   "type": "module",
   "exports": {

package/templates/fronds/blog/handlers/PostHandler.ts

@@ -30,9 +30,7 @@ export default class PostHandler extends Crud(Post) {
 
   /** Only published posts, projected to the card. */
   async published(): Promise<PostCard[]> {
-    const all = await this.orm.list();
-    return all
-      .filter((p) => p.status === 'published')
-      .map(({ id, title, status }) => ({ id, title, status }));
+    const posts = await this.orm.list({ where: { status: 'published' } });
+    return posts.map(({ id, title, status }) => ({ id, title, status }));
   }
 }

package/templates/fronds/blog/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@frond/__name__",
+  "name": "@fronds/__name__",
   "version": "0.0.1",
   "type": "module",
   "exports": {

package/templates/workspace/AGENTS.md

@@ -0,0 +1,14 @@
+# Working in this application
+
+This project is built with **Fougere**. Read `CLAUDE.md` for the model and architecture guidance
+that applies to every coding agent.
+
+## Required verification workflow
+
+After every change to handlers, entities, Fronds, configuration, or topology:
+
+1. Run `fougere check`.
+2. Fix every deterministic error it reports before continuing.
+3. Run the relevant tests, then run `pnpm typecheck`.
+
+`fougere check` is the Fougere model barrier; tests and TypeScript come after it passes.

package/templates/workspace/CLAUDE.md

@@ -44,7 +44,18 @@ exist to add what a projection cannot derive — never to replace it.
 
 ## Reading data
 
-`EntityOrm`, injected by type, is the only data access:
+Storage is reached through a repository. Never inject `EntityOrm` directly into a handler,
+presenter or collector — the boot refuses it. With no repository file, ask for the default shape:
+
+```ts
+import type { RepositoryOf } from '@fougere/core';
+import Product from '../entities/Product.js';
+
+constructor(private products: RepositoryOf<Product>) {}
+```
+
+If the handler extends `Crud(Product)`, its inherited `this.orm` is already backed by that
+repository; do not add a constructor. The repository forwards the guarded storage gestures:
 
 ```
 list(options?)        every row — `options.where` filters, plus paging and sorting
@@ -56,10 +67,21 @@ create / update / delete
 
 Read a relation with `findAllBy`. Never read a whole table to filter it in memory.
 
+When a query deserves a domain name, add `repositories/ProductRepository.ts` with
+`class ProductRepository extends Repository(Product)`, put the query there, and inject
+`ProductRepository`. A repository is registered as a provider and remains the only route to storage.
+
 ## Checking your work
 
+After every change to handlers, entities, Fronds, configuration, or topology:
+
+1. Run `fougere check`.
+2. Fix every deterministic error it reports before continuing.
+3. Run the relevant tests, then run the project typecheck.
+
 ```bash
-pnpm typecheck    # the compiler — free, immediate, and it catches most of it
+fougere check
+pnpm typecheck
 ```
 
-Run it. It is the first judge, and the cheapest.
+`fougere check` is the Fougere model barrier; tests and TypeScript come after it passes.