netcore-blueprint 0.0.48 → 0.0.49

package/bin/copy-module.js

@@ -6,8 +6,8 @@ const { execSync } = require('child_process');
 
 // =====================================================
 // Param = Source Module Name (also base for new module)
-// Example: copy-module __MODULE__
-// Will create: __MODULE__Module
+// Example: copy-module Order
+// Will create: OrderModule
 // =====================================================
 
 const sourceModuleName = process.argv[2];
@@ -15,7 +15,7 @@ const force = process.argv.includes('--force');
 
 if (!sourceModuleName) {
   console.error("❌ Usage: copy-module <SourceModuleName>");
-  console.error("   Example: copy-module __MODULE__");
+  console.error("   Example: copy-module Order");
   process.exit(1);
 }
 
@@ -23,10 +23,20 @@ if (!sourceModuleName) {
 const modulesPath = process.cwd();
 
 const templateRoot = path.join(modulesPath, sourceModuleName);
-const targetModuleRoot = path.join(modulesPath, '..', 'BlueprintTemplate', 'Modules', `${sourceModuleName}Module`);
+const targetModuleRoot = path.join(
+  modulesPath,
+  '..',
+  'BlueprintTemplate',
+  'Modules',
+  `${sourceModuleName}Module`
+);
 
 const solutionFile = findSolutionFileFixed(modulesPath);
 
+// =====================================================
+// Safety checks
+// =====================================================
+
 if (!fs.existsSync(templateRoot)) {
   console.error(`❌ Source module folder not found: ${templateRoot}`);
   process.exit(1);
@@ -60,28 +70,20 @@ console.log(`🧩 Solution: ${solutionFile}`);
 fs.mkdirSync(targetModuleRoot, { recursive: true });
 
 // =====================================================
-// 2. Create projects
+// 2. Copy projects from template (NO dotnet new)
 // =====================================================
 
 const projects = [
-  { name: `${sourceModuleName}Module.API`, type: 'classlib' },
-  { name: `${sourceModuleName}Module.Core`, type: 'classlib' },
-  { name: `${sourceModuleName}Module.Infrastructure`, type: 'classlib' },
+  { name: `${sourceModuleName}Module.API` },
+  { name: `${sourceModuleName}Module.Core` },
+  { name: `${sourceModuleName}Module.Infrastructure` },
 ];
 
 projects.forEach(p => {
-  console.log(`📦 Creating project: ${p.name}`);
-
-  execSync(`dotnet new ${p.type} -n ${p.name}`, {
-    cwd: targetModuleRoot,
-    stdio: 'inherit'
-  });
+  console.log(`📦 Copying project from template: ${p.name}`);
 
   const projectPath = path.join(targetModuleRoot, p.name);
-
-  // =====================================================
-  // 3. Copy template files (no csproj)
-  // =====================================================
+  fs.mkdirSync(projectPath, { recursive: true });
 
   const templateSubFolder = getTemplateSubFolder(p.name, templateRoot);
 
@@ -95,7 +97,7 @@ projects.forEach(p => {
 });
 
 // =====================================================
-// 4. Add projects to solution
+// 3. Add projects to solution
 // =====================================================
 
 projects.forEach(p => {
@@ -105,12 +107,27 @@ projects.forEach(p => {
     `${p.name}.csproj`
   );
 
+  if (!fs.existsSync(csproj)) {
+    console.warn(`⚠️ csproj not found, skipping: ${csproj}`);
+    return;
+  }
+
   console.log(`➕ Adding to solution: ${csproj}`);
   execSync(`dotnet sln "${solutionFile}" add "${csproj}"`, {
     stdio: 'inherit'
   });
 });
 
+// =====================================================
+// 4. Restore & Build
+// =====================================================
+
+console.log('🔄 Restoring NuGet packages...');
+execSync(`dotnet restore "${solutionFile}"`, { stdio: 'inherit' });
+
+console.log('🏗️ Building solution...');
+execSync(`dotnet build "${solutionFile}"`, { stdio: 'inherit' });
+
 console.log(`🎉 Module "${sourceModuleName}Module" created successfully!`);
 
 // =====================================================
@@ -136,19 +153,11 @@ function copyRecursive(src, dest) {
   }
 
   const entries = fs.readdirSync(src, { withFileTypes: true });
-  console.log(`📄 TruongDX8 src: ${src}`);
-  console.log(`📄 TruongDX8 dest: ${dest}`);
 
   for (const entry of entries) {
-    console.log(`📄 TruongDX8 Item: ${entry.name}`);
     const srcPath = path.join(src, entry.name);
     const destPath = path.join(dest, entry.name);
 
-    // Do NOT overwrite .csproj generated by dotnet new
-    if (entry.isFile() && entry.name.endsWith('.csproj')) {
-      continue;
-    }
-
     if (entry.isDirectory()) {
       copyRecursive(srcPath, destPath);
     } else {
@@ -158,8 +167,7 @@ function copyRecursive(src, dest) {
 }
 
 function findSolutionFileFixed(startDir) {
-  // startDir = .../Modules/SomeModule
-  const root = path.dirname(startDir); 
+  const root = path.dirname(startDir);
   const blueprintTemplate = path.join(root, 'BlueprintTemplate');
 
   if (!fs.existsSync(blueprintTemplate)) {

package/package.json

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