create-forgeon 0.1.24 → 0.1.26

package/package.json

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

package/src/core/docs.test.mjs

@@ -55,9 +55,10 @@ describe('generateDocs', () => {
       assert.match(architectureDoc, /Config Strategy/);
       assert.match(architectureDoc, /TypeScript Module Policy/);
       assert.match(architectureDoc, /tsconfig\.base\.esm\.json/);
-    } finally {
-      fs.rmSync(targetRoot, { recursive: true, force: true });
-    }
+      assert.match(architectureDoc, /DbPrismaModule/);
+    } finally {
+      fs.rmSync(targetRoot, { recursive: true, force: true });
+    }
   });
 
   it('generates docker and caddy notes when enabled', () => {
@@ -95,8 +96,9 @@ describe('generateDocs', () => {
       assert.match(architectureDoc, /Active reverse proxy preset: `caddy`/);
       assert.match(architectureDoc, /TypeScript Module Policy/);
       assert.match(architectureDoc, /tsconfig\.base\.node\.json/);
-    } finally {
-      fs.rmSync(targetRoot, { recursive: true, force: true });
-    }
+      assert.match(architectureDoc, /DbPrismaModule/);
+    } finally {
+      fs.rmSync(targetRoot, { recursive: true, force: true });
+    }
   });
 });

package/src/modules/executor.test.mjs

