create-flow-os 0.0.15 → 0.0.16

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "create-flow-os",
-  "version": "0.0.15",
+  "version": "0.0.16",
   "license": "PolyForm-Shield-1.0.0",
   "type": "module",
   "dependencies": {
-    "@flow-os/client": "^0.0.11"
+    "@flow-os/client": "^0.0.16"
   },
   "bin": {
     "create-flow-os": "./src/index.ts"

package/src/init/index.ts

@@ -4,7 +4,7 @@ import * as readline from "readline";
 import { join, dirname } from "path";
 import { fileURLToPath } from "url";
 import { libsWithConfig, toShortName } from "./lib";
-import { initLib } from "./scaffold";
+import { initLib, fetchFlowClientVersion } from "./scaffold";
 
 // ───────────────────────────────────────────────────────────────────────────────
 // Usage: bun create flow-os i [lib...] | bun create flow-os i (prompt interattivo)
@@ -62,10 +62,11 @@ if (!toInit.length) {
 }
 
 // ───────────────────────────────────────────────────────────────────────────────
-// Execute: init libs, poi output box
+// Execute: fetch versione client da npm (latest/dev), init libs, poi output box
 // ───────────────────────────────────────────────────────────────────────────────
+const clientVersion = await fetchFlowClientVersion();
 const done = new Set<string>();
-for (const lib of toInit) initLib(lib, cwd, done);
+for (const lib of toInit) initLib(lib, cwd, done, clientVersion);
 
 const iconOk = V + "◆" + R;
 const iconUnrec = Y + "?" + R;

package/src/init/scaffold.ts

@@ -4,6 +4,7 @@ import { fileURLToPath } from "url";
 import { pkgRoot, flowDeps, toPkgName, toShortName } from "./lib";
 
 const SKIP = new Set(["node_modules", ".git", ".vite", "package.json"]);
+const NPM_REGISTRY = "https://registry.npmjs.org";
 
 function copyConfig(configDir: string, cwd: string): void {
   for (const e of readdirSync(configDir, { withFileTypes: true })) {
@@ -12,13 +13,27 @@ function copyConfig(configDir: string, cwd: string): void {
   }
 }
 
-/** Versione @flow-os/client da create-flow-os (fallback quando pkgRoot non risolve) */
-function getCreateFlowOsClientDep(): string | undefined {
+/** Indica se create-flow-os è in modalità dev (flow-os@dev) */
+function isCreateFlowOsDev(): boolean {
   try {
     const cliRoot = join(dirname(fileURLToPath(import.meta.url)), "..", "..");
     const pkg = JSON.parse(readFileSync(join(cliRoot, "package.json"), "utf-8")) as { dependencies?: Record<string, string> };
     const v = pkg.dependencies?.["@flow-os/client"];
-    return v && v !== "workspace:*" ? v : undefined;
+    return !!v?.includes("dev");
+  } catch {
+    return false;
+  }
+}
+
+/** Recupera la versione di @flow-os/client dal registry npm in tempo reale (latest o dev) */
+export async function fetchFlowClientVersion(): Promise<string | undefined> {
+  const tag = isCreateFlowOsDev() ? "dev" : "latest";
+  try {
+    const res = await fetch(`${NPM_REGISTRY}/@flow-os/client`);
+    if (!res.ok) return undefined;
+    const data = (await res.json()) as { "dist-tags"?: Record<string, string> };
+    const version = data["dist-tags"]?.[tag] ?? data["dist-tags"]?.["latest"];
+    return version;
   } catch {
     return undefined;
   }
@@ -27,7 +42,8 @@ function getCreateFlowOsClientDep(): string | undefined {
 /** Sostituisce workspace:* e 0.0.1 con versione concreta (workspace va bene solo dentro flow-os) */
 function resolveFlowDeps(
   deps: Record<string, string> | undefined,
-  configDir: string
+  configDir: string,
+  clientVersionFromNpm: string | undefined
 ): Record<string, string> {
   if (!deps) return {};
   const resolved = { ...deps };
@@ -38,14 +54,25 @@ function resolveFlowDeps(
       ownerVersion = (JSON.parse(readFileSync(ownerPkgPath, "utf-8")) as { version?: string }).version;
     } catch {}
   }
-  const createFlowOsClientDep = getCreateFlowOsClientDep();
-  const isDevSpec = createFlowOsClientDep?.includes("dev");
+  const isDevSpec = isCreateFlowOsDev();
   for (const k of Object.keys(resolved)) {
-    if (!k.startsWith("@flow-os/") || (resolved[k] !== "workspace:*" && resolved[k] !== "0.0.1")) continue;
+    if (!k.startsWith("@flow-os/")) continue;
+    const v = resolved[k];
+    if (v !== "workspace:*" && v !== "0.0.1" && k !== "@flow-os/client") continue;
     let spec: string | undefined;
-    // flow-os@dev → usa tag "dev" per installare @flow-os/client@dev
-    if (k === "@flow-os/client" && isDevSpec) {
-      spec = "dev";
+    if (k === "@flow-os/client") {
+      if (clientVersionFromNpm) {
+        spec = isDevSpec ? "dev" : `^${clientVersionFromNpm}`;
+      } else if (isDevSpec) {
+        spec = "dev";
+      } else {
+        try {
+          const root = pkgRoot(k);
+          const pkg = JSON.parse(readFileSync(join(root, "package.json"), "utf-8")) as { version?: string };
+          if (pkg.version) spec = `^${pkg.version}`;
+        } catch {}
+        if (!spec && ownerVersion) spec = `^${ownerVersion}`;
+      }
     } else {
       try {
         const root = pkgRoot(k);
@@ -53,14 +80,13 @@ function resolveFlowDeps(
         if (pkg.version) spec = `^${pkg.version}`;
       } catch {}
       if (!spec && ownerVersion) spec = `^${ownerVersion}`;
-      if (!spec && k === "@flow-os/client" && createFlowOsClientDep) spec = createFlowOsClientDep;
     }
     if (spec) resolved[k] = spec;
   }
   return resolved;
 }
 
-function mergePkg(configDir: string, cwd: string): void {
+function mergePkg(configDir: string, cwd: string, clientVersionFromNpm: string | undefined): void {
   const configPkg = join(configDir, "package.json");
   if (!existsSync(configPkg)) return;
   const targetPath = join(cwd, "package.json");
@@ -70,13 +96,15 @@ function mergePkg(configDir: string, cwd: string): void {
     : { ...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))) target.dependencies[k] = v;
-  for (const [k, v] of Object.entries(resolveFlowDeps(config.devDependencies, configDir))) target.devDependencies[k] = v;
+  for (const [k, v] of Object.entries(resolveFlowDeps(config.dependencies, configDir, clientVersionFromNpm)))
+    target.dependencies[k] = v;
+  for (const [k, v] of Object.entries(resolveFlowDeps(config.devDependencies, configDir, clientVersionFromNpm)))
+    target.devDependencies[k] = v;
   target.scripts = { ...target.scripts, ...config.scripts };
   writeFileSync(targetPath, JSON.stringify(target, null, 2));
 }
 
-export function initLib(lib: string, cwd: string, done: Set<string>): void {
+export function initLib(lib: string, cwd: string, done: Set<string>, clientVersionFromNpm?: string): void {
   const pkgName = toPkgName(lib);
   if (done.has(pkgName)) return;
 
@@ -85,10 +113,10 @@ export function initLib(lib: string, cwd: string, done: Set<string>): void {
   if (!existsSync(configDir)) return;
 
   for (const sub of flowDeps(root)) {
-    initLib(toShortName(sub), cwd, done);
+    initLib(toShortName(sub), cwd, done, clientVersionFromNpm);
   }
 
   copyConfig(configDir, cwd);
-  mergePkg(configDir, cwd);
+  mergePkg(configDir, cwd, clientVersionFromNpm);
   done.add(pkgName);
 }