@postxl/generator 0.59.0 → 0.60.1

package/dist/generators/indices/businesslogic-update-module.generator.js

@@ -11,7 +11,6 @@ function generateBusinessLogicUpdateModule({ models, meta }) {
         .map((model) => ({ model, meta: (0, meta_1.getModelMetadata)({ model }) }))
         .sort((a, b) => a.meta.businessLogic.update.serviceClassName.localeCompare(b.meta.businessLogic.update.serviceClassName));
     const imports = imports_1.ImportsGenerator.from(meta.businessLogic.update.moduleFilePath).addImports({
-        [meta.data.importPath]: meta.data.moduleName,
         [meta.businessLogic.update.serviceFilePath]: meta.businessLogic.update.serviceClassName,
         [meta.businessLogic.view.importPath]: meta.businessLogic.view.moduleName,
     });
@@ -25,45 +24,18 @@ function generateBusinessLogicUpdateModule({ models, meta }) {
     }
     const moduleName = meta.businessLogic.update.moduleName;
     return /* ts */ `
-import { DynamicModule } from '@backend/common'
+import { Module } from '@nestjs/common'
   
 ${imports.generate()}
 
+const providers = [${providers.join(', ')}]
 
-export class ${moduleName} {
-  /**
-   * Internal cache for the module instance.
-   */
-  private static cachedModule: DynamicModule | undefined = undefined
- 
-  /**
-   * The getInstance method should be called by any module that needs the module.
-   */
-  static getInstance(): DynamicModule {
-    if (!${moduleName}.cachedModule) {
-      throw new Error('${moduleName} must be called via .forRoot first!')
-    }
-    return ${moduleName}.cachedModule
-  }
-
-  /**
-   * The forRoot method should only be called once by the root module.
-   */
-  static forRoot(): DynamicModule {
-    if (${moduleName}.cachedModule) {
-      throw new Error('${moduleName} is already instantiated, please call .forRoot only once from root...')
-    }
-  
-    const providers = [${providers.join(', ')}]
-    ${moduleName}.cachedModule = {
-      module: ${moduleName},
-      providers,
-      imports: [${meta.data.moduleName}.getInstance(), ${meta.businessLogic.view.moduleName}.getInstance()],
-      exports: providers,
-    }
-    return ${moduleName}.cachedModule
-  }
-}
+@Module({
+  imports: [ViewModule],
+  providers,
+  exports: providers,
+})
+export class ${moduleName} {}
 `;
 }
 exports.generateBusinessLogicUpdateModule = generateBusinessLogicUpdateModule;

package/dist/generators/indices/businesslogic-view-module.generator.js

@@ -11,7 +11,6 @@ function generateBusinessLogicViewModule({ models, meta }) {
         .map((model) => ({ model, meta: (0, meta_1.getModelMetadata)({ model }) }))
         .sort((a, b) => a.meta.businessLogic.view.serviceClassName.localeCompare(b.meta.businessLogic.view.serviceClassName));
     const imports = imports_1.ImportsGenerator.from(meta.businessLogic.view.moduleFilePath).addImports({
-        [meta.data.importPath]: meta.data.moduleName,
         [meta.businessLogic.view.serviceFilePath]: meta.businessLogic.view.serviceClassName,
     });
     const providers = [meta.businessLogic.view.serviceClassName];
@@ -24,45 +23,17 @@ function generateBusinessLogicViewModule({ models, meta }) {
     }
     const moduleName = meta.businessLogic.view.moduleName;
     return /* ts */ `
-import { DynamicModule } from '@backend/common'
-  
-${imports.generate()}
+import { Module } from '@nestjs/common'
 
+${imports.generate()}
 
-export class ${moduleName} {
-  /**
-   * Internal cache for the module instance.
-   */
-  private static cachedModule: DynamicModule | undefined = undefined
- 
-  /**
-   * The getInstance method should be called by any module that needs the module.
-   */
-  static getInstance(): DynamicModule {
-    if (!${moduleName}.cachedModule) {
-      throw new Error('${moduleName} must be called via .forRoot first!')
-    }
-    return ${moduleName}.cachedModule
-  }
+const providers = [${providers.join(', ')}]
 
-  /**
-   * The forRoot method should only be called once by the root module.
-   */
-  static forRoot(): DynamicModule {
-    if (${moduleName}.cachedModule) {
-      throw new Error('${moduleName} is already instantiated, please call .forRoot only once from root...')
-    }
-  
-    const providers = [${providers.join(', ')}]
-    ${moduleName}.cachedModule = {
-      module: ${moduleName},
-      providers,
-      imports: [${meta.data.moduleName}.getInstance()],
-      exports: providers,
-    }
-    return ${moduleName}.cachedModule
-  }
-}
+@Module({
+  providers,
+  exports: providers,
+})
+export class ${moduleName} {}
 `;
 }
 exports.generateBusinessLogicViewModule = generateBusinessLogicViewModule;

