create-nexu 1.1.0 → 1.1.1

package/dist/index.js

@@ -90,18 +90,6 @@ function execInherit(command, cwd) {
     throw new Error(`Command failed: ${command}`);
   }
 }
-function copyWithMerge(src, dest, overwrite = false) {
-  if (fs.existsSync(dest) && !overwrite) {
-    if (fs.statSync(src).isDirectory() && fs.statSync(dest).isDirectory()) {
-      const files = fs.readdirSync(src);
-      for (const file of files) {
-        copyWithMerge(path.join(src, file), path.join(dest, file), overwrite);
-      }
-    }
-    return;
-  }
-  fs.copySync(src, dest, { overwrite });
-}
 function log(message, type = "info") {
   const colors = {
     info: chalk.blue,
@@ -517,6 +505,7 @@ async function init(projectName, options) {
 import path4 from "path";
 import { fileURLToPath as fileURLToPath3 } from "url";
 import chalk4 from "chalk";
+import { diffLines } from "diff";
 import fs4 from "fs-extra";
 import inquirer3 from "inquirer";
 import ora3 from "ora";
@@ -534,6 +523,138 @@ function getTemplateDir3() {
   }
   throw new Error("Template directory not found. Please reinstall the package.");
 }
+function compareFiles(srcPath, destPath) {
+  if (!fs4.existsSync(destPath)) return false;
+  if (!fs4.existsSync(srcPath)) return false;
+  const srcStat = fs4.statSync(srcPath);
+  const destStat = fs4.statSync(destPath);
+  if (srcStat.isDirectory() || destStat.isDirectory()) return false;
+  const srcContent = fs4.readFileSync(srcPath, "utf-8");
+  const destContent = fs4.readFileSync(destPath, "utf-8");
+  return srcContent === destContent;
+}
+function collectFileChanges(srcDir, destDir, category, basePath = "") {
+  const changes = [];
+  if (!fs4.existsSync(srcDir)) return changes;
+  const entries = fs4.readdirSync(srcDir, { withFileTypes: true });
+  for (const entry of entries) {
+    const srcPath = path4.join(srcDir, entry.name);
+    const destPath = path4.join(destDir, entry.name);
+    const relativePath = basePath ? path4.join(basePath, entry.name) : entry.name;
+    if (entry.isDirectory()) {
+      changes.push(...collectFileChanges(srcPath, destPath, category, relativePath));
+    } else {
+      if (!fs4.existsSync(destPath)) {
+        changes.push({ type: "add", relativePath, srcPath, destPath, category });
+      } else if (!compareFiles(srcPath, destPath)) {
+        changes.push({ type: "modify", relativePath, srcPath, destPath, category });
+      }
+    }
+  }
+  return changes;
+}
+function showFileDiff(srcPath, destPath) {
+  if (!fs4.existsSync(destPath)) {
+    console.log(chalk4.green("  (new file)"));
+    return;
+  }
+  const srcContent = fs4.readFileSync(srcPath, "utf-8");
+  const destContent = fs4.readFileSync(destPath, "utf-8");
+  const differences = diffLines(destContent, srcContent);
+  let hasChanges2 = false;
+  for (const part of differences) {
+    if (part.added || part.removed) {
+      hasChanges2 = true;
+      const lines = part.value.split("\n").filter((l) => l.length > 0);
+      for (const line of lines.slice(0, 5)) {
+        if (part.added) {
+          console.log(chalk4.green(`  + ${line.substring(0, 80)}`));
+        } else {
+          console.log(chalk4.red(`  - ${line.substring(0, 80)}`));
+        }
+      }
+      if (lines.length > 5) {
+        console.log(chalk4.gray(`  ... and ${lines.length - 5} more lines`));
+      }
+    }
+  }
+  if (!hasChanges2) {
+    console.log(chalk4.gray("  (no visible changes)"));
+  }
+}
+function collectDependencyChanges(templatePkgPath, projectPkgPath) {
+  if (!fs4.existsSync(templatePkgPath) || !fs4.existsSync(projectPkgPath)) {
+    return null;
+  }
+  const templatePkg = fs4.readJsonSync(templatePkgPath);
+  const projectPkg = fs4.readJsonSync(projectPkgPath);
+  const changes = {
+    type: "package.json",
+    changes: {
+      added: { dependencies: {}, devDependencies: {}, scripts: {} },
+      updated: { dependencies: {}, devDependencies: {}, scripts: {} }
+    }
+  };
+  for (const depType of ["dependencies", "devDependencies"]) {
+    if (templatePkg[depType]) {
+      for (const [pkg, version] of Object.entries(templatePkg[depType])) {
+        if (!projectPkg[depType]?.[pkg]) {
+          changes.changes.added[depType][pkg] = version;
+        } else if (projectPkg[depType][pkg] !== version) {
+          changes.changes.updated[depType][pkg] = {
+            from: projectPkg[depType][pkg],
+            to: version
+          };
+        }
+      }
+    }
+  }
+  if (templatePkg.scripts) {
+    for (const [script, cmd] of Object.entries(templatePkg.scripts)) {
+      if (!projectPkg.scripts?.[script]) {
+        changes.changes.added.scripts[script] = cmd;
+      }
+    }
+  }
+  return changes;
+}
+function displayDependencyChanges(changes) {
+  const { added, updated } = changes.changes;
+  if (Object.keys(added.dependencies).length > 0) {
+    console.log(chalk4.cyan("\n  New dependencies:"));
+    for (const [pkg, version] of Object.entries(added.dependencies)) {
+      console.log(chalk4.green(`    + ${pkg}: ${version}`));
+    }
+  }
+  if (Object.keys(added.devDependencies).length > 0) {
+    console.log(chalk4.cyan("\n  New devDependencies:"));
+    for (const [pkg, version] of Object.entries(added.devDependencies)) {
+      console.log(chalk4.green(`    + ${pkg}: ${version}`));
+    }
+  }
+  if (Object.keys(updated.dependencies).length > 0) {
+    console.log(chalk4.cyan("\n  Updated dependencies:"));
+    for (const [pkg, { from, to }] of Object.entries(updated.dependencies)) {
+      console.log(chalk4.yellow(`    ~ ${pkg}: ${from} \u2192 ${to}`));
+    }
+  }
+  if (Object.keys(updated.devDependencies).length > 0) {
+    console.log(chalk4.cyan("\n  Updated devDependencies:"));
+    for (const [pkg, { from, to }] of Object.entries(updated.devDependencies)) {
+      console.log(chalk4.yellow(`    ~ ${pkg}: ${from} \u2192 ${to}`));
+    }
+  }
+  if (Object.keys(added.scripts).length > 0) {
+    console.log(chalk4.cyan("\n  New scripts:"));
+    for (const [script, cmd] of Object.entries(added.scripts)) {
+      console.log(chalk4.green(`    + ${script}: ${String(cmd).substring(0, 50)}...`));
+    }
+  }
+}
+function hasChanges(changes) {
+  const { added, updated } = changes.changes;
+  return Object.keys(added.dependencies).length > 0 || Object.keys(added.devDependencies).length > 0 || Object.keys(added.scripts).length > 0 || Object.keys(updated.dependencies).length > 0 || Object.keys(updated.devDependencies).length > 0;
+}
 async function update(options) {
   console.log(chalk4.bold("\n\u{1F504} Update Nexu Project\n"));
   const projectDir = process.cwd();
@@ -544,28 +665,227 @@ async function update(options) {
     );
     process.exit(1);
   }
-  const updateAll = options.all || !options.packages && !options.config && !options.workflows && !options.services;
+  const templateDir = getTemplateDir3();
+  const updateAll = options.all || !options.packages && !options.config && !options.workflows && !options.services && !options.scripts && !options.dependencies;
   const updateTargets = {
     packages: updateAll || options.packages,
     config: updateAll || options.config,
     workflows: updateAll || options.workflows,
-    services: updateAll || options.services
+    services: updateAll || options.services,
+    scripts: updateAll || options.scripts,
+    dependencies: updateAll || options.dependencies
   };
-  console.log("Components to update:");
-  if (updateTargets.packages) console.log(chalk4.cyan("  - Shared packages"));
-  if (updateTargets.config) console.log(chalk4.cyan("  - Configuration files"));
-  if (updateTargets.workflows) console.log(chalk4.cyan("  - GitHub workflows"));
-  if (updateTargets.services) console.log(chalk4.cyan("  - Docker services"));
+  const spinner = ora3("Analyzing changes...").start();
+  const allFileChanges = [];
+  let dependencyChanges = null;
+  if (updateTargets.config) {
+    for (const file of TEMPLATE_DIRS.config) {
+      const srcFile = path4.join(templateDir, file);
+      const destFile = path4.join(projectDir, file);
+      if (fs4.existsSync(srcFile)) {
+        if (!fs4.existsSync(destFile)) {
+          allFileChanges.push({
+            type: "add",
+            relativePath: file,
+            srcPath: srcFile,
+            destPath: destFile,
+            category: "config"
+          });
+        } else if (!compareFiles(srcFile, destFile)) {
+          allFileChanges.push({
+            type: "modify",
+            relativePath: file,
+            srcPath: srcFile,
+            destPath: destFile,
+            category: "config"
+          });
+        }
+      }
+    }
+    allFileChanges.push(
+      ...collectFileChanges(
+        path4.join(templateDir, ".husky"),
+        path4.join(projectDir, ".husky"),
+        "config",
+        ".husky"
+      )
+    );
+    allFileChanges.push(
+      ...collectFileChanges(
+        path4.join(templateDir, ".vscode"),
+        path4.join(projectDir, ".vscode"),
+        "config",
+        ".vscode"
+      )
+    );
+  }
+  if (updateTargets.workflows) {
+    allFileChanges.push(
+      ...collectFileChanges(
+        path4.join(templateDir, ".github"),
+        path4.join(projectDir, ".github"),
+        "workflows",
+        ".github"
+      )
+    );
+  }
+  if (updateTargets.services) {
+    allFileChanges.push(
+      ...collectFileChanges(
+        path4.join(templateDir, "services"),
+        path4.join(projectDir, "services"),
+        "services",
+        "services"
+      )
+    );
+    allFileChanges.push(
+      ...collectFileChanges(
+        path4.join(templateDir, "docker"),
+        path4.join(projectDir, "docker"),
+        "services",
+        "docker"
+      )
+    );
+  }
+  if (updateTargets.scripts) {
+    allFileChanges.push(
+      ...collectFileChanges(
+        path4.join(templateDir, "scripts"),
+        path4.join(projectDir, "scripts"),
+        "scripts",
+        "scripts"
+      )
+    );
+  }
+  if (updateTargets.packages) {
+    const existingPackages = fs4.existsSync(path4.join(projectDir, "packages")) ? fs4.readdirSync(path4.join(projectDir, "packages")).filter((f) => fs4.statSync(path4.join(projectDir, "packages", f)).isDirectory()) : [];
+    for (const pkg of SHARED_PACKAGES) {
+      if (existingPackages.includes(pkg)) {
+        allFileChanges.push(
+          ...collectFileChanges(
+            path4.join(templateDir, "packages", pkg),
+            path4.join(projectDir, "packages", pkg),
+            "packages",
+            path4.join("packages", pkg)
+          )
+        );
+      }
+    }
+  }
+  if (updateTargets.dependencies) {
+    dependencyChanges = collectDependencyChanges(
+      path4.join(templateDir, "package.json"),
+      path4.join(projectDir, "package.json")
+    );
+  }
+  spinner.stop();
+  const addedFiles = allFileChanges.filter((c) => c.type === "add");
+  const modifiedFiles = allFileChanges.filter((c) => c.type === "modify");
+  if (addedFiles.length === 0 && modifiedFiles.length === 0 && (!dependencyChanges || !hasChanges(dependencyChanges))) {
+    console.log(chalk4.green("\u2713 Your project is up to date! No changes needed.\n"));
+    return;
+  }
+  console.log(chalk4.bold("\u{1F4CB} Changes to apply:\n"));
+  const categories = [...new Set(allFileChanges.map((c) => c.category))];
+  for (const category of categories) {
+    const categoryChanges = allFileChanges.filter((c) => c.category === category);
+    if (categoryChanges.length === 0) continue;
+    const categoryNames = {
+      config: "Configuration files",
+      workflows: "GitHub workflows",
+      services: "Docker services",
+      scripts: "Scripts",
+      packages: "Shared packages"
+    };
+    console.log(chalk4.cyan.bold(`
+${categoryNames[category] || category}:`));
+    const added = categoryChanges.filter((c) => c.type === "add");
+    const modified = categoryChanges.filter((c) => c.type === "modify");
+    if (added.length > 0) {
+      console.log(chalk4.green(`  New files (${added.length}):`));
+      for (const change of added.slice(0, 10)) {
+        console.log(chalk4.green(`    + ${change.relativePath}`));
+      }
+      if (added.length > 10) {
+        console.log(chalk4.gray(`    ... and ${added.length - 10} more files`));
+      }
+    }
+    if (modified.length > 0) {
+      console.log(chalk4.yellow(`  Modified files (${modified.length}):`));
+      for (const change of modified.slice(0, 10)) {
+        console.log(chalk4.yellow(`    ~ ${change.relativePath}`));
+      }
+      if (modified.length > 10) {
+        console.log(chalk4.gray(`    ... and ${modified.length - 10} more files`));
+      }
+    }
+  }
+  if (dependencyChanges && hasChanges(dependencyChanges)) {
+    console.log(chalk4.cyan.bold("\nPackage.json changes:"));
+    displayDependencyChanges(dependencyChanges);
+  }
   console.log("");
+  if (options.preview) {
+    const { showDiff } = await inquirer3.prompt([
+      {
+        type: "confirm",
+        name: "showDiff",
+        message: "Show detailed file differences?",
+        default: false
+      }
+    ]);
+    if (showDiff) {
+      for (const change of modifiedFiles) {
+        console.log(chalk4.bold(`
+${change.relativePath}:`));
+        showFileDiff(change.srcPath, change.destPath);
+      }
+    }
+  }
   if (options.dryRun) {
-    log("Dry run mode - no changes will be made", "info");
+    console.log(chalk4.blue("\ni Dry run mode - no changes were made.\n"));
+    return;
+  }
+  const { selectedCategories } = await inquirer3.prompt([
+    {
+      type: "checkbox",
+      name: "selectedCategories",
+      message: "Select which changes to apply:",
+      choices: [
+        ...categories.map((cat) => {
+          const count = allFileChanges.filter((c) => c.category === cat).length;
+          const categoryNames = {
+            config: "Configuration files",
+            workflows: "GitHub workflows",
+            services: "Docker services",
+            scripts: "Scripts",
+            packages: "Shared packages"
+          };
+          return {
+            name: `${categoryNames[cat] || cat} (${count} files)`,
+            value: cat,
+            checked: true
+          };
+        }),
+        ...dependencyChanges && hasChanges(dependencyChanges) ? [
+          {
+            name: "Package.json dependencies",
+            value: "dependencies",
+            checked: true
+          }
+        ] : []
+      ]
+    }
+  ]);
+  if (selectedCategories.length === 0) {
+    log("No changes selected. Update cancelled.", "warn");
     return;
   }
   const { confirm } = await inquirer3.prompt([
     {
       type: "confirm",
       name: "confirm",
-      message: "Proceed with update?",
+      message: `Apply ${selectedCategories.length} category(ies) of changes?`,
       default: true
     }
   ]);
@@ -573,112 +893,60 @@ async function update(options) {
     log("Update cancelled.", "warn");
     return;
   }
-  const templateDir = getTemplateDir3();
-  if (updateTargets.packages) {
-    await updatePackages(projectDir, templateDir);
-  }
-  if (updateTargets.config) {
-    await updateConfig(projectDir, templateDir);
-  }
-  if (updateTargets.workflows) {
-    await updateWorkflows(projectDir, templateDir);
-  }
-  if (updateTargets.services) {
-    await updateServices(projectDir, templateDir);
-  }
-  console.log("\n" + chalk4.green.bold("\u2728 Update complete!\n"));
-  console.log("Run " + chalk4.cyan("pnpm install") + " to install any new dependencies.");
-  console.log("");
-}
-async function updatePackages(projectDir, templateDir) {
-  const spinner = ora3("Updating shared packages...").start();
-  const existingPackages = fs4.existsSync(path4.join(projectDir, "packages")) ? fs4.readdirSync(path4.join(projectDir, "packages")).filter((f) => fs4.statSync(path4.join(projectDir, "packages", f)).isDirectory()) : [];
-  const { selectedPackages } = await inquirer3.prompt([
-    {
-      type: "checkbox",
-      name: "selectedPackages",
-      message: "Select packages to update:",
-      choices: SHARED_PACKAGES.map((pkg) => ({
-        name: pkg + (existingPackages.includes(pkg) ? " (update)" : " (add new)"),
-        value: pkg,
-        checked: existingPackages.includes(pkg)
-      }))
+  const applySpinner = ora3("Applying changes...").start();
+  let appliedFiles = 0;
+  for (const change of allFileChanges) {
+    if (!selectedCategories.includes(change.category)) continue;
+    fs4.ensureDirSync(path4.dirname(change.destPath));
+    fs4.copySync(change.srcPath, change.destPath, { overwrite: true });
+    appliedFiles++;
+  }
+  if (selectedCategories.includes("dependencies") && dependencyChanges) {
+    const templatePkgPath = path4.join(templateDir, "package.json");
+    const projectPkgPath = path4.join(projectDir, "package.json");
+    const templatePkg = fs4.readJsonSync(templatePkgPath);
+    const projectPkg = fs4.readJsonSync(projectPkgPath);
+    if (templatePkg.devDependencies) {
+      projectPkg.devDependencies = {
+        ...projectPkg.devDependencies,
+        ...templatePkg.devDependencies
+      };
     }
-  ]);
-  spinner.start("Updating packages...");
-  for (const pkg of selectedPackages) {
-    const srcDir = path4.join(templateDir, "packages", pkg);
-    const destDir = path4.join(projectDir, "packages", pkg);
-    if (fs4.existsSync(srcDir)) {
-      let existingPkgJson = null;
-      const pkgJsonPath = path4.join(destDir, "package.json");
-      if (fs4.existsSync(pkgJsonPath)) {
-        existingPkgJson = fs4.readJsonSync(pkgJsonPath);
-      }
-      fs4.copySync(srcDir, destDir, { overwrite: true });
-      if (existingPkgJson) {
-        const newPkgJson = fs4.readJsonSync(pkgJsonPath);
-        newPkgJson.version = existingPkgJson.version;
-        fs4.writeJsonSync(pkgJsonPath, newPkgJson, { spaces: 2 });
-      }
+    if (templatePkg.dependencies) {
+      projectPkg.dependencies = {
+        ...projectPkg.dependencies,
+        ...templatePkg.dependencies
+      };
+    }
+    if (templatePkg.scripts) {
+      projectPkg.scripts = {
+        ...templatePkg.scripts,
+        ...projectPkg.scripts
+      };
     }
+    if (projectPkg.dependencies) {
+      projectPkg.dependencies = sortObject(projectPkg.dependencies);
+    }
+    if (projectPkg.devDependencies) {
+      projectPkg.devDependencies = sortObject(projectPkg.devDependencies);
+    }
+    fs4.writeJsonSync(projectPkgPath, projectPkg, { spaces: 2 });
   }
-  spinner.succeed(`Updated ${selectedPackages.length} packages`);
-}
-async function updateConfig(projectDir, templateDir) {
-  const spinner = ora3("Updating configuration files...").start();
-  const configFiles = TEMPLATE_DIRS.config;
-  let updated = 0;
-  for (const file of configFiles) {
-    const srcFile = path4.join(templateDir, file);
-    const destFile = path4.join(projectDir, file);
-    if (fs4.existsSync(srcFile)) {
-      fs4.copySync(srcFile, destFile, { overwrite: true });
-      updated++;
-    }
-  }
-  const huskySrc = path4.join(templateDir, ".husky");
-  const huskyDest = path4.join(projectDir, ".husky");
-  if (fs4.existsSync(huskySrc)) {
-    fs4.copySync(huskySrc, huskyDest, { overwrite: true });
-  }
-  const vscodeSrc = path4.join(templateDir, ".vscode");
-  const vscodeDest = path4.join(projectDir, ".vscode");
-  if (fs4.existsSync(vscodeSrc)) {
-    fs4.copySync(vscodeSrc, vscodeDest, { overwrite: true });
-  }
-  spinner.succeed(`Updated ${updated} configuration files`);
-}
-async function updateWorkflows(projectDir, templateDir) {
-  const spinner = ora3("Updating GitHub workflows...").start();
-  const workflowsSrc = path4.join(templateDir, ".github", "workflows");
-  const workflowsDest = path4.join(projectDir, ".github", "workflows");
-  if (fs4.existsSync(workflowsSrc)) {
-    fs4.ensureDirSync(workflowsDest);
-    fs4.copySync(workflowsSrc, workflowsDest, { overwrite: true });
-  }
-  const actionsSrc = path4.join(templateDir, ".github", "actions");
-  const actionsDest = path4.join(projectDir, ".github", "actions");
-  if (fs4.existsSync(actionsSrc)) {
-    fs4.ensureDirSync(actionsDest);
-    fs4.copySync(actionsSrc, actionsDest, { overwrite: true });
-  }
-  const dependabotSrc = path4.join(templateDir, ".github", "dependabot.yml");
-  const dependabotDest = path4.join(projectDir, ".github", "dependabot.yml");
-  if (fs4.existsSync(dependabotSrc)) {
-    fs4.copySync(dependabotSrc, dependabotDest, { overwrite: true });
-  }
-  spinner.succeed("Updated GitHub workflows and actions");
+  applySpinner.succeed(`Applied ${appliedFiles} file changes`);
+  console.log("\n" + chalk4.green.bold("\u2728 Update complete!\n"));
+  if (selectedCategories.includes("dependencies")) {
+    console.log("Run your package manager install command to install any new dependencies.");
+  }
+  console.log("");
 }
-async function updateServices(projectDir, templateDir) {
-  const spinner = ora3("Updating Docker services...").start();
-  const servicesSrc = path4.join(templateDir, "services");
-  const servicesDest = path4.join(projectDir, "services");
-  if (fs4.existsSync(servicesSrc)) {
-    fs4.ensureDirSync(servicesDest);
-    copyWithMerge(servicesSrc, servicesDest, true);
-  }
-  spinner.succeed("Updated Docker services");
+function sortObject(obj) {
+  return Object.keys(obj).sort().reduce(
+    (acc, key) => {
+      acc[key] = obj[key];
+      return acc;
+    },
+    {}
+  );
 }
 
 // src/index.ts
@@ -691,6 +959,6 @@ program.argument("[project-name]", "Name of the project to create").option("-t,
     return init(projectName, options);
   }
 });
-program.command("update").description("Update an existing Nexu project with latest features").option("-p, --packages", "Update only shared packages").option("-c, --config", "Update only configuration files").option("-w, --workflows", "Update only GitHub workflows").option("-s, --services", "Update only Docker services").option("--all", "Update everything (default)").option("--dry-run", "Show what would be updated without making changes").action(update);
+program.command("update").description("Update an existing Nexu project with latest features").option("-p, --packages", "Update only shared packages").option("-c, --config", "Update only configuration files").option("-w, --workflows", "Update only GitHub workflows").option("-s, --services", "Update only Docker services").option("--scripts", "Update only scripts").option("-d, --dependencies", "Update only package.json dependencies").option("--all", "Update everything (default)").option("--dry-run", "Show what would be updated without making changes").option("--preview", "Show detailed file differences before applying").action(update);
 program.command("add <component>").description("Add a component to your project (package, service)").option("-n, --name <name>", "Name for the component").action(add);
 program.parse();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-nexu",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "CLI to create and update Nexu monorepo projects",
   "author": "Nexu Team",
   "license": "MIT",
@@ -23,18 +23,20 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
+    "chalk": "^5.3.0",
     "commander": "^12.0.0",
+    "diff": "^8.0.3",
     "fs-extra": "^11.2.0",
     "inquirer": "^9.2.0",
-    "chalk": "^5.3.0",
     "ora": "^8.0.0",
     "semver": "^7.6.0"
   },
   "devDependencies": {
+    "@types/diff": "^8.0.0",
     "@types/fs-extra": "^11.0.0",
     "@types/inquirer": "^9.0.0",
-    "@types/semver": "^7.5.0",
     "@types/node": "^20.0.0",
+    "@types/semver": "^7.5.0",
     "tsup": "^8.0.0",
     "typescript": "^5.4.0"
   }