create-forgeon 0.2.0 → 0.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-forgeon",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Forgeon project generator CLI",
   "license": "MIT",
   "author": "Forgeon",

package/src/modules/db-prisma.mjs

@@ -84,6 +84,26 @@ function ensureLineBefore(content, anchorLine, lineToInsert) {
   return `${content.slice(0, index)}${lineToInsert}\n${content.slice(index)}`;
 }
 
+function ensureNestCommonImport(content, importName) {
+  const pattern = /import\s*\{([^}]*)\}\s*from '@nestjs\/common';/m;
+  const match = content.match(pattern);
+  if (!match) {
+    return `import { ${importName} } from '@nestjs/common';\n${content}`;
+  }
+
+  const names = match[1]
+    .split(',')
+    .map((item) => item.trim())
+    .filter(Boolean);
+
+  if (!names.includes(importName)) {
+    names.push(importName);
+  }
+
+  const replacement = `import { ${names.join(', ')} } from '@nestjs/common';`;
+  return content.replace(pattern, replacement);
+}
+
 function upsertEnvLines(filePath, lines) {
   let content = '';
   if (fs.existsSync(filePath)) {
@@ -244,10 +264,13 @@ function patchHealthController(targetRoot) {
   }
 
   let content = fs.readFileSync(filePath, 'utf8').replace(/\r\n/g, '\n');
+  content = ensureNestCommonImport(content, 'Post');
+
   if (!content.includes("from '@forgeon/db-prisma';")) {
+    const nestCommonImport = content.match(/import\s*\{[^}]*\}\s*from '@nestjs\/common';/m)?.[0];
     const anchor = content.includes("import { I18nService } from 'nestjs-i18n';")
       ? "import { I18nService } from 'nestjs-i18n';"
-      : "import { BadRequestException, ConflictException, Controller, Get, Post, Query } from '@nestjs/common';";
+      : nestCommonImport;
     content = ensureLineAfter(content, anchor, "import { PrismaService } from '@forgeon/db-prisma';");
   }
 
@@ -350,6 +373,7 @@ function patchApiDockerfile(targetRoot) {
 
   content = content
     .replace(/^RUN pnpm --filter @forgeon\/db-prisma build\r?\n?/gm, '')
+    .replace(/^RUN pnpm --filter @forgeon\/core build\r?\n?/gm, '')
     .replace(/^RUN pnpm --filter @forgeon\/api prisma:generate\r?\n?/gm, '')
     .replace(/^CMD \["node", "apps\/api\/dist\/main\.js"\]\r?\n?/gm, '')
     .replace(
@@ -357,6 +381,7 @@ function patchApiDockerfile(targetRoot) {
       '',
     );
 
+  content = ensureLineBefore(content, 'RUN pnpm --filter @forgeon/api build', 'RUN pnpm --filter @forgeon/core build');
   content = ensureLineBefore(content, 'RUN pnpm --filter @forgeon/api build', 'RUN pnpm --filter @forgeon/db-prisma build');
   content = ensureLineBefore(content, 'RUN pnpm --filter @forgeon/api build', 'RUN pnpm --filter @forgeon/api prisma:generate');
   content = `${content.trimEnd()}\nCMD ["sh", "-c", "pnpm --filter @forgeon/api prisma:migrate:deploy && node apps/api/dist/main.js"]\n`;

package/src/modules/i18n.mjs

@@ -188,23 +188,23 @@ function patchApiDockerfile(targetRoot) {
     .replace(/^RUN pnpm --filter @forgeon\/i18n-contracts build\r?\n?/gm, '')
     .replace(/^RUN pnpm --filter @forgeon\/i18n build\r?\n?/gm, '');
 
+  const apiBuildAnchor = content.includes('RUN pnpm --filter @forgeon/api prisma:generate')
+    ? 'RUN pnpm --filter @forgeon/api prisma:generate'
+    : 'RUN pnpm --filter @forgeon/api build';
+
   content = ensureLineBefore(
     content,
-    'RUN pnpm --filter @forgeon/api prisma:generate',
+    apiBuildAnchor,
     'RUN pnpm --filter @forgeon/core build',
   );
   content = ensureLineBefore(
     content,
-    content.includes('RUN pnpm --filter @forgeon/api prisma:generate')
-      ? 'RUN pnpm --filter @forgeon/api prisma:generate'
-      : 'RUN pnpm --filter @forgeon/api build',
+    apiBuildAnchor,
     'RUN pnpm --filter @forgeon/i18n-contracts build',
   );
   content = ensureLineBefore(
     content,
-    content.includes('RUN pnpm --filter @forgeon/api prisma:generate')
-      ? 'RUN pnpm --filter @forgeon/api prisma:generate'
-      : 'RUN pnpm --filter @forgeon/api build',
+    apiBuildAnchor,
     'RUN pnpm --filter @forgeon/i18n build',
   );