netcore-blueprint 0.0.81 → 0.0.82

package/bin/copy-module.js

@@ -1,5 +1,6 @@
 #!/usr/bin/env node
 
+const { findSolutionFileFixed, copyRecursive, addProjectReferencesToCsproj } = require('../lib/replacer');
 const fs = require('fs');
 const path = require('path');
 const { execSync } = require('child_process');
@@ -9,7 +10,6 @@ const { execSync } = require('child_process');
 // Example: copy-module __MODULE__
 // Will create: __MODULE__Module
 // =====================================================
-
 const sourceModuleName = process.argv[2];
 const targetFolder = process.argv[3];
 const force = process.argv.includes('--force');
@@ -25,7 +25,7 @@ const modulesPath = process.cwd();
 const templateRoot = path.join(modulesPath, sourceModuleName);
 const targetModuleRoot = path.join(modulesPath, '..', targetFolder, 'Modules', `${sourceModuleName}Module`);
 
-const solutionFile = findSolutionFileFixed(modulesPath);
+const solutionFile = findSolutionFileFixed(modulesPath, targetFolder);
 
 if (!fs.existsSync(templateRoot)) {
   console.error(`❌ Source module folder not found: ${templateRoot}`);
@@ -100,7 +100,7 @@ projects.forEach(p => {
   // 3. Copy template files (no csproj)
   // =====================================================
 
-  const templateSubFolder = getTemplateSubFolder(p.name, templateRoot);
+  const templateSubFolder = path.join(templateRoot, p.name);
 
   if (!templateSubFolder || !fs.existsSync(templateSubFolder)) {
     console.warn(`⚠️ Template subfolder not found: ${templateSubFolder}`);
@@ -142,163 +142,16 @@ addModuleReferencesToHostApi(sourceModuleName, hostApiProjectPath);
 // =====================================================
 // Helpers
 // =====================================================
-
-function getTemplateSubFolder(projectName, templateRoot) {
-  if (projectName.endsWith('.API')) {
-    return path.join(templateRoot, `${projectName}`);
-  }
-  if (projectName.endsWith('.Core')) {
-    return path.join(templateRoot, `${projectName}`);
-  }
-  if (projectName.endsWith('.Infrastructure')) {
-    return path.join(templateRoot, `${projectName}`);
-  }
-  return null;
-}
-
-function copyRecursive(src, dest) {
-  if (!fs.existsSync(dest)) {
-    fs.mkdirSync(dest, { recursive: true });
-  }
-
-  const entries = fs.readdirSync(src, { withFileTypes: true });
-  console.log(`📄 copy-module src: ${src}`);
-  console.log(`📄 copy-module dest: ${dest}`);
-
-  for (const entry of entries) {
-    console.log(`📄 copy-module 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')) {
-      console.log(`🧬 Merging ItemGroup from template csproj: ${srcPath}`);
-      mergeItemGroupFromTemplate(srcPath, destPath);
-      continue;
-    }
-
-    if (entry.isDirectory()) {
-      copyRecursive(srcPath, destPath);
-    } else {
-      fs.copyFileSync(srcPath, destPath);
-    }
-  }
-}
-
-function findSolutionFileFixed(startDir) {
-  // startDir = .../Modules/SomeModule
-  const root = path.dirname(startDir); 
-  const targetSolution = path.join(root, targetFolder);
-
-  if (!fs.existsSync(targetSolution)) {
-    throw new Error('Target folder not found');
-  }
-
-  const btFiles = fs.readdirSync(targetSolution);
-  const sln = btFiles.find(f => f.endsWith('.sln') || f.endsWith('.slnx'));
-
-  if (!sln) {
-    throw new Error('No .sln file found in Target folder');
-  }
-
-  return path.join(targetSolution, sln);
-}
-
-function mergeItemGroupFromTemplate(templateCsprojPath, targetCsprojPath) {
-  if (!fs.existsSync(targetCsprojPath)) {
-    console.warn(`⚠️ Target csproj not found, skipping merge: ${targetCsprojPath}`);
-    return;
-  }
-
-  const templateContent = fs.readFileSync(templateCsprojPath, 'utf8');
-  const targetContent = fs.readFileSync(targetCsprojPath, 'utf8');
-
-  // Extract all ItemGroup blocks from template
-  const itemGroupMatches = templateContent.match(/<ItemGroup>[\s\S]*?<\/ItemGroup>/g);
-
-  if (!itemGroupMatches || itemGroupMatches.length === 0) {
-    console.log(`ℹ️ No <ItemGroup> found in template csproj: ${templateCsprojPath}`);
-    return;
-  }
-
-  const itemGroupsToInsert = '\n\n' + itemGroupMatches.join('\n\n') + '\n';
-
-  // Insert right after </PropertyGroup>
-  if (!targetContent.includes('</PropertyGroup>')) {
-    console.warn(`⚠️ No </PropertyGroup> found in target csproj: ${targetCsprojPath}`);
-    return;
-  }
-
-  const updatedTarget = targetContent.replace(
-    /<\/PropertyGroup>/,
-    `</PropertyGroup>${itemGroupsToInsert}`
-  );
-
-  fs.writeFileSync(targetCsprojPath, updatedTarget, 'utf8');
-
-  console.log(`✅ ItemGroup merged into: ${targetCsprojPath}`);
-}
-
 function addModuleReferencesToHostApi(moduleName, hostApiCsprojPath) {
-  if (!fs.existsSync(hostApiCsprojPath)) {
-    console.warn(`⚠️ HostAPI.csproj not found: ${hostApiCsprojPath}`);
-    return;
-  }
-
-  let content = fs.readFileSync(hostApiCsprojPath, 'utf8');
+  const refs = buildStaticProjectRefs(moduleName);
+  addProjectReferencesToCsproj(hostApiCsprojPath, refs);
+}
 
-  const refs = [
+// Build refs (giữ nguyên logic cũ)
+function buildStaticProjectRefs(moduleName) {
+  return [
     `..\\Modules\\${moduleName}Module\\${moduleName}Module.API\\${moduleName}Module.API.csproj`,
     `..\\Modules\\${moduleName}Module\\${moduleName}Module.Core\\${moduleName}Module.Core.csproj`,
     `..\\Modules\\${moduleName}Module\\${moduleName}Module.Infrastructure\\${moduleName}Module.Infrastructure.csproj`,
   ];
-
-  // Avoid duplicate
-  if (refs.some(r => content.includes(r))) {
-    console.log(`ℹ️ HostAPI already contains references for ${moduleName}Module`);
-    return;
-  }
-
-  const projectRefXml = refs
-    .map(r => `    <ProjectReference Include="${r}" />`)
-    .join('\n');
-
-  // 🔥 Find ItemGroup that has ProjectReference BUT NOT PackageReference
-  const projectOnlyItemGroupRegex =
-    /<ItemGroup>(?:(?!<PackageReference)[\s\S])*?<ProjectReference[\s\S]*?<\/ItemGroup>/;
-
-  const match = content.match(projectOnlyItemGroupRegex);
-
-  if (match) {
-    // ✅ Append to correct ProjectReference-only ItemGroup
-    const originalGroup = match[0];
-
-    const updatedGroup = originalGroup.replace(
-      /<\/ItemGroup>/,
-      `${projectRefXml}\n  </ItemGroup>`
-    );
-
-    content = content.replace(originalGroup, updatedGroup);
-
-    console.log(`✅ Appended to ProjectReference-only ItemGroup`);
-  } else {
-    // 🆕 Fallback: create new clean ProjectReference ItemGroup
-    const newItemGroup = `
-
-  <ItemGroup>
-${projectRefXml}
-  </ItemGroup>
-`;
-
-    content = content.replace(
-      /<\/Project>/,
-      `${newItemGroup}\n</Project>`
-    );
-
-    console.log(`🆕 Created new ProjectReference ItemGroup`);
-  }
-
-  fs.writeFileSync(hostApiCsprojPath, content, 'utf8');
-
-  console.log(`🎯 HostAPI references updated for ${moduleName}Module`);
-}
+}

package/bin/create-assistant.js

@@ -2,7 +2,7 @@
 
 const fs = require('fs');
 const path = require('path');
-const { buildReplaceMap, applyReplacements } = require('../lib/replacer');
+const { buildReplaceMap, copyAndRenameFiles } = require('../lib/replacer');
 
 // =======================
 // Args
@@ -67,33 +67,6 @@ console.log(`📁 To: ${destinationAssistantPath}`);
 // Run
 // =======================
 
-copyAndRenameFiles(sourceAssistantPath, destinationAssistantPath);
+copyAndRenameFiles(sourceAssistantPath, destinationAssistantPath, replaceMap);
 
-console.log(`🎉 Assistant "${newAssistantName}" created successfully!`);
-
-// =======================
-// Core Logic
-// =======================
-
-function copyAndRenameFiles(src, 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 renamed = applyReplacements(entry.name, replaceMap);
-      const destPath = path.join(dest, renamed);
-
-      copyAndRenameFiles(srcPath, destPath);
-    }
-  } else {
-    let content = fs.readFileSync(src, 'utf8');
-    content = applyReplacements(content, replaceMap);
-    fs.writeFileSync(dest, content, 'utf8');
-  }
-}
+console.log(`🎉 Assistant "${newAssistantName}" created successfully!`);

package/bin/create-module.js

@@ -2,7 +2,7 @@
 
 const fs = require('fs');
 const path = require('path');
-const { buildReplaceMap, applyReplacements } = require('../lib/replacer');
+const { buildReplaceMap, copyAndRenameFiles } = require('../lib/replacer');
 
 // =======================
 // Args
@@ -66,33 +66,6 @@ console.log(`📁 To: ${destinationModulePath}`);
 // Run
 // =======================
 
-copyAndRenameFiles(sourceModulePath, destinationModulePath);
+copyAndRenameFiles(sourceModulePath, destinationModulePath, replaceMap);
 
-console.log(`🎉 Module "${newModuleName}" created successfully!`);
-
-// =======================
-// Core Logic
-// =======================
-
-function copyAndRenameFiles(src, 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 renamed = applyReplacements(entry.name, replaceMap);
-      const destPath = path.join(dest, renamed);
-
-      copyAndRenameFiles(srcPath, destPath);
-    }
-  } else {
-    let content = fs.readFileSync(src, 'utf8');
-    content = applyReplacements(content, replaceMap);
-    fs.writeFileSync(dest, content, 'utf8');
-  }
-}
+console.log(`🎉 Module "${newModuleName}" created successfully!`);

package/lib/replacer.js

@@ -21,7 +21,178 @@ function applyReplacements(text, replaceMap) {
   return result;
 }
 
+function copyAndRenameFiles(src, dest, replaceMap) {
+  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 renamed = applyReplacements(entry.name, replaceMap);
+      const destPath = path.join(dest, renamed);
+
+      copyAndRenameFiles(srcPath, destPath);
+    }
+  } else {
+    let content = fs.readFileSync(src, 'utf8');
+    content = applyReplacements(content, replaceMap);
+    fs.writeFileSync(dest, content, 'utf8');
+  }
+}
+
+function findSolutionFileFixed(startDir, targetFolder) {
+  // startDir = .../Modules/SomeModule
+  const root = path.dirname(startDir); 
+  const targetSolution = path.join(root, targetFolder);
+
+  if (!fs.existsSync(targetSolution)) {
+    throw new Error('Target folder not found');
+  }
+
+  const btFiles = fs.readdirSync(targetSolution);
+  const sln = btFiles.find(f => f.endsWith('.sln') || f.endsWith('.slnx'));
+
+  if (!sln) {
+    throw new Error('No .sln file found in Target folder');
+  }
+
+  return path.join(targetSolution, sln);
+}
+
+function copyRecursive(src, dest) {
+  if (!fs.existsSync(dest)) {
+    fs.mkdirSync(dest, { recursive: true });
+  }
+
+  const entries = fs.readdirSync(src, { withFileTypes: true });
+
+  console.log(`📄 Copy src: ${src}`);
+  console.log(`📄 Copy dest: ${dest}`);
+
+  for (const entry of entries) {
+    const srcPath = path.join(src, entry.name);
+    const destPath = path.join(dest, entry.name);
+
+    console.log(`📄 Item: ${entry.name}`);
+
+    // 👉 Handle .csproj riêng
+    if (entry.isFile() && entry.name.endsWith('.csproj')) {
+      handleCsprojFile(srcPath, destPath);
+      continue;
+    }
+
+    if (entry.isDirectory()) {
+      copyRecursive(srcPath, destPath);
+    } else {
+      fs.copyFileSync(srcPath, destPath);
+    }
+  }
+}
+
+function handleCsprojFile(templatePath, targetPath) {
+  if (!fs.existsSync(targetPath)) {
+    console.warn(`⚠️ Target csproj not found: ${targetPath}`);
+    return;
+  }
+
+  const templateContent = fs.readFileSync(templatePath, 'utf8');
+  let targetContent = fs.readFileSync(targetPath, 'utf8');
+
+  const itemGroups = templateContent.match(/<ItemGroup>[\s\S]*?<\/ItemGroup>/g);
+
+  if (!itemGroups || itemGroups.length === 0) {
+    console.log(`ℹ️ No <ItemGroup> found in template: ${templatePath}`);
+    return;
+  }
+
+  // ✅ tránh duplicate
+  const newGroups = itemGroups.filter(group => !targetContent.includes(group));
+
+  if (newGroups.length === 0) {
+    console.log(`ℹ️ No new ItemGroup to merge`);
+    return;
+  }
+
+  const insertContent = '\n\n' + newGroups.join('\n\n') + '\n';
+
+  // ✅ fallback nếu không có PropertyGroup
+  if (targetContent.includes('</PropertyGroup>')) {
+    targetContent = targetContent.replace(
+      '</PropertyGroup>',
+      `</PropertyGroup>${insertContent}`
+    );
+  } else {
+    targetContent = targetContent.replace(
+      '</Project>',
+      `${insertContent}\n</Project>`
+    );
+  }
+
+  fs.writeFileSync(targetPath, targetContent, 'utf8');
+
+  console.log(`✅ ItemGroup merged into: ${targetPath}`);
+}
+
+function addProjectReferencesToCsproj(hostApiCsprojPath, refs) {
+  if (!fs.existsSync(hostApiCsprojPath)) {
+    console.warn(`⚠️ HostAPI.csproj not found: ${hostApiCsprojPath}`);
+    return;
+  }
+
+  let content = fs.readFileSync(hostApiCsprojPath, 'utf8');
+
+  if (refs.some(r => content.includes(r))) {
+    console.log(`ℹ️ HostAPI already contains references`);
+    return;
+  }
+
+  const projectRefXml = refs
+                        .map(r => `<ProjectReference Include="${r}" />`)
+                        .join('\n');
+
+  content = appendProjectReferences(content, projectRefXml);
+
+  fs.writeFileSync(hostApiCsprojPath, content, 'utf8');
+
+  console.log(`🎯 HostAPI references updated`);
+}
+
+// Append logic
+function appendProjectReferences(content, projectRefXml) {
+  const projectOnlyItemGroupRegex =
+    /<ItemGroup>(?:(?!<PackageReference)[\s\S])*?<ProjectReference[\s\S]*?<\/ItemGroup>/;
+
+  const match = content.match(projectOnlyItemGroupRegex);
+
+  if (match) {
+    const updatedGroup = match[0].replace(
+      /<\/ItemGroup>/,
+      `${projectRefXml}\n  </ItemGroup>`
+    );
+
+    console.log(`✅ Appended to ProjectReference-only ItemGroup`);
+    return content.replace(match[0], updatedGroup);
+  }
+
+  const newItemGroup = `
+    <ItemGroup>
+  ${projectRefXml}
+    </ItemGroup>
+  `;
+
+  console.log(`🆕 Created new ProjectReference ItemGroup`);
+
+  return content.replace(/<\/Project>/, `${newItemGroup}\n</Project>`);
+}
+
 module.exports = {
   buildReplaceMap,
-  applyReplacements
+  copyAndRenameFiles,
+  findSolutionFileFixed,
+  copyRecursive,
+  addProjectReferencesToCsproj
 };

package/package.json

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