netcore-blueprint 0.0.31 → 0.0.32

package/bin/copy-module.js

@@ -5,13 +5,12 @@ const path = require('path');
 const { execSync } = require('child_process');
 
 // =====================================================
-// Param = Source Module Name
+// Param = Source Module Name (also base for new module)
 // Example: copy-module __MODULE__
-// Will create: Modules\__MODULE__Module\*
+// Will create: __MODULE__Module
 // =====================================================
 
 const sourceModuleName = process.argv[2];
-const force = process.argv.includes('--force');
 
 if (!sourceModuleName) {
   console.error("❌ Usage: copy-module <SourceModuleName>");
@@ -23,8 +22,7 @@ if (!sourceModuleName) {
 const modulesPath = process.cwd();
 
 const templateRoot = path.join(modulesPath, sourceModuleName);
-const targetModuleName = `${sourceModuleName}Module`;
-const targetModuleRoot = path.join(modulesPath, targetModuleName);
+const targetModuleRoot = path.join(modulesPath, `${sourceModuleName}Module`);
 
 const solutionFile = findSolutionFileUpwards(modulesPath);
 
@@ -34,18 +32,12 @@ if (!fs.existsSync(templateRoot)) {
 }
 
 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 });
+  console.error(`❌ Target module already exists: ${targetModuleRoot}`);
+  process.exit(1);
 }
 
 if (!solutionFile) {
-  console.error("❌ Could not find .sln or .slnx file.");
+  console.error("❌ Could not find .sln file in parent directories.");
   process.exit(1);
 }
 
@@ -55,19 +47,19 @@ console.log(`   To:   ${targetModuleRoot}`);
 console.log(`🧩 Solution: ${solutionFile}`);
 
 // =====================================================
-// 1. Create module root folder
+// 1. Create module root
 // =====================================================
 
 fs.mkdirSync(targetModuleRoot, { recursive: true });
 
 // =====================================================
-// 2. Create projects (ALL classlib)
+// 2. Create projects
 // =====================================================
 
 const projects = [
-  { name: `${targetModuleName}.API`, type: 'classlib' },
-  { name: `${targetModuleName}.Core`, type: 'classlib' },
-  { name: `${targetModuleName}.Infrastructure`, type: 'classlib' },
+  { name: `${sourceModuleName}Module.API`, type: 'webapi' },
+  { name: `${sourceModuleName}Module.Core`, type: 'classlib' },
+  { name: `${sourceModuleName}Module.Infrastructure`, type: 'classlib' },
 ];
 
 projects.forEach(p => {
@@ -81,7 +73,7 @@ projects.forEach(p => {
   const projectPath = path.join(targetModuleRoot, p.name);
 
   // =====================================================
-  // 3. Copy template files (NO csproj)
+  // 3. Copy template files (no csproj)
   // =====================================================
 
   const templateSubFolder = getTemplateSubFolder(p.name, templateRoot);
@@ -96,16 +88,23 @@ projects.forEach(p => {
 });
 
 // =====================================================
-// 4. Add Solution Folder + add projects under it
+// 4. Add projects to solution
 // =====================================================
 
-console.log(`📁 Creating solution folder: Modules\\${targetModuleName}`);
-execSync(
-  `dotnet sln "${solutionFile}" add --solution-folder "Modules\\${targetModuleName}" "${targetModuleRoot}\\*\\*.csproj"`,
-  { stdio: 'inherit' }
-);
+projects.forEach(p => {
+  const csproj = path.join(
+    targetModuleRoot,
+    p.name,
+    `${p.name}.csproj`
+  );
+
+  console.log(`➕ Adding to solution: ${csproj}`);
+  execSync(`dotnet sln "${solutionFile}" add "${csproj}"`, {
+    stdio: 'inherit'
+  });
+});
 
-console.log(`🎉 Module "${targetModuleName}" created successfully!`);
+console.log(`🎉 Module "${sourceModuleName}Module" created successfully!`);
 
 // =====================================================
 // Helpers
@@ -135,7 +134,7 @@ function copyRecursive(src, dest) {
     const srcPath = path.join(src, entry.name);
     const destPath = path.join(dest, entry.name);
 
-    // Do NOT overwrite .csproj
+    // Do NOT overwrite .csproj generated by dotnet new
     if (entry.isFile() && entry.name.endsWith('.csproj')) {
       continue;
     }
@@ -152,10 +151,12 @@ function findSolutionFileUpwards(startDir) {
   let current = startDir;
 
   while (true) {
+    // 1. Check current folder
     const files = fs.readdirSync(current);
     let sln = files.find(f => f.endsWith('.sln') || f.endsWith('.slnx'));
     if (sln) return path.join(current, sln);
 
+    // 2. Check BlueprintTemplate sibling
     const blueprintTemplate = path.join(current, 'BlueprintTemplate');
     if (fs.existsSync(blueprintTemplate)) {
       const btFiles = fs.readdirSync(blueprintTemplate);
@@ -163,8 +164,10 @@ function findSolutionFileUpwards(startDir) {
       if (sln) return path.join(blueprintTemplate, sln);
     }
 
+    // 3. Go up
     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.31",
+  "version": "0.0.32",
   "description": "A custom project blueprint",
   "main": "create.js",
   "bin": {