@fougere/cli 0.11.0-alpha.0 → 0.12.1-alpha.0

package/app/commands/GraphCommand.ts

@@ -19,12 +19,12 @@ export default class GraphCommand {
 
     if (machineWanted(raw)) return printMachine(result);
 
-    if (result.fronds.length === 0) {
+    if (result.totalFronds === 0) {
       this.ui.warn('No fronds found. Run this from a Fougere project root.');
       return;
     }
 
-    this.ui.step(`${pc.bold(String(result.totalEntities))} entities, ${pc.bold(String(result.totalRefs))} refs, ${pc.bold(String(result.fronds.length))} frond(s)`);
+    this.ui.step(`${pc.bold(String(result.totalEntities))} entities, ${pc.bold(String(result.totalRefs))} refs, ${pc.bold(String(result.totalFronds))} frond(s)`);
     this.ui.note(renderFronds(result.declared), 'Fronds');
     this.ui.note(renderGraph(result.nodes), 'Entity Graph');
 
@@ -33,7 +33,7 @@ export default class GraphCommand {
       this.ui.note(renderClusters(result.clusters), 'Suggested Domains');
     }
 
-    if (result.fronds.length === 1 && result.clusters.length > 1 && result.totalEntities >= min) {
+    if (result.totalFronds === 1 && result.clusters.length > 1 && result.totalEntities >= min) {
       this.ui.info(`${pc.dim('Tip:')} ${result.clusters.length} natural domains detected. Consider splitting into separate fronds.`);
     }
 
@@ -63,8 +63,8 @@ function renderFronds(declared: DeclaredTopology): string {
   }).join('\n');
 }
 
-function renderGraph(nodes: Map<string, EntityNode>): string {
-  return [...nodes.entries()].map(([name, node]) => {
+function renderGraph(nodes: Record<string, EntityNode>): string {
+  return Object.entries(nodes).map(([name, node]) => {
     const refs = node.refs.length > 0
       ? ` ${pc.dim('→')} ${node.refs.map((r) => pc.cyan(r)).join(', ')}`
       : '';

package/app/commands/ServeCommand.ts

@@ -36,7 +36,7 @@ export default class ServeCommand {
     // the same way rather than the first one being special.
     const conventions = await installLoader(root, watching);
 
-    let hosted = await bootApp(root, { fronds: [frond], topology: false });
+    let hosted = await bootApp(root, { only: [frond], topology: false });
     if (!hosted.fronds.some((f) => f.name === frond)) {
       this.ui.error(`Frond '${frond}' introuvable dans ce projet.`);
       return;
@@ -64,7 +64,7 @@ export default class ServeCommand {
       const started = Date.now();
       let next: App;
       try {
-        next = await bootApp(root, { fronds: [frond], topology: false });
+        next = await bootApp(root, { only: [frond], topology: false });
       } catch (error) {
         // The previous app keeps serving: a dev loop that dies on a typo is worse than
         // one that holds the last state which booted.

package/fronds/analysis/handlers/CheckHandler.ts

@@ -12,6 +12,7 @@ import ProjectScan from '../services/ProjectScan.js';
 import { statSync } from 'node:fs';
 import { dirname, join } from 'node:path';
 import { FACADE_OUT, DEFAULT_OUT } from './BuildHandler.js';
+import { remotesOf } from '@fougere/core/node';
 
 export interface CheckResult {
   fronds: number;
@@ -46,7 +47,7 @@ export default class CheckHandler {
     // migration, seed or adapter mount is needed for a global semantic check.
     const model = resolveEffectiveOperations(fronds, {
       diagnostics,
-      remotes: config.remotes,
+      remotes: remotesOf(config),
       adapters: config.adapters,
     });
     const findings: Diagnostic[] = [...model.diagnostics];

package/fronds/analysis/handlers/DevtoolsHandler.ts

@@ -1,6 +1,7 @@
 import { createHttpTransport } from '@fougere/transport-http/client';
 import type { CallPage, CallRecord } from '@fougere/core';
 import ProjectScan from '../services/ProjectScan.js';
+import { remotesOf } from '@fougere/core/node';
 
 /**
  * Where an app answers in development — Nuxt, Next and the site all sit there, so it is a
@@ -80,7 +81,7 @@ export default class DevtoolsHandler {
   private async addresses(root?: string): Promise<{ url: string; frond?: string }[]> {
     const { config } = await this.projectScan.at(root);
     const here = local();
-    const remotes = Object.entries(config.remotes ?? {})
+    const remotes = Object.entries(remotesOf(config))
       .map(([frond, url]) => ({ url: trimmed(url), frond }));
 
     return [{ url: here }, ...remotes.filter((one) => one.url !== here)];

package/fronds/analysis/handlers/ExplainHandler.ts

@@ -6,6 +6,7 @@ import {
 import { relative } from 'node:path';
 import ProjectScan from '../services/ProjectScan.js';
 import { ANONYMOUS_SCHEMA_NAME, lowerFirst, type SchemaView } from '@fougere/schema';
+import { remotesOf } from '@fougere/core/node';
 
 type Cardinality = NonNullable<OperationContract['cardinality']>;
 type Binding = EffectiveOperation['binding'][number];
@@ -91,7 +92,7 @@ export default class ExplainHandler {
   /** The names this project serves — the list `explain` used to spell in a refusal only. */
   async list(input: { root?: string }): Promise<ExplainListing> {
     const { scan, model } = await this.modelOf(input.root);
-    const remotes = scan.config.remotes ?? {};
+    const remotes = remotesOf(scan.config);
     const counted = new Map<string, number>();
     for (const operation of model.operations) {
       const frond = operation.placement.frond;
@@ -115,7 +116,7 @@ export default class ExplainHandler {
       scan,
       model: resolveEffectiveOperations(scan.fronds, {
         diagnostics: scan.diagnostics,
-        remotes: scan.config.remotes,
+        remotes: remotesOf(scan.config),
         adapters: scan.config.adapters,
       }),
     };

package/fronds/analysis/handlers/GraphHandler.ts

@@ -1,14 +1,17 @@
 import {
   buildGraph, declaredTopologyOf, suggestSplit,
-  type DeclaredTopology, type EntityNode, type DomainCluster, type FrondDescriptor,
+  type DeclaredTopology, type EntityNode, type DomainCluster,
 } from '@fougere/core';
 import ProjectScan from '../services/ProjectScan.js';
+import { remotesOf } from '@fougere/core/node';
 
 export interface GraphResult {
-  fronds: FrondDescriptor[];
+  /** How many fronds the scan found — the descriptors themselves hold classes, which no
+   * operation answers: a reader outside this process would receive the husk JSON makes of them. */
+  totalFronds: number;
   /** Where the fronds run and which reaches which — the same picture, one altitude up. */
   declared: DeclaredTopology;
-  nodes: Map<string, EntityNode>;
+  nodes: Record<string, EntityNode>;
   clusters: DomainCluster[];
   totalEntities: number;
   totalRefs: number;
@@ -24,9 +27,9 @@ export default class GraphHandler {
     const clusters = suggestSplit(nodes);
 
     return {
-      fronds,
-      declared: declaredTopologyOf({ fronds, remotes: config.remotes ?? {} }),
-      nodes,
+      totalFronds: fronds.length,
+      declared: declaredTopologyOf({ fronds, remotes: remotesOf(config) }),
+      nodes: Object.fromEntries(nodes),
       clusters,
       totalEntities: nodes.size,
       totalRefs: [...nodes.values()].reduce((sum, n) => sum + n.refs.length, 0),

package/fronds/analysis/handlers/LoadHandler.ts

@@ -2,6 +2,7 @@ import { loadScript, reachableOps } from '@fougere/testing';
 import { writeFile } from 'node:fs/promises';
 import { join } from 'node:path';
 import ProjectScan from '../services/ProjectScan.js';
+import { remotesOf } from '@fougere/core/node';
 
 export interface LoadScenario {
   /** Where it was written, or `null` when it was only printed. */
@@ -27,7 +28,7 @@ export default class LoadHandler {
     const facade = input.facade?.trim() || undefined;
     // The topology statement travels with it: an op that crosses a process is not held to the
     // same figure as one that never leaves, and `remotes:` is what says which is which.
-    const remotes = config.remotes ?? {};
+    const remotes = remotesOf(config);
     const script = loadScript({ fronds }, { ...(facade ? { facade } : {}), remotes });
 
     const file = input.out === undefined ? join(root, 'load.js') : input.out || null;

package/fronds/analysis/services/ProjectScan.ts

@@ -1,6 +1,6 @@
 import { type FougereConfig, type ScanResult } from '@fougere/core';
 import { scanProject, frondAliases } from '@fougere/compiler';
-import { resolveConventions } from '@fougere/core';
+import { nested, resolveConventions } from '@fougere/core';
 import { setModuleLoader, loadConfig } from '@fougere/core/node';
 import { resolve } from 'node:path';
 
@@ -46,6 +46,10 @@ export default class ProjectScan {
     // naming its neighbour is unreadable to the very tool that checks it.
     install(await frondAliases(target, conventions));
 
-    return { root: target, config, ...(await scanProject(target, undefined, conventions)) };
+    const scanned = await scanProject(target, undefined, conventions);
+
+    // A scan reads the disk, and the disk is flat: who inherits from whom is in the config.
+    // Stamped here so every reader of a project gets what a boot would have given it.
+    return { root: target, config, ...scanned, fronds: nested(scanned.fronds, config.fronds) };
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fougere/cli",
-  "version": "0.11.0-alpha.0",
+  "version": "0.12.1-alpha.0",
   "description": "The Fougere CLI — compose a workspace, serve a frond, call an operation.",
   "keywords": [
     "fougere",
@@ -42,20 +42,20 @@
     "jiti": "^2.4.2",
     "picocolors": "^1.1.1",
     "safe-regex": "^2.1.1",
-    "@fougere/adapter-sql": "0.11.0-alpha.0",
-    "@fougere/core": "0.11.0-alpha.0",
-    "@fougere/compiler": "0.11.0-alpha.0",
-    "@fougere/container": "0.11.0-alpha.0",
-    "@fougere/defaults": "0.11.0-alpha.0",
-    "@fougere/nuxt": "0.11.0-alpha.0",
-    "@fougere/schema": "0.11.0-alpha.0",
-    "@fougere/testing": "0.11.0-alpha.0",
-    "@fougere/svelte": "0.11.0-alpha.0",
-    "@fougere/transport-http": "0.11.0-alpha.0",
-    "@fougere/next": "0.11.0-alpha.0",
-    "@fougere/oclif": "0.11.0-alpha.0",
-    "@fougere/admin": "0.11.0-alpha.0",
-    "@fougere/react": "0.11.0-alpha.0"
+    "@fougere/compiler": "0.12.1-alpha.0",
+    "@fougere/defaults": "0.12.1-alpha.0",
+    "@fougere/adapter-sql": "0.12.1-alpha.0",
+    "@fougere/next": "0.12.1-alpha.0",
+    "@fougere/react": "0.12.1-alpha.0",
+    "@fougere/core": "0.12.1-alpha.0",
+    "@fougere/schema": "0.12.1-alpha.0",
+    "@fougere/container": "0.12.1-alpha.0",
+    "@fougere/testing": "0.12.1-alpha.0",
+    "@fougere/nuxt": "0.12.1-alpha.0",
+    "@fougere/svelte": "0.12.1-alpha.0",
+    "@fougere/transport-http": "0.12.1-alpha.0",
+    "@fougere/admin": "0.12.1-alpha.0",
+    "@fougere/oclif": "0.12.1-alpha.0"
   },
   "devDependencies": {
     "vitest": "^4.1.0"