netcore-blueprint 0.0.29 → 0.0.31

package/bin/copy-module.js

@@ -2,111 +2,169 @@
 
 const fs = require('fs');
 const path = require('path');
-const { buildReplaceMap, applyReplacements } = require('../lib/replacer');
-
-// =======================
-// Args
-// =======================
-// Usage:
-//   create-module <NewModuleName> <NewEntityName>
-// Example:
-//   create-module AiAssistant Prompt
-// =======================
-
-const newModuleName = process.argv[2];
-const newEntityName = process.argv[3];
-
-if (!newModuleName || !newEntityName) {
-  console.error("❌ Usage: create-module <NewModuleName> <NewEntityName>");
-  console.error("   Example: create-module AiAssistant Prompt");
-  process.exit(1);
-}
+const { execSync } = require('child_process');
 
-// =======================
-// Template Source (Module mẫu)
-// =======================
+// =====================================================
+// Param = Source Module Name
+// Example: copy-module __MODULE__
+// Will create: Modules\__MODULE__Module\*
+// =====================================================
 
-const sourceModuleName = "ItemModule";   // module mẫu
-const sourceEntityName = "Item";         // entity mẫu
+const sourceModuleName = process.argv[2];
+const force = process.argv.includes('--force');
 
-const modulesTemplateRoot = path.join(__dirname, "..", "Modules");
-const sourceModulePath = path.join(modulesTemplateRoot, sourceModuleName);
+if (!sourceModuleName) {
+  console.error("❌ Usage: copy-module <SourceModuleName>");
+  console.error("   Example: copy-module __MODULE__");
+  process.exit(1);
+}
 
-// =======================
-// Destination (nơi user đang đứng)
-// =======================
+// Assume current working directory is Modules/
+const modulesPath = process.cwd();
 
-const destinationRoot = process.cwd(); // thường là thư mục Modules
-const destinationModulePath = path.join(destinationRoot, newModuleName);
+const templateRoot = path.join(modulesPath, sourceModuleName);
+const targetModuleName = `${sourceModuleName}Module`;
+const targetModuleRoot = path.join(modulesPath, targetModuleName);
 
-// =======================
-// Guards
-// =======================
+const solutionFile = findSolutionFileUpwards(modulesPath);
 
