create-forgeon 0.3.2 → 0.3.3

package/package.json

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

package/src/modules/executor.test.mjs

@@ -1261,6 +1261,48 @@ describe('addModule', () => {
     }
   });
 
+  it('scans auth persistence as db-adapter participant while remaining triggerable from db-prisma install order', () => {
+    const targetRoot = mkTmp('forgeon-module-jwt-db-scan-');
+    const projectRoot = path.join(targetRoot, 'demo-jwt-db-scan');
+    const templateRoot = path.join(packageRoot, 'templates', 'base');
+
+    try {
+      scaffoldProject({
+        templateRoot,
+        packageRoot,
+        targetRoot: projectRoot,
+        projectName: 'demo-jwt-db-scan',
+        frontend: 'react',
+        db: 'prisma',
+        dbPrismaEnabled: false,
+        i18nEnabled: false,
+        proxy: 'caddy',
+      });
+
+      addModule({
+        moduleId: 'jwt-auth',
+        targetRoot: projectRoot,
+        packageRoot,
+      });
+      addModule({
+        moduleId: 'db-prisma',
+        targetRoot: projectRoot,
+        packageRoot,
+      });
+
+      const scan = scanIntegrations({
+        targetRoot: projectRoot,
+        relatedModuleId: 'db-prisma',
+      });
+      const persistenceGroup = scan.groups.find((group) => group.id === 'auth-persistence');
+
+      assert.ok(persistenceGroup);
+      assert.deepEqual(persistenceGroup.modules, ['jwt-auth', 'db-adapter']);
+    } finally {
+      fs.rmSync(targetRoot, { recursive: true, force: true });
+    }
+  });
+
   it('applies logger then jwt-auth on db/i18n-disabled scaffold without breaking health controller syntax', () => {
     const targetRoot = mkTmp('forgeon-module-jwt-nodb-noi18n-');
     const projectRoot = path.join(targetRoot, 'demo-jwt-nodb-noi18n');

package/src/modules/sync-integrations.mjs

@@ -95,7 +95,8 @@ const INTEGRATION_GROUPS = [
   {
     id: 'auth-persistence',
     title: 'Auth Persistence Integration',
-    modules: ['jwt-auth', 'db-prisma'],
+    participants: ['jwt-auth', 'db-adapter'],
+    relatedModules: ['jwt-auth', 'db-prisma'],
     description: [
       'Patch AppModule to wire AUTH_REFRESH_TOKEN_STORE to the current db-adapter implementation (today: PrismaAuthRefreshTokenStore)',
       'Add apps/api/src/auth/prisma-auth-refresh-token.store.ts',
@@ -109,7 +110,8 @@ const INTEGRATION_GROUPS = [
   {
     id: 'auth-rbac-claims',
     title: 'Auth Claims Integration',
-    modules: ['jwt-auth', 'rbac'],
+    participants: ['jwt-auth', 'rbac'],
+    relatedModules: ['jwt-auth', 'rbac'],
     description: [
       'Extend AuthUser with optional permissions in @forgeon/auth-contracts',
       'Add demo RBAC claims to jwt-auth login and token payloads',
@@ -139,6 +141,20 @@ function detectModules(rootDir) {
   };
 }
 
+function getGroupParticipants(group) {
+  return Array.isArray(group.participants) && group.participants.length > 0
+    ? group.participants
+    : Array.isArray(group.modules)
+      ? group.modules
+      : [];
+}
+
+function getGroupRelatedModules(group) {
+  return Array.isArray(group.relatedModules) && group.relatedModules.length > 0
+    ? group.relatedModules
+    : getGroupParticipants(group);
+}
+
 function syncJwtDbPrisma({ rootDir, packageRoot, changedFiles }) {
   const appModulePath = path.join(rootDir, 'apps', 'api', 'src', 'app.module.ts');
   const schemaPath = path.join(rootDir, 'apps', 'api', 'prisma', 'schema.prisma');
@@ -385,7 +401,7 @@ export function syncIntegrations({ targetRoot, packageRoot, groupIds = null }) {
     availableGroups: available.map((group) => ({
       id: group.id,
       title: group.title,
-      modules: [...group.modules],
+      modules: [...getGroupParticipants(group)],
       description: [...group.description],
     })),
     changedFiles: [...changedFiles].sort().map((filePath) => path.relative(rootDir, filePath)),
@@ -399,13 +415,13 @@ export function scanIntegrations({ targetRoot, relatedModuleId = null }) {
     (group) =>
       group.isAvailable(detected) &&
       group.isPending(rootDir) &&
-      (!relatedModuleId || group.modules.includes(relatedModuleId)),
+      (!relatedModuleId || getGroupRelatedModules(group).includes(relatedModuleId)),
   );
   return {
     groups: available.map((group) => ({
       id: group.id,
       title: group.title,
-      modules: [...group.modules],
+      modules: [...getGroupParticipants(group)],
       description: [...group.description],
     })),
   };

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

@@ -299,7 +299,7 @@ function run() {
   } else {
     summary.push({
       feature: 'jwt-auth + db-adapter (current provider: db-prisma)',
-      result: { applied: false, reason: 'required modules are not both installed' },
+      result: { applied: false, reason: 'required components are not both available' },
     });
   }
 
@@ -311,7 +311,7 @@ function run() {
   } else {
     summary.push({
       feature: 'jwt-auth + rbac',
-      result: { applied: false, reason: 'required modules are not both installed' },
+      result: { applied: false, reason: 'required components are not both available' },
     });
   }