create-flow-os 0.0.47-dev.1772045775 → 0.0.47-dev.1772047467

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-flow-os",
-  "version": "0.0.47-dev.1772045775",
+  "version": "0.0.47-dev.1772047467",
   "license": "PolyForm-Shield-1.0.0",
   "type": "module",
   "dependencies": {
@@ -13,7 +13,7 @@
     "create": "bun run src/create/index.ts",
     "dev": "flow-os dev",
     "build": "flow-os build",
-    "start": "bun run server/start.ts"
+    "start": "bun ./node_modules/@flow-os/server/src/bin.ts"
   },
   "devDependencies": {
     "@types/node": "^25.3.0",

package/src/init/merge.ts

@@ -136,7 +136,19 @@ export function mergeCodeTemplates(a: string, b: string): string {
   return replaceObjectArg(base, extB, merged);
 }
 
-/** Merge per file con pattern fn({...}) - config(), defineConfig(), ecc. */
+/** 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);
+}
+
+/** Merge per file con pattern fn({...}) - config(), defineConfig(), ecc. Additivo: non sovrascrive. */
 export function mergeCodeObject(userContent: string, templateContent: string, _path: string): { merged: string; conflicts: Conflict[]; ext: Extracted | null } {
   const conflicts: Conflict[] = [];
   const userExt = extractObjectArg(userContent);
@@ -146,7 +158,14 @@ export function mergeCodeObject(userContent: string, templateContent: string, _p
   const templateObj = templateExt.obj;
   const mergedObj = deepMergeAdditive(userObj, templateObj, "", conflicts);
   const base = userContent || templateContent;
-  const merged = replaceObjectArg(base, templateExt, mergedObj);
+  const extToReplace = userExt ?? templateExt;
+  let merged = replaceObjectArg(base, extToReplace, mergedObj);
+  const templateExport = extractExportDefault(templateContent);
+  if (templateExport && !userHasExportDefault(userContent)) {
+    const userTrimmed = merged.trimEnd();
+    const sep = userTrimmed.endsWith("\n") || !userTrimmed ? "" : "\n\n";
+    merged = userTrimmed + sep + templateExport;
+  }
   return { merged, conflicts, ext: templateExt };
 }
 

package/src/init/scaffold.ts

@@ -235,6 +235,24 @@ function resolveFlowDeps(
   return resolved;
 }
 
+const PKG_KEY_ORDER = ["name", "version", "private", "type", "scripts", "dependencies", "devDependencies"];
+
+function sortPkgKeys(pkg: Record<string, unknown>): Record<string, unknown> {
+  const ordered: Record<string, unknown> = {};
+  for (const k of PKG_KEY_ORDER) {
+    if (k in pkg) {
+      const v = pkg[k];
+      ordered[k] = k === "scripts" && v && typeof v === "object" && !Array.isArray(v)
+        ? Object.fromEntries(Object.entries(v as Record<string, string>).sort(([a], [b]) => a.localeCompare(b)))
+        : v;
+    }
+  }
+  for (const k of Object.keys(pkg).sort()) {
+    if (!(k in ordered)) ordered[k] = pkg[k];
+  }
+  return ordered;
+}
+
 function mergePkg(configDir: string, cwd: string, versionsFromNpm: Map<string, string>, useWorkspace: boolean): void {
   const configPkg = join(configDir, "package.json");
   if (!existsSync(configPkg)) return;
@@ -251,7 +269,7 @@ function mergePkg(configDir: string, cwd: string, versionsFromNpm: Map<string, s
   for (const [k, v] of Object.entries(resolveFlowDeps(config.devDependencies, pkgRootDir, versionsFromNpm, useWorkspace)))
     target.devDependencies[k] = v;
   target.scripts = { ...target.scripts, ...config.scripts };
-  writeFileSync(targetPath, JSON.stringify(target, null, 2));
+  writeFileSync(targetPath, JSON.stringify(sortPkgKeys(target), null, 2));
 }
 
 type FlowOsInit = { dependencies?: Record<string, string>; devDependencies?: Record<string, string>; scripts?: Record<string, string>; name?: string; version?: string; type?: string };
@@ -297,7 +315,7 @@ function mergeFlowOsInit(
   for (const [k, v] of Object.entries(resolveFlowDeps(init.devDependencies, packageRoot, versionsFromNpm, useWorkspace)))
     target.devDependencies[k] = v;
   target.scripts = { ...target.scripts, ...init.scripts };
-  writeFileSync(targetPath, JSON.stringify(target, null, 2));
+  writeFileSync(targetPath, JSON.stringify(sortPkgKeys(target), null, 2));
 }
 
 /** Aggiunge dipendenza per pacchetti senza config (solo install) */
@@ -313,7 +331,7 @@ function addDependencyForPackage(
   target.dependencies = target.dependencies ?? {};
   const spec = useWorkspace ? "workspace:*" : (versionsFromNpm.get(pkgName) ? `^${versionsFromNpm.get(pkgName)}` : undefined);
   if (spec) target.dependencies[pkgName] = spec;
-  writeFileSync(targetPath, JSON.stringify(target, null, 2));
+  writeFileSync(targetPath, JSON.stringify(sortPkgKeys(target), null, 2));
 }
 
 /** Assicura che versions abbia le versioni per pkgNames (fetch lazy) */
@@ -465,7 +483,7 @@ export async function initLib(
   if (!existsSync(targetPath)) {
     writeFileSync(
       targetPath,
-      JSON.stringify({ name: basename(cwd) || "flow-app", version: "0.0.1", private: true, type: "module" }, null, 2)
+      JSON.stringify(sortPkgKeys({ name: basename(cwd) || "flow-app", version: "0.0.1", private: true, type: "module" }), null, 2)
     );
   }