netcore-blueprint 0.0.28 → 0.0.30

package/bin/copy-module.js

@@ -5,31 +5,38 @@ const path = require('path');
 const { execSync } = require('child_process');
 
 // =====================================================
-// Param = Source Module Name
-// Example: copy-module __MODULE__
-// Will create: Modules\__MODULE__Module\*
+// Usage:
+//   copy-module __MODULE__ [--force]
+//
+// Template structure:
+// Modules\__MODULE__Module\
+//   __MODULE__Module.API\
+//   __MODULE__Module.Core\
+//   __MODULE__Module.Infrastructure\
 // =====================================================
 
 const sourceModuleName = process.argv[2];
 const force = process.argv.includes('--force');
 
 if (!sourceModuleName) {
-  console.error("❌ Usage: copy-module <SourceModuleName>");
+  console.error("❌ Usage: copy-module <SourceModuleName> [--force]");
   console.error("   Example: copy-module __MODULE__");
   process.exit(1);
 }
 
-// Assume current working directory is Modules/
+// Assume cwd = Modules/
 const modulesPath = process.cwd();
 
-const templateRoot = path.join(modulesPath, sourceModuleName);
+const templateModuleRoot = path.join(modulesPath, `${sourceModuleName}Module`);
 const targetModuleName = `${sourceModuleName}Module`;
 const targetModuleRoot = path.join(modulesPath, targetModuleName);
 
 const solutionFile = findSolutionFileUpwards(modulesPath);
 
-if (!fs.existsSync(templateRoot)) {
-  console.error(`❌ Source module folder not found: ${templateRoot}`);
+// ================= Guards =================
+
+if (!fs.existsSync(templateModuleRoot)) {
+  console.error(`❌ Template module not found: ${templateModuleRoot}`);
   process.exit(1);
 }
 
@@ -40,7 +47,7 @@ if (fs.existsSync(targetModuleRoot)) {
     process.exit(1);
   }
 
-  console.log(`🔥 --force detected. Removing existing module: ${targetModuleRoot}`);
+  console.log(`🔥 --force detected. Removing: ${targetModuleRoot}`);
   fs.rmSync(targetModuleRoot, { recursive: true, force: true });
 }
 
@@ -49,103 +56,73 @@ if (!solutionFile) {
   process.exit(1);
 }
 
-console.log(`🚀 Cloning module template:`);
-console.log(`   From: ${templateRoot}`);
-console.log(`   To:   ${targetModuleRoot}`);
+console.log(`🚀 Cloning module template`);
+console.log(`📁 From: ${templateModuleRoot}`);
+console.log(`📁 To:   ${targetModuleRoot}`);
 console.log(`🧩 Solution: ${solutionFile}`);
 
-// =====================================================
-// 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' },
-];
+// ================= 1. Copy whole module folder =================
 
