create-forgeon 0.3.17 → 0.3.19

package/package.json

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

package/src/modules/accounts.mjs

@@ -172,38 +172,51 @@ function patchAppModule(targetRoot) {
   let content = fs.readFileSync(filePath, 'utf8').replace(/\r\n/g, '\n');
   content = content.replace(
     "import { authConfig, authEnvSchema, ForgeonAccountsModule } from '@forgeon/accounts-api';",
+    "import { ACCOUNTS_PERSISTENCE_PORT, authConfig, authEnvSchema, ForgeonAccountsModule, UsersModule } from '@forgeon/accounts-api';",
+  );
+  content = content.replace(
     "import { authConfig, authEnvSchema, ForgeonAccountsModule, UsersModule } from '@forgeon/accounts-api';",
+    "import { ACCOUNTS_PERSISTENCE_PORT, authConfig, authEnvSchema, ForgeonAccountsModule, UsersModule } from '@forgeon/accounts-api';",
   );
   content = ensureImportLine(
     content,
-    "import { authConfig, authEnvSchema, ForgeonAccountsModule, UsersModule } from '@forgeon/accounts-api';",
+    "import { ACCOUNTS_PERSISTENCE_PORT, authConfig, authEnvSchema, ForgeonAccountsModule, UsersModule } from '@forgeon/accounts-api';",
   );
   content = ensureImportLine(
     content,
-    "import { ForgeonAccountsDbPrismaModule } from './accounts/forgeon-accounts-db-prisma.module';",
+    "import { PrismaAccountsPersistenceStore } from './accounts/prisma-accounts-persistence.store';",
+  );
+  content = content.replace(
+    /^import \{ ForgeonAccountsDbPrismaModule \} from '\.\/accounts\/forgeon-accounts-db-prisma\.module';\r?\n/m,
+    '',
   );
   content = ensureLoadItem(content, 'authConfig');
   content = ensureValidatorSchema(content, 'authEnvSchema');
-
-  if (!content.includes('    ForgeonAccountsDbPrismaModule,')) {
-    if (content.includes('    DbPrismaModule,')) {
-      content = ensureLineAfter(content, '    DbPrismaModule,', '    ForgeonAccountsDbPrismaModule,');
-    } else {
-      content = ensureLineAfter(content, '    CoreErrorsModule,', '    ForgeonAccountsDbPrismaModule,');
-    }
-  }
+  content = content.replace(/^\s*ForgeonAccountsDbPrismaModule,\r?\n/gm, '');
 
   const accountsModuleLine = `    ForgeonAccountsModule.register({
+      imports: [DbPrismaModule],
+      providers: [
+        PrismaAccountsPersistenceStore,
+        {
+          provide: ACCOUNTS_PERSISTENCE_PORT,
+          useExisting: PrismaAccountsPersistenceStore,
+        },
+      ],
       users: UsersModule.register({}),
     }),`;
-  if (!content.includes('ForgeonAccountsModule.register({')) {
-    if (content.includes('    ForgeonI18nModule.register({')) {
-      content = ensureLineBefore(content, '    ForgeonI18nModule.register({', accountsModuleLine);
-    } else if (content.includes('    ForgeonAccountsDbPrismaModule,')) {
-      content = ensureLineAfter(content, '    ForgeonAccountsDbPrismaModule,', accountsModuleLine);
-    } else {
-      content = ensureLineAfter(content, '    CoreErrorsModule,', accountsModuleLine);
-    }
+
+  if (content.includes('    ForgeonAccountsModule.register({')) {
+    content = content.replace(
+      / {4}ForgeonAccountsModule\.register\(\{[\s\S]*? {4}\}\),/m,
+      accountsModuleLine,
+    );
+  } else if (content.includes('    ForgeonI18nModule.register({')) {
+    content = ensureLineBefore(content, '    ForgeonI18nModule.register({', accountsModuleLine);
+  } else if (content.includes('    DbPrismaModule,')) {
+    content = ensureLineAfter(content, '    DbPrismaModule,', accountsModuleLine);
+  } else {
+    content = ensureLineAfter(content, '    CoreErrorsModule,', accountsModuleLine);
   }
 
   fs.writeFileSync(filePath, `${content.trimEnd()}\n`, 'utf8');
@@ -414,3 +427,5 @@ export function applyAccountsModule({ packageRoot, targetRoot }) {
 }
 
 
+
+

package/src/modules/db-prisma.mjs

@@ -1,4 +1,4 @@
-import fs from 'node:fs';
+import fs from 'node:fs';
 import path from 'node:path';
 import { copyRecursive, writeJson } from '../utils/fs.mjs';
 import {
@@ -156,17 +156,12 @@ function patchHealthController(targetRoot, probeTargets) {
     const dbMethod = `
   @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 },
-    });
+    const queryResult = await this.prisma.$queryRaw\`SELECT 1 AS ok\`;
 
     return {
       status: 'ok',
       feature: 'db-prisma',
-      user,
+      queryResult,
     };
   }
 `;
@@ -183,7 +178,7 @@ function registerWebProbe(targetRoot, probeTargets) {
     definition: {
       id: 'db',
       title: 'Database',
-      buttonLabel: 'Check database (create user)',
+      buttonLabel: 'Check database query',
       resultTitle: 'DB probe response',
       path: '/health/db',
       request: { method: 'POST' },
@@ -336,3 +331,4 @@ export function applyDbPrismaModule({ packageRoot, targetRoot }) {
     'DATABASE_URL=postgresql://postgres:postgres@db:5432/app?schema=public',
   ]);
 }
+

package/src/modules/executor.test.mjs

@@ -716,8 +716,11 @@ function assertAccountsWiring(projectRoot) {
   const appModule = fs.readFileSync(path.join(projectRoot, 'apps', 'api', 'src', 'app.module.ts'), 'utf8');
   assert.match(appModule, /authConfig/);
   assert.match(appModule, /authEnvSchema/);
-  assert.match(appModule, /ForgeonAccountsDbPrismaModule/);
   assert.match(appModule, /ForgeonAccountsModule\.register\(\{/);
+  assert.match(appModule, /imports: \[DbPrismaModule\]/);
+  assert.match(appModule, /PrismaAccountsPersistenceStore/);
+  assert.match(appModule, /provide: ACCOUNTS_PERSISTENCE_PORT/);
+  assert.match(appModule, /useExisting: PrismaAccountsPersistenceStore/);
   assert.match(appModule, /UsersModule\.register\(\{\}\)/);
   assert.doesNotMatch(appModule, /AUTH_REFRESH_TOKEN_STORE/);
 
@@ -727,6 +730,8 @@ function assertAccountsWiring(projectRoot) {
   );
   assert.match(healthController, /@Get\('auth'\)/);
   assert.match(healthController, /authService\.getProbeStatus/);
+  assert.match(healthController, /\$queryRaw/);
+  assert.doesNotMatch(healthController, /data:\s*\{\s*email\s*\}/);
   assert.doesNotMatch(healthController, /,\s*,/);
 
   assertWebProbeShell(projectRoot);
@@ -2211,6 +2216,10 @@ describe('addModule', () => {
       );
       assert.equal(fs.existsSync(migrationPath), true);
 
+      const seedSource = fs.readFileSync(path.join(projectRoot, 'apps', 'api', 'prisma', 'seed.ts'), 'utf8');
+      assert.match(seedSource, /Prisma\.dmmf/);
+      assert.match(seedSource, /userFields\.has\('email'\)/);
+
       const readme = fs.readFileSync(path.join(projectRoot, 'README.md'), 'utf8');
       assert.match(readme, /POST \/api\/auth\/register/);
       assert.match(readme, /POST \/api\/auth\/password-reset\/request/);
@@ -2634,3 +2643,10 @@ describe('addModule', () => {
 
 
 
+
+
+
+
+
+
+

package/templates/module-presets/db-prisma/apps/api/prisma/seed.ts

@@ -1,20 +1,41 @@
-import { PrismaClient } from '@prisma/client';
-
-const prisma = new PrismaClient();
-
-async function main() {
-  await prisma.user.upsert({
-    where: { email: 'seed@example.com' },
-    update: {},
-    create: { email: 'seed@example.com' },
-  });
-}
-
-main()
-  .catch((error) => {
-    console.error(error);
-    process.exit(1);
-  })
-  .finally(async () => {
-    await prisma.$disconnect();
+import { Prisma, PrismaClient } from '@prisma/client';
+
+const prisma = new PrismaClient();
+
+function getUserFieldSet() {
+  const userModel = Prisma.dmmf.datamodel.models.find((model) => model.name === 'User');
+  return new Set((userModel?.fields ?? []).map((field) => field.name));
+}
+
+async function main() {
+  const userFields = getUserFieldSet();
+  const userDelegate = prisma.user as unknown as {
+    findFirst(args?: Record<string, unknown>): Promise<{ id: string } | null>;
+    upsert(args: Record<string, unknown>): Promise<unknown>;
+    create(args: Record<string, unknown>): Promise<unknown>;
+  };
+
+  if (userFields.has('email')) {
+    await userDelegate.upsert({
+      where: { email: 'seed@example.com' },
+      update: {},
+      create: { email: 'seed@example.com' },
+    });
+    return;
+  }
+
+  const existingUser = await userDelegate.findFirst({ select: { id: true } });
+  if (!existingUser) {
+    const data = userFields.has('status') ? { status: 'active' } : {};
+    await userDelegate.create({ data });
+  }
+}
+
+main()
+  .catch((error) => {
+    console.error(error);
+    process.exit(1);
+  })
+  .finally(async () => {
+    await prisma.$disconnect();
   });

package/templates/module-presets/accounts/apps/api/src/accounts/forgeon-accounts-db-prisma.module.ts

@@ -1,17 +0,0 @@
-import { Module } from '@nestjs/common';
-import { ACCOUNTS_PERSISTENCE_PORT } from '@forgeon/accounts-api';
-import { DbPrismaModule } from '@forgeon/db-prisma';
-import { PrismaAccountsPersistenceStore } from './prisma-accounts-persistence.store';
-
-@Module({
-  imports: [DbPrismaModule],
-  providers: [
-    PrismaAccountsPersistenceStore,
-    {
-      provide: ACCOUNTS_PERSISTENCE_PORT,
-      useExisting: PrismaAccountsPersistenceStore,
-    },
-  ],
-  exports: [ACCOUNTS_PERSISTENCE_PORT],
-})
-export class ForgeonAccountsDbPrismaModule {}