odoro 1.0.9 → 2.0.0

package/dist/{create-CYVSVDAD.js → create-QX5LEWMS.js}

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { writeDatabaseUrl, assertEnvIgnored, PROVIDER_PENDING, checkDatabaseUrl } from './chunk-3SZIN6VG.js';
+import { writeDatabaseUrl, assertEnvIgnored, PROVIDER_PENDING, checkDatabaseUrl } from './chunk-P3DJITWE.js';
 import { execSync, spawn } from 'child_process';
 import { existsSync, statSync, readdirSync, readFileSync } from 'fs';
 import { resolve, basename, dirname, join } from 'path';
@@ -14,86 +14,86 @@ var MODULES = [
     id: "libs",
     label: "Libraries",
     hint: "styles, tokens, UI and motion",
-    defaut: true,
-    paquet: "@odoro-cli/libs"
+    ticked: true,
+    packageName: "@odoro-cli/libs"
   },
   {
     id: "router",
     label: "Router",
     hint: "ships with the libraries \u2014 wires up the pages",
-    defaut: true
+    ticked: true
   },
   {
     id: "icons",
     label: "Icons",
     hint: "five families, imported one by one",
-    defaut: true,
-    paquet: "@odoro-cli/icons"
+    ticked: true,
+    packageName: "@odoro-cli/icons"
   },
   {
     id: "engine",
     label: "Engine",
     hint: "WebGL, surfaces and motion policy",
-    defaut: false,
-    paquet: "@odoro-cli/engine"
+    ticked: false,
+    packageName: "@odoro-cli/engine"
   },
   {
     id: "registre",
     label: "Component registry",
     hint: "copied by `odoro add` \u2014 pulls in the engine",
-    defaut: false
+    ticked: false
   }
 ];
