create-flow-os 0.0.47-dev.1772052163 → 0.0.47-dev.1772054229

package/package.json

@@ -1,11 +1,10 @@
 {
   "name": "create-flow-os",
-  "version": "0.0.47-dev.1772052163",
+  "version": "0.0.47-dev.1772054229",
   "license": "PolyForm-Shield-1.0.0",
   "type": "module",
   "dependencies": {
-    "@flow-os/client": ">=0.0.1-dev.0",
-    "node-diff3": "^3.2.0"
+    "@flow-os/client": ">=0.0.1-dev.0"
   },
   "bin": {
     "create-flow-os": "./src/index.ts"

package/src/init/merge.ts

@@ -1,21 +1,19 @@
 /**
- * Merge generico per qualsiasi file.
- * JSON: merge additivo. Code/altri: merge 3-way (tipo Git) quando possibile.
+ * Merge: strategia "never overwrite" (create-react-app, ecc.).
+ * File vuoto → template. File con contenuto → mantieni utente. Mai corrompere.
+ * JSON: merge additivo strutturato.
  */
 
 import * as readline from "readline";
-import { merge as diff3Merge } from "node-diff3";
 
 export type Conflict = { key: string; userVal: unknown; templateVal: unknown; path: string };
 
-/** Opzioni per merge 3-way: base (template precedente) e callback per salvare la nuova base */
+/** Opzioni (compatibilità): non usate con never-overwrite */
 export type Merge3WayOptions = {
   baseContent?: string;
   saveBase?: (content: string) => void;
 };
 
-const LINE_SEP = /\n/;
-
 /** Deep merge di oggetti: aggiunge chiavi nuove, per esistenti chiede se diverso */
 function deepMergeAdditive(
   user: Record<string, unknown>,
@@ -73,21 +71,6 @@ export function mergeCodeTemplates(a: string, b: string): string {
   return b || a;
 }
 
-/** Merge 3-way per file di codice (tipo Git). Base = template precedente (da cache). */
-function merge3Way(
-  userContent: string,
-  templateContent: string,
-  baseContent: string | undefined
-): { merged: string; hasConflicts: boolean } {
-  if (!userContent.trim()) return { merged: templateContent, hasConflicts: false };
-  const base = baseContent ?? templateContent;
-  const { conflict, result } = diff3Merge(userContent, base, templateContent, {
-    stringSeparator: LINE_SEP,
-    excludeFalseConflicts: true,
-  });
-  return { merged: result.join("\n"), hasConflicts: conflict };
-}
-
 /** Chiede all'utente se applicare i valori del template in conflitto */
 export async function resolveConflicts(conflicts: Conflict[], path: string): Promise<Record<string, unknown>> {
   if (conflicts.length === 0) return {};
@@ -104,16 +87,15 @@ export async function resolveConflicts(conflicts: Conflict[], path: string): Pro
   return overrides;
 }
 
-/** Merge generico: JSON additivo, code/altri merge 3-way (tipo Git) */
+/** Never overwrite: file vuoto → template, file con contenuto → mantieni. Mai corrompere. */
 export async function mergeFile(
   userContent: string | null,
   templateContent: string,
   relPath: string,
   promptConflict: (path: string, conflicts: Conflict[]) => Promise<Record<string, unknown>>,
-  options?: Merge3WayOptions
+  _options?: Merge3WayOptions
 ): Promise<string> {
   const isJson = relPath.toLowerCase().endsWith(".json");
-  const use3Way = /\.(ts|tsx|js|jsx|mjs|cjs|html|css|md|vue|svelte)$/.test(relPath);
 
   if (isJson) {
     const { merged, conflicts } = mergeJson(userContent ?? "{}", templateContent, relPath);
@@ -126,21 +108,13 @@ export async function mergeFile(
     return merged;
   }
 
-  if (use3Way) {
-    const { merged, hasConflicts } = merge3Way(
-      userContent ?? "",
-      templateContent,
-      options?.baseContent
-    );
-    if (hasConflicts) {
-      console.warn(`\n[flow-os] Conflitti in ${relPath} - risolvi i marker <<<<<<< / >>>>>>>`);
-    }
-    options?.saveBase?.(templateContent);
-    return merged;
+  // Never overwrite: vuoto → template. Con contenuto → mantieni. Eccezione: file incompleto (manca export che template ha)
+  const content = (userContent ?? "").trim();
+  if (!content) return templateContent;
+  const tHasExport = /\bexport\s+default\b/.test(templateContent);
+  const uHasExport = /\bexport\s+default\b/.test(userContent ?? "");
+  if (tHasExport && !uHasExport) {
+    return templateContent; // File troncato
   }
-
-  // Altri file: merge 3-way se possibile
-  const { merged } = merge3Way(userContent ?? "", templateContent, options?.baseContent);
-  options?.saveBase?.(templateContent);
-  return merged;
+  return userContent!;
 }

package/src/init/scaffold.ts

@@ -2,7 +2,7 @@ import { existsSync, cpSync, readFileSync, writeFileSync, readdirSync, mkdirSync
 import { join, basename, dirname } from "path";
 import { fileURLToPath } from "url";
 import { pkgRoot, flowDeps, toPkgName, toShortName } from "./lib";
-import { mergeFile, resolveConflicts, mergeJsonTemplates, mergeCodeTemplates, type Merge3WayOptions } from "./merge";
+import { mergeFile, resolveConflicts, mergeJsonTemplates, mergeCodeTemplates } from "./merge";
 
 const SKIP = new Set(["node_modules", ".git", ".vite", "package.json"]);
 const NPM_REGISTRY = "https://registry.npmjs.org";
@@ -48,54 +48,22 @@ function mergeTemplateInto(combined: Map<string, string>, pkgFiles: Map<string,
   }
 }
 
-const INIT_BASE_FILE = ".flow-os/init-base.json";
-
-function loadInitBase(cwd: string): Record<string, string> {
-  const p = join(cwd, INIT_BASE_FILE);
-  if (!existsSync(p)) return {};
-  try {
-    return JSON.parse(readFileSync(p, "utf-8")) as Record<string, string>;
-  } catch {
-    return {};
-  }
-}
-
-function saveInitBase(cwd: string, base: Record<string, string>): void {
-  const dir = join(cwd, ".flow-os");
-  if (!existsSync(dir)) mkdirSync(dir, { recursive: true });
-  writeFileSync(join(cwd, INIT_BASE_FILE), JSON.stringify(base, null, 2));
-}
-
-/** Scrive combined template in cwd facendo merge con file utente (merge 3-way tipo Git) */
+/** Scrive combined template in cwd. Never overwrite: file con contenuto → mantieni. */
 async function writeMergedWithUser(
   combined: Map<string, string>,
   cwd: string,
   promptConflict: (path: string, conflicts: import("./merge").Conflict[]) => Promise<Record<string, unknown>>
 ): Promise<void> {
-  const baseCache = loadInitBase(cwd);
-  const newBase: Record<string, string> = {};
-
   for (const [relPath, templateContent] of combined) {
     const dest = join(cwd, relPath);
     const destDir = dirname(dest);
     if (!existsSync(destDir)) {
-      const { mkdirSync } = await import("fs");
       mkdirSync(destDir, { recursive: true });
     }
     const userContent = existsSync(dest) ? readFileSync(dest, "utf-8") : null;
-    const mergeOpts: Merge3WayOptions = {
-      baseContent: baseCache[relPath],
-      saveBase: (content) => {
-        newBase[relPath] = content;
-      },
-    };
-    const merged = await mergeFile(userContent, templateContent, relPath, promptConflict, mergeOpts);
+    const merged = await mergeFile(userContent, templateContent, relPath, promptConflict);
     writeFileSync(dest, merged);
   }
-
-  if (Object.keys(newBase).length > 0) {
-    saveInitBase(cwd, { ...baseCache, ...newBase });
-  }
 }
 
 /** Indica se create-flow-os è in modalità dev (flow-os@dev) */