create-forgeon 0.2.0 → 0.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-forgeon",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "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';");
   }
 
@@ -301,6 +324,11 @@ function patchWebApp(targetRoot) {
   }
 
   let content = fs.readFileSync(filePath, 'utf8').replace(/\r\n/g, '\n');
+  content = content
+    .replace(/^\s*\{\/\* forgeon:probes:actions:start \*\/\}\r?\n?/gm, '')
+    .replace(/^\s*\{\/\* forgeon:probes:actions:end \*\/\}\r?\n?/gm, '')
+    .replace(/^\s*\{\/\* forgeon:probes:results:start \*\/\}\r?\n?/gm, '')
+    .replace(/^\s*\{\/\* forgeon:probes:results:end \*\/\}\r?\n?/gm, '');
 
   if (!content.includes('dbProbeResult')) {
     const stateAnchor = '  const [validationProbeResult, setValidationProbeResult] = useState<ProbeResult | null>(null);';
@@ -314,23 +342,29 @@ function patchWebApp(targetRoot) {
   }
 
   if (!content.includes('Check database (create user)')) {
-    const buttonAnchor = "        <button onClick={() => runProbe(setValidationProbeResult, '/api/health/validation')>";
-    const buttonAnchorI18n = "        <button onClick={() => runProbe(setValidationProbeResult, '/health/validation')>";
-    const dbButton = content.includes(buttonAnchorI18n)
+    const dbButton = content.includes("runProbe(setHealthResult, '/health')")
       ? "        <button onClick={() => runProbe(setDbProbeResult, '/health/db', { method: 'POST' })}>\n          Check database (create user)\n        </button>"
       : "        <button onClick={() => runProbe(setDbProbeResult, '/api/health/db', { method: 'POST' })}>\n          Check database (create user)\n        </button>";
 
-    if (content.includes(buttonAnchor)) {
-      content = ensureLineAfter(content, buttonAnchor, dbButton);
-    } else if (content.includes(buttonAnchorI18n)) {
-      content = ensureLineAfter(content, buttonAnchorI18n, dbButton);
+    const actionsStart = content.indexOf('<div className="actions">');
+    if (actionsStart >= 0) {
+      const actionsEnd = content.indexOf('\n      </div>', actionsStart);
+      if (actionsEnd >= 0) {
+        content = `${content.slice(0, actionsEnd)}\n${dbButton}${content.slice(actionsEnd)}`;
+      }
     }
   }
 
   if (!content.includes("{renderResult('DB probe response', dbProbeResult)}")) {
-    const resultAnchor = "{renderResult('Validation probe response', validationProbeResult)}";
-    if (content.includes(resultAnchor)) {
-      content = ensureLineAfter(content, resultAnchor, "      {renderResult('DB probe response', dbProbeResult)}");
+    const dbResultLine = "      {renderResult('DB probe response', dbProbeResult)}";
+    const networkLine = '      {networkError ? <p className="error">{networkError}</p> : null}';
+    if (content.includes(networkLine)) {
+      content = content.replace(networkLine, `${dbResultLine}\n${networkLine}`);
+    } else {
+      const resultAnchor = "{renderResult('Validation probe response', validationProbeResult)}";
+      if (content.includes(resultAnchor)) {
+        content = ensureLineAfter(content, resultAnchor, dbResultLine);
+      }
     }
   }
 
@@ -350,6 +384,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 +392,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',
   );
 

package/src/modules/jwt-auth.mjs

@@ -2,9 +2,6 @@ import fs from 'node:fs';
 import path from 'node:path';
 import { copyRecursive, writeJson } from '../utils/fs.mjs';
 
-const JWT_README_START = '<!-- forgeon:jwt-auth:start -->';
-const JWT_README_END = '<!-- forgeon:jwt-auth:end -->';
-
 function copyFromPreset(packageRoot, targetRoot, relativePath) {
   const source = path.join(packageRoot, 'templates', 'module-presets', 'jwt-auth', relativePath);
   if (!fs.existsSync(source)) {
@@ -356,30 +353,58 @@ function patchWebApp(targetRoot) {
   }
 
   let content = fs.readFileSync(filePath, 'utf8').replace(/\r\n/g, '\n');
+  content = content
+    .replace(/^\s*\{\/\* forgeon:probes:actions:start \*\/\}\r?\n?/gm, '')
+    .replace(/^\s*\{\/\* forgeon:probes:actions:end \*\/\}\r?\n?/gm, '')
+    .replace(/^\s*\{\/\* forgeon:probes:results:start \*\/\}\r?\n?/gm, '')
+    .replace(/^\s*\{\/\* forgeon:probes:results:end \*\/\}\r?\n?/gm, '');
+
   if (!content.includes('authProbeResult')) {
-    content = content.replace(
-      '  const [dbProbeResult, setDbProbeResult] = useState<ProbeResult | null>(null);',
-      `  const [dbProbeResult, setDbProbeResult] = useState<ProbeResult | null>(null);
+    if (content.includes('  const [dbProbeResult, setDbProbeResult] = useState<ProbeResult | null>(null);')) {
+      content = content.replace(
+        '  const [dbProbeResult, setDbProbeResult] = useState<ProbeResult | null>(null);',
+        `  const [dbProbeResult, setDbProbeResult] = useState<ProbeResult | null>(null);
   const [authProbeResult, setAuthProbeResult] = useState<ProbeResult | null>(null);`,
-    );
+      );
+    } else if (content.includes('  const [validationProbeResult, setValidationProbeResult] = useState<ProbeResult | null>(null);')) {
+      content = content.replace(
+        '  const [validationProbeResult, setValidationProbeResult] = useState<ProbeResult | null>(null);',
+        `  const [validationProbeResult, setValidationProbeResult] = useState<ProbeResult | null>(null);
+  const [authProbeResult, setAuthProbeResult] = useState<ProbeResult | null>(null);`,
+      );
+    }
   }
 
   if (!content.includes('Check JWT auth probe')) {
     const path = content.includes("runProbe(setHealthResult, '/health')") ? '/health/auth' : '/api/health/auth';
-    content = content.replace(
-      /<button onClick=\{\(\) => runProbe\(setErrorProbeResult,[\s\S]*?<\/button>/m,
-      (match) =>
-        `${match}
-        <button onClick={() => runProbe(setAuthProbeResult, '${path}')}>Check JWT auth probe</button>`,
-    );
+    const authButton = `        <button onClick={() => runProbe(setAuthProbeResult, '${path}')}>Check JWT auth probe</button>`;
+    const actionsStart = content.indexOf('<div className="actions">');
+    if (actionsStart >= 0) {
+      const actionsEnd = content.indexOf('\n      </div>', actionsStart);
+      if (actionsEnd >= 0) {
+        content = `${content.slice(0, actionsEnd)}\n${authButton}${content.slice(actionsEnd)}`;
+      }
+    }
   }
 
   if (!content.includes("renderResult('Auth probe response', authProbeResult)")) {
-    content = content.replace(
-      "{renderResult('DB probe response', dbProbeResult)}",
-      `{renderResult('DB probe response', dbProbeResult)}
+    const authResultLine = "      {renderResult('Auth probe response', authProbeResult)}";
+    const networkLine = '      {networkError ? <p className="error">{networkError}</p> : null}';
+    if (content.includes(networkLine)) {
+      content = content.replace(networkLine, `${authResultLine}\n${networkLine}`);
+    } else if (content.includes("{renderResult('DB probe response', dbProbeResult)}")) {
+      content = content.replace(
+        "{renderResult('DB probe response', dbProbeResult)}",
+        `{renderResult('DB probe response', dbProbeResult)}
       {renderResult('Auth probe response', authProbeResult)}`,
-    );
+      );
+    } else if (content.includes("{renderResult('Validation probe response', validationProbeResult)}")) {
+      content = content.replace(
+        "{renderResult('Validation probe response', validationProbeResult)}",
+        `{renderResult('Validation probe response', validationProbeResult)}
+      {renderResult('Auth probe response', authProbeResult)}`,
+      );
+    }
   }
 
   fs.writeFileSync(filePath, `${content.trimEnd()}\n`, 'utf8');
@@ -480,8 +505,7 @@ function patchReadme(targetRoot, dbAdapter) {
   1. install a DB module first (for now: \`create-forgeon add db-prisma --project .\`);
   2. run \`create-forgeon add jwt-auth --project .\` again to auto-wire the adapter.`;
 
-  const section = `${JWT_README_START}
-## JWT Auth Module
+  const section = `## JWT Auth Module
 
 The jwt-auth add-module provides:
 - \`@forgeon/auth-contracts\` shared auth routes/types/error codes
@@ -501,13 +525,19 @@ Default routes:
 - \`POST /api/auth/login\`
 - \`POST /api/auth/refresh\`
 - \`POST /api/auth/logout\`
-- \`GET /api/auth/me\`
-${JWT_README_END}`;
+- \`GET /api/auth/me\``;
 
   let content = fs.readFileSync(readmePath, 'utf8').replace(/\r\n/g, '\n');
-  const sectionPattern = new RegExp(`${JWT_README_START}[\\s\\S]*?${JWT_README_END}`, 'm');
-  if (sectionPattern.test(content)) {
-    content = content.replace(sectionPattern, section);
+  const sectionHeading = '## JWT Auth Module';
+  if (content.includes(sectionHeading)) {
+    const start = content.indexOf(sectionHeading);
+    const tail = content.slice(start + sectionHeading.length);
+    const nextHeadingMatch = tail.match(/\n##\s+/);
+    const end =
+      nextHeadingMatch && nextHeadingMatch.index !== undefined
+        ? start + sectionHeading.length + nextHeadingMatch.index + 1
+        : content.length;
+    content = `${content.slice(0, start)}${section}\n\n${content.slice(end).replace(/^\n+/, '')}`;
   } else if (content.includes('## Prisma In Docker Start')) {
     content = content.replace('## Prisma In Docker Start', `${section}\n\n## Prisma In Docker Start`);
   } else {
@@ -566,6 +596,14 @@ export function applyJwtAuthModule({ packageRoot, targetRoot }) {
   copyFromPreset(packageRoot, targetRoot, path.join('packages', 'auth-contracts'));
   copyFromPreset(packageRoot, targetRoot, path.join('packages', 'auth-api'));
 
+  const swaggerPackagePath = path.join(targetRoot, 'packages', 'swagger', 'package.json');
+  const authApiPackagePath = path.join(targetRoot, 'packages', 'auth-api', 'package.json');
+  if (fs.existsSync(swaggerPackagePath) && fs.existsSync(authApiPackagePath)) {
+    const authApiPackage = JSON.parse(fs.readFileSync(authApiPackagePath, 'utf8'));
+    ensureDependency(authApiPackage, '@nestjs/swagger', '^11.2.0');
+    writeJson(authApiPackagePath, authApiPackage);
+  }
+
   if (supportsPrismaStore) {
     copyFromPreset(
       packageRoot,

package/templates/base/docs/AI/MODULE_CHECKS.md

@@ -23,3 +23,6 @@ If a module can be validated through a safe API call, it must provide:
 - If probe writes data, it must use clearly marked probe/test records.
 - Probe should not require hidden setup beyond documented env/dependencies.
 - `create-forgeon add <module>` must wire both API probe and web probe UI when feasible.
+- Web probes should be appended to the existing probe UI structure in `apps/web/src/App.tsx`:
+  - add new action button at the end of `<div className="actions">`
+  - add new result block before the `networkError` render block

package/templates/base/scripts/forgeon-sync-integrations.mjs

@@ -54,8 +54,14 @@ function syncJwtSwagger({ rootDir, changedFiles }) {
   );
   const loginDtoPath = path.join(rootDir, 'packages', 'auth-api', 'src', 'dto', 'login.dto.ts');
   const refreshDtoPath = path.join(rootDir, 'packages', 'auth-api', 'src', 'dto', 'refresh.dto.ts');
-
-  if (!fs.existsSync(controllerPath) || !fs.existsSync(loginDtoPath) || !fs.existsSync(refreshDtoPath)) {
+  const authApiPackagePath = path.join(rootDir, 'packages', 'auth-api', 'package.json');
+
+  if (
+    !fs.existsSync(controllerPath) ||
+    !fs.existsSync(loginDtoPath) ||
+    !fs.existsSync(refreshDtoPath) ||
+    !fs.existsSync(authApiPackagePath)
+  ) {
     return { applied: false, reason: 'jwt-auth source files are missing' };
   }
 
@@ -153,6 +159,16 @@ function syncJwtSwagger({ rootDir, changedFiles }) {
   changedFiles.add(loginDtoPath);
   changedFiles.add(refreshDtoPath);
 
+  const authApiPackage = JSON.parse(fs.readFileSync(authApiPackagePath, 'utf8'));
+  if (!authApiPackage.dependencies) {
+    authApiPackage.dependencies = {};
+  }
+  if (!authApiPackage.dependencies['@nestjs/swagger']) {
+    authApiPackage.dependencies['@nestjs/swagger'] = '^11.2.0';
+    fs.writeFileSync(authApiPackagePath, `${JSON.stringify(authApiPackage, null, 2)}\n`, 'utf8');
+    changedFiles.add(authApiPackagePath);
+  }
+
   return { applied: true };
 }