create-forgeon 0.2.3 → 0.2.5

package/package.json

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

package/src/modules/db-prisma.mjs

@@ -3,8 +3,10 @@ import path from 'node:path';
 import { copyRecursive, writeJson } from '../utils/fs.mjs';
 import {
   ensureBuildSteps,
+  ensureClassMember,
   ensureDependency,
   ensureDevDependency,
+  ensureImportLine,
   ensureLineAfter,
   ensureLineBefore,
   ensureLoadItem,
@@ -118,11 +120,7 @@ function patchHealthController(targetRoot) {
   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';"
-      : nestCommonImport;
-    content = ensureLineAfter(content, anchor, "import { PrismaService } from '@forgeon/db-prisma';");
+    content = ensureImportLine(content, "import { PrismaService } from '@forgeon/db-prisma';");
   }
 
   if (!content.includes('private readonly prisma: PrismaService')) {
@@ -167,17 +165,7 @@ function patchHealthController(targetRoot) {
     };
   }
 `;
-    const translateIndex = content.indexOf('private translate(');
-    if (translateIndex > -1) {
-      content = `${content.slice(0, translateIndex).trimEnd()}\n\n${dbMethod}\n${content.slice(translateIndex)}`;
-    } else {
-      const classEnd = content.lastIndexOf('\n}');
-      if (classEnd >= 0) {
-        content = `${content.slice(0, classEnd).trimEnd()}\n\n${dbMethod}\n${content.slice(classEnd)}`;
-      } else {
-        content = `${content.trimEnd()}\n${dbMethod}\n`;
-      }
-    }
+    content = ensureClassMember(content, 'HealthController', dbMethod, { beforeNeedle: 'private translate(' });
   }
 
   fs.writeFileSync(filePath, `${content.trimEnd()}\n`, 'utf8');

package/src/modules/executor.test.mjs

@@ -1053,6 +1053,59 @@ describe('addModule', () => {
     }
   });
 
+  it('keeps health controller valid for add sequence jwt-auth -> logger -> swagger -> i18n -> db-prisma on db/i18n-disabled scaffold', () => {
+    const targetRoot = mkTmp('forgeon-module-seq-health-valid-');
+    const projectRoot = path.join(targetRoot, 'demo-seq-health-valid');
+    const templateRoot = path.join(packageRoot, 'templates', 'base');
+
+    try {
+      scaffoldProject({
+        templateRoot,
+        packageRoot,
+        targetRoot: projectRoot,
+        projectName: 'demo-seq-health-valid',
+        frontend: 'react',
+        db: 'prisma',
+        dbPrismaEnabled: false,
+        i18nEnabled: false,
+        proxy: 'caddy',
+      });
+
+      for (const moduleId of ['jwt-auth', 'logger', 'swagger', 'i18n', 'db-prisma']) {
+        addModule({ moduleId, targetRoot: projectRoot, packageRoot });
+      }
+
+      const healthController = fs.readFileSync(
+        path.join(projectRoot, 'apps', 'api', 'src', 'health', 'health.controller.ts'),
+        'utf8',
+      );
+
+      const classStart = healthController.indexOf('export class HealthController {');
+      const classEnd = healthController.lastIndexOf('\n}');
+      assert.equal(classStart > -1, true);
+      assert.equal(classEnd > classStart, true);
+
+      const imports = [...healthController.matchAll(/^import\s.+;$/gm)];
+      assert.equal(imports.length > 0, true);
+      for (const importLine of imports) {
+        assert.equal(importLine.index < classStart, true);
+      }
+
+      const authProbe = healthController.indexOf("@Get('auth')");
+      const dbProbe = healthController.indexOf("@Post('db')");
+      const translateMethod = healthController.indexOf('private translate(');
+      assert.equal(authProbe > classStart && authProbe < classEnd, true);
+      assert.equal(dbProbe > classStart && dbProbe < classEnd, true);
+      assert.equal(translateMethod > classStart && translateMethod < classEnd, true);
+
+      assert.match(healthController, /private readonly authService: AuthService/);
+      assert.match(healthController, /private readonly i18n: I18nService/);
+      assert.match(healthController, /private readonly prisma: PrismaService/);
+    } finally {
+      fs.rmSync(targetRoot, { recursive: true, force: true });
+    }
+  });
+
   it('applies swagger then jwt-auth without forcing swagger dependency in auth-api', () => {
     const targetRoot = mkTmp('forgeon-module-jwt-swagger-');
     const projectRoot = path.join(targetRoot, 'demo-jwt-swagger');

package/src/modules/i18n.mjs

@@ -3,7 +3,9 @@ import path from 'node:path';
 import { copyRecursive, writeJson } from '../utils/fs.mjs';
 import {
   ensureBuildSteps,
+  ensureClassMember,
   ensureDependency,
+  ensureImportLine,
   ensureLineAfter,
   ensureLineBefore,
   ensureLoadItem,
@@ -288,19 +290,7 @@ function patchHealthController(targetRoot) {
 
   let content = fs.readFileSync(filePath, 'utf8').replace(/\r\n/g, '\n');
   if (!content.includes("from 'nestjs-i18n';")) {
-    if (content.includes("import { PrismaService } from '@forgeon/db-prisma';")) {
-      content = ensureLineAfter(
-        content,
-        "import { PrismaService } from '@forgeon/db-prisma';",
-        "import { I18nService } from 'nestjs-i18n';",
-      );
-    } else {
-      content = ensureLineAfter(
-        content,
-        "import { BadRequestException, ConflictException, Controller, Get, Post, Query } from '@nestjs/common';",
-        "import { I18nService } from 'nestjs-i18n';",
-      );
-    }
+    content = ensureImportLine(content, "import { I18nService } from 'nestjs-i18n';");
   }
 
   if (!content.includes('private readonly i18n: I18nService')) {
@@ -308,11 +298,22 @@ function patchHealthController(targetRoot) {
     if (constructorMatch) {
       const original = constructorMatch[0];
       const inner = constructorMatch[1].trimEnd();
-      const separator = inner.length > 0 ? ',' : '';
-      const next = `constructor(${inner}${separator}
+      const normalizedInner = inner.replace(/,\s*$/, '');
+      const separator = normalizedInner.length > 0 ? ',' : '';
+      const next = `constructor(${normalizedInner}${separator}
     private readonly i18n: I18nService,
   ) {`;
       content = content.replace(original, next);
+    } else {
+      const classAnchor = 'export class HealthController {';
+      if (content.includes(classAnchor)) {
+        content = content.replace(
+          classAnchor,
+          `${classAnchor}
+  constructor(private readonly i18n: I18nService) {}
+`,
+        );
+      }
     }
   }
 
