create-forgeon 0.3.18 → 0.3.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-forgeon",
-  "version": "0.3.18",
+  "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/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/);
 
@@ -2643,3 +2646,7 @@ describe('addModule', () => {
 
 
 
+
+
+
+

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 {}