-projects.forEach(p => {
-  console.log(`📦 Creating project: ${p.name}`);
+copyRecursive(templateModuleRoot, targetModuleRoot);
 
-  execSync(`dotnet new ${p.type} -n ${p.name}`, {
-    cwd: targetModuleRoot,
-    stdio: 'inherit'
-  });
+// ================= 2. Collect csproj files =================
 
-  const projectPath = path.join(targetModuleRoot, p.name);
+const csprojFiles = findCsprojFiles(targetModuleRoot);
 
-  // =====================================================
-  // 3. Copy template files (NO csproj)
-  // =====================================================
+if (csprojFiles.length === 0) {
+  console.error("❌ No .csproj files found in cloned module.");
+  process.exit(1);
+}
 
-  const templateSubFolder = getTemplateSubFolder(p.name, templateRoot);
+// ================= 3. Add to solution (NO wildcard) =================
 
-  if (!templateSubFolder || !fs.existsSync(templateSubFolder)) {
-    console.warn(`⚠️ Template subfolder not found: ${templateSubFolder}`);
-    return;
-  }
+console.log(`📁 Creating solution folder: Modules\\${targetModuleName}`);
 
-  console.log(`📄 Copying template from: ${templateSubFolder}`);
-  copyRecursive(templateSubFolder, projectPath);
+csprojFiles.forEach(csproj => {
+  console.log(`➕ Adding to solution: ${csproj}`);
+  execSync(
+    `dotnet sln "${solutionFile}" add --solution-folder "Modules\\${targetModuleName}" "${csproj}"`,
+    { stdio: 'inherit' }
+  );
 });
 
-// =====================================================
-// 4. Add Solution Folder + add projects under it
-// =====================================================
-
-console.log(`📁 Creating solution folder: Modules\\${targetModuleName}`);
-execSync(
-  `dotnet sln "${solutionFile}" add --solution-folder "Modules\\${targetModuleName}" "${targetModuleRoot}\\*\\*.csproj"`,
-  { stdio: 'inherit' }
-);
-
-console.log(`🎉 Module "${targetModuleName}" created successfully!`);
+console.log(`🎉 Module "${targetModuleName}" cloned successfully!`);
 
 // =====================================================
 // Helpers
 // =====================================================
 
-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;
-}
-
 function copyRecursive(src, dest) {
-  if (!fs.existsSync(dest)) {
+  const stat = fs.lstatSync(src);
+
+  if (stat.isDirectory()) {
     fs.mkdirSync(dest, { recursive: true });
+    const entries = fs.readdirSync(src, { withFileTypes: true });
+
+    for (const entry of entries) {
+      const srcPath = path.join(src, entry.name);
+      const destPath = path.join(dest, entry.name);
+      copyRecursive(srcPath, destPath);
+    }
+  } else {
+    fs.copyFileSync(src, dest);
   }
+}
 
-  const entries = fs.readdirSync(src, { withFileTypes: true });
+function findCsprojFiles(dir, results = []) {
+  const entries = fs.readdirSync(dir, { withFileTypes: true });
 
   for (const entry of entries) {
-    const srcPath = path.join(src, entry.name);
-    const destPath = path.join(dest, entry.name);
-
-    // Do NOT overwrite .csproj
-    if (entry.isFile() && entry.name.endsWith('.csproj')) {
-      continue;
-    }
+    const fullPath = path.join(dir, entry.name);
 
     if (entry.isDirectory()) {
-      copyRecursive(srcPath, destPath);
-    } else {
-      fs.copyFileSync(srcPath, destPath);
+      findCsprojFiles(fullPath, results);
+    } else if (entry.isFile() && entry.name.endsWith('.csproj')) {
+      results.push(fullPath);
     }
   }
+
+  return results;
 }
 
 function findSolutionFileUpwards(startDir) {

package/bin/create-module.js

@@ -8,35 +8,33 @@ 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("❌ Usage: create-module <ModuleName> <EntityName>");
   console.error("   Example: create-module AiAssistant Prompt");
   process.exit(1);
 }
 
 // =======================
-// Template Source (Module mẫu)
+// Template source
 // =======================
 
-const sourceModuleName = "ItemModule";   // module mẫu
-const sourceEntityName = "Item";         // entity mẫu
+const sourceModuleName = "ItemModule";
+const sourceEntityName = "Item";
 
 const modulesTemplateRoot = path.join(__dirname, "..", "Modules");
 const sourceModulePath = path.join(modulesTemplateRoot, sourceModuleName);
 
 // =======================
-// Destination (nơi user đang đứng)
+// Destination
 // =======================
 
-const destinationRoot = process.cwd(); // thường là thư mục Modules
+const destinationRoot = process.cwd();
 const destinationModulePath = path.join(destinationRoot, newModuleName);
 
 // =======================
@@ -44,7 +42,7 @@ const destinationModulePath = path.join(destinationRoot, newModuleName);
 // =======================
 
 if (!fs.existsSync(sourceModulePath)) {
-  console.error(`❌ Source module template not found: ${sourceModulePath}`);
+  console.error(`❌ Source module not found: ${sourceModulePath}`);
   process.exit(1);
 }
 
@@ -64,15 +62,10 @@ const replaceMap = buildReplaceMap({
   newEntityName
 });
 
-// =======================
-// Logs
-// =======================
-
-console.log(`🚀 Creating module from template`);
-console.log(`📦 New Module: ${newModuleName}`);
-console.log(`🧩 New Entity: ${newEntityName}`);
-console.log(`📁 Template:   ${sourceModulePath}`);
-console.log(`📁 Target:     ${destinationModulePath}`);
+console.log(`📦 Creating module: ${newModuleName}`);
+console.log(`🧩 Entity name: ${newEntityName}`);
+console.log(`📁 From template: ${sourceModulePath}`);
+console.log(`📁 To: ${destinationModulePath}`);
 
 // =======================
 // Run
@@ -80,7 +73,7 @@ console.log(`📁 Target:     ${destinationModulePath}`);
 
 copyAndRenameFiles(sourceModulePath, destinationModulePath);
 
-console.log(`🎉 Module "${newModuleName}" created with Entity "${newEntityName}" successfully!`);
+console.log(`🎉 Module "${newModuleName}" with Entity "${newEntityName}" created successfully!`);
 
 // =======================
 // Core Logic
@@ -97,14 +90,12 @@ function copyAndRenameFiles(src, dest) {
     for (const entry of entries) {
       const srcPath = path.join(src, entry.name);
 
-      // Rename folder/file name
-      const renamedName = applyReplacements(entry.name, replaceMap);
-      const destPath = path.join(dest, renamedName);
+      let renamed = applyReplacements(entry.name, replaceMap);
+      const destPath = path.join(dest, renamed);
 
       copyAndRenameFiles(srcPath, destPath);
     }
   } else {
-    // Copy + replace file content
     let content = fs.readFileSync(src, 'utf8');
     content = applyReplacements(content, replaceMap);
     fs.writeFileSync(dest, content, 'utf8');

package/package.json

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