package/dist/generators/indices/datamock-module.generator.js

@@ -56,8 +56,8 @@ function generateDataMockModule({ models, meta }) {
         }`)
         .join(', ');
     return /* ts */ `
-import { DynamicModule } from '@backend/common'
-import { DbModule } from '@backend/db'
+import { DynamicModule } from '@nestjs/common'
+import { DatabaseModule } from '@backend/db'
 
 ${imports.generate()}
 
@@ -70,17 +70,13 @@ export class ${meta.data.dataMockModuleName} {
       ${providers} 
     ]
 
-    const cachedModule = {
+    return {
       module: ${meta.data.moduleName},
-      imports: [DbModule.provideMock()],
+      imports: [DatabaseModule.provideMock()],
       providers,
       exports: providers,
       global: true,
-    }
-    
-    ${meta.data.moduleName}._storeMockModule(cachedModule)
-    
-    return cachedModule
+    }    
   }
 }
 

package/dist/generators/indices/datamodule.generator.js

@@ -10,7 +10,6 @@ function generateDataModule({ models, meta }) {
     const mm = models.map((model) => ({ model, meta: (0, meta_1.getModelMetadata)({ model }) }));
     const imports = imports_1.ImportsGenerator.from(meta.data.dataModuleFilePath).addImports({
         [meta.data.dataService.filePath]: [meta.data.dataService.class],
-        [meta.data.dataMockModuleFilePath]: [meta.data.dataMockModuleName],
     });
     for (const { meta } of mm) {
         imports.addImport({
@@ -20,57 +19,17 @@ function generateDataModule({ models, meta }) {
     }
     const moduleName = meta.data.moduleName;
     return /* ts */ `
-import { FactoryProvider } from '@nestjs/common'
-  
-import { DynamicModule } from '@backend/common'
-import { DbModule, DbService } from '@backend/db'
-import { E2EConfig } from '@backend/e2e'
+import { DynamicModule, FactoryProvider } from '@nestjs/common'  
+import { DatabaseModule, DatabaseService } from '@backend/db'
 
 ${imports.generate()}
 
 export class ${moduleName} {
-  /**
-   * Internal cache for the module instance.
-   */
-  private static cachedModule: DynamicModule | undefined = undefined
-
-  /**
-   * The getInstance method should be called by any module that needs the module.
-   */
-  static getInstance(): DynamicModule {
-    if (!${moduleName}.cachedModule) {
-      throw new Error('${moduleName} must be called via .forRoot first!')
-    }
-    return ${moduleName}.cachedModule
-  }
-  
-  /**
-   * Stores another module instance in the cache.
-   * Note: This should only be used for testing purposes.
-   */
-  static _storeMockModule(module: DynamicModule): void {
-    ${moduleName}.cachedModule = module
-  }
-
-  /**
-   * The forRoot method should only be called once by the root module.
-   */
-  static forRoot(options: E2EConfig): DynamicModule {
-    if (${moduleName}.cachedModule) {
-      throw new Error('${moduleName} is already instantiated, please call .forRoot only once from root...')
-    }
-
-    if (options.isE2ETest && !options.useDatabaseForE2E) {
-      return ${meta.data.dataMockModuleName}.mock()
-    }
-
-    // We need to initialize the user repository right at the beginning,
-    // so that we have the rootUser available for the other modules - including
-    // the action and seed modules which will ensure that seed data is created.
+  public static forRoot(): DynamicModule {
     const userRepositoryProvider: FactoryProvider<UserRepository> = {
       provide: UserRepository,
-      inject: [DbService],
-      useFactory: async (dbService: DbService) => {
+      inject: [DatabaseService],
+      useFactory: async (dbService: DatabaseService) => {
         const repository = new UserRepository(dbService)
         await repository.init()
         return repository
@@ -88,15 +47,13 @@ export class ${moduleName} {
         .join(',')}
     ]
 
-    ${moduleName}.cachedModule = {
+    return {
       module: ${moduleName},
       global: true,
-      imports: [DbModule.forRoot()],
+      imports: [DatabaseModule],
       providers,
       exports: providers,
     }
-
-    return ${moduleName}.cachedModule
   }
 }`;
 }

package/dist/generators/indices/dispatcher-service.generator.js

@@ -23,7 +23,7 @@ function generateActionsDispatcherService({ models, meta }) {
   import { Injectable } from '@nestjs/common'
 
 import { ExhaustiveSwitchCheck } from '@backend/common'
-import { DbService } from '@backend/db'
+import { DatabaseService } from '@backend/db'
 
 ${imports.generate()}
 
@@ -43,7 +43,7 @@ export class ${meta.actions.dispatcher.class} {
 
   constructor(
     private readonly updateService: ${meta.businessLogic.update.serviceClassName}, 
-    private readonly dbService: DbService,
+    private readonly databaseService: DatabaseService,
     private readonly actionExecutionFactory: ActionExecutionFactory,
   ) {}
 
@@ -51,7 +51,7 @@ export class ${meta.actions.dispatcher.class} {
     action: A; 
     user: ${meta.config.userType} 
   }): Promise<ResultOfAction<A>> {
-    const execution = await this.actionExecutionFactory.create({ action, dbService: this.dbService, user })
+    const execution = await this.actionExecutionFactory.create({ action, databaseService: this.databaseService, user })
 
     try {
       const result = await this.execute({ action, execution })

package/dist/generators/indices/testdata-service.generator.js

@@ -32,7 +32,7 @@ function generateTestDataService({ models, meta: schemaMeta, }) {
     return /* ts */ `
 import { Injectable, Logger } from '@nestjs/common'
 
-import { DbService } from '@backend/db'
+import { DatabaseService } from '@backend/db'
 ${imports.generate()}
 
 @Injectable()
@@ -40,14 +40,14 @@ export class TestDataService {
   private logger = new Logger(TestDataService.name)
 
   constructor(
-    private db: DbService,
-    private dataService: ${schemaMeta.data.dataService.class},
-    private actionExecutionFactory: ActionExecutionFactory,
+    private readonly databaseService: DatabaseService,
+    private readonly dataService: ${schemaMeta.data.dataService.class},
+    private readonly actionExecutionFactory: ActionExecutionFactory,
   ) {}
 
   public async resetTestData(data: MockData) {
     this.logger.log('💥 Emptying test data')
-    await this.db.WIPE_ENTIRE_DATABASE()
+    await this.databaseService.WIPE_ENTIRE_DATABASE()
 
     // We need to init the user repository first so the root user is created
     this.logger.log('✍ Setting test data')
@@ -65,7 +65,7 @@ export class TestDataService {
         order: 0, 
         payload: []
       },
-      dbService: this.db,
+      databaseService: this.databaseService,
       user: this.dataService.users.rootUser,
     })
 

package/dist/generators/models/repository.generator.js

@@ -466,7 +466,7 @@ function generateMainBuildingBlocks_InDatabase({ model, meta, schemaMeta, import
     imports.addImports({
         [meta.types.importPath]: [meta.types.zodDecoderFnNames.fromDatabase],
         [schemaMeta.backendModules.db.importPath]: [
-            schemaMeta.backendModules.db.dbService.name,
+            schemaMeta.backendModules.db.databaseService.name,
             (0, types_1.toAnnotatedTypeName)((0, types_1.toTypeName)(`${model.sourceName} as DbType`)),
         ],
         [schemaMeta.backendModules.common.importPath]: [
@@ -481,7 +481,7 @@ function generateMainBuildingBlocks_InDatabase({ model, meta, schemaMeta, import
     const methodTypeSignatures = getRepositoryMethodsTypeSignatures({ model, meta });
     const userRepositorySpecificBlocks = generateUserRepositorySpecificBlocks_InDatabase({ model, meta, imports });
     return {
-        constructorCode: `constructor(protected db: DbService) {}`,
+        constructorCode: `constructor(protected db: ${schemaMeta.backendModules.db.databaseService.name}) {}`,
         userRepositorySpecificBlocks,
         initCode: `
       public async init() {

package/dist/lib/meta.d.ts

@@ -46,7 +46,7 @@ export type SchemaMetaData = {
              * Path that may be used to import the db backend module.
              */
             importPath: Types.BackendModulePath;
-            dbService: {
+            databaseService: {
                 /**
                  * The name of the DB service class.
                  */

package/dist/lib/meta.js

@@ -58,8 +58,8 @@ function getSchemaMetadata({ config }) {
             },
             db: {
                 importPath: Types.toBackendModulePath(`@backend/db`),
-                dbService: {
-                    name: Types.toClassName(`DbService`),
+                databaseService: {
+                    name: Types.toClassName(`DatabaseService`),
                 },
             },
             http: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@postxl/generator",
-  "version": "0.59.0",
+  "version": "0.60.1",
   "main": "./dist/generator.js",
   "typings": "./dist/generator.d.ts",
   "bin": {