create-forgeon 0.1.33 → 0.1.35

package/src/modules/i18n.mjs

@@ -34,6 +34,31 @@ function ensureScript(packageJson, name, command) {
   packageJson.scripts[name] = command;
 }
 
+function ensureBuildSteps(packageJson, scriptName, requiredCommands) {
+  if (!packageJson.scripts) {
+    packageJson.scripts = {};
+  }
+
+  const current = packageJson.scripts[scriptName];
+  const steps =
+    typeof current === 'string' && current.trim().length > 0
+      ? current
+          .split('&&')
+          .map((item) => item.trim())
+          .filter(Boolean)
+      : [];
+
+  for (const command of requiredCommands) {
+    if (!steps.includes(command)) {
+      steps.push(command);
+    }
+  }
+
+  if (steps.length > 0) {
+    packageJson.scripts[scriptName] = steps.join(' && ');
+  }
+}
+
 function upsertEnvLines(filePath, lines) {
   let content = '';
   if (fs.existsSync(filePath)) {
@@ -87,6 +112,48 @@ function ensureLineBefore(content, anchorLine, lineToInsert) {
   return `${content.slice(0, index)}${lineToInsert}\n${content.slice(index)}`;
 }
 
+function ensureLoadItem(content, itemName) {
+  const pattern = /load:\s*\[([^\]]*)\]/m;
+  const match = content.match(pattern);
+  if (!match) {
+    return content;
+  }
+
+  const rawList = match[1];
+  const items = rawList
+    .split(',')
+    .map((item) => item.trim())
+    .filter(Boolean);
+
+  if (!items.includes(itemName)) {
+    items.push(itemName);
+  }
+
+  const next = `load: [${items.join(', ')}]`;
+  return content.replace(pattern, next);
+}
+
+function ensureValidatorSchema(content, schemaName) {
+  const pattern = /validate:\s*createEnvValidator\(\[([^\]]*)\]\)/m;
+  const match = content.match(pattern);
+  if (!match) {
+    return content;
+  }
+
+  const rawList = match[1];
+  const items = rawList
+    .split(',')
+    .map((item) => item.trim())
+    .filter(Boolean);
+
+  if (!items.includes(schemaName)) {
+    items.push(schemaName);
+  }
+
+  const next = `validate: createEnvValidator([${items.join(', ')}])`;
+  return content.replace(pattern, next);
+}
+
 function patchApiDockerfile(targetRoot) {
   const dockerfilePath = path.join(targetRoot, 'apps', 'api', 'Dockerfile');
   if (!fs.existsSync(dockerfilePath)) {
@@ -242,11 +309,12 @@ function patchApiPackage(targetRoot) {
   }
 
   const packageJson = JSON.parse(fs.readFileSync(packagePath, 'utf8'));
-  ensureScript(
-    packageJson,
-    'predev',
-    'pnpm --filter @forgeon/core build && pnpm --filter @forgeon/db-prisma build && pnpm --filter @forgeon/i18n-contracts build && pnpm --filter @forgeon/i18n build',
-  );
+  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:*');
@@ -261,16 +329,14 @@ function patchWebPackage(targetRoot) {
   }
 
   const packageJson = JSON.parse(fs.readFileSync(packagePath, 'utf8'));
-  ensureScript(
-    packageJson,
-    'predev',
-    'pnpm --filter @forgeon/i18n-contracts build && pnpm --filter @forgeon/i18n-web build',
-  );
-  ensureScript(
-    packageJson,
-    'prebuild',
-    'pnpm --filter @forgeon/i18n-contracts build && pnpm --filter @forgeon/i18n-web build',
-  );
+  ensureBuildSteps(packageJson, 'predev', [
+    'pnpm --filter @forgeon/i18n-contracts build',
+    'pnpm --filter @forgeon/i18n-web build',
+  ]);
+  ensureBuildSteps(packageJson, 'prebuild', [
+    'pnpm --filter @forgeon/i18n-contracts build',
+    'pnpm --filter @forgeon/i18n-web build',
+  ]);
   ensureDependency(packageJson, '@forgeon/i18n-contracts', 'workspace:*');
   ensureDependency(packageJson, '@forgeon/i18n-web', 'workspace:*');
   ensureDependency(packageJson, 'i18next', '^23.16.8');
@@ -278,6 +344,167 @@ function patchWebPackage(targetRoot) {
   writeJson(packagePath, packageJson);
 }
 
+function patchAppModule(targetRoot) {
+  const appModulePath = path.join(targetRoot, 'apps', 'api', 'src', 'app.module.ts');
+  if (!fs.existsSync(appModulePath)) {
+    return;
+  }
+
+  let content = fs.readFileSync(appModulePath, 'utf8').replace(/\r\n/g, '\n');
+  if (!content.includes("from '@forgeon/i18n';")) {
+    if (content.includes("import { ForgeonLoggerModule, loggerConfig, loggerEnvSchema } from '@forgeon/logger';")) {
+      content = ensureLineAfter(
+        content,
+        "import { ForgeonLoggerModule, loggerConfig, loggerEnvSchema } from '@forgeon/logger';",
+        "import { ForgeonI18nModule, i18nConfig, i18nEnvSchema } from '@forgeon/i18n';",
+      );
+    } else if (
+      content.includes("import { ForgeonSwaggerModule, swaggerConfig, swaggerEnvSchema } from '@forgeon/swagger';")
+    ) {
+      content = ensureLineAfter(
+        content,
+        "import { ForgeonSwaggerModule, swaggerConfig, swaggerEnvSchema } from '@forgeon/swagger';",
+        "import { ForgeonI18nModule, i18nConfig, i18nEnvSchema } from '@forgeon/i18n';",
+      );
+    } else if (
+      content.includes("import { dbPrismaConfig, dbPrismaEnvSchema, DbPrismaModule } from '@forgeon/db-prisma';")
+    ) {
+      content = ensureLineAfter(
+        content,
+        "import { dbPrismaConfig, dbPrismaEnvSchema, DbPrismaModule } from '@forgeon/db-prisma';",
+        "import { ForgeonI18nModule, i18nConfig, i18nEnvSchema } from '@forgeon/i18n';",
+      );
+    } else {
+      content = ensureLineAfter(
+        content,
+        "import { ConfigModule } from '@nestjs/config';",
+        "import { ForgeonI18nModule, i18nConfig, i18nEnvSchema } from '@forgeon/i18n';",
+      );
+    }
+  }
+
+  if (!content.includes("import { join } from 'path';")) {
+    content = ensureLineBefore(
+      content,
+      "import { HealthController } from './health/health.controller';",
+      "import { join } from 'path';",
+    );
+  }
+
+  if (!content.includes('const i18nPath =')) {
+    content = ensureLineBefore(
+      content,
+      '@Module({',
+      "const i18nPath = join(__dirname, '..', '..', '..', 'resources', 'i18n');",
+    );
+  }
+
+  content = ensureLoadItem(content, 'i18nConfig');
+  content = ensureValidatorSchema(content, 'i18nEnvSchema');
+
+  const i18nModuleBlock = `    ForgeonI18nModule.register({
+      path: i18nPath,
+    }),`;
+  if (!content.includes('ForgeonI18nModule.register({')) {
+    if (content.includes('    DbPrismaModule,')) {
+      content = ensureLineAfter(content, '    DbPrismaModule,', i18nModuleBlock);
+    } else if (content.includes('    ForgeonLoggerModule,')) {
+      content = ensureLineAfter(content, '    ForgeonLoggerModule,', i18nModuleBlock);
+    } else if (content.includes('    ForgeonSwaggerModule,')) {
+      content = ensureLineAfter(content, '    ForgeonSwaggerModule,', i18nModuleBlock);
+    } else {
+      content = ensureLineAfter(content, '    CoreErrorsModule,', i18nModuleBlock);
+    }
+  }
+
+  fs.writeFileSync(appModulePath, `${content.trimEnd()}\n`, 'utf8');
+}
+
+function patchHealthController(targetRoot) {
+  const filePath = path.join(targetRoot, 'apps', 'api', 'src', 'health', 'health.controller.ts');
+  if (!fs.existsSync(filePath)) {
+    return;
+  }
+
+  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';",
+      );
+    }
+  }
+
+  if (!content.includes('private readonly i18n: I18nService')) {
+    const constructorMatch = content.match(/constructor\(([\s\S]*?)\)\s*\{/m);
+    if (constructorMatch) {
+      const original = constructorMatch[0];
+      const inner = constructorMatch[1].trimEnd();
+      const separator = inner.length > 0 ? ',' : '';
+      const next = `constructor(${inner}${separator}
+    private readonly i18n: I18nService,
+  ) {`;
+      content = content.replace(original, next);
+    }
+  }
+
+  if (!content.includes('private translate(')) {
+    const translateMethod = `
+  private translate(key: string, lang?: string): string {
+    const value = this.i18n.t(key, { lang, defaultValue: key });
+    return typeof value === 'string' ? value : key;
+  }
+`;
+    content = `${content.trimEnd()}\n${translateMethod}\n`;
+  }
+
+  content = content.replace(
+    /getHealth\(@Query\('lang'\)\s*_lang\?:\s*string\)/g,
+    "getHealth(@Query('lang') lang?: string)",
+  );
+  content = content.replace(
+    /getErrorProbe\(\)/g,
+    "getErrorProbe(@Query('lang') lang?: string)",
+  );
+  content = content.replace(
+    /getValidationProbe\(@Query\('value'\)\s*value\?:\s*string\)/g,
+    "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*'English',/g, "i18n: 'en',");
+
+  content = content.replace(
+    /message:\s*'Email already exists',/g,
+    "message: this.translate('errors.http.CONFLICT', lang),",
+  );
+
+  if (
+    content.includes("const translatedMessage = this.translate('validation.generic.required', lang);") === false &&
+    content.includes("if (!value || value.trim().length === 0) {")
+  ) {
+    content = content.replace(
+      /if \(!value \|\| value\.trim\(\)\.length === 0\) \{\s*throw new BadRequestException\(\{\s*message:\s*'Field is required',\s*details:\s*\[\{ field: 'value', message: 'Field is required' \}\],\s*\}\);\s*\}/m,
+      `if (!value || value.trim().length === 0) {
+      const translatedMessage = this.translate('validation.generic.required', lang);
+      throw new BadRequestException({
+        message: translatedMessage,
+        details: [{ field: 'value', message: translatedMessage }],
+      });
+    }`,
+    );
+  }
+
+  fs.writeFileSync(filePath, `${content.trimEnd()}\n`, 'utf8');
+}
+
 function patchI18nPackage(targetRoot) {
   const packagePath = path.join(targetRoot, 'packages', 'i18n', 'package.json');
   if (!fs.existsSync(packagePath)) {
@@ -327,17 +554,12 @@ export function applyI18nModule({ packageRoot, targetRoot }) {
   copyFromPreset(packageRoot, targetRoot, path.join('apps', 'web', 'src', 'i18n.ts'));
   copyFromPreset(packageRoot, targetRoot, path.join('apps', 'web', 'src', 'main.tsx'));
 
-  copyFromBase(packageRoot, targetRoot, path.join('apps', 'api', 'src', 'app.module.ts'));
-  copyFromBase(
-    packageRoot,
-    targetRoot,
-    path.join('apps', 'api', 'src', 'health', 'health.controller.ts'),
-  );
-
   patchI18nPackage(targetRoot);
   patchApiPackage(targetRoot);
   patchWebPackage(targetRoot);
   patchRootPackage(targetRoot);
+  patchAppModule(targetRoot);
+  patchHealthController(targetRoot);
   patchApiDockerfile(targetRoot);
   patchProxyDockerfiles(targetRoot);
 

package/src/modules/logger.mjs

@@ -71,6 +71,48 @@ function upsertEnvLines(filePath, lines) {
   fs.writeFileSync(filePath, next.replace(/^\n/, ''), 'utf8');
 }
 
+function ensureLoadItem(content, itemName) {
+  const pattern = /load:\s*\[([^\]]*)\]/m;
+  const match = content.match(pattern);
+  if (!match) {
+    return content;
+  }
+
+  const rawList = match[1];
+  const items = rawList
+    .split(',')
+    .map((item) => item.trim())
+    .filter(Boolean);
+
+  if (!items.includes(itemName)) {
+    items.push(itemName);
+  }
+
+  const next = `load: [${items.join(', ')}]`;
+  return content.replace(pattern, next);
+}
+
+function ensureValidatorSchema(content, schemaName) {
+  const pattern = /validate:\s*createEnvValidator\(\[([^\]]*)\]\)/m;
+  const match = content.match(pattern);
+  if (!match) {
+    return content;
+  }
+
+  const rawList = match[1];
+  const items = rawList
+    .split(',')
+    .map((item) => item.trim())
+    .filter(Boolean);
+
+  if (!items.includes(schemaName)) {
+    items.push(schemaName);
+  }
+
+  const next = `validate: createEnvValidator([${items.join(', ')}])`;
+  return content.replace(pattern, next);
+}
+
 function patchApiPackage(targetRoot) {
   const packagePath = path.join(targetRoot, 'apps', 'api', 'package.json');
   if (!fs.existsSync(packagePath)) {
@@ -141,28 +183,32 @@ function patchAppModule(targetRoot) {
 
   let content = fs.readFileSync(filePath, 'utf8').replace(/\r\n/g, '\n');
 
-  content = ensureLineAfter(
-    content,
-    "import { dbPrismaConfig, dbPrismaEnvSchema, DbPrismaModule } from '@forgeon/db-prisma';",
-    "import { ForgeonLoggerModule, loggerConfig, loggerEnvSchema } from '@forgeon/logger';",
-  );
+  if (!content.includes("from '@forgeon/logger';")) {
+    if (content.includes("import { ForgeonSwaggerModule, swaggerConfig, swaggerEnvSchema } from '@forgeon/swagger';")) {
+      content = ensureLineAfter(
+        content,
+        "import { ForgeonSwaggerModule, swaggerConfig, swaggerEnvSchema } from '@forgeon/swagger';",
+        "import { ForgeonLoggerModule, loggerConfig, loggerEnvSchema } from '@forgeon/logger';",
+      );
+    } else if (
+      content.includes("import { dbPrismaConfig, dbPrismaEnvSchema, DbPrismaModule } from '@forgeon/db-prisma';")
+    ) {
+      content = ensureLineAfter(
+        content,
+        "import { dbPrismaConfig, dbPrismaEnvSchema, DbPrismaModule } from '@forgeon/db-prisma';",
+        "import { ForgeonLoggerModule, loggerConfig, loggerEnvSchema } from '@forgeon/logger';",
+      );
+    } else {
+      content = ensureLineAfter(
+        content,
+        "import { ConfigModule } from '@nestjs/config';",
+        "import { ForgeonLoggerModule, loggerConfig, loggerEnvSchema } from '@forgeon/logger';",
+      );
+    }
+  }
 
-  content = content.replace(
-    'load: [coreConfig, dbPrismaConfig, i18nConfig],',
-    'load: [coreConfig, dbPrismaConfig, i18nConfig, loggerConfig],',
-  );
-  content = content.replace(
-    'load: [coreConfig, dbPrismaConfig],',
-    'load: [coreConfig, dbPrismaConfig, loggerConfig],',
-  );
-  content = content.replace(
-    'validate: createEnvValidator([coreEnvSchema, dbPrismaEnvSchema, i18nEnvSchema]),',
-    'validate: createEnvValidator([coreEnvSchema, dbPrismaEnvSchema, i18nEnvSchema, loggerEnvSchema]),',
-  );
-  content = content.replace(
-    'validate: createEnvValidator([coreEnvSchema, dbPrismaEnvSchema]),',
-    'validate: createEnvValidator([coreEnvSchema, dbPrismaEnvSchema, loggerEnvSchema]),',
-  );
+  content = ensureLoadItem(content, 'loggerConfig');
+  content = ensureValidatorSchema(content, 'loggerEnvSchema');
 
   content = ensureLineAfter(content, '    CoreErrorsModule,', '    ForgeonLoggerModule,');
 
@@ -177,16 +223,19 @@ function patchApiDockerfile(targetRoot) {
 
   let content = fs.readFileSync(dockerfilePath, 'utf8').replace(/\r\n/g, '\n');
 
+  const packageAnchor = content.includes('COPY packages/db-prisma/package.json packages/db-prisma/package.json')
+    ? 'COPY packages/db-prisma/package.json packages/db-prisma/package.json'
+    : 'COPY packages/core/package.json packages/core/package.json';
   content = ensureLineAfter(
     content,
-    'COPY packages/db-prisma/package.json packages/db-prisma/package.json',
+    packageAnchor,
     'COPY packages/logger/package.json packages/logger/package.json',
   );
-  content = ensureLineAfter(
-    content,
-    'COPY packages/db-prisma packages/db-prisma',
-    'COPY packages/logger packages/logger',
-  );
+
+  const sourceAnchor = content.includes('COPY packages/db-prisma packages/db-prisma')
+    ? 'COPY packages/db-prisma packages/db-prisma'
+    : 'COPY packages/core packages/core';
+  content = ensureLineAfter(content, sourceAnchor, 'COPY packages/logger packages/logger');
 
   content = content.replace(/^RUN pnpm --filter @forgeon\/logger build\r?\n?/gm, '');
   content = ensureLineBefore(

package/src/modules/registry.mjs

@@ -1,4 +1,12 @@
 const MODULE_PRESETS = {
+  'db-prisma': {
+    id: 'db-prisma',
+    label: 'DB Prisma',
+    category: 'database-layer',
+    implemented: true,
+    description: 'Prisma/Postgres module wiring with env config, scripts, and DB probe endpoint.',
+    docFragments: ['00_title', '10_overview', '20_scope', '90_status_implemented'],
+  },
   i18n: {
     id: 'i18n',
     label: 'I18n',

package/src/modules/swagger.mjs

@@ -197,6 +197,12 @@ function patchAppModule(targetRoot) {
         "import { dbPrismaConfig, dbPrismaEnvSchema, DbPrismaModule } from '@forgeon/db-prisma';",
         "import { ForgeonSwaggerModule, swaggerConfig, swaggerEnvSchema } from '@forgeon/swagger';",
       );
+    } else {
+      content = ensureLineAfter(
+        content,
+        "import { ConfigModule } from '@nestjs/config';",
+        "import { ForgeonSwaggerModule, swaggerConfig, swaggerEnvSchema } from '@forgeon/swagger';",
+      );
     }
   }
 
@@ -218,7 +224,9 @@ function patchApiDockerfile(targetRoot) {
 
   const packageAnchor = content.includes('COPY packages/logger/package.json packages/logger/package.json')
     ? 'COPY packages/logger/package.json packages/logger/package.json'
-    : 'COPY packages/db-prisma/package.json packages/db-prisma/package.json';
+    : content.includes('COPY packages/db-prisma/package.json packages/db-prisma/package.json')
+      ? 'COPY packages/db-prisma/package.json packages/db-prisma/package.json'
+      : 'COPY packages/core/package.json packages/core/package.json';
   content = ensureLineAfter(
     content,
     packageAnchor,
@@ -227,7 +235,9 @@ function patchApiDockerfile(targetRoot) {
 
   const sourceAnchor = content.includes('COPY packages/logger packages/logger')
     ? 'COPY packages/logger packages/logger'
-    : 'COPY packages/db-prisma packages/db-prisma';
+    : content.includes('COPY packages/db-prisma packages/db-prisma')
+      ? 'COPY packages/db-prisma packages/db-prisma'
+      : 'COPY packages/core packages/core';
   content = ensureLineAfter(content, sourceAnchor, 'COPY packages/swagger packages/swagger');
 
   content = content.replace(/^RUN pnpm --filter @forgeon\/swagger build\r?\n?/gm, '');
@@ -284,8 +294,8 @@ Configuration (env):
 - \`SWAGGER_VERSION=1.0.0\`
 
 When enabled:
-- UI endpoint: \`http://localhost:3000/docs\` (or your configured path)
-- in Docker with proxy: \`http://localhost:8080/docs\`
+- UI endpoint: \`http://localhost:3000/api/docs\` (respects global API prefix)
+- in Docker with proxy: \`http://localhost:8080/api/docs\`
 `;
 
   if (content.includes('## Prisma In Docker Start')) {

package/templates/module-fragments/db-prisma/00_title.md

@@ -0,0 +1,6 @@
+# {{MODULE_LABEL}}
+
+- Id: `{{MODULE_ID}}`
+- Category: `{{MODULE_CATEGORY}}`
+- Status: {{MODULE_STATUS}}
+

package/templates/module-fragments/db-prisma/10_overview.md

@@ -0,0 +1,10 @@
+## Overview
+
+Adds Prisma/Postgres database wiring to the API.
+
+Included parts:
+- `@forgeon/db-prisma` package
+- Prisma schema + migration files in `apps/api/prisma`
+- API scripts for `prisma generate/migrate/studio/seed`
+- DB health probe endpoint wiring
+

package/templates/module-fragments/db-prisma/20_scope.md

@@ -0,0 +1,14 @@
+## Applied Scope
+
+- Adds `packages/db-prisma` workspace package
+- Restores/creates `apps/api/prisma` schema and migrations
+- Wires db config/env schema into API `ConfigModule` load/validation
+- Registers `DbPrismaModule` in API `AppModule`
+- Ensures `PrismaService` is available in health controller (`POST /api/health/db`)
+- Updates API scripts and dependencies for Prisma workflows
+- Updates API Docker build steps to include db package and prisma generate
+- Ensures `DATABASE_URL` in:
+  - `apps/api/.env.example`
+  - `infra/docker/.env.example`
+  - `infra/docker/compose.yml`
+

package/templates/module-fragments/db-prisma/90_status_implemented.md

@@ -0,0 +1,4 @@
+## Status
+
+Implemented and applied by `create-forgeon add db-prisma`.
+

package/templates/module-presets/swagger/packages/swagger/src/setup-swagger.ts

@@ -17,9 +17,9 @@ export function setupSwagger(app: INestApplication, config: SwaggerConfigService
   );
 
   SwaggerModule.setup(config.path, app, document, {
+    useGlobalPrefix: true,
     swaggerOptions: {
       persistAuthorization: true,
     },
   });
 }
-