-if (!fs.existsSync(sourceModulePath)) {
-  console.error(`❌ Source module template not found: ${sourceModulePath}`);
+if (!fs.existsSync(templateRoot)) {
+  console.error(`❌ Source module folder not found: ${templateRoot}`);
   process.exit(1);
 }
 
-if (fs.existsSync(destinationModulePath)) {
-  console.error(`❌ Destination module already exists: ${destinationModulePath}`);
+if (fs.existsSync(targetModuleRoot)) {
+  if (!force) {
+    console.error(`❌ Target module already exists: ${targetModuleRoot}`);
+    console.error(`   Use --force to overwrite.`);
+    process.exit(1);
+  }
+
+  console.log(`🔥 --force detected. Removing existing module: ${targetModuleRoot}`);
+  fs.rmSync(targetModuleRoot, { recursive: true, force: true });
+}
+
+if (!solutionFile) {
+  console.error("❌ Could not find .sln or .slnx file.");
   process.exit(1);
 }
 
-// =======================
-// Replace Map
-// =======================
+console.log(`🚀 Cloning module template:`);
+console.log(`   From: ${templateRoot}`);
+console.log(`   To:   ${targetModuleRoot}`);
+console.log(`🧩 Solution: ${solutionFile}`);
 
-const replaceMap = buildReplaceMap({
-  sourceModuleName,
-  newModuleName,
-  sourceEntityName,
-  newEntityName
-});
+// =====================================================
+// 1. Create module root folder
+// =====================================================
+
+fs.mkdirSync(targetModuleRoot, { recursive: true });
+
+// =====================================================
+// 2. Create projects (ALL classlib)
+// =====================================================
+
+const projects = [
+  { name: `${targetModuleName}.API`, type: 'classlib' },
+  { name: `${targetModuleName}.Core`, type: 'classlib' },
+  { name: `${targetModuleName}.Infrastructure`, type: 'classlib' },
+];
+
+projects.forEach(p => {
+  console.log(`📦 Creating project: ${p.name}`);
+
+  execSync(`dotnet new ${p.type} -n ${p.name}`, {
+    cwd: targetModuleRoot,
+    stdio: 'inherit'
+  });
+
+  const projectPath = path.join(targetModuleRoot, p.name);
+
+  // =====================================================
+  // 3. Copy template files (NO csproj)
+  // =====================================================
 
-// =======================
-// Logs
-// =======================
+  const templateSubFolder = getTemplateSubFolder(p.name, templateRoot);
 
-console.log(`🚀 Creating module from template`);
-console.log(`📦 New Module: ${newModuleName}`);
-console.log(`🧩 New Entity: ${newEntityName}`);
-console.log(`📁 Template:   ${sourceModulePath}`);
-console.log(`📁 Target:     ${destinationModulePath}`);
+  if (!templateSubFolder || !fs.existsSync(templateSubFolder)) {
+    console.warn(`⚠️ Template subfolder not found: ${templateSubFolder}`);
+    return;
+  }
+
+  console.log(`📄 Copying template from: ${templateSubFolder}`);
+  copyRecursive(templateSubFolder, projectPath);
+});
 
-// =======================
-// Run
-// =======================
+// =====================================================
+// 4. Add Solution Folder + add projects under it
+// =====================================================
 
-copyAndRenameFiles(sourceModulePath, destinationModulePath);
+console.log(`📁 Creating solution folder: Modules\\${targetModuleName}`);
+execSync(
+  `dotnet sln "${solutionFile}" add --solution-folder "Modules\\${targetModuleName}" "${targetModuleRoot}\\*\\*.csproj"`,
+  { stdio: 'inherit' }
+);
 
-console.log(`🎉 Module "${newModuleName}" created with Entity "${newEntityName}" successfully!`);
+console.log(`🎉 Module "${targetModuleName}" created successfully!`);
 
-// =======================
-// Core Logic
-// =======================
+// =====================================================
+// Helpers
+// =====================================================
 
-function copyAndRenameFiles(src, dest) {
-  const stat = fs.lstatSync(src);
+function getTemplateSubFolder(projectName, templateRoot) {
+  if (projectName.endsWith('.API')) {
+    return path.join(templateRoot, 'API');
+  }
+  if (projectName.endsWith('.Core')) {
+    return path.join(templateRoot, 'Core');
+  }
+  if (projectName.endsWith('.Infrastructure')) {
+    return path.join(templateRoot, 'Infrastructure');
+  }
+  return null;
+}
 
-  if (stat.isDirectory()) {
+function copyRecursive(src, dest) {
+  if (!fs.existsSync(dest)) {
     fs.mkdirSync(dest, { recursive: true });
+  }
 
-    const entries = fs.readdirSync(src, { withFileTypes: true });
+  const entries = fs.readdirSync(src, { withFileTypes: true });
 
-    for (const entry of entries) {
-      const srcPath = path.join(src, entry.name);
+  for (const entry of entries) {
+    const srcPath = path.join(src, entry.name);
+    const destPath = path.join(dest, entry.name);
 
-      // Rename folder/file name
-      const renamedName = applyReplacements(entry.name, replaceMap);
-      const destPath = path.join(dest, renamedName);
+    // Do NOT overwrite .csproj
+    if (entry.isFile() && entry.name.endsWith('.csproj')) {
+      continue;
+    }
+
+    if (entry.isDirectory()) {
+      copyRecursive(srcPath, destPath);
+    } else {
+      fs.copyFileSync(srcPath, destPath);
+    }
+  }
+}
+
+function findSolutionFileUpwards(startDir) {
+  let current = startDir;
 
-      copyAndRenameFiles(srcPath, destPath);
+  while (true) {
+    const files = fs.readdirSync(current);
+    let sln = files.find(f => f.endsWith('.sln') || f.endsWith('.slnx'));
+    if (sln) return path.join(current, sln);
+
+    const blueprintTemplate = path.join(current, 'BlueprintTemplate');
+    if (fs.existsSync(blueprintTemplate)) {
+      const btFiles = fs.readdirSync(blueprintTemplate);
+      sln = btFiles.find(f => f.endsWith('.sln') || f.endsWith('.slnx'));
+      if (sln) return path.join(blueprintTemplate, sln);
     }
-  } else {
-    // Copy + replace file content
-    let content = fs.readFileSync(src, 'utf8');
-    content = applyReplacements(content, replaceMap);
-    fs.writeFileSync(dest, content, 'utf8');
+
+    const parent = path.dirname(current);
+    if (parent === current) return null;
+    current = parent;
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "netcore-blueprint",
-  "version": "0.0.29",
+  "version": "0.0.31",
   "description": "A custom project blueprint",
   "main": "create.js",
   "bin": {