create-flow-os 0.0.23 → 0.0.24

package/package.json

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

package/src/init/scaffold.ts

@@ -89,6 +89,29 @@ export async function fetchFlowClientVersion(): Promise<string | undefined> {
   }
 }
 
+/** Scarica config da npm (bypass cache) - estrae in temp, ritorna { files, configDir, tmpDir } */
+async function fetchConfigFromNpm(
+  pkgName: string,
+  version: string
+): Promise<{ files: Map<string, string>; configDir: string; tmpDir: string } | null> {
+  const shortName = pkgName.replace(/^@flow-os\//, "");
+  const url = `${NPM_REGISTRY}/${pkgName}/-/${shortName}-${version}.tgz`;
+  try {
+    const res = await fetch(url, { cache: "no-store" });
+    if (!res.ok) return null;
+    const archive = new Bun.Archive(await res.blob());
+    const { tmpdir } = await import("os");
+    const tmpDir = join(tmpdir(), `flow-os-client-${version}-${Date.now()}`);
+    await archive.extract(tmpDir, { glob: ["package/config/**"] });
+    const configDir = join(tmpDir, "package", "config");
+    if (!existsSync(configDir)) return null;
+    const files = collectConfigFiles(configDir);
+    return { files, configDir, tmpDir };
+  } catch {
+    return null;
+  }
+}
+
 /** Sostituisce workspace:* e 0.0.1 con versione concreta (workspace va bene solo dentro flow-os) */
 function resolveFlowDeps(
   deps: Record<string, string> | undefined,
@@ -160,7 +183,8 @@ async function collectAllTemplates(
   combined: Map<string, string>,
   done: Set<string>,
   order: string[],
-  _clientVersionFromNpm?: string
+  clientVersionFromNpm: string | undefined,
+  tmpDirs: string[]
 ): Promise<void> {
   for (const lib of libs) {
     const pkgName = toPkgName(lib);
@@ -168,15 +192,32 @@ async function collectAllTemplates(
 
     const root = pkgRoot(pkgName);
     const configDir = join(root, "config");
-    if (!existsSync(configDir)) continue;
+    if (!existsSync(configDir) && pkgName !== "@flow-os/client") continue;
 
     for (const sub of flowDeps(root)) {
-      await collectAllTemplates([toShortName(sub)], combined, done, order, _clientVersionFromNpm);
+      await collectAllTemplates([toShortName(sub)], combined, done, order, clientVersionFromNpm, tmpDirs);
     }
 
-    const pkgFiles = collectConfigFiles(configDir);
+    let pkgFiles: Map<string, string>;
+    let configDirForPkg: string;
+    if (pkgName === "@flow-os/client" && clientVersionFromNpm) {
+      const fetched = await fetchConfigFromNpm(pkgName, clientVersionFromNpm);
+      if (fetched) {
+        pkgFiles = fetched.files;
+        configDirForPkg = fetched.configDir;
+        tmpDirs.push(fetched.tmpDir);
+      } else {
+        if (!existsSync(configDir)) continue;
+        pkgFiles = collectConfigFiles(configDir);
+        configDirForPkg = configDir;
+      }
+    } else {
+      if (!existsSync(configDir)) continue;
+      pkgFiles = collectConfigFiles(configDir);
+      configDirForPkg = configDir;
+    }
     mergeTemplateInto(combined, pkgFiles);
-    order.push(configDir);
+    order.push(configDirForPkg);
     done.add(pkgName);
   }
 }
@@ -190,11 +231,19 @@ export async function initLib(
   const combined = new Map<string, string>();
   const done = new Set<string>();
   const order: string[] = [];
-  await collectAllTemplates(libs, combined, done, order, clientVersionFromNpm);
+  const tmpDirs: string[] = [];
+  await collectAllTemplates(libs, combined, done, order, clientVersionFromNpm, tmpDirs);
 
   for (const configDir of order) {
     mergePkg(configDir, cwd, clientVersionFromNpm);
   }
 
   await writeMergedWithUser(combined, cwd, (path, conflicts) => resolveConflicts(conflicts, path));
+
+  const { rmSync } = await import("fs");
+  for (const d of tmpDirs) {
+    try {
+      rmSync(d, { recursive: true, force: true });
+    } catch {}
+  }
 }