@@ -98,6 +98,7 @@ describe('addModule', () => {
       assert.equal(fs.existsSync(path.join(projectRoot, 'tsconfig.base.esm.json')), true);
 
       const apiPackage = fs.readFileSync(path.join(projectRoot, 'apps', 'api', 'package.json'), 'utf8');
+      assert.match(apiPackage, /@forgeon\/db-prisma/);
       assert.match(apiPackage, /@forgeon\/i18n/);
       assert.match(apiPackage, /@forgeon\/i18n-contracts/);
 
@@ -110,15 +111,20 @@ describe('addModule', () => {
 
       const appModule = fs.readFileSync(path.join(projectRoot, 'apps', 'api', 'src', 'app.module.ts'), 'utf8');
       assert.match(appModule, /coreConfig/);
+      assert.match(appModule, /dbPrismaConfig/);
+      assert.match(appModule, /dbPrismaEnvSchema/);
       assert.match(appModule, /createEnvValidator/);
       assert.match(appModule, /coreEnvSchema/);
       assert.match(appModule, /i18nConfig/);
       assert.match(appModule, /i18nEnvSchema/);
       assert.match(appModule, /CoreConfigModule/);
       assert.match(appModule, /CoreErrorsModule/);
+      assert.match(appModule, /DbPrismaModule/);
 
       const mainTs = fs.readFileSync(path.join(projectRoot, 'apps', 'api', 'src', 'main.ts'), 'utf8');
       assert.match(mainTs, /CoreExceptionFilter/);
+      assert.match(mainTs, /createValidationPipe/);
+      assert.doesNotMatch(mainTs, /new ValidationPipe\(/);
 
       const forgeonI18nModule = fs.readFileSync(
         path.join(projectRoot, 'packages', 'i18n', 'src', 'forgeon-i18n.module.ts'),
@@ -225,6 +231,8 @@ describe('addModule', () => {
         'utf8',
       );
       assert.match(apiDockerfile, /RUN pnpm --filter @forgeon\/core build/);
+      assert.match(apiDockerfile, /RUN pnpm --filter @forgeon\/db-prisma build/);
+      assert.match(apiDockerfile, /COPY packages\/db-prisma\/package\.json packages\/db-prisma\/package\.json/);
     } finally {
       fs.rmSync(targetRoot, { recursive: true, force: true });
     }

package/src/modules/i18n.mjs

@@ -102,6 +102,11 @@ 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(
@@ -112,6 +117,11 @@ function patchApiDockerfile(targetRoot) {
   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(
@@ -122,6 +132,7 @@ 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, '');
 
@@ -130,6 +141,11 @@ function patchApiDockerfile(targetRoot) {
     'RUN pnpm --filter @forgeon/api prisma:generate',
     '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',
@@ -229,10 +245,11 @@ function patchApiPackage(targetRoot) {
   ensureScript(
     packageJson,
     'predev',
-    'pnpm --filter @forgeon/i18n-contracts build && pnpm --filter @forgeon/i18n build',
+    '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);
 }
@@ -298,6 +315,7 @@ function patchRootPackage(targetRoot) {
 }
 
 export function applyI18nModule({ packageRoot, targetRoot }) {
+  copyFromBase(packageRoot, targetRoot, path.join('packages', 'db-prisma'));
   copyFromBase(packageRoot, targetRoot, path.join('packages', 'i18n'));
   copyFromBase(packageRoot, targetRoot, path.join('resources', 'i18n'));
 

package/src/presets/i18n.mjs

@@ -9,12 +9,13 @@ export function applyI18nDisabled(targetRoot) {
   removeIfExists(path.join(targetRoot, 'resources', 'i18n'));
 
   const apiPackagePath = path.join(targetRoot, 'apps', 'api', 'package.json');
-  if (fs.existsSync(apiPackagePath)) {
-    const apiPackage = JSON.parse(fs.readFileSync(apiPackagePath, 'utf8'));
-
-    if (apiPackage.scripts) {
-      delete apiPackage.scripts.predev;
-    }
+  if (fs.existsSync(apiPackagePath)) {
+    const apiPackage = JSON.parse(fs.readFileSync(apiPackagePath, 'utf8'));
+
+    if (apiPackage.scripts) {
+      apiPackage.scripts.predev =
+        'pnpm --filter @forgeon/core build && pnpm --filter @forgeon/db-prisma build';
+    }
 
     if (apiPackage.dependencies) {
       delete apiPackage.dependencies['@forgeon/i18n'];
@@ -110,21 +111,21 @@ export function applyI18nDisabled(targetRoot) {
     appModulePath,
     `import { Module } from '@nestjs/common';
 import { ConfigModule } from '@nestjs/config';
-import { CoreConfigModule, CoreErrorsModule, coreConfig, validateCoreEnv } from '@forgeon/core';
+import { dbPrismaConfig, dbPrismaEnvSchema, DbPrismaModule } from '@forgeon/db-prisma';
+import { CoreConfigModule, CoreErrorsModule, coreConfig, coreEnvSchema, createEnvValidator } from '@forgeon/core';
 import { HealthController } from './health/health.controller';
-import { PrismaModule } from './prisma/prisma.module';
 
 @Module({
   imports: [
     ConfigModule.forRoot({
       isGlobal: true,
-      load: [coreConfig],
-      validate: validateCoreEnv,
+      load: [coreConfig, dbPrismaConfig],
+      validate: createEnvValidator([coreEnvSchema, dbPrismaEnvSchema]),
       envFilePath: '.env',
     }),
     CoreConfigModule,
     CoreErrorsModule,
-    PrismaModule,
+    DbPrismaModule,
   ],
   controllers: [HealthController],
 })
@@ -141,29 +142,70 @@ export class AppModule {}
     'health',
     'health.controller.ts',
   );
-  fs.writeFileSync(
-    healthControllerPath,
-    `import { Controller, Get, Query } from '@nestjs/common';
-import { EchoQueryDto } from '../common/dto/echo-query.dto';
-
-@Controller('health')
-export class HealthController {
-  @Get()
-  getHealth(@Query('lang') _lang?: string) {
-    return {
-      status: 'ok',
-      message: 'OK',
-    };
-  }
-
-  @Get('echo')
-  getEcho(@Query() query: EchoQueryDto) {
-    return { value: query.value };
-  }
-}
-`,
-    'utf8',
-  );
+  fs.writeFileSync(
+    healthControllerPath,
+    `import { ConflictException, Controller, Get, Post, Query } from '@nestjs/common';
+import { PrismaService } from '@forgeon/db-prisma';
+import { EchoQueryDto } from '../common/dto/echo-query.dto';
+
+@Controller('health')
+export class HealthController {
+  constructor(private readonly prisma: PrismaService) {}
+
+  @Get()
+  getHealth(@Query('lang') lang?: string) {
+    const locale = this.resolveLocale(lang);
+    return {
+      status: 'ok',
+      message: 'OK',
+      i18n: locale === 'uk' ? 'Ukrainian' : 'English',
+    };
+  }
+
+  @Get('error')
+  getErrorProbe() {
+    throw new ConflictException({
+      message: 'Email already exists',
+      details: {
+        feature: 'core-errors',
+        probe: 'health.error',
+      },
+    });
+  }
+
+  @Get('validation')
+  getValidationProbe(@Query() query: EchoQueryDto) {
+    return {
+      status: 'ok',
+      validated: true,
+      value: query.value,
+    };
+  }
+
+  @Post('db')
+  async getDbProbe() {
+    const token = \`\${Date.now()}-\${Math.floor(Math.random() * 1_000_000)}\`;
+    const email = \`health-probe-\${token}@example.local\`;
+    const user = await this.prisma.user.create({
+      data: { email },
+      select: { id: true, email: true, createdAt: true },
+    });
+
+    return {
+      status: 'ok',
+      feature: 'db-prisma',
+      user,
+    };
+  }
+
+  private resolveLocale(lang?: string): 'en' | 'uk' {
+    const normalized = (lang ?? '').toLowerCase();
+    return normalized.startsWith('uk') ? 'uk' : 'en';
+  }
+}
+`,
+    'utf8',
+  );
 
   removeIfExists(
     path.join(targetRoot, 'apps', 'api', 'src', 'common', 'filters', 'app-exception.filter.ts'),

package/templates/base/apps/api/Dockerfile

@@ -4,19 +4,22 @@ WORKDIR /app
 RUN corepack enable
 
 COPY package.json pnpm-workspace.yaml tsconfig.base.json tsconfig.base.node.json tsconfig.base.esm.json ./
-COPY apps/api/package.json apps/api/package.json
-COPY apps/api/prisma apps/api/prisma
-COPY packages/core/package.json packages/core/package.json
-COPY packages/i18n/package.json packages/i18n/package.json
+COPY apps/api/package.json apps/api/package.json
+COPY apps/api/prisma apps/api/prisma
+COPY packages/core/package.json packages/core/package.json
+COPY packages/db-prisma/package.json packages/db-prisma/package.json
+COPY packages/i18n/package.json packages/i18n/package.json
 
 RUN pnpm install --frozen-lockfile=false
 
 COPY apps/api apps/api
 COPY packages/core packages/core
+COPY packages/db-prisma packages/db-prisma
 COPY packages/i18n packages/i18n
 COPY resources resources
 
 RUN pnpm --filter @forgeon/core build
+RUN pnpm --filter @forgeon/db-prisma build
 RUN pnpm --filter @forgeon/i18n build
 RUN pnpm --filter @forgeon/api prisma:generate
 RUN pnpm --filter @forgeon/api build

package/templates/base/apps/api/package.json

@@ -2,8 +2,8 @@
   "name": "@forgeon/api",
   "version": "0.1.0",
   "private": true,
-  "scripts": {
-    "predev": "pnpm --filter @forgeon/i18n build",
+  "scripts": {
+    "predev": "pnpm --filter @forgeon/core build && pnpm --filter @forgeon/db-prisma build && pnpm --filter @forgeon/i18n build",
     "build": "tsc -p tsconfig.build.json",
     "dev": "ts-node --transpile-only src/main.ts",
     "start": "node dist/main.js",
@@ -14,6 +14,7 @@
     "prisma:seed": "ts-node --transpile-only prisma/seed.ts"
   },
   "dependencies": {
+    "@forgeon/db-prisma": "workspace:*",
     "@forgeon/core": "workspace:*",
     "@forgeon/i18n": "workspace:*",
     "@nestjs/common": "^11.0.1",

package/templates/base/apps/api/src/app.module.ts

@@ -1,5 +1,6 @@
 import { Module } from '@nestjs/common';
 import { ConfigModule } from '@nestjs/config';
+import { dbPrismaConfig, dbPrismaEnvSchema, DbPrismaModule } from '@forgeon/db-prisma';
 import {
   CoreConfigModule,
   CoreErrorsModule,
@@ -10,7 +11,6 @@ import {
 import { ForgeonI18nModule, i18nConfig, i18nEnvSchema } from '@forgeon/i18n';
 import { join } from 'path';
 import { HealthController } from './health/health.controller';
-import { PrismaModule } from './prisma/prisma.module';
 
 const i18nPath = join(__dirname, '..', '..', '..', 'resources', 'i18n');
 
@@ -18,16 +18,16 @@ const i18nPath = join(__dirname, '..', '..', '..', 'resources', 'i18n');
   imports: [
     ConfigModule.forRoot({
       isGlobal: true,
-      load: [coreConfig, i18nConfig],
-      validate: createEnvValidator([coreEnvSchema, i18nEnvSchema]),
+      load: [coreConfig, dbPrismaConfig, i18nConfig],
+      validate: createEnvValidator([coreEnvSchema, dbPrismaEnvSchema, i18nEnvSchema]),
       envFilePath: '.env',
     }),
     CoreConfigModule,
     CoreErrorsModule,
+    DbPrismaModule,
     ForgeonI18nModule.register({
       path: i18nPath,
     }),
-    PrismaModule,
   ],
   controllers: [HealthController],
 })

package/templates/base/apps/api/src/health/health.controller.ts

@@ -1,10 +1,14 @@
-import { Controller, Get, Optional, Query } from '@nestjs/common';
+import { ConflictException, Controller, Get, Optional, Post, Query } from '@nestjs/common';
+import { PrismaService } from '@forgeon/db-prisma';
 import { I18nService } from 'nestjs-i18n';
 import { EchoQueryDto } from '../common/dto/echo-query.dto';
 
 @Controller('health')
 export class HealthController {
-  constructor(@Optional() private readonly i18n?: I18nService) {}
+  constructor(
+    private readonly prisma: PrismaService,
+    @Optional() private readonly i18n?: I18nService,
+  ) {}
 
   @Get()
   getHealth(@Query('lang') lang?: string) {
@@ -16,16 +20,45 @@ export class HealthController {
     };
   }
 
-  @Get('echo')
-  getEcho(@Query() query: EchoQueryDto) {
-    return { value: query.value };
+  @Get('error')
+  getErrorProbe() {
+    throw new ConflictException({
+      message: 'Email already exists',
+      details: {
+        feature: 'core-errors',
+        probe: 'health.error',
+      },
+    });
   }
 
-  private translate(key: string, lang?: string): string {
+  @Get('validation')
+  getValidationProbe(@Query() query: EchoQueryDto) {
+    return {
+      status: 'ok',
+      validated: true,
+      value: query.value,
+    };
+  }
+
+  @Post('db')
+  async getDbProbe() {
+    const token = `${Date.now()}-${Math.floor(Math.random() * 1_000_000)}`;
+    const email = `health-probe-${token}@example.local`;
+    const user = await this.prisma.user.create({
+      data: { email },
+      select: { id: true, email: true, createdAt: true },
+    });
+
+    return {
+      status: 'ok',
+      feature: 'db-prisma',
+      user,
+    };
+  }
+
+  private translate(key: string, lang?: string): string {
     if (!this.i18n) {
       if (key === 'common.ok') return 'OK';
-      if (key === 'common.checkApiHealth') return 'Check API health';
-      if (key === 'common.language') return 'Language';
       if (key === 'common.languages.english') return 'English';
       if (key === 'common.languages.ukrainian') return 'Ukrainian';
       return key;

package/templates/base/apps/api/src/main.ts

@@ -1,6 +1,9 @@
 import 'reflect-metadata';
-import { ValidationPipe } from '@nestjs/common';
-import { CoreConfigService, CoreExceptionFilter } from '@forgeon/core';
+import {
+  CoreConfigService,
+  CoreExceptionFilter,
+  createValidationPipe,
+} from '@forgeon/core';
 import { NestFactory } from '@nestjs/core';
 import { AppModule } from './app.module';
 
@@ -10,12 +13,7 @@ async function bootstrap() {
   const coreConfigService = app.get(CoreConfigService);
 
   app.setGlobalPrefix(coreConfigService.apiPrefix);
-  app.useGlobalPipes(
-    new ValidationPipe({
-      whitelist: true,
-      transform: true,
-    }),
-  );
+  app.useGlobalPipes(createValidationPipe());
   app.useGlobalFilters(app.get(CoreExceptionFilter));
 
   await app.listen(coreConfigService.port);

package/templates/base/apps/web/src/App.tsx

@@ -1,37 +1,78 @@
-import { useState } from 'react';
-import './styles.css';
+import { useState } from 'react';
+import './styles.css';
+
+type ProbeResult = {
+  statusCode: number;
+  body: unknown;
+};
+
+export default function App() {
+  const [healthResult, setHealthResult] = useState<ProbeResult | null>(null);
+  const [errorProbeResult, setErrorProbeResult] = useState<ProbeResult | null>(null);
+  const [validationProbeResult, setValidationProbeResult] = useState<ProbeResult | null>(null);
+  const [dbProbeResult, setDbProbeResult] = useState<ProbeResult | null>(null);
+  const [networkError, setNetworkError] = useState<string | null>(null);
+
+  const requestProbe = async (url: string, init?: RequestInit): Promise<ProbeResult> => {
+    const response = await fetch(url, init);
+    let body: unknown = null;
+
+    try {
+      body = await response.json();
+    } catch {
+      body = { message: 'Non-JSON response' };
+    }
+
+    return {
+      statusCode: response.status,
+      body,
+    };
+  };
+
+  const runProbe = async (
+    setter: (value: ProbeResult | null) => void,
+    url: string,
+    init?: RequestInit,
+  ) => {
+    setNetworkError(null);
+    try {
+      const result = await requestProbe(url, init);
+      setter(result);
+    } catch (err) {
+      setNetworkError(err instanceof Error ? err.message : 'Unknown error');
+    }
+  };
+
+  const renderResult = (title: string, result: ProbeResult | null) => (
+    <section>
+      <h3>{title}</h3>
+      {result ? <pre>{JSON.stringify(result, null, 2)}</pre> : null}
+    </section>
+  );
+
+  return (
+    <main className="page">
+      <h1>Forgeon Fullstack Scaffold</h1>
+      <p>Default frontend preset: React + Vite + TypeScript.</p>
+      <div className="actions">
+        <button onClick={() => runProbe(setHealthResult, '/api/health')}>Check API health</button>
+        <button onClick={() => runProbe(setErrorProbeResult, '/api/health/error')}>
+          Check error envelope
+        </button>
+        <button onClick={() => runProbe(setValidationProbeResult, '/api/health/validation')}>
+          Check validation (expect 400)
+        </button>
+        <button onClick={() => runProbe(setDbProbeResult, '/api/health/db', { method: 'POST' })}>
+          Check database (create user)
+        </button>
+      </div>
+      {renderResult('Health response', healthResult)}
+      {renderResult('Error probe response', errorProbeResult)}
+      {renderResult('Validation probe response', validationProbeResult)}
+      {renderResult('DB probe response', dbProbeResult)}
+      {networkError ? <p className="error">{networkError}</p> : null}
+    </main>
+  );
+}
 
-type HealthResponse = {
-  status: string;
-  message: string;
-};
-
-export default function App() {
-  const [data, setData] = useState<HealthResponse | null>(null);
-  const [error, setError] = useState<string | null>(null);
-
-  const checkApi = async () => {
-    setError(null);
-    try {
-      const response = await fetch('/api/health');
-      if (!response.ok) {
-        throw new Error(`HTTP ${response.status}`);
-      }
-      const payload = (await response.json()) as HealthResponse;
-      setData(payload);
-    } catch (err) {
-      setError(err instanceof Error ? err.message : 'Unknown error');
-    }
-  };
-
-  return (
-    <main className="page">
-      <h1>Forgeon Fullstack Scaffold</h1>
-      <p>Default frontend preset: React + Vite + TypeScript.</p>
-      <button onClick={checkApi}>Check API health</button>
-      {data ? <pre>{JSON.stringify(data, null, 2)}</pre> : null}
-      {error ? <p className="error">{error}</p> : null}
-    </main>
-  );
-}
 

package/templates/base/apps/web/src/styles.css

@@ -8,23 +8,35 @@ body {
   color: #0f172a;
 }
 
-.page {
-  max-width: 720px;
-  margin: 3rem auto;
-  padding: 0 1rem;
-}
-
-button {
-  padding: 0.6rem 1rem;
-  border: 0;
-  border-radius: 0.5rem;
-  cursor: pointer;
-}
-
-pre {
-  background: #e2e8f0;
-  padding: 1rem;
-  border-radius: 0.5rem;
+.page {
+  max-width: 720px;
+  margin: 3rem auto;
+  padding: 0 1rem;
+}
+
+.actions {
+  display: grid;
+  grid-template-columns: repeat(auto-fit, minmax(220px, 1fr));
+  gap: 0.6rem;
+  margin: 1rem 0 1.25rem;
+}
+
+button {
+  padding: 0.6rem 1rem;
+  border: 0;
+  border-radius: 0.5rem;
+  cursor: pointer;
+}
+
+h3 {
+  margin: 1rem 0 0.5rem;
+  font-size: 1rem;
+}
+
+pre {
+  background: #e2e8f0;
+  padding: 1rem;
+  border-radius: 0.5rem;
   overflow: auto;
 }