create-flow-os 0.0.47-dev.1772045775 → 0.0.47

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "create-flow-os",
-  "version": "0.0.47-dev.1772045775",
+  "version": "0.0.47",
   "license": "PolyForm-Shield-1.0.0",
   "type": "module",
   "dependencies": {
-    "@flow-os/client": ">=0.0.1-dev.0"
+    "@flow-os/client": "^0.0.47"
   },
   "bin": {
     "create-flow-os": "./src/index.ts"

package/src/init/index.ts

@@ -1,10 +1,12 @@
 #!/usr/bin/env bun
+// Clear subito per nascondere resolving/installing di Bun
+process.stdout.write("\x1b[2J\x1b[H");
 
 import * as readline from "readline";
 import { join, dirname } from "path";
 import { fileURLToPath } from "url";
 import { libsWithConfig, toShortName, toPkgName } from "./lib";
-import { initLib, fetchFlowPackageVersions, shouldUseWorkspace, findFlowOsRepoRoot } from "./scaffold";
+import { initLib, fetchFlowPackageVersions } from "./scaffold";
 import { bannerBox, withLoading, colors } from "./ui";
 
 const { V, V_LIGHT, Y, E, R, B } = colors;
@@ -14,8 +16,7 @@ const { V, V_LIGHT, Y, E, R, B } = colors;
 // ───────────────────────────────────────────────────────────────────────────────
 const cwd = process.cwd();
 const cliRoot = join(dirname(fileURLToPath(import.meta.url)), "..", "..");
-const flowOsRepoRoot = findFlowOsRepoRoot(cwd);
-const available = libsWithConfig(cliRoot, flowOsRepoRoot).map(toShortName);
+const available = libsWithConfig(cliRoot).map(toShortName);
 
 let libs = [...new Set(process.argv.slice(3))];
 
@@ -42,7 +43,7 @@ if (!toInit.length) {
 // ───────────────────────────────────────────────────────────────────────────────
 const pkgNames = toInit.map(toPkgName);
 await withLoading(async (onStep) => {
-  const versions = shouldUseWorkspace(cwd) ? new Map<string, string>() : await fetchFlowPackageVersions(pkgNames);
+  const versions = await fetchFlowPackageVersions(pkgNames);
   await initLib(toInit, cwd, versions, onStep);
 });
 

package/src/init/lib.ts

@@ -1,4 +1,4 @@
-import { existsSync, readFileSync, readdirSync } from "fs";
+import { existsSync, readFileSync } from "fs";
 import { join, dirname } from "path";
 import { fileURLToPath } from "url";
 
@@ -21,27 +21,7 @@ export function flowDeps(root: string): string[] {
   return Object.keys(deps).filter((k) => k.startsWith(FLOW_PREFIX));
 }
 
-/** Scansiona packages/ per tutti gli @flow-os/* (con o senza config) */
-function scanPackagesDir(packagesDir: string): string[] {
-  const found: string[] = [];
-  try {
-    for (const name of readdirSync(packagesDir, { withFileTypes: true })) {
-      if (!name.isDirectory()) continue;
-      const pkgPath = join(packagesDir, name.name, "package.json");
-      if (!existsSync(pkgPath)) continue;
-      try {
-        const pkg = JSON.parse(readFileSync(pkgPath, "utf-8")) as { name?: string };
-        if (pkg?.name?.startsWith(FLOW_PREFIX)) found.push(pkg.name);
-      } catch {}
-    }
-  } catch {}
-  return found;
-}
-
-export function libsWithConfig(cliRoot: string, flowOsRepoRoot?: string | null): string[] {
-  const packagesDir = flowOsRepoRoot ? join(flowOsRepoRoot, "packages") : join(cliRoot, "..");
-  const fromScan = scanPackagesDir(packagesDir);
-  if (fromScan.length > 0) return fromScan;
+export function libsWithConfig(cliRoot: string): string[] {
   const pkg = JSON.parse(readFileSync(join(cliRoot, "package.json"), "utf-8"));
   const deps = Object.keys(pkg.dependencies ?? {}).filter((k) => k.startsWith(FLOW_PREFIX));
   return deps.filter((name) => existsSync(join(pkgRoot(name), "config")));

package/src/init/scaffold.ts

@@ -79,29 +79,6 @@ function isCreateFlowOsDev(): boolean {
   }
 }
 
-/** Trova la root del repo flow-os salendo da cwd (contiene packages/client) */
-export function findFlowOsRepoRoot(cwd: string): string | null {
-  let d = cwd;
-  while (true) {
-    const pkgClient = join(d, "packages", "client", "package.json");
-    if (existsSync(pkgClient)) {
-      try {
-        const pkg = JSON.parse(readFileSync(pkgClient, "utf-8")) as { name?: string };
-        if (pkg?.name === "@flow-os/client") return d;
-      } catch {}
-    }
-    const parent = dirname(d);
-    if (parent === d) break;
-    d = parent;
-  }
-  return null;
-}
-
-/** True se usare workspace:* (cwd dentro repo flow-os) */
-export function shouldUseWorkspace(cwd: string): boolean {
-  return !!findFlowOsRepoRoot(cwd);
-}
-
 /** Recupera versione di un pacchetto @flow-os/* dal registry npm (con cache 5 min) */
 async function fetchFlowPackageVersion(pkgName: string): Promise<string | undefined> {
   const tag = isCreateFlowOsDev() ? "dev" : "latest";
@@ -192,19 +169,12 @@ async function fetchConfigFromNpm(
 /** Sostituisce workspace:* e 0.0.1 con versione concreta (workspace va bene solo dentro flow-os) */
 function resolveFlowDeps(
   deps: Record<string, string> | undefined,
-  pkgRootDir: string,
-  versionsFromNpm: Map<string, string>,
-  useWorkspace: boolean
+  configDir: string,
+  versionsFromNpm: Map<string, string>
 ): Record<string, string> {
   if (!deps) return {};
   const resolved = { ...deps };
-  if (useWorkspace) {
-    for (const k of Object.keys(resolved)) {
-      if (k.startsWith("@flow-os/")) resolved[k] = "workspace:*";
-    }
-    return resolved;
-  }
-  const ownerPkgPath = join(pkgRootDir, "package.json");
+  const ownerPkgPath = join(configDir, "..", "package.json");
   let ownerVersion: string | undefined;
   if (existsSync(ownerPkgPath)) {
     try {
@@ -235,7 +205,7 @@ function resolveFlowDeps(
   return resolved;
 }
 
-function mergePkg(configDir: string, cwd: string, versionsFromNpm: Map<string, string>, useWorkspace: boolean): void {
+function mergePkg(configDir: string, cwd: string, versionsFromNpm: Map<string, string>): void {
   const configPkg = join(configDir, "package.json");
   if (!existsSync(configPkg)) return;
   const targetPath = join(cwd, "package.json");
@@ -245,77 +215,14 @@ function mergePkg(configDir: string, cwd: string, versionsFromNpm: Map<string, s
     : { ...config, name: basename(cwd) || "flow-app" };
   target.dependencies = { ...target.dependencies, ...config.dependencies };
   target.devDependencies = { ...target.devDependencies, ...config.devDependencies };
-  const pkgRootDir = join(configDir, "..");
-  for (const [k, v] of Object.entries(resolveFlowDeps(config.dependencies, pkgRootDir, versionsFromNpm, useWorkspace)))
+  for (const [k, v] of Object.entries(resolveFlowDeps(config.dependencies, configDir, versionsFromNpm)))
     target.dependencies[k] = v;
-  for (const [k, v] of Object.entries(resolveFlowDeps(config.devDependencies, pkgRootDir, versionsFromNpm, useWorkspace)))
+  for (const [k, v] of Object.entries(resolveFlowDeps(config.devDependencies, configDir, versionsFromNpm)))
     target.devDependencies[k] = v;
   target.scripts = { ...target.scripts, ...config.scripts };
   writeFileSync(targetPath, JSON.stringify(target, null, 2));
 }
 
-type FlowOsInit = { dependencies?: Record<string, string>; devDependencies?: Record<string, string>; scripts?: Record<string, string>; name?: string; version?: string; type?: string };
-
-/** Merge da flow-os-init: root package.json (se in repo) oppure package (npm) */
-function mergeFlowOsInit(
-  packageRoot: string,
-  pkgName: string,
-  cwd: string,
-  versionsFromNpm: Map<string, string>,
-  useWorkspace: boolean,
-  flowOsRepoRoot: string | null
-): void {
-  let init: FlowOsInit | undefined;
-  if (flowOsRepoRoot) {
-    const rootPkgPath = join(flowOsRepoRoot, "package.json");
-    if (existsSync(rootPkgPath)) {
-      try {
-        const rootPkg = JSON.parse(readFileSync(rootPkgPath, "utf-8")) as { "flow-os-init"?: Record<string, FlowOsInit> };
-        init = rootPkg["flow-os-init"]?.[pkgName];
-      } catch {}
-    }
-  }
-  if (!init) {
-    const pkgPath = join(packageRoot, "package.json");
-    if (!existsSync(pkgPath)) return;
-    try {
-      const pkg = JSON.parse(readFileSync(pkgPath, "utf-8")) as { "flow-os-init"?: FlowOsInit };
-      init = pkg["flow-os-init"];
-    } catch {
-      return;
-    }
-  }
-  if (!init) return;
-  const targetPath = join(cwd, "package.json");
-  const target = existsSync(targetPath)
-    ? JSON.parse(readFileSync(targetPath, "utf-8"))
-    : { name: init.name ?? (basename(cwd) || "flow-app"), version: init.version ?? "0.0.1", type: init.type ?? "module" };
-  target.dependencies = { ...target.dependencies, ...init.dependencies };
-  target.devDependencies = { ...target.devDependencies, ...init.devDependencies };
-  for (const [k, v] of Object.entries(resolveFlowDeps(init.dependencies, packageRoot, versionsFromNpm, useWorkspace)))
-    target.dependencies[k] = v;
-  for (const [k, v] of Object.entries(resolveFlowDeps(init.devDependencies, packageRoot, versionsFromNpm, useWorkspace)))
-    target.devDependencies[k] = v;
-  target.scripts = { ...target.scripts, ...init.scripts };
-  writeFileSync(targetPath, JSON.stringify(target, null, 2));
-}
-
-/** Aggiunge dipendenza per pacchetti senza config (solo install) */
-function addDependencyForPackage(
-  pkgName: string,
-  cwd: string,
-  versionsFromNpm: Map<string, string>,
-  useWorkspace: boolean
-): void {
-  const targetPath = join(cwd, "package.json");
-  if (!existsSync(targetPath)) return;
-  const target = JSON.parse(readFileSync(targetPath, "utf-8"));
-  target.dependencies = target.dependencies ?? {};
-  const spec = useWorkspace ? "workspace:*" : (versionsFromNpm.get(pkgName) ? `^${versionsFromNpm.get(pkgName)}` : undefined);
-  if (spec) target.dependencies[pkgName] = spec;
-  writeFileSync(targetPath, JSON.stringify(target, null, 2));
-}
-
 /** Assicura che versions abbia le versioni per pkgNames (fetch lazy) */
 async function ensureVersions(versions: Map<string, string>, pkgNames: string[]): Promise<void> {
   const missing = pkgNames.filter((n) => !versions.has(n));
@@ -344,17 +251,12 @@ async function collectAllTemplates(
   done: Set<string>,
   order: string[],
   versionsFromNpm: Map<string, string>,
-  tmpDirs: string[],
-  flowOsRepoRoot: string | null
+  tmpDirs: string[]
 ): Promise<void> {
   for (const lib of libs) {
     const pkgName = toPkgName(lib);
     if (done.has(pkgName)) continue;
 
-    const shortName = toShortName(pkgName);
-    const localFromRepo = flowOsRepoRoot ? join(flowOsRepoRoot, "packages", shortName) : "";
-    const localConfigFromRepo = localFromRepo ? join(localFromRepo, "config") : "";
-
     let root: string;
     let configDir: string;
     try {
@@ -364,22 +266,12 @@ async function collectAllTemplates(
       root = "";
       configDir = "";
     }
-    const hasLocalFromRepo = !!localConfigFromRepo && existsSync(localConfigFromRepo);
     const hasLocal = existsSync(configDir);
 
     let pkgFiles: Map<string, string>;
     let configDirForPkg: string;
-    const useLocalRepo = hasLocalFromRepo && flowOsRepoRoot;
     const npmVer = versionsFromNpm.get(pkgName);
-
-    if (useLocalRepo) {
-      configDirForPkg = localConfigFromRepo;
-      pkgFiles = collectConfigFiles(configDirForPkg);
-      const subDeps = flowDepsFromPkg(join(configDirForPkg, ".."));
-      for (const sub of subDeps) {
-        await collectAllTemplates([toShortName(sub)], combined, done, order, versionsFromNpm, tmpDirs, flowOsRepoRoot);
-      }
-    } else if (npmVer) {
+    if (npmVer) {
       const fetched = await fetchConfigFromNpm(pkgName, npmVer, tmpDirs);
       if (fetched) {
         pkgFiles = fetched.files;
@@ -387,13 +279,13 @@ async function collectAllTemplates(
         const subDeps = flowDepsFromPkg(join(configDirForPkg, ".."));
         await ensureVersions(versionsFromNpm, subDeps);
         for (const sub of subDeps) {
-          await collectAllTemplates([toShortName(sub)], combined, done, order, versionsFromNpm, tmpDirs, flowOsRepoRoot);
+          await collectAllTemplates([toShortName(sub)], combined, done, order, versionsFromNpm, tmpDirs);
         }
       } else if (hasLocal) {
         const subDeps = flowDeps(root);
         await ensureVersions(versionsFromNpm, subDeps);
         for (const sub of subDeps) {
-          await collectAllTemplates([toShortName(sub)], combined, done, order, versionsFromNpm, tmpDirs, flowOsRepoRoot);
+          await collectAllTemplates([toShortName(sub)], combined, done, order, versionsFromNpm, tmpDirs);
         }
         pkgFiles = collectConfigFiles(configDir);
         configDirForPkg = configDir;
@@ -404,7 +296,7 @@ async function collectAllTemplates(
       const subDeps = flowDeps(root);
       await ensureVersions(versionsFromNpm, subDeps);
       for (const sub of subDeps) {
-        await collectAllTemplates([toShortName(sub)], combined, done, order, versionsFromNpm, tmpDirs, flowOsRepoRoot);
+        await collectAllTemplates([toShortName(sub)], combined, done, order, versionsFromNpm, tmpDirs);
       }
       pkgFiles = collectConfigFiles(configDir);
       configDirForPkg = configDir;
@@ -427,68 +319,28 @@ export async function initLib(
   onProgress?: (step: InitProgressStep) => void
 ): Promise<void> {
   const pkgNames = libs.map(toPkgName);
-  const flowOsRepoRoot = findFlowOsRepoRoot(cwd);
-  const useWorkspace = !!flowOsRepoRoot;
   const versions = versionsFromNpm ?? new Map<string, string>();
 
   onProgress?.("fetch");
-  if (!useWorkspace) {
-    const fetched = await fetchFlowPackageVersions(pkgNames);
-    for (const [k, v] of fetched) versions.set(k, v);
-  }
+  const fetched = await fetchFlowPackageVersions(pkgNames);
+  for (const [k, v] of fetched) versions.set(k, v);
 
   onProgress?.("templates");
   const combined = new Map<string, string>();
   const done = new Set<string>();
   const order: string[] = [];
   const tmpDirs: string[] = [];
-  await collectAllTemplates(libs, combined, done, order, versions, tmpDirs, flowOsRepoRoot);
-
-  for (const configDir of order) {
-    const packageRoot = join(configDir, "..");
-    const pkgName = (() => {
-      try {
-        const p = JSON.parse(readFileSync(join(packageRoot, "package.json"), "utf-8")) as { name?: string };
-        return p?.name ?? "";
-      } catch {
-        return "";
-      }
-    })();
-    if (existsSync(join(configDir, "package.json"))) {
-      mergePkg(configDir, cwd, versions, useWorkspace);
-    } else {
-      mergeFlowOsInit(packageRoot, pkgName, cwd, versions, useWorkspace, flowOsRepoRoot);
-    }
-  }
+  await collectAllTemplates(libs, combined, done, order, versions, tmpDirs);
 
-  const targetPath = join(cwd, "package.json");
-  if (!existsSync(targetPath)) {
-    writeFileSync(
-      targetPath,
-      JSON.stringify({ name: basename(cwd) || "flow-app", version: "0.0.1", private: true, type: "module" }, null, 2)
-    );
-  }
-
-  const toAdd = new Set<string>(pkgNames);
   for (const configDir of order) {
-    const packageRoot = join(configDir, "..");
-    for (const peer of flowDepsFromPkg(packageRoot)) toAdd.add(peer);
-  }
-  for (const pkgName of pkgNames) {
-    const packageRoot = flowOsRepoRoot ? join(flowOsRepoRoot, "packages", toShortName(pkgName)) : (() => { try { return pkgRoot(pkgName); } catch { return ""; } })();
-    if (packageRoot) for (const peer of flowDepsFromPkg(packageRoot)) toAdd.add(peer);
-  }
-  await ensureVersions(versions, [...toAdd]);
-  for (const pkgName of toAdd) {
-    addDependencyForPackage(pkgName, cwd, versions, useWorkspace);
+    mergePkg(configDir, cwd, versions);
   }
 
   onProgress?.("write");
   await writeMergedWithUser(combined, cwd, (path, conflicts) => resolveConflicts(conflicts, path));
 
   onProgress?.("install");
-  const installCwd = useWorkspace && flowOsRepoRoot ? flowOsRepoRoot : cwd;
-  const proc = Bun.spawn(["bun", "install"], { cwd: installCwd, stdout: "pipe", stderr: "pipe" });
+  const proc = Bun.spawn(["bun", "install"], { cwd, stdout: "inherit", stderr: "inherit" });
   const exitCode = await proc.exited;
   if (exitCode !== 0) {
     throw new Error(`bun install exited with code ${exitCode}`);

package/src/init/ui.ts

@@ -9,7 +9,6 @@ const E = "\x1b[91m";
 const R = "\x1b[0m";
 const B = "\x1b[1m";
 const DIM = "\x1b[2m";
-const W = "\x1b[97m";  // bianco (solo per headerLogo)
 
 const FRAMES = "⠋⠙⠹⠸⠼⠴⠦⠧⠇⠏";
 
@@ -26,24 +25,19 @@ export function bannerBox(title: string, lines: string[], color: string, w = 50)
   const c = color;
   const inner = " " + c + B + title + R + " ";
   const innerLen = stripAnsi(inner).length;
-  const innerW = w - 4;
-  const half = Math.max(0, Math.floor((innerW - innerLen) / 2));
-  const rest = innerW - half - innerLen;
-  const top = c + "╭" + "─".repeat(half) + inner + c + "─".repeat(rest) + "╮" + R;
-  const bottom = c + "╰" + "─".repeat(innerW) + "╯" + R;
-  const emptyLine = c + "│" + R + "  " + " ".repeat(innerW - 2) + c + "│" + R;
-  const bodyLines = lines.map((l) => c + "│" + R + "  " + pad(l, innerW - 2) + c + "│" + R);
-  return "\n" + top + "\n" + emptyLine + "\n" + bodyLines.join("\n") + "\n" + bottom + "\n";
+  const half = Math.max(0, Math.floor((w - 2 - innerLen) / 2));
+  const top = c + "╭" + "─".repeat(half) + inner + "─".repeat(w - 2 - half - innerLen) + "╮" + R;
+  const bottom = c + "╰" + "─".repeat(w - 2) + "╯" + R;
+  const bodyLines = lines.map((l) => c + "│" + R + "  " + pad(l, w - 2) + c + "│" + R);
+  return "\n" + top + "\n" + bodyLines.join("\n") + "\n" + bottom + "\n";
 }
 
-export function box(lines: string[], color: string, w = 50): string {
+export function box(lines: string[], color: string, w = 52): string {
   const c = color;
-  const innerW = w - 4;
-  const top = c + "╭" + "─".repeat(innerW) + "╮" + R;
-  const bottom = c + "╰" + "─".repeat(innerW) + "╯" + R;
-  const emptyLine = c + "│" + R + "  " + " ".repeat(innerW - 2) + c + "│" + R;
-  const body = lines.map((l) => c + "│" + R + "  " + pad(l, innerW - 2) + c + "│" + R).join("\n");
-  return "\n" + top + "\n" + emptyLine + "\n" + body + "\n" + bottom + "\n";
+  const top = c + "╭" + "─".repeat(w) + "╮" + R;
+  const bottom = c + "╰" + "─".repeat(w) + "╯" + R;
+  const body = lines.map((l) => c + "│" + R + "  " + pad(l, w - 2) + c + "│" + R).join("\n");
+  return "\n" + top + "\n" + body + "\n" + bottom + "\n";
 }
 
 import type { InitProgressStep } from "./scaffold";
@@ -93,6 +87,8 @@ export async function withLoading<T>(
   }
 }
 
+const W = "\x1b[97m"; // bianco
+
 export const colors = { V, V_LIGHT, Y, E, R, B, DIM, W };
 
 /** Icona layers: 3 quadrati arrotondati sovrapposti, vista isometrica con shading ▓▒░ */