create-flow-os 0.0.51-dev.1772054686 → 0.0.51-dev.1772055928

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-flow-os",
-  "version": "0.0.51-dev.1772054686",
+  "version": "0.0.51-dev.1772055928",
   "license": "PolyForm-Shield-1.0.0",
   "type": "module",
   "dependencies": {

package/src/init/merge.ts

@@ -87,13 +87,20 @@ export async function resolveConflicts(conflicts: Conflict[], path: string): Pro
   return overrides;
 }
 
-/** Never overwrite: file vuoto → template, file con contenuto → mantieni. Mai corrompere. */
+/** Normalizza contenuto per confronto (trim, line endings) */
+function normalizeForCompare(s: string): string {
+  return s.replace(/\r\n/g, "\n").replace(/\r/g, "\n").trim();
+}
+
+/** Never overwrite: file vuoto → template, file con contenuto → mantieni. Mai corrompere.
+ * Se supersededContent è fornito e userContent coincide (normalizzato), usa templateContent:
+ * un pacchetto "figlio" (es. router) può sostituire il template di un pacchetto "genitore" (es. client). */
 export async function mergeFile(
   userContent: string | null,
   templateContent: string,
   relPath: string,
   promptConflict: (path: string, conflicts: Conflict[]) => Promise<Record<string, unknown>>,
-  _options?: Merge3WayOptions
+  _options?: Merge3WayOptions & { supersededContent?: string | null }
 ): Promise<string> {
   const isJson = relPath.toLowerCase().endsWith(".json");
 
@@ -108,9 +115,18 @@ export async function mergeFile(
     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;
+
+  // Template supersede template: se il file utente è identico al template precedente (sostituito da un pkg figlio), usa il nuovo
+  const superseded = _options?.supersededContent;
+  if (superseded != null && superseded.trim()) {
+    if (normalizeForCompare(userContent!) === normalizeForCompare(superseded)) {
+      return templateContent;
+    }
+  }
+
+  // Never overwrite: eccezione file incompleto (manca export che template ha)
   const tHasExport = /\bexport\s+default\b/.test(templateContent);
   const uHasExport = /\bexport\s+default\b/.test(userContent ?? "");
   if (tHasExport && !uHasExport) {

package/src/init/scaffold.ts

@@ -30,38 +30,42 @@ function collectConfigFiles(configDir: string, relPath = ""): Map<string, string
   return out;
 }
 
-/** Merge template A con template B (stesso relPath) */
-function mergeTemplateInto(combined: Map<string, string>, pkgFiles: Map<string, string>): void {
+type TemplateEntry = { current: string; superseded?: string };
+
+/** Merge template A con template B (stesso relPath). Quando B sovrascrive A, A va in superseded. */
+function mergeTemplateInto(combined: Map<string, TemplateEntry>, pkgFiles: Map<string, string>): void {
   for (const [relPath, content] of pkgFiles) {
     const existing = combined.get(relPath);
     const isJson = relPath.toLowerCase().endsWith(".json");
     const isCode = /\.(ts|tsx|js|jsx|mjs|cjs)$/.test(relPath);
     if (existing === undefined) {
-      combined.set(relPath, content);
+      combined.set(relPath, { current: content });
     } else if (isJson) {
-      combined.set(relPath, mergeJsonTemplates(existing, content));
+      combined.set(relPath, { current: mergeJsonTemplates(existing.current, content) });
     } else if (isCode) {
-      combined.set(relPath, mergeCodeTemplates(existing, content));
+      combined.set(relPath, { current: mergeCodeTemplates(existing.current, content), superseded: existing.current });
     } else {
-      combined.set(relPath, content);
+      combined.set(relPath, { current: content, superseded: existing.current });
     }
   }
 }
 
-/** Scrive combined template in cwd. Never overwrite: file con contenuto → mantieni. */
+/** Scrive combined template in cwd. Never overwrite: file con contenuto → mantieni. Se coincide con superseded → usa nuovo template. */
 async function writeMergedWithUser(
-  combined: Map<string, string>,
+  combined: Map<string, TemplateEntry>,
   cwd: string,
   promptConflict: (path: string, conflicts: import("./merge").Conflict[]) => Promise<Record<string, unknown>>
 ): Promise<void> {
-  for (const [relPath, templateContent] of combined) {
+  for (const [relPath, entry] of combined) {
     const dest = join(cwd, relPath);
     const destDir = dirname(dest);
     if (!existsSync(destDir)) {
       mkdirSync(destDir, { recursive: true });
     }
     const userContent = existsSync(dest) ? readFileSync(dest, "utf-8") : null;
-    const merged = await mergeFile(userContent, templateContent, relPath, promptConflict);
+    const merged = await mergeFile(userContent, entry.current, relPath, promptConflict, {
+      supersededContent: entry.superseded ?? null,
+    });
     writeFileSync(dest, merged);
   }
 }
@@ -455,7 +459,7 @@ export async function initLib(
   }
 
   onProgress?.("templates");
-  const combined = new Map<string, string>();
+  const combined = new Map<string, { current: string; superseded?: string }>();
   const done = new Set<string>();
   const order: string[] = [];
   const tmpDirs: string[] = [];