npm - create-flow-os - Versions diffs - 0.0.1-dev.1771781977 → 0.0.1-dev.1771782787 - Mend

@@ -463,6 +463,24 @@ class x {
     }
   }
 }
+class BD extends x {
+  get cursor() {
+    return this.value ? 0 : 1;
+  }
+  get _value() {
+    return this.cursor === 0;
+  }
+  constructor(u) {
+    super(u, false), this.value = !!u.initialValue, this.on("value", () => {
+      this.value = this._value;
+    }), this.on("confirm", (F) => {
+      this.output.write(import_sisteransi.cursor.move(0, -1)), this.value = F, this.state = "submit", this.close();
+    }), this.on("cursor", () => {
+      this.value = !this.value;
+    });
+  }
+}
 var fD = Object.defineProperty;
 var gD = (e, u, F) => (u in e) ? fD(e, u, { enumerable: true, configurable: true, writable: true, value: F }) : e[u] = F;
 var K = (e, u, F) => (gD(e, typeof u != "symbol" ? u + "" : u, F), F);
@@ -642,6 +660,25 @@ ${import_picocolors2.default.cyan($2)}
 `;
   }
 } }).prompt();
+var ce = (s) => {
+  const n = s.active ?? "Yes", t = s.inactive ?? "No";
+  return new BD({ active: n, inactive: t, initialValue: s.initialValue ?? true, render() {
+    const i = `${import_picocolors2.default.gray(a2)}
+${y2(this.state)}  ${s.message}
+`, r2 = this.value ? n : t;
+    switch (this.state) {
+      case "submit":
+        return `${i}${import_picocolors2.default.gray(a2)}  ${import_picocolors2.default.dim(r2)}`;
+      case "cancel":
+        return `${i}${import_picocolors2.default.gray(a2)}  ${import_picocolors2.default.strikethrough(import_picocolors2.default.dim(r2))}
+${import_picocolors2.default.gray(a2)}`;
+      default:
+        return `${i}${import_picocolors2.default.cyan(a2)}  ${this.value ? `${import_picocolors2.default.green(I2)} ${n}` : `${import_picocolors2.default.dim(T2)} ${import_picocolors2.default.dim(n)}`} ${import_picocolors2.default.dim("/")} ${this.value ? `${import_picocolors2.default.dim(T2)} ${import_picocolors2.default.dim(t)}` : `${import_picocolors2.default.green(I2)} ${t}`}
+${import_picocolors2.default.cyan($2)}
+`;
+    }
+  } }).prompt();
+};
 var le = (s) => {
   const n = (t, i) => {
     const r2 = t.label ?? String(t.value);
@@ -925,7 +962,11 @@ async function runDev(cwd) {
   });
   await devProc.exited;
 }
-var PROFILE_FLAGS = ["client", "full", "server"];
+var PROFILE_LABELS = {
+  full: "Full stack (client + server)",
+  client: "Client only",
+  server: "Server only"
+};
 function optsForProfile(config, profileId) {
   return Object.entries(config.packages).filter(([, e2]) => {
     const inc = e2.includeIn ?? [];
@@ -942,12 +983,13 @@ function optionalPackageIdsForProfile(config, profileId) {
   const defaultIds = config.profiles[profileId]?.defaultPackages ?? [];
   return optIds.filter((id) => !defaultIds.includes(id));
 }
-function profileFromArgv(argv2) {
+function profileFromArgv(argv2, profileIds) {
+  const set = new Set(profileIds);
   for (const arg of argv2) {
     if (!arg.startsWith("--"))
       continue;
     const key = arg.slice(2);
-    if (PROFILE_FLAGS.includes(key))
+    if (set.has(key))
       return key;
   }
   return null;
@@ -982,9 +1024,10 @@ async function main() {
     } catch {}
   }
   const config = await Bun.file(join2(DIR, "config.json")).json();
+  const profileIds = Object.keys(config.profiles);
   const hasDeps = Object.values(config.packages).every((e2) => Array.isArray(e2.deps));
   if (!hasDeps) {
-    he(c2.dim("Run ") + c2.brand("bun run gen") + c2.dim(" from create-flow first."));
+    he(c2.dim("Run ") + c2.brand("bun run gen") + c2.dim(" in create-flow first."));
     process.exit(1);
   }
   const projectName = nameArg?.trim() || (yes ? "my-flow-app" : null);
@@ -1001,8 +1044,9 @@ async function main() {
   }
   if (!name)
     name = "my-flow-app";
-  const profileFlag = profileFromArgv(argv);
+  const profileFlag = profileFromArgv(argv, profileIds);
   const optsFull = optsForProfile(config, "full");
+  const allPackageIds = optsFull.map(([id]) => id);
   let profileId;
   let selected = [];
   if (profileFlag) {
@@ -1013,35 +1057,42 @@ async function main() {
     selected = [...defaultIds, ...addOns];
   } else if (yes) {
     profileId = "full";
-    selected = optsFull.map(([id]) => id);
+    selected = allPackageIds;
   } else {
-    const choice = await le({
-      message: c2.muted("Template"),
-      options: [
-        { value: "full", label: `${ICON.full}  Full stack  ${c2.dim("(client + server)")}` },
-        { value: "client", label: `${ICON.client}  Client only` },
-        { value: "server", label: `${ICON.server}  Server only` }
-      ]
+    const withAll = await ce({
+      message: c2.muted("Include all packages?"),
+      initialValue: true
     });
-    if (lD(choice))
+    if (lD(withAll))
       process.exit(0);
-    profileId = choice;
-    const opts = optsForProfile(config, profileId);
-    const optIds = opts.map(([id]) => id);
-    const defaultIds = config.profiles[profileId]?.defaultPackages ?? [];
-    selected = optIds.filter((id) => defaultIds.includes(id));
-    if (profileId === "full") {
-      selected = optIds;
-    } else if (opts.length > 0) {
+    if (withAll) {
+      profileId = "full";
+      selected = allPackageIds;
+    } else {
+      const options = profileIds.map((id) => ({
+        value: id,
+        label: `${ICON[id] ?? ""}  ${PROFILE_LABELS[id] ?? id}`.trim() || id
+      }));
+      const choice = await le({
+        message: c2.muted("Template"),
+        options
+      });
+      if (lD(choice))
+        process.exit(0);
+      profileId = choice;
+      const opts = optsForProfile(config, profileId);
+      const optIds = opts.map(([id]) => id);
+      const defaultIds = config.profiles[profileId]?.defaultPackages ?? [];
+      selected = optIds.filter((id) => defaultIds.includes(id));
       const optionalIds = optIds.filter((id) => !defaultIds.includes(id));
       if (optionalIds.length > 0) {
-        const r2 = await $e({
+        const addOns = await $e({
           message: c2.muted("Add-ons"),
           options: optionalIds.map((id) => ({ value: id, label: id })),
           required: false
         });
-        if (!lD(r2))
-          selected = [...selected, ...r2 ?? []];
+        if (!lD(addOns))
+          selected = [...selected, ...addOns ?? []];
       }
     }
   }
@@ -1054,11 +1105,11 @@ async function main() {
     stat(projectPath).then(() => true).catch(() => false)
   ]);
   if (!profileExists) {
-    he(c2.dim("Profile not found. Run ") + c2.brand("bun run gen") + c2.dim("."));
+    he(c2.dim("Profile missing. Run ") + c2.brand("bun run gen") + c2.dim(" in create-flow."));
     process.exit(1);
   }
   if (pathExists && !force) {
-    he(c2.dim("Folder ") + name + c2.dim(" exists. Use ") + c2.brand("--force") + c2.dim("."));
+    he(c2.dim("Directory ") + name + c2.dim(" exists. Use ") + c2.brand("--force") + c2.dim(" to overwrite."));
     process.exit(1);
   }
   const isDevFromRepoPromise = useDevTag ? findPackageDir(REPO_ROOT, "@flow.os/client").then((d2) => !!d2) : Promise.resolve(false);
@@ -1066,7 +1117,7 @@ async function main() {
   const createSpinner = _2();
   createSpinner.start(c2.cyan(ICON.rocket + "  Creating project\u2026"));
   await copyWithExclude(profileDir, projectPathNew, ["node_modules", ".git", "packages", "scripts", "LICENSE", "README.md"]);
-  createSpinner.stop(c2.cyan(ICON.rocket + "  Project created"));
+  createSpinner.stop(c2.cyan(ICON.rocket + "  Done"));
   const extraDeps = {};
   for (const id of selected) {
     const deps = config.packages[id]?.deps;
@@ -1081,7 +1132,7 @@ async function main() {
     try {
       await Bun.$`git init ${projectPathNew}`.quiet();
       await Bun.$`git -C ${projectPathNew} add -A`.quiet();
-      await Bun.$`git -C ${projectPathNew} commit -m "Initial commit (Flow)"`.quiet();
+      await Bun.$`git -C ${projectPathNew} commit -m "Initial commit"`.quiet();
     } catch {}
   }
   const finalPkg = await Bun.file(pkgPath).json();
@@ -1118,10 +1169,10 @@ async function main() {
   await Bun.write(pkgPath, JSON.stringify(finalPkg, null, 2));
   if (!noInstall) {
     const s = _2();
-    s.start(c2.cyan(ICON.deps + "  Installing dependencies\u2026"));
+    s.start(c2.cyan(ICON.deps + "  Installing\u2026"));
     const proc = Bun.spawn(["bun", "install"], { cwd: projectPathNew, stdout: "pipe", stderr: "pipe" });
     const code = await proc.exited;
-    s.stop(code === 0 ? c2.cyan(ICON.deps + "  Dependencies installed") : "Failed");
+    s.stop(code === 0 ? c2.cyan(ICON.deps + "  Installed") : "Failed");
     if (code !== 0) {
       const err = await new Response(proc.stderr).text();
       v2.error(err || "bun install exit " + code);
@@ -1137,14 +1188,13 @@ async function main() {
     ge(c2.cyan(ICON.rocket + "  Starting dev server\u2026"));
     await runDev(projectPath);
   } else {
-    const outroLines = [
-      c2.bold("Done"),
+    ge(box([
+      c2.bold("All set"),
       "",
-      c2.dim("Next steps:"),
+      c2.dim("Run:"),
       "  " + c2.brand("cd " + name),
       "  " + c2.brand("bun run dev")
-    ];
-    ge(box(outroLines));
+    ]));
   }
 }
 main().catch((e2) => {

@@ -1,6 +1,6 @@
 {
   "name": "create-flow-os",
-  "version": "0.0.1-dev.1771781977",
+  "version": "0.0.1-dev.1771782787",
   "type": "module",
   "bin": {
     "create-flow-os": "bin/index.js"

@@ -1,4 +1,3 @@
-/* @flow: client */
 :root {
   --background: #rgb(34, 34, 34)

@@ -1,4 +1,3 @@
-// @flow: client
 import './root.css';
 import { App } from '@flow.os/router';
 import NotFound from './routes/404';

@@ -1,4 +1,3 @@
-// @flow: client
 /** Pagina 404 full-page (senza layout comune). Mostrata dal router per route inesistenti; raggiungibile anche da /404. */
 export default function NotFound(path: string) {
   return (

@@ -1,4 +1,3 @@
-// @flow: client
 import { state } from '@flow.os/core';
 export default function Home() {

@@ -16,7 +16,6 @@
   },
   "dependencies": {
     "@flow.os/client": "file:./packages/client",
-    "@flow.os/server": "^0.0.1",
     "@flow.os/core": "file:./packages/core",
     "@flow.os/router": "file:./packages/router",
     "@flow.os/style": "file:./packages/style"

@@ -1,4 +1,3 @@
-// @flow: server
 import { defineHandler } from '@flow.os/server';
 export default defineHandler(() => ({ hello: 'api' }));

create-flow-os 0.0.1-dev.1771781977 → 0.0.1-dev.1771782787