-var MODULE_IDS = MODULES.map((m) => m.id);
-var MODULES_PAR_DEFAUT = MODULES.filter(
-  (m) => m.defaut
-).map((m) => m.id);
-function resoudre(selection) {
-  const choisis = new Set(selection);
-  const avertissements = [];
-  if (choisis.has("router") && !choisis.has("libs")) {
-    choisis.delete("router");
-    avertissements.push(
+var MODULE_IDS = MODULES.map((module) => module.id);
+var DEFAULT_MODULES = MODULES.filter(
+  (module) => module.ticked
+).map((module) => module.id);
+function resolveModules(selection) {
+  const chosen = new Set(selection);
+  const warnings = [];
+  if (chosen.has("router") && !chosen.has("libs")) {
+    chosen.delete("router");
+    warnings.push(
       "The router lives in the libraries (@odoro-cli/libs/router) \u2014 without them it is dropped."
     );
   }
-  if (choisis.has("registre") && !choisis.has("engine")) {
-    choisis.add("engine");
-    avertissements.push(
+  if (chosen.has("registre") && !chosen.has("engine")) {
+    chosen.add("engine");
+    warnings.push(
       "Almost every registry entry imports @odoro-cli/engine, so the engine was added."
     );
   }
-  return { modules: MODULE_IDS.filter((id) => choisis.has(id)), avertissements };
+  return { modules: MODULE_IDS.filter((id) => chosen.has(id)), warnings };
 }
-function paquetsDe(modules) {
-  const choisis = new Set(modules);
-  return MODULES.filter((m) => m.paquet !== void 0 && choisis.has(m.id)).map(
-    (m) => m.paquet
-  );
+function packagesFor(modules) {
+  const chosen = new Set(modules);
+  return MODULES.filter(
+    (module) => module.packageName !== void 0 && chosen.has(module.id)
+  ).map((module) => module.packageName);
 }
-function variantesDe(modules) {
-  const choisis = new Set(modules);
-  const variantes = [];
-  if (!choisis.has("libs")) variantes.push("sans-libs");
-  else if (!choisis.has("router")) variantes.push("sans-routeur");
-  if (choisis.has("engine")) variantes.push("avec-moteur");
-  return variantes;
+function variantsFor(modules) {
+  const chosen = new Set(modules);
+  const variants = [];
+  if (!chosen.has("libs")) variants.push("without-libs");
+  else if (!chosen.has("router")) variants.push("without-router");
+  if (chosen.has("engine")) variants.push("with-engine");
+  return variants;
 }
-function gardeLesRoutes(modules) {
+function keepsRoutes(modules) {
   return modules.includes("router");
 }
-function lireModules(valeur) {
-  const brut = valeur.split(",").map((part) => part.trim()).filter((part) => part !== "");
-  if (brut.length === 1 && (brut[0] === "none" || brut[0] === "aucun")) {
+function readModules(value) {
+  const raw = value.split(",").map((part) => part.trim()).filter((part) => part !== "");
+  if (raw.length === 1 && (raw[0] === "none" || raw[0] === "aucun")) {
     return { modules: [] };
   }
-  const inconnu = brut.find((part) => !MODULE_IDS.includes(part));
-  if (inconnu !== void 0) {
+  const unknown = raw.find((part) => !MODULE_IDS.includes(part));
+  if (unknown !== void 0) {
     return {
-      erreur: `Unknown module: "${inconnu}". Available: ${MODULE_IDS.join(", ")}, or "none".`
+      error: `Unknown module: "${unknown}". Available: ${MODULE_IDS.join(", ")}, or "none".`
     };
   }
-  return { modules: brut };
+  return { modules: raw };
 }
 var PACKAGE_MANAGERS = ["pnpm", "npm", "yarn", "bun"];
 function detectPackageManager(userAgent = process.env["npm_config_user_agent"]) {
@@ -111,18 +111,18 @@ function toPackageName(input) {
   return input.trim().toLowerCase().replace(/^[._]+/, "").replace(/[^a-z0-9\-~]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 214) || "odoro-app";
 }
 function validatePackageName(name) {
-  if (name.trim() === "") return "Le nom du projet ne peut pas etre vide.";
-  if (name.length > 214) return "Le nom du projet ne peut pas depasser 214 caracteres.";
-  if (/^[._]/.test(name)) return 'Le nom du projet ne peut pas commencer par "." ou "_".';
+  if (name.trim() === "") return "The project name cannot be empty.";
+  if (name.length > 214) return "The project name cannot exceed 214 characters.";
+  if (/^[._]/.test(name)) return 'The project name cannot start with "." or "_".';
   if (!/^[a-z0-9\-~][a-z0-9\-._~]*$/.test(name)) {
-    return "Le nom doit etre en minuscules, sans espace ni caractere special.";
+    return "The name must be lowercase, without spaces or special characters.";
   }
   return void 0;
 }
 function inspectTarget(directory) {
   if (!existsSync(directory)) return "absent";
   const entries = readdirSync(directory).filter((entry) => entry !== ".git");
-  return entries.length === 0 ? "vide" : "occupe";
+  return entries.length === 0 ? "empty" : "occupied";
 }
 function targetFileName(name) {
   return name.startsWith("_") ? `.${name.slice(1)}` : name;
@@ -136,29 +136,29 @@ function templatesRoot(from = fileURLToPath(import.meta.url)) {
     if (parent === directory) break;
     directory = parent;
   }
-  throw new Error("[odoro] Dossier des templates introuvable depuis " + from);
+  throw new Error("[odoro] Templates directory not found from " + from);
 }
 function availableTemplates(root = templatesRoot()) {
   return readdirSync(root).filter((entry) => statSync(resolve(root, entry)).isDirectory()).sort();
 }
 
-// src/scaffold/versions-famille.generated.ts
-var VERSIONS_FAMILLE = {
-  "@odoro-cli/engine": "1.0.2",
-  "@odoro-cli/icons": "1.0.2",
-  "@odoro-cli/libs": "1.0.2",
-  "@odoro-cli/server": "1.0.2",
-  "create-odoro": "1.0.9",
-  "odoro": "1.0.9"
+// src/scaffold/family-versions.generated.ts
+var FAMILY_VERSIONS = {
+  "@odoro-cli/engine": "2.0.0",
+  "@odoro-cli/icons": "2.0.0",
+  "@odoro-cli/libs": "2.0.0",
+  "@odoro-cli/server": "1.1.0",
+  "create-odoro": "1.0.10",
+  "odoro": "2.0.0"
 };
 
 // src/scaffold/scaffold.ts
-var DOSSIER_VARIANTES = "_variantes";
-var PAQUETS_OPTIONNELS = ["@odoro-cli/libs", "@odoro-cli/icons", "@odoro-cli/engine"];
+var VARIANTS_DIRECTORY = "_variants";
+var OPTIONAL_PACKAGES = ["@odoro-cli/libs", "@odoro-cli/icons", "@odoro-cli/engine"];
 function cliVersion() {
   try {
-    const manifeste = join(dirname(templatesRoot()), "package.json");
-    const { version } = JSON.parse(readFileSync(manifeste, "utf8"));
+    const manifest = join(dirname(templatesRoot()), "package.json");
+    const { version } = JSON.parse(readFileSync(manifest, "utf8"));
     return version;
   } catch {
     return "latest";
@@ -167,7 +167,7 @@ function cliVersion() {
 async function copyDirectory(from, to, written, prefix = "") {
   await mkdir(to, { recursive: true });
   for (const entry of await readdir(from, { withFileTypes: true })) {
-    if (prefix === "" && entry.name === DOSSIER_VARIANTES) continue;
+    if (prefix === "" && entry.name === VARIANTS_DIRECTORY) continue;
     const source = join(from, entry.name);
     const name = targetFileName(entry.name);
     const destination = join(to, name);
@@ -183,11 +183,11 @@ async function copyDirectory(from, to, written, prefix = "") {
 function isOdoroPackage(name) {
   return name === "odoro" || name.startsWith("@odoro-cli/");
 }
-function versionDemandee(nom, versionCli2) {
-  if (versionCli2 === "latest") return "latest";
-  if (nom === "odoro") return `^${versionCli2}`;
-  const relevee = VERSIONS_FAMILLE[nom];
-  return relevee === void 0 ? "latest" : `^${relevee}`;
+function requestedVersion(name, cli) {
+  if (cli === "latest") return "latest";
+  if (name === "odoro") return `^${cli}`;
+  const collected = FAMILY_VERSIONS[name];
+  return collected === void 0 ? "latest" : `^${collected}`;
 }
 function alignOdoroVersions(manifest, version) {
   const aligned = { ...manifest };
@@ -196,18 +196,18 @@ function alignOdoroVersions(manifest, version) {
     if (typeof deps !== "object" || deps === null) continue;
     const next = {};
     for (const [name, range] of Object.entries(deps)) {
-      next[name] = isOdoroPackage(name) ? versionDemandee(name, version) : range;
+      next[name] = isOdoroPackage(name) ? requestedVersion(name, version) : range;
     }
     aligned[field] = next;
   }
   return aligned;
 }
-function ajusterModules(manifest, modules) {
-  const voulus = new Set(paquetsDe(modules));
+function adjustModules(manifest, modules) {
+  const wanted = new Set(packagesFor(modules));
   const deps = { ...manifest["dependencies"] ?? {} };
-  for (const paquet of PAQUETS_OPTIONNELS) {
-    if (voulus.has(paquet)) deps[paquet] ??= "latest";
-    else delete deps[paquet];
+  for (const packageName of OPTIONAL_PACKAGES) {
+    if (wanted.has(packageName)) deps[packageName] ??= "latest";
+    else delete deps[packageName];
   }
   return {
     ...manifest,
@@ -216,21 +216,21 @@ function ajusterModules(manifest, modules) {
     )
   };
 }
-async function poserVariante(source, target, nom) {
-  const racine = join(source, DOSSIER_VARIANTES, nom);
-  if (!existsSync(racine)) {
-    throw new Error(`[odoro] Variante de gabarit introuvable : "${nom}".`);
+async function layVariant(source, target, name) {
+  const root = join(source, VARIANTS_DIRECTORY, name);
+  if (!existsSync(root)) {
+    throw new Error(`[odoro] Template variant not found: "${name}".`);
   }
-  const poses = [];
-  await copyDirectory(racine, target, poses);
-  return poses;
+  const laid = [];
+  await copyDirectory(root, target, laid);
+  return laid;
 }
 async function renamePackage(target, packageName, version, modules) {
   const file = join(target, "package.json");
   if (!existsSync(file)) return;
   const manifest = JSON.parse(await readFile(file, "utf8"));
-  const ajuste = ajusterModules({ ...manifest, name: packageName }, modules);
-  const renamed = alignOdoroVersions(ajuste, version);
+  const adjusted = adjustModules({ ...manifest, name: packageName }, modules);
+  const renamed = alignOdoroVersions(adjusted, version);
   await writeFile(file, `${JSON.stringify(renamed, null, 2)}
 `, "utf8");
 }
@@ -238,7 +238,7 @@ async function scaffold(options) {
   const root = options.root ?? templatesRoot();
   const source = join(root, options.template);
   if (!existsSync(source)) {
-    throw new Error(`[odoro] Template inconnu : "${options.template}".`);
+    throw new Error(`[odoro] Unknown template: "${options.template}".`);
   }
   if (options.overwrite === "ecraser" && existsSync(options.target)) {
     for (const entry of await readdir(options.target)) {
@@ -246,17 +246,17 @@ async function scaffold(options) {
       await rm(join(options.target, entry), { recursive: true, force: true });
     }
   }
-  const modules = options.modules ?? MODULES_PAR_DEFAUT;
+  const modules = options.modules ?? DEFAULT_MODULES;
   const files = [];
   await copyDirectory(source, options.target, files);
-  if (!gardeLesRoutes(modules)) {
-    for (const fichier of ["src/router.tsx", "client/src/router.tsx"]) {
-      await rm(join(options.target, fichier), { force: true });
+  if (!keepsRoutes(modules)) {
+    for (const file of ["src/router.tsx", "client/src/router.tsx"]) {
+      await rm(join(options.target, file), { force: true });
     }
   }
-  const poses = [];
-  for (const variante of variantesDe(modules)) {
-    poses.push(...await poserVariante(source, options.target, variante));
+  const laid = [];
+  for (const variant of variantsFor(modules)) {
+    laid.push(...await layVariant(source, options.target, variant));
   }
   await renamePackage(
     options.target,
@@ -264,17 +264,17 @@ async function scaffold(options) {
     options.version ?? cliVersion(),
     modules
   );
-  const retires = /* @__PURE__ */ new Set(["src/router.tsx", "client/src/router.tsx"]);
-  const listes = /* @__PURE__ */ new Set([
-    ...files.filter((f) => gardeLesRoutes(modules) || !retires.has(f)),
-    ...poses
+  const removed = /* @__PURE__ */ new Set(["src/router.tsx", "client/src/router.tsx"]);
+  const listed = /* @__PURE__ */ new Set([
+    ...files.filter((file) => keepsRoutes(modules) || !removed.has(file)),
+    ...laid
   ]);
-  return { files: [...listes].sort() };
+  return { files: [...listed].sort() };
 }
 
 // src/commands/create.ts
-var DERNIERES_LIGNES = 8;
-var LARGEUR_LIGNE = 64;
+var LAST_LINES = 8;
+var LINE_WIDTH = 64;
 var TEMPLATE_LABELS = {
   "react-ts": "Single-page app \u2014 React, TypeScript, Odoro router and motion",
   "react-ts-server": "Client and server \u2014 the same app, plus a modular @odoro-cli/server base and a Dockerfile"
@@ -301,94 +301,98 @@ async function askDatabase() {
   );
   if (choice === "provider") {
     prompts.log.warn(PROVIDER_PENDING);
-    return { choice, note: "Lancez `odoro db:create` des que la plateforme est la." };
+    return { choice, note: "Run `odoro db:create` as soon as the platform is there." };
   }
   if (choice === "later") {
     return {
       choice,
-      note: "Aucune base : le client demarrera, et /api/ready repondra 503 en disant ce qui manque."
+      note: "No database: the client will start, and /api/ready will answer 503 saying what is missing."
     };
   }
   const url = ensure(
     await prompts.text({
       message: "PostgreSQL URL",
-      placeholder: "postgres://utilisateur:motdepasse@hote:5432/base?sslmode=require",
+      placeholder: "postgres://user:password@host:5432/database?sslmode=require",
       validate: (value) => checkDatabaseUrl(value ?? "")
     })
   );
   return {
     choice,
     url: url.trim(),
-    // Seule la forme a ete verifiee : le dire, plutot que de laisser croire
-    // que la connexion a ete etablie.
-    note: "Forme de l URL verifiee. La connexion sera etablie au premier demarrage."
+    // Only the shape was checked: say so, rather than letting one believe the
+    // connection was established.
+    note: "URL shape checked. The connection will be established on the first start."
   };
 }
 async function askModules(options) {
   if (options.modules !== void 0) {
-    const lu = lireModules(options.modules);
-    if (lu.erreur !== void 0) {
-      prompts.cancel(lu.erreur);
+    const read = readModules(options.modules);
+    if (read.error !== void 0) {
+      prompts.cancel(read.error);
       return void 0;
     }
-    return annoncer(resoudre(lu.modules));
+    return announce(resolveModules(read.modules));
   }
-  if (options.yes === true) return MODULES_PAR_DEFAUT;
-  const choisis = ensure(
+  if (options.yes === true) return DEFAULT_MODULES;
+  const chosen = ensure(
     await prompts.multiselect({
       message: "What goes in the project?",
-      initialValues: [...MODULES_PAR_DEFAUT],
+      initialValues: [...DEFAULT_MODULES],
       required: false,
-      options: MODULES.map((m) => ({ value: m.id, label: m.label, hint: m.hint }))
+      options: MODULES.map((module) => ({
+        value: module.id,
+        label: module.label,
+        hint: module.hint
+      }))
     })
   );
-  return annoncer(resoudre(choisis));
+  return announce(resolveModules(chosen));
 }
-function annoncer(resolution) {
-  for (const mot of resolution.avertissements) prompts.log.warn(mot);
+function announce(resolution) {
+  for (const warning of resolution.warnings) prompts.log.warn(warning);
   return resolution.modules;
 }
-async function installerDependances(target, manager) {
-  const [commande, ...args] = installCommand(manager).split(" ");
-  if (commande === void 0) return false;
-  const barre = prompts.spinner({ indicator: "timer" });
-  barre.start(`Installing dependencies with ${manager}`);
-  const fin = [];
-  const garder = (bloc) => {
-    for (const ligne of bloc.split("\n")) {
-      const propre = ligne.trim();
-      if (propre === "" || !/[a-z0-9]/i.test(propre)) continue;
-      fin.push(propre);
-      if (fin.length > DERNIERES_LIGNES) fin.shift();
-      barre.message(`${manager} \xB7 ${propre.slice(0, LARGEUR_LIGNE)}`);
+async function installDependencies(target, manager) {
+  const [command, ...args] = installCommand(manager).split(" ");
+  if (command === void 0) return false;
+  const bar = prompts.spinner({ indicator: "timer" });
+  bar.start(`Installing dependencies with ${manager}`);
+  const tail = [];
+  const keep = (block) => {
+    for (const line of block.split("\n")) {
+      const clean = line.trim();
+      if (clean === "" || !/[a-z0-9]/i.test(clean)) continue;
+      tail.push(clean);
+      if (tail.length > LAST_LINES) tail.shift();
+      bar.message(`${manager} \xB7 ${clean.slice(0, LINE_WIDTH)}`);
     }
   };
   const code = await new Promise((resolve_) => {
-    const processus = spawn(commande, args, {
+    const child = spawn(command, args, {
       cwd: target,
       shell: process.platform === "win32"
     });
-    processus.stdout?.setEncoding("utf8").on("data", garder);
-    processus.stderr?.setEncoding("utf8").on("data", garder);
-    processus.on("error", () => {
+    child.stdout?.setEncoding("utf8").on("data", keep);
+    child.stderr?.setEncoding("utf8").on("data", keep);
+    child.on("error", () => {
       resolve_(-1);
     });
-    processus.on("close", (sortie) => {
-      resolve_(sortie ?? -1);
+    child.on("close", (status) => {
+      resolve_(status ?? -1);
     });
   });
   if (code === 0) {
-    barre.stop(`Dependencies installed with ${manager}`);
+    bar.stop(`Dependencies installed with ${manager}`);
     return true;
   }
-  barre.stop(`${manager} install failed`, 1);
-  for (const ligne of fin) prompts.log.error(colors.dim(ligne));
+  bar.stop(`${manager} install failed`, 1);
+  for (const line of tail) prompts.log.error(colors.dim(line));
   return false;
 }
-function versionCli() {
+function cliVersion2() {
   try {
-    const manifeste = join(dirname(templatesRoot()), "package.json");
-    const { version } = JSON.parse(readFileSync(manifeste, "utf8"));
+    const manifest = join(dirname(templatesRoot()), "package.json");
+    const { version } = JSON.parse(readFileSync(manifest, "utf8"));
     return version;
   } catch {
     return "?";
@@ -406,12 +410,12 @@ async function createCommand(options) {
   const templates = availableTemplates(root);
   const defaultTemplate = templates[0] ?? "react-ts";
   prompts.intro(
-    `${colors.bgBlue(colors.black(" ODORO "))} ${colors.dim(`v${versionCli()}`)}`
+    `${colors.bgBlue(colors.black(" ODORO "))} ${colors.dim(`v${cliVersion2()}`)}`
   );
   const rawName = options.name ?? (options.yes === true ? "odoro-app" : ensure(
     await prompts.text({
       message: "Project name",
-      placeholder: "mon-site",
+      placeholder: "my-site",
       defaultValue: "odoro-app",
       validate: (value) => value === "" ? void 0 : validatePackageName(toPackageName(value))
     })
@@ -425,7 +429,7 @@ async function createCommand(options) {
   }
   let overwrite = options.overwrite;
   const state = inspectTarget(target);
-  if (state === "occupe" && overwrite === void 0) {
+  if (state === "occupied" && overwrite === void 0) {
     if (options.yes === true) {
       prompts.cancel(
         `Folder "${basename(target)}" is not empty. Pass --overwrite or --merge.`
@@ -436,14 +440,14 @@ async function createCommand(options) {
       await prompts.select({
         message: `Folder "${basename(target)}" is not empty.`,
         options: [
-          { value: "annuler", label: "Cancel" },
+          { value: "cancel", label: "Cancel" },
           { value: "fusionner", label: "Merge \u2014 overwrites files of the same name" },
           { value: "ecraser", label: "Empty the folder, then create the project" }
         ]
       })
     );
-    if (choice === "annuler") {
-      prompts.cancel("Creation annulee.");
+    if (choice === "cancel") {
+      prompts.cancel("Creation cancelled.");
       return 0;
     }
     overwrite = choice;
@@ -513,12 +517,12 @@ async function createCommand(options) {
   if (database?.url !== void 0) {
     await writeDatabaseUrl(target, database.url);
     prompts.log.success("Database URL written to .env");
-    const risque = await assertEnvIgnored(target);
-    if (risque !== void 0) prompts.log.warn(risque);
+    const risk = await assertEnvIgnored(target);
+    if (risk !== void 0) prompts.log.warn(risk);
   }
   if (database !== void 0) prompts.log.info(database.note);
   if (modules.includes("registre")) {
-    const { initCommand } = await import('./commands-AHMXBWQQ.js');
+    const { initCommand } = await import('./commands-GYA7NTCX.js');
     const code = await initCommand({ root: target, yes: true });
     if (code !== 0) {
       prompts.log.warn(
@@ -526,14 +530,14 @@ async function createCommand(options) {
       );
     }
   }
-  const installe = withInstall ? await installerDependances(target, manager) : false;
+  const installed = withInstall ? await installDependencies(target, manager) : false;
   const steps = [
     `cd ${basename(target)}`,
-    // Si l'installation a echoue, la commande revient dans les etapes : le
-    // projet est ecrit, il ne lui manque que ses dependances.
-    ...installe ? [] : [installCommand(manager)],
-    // `odoro.json` vient d'etre ecrit : ce qui reste a montrer, c'est la
-    // commande qui s'en sert.
+    // When the install failed, the command comes back into the steps: the
+    // project is written, it is only missing its dependencies.
+    ...installed ? [] : [installCommand(manager)],
+    // `odoro.json` has just been written: what remains to show is the command
+    // that uses it.
     ...modules.includes("registre") ? ["odoro add text/count-up"] : [],
     runCommand(manager, "dev")
   ];