create-flow-os 0.0.47-dev.1772047685 → 0.0.47-dev.1772051359

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-flow-os",
-  "version": "0.0.47-dev.1772047685",
+  "version": "0.0.47-dev.1772051359",
   "license": "PolyForm-Shield-1.0.0",
   "type": "module",
   "dependencies": {

package/src/init/merge.ts

@@ -136,16 +136,36 @@ export function mergeCodeTemplates(a: string, b: string): string {
   return replaceObjectArg(base, extB, merged);
 }
 
-/** Estrae la riga "export default fn(...)" dal template */
-function extractExportDefault(content: string): string | null {
-  const m = content.match(/export\s+default\s+\w+\s*\([^)]*\)\s*;?/);
-  return m ? m[0].trim() : null;
-}
-
-/** True se user ha già export default (anche su righe diverse, formattazione diversa) */
-function userHasExportDefault(content: string): boolean {
-  const normalized = content.replace(/\s+/g, " ");
-  return /\bexport\s+default\b/.test(normalized);
+/** Pattern universali: aggiungi blocco solo se manca. Vale per tutti i file di tutti i package. */
+type AddIfMissingPattern = {
+  /** Controlla se il contenuto ha già questo (anche su righe diverse, formattazione diversa) */
+  hasSignature: (content: string) => boolean;
+  /** Estrae il blocco completo dal template da aggiungere */
+  extractBlock: (content: string) => string | null;
+};
+
+const ADD_IF_MISSING_PATTERNS: AddIfMissingPattern[] = [
+  {
+    hasSignature: (c) => /\bexport\s+default\b/.test(c.replace(/\s+/g, " ")),
+    extractBlock: (c) => {
+      const m = c.match(/export\s+default\s+[\s\S]+?;\s*$/m) ?? c.match(/export\s+default\s+[\s\S]+?(?=\s*\n\s*\n|$)/s);
+      return m?.[0]?.trim() ?? null;
+    },
+  },
+];
+
+/** Applica i pattern add-if-missing: aggiunge blocchi dal template solo se mancano. Univoco per tutti i file. */
+function applyAddIfMissing(userOrMerged: string, templateContent: string): string {
+  let result = userOrMerged;
+  for (const p of ADD_IF_MISSING_PATTERNS) {
+    const block = p.extractBlock(templateContent);
+    if (block && !p.hasSignature(result)) {
+      const trimmed = result.trimEnd();
+      const sep = trimmed.endsWith("\n") || !trimmed ? "" : "\n\n";
+      result = trimmed + sep + block;
+    }
+  }
+  return result;
 }
 
 /** Merge per file con pattern fn({...}) - config(), defineConfig(), ecc. Additivo: non sovrascrive. */
@@ -153,19 +173,17 @@ export function mergeCodeObject(userContent: string, templateContent: string, _p
   const conflicts: Conflict[] = [];
   const userExt = extractObjectArg(userContent);
   const templateExt = extractObjectArg(templateContent);
-  if (!templateExt) return { merged: userContent || templateContent, conflicts: [], ext: null };
+  if (!templateExt) {
+    const base = userContent || templateContent;
+    return { merged: applyAddIfMissing(base, templateContent), conflicts: [], ext: null };
+  }
   const userObj = userExt?.obj ?? {};
   const templateObj = templateExt.obj;
   const mergedObj = deepMergeAdditive(userObj, templateObj, "", conflicts);
   const base = userContent || templateContent;
   const extToReplace = userExt ?? templateExt;
   let merged = replaceObjectArg(base, extToReplace, mergedObj);
-  const templateExport = extractExportDefault(templateContent);
-  if (templateExport && !userHasExportDefault(userContent) && !userHasExportDefault(merged)) {
-    const userTrimmed = merged.trimEnd();
-    const sep = userTrimmed.endsWith("\n") || !userTrimmed ? "" : "\n\n";
-    merged = userTrimmed + sep + templateExport;
-  }
+  merged = applyAddIfMissing(merged, templateContent);
   return { merged, conflicts, ext: templateExt };
 }
 
@@ -219,5 +237,7 @@ export async function mergeFile(
     return merged;
   }
 
-  return userContent ?? templateContent;
+  // Altri file (html, css, md, ecc.): stesso sistema add-if-missing univoco
+  const base = userContent ?? templateContent;
+  return applyAddIfMissing(base, templateContent);
 }