create-forgeon 0.1.38 → 0.2.1

package/src/modules/db-prisma.mjs

@@ -2,10 +2,10 @@ import fs from 'node:fs';
 import path from 'node:path';
 import { copyRecursive, writeJson } from '../utils/fs.mjs';
 
-function copyFromBase(packageRoot, targetRoot, relativePath) {
-  const source = path.join(packageRoot, 'templates', 'base', relativePath);
+function copyFromPreset(packageRoot, targetRoot, relativePath) {
+  const source = path.join(packageRoot, 'templates', 'module-presets', 'db-prisma', relativePath);
   if (!fs.existsSync(source)) {
-    throw new Error(`Missing db-prisma source template: ${source}`);
+    throw new Error(`Missing db-prisma preset template: ${source}`);
   }
   const destination = path.join(targetRoot, relativePath);
   copyRecursive(source, destination);
@@ -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';");
   }
 
@@ -256,8 +279,9 @@ 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 prisma: PrismaService,
   ) {`;
       content = content.replace(original, next);
@@ -293,6 +317,49 @@ function patchHealthController(targetRoot) {
   fs.writeFileSync(filePath, `${content.trimEnd()}\n`, 'utf8');
 }
 
+function patchWebApp(targetRoot) {
+  const filePath = path.join(targetRoot, 'apps', 'web', 'src', 'App.tsx');
+  if (!fs.existsSync(filePath)) {
+    return;
+  }
+
+  let content = fs.readFileSync(filePath, 'utf8').replace(/\r\n/g, '\n');
+
+  if (!content.includes('dbProbeResult')) {
+    const stateAnchor = '  const [validationProbeResult, setValidationProbeResult] = useState<ProbeResult | null>(null);';
+    if (content.includes(stateAnchor)) {
+      content = ensureLineAfter(
+        content,
+        stateAnchor,
+        '  const [dbProbeResult, setDbProbeResult] = useState<ProbeResult | null>(null);',
+      );
+    }
+  }
+
+  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)
+      ? "        <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);
+    }
+  }
+
+  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)}");
+    }
+  }
+
+  fs.writeFileSync(filePath, `${content.trimEnd()}\n`, 'utf8');
+}
+
 function patchApiDockerfile(targetRoot) {
   const dockerfilePath = path.join(targetRoot, 'apps', 'api', 'Dockerfile');
   if (!fs.existsSync(dockerfilePath)) {
@@ -300,34 +367,26 @@ function patchApiDockerfile(targetRoot) {
   }
 
   let content = fs.readFileSync(dockerfilePath, 'utf8').replace(/\r\n/g, '\n');
-  content = ensureLineAfter(
-    content,
-    'COPY apps/api/package.json apps/api/package.json',
-    'COPY apps/api/prisma apps/api/prisma',
-  );
-  content = ensureLineAfter(
-    content,
-    'COPY packages/core/package.json packages/core/package.json',
-    'COPY packages/db-prisma/package.json packages/db-prisma/package.json',
-  );
+  content = ensureLineAfter(content, 'COPY apps/api/package.json apps/api/package.json', 'COPY apps/api/prisma apps/api/prisma');
+  content = ensureLineAfter(content, 'COPY packages/core/package.json packages/core/package.json', 'COPY packages/db-prisma/package.json packages/db-prisma/package.json');
   content = ensureLineAfter(content, 'COPY packages/core packages/core', 'COPY packages/db-prisma packages/db-prisma');
 
-  content = content.replace(/^RUN pnpm --filter @forgeon\/db-prisma build\r?\n?/gm, '');
-  content = ensureLineBefore(
-    content,
-    'RUN pnpm --filter @forgeon/api prisma:generate',
-    'RUN pnpm --filter @forgeon/db-prisma build',
-  );
-
-  if (!content.includes('RUN pnpm --filter @forgeon/api prisma:generate')) {
-    content = ensureLineBefore(
-      content,
-      'RUN pnpm --filter @forgeon/api build',
-      'RUN pnpm --filter @forgeon/api prisma:generate',
+  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(
+      /^CMD \["sh", "-c", "pnpm --filter @forgeon\/api prisma:migrate:deploy && node apps\/api\/dist\/main\.js"\]\r?\n?/gm,
+      '',
     );
-  }
 
-  fs.writeFileSync(dockerfilePath, `${content.trimEnd()}\n`, 'utf8');
+  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`;
+
+  fs.writeFileSync(dockerfilePath, content, 'utf8');
 }
 
 function patchCompose(targetRoot) {
@@ -337,6 +396,29 @@ function patchCompose(targetRoot) {
   }
 
   let content = fs.readFileSync(composePath, 'utf8').replace(/\r\n/g, '\n');
+
+  const dbServiceBlock = `  db:
+    image: postgres:16-alpine
+    restart: unless-stopped
+    environment:
+      POSTGRES_USER: \${POSTGRES_USER}
+      POSTGRES_PASSWORD: \${POSTGRES_PASSWORD}
+      POSTGRES_DB: \${POSTGRES_DB}
+    ports:
+      - "5432:5432"
+    volumes:
+      - db_data:/var/lib/postgresql/data
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U \${POSTGRES_USER}"]
+      interval: 10s
+      timeout: 5s
+      retries: 10
+`;
+
+  if (!/\n\s{2}db:\n/.test(content)) {
+    content = content.replace(/^services:\n/m, `services:\n${dbServiceBlock}\n`);
+  }
+
   if (!content.includes('DATABASE_URL: ${DATABASE_URL}')) {
     content = content.replace(
       /^(\s+API_PREFIX:.*)$/m,
@@ -345,6 +427,22 @@ function patchCompose(targetRoot) {
     );
   }
 
+  if (!content.includes('depends_on:') || !content.includes('condition: service_healthy')) {
+    content = content.replace(
+      /^(\s{2}api:\n[\s\S]*?^\s{4}environment:\n(?:\s{6}.+\n)+)/m,
+      `$1    depends_on:
+      db:
+        condition: service_healthy
+`,
+    );
+  }
+
+  if (!/^volumes:\n/m.test(content)) {
+    content = `${content.trimEnd()}\n\nvolumes:\n  db_data:\n`;
+  } else if (!/^\s{2}db_data:\s*$/m.test(content)) {
+    content = `${content.trimEnd()}\n  db_data:\n`;
+  }
+
   fs.writeFileSync(composePath, `${content.trimEnd()}\n`, 'utf8');
 }
 
@@ -381,13 +479,14 @@ Configuration (env):
 }
 
 export function applyDbPrismaModule({ packageRoot, targetRoot }) {
-  copyFromBase(packageRoot, targetRoot, path.join('packages', 'db-prisma'));
-  copyFromBase(packageRoot, targetRoot, path.join('apps', 'api', 'prisma'));
+  copyFromPreset(packageRoot, targetRoot, path.join('packages', 'db-prisma'));
+  copyFromPreset(packageRoot, targetRoot, path.join('apps', 'api', 'prisma'));
 
   patchApiPackage(targetRoot);
   patchRootPackage(targetRoot);
   patchAppModule(targetRoot);
   patchHealthController(targetRoot);
+  patchWebApp(targetRoot);
   patchApiDockerfile(targetRoot);
   patchCompose(targetRoot);
   patchReadme(targetRoot);
@@ -396,6 +495,9 @@ export function applyDbPrismaModule({ packageRoot, targetRoot }) {
     'DATABASE_URL=postgresql://postgres:postgres@localhost:5432/app?schema=public',
   ]);
   upsertEnvLines(path.join(targetRoot, 'infra', 'docker', '.env.example'), [
+    'POSTGRES_USER=postgres',
+    'POSTGRES_PASSWORD=postgres',
+    'POSTGRES_DB=app',
     'DATABASE_URL=postgresql://postgres:postgres@db:5432/app?schema=public',
   ]);
 }