@@ -323,9 +324,10 @@ function patchHealthController(targetRoot) {
     return typeof value === 'string' ? value : key;
   }
 `;
-    content = `${content.trimEnd()}\n${translateMethod}\n`;
+    content = ensureClassMember(content, 'HealthController', translateMethod);
   }
 
+  content = content.replace(/getHealth\(\)/g, "getHealth(@Query('lang') lang?: string)");
   content = content.replace(
     /getHealth\(@Query\('lang'\)\s*_lang\?:\s*string\)/g,
     "getHealth(@Query('lang') lang?: string)",
@@ -339,6 +341,7 @@ function patchHealthController(targetRoot) {
     "getValidationProbe(@Query('value') value?: string, @Query('lang') lang?: string)",
   );
   content = content.replace(/message:\s*'OK',/g, "message: this.translate('common.actions.ok', lang),");
+  content = content.replace(/i18n:\s*'disabled',/g, "i18n: 'en',");
   content = content.replace(/i18n:\s*'English',/g, "i18n: 'en',");
 
   content = content.replace(

package/src/modules/jwt-auth.mjs

@@ -3,7 +3,9 @@ import path from 'node:path';
 import { copyRecursive, writeJson } from '../utils/fs.mjs';
 import {
   ensureBuildSteps,
+  ensureClassMember,
   ensureDependency,
+  ensureImportLine,
   ensureLineAfter,
   ensureLineBefore,
   ensureLoadItem,
@@ -117,20 +119,7 @@ function patchHealthController(targetRoot) {
   let content = fs.readFileSync(filePath, 'utf8').replace(/\r\n/g, '\n');
 
   if (!content.includes("from '@forgeon/auth-api';")) {
-    const nestCommonImport = content.match(/import\s*\{[^}]*\}\s*from '@nestjs\/common';/m)?.[0];
-    if (content.includes("import { PrismaService } from '@forgeon/db-prisma';")) {
-      content = ensureLineAfter(
-        content,
-        "import { PrismaService } from '@forgeon/db-prisma';",
-        "import { AuthService } from '@forgeon/auth-api';",
-      );
-    } else {
-      content = ensureLineAfter(
-        content,
-        nestCommonImport ?? "import { Controller, Get } from '@nestjs/common';",
-        "import { AuthService } from '@forgeon/auth-api';",
-      );
-    }
+    content = ensureImportLine(content, "import { AuthService } from '@forgeon/auth-api';");
   }
 
   if (!content.includes('private readonly authService: AuthService')) {
@@ -164,19 +153,8 @@ function patchHealthController(targetRoot) {
     return this.authService.getProbeStatus();
   }
 `;
