netcore-blueprint 0.0.49 → 0.0.51

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 Order
-// Will create: OrderModule
+// Example: copy-module __MODULE__
+// Will create: __MODULE__Module
 // =====================================================
 
 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 Order");
+  console.error("   Example: copy-module __MODULE__");
   process.exit(1);
 }
 
@@ -23,20 +23,10 @@ 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);
@@ -70,20 +60,28 @@ console.log(`🧩 Solution: ${solutionFile}`);
 fs.mkdirSync(targetModuleRoot, { recursive: true });
 
 // =====================================================
-// 2. Copy projects from template (NO dotnet new)
+// 2. Create projects
 // =====================================================
 
 const projects = [
-  { name: `${sourceModuleName}Module.API` },
-  { name: `${sourceModuleName}Module.Core` },
-  { name: `${sourceModuleName}Module.Infrastructure` },
+  { name: `${sourceModuleName}Module.API`, type: 'classlib' },
+  { name: `${sourceModuleName}Module.Core`, type: 'classlib' },
+  { name: `${sourceModuleName}Module.Infrastructure`, type: 'classlib' },
 ];
 
 projects.forEach(p => {
-  console.log(`📦 Copying project from template: ${p.name}`);
+  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);
-  fs.mkdirSync(projectPath, { recursive: true });
+
+  // =====================================================
+  // 3. Copy template files (no csproj)
+  // =====================================================
 
   const templateSubFolder = getTemplateSubFolder(p.name, templateRoot);
 
@@ -97,7 +95,7 @@ projects.forEach(p => {
 });
 
 // =====================================================
-// 3. Add projects to solution
+// 4. Add projects to solution
 // =====================================================
 
 projects.forEach(p => {
@@ -107,21 +105,12 @@ 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' });
 
@@ -153,11 +142,30 @@ 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')) {
+      const deps = extractDependenciesFromCsproj(srcPath);
+
+      const targetCsprojPath = path.join(
+        dest,
+        path.basename(srcPath)
+      ).replace(
+        path.basename(srcPath),
+        path.basename(dest) + '.csproj'
+      );
+
+      injectDependenciesIntoCsproj(targetCsprojPath, deps);
+      continue;
+    }
+
     if (entry.isDirectory()) {
       copyRecursive(srcPath, destPath);
     } else {
@@ -167,7 +175,8 @@ function copyRecursive(src, dest) {
 }
 
 function findSolutionFileFixed(startDir) {
-  const root = path.dirname(startDir);
+  // startDir = .../Modules/SomeModule
+  const root = path.dirname(startDir); 
   const blueprintTemplate = path.join(root, 'BlueprintTemplate');
 
   if (!fs.existsSync(blueprintTemplate)) {
@@ -183,3 +192,39 @@ function findSolutionFileFixed(startDir) {
 
   return path.join(blueprintTemplate, sln);
 }
+
+function extractDependenciesFromCsproj(templateCsprojPath) {
+  const xml = fs.readFileSync(templateCsprojPath, 'utf8');
+
+  const packageRefs = xml.match(/<PackageReference[\s\S]*?\/>/g) || [];
+  const projectRefs = xml.match(/<ProjectReference[\s\S]*?\/>/g) || [];
+
+  return {
+    packageRefs,
+    projectRefs
+  };
+}
+
+function injectDependenciesIntoCsproj(targetCsprojPath, deps) {
+  let targetXml = fs.readFileSync(targetCsprojPath, 'utf8');
+
+  const injection = `
+  <ItemGroup>
+${deps.packageRefs.map(x => '    ' + x).join('\n')}
+  </ItemGroup>
+
+  <ItemGroup>
+${deps.projectRefs.map(x => '    ' + x).join('\n')}
+  </ItemGroup>
+`;
+
+  // Inject before </Project>
+  targetXml = targetXml.replace(
+    /<\/Project>/i,
+    `${injection}\n</Project>`
+  );
+
+  fs.writeFileSync(targetCsprojPath, targetXml, 'utf8');
+
+  console.log(`🧩 Injected dependencies into: ${targetCsprojPath}`);
+}

package/package.json

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