create-flow-os 0.0.12 → 0.0.13-dev.1772013189

package/package.json

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

package/src/init/scaffold.ts

@@ -1,5 +1,6 @@
 import { existsSync, cpSync, readFileSync, writeFileSync, readdirSync } from "node:fs";
-import { join, basename } from "node:path";
+import { join, basename, dirname } from "node:path";
+import { fileURLToPath } from "node:url";
 import { pkgRoot, flowDeps, toPkgName, toShortName } from "./lib.ts";
 
 const SKIP = new Set(["node_modules", ".git", ".vite", "package.json"]);
@@ -11,18 +12,44 @@ function copyConfig(configDir: string, cwd: string): void {
   }
 }
 
-/** Sostituisce workspace:* e 0.0.1 con ^version dal package risolto (per progetti fuori dal monorepo) */
-function resolveFlowDeps(deps: Record<string, string> | undefined): Record<string, string> {
+/** Versione @flow-os/client da create-flow-os (fallback quando pkgRoot non risolve) */
+function getCreateFlowOsClientDep(): string | undefined {
+  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;
+  } catch {
+    return 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
+): Record<string, string> {
   if (!deps) return {};
   const resolved = { ...deps };
+  const ownerPkgPath = join(configDir, "..", "package.json");
+  let ownerVersion: string | undefined;
+  if (existsSync(ownerPkgPath)) {
+    try {
+      ownerVersion = (JSON.parse(readFileSync(ownerPkgPath, "utf-8")) as { version?: string }).version;
+    } catch {}
+  }
+  const createFlowOsClientDep = getCreateFlowOsClientDep();
   for (const k of Object.keys(resolved)) {
-    if (k.startsWith("@flow-os/") && (resolved[k] === "workspace:*" || resolved[k] === "0.0.1")) {
-      try {
-        const root = pkgRoot(k);
-        const pkg = JSON.parse(readFileSync(join(root, "package.json"), "utf-8")) as { version?: string };
-        if (pkg.version) resolved[k] = `^${pkg.version}`;
-      } catch {}
-    }
+    if (!k.startsWith("@flow-os/") || (resolved[k] !== "workspace:*" && resolved[k] !== "0.0.1")) continue;
+    let spec: string | undefined;
+    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}`;
+    if (!spec && k === "@flow-os/client" && createFlowOsClientDep) spec = createFlowOsClientDep;
+    if (spec) resolved[k] = spec;
   }
   return resolved;
 }
@@ -37,8 +64,8 @@ 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))) target.dependencies[k] = v;
-  for (const [k, v] of Object.entries(resolveFlowDeps(config.devDependencies))) target.devDependencies[k] = v;
+  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;
   target.scripts = { ...target.scripts, ...config.scripts };
   writeFileSync(targetPath, JSON.stringify(target, null, 2));
 }