-    if (content.includes("@Post('db')")) {
-      content = content.replace("@Post('db')", `${method}\n  @Post('db')`);
-    } else if (content.includes('private translate(')) {
-      const index = content.indexOf('private translate(');
-      content = `${content.slice(0, index).trimEnd()}\n\n${method}\n${content.slice(index)}`;
-    } else {
-      const classEnd = content.lastIndexOf('\n}');
-      if (classEnd >= 0) {
-        content = `${content.slice(0, classEnd).trimEnd()}\n\n${method}\n${content.slice(classEnd)}`;
-      } else {
-        content = `${content.trimEnd()}\n${method}\n`;
-      }
-    }
+    const beforeNeedle = content.includes("@Post('db')") ? "@Post('db')" : 'private translate(';
+    content = ensureClassMember(content, 'HealthController', method, { beforeNeedle });
   }
 
   fs.writeFileSync(filePath, `${content.trimEnd()}\n`, 'utf8');

package/src/modules/shared/patch-utils.mjs

@@ -73,6 +73,81 @@ export function ensureLineBefore(content, anchorLine, lineToInsert) {
   return `${content.slice(0, index)}${lineToInsert}\n${content.slice(index)}`;
 }
 
+export function ensureImportLine(content, importLine) {
+  if (content.includes(importLine)) {
+    return content;
+  }
+
+  const importMatches = [...content.matchAll(/^import\s.+;$/gm)];
+  if (importMatches.length === 0) {
+    return `${importLine}\n${content}`;
+  }
+
+  const lastImport = importMatches.at(-1);
+  const insertAt = lastImport.index + lastImport[0].length;
+  return `${content.slice(0, insertAt)}\n${importLine}${content.slice(insertAt)}`;
+}
+
+function findClassRange(content, className) {
+  const classPattern = new RegExp(`export\\s+class\\s+${className}\\b`);
+  const classMatch = classPattern.exec(content);
+  if (!classMatch) {
+    return null;
+  }
+
+  const openBrace = content.indexOf('{', classMatch.index);
+  if (openBrace < 0) {
+    return null;
+  }
+
+  let depth = 0;
+  for (let index = openBrace; index < content.length; index += 1) {
+    const char = content[index];
+    if (char === '{') {
+      depth += 1;
+    } else if (char === '}') {
+      depth -= 1;
+      if (depth === 0) {
+        return {
+          classStart: classMatch.index,
+          bodyStart: openBrace + 1,
+          classEnd: index,
+        };
+      }
+    }
+  }
+
+  return null;
+}
+
+export function ensureClassMember(content, className, memberCode, options = {}) {
+  const member = memberCode.trim();
+  if (member.length === 0) {
+    return content;
+  }
+
+  const range = findClassRange(content, className);
+  if (!range) {
+    return `${content.trimEnd()}\n${member}\n`;
+  }
+
+  const classBody = content.slice(range.bodyStart, range.classEnd);
+  if (classBody.includes(member)) {
+    return content;
+  }
+
+  let insertAt = range.classEnd;
+  const beforeNeedle = options.beforeNeedle;
+  if (typeof beforeNeedle === 'string' && beforeNeedle.length > 0) {
+    const needleIndex = classBody.indexOf(beforeNeedle);
+    if (needleIndex >= 0) {
+      insertAt = range.bodyStart + needleIndex;
+    }
+  }
+
+  return `${content.slice(0, insertAt)}\n\n${member}\n${content.slice(insertAt)}`;
+}
+
 export function upsertEnvLines(filePath, lines) {
   let content = '';
   if (fs.existsSync(filePath)) {

package/src/modules/sync-integrations.mjs

@@ -72,12 +72,12 @@ const INTEGRATION_GROUPS = [
   {
     id: 'auth-persistence',
     title: 'Auth Persistence Integration',
-    modules: ['jwt-auth', 'db-prisma', 'core-config'],
+    modules: ['jwt-auth', 'db-prisma'],
     description: [
-      'Register Prisma refresh-token store in AuthModule',
-      'Wire AUTH_REFRESH_TOKEN_STORE provider to Prisma store',
-      'Extend Prisma User model with refreshTokenHash',
-      'Add auth persistence migration and update README note',
+      'Patch AppModule to wire AUTH_REFRESH_TOKEN_STORE with PrismaAuthRefreshTokenStore',
+      'Add apps/api/src/auth/prisma-auth-refresh-token.store.ts',
+      'Extend Prisma User model with refreshTokenHash and add migration 0002_auth_refresh_token_hash',
+      'Update JWT auth README note about refresh-token persistence',
     ],
     isAvailable: (detected) => detected.jwtAuth && detected.dbPrisma,
     isPending: (rootDir) => isAuthPersistencePending(rootDir),