package/src/modules/executor.test.mjs

@@ -261,6 +261,7 @@ describe('addModule', () => {
         projectName: 'demo-i18n',
         frontend: 'react',
         db: 'prisma',
+        dbPrismaEnabled: true,
         i18nEnabled: false,
         proxy: 'caddy',
       });
@@ -394,13 +395,17 @@ describe('addModule', () => {
       assert.doesNotMatch(i18nTs, /I18N_DEFAULT_LANG/);
 
       const rootPackage = fs.readFileSync(path.join(projectRoot, 'package.json'), 'utf8');
+      assert.match(rootPackage, /"forgeon:sync-integrations"/);
       assert.match(rootPackage, /"i18n:sync"/);
       assert.match(rootPackage, /"i18n:check"/);
       assert.match(rootPackage, /"i18n:types"/);
       assert.match(rootPackage, /"i18n:add"/);
+      assert.match(rootPackage, /"ts-morph":/);
 
       const i18nAddScriptPath = path.join(projectRoot, 'scripts', 'i18n-add.mjs');
       assert.equal(fs.existsSync(i18nAddScriptPath), true);
+      const syncScriptPath = path.join(projectRoot, 'scripts', 'forgeon-sync-integrations.mjs');
+      assert.equal(fs.existsSync(syncScriptPath), true);
 
       const caddyDockerfile = fs.readFileSync(
         path.join(projectRoot, 'infra', 'docker', 'caddy.Dockerfile'),
@@ -444,6 +449,7 @@ describe('addModule', () => {
         projectName: 'demo-logger',
         frontend: 'react',
         db: 'prisma',
+        dbPrismaEnabled: true,
         i18nEnabled: false,
         proxy: 'caddy',
       });
@@ -536,6 +542,7 @@ describe('addModule', () => {
         projectName: 'demo-swagger',
         frontend: 'react',
         db: 'prisma',
+        dbPrismaEnabled: true,
         i18nEnabled: false,
         proxy: 'caddy',
       });
@@ -629,6 +636,7 @@ describe('addModule', () => {
         projectName: 'demo-swagger-i18n',
         frontend: 'react',
         db: 'prisma',
+        dbPrismaEnabled: true,
         i18nEnabled: true,
         proxy: 'caddy',
       });
@@ -642,11 +650,19 @@ describe('addModule', () => {
       assert.equal(result.applied, true);
 
       const appModule = fs.readFileSync(path.join(projectRoot, 'apps', 'api', 'src', 'app.module.ts'), 'utf8');
-      assert.match(appModule, /load: \[coreConfig,\s*dbPrismaConfig,\s*i18nConfig,\s*swaggerConfig\]/);
-      assert.match(
-        appModule,
-        /validate: createEnvValidator\(\[coreEnvSchema,\s*dbPrismaEnvSchema,\s*i18nEnvSchema,\s*swaggerEnvSchema\]\)/,
-      );
+      const loadMatch = appModule.match(/load: \[([^\]]+)\]/);
+      assert.ok(loadMatch);
+      assert.match(loadMatch[1], /coreConfig/);
+      assert.match(loadMatch[1], /dbPrismaConfig/);
+      assert.match(loadMatch[1], /i18nConfig/);
+      assert.match(loadMatch[1], /swaggerConfig/);
+
+      const validateMatch = appModule.match(/validate: createEnvValidator\(\[([^\]]+)\]\)/);
+      assert.ok(validateMatch);
+      assert.match(validateMatch[1], /coreEnvSchema/);
+      assert.match(validateMatch[1], /dbPrismaEnvSchema/);
+      assert.match(validateMatch[1], /i18nEnvSchema/);
+      assert.match(validateMatch[1], /swaggerEnvSchema/);
       assert.match(appModule, /ForgeonSwaggerModule/);
       assert.match(appModule, /ForgeonI18nModule/);
     } finally {
@@ -667,6 +683,7 @@ describe('addModule', () => {
         projectName: 'demo-swagger-logger',
         frontend: 'react',
         db: 'prisma',
+        dbPrismaEnabled: true,
         i18nEnabled: true,
         proxy: 'caddy',
       });
@@ -686,14 +703,21 @@ describe('addModule', () => {
       assert.equal(loggerResult.applied, true);
 
       const appModule = fs.readFileSync(path.join(projectRoot, 'apps', 'api', 'src', 'app.module.ts'), 'utf8');
-      assert.match(
-        appModule,
-        /load: \[coreConfig,\s*dbPrismaConfig,\s*i18nConfig,\s*swaggerConfig,\s*loggerConfig\]/,
-      );
-      assert.match(
-        appModule,
-        /validate: createEnvValidator\(\[coreEnvSchema,\s*dbPrismaEnvSchema,\s*i18nEnvSchema,\s*swaggerEnvSchema,\s*loggerEnvSchema\]\)/,
-      );
+      const loadMatch = appModule.match(/load: \[([^\]]+)\]/);
+      assert.ok(loadMatch);
+      assert.match(loadMatch[1], /coreConfig/);
+      assert.match(loadMatch[1], /dbPrismaConfig/);
+      assert.match(loadMatch[1], /i18nConfig/);
+      assert.match(loadMatch[1], /swaggerConfig/);
+      assert.match(loadMatch[1], /loggerConfig/);
+
+      const validateMatch = appModule.match(/validate: createEnvValidator\(\[([^\]]+)\]\)/);
+      assert.ok(validateMatch);
+      assert.match(validateMatch[1], /coreEnvSchema/);
+      assert.match(validateMatch[1], /dbPrismaEnvSchema/);
+      assert.match(validateMatch[1], /i18nEnvSchema/);
+      assert.match(validateMatch[1], /swaggerEnvSchema/);
+      assert.match(validateMatch[1], /loggerEnvSchema/);
       assert.match(appModule, /ForgeonSwaggerModule/);
       assert.match(appModule, /ForgeonLoggerModule/);
     } finally {
@@ -714,6 +738,7 @@ describe('addModule', () => {
         projectName: 'demo-logger-i18n',
         frontend: 'react',
         db: 'prisma',
+        dbPrismaEnabled: true,
         i18nEnabled: false,
         proxy: 'caddy',
       });
@@ -770,6 +795,7 @@ describe('addModule', () => {
         projectName: 'demo-swagger-i18n-order',
         frontend: 'react',
         db: 'prisma',
+        dbPrismaEnabled: true,
         i18nEnabled: false,
         proxy: 'caddy',
       });
@@ -826,6 +852,7 @@ describe('addModule', () => {
         projectName: 'demo-mixed-order',
         frontend: 'react',
         db: 'prisma',
+        dbPrismaEnabled: true,
         i18nEnabled: false,
         proxy: 'caddy',
       });
@@ -879,6 +906,7 @@ describe('addModule', () => {
         projectName: 'demo-jwt-db',
         frontend: 'react',
         db: 'prisma',
+        dbPrismaEnabled: true,
         i18nEnabled: true,
         proxy: 'caddy',
       });
@@ -944,6 +972,7 @@ describe('addModule', () => {
         projectName: 'demo-jwt-nodb',
         frontend: 'react',
         db: 'prisma',
+        dbPrismaEnabled: true,
         i18nEnabled: false,
         proxy: 'caddy',
       });
@@ -995,6 +1024,7 @@ describe('addModule', () => {
           projectName: `demo-db-${sequence.join('-')}`,
           frontend: 'react',
           db: 'prisma',
+        dbPrismaEnabled: true,
           i18nEnabled: false,
           proxy: 'caddy',
         });
@@ -1023,6 +1053,7 @@ describe('addModule', () => {
         projectName: 'demo-db-last',
         frontend: 'react',
         db: 'prisma',
+        dbPrismaEnabled: true,
         i18nEnabled: false,
         proxy: 'caddy',
       });

package/src/modules/i18n.mjs

@@ -169,11 +169,6 @@ function patchApiDockerfile(targetRoot) {
   content = ensureLineAfter(
     content,
     'COPY packages/core/package.json packages/core/package.json',
-    'COPY packages/db-prisma/package.json packages/db-prisma/package.json',
-  );
-  content = ensureLineAfter(
-    content,
-    'COPY packages/db-prisma/package.json packages/db-prisma/package.json',
     'COPY packages/i18n-contracts/package.json packages/i18n-contracts/package.json',
   );
   content = ensureLineAfter(
@@ -181,16 +176,7 @@ function patchApiDockerfile(targetRoot) {
     'COPY packages/i18n-contracts/package.json packages/i18n-contracts/package.json',
     'COPY packages/i18n/package.json packages/i18n/package.json',
   );
-  content = ensureLineAfter(
-    content,
-    'COPY packages/core packages/core',
-    'COPY packages/db-prisma packages/db-prisma',
-  );
-  content = ensureLineAfter(
-    content,
-    'COPY packages/db-prisma packages/db-prisma',
-    'COPY packages/i18n-contracts packages/i18n-contracts',
-  );
+  content = ensureLineAfter(content, 'COPY packages/core packages/core', 'COPY packages/i18n-contracts packages/i18n-contracts');
   content = ensureLineAfter(
     content,
     'COPY packages/i18n-contracts packages/i18n-contracts',
@@ -199,28 +185,26 @@ function patchApiDockerfile(targetRoot) {
 
   content = content
     .replace(/^RUN pnpm --filter @forgeon\/core build\r?\n?/gm, '')
-    .replace(/^RUN pnpm --filter @forgeon\/db-prisma build\r?\n?/gm, '')
     .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,
-    'RUN pnpm --filter @forgeon/api prisma:generate',
-    'RUN pnpm --filter @forgeon/db-prisma build',
-  );
-  content = ensureLineBefore(
-    content,
-    'RUN pnpm --filter @forgeon/api prisma:generate',
+    apiBuildAnchor,
     'RUN pnpm --filter @forgeon/i18n-contracts build',
   );
   content = ensureLineBefore(
     content,
-    'RUN pnpm --filter @forgeon/api prisma:generate',
+    apiBuildAnchor,
     'RUN pnpm --filter @forgeon/i18n build',
   );
 
@@ -291,8 +275,10 @@ function patchCompose(targetRoot) {
 
   let content = fs.readFileSync(composePath, 'utf8').replace(/\r\n/g, '\n');
   if (!content.includes('I18N_DEFAULT_LANG: ${I18N_DEFAULT_LANG}')) {
+    const hasDatabaseUrl = /^(\s+DATABASE_URL:.*)$/m.test(content);
+    const anchorPattern = hasDatabaseUrl ? /^(\s+DATABASE_URL:.*)$/m : /^(\s+API_PREFIX:.*)$/m;
     content = content.replace(
-      /^(\s+DATABASE_URL:.*)$/m,
+      anchorPattern,
       `$1
       I18N_DEFAULT_LANG: \${I18N_DEFAULT_LANG}
       I18N_FALLBACK_LANG: \${I18N_FALLBACK_LANG}`,
@@ -311,13 +297,11 @@ function patchApiPackage(targetRoot) {
   const packageJson = JSON.parse(fs.readFileSync(packagePath, 'utf8'));
   ensureBuildSteps(packageJson, 'predev', [
     'pnpm --filter @forgeon/core build',
-    'pnpm --filter @forgeon/db-prisma build',
     'pnpm --filter @forgeon/i18n-contracts build',
     'pnpm --filter @forgeon/i18n build',
   ]);
   ensureDependency(packageJson, '@forgeon/i18n', 'workspace:*');
   ensureDependency(packageJson, '@forgeon/i18n-contracts', 'workspace:*');
-  ensureDependency(packageJson, '@forgeon/db-prisma', 'workspace:*');
   ensureDependency(packageJson, 'nestjs-i18n', '^10.5.1');
   writeJson(packagePath, packageJson);
 }
@@ -544,7 +528,6 @@ function patchRootPackage(targetRoot) {
 
 export function applyI18nModule({ packageRoot, targetRoot }) {
   copyFromBase(packageRoot, targetRoot, path.join('scripts', 'i18n-add.mjs'));
-  copyFromBase(packageRoot, targetRoot, path.join('packages', 'db-prisma'));
   copyFromBase(packageRoot, targetRoot, path.join('packages', 'i18n'));
   copyFromBase(packageRoot, targetRoot, path.join('resources', 'i18n'));
 

package/src/modules/logger.mjs

@@ -238,9 +238,12 @@ function patchApiDockerfile(targetRoot) {
   content = ensureLineAfter(content, sourceAnchor, 'COPY packages/logger packages/logger');
 
   content = content.replace(/^RUN pnpm --filter @forgeon\/logger build\r?\n?/gm, '');
+  const buildAnchor = 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',
+    buildAnchor,
     'RUN pnpm --filter @forgeon/logger build',
   );
 

package/src/modules/swagger.mjs

@@ -241,9 +241,12 @@ function patchApiDockerfile(targetRoot) {
   content = ensureLineAfter(content, sourceAnchor, 'COPY packages/swagger packages/swagger');
 
   content = content.replace(/^RUN pnpm --filter @forgeon\/swagger build\r?\n?/gm, '');
+  const buildAnchor = 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',
+    buildAnchor,
     'RUN pnpm --filter @forgeon/swagger build',
   );
 
@@ -258,8 +261,10 @@ function patchCompose(targetRoot) {
 
   let content = fs.readFileSync(composePath, 'utf8').replace(/\r\n/g, '\n');
   if (!content.includes('SWAGGER_ENABLED: ${SWAGGER_ENABLED}')) {
+    const hasDatabaseUrl = /^(\s+DATABASE_URL:.*)$/m.test(content);
+    const anchorPattern = hasDatabaseUrl ? /^(\s+DATABASE_URL:.*)$/m : /^(\s+API_PREFIX:.*)$/m;
     content = content.replace(
-      /^(\s+DATABASE_URL:.*)$/m,
+      anchorPattern,
       `$1
       SWAGGER_ENABLED: \${SWAGGER_ENABLED}
       SWAGGER_PATH: \${SWAGGER_PATH}