create-flow-os 0.0.62 → 0.0.63-dev.1772065004

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "create-flow-os",
-  "version": "0.0.62",
+  "version": "0.0.63-dev.1772065004",
   "license": "PolyForm-Shield-1.0.0",
   "type": "module",
   "dependencies": {
-    "@flow-os/client": "^0.0.62"
+    "@flow-os/client": "^0.0.63",
+    "tar": "^7.4.3"
   },
   "bin": {
     "create-flow-os": "./src/index.ts"

package/src/init/scaffold.ts

@@ -43,7 +43,7 @@ function mergeTemplateInto(combined: Map<string, TemplateEntry>, pkgFiles: Map<s
   }
 }
 
-/** Scrive combined template in cwd. Never overwrite: file con contenuto → mantieni. Se coincide con superseded → usa nuovo template. */
+/** Scrive combined (config merge di tutte le lib) in cwd. Merge con folder utente: never overwrite (file con contenuto → mantieni). Se coincide con superseded → usa nuovo template. */
 async function writeMergedWithUser(
   combined: Map<string, TemplateEntry>,
   cwd: string,
@@ -130,26 +130,63 @@ export async function fetchFlowClientVersion(): Promise<string | undefined> {
   return fetchFlowPackageVersion("@flow-os/client");
 }
 
-/** Scarica config da npm (sempre fresh, no cache) */
+/** Bun.Archive richiede Bun >= 1.3.6. Fallback con pacchetto tar per versioni precedenti. */
+const hasBunArchive = typeof (globalThis as { Bun?: { Archive?: unknown } }).Bun?.Archive === "function";
+
+/** Scarica config da npm (sempre fresh, no cache). Se version fallisce, riprova con latest. */
 async function fetchConfigFromNpm(
   pkgName: string,
   version: string,
-  tmpDirs: string[]
+  tmpDirs: string[],
+  fallbackLatest?: string
 ): Promise<{ files: Map<string, string>; configDir: string; tmpDir: string } | null> {
   const shortName = pkgName.replace(/^@flow-os\//, "");
   const { tmpdir } = await import("os");
-  const url = `${NPM_REGISTRY}/${pkgName}/-/${shortName}-${version}.tgz`;
-  try {
+  const { writeFileSync } = await import("fs");
+
+  async function tryFetch(v: string): Promise<{ files: Map<string, string>; configDir: string; tmpDir: string } | null> {
+    const url = `${NPM_REGISTRY}/${pkgName}/-/${shortName}-${v}.tgz`;
     const res = await fetch(url, { headers: { "Cache-Control": "no-cache", "Pragma": "no-cache" } });
     if (!res.ok) return null;
-    const archive = new Bun.Archive(await res.blob());
-    const tmpDir = join(tmpdir(), `flow-os-${shortName}-${version}-${Date.now()}`);
-    await archive.extract(tmpDir, { glob: ["package/config/**", "package/package.json"] });
+    const tmpDir = join(tmpdir(), `flow-os-${shortName}-${v}-${Date.now()}`);
+    const tgzPath = join(tmpDir, "pkg.tgz");
+
+    if (hasBunArchive) {
+      const Archive = (globalThis as { Bun?: { Archive: new (data: Blob) => { extract: (dir: string, opts?: { glob?: string[] }) => Promise<number> } } }).Bun!.Archive;
+      const archive = new Archive(await res.blob());
+      mkdirSync(tmpDir, { recursive: true });
+      await archive.extract(tmpDir, { glob: ["package/config/**", "package/package.json"] });
+    } else {
+      mkdirSync(tmpDir, { recursive: true });
+      const buf = Buffer.from(await res.arrayBuffer());
+      writeFileSync(tgzPath, buf);
+      const tar = await import("tar");
+      await tar.x({ file: tgzPath, cwd: tmpDir });
+    }
+
     const extractedConfigDir = join(tmpDir, "package", "config");
     if (!existsSync(extractedConfigDir)) return null;
     const files = collectConfigFiles(extractedConfigDir);
     tmpDirs.push(tmpDir);
     return { files, configDir: extractedConfigDir, tmpDir };
+  }
+
+  try {
+    let result = await tryFetch(version);
+    if (!result && fallbackLatest && fallbackLatest !== version) {
+      result = await tryFetch(fallbackLatest);
+    }
+    if (!result && isCreateFlowOsDev()) {
+      try {
+        const r = await fetch(`${NPM_REGISTRY}/${pkgName}`, { headers: { Accept: "application/json" } });
+        if (r.ok) {
+          const d = (await r.json()) as { "dist-tags"?: Record<string, string> };
+          const latest = d["dist-tags"]?.["latest"];
+          if (latest && latest !== version) result = await tryFetch(latest);
+        }
+      } catch {}
+    }
+    return result;
   } catch {
     return null;
   }
@@ -329,7 +366,7 @@ function flowDepsFromPkg(pkgPath: string): string[] {
   }
 }
 
-/** Fase 1: raccoglie e merge tutti i template in memoria, ritorna ordine pacchetti */
+/** Fase 1: per ogni lib prende config/ (da npm o repo locale), merge tutti i config insieme in combined */
 async function collectAllTemplates(
   libs: string[],
   combined: Map<string, TemplateEntry>,
@@ -411,7 +448,9 @@ async function collectAllTemplates(
 
 export type InitProgressStep = "fetch" | "templates" | "write" | "install";
 
-/** Init: 1) fetch versioni npm, 2) merge template, 3) mergePkg, 4) merge con file utente, 5) bun install */
+/** Init: 1) fetch versioni npm (dev/latest), 2) raccoglie config/ di ogni lib e li merge insieme,
+ *  3) mergePkg (package.json), 4) merge con folder utente (never overwrite), 5) bun install.
+ *  Fuori repo: scarica config da npm. Dentro repo: usa workspace + config locali. */
 export async function initLib(
   libs: string[],
   cwd: string,