create-flow-os 0.0.47-dev.1772043683 → 0.0.47-dev.1772043814

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-flow-os",
-  "version": "0.0.47-dev.1772043683",
+  "version": "0.0.47-dev.1772043814",
   "license": "PolyForm-Shield-1.0.0",
   "type": "module",
   "dependencies": {

package/src/init/index.ts

@@ -6,7 +6,7 @@ import * as readline from "readline";
 import { join, dirname } from "path";
 import { fileURLToPath } from "url";
 import { libsWithConfig, toShortName, toPkgName } from "./lib";
-import { initLib, fetchFlowPackageVersions } from "./scaffold";
+import { initLib, fetchFlowPackageVersions, shouldUseWorkspace } from "./scaffold";
 import { bannerBox, withLoading, colors } from "./ui";
 
 const { V, V_LIGHT, Y, E, R, B } = colors;
@@ -43,7 +43,7 @@ if (!toInit.length) {
 // ───────────────────────────────────────────────────────────────────────────────
 const pkgNames = toInit.map(toPkgName);
 await withLoading(async (onStep) => {
-  const versions = await fetchFlowPackageVersions(pkgNames);
+  const versions = shouldUseWorkspace(cwd) ? new Map<string, string>() : await fetchFlowPackageVersions(pkgNames);
   await initLib(toInit, cwd, versions, onStep);
 });
 

package/src/init/scaffold.ts

@@ -79,6 +79,29 @@ 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";
@@ -170,10 +193,17 @@ async function fetchConfigFromNpm(
 function resolveFlowDeps(
   deps: Record<string, string> | undefined,
   configDir: string,
-  versionsFromNpm: Map<string, string>
+  versionsFromNpm: Map<string, string>,
+  useWorkspace: boolean
 ): 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(configDir, "..", "package.json");
   let ownerVersion: string | undefined;
   if (existsSync(ownerPkgPath)) {
@@ -205,7 +235,7 @@ function resolveFlowDeps(
   return resolved;
 }
 
-function mergePkg(configDir: string, cwd: string, versionsFromNpm: Map<string, string>): void {
+function mergePkg(configDir: string, cwd: string, versionsFromNpm: Map<string, string>, useWorkspace: boolean): void {
   const configPkg = join(configDir, "package.json");
   if (!existsSync(configPkg)) return;
   const targetPath = join(cwd, "package.json");
@@ -215,9 +245,9 @@ 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 };
-  for (const [k, v] of Object.entries(resolveFlowDeps(config.dependencies, configDir, versionsFromNpm)))
+  for (const [k, v] of Object.entries(resolveFlowDeps(config.dependencies, configDir, versionsFromNpm, useWorkspace)))
     target.dependencies[k] = v;
-  for (const [k, v] of Object.entries(resolveFlowDeps(config.devDependencies, configDir, versionsFromNpm)))
+  for (const [k, v] of Object.entries(resolveFlowDeps(config.devDependencies, configDir, versionsFromNpm, useWorkspace)))
     target.devDependencies[k] = v;
   target.scripts = { ...target.scripts, ...config.scripts };
   writeFileSync(targetPath, JSON.stringify(target, null, 2));
@@ -251,12 +281,17 @@ async function collectAllTemplates(
   done: Set<string>,
   order: string[],
   versionsFromNpm: Map<string, string>,
-  tmpDirs: string[]
+  tmpDirs: string[],
+  flowOsRepoRoot: string | null
 ): 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 {
@@ -266,12 +301,22 @@ 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 (npmVer) {
+
+    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) {
       const fetched = await fetchConfigFromNpm(pkgName, npmVer, tmpDirs);
       if (fetched) {
         pkgFiles = fetched.files;
@@ -279,13 +324,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);
+          await collectAllTemplates([toShortName(sub)], combined, done, order, versionsFromNpm, tmpDirs, flowOsRepoRoot);
         }
       } 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);
+          await collectAllTemplates([toShortName(sub)], combined, done, order, versionsFromNpm, tmpDirs, flowOsRepoRoot);
         }
         pkgFiles = collectConfigFiles(configDir);
         configDirForPkg = configDir;
@@ -296,7 +341,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);
+        await collectAllTemplates([toShortName(sub)], combined, done, order, versionsFromNpm, tmpDirs, flowOsRepoRoot);
       }
       pkgFiles = collectConfigFiles(configDir);
       configDirForPkg = configDir;
@@ -319,28 +364,33 @@ 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");
-  const fetched = await fetchFlowPackageVersions(pkgNames);
-  for (const [k, v] of fetched) versions.set(k, v);
+  if (!useWorkspace) {
+    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);
+  await collectAllTemplates(libs, combined, done, order, versions, tmpDirs, flowOsRepoRoot);
 
   for (const configDir of order) {
-    mergePkg(configDir, cwd, versions);
+    mergePkg(configDir, cwd, versions, useWorkspace);
   }
 
   onProgress?.("write");
   await writeMergedWithUser(combined, cwd, (path, conflicts) => resolveConflicts(conflicts, path));
 
   onProgress?.("install");
-  const proc = Bun.spawn(["bun", "install"], { cwd, stdout: "inherit", stderr: "inherit" });
+  const installCwd = useWorkspace && flowOsRepoRoot ? flowOsRepoRoot : cwd;
+  const proc = Bun.spawn(["bun", "install"], { cwd: installCwd, stdout: "inherit", stderr: "inherit" });
   const exitCode = await proc.exited;
   if (exitCode !== 0) {
     throw new Error(`bun install exited with code ${exitCode}`);