feat(cli): add test for multiple repositories

Author: marioestradarosa

docs/site/Repository-generator.md

@@ -10,8 +10,9 @@ permalink: /doc/en/lb4/Repository-generator.html
 
 ### Synopsis
 
-Adds a new [Repository or Multiple Repositories](Repositories.md) class to a
-LoopBack application with one single command.
+Adds a new
+[Repository class (or multiple backed by the same datasource)](Repositories.md)
+to a LoopBack application with one single command.
 
 ```sh
 lb4 repository [options] [<name>]

docs/site/tables/lb4-artifact-commands.html

@@ -31,7 +31,7 @@
 
     <tr>
       <td><code>lb4 repository</code></td>
-      <td>Add a new repository or multiple repositories to a LoopBack 4 application</td>
+      <td>Add new repositories for selected model(s) to a LoopBack 4 application</td>
       <td><a href="Repository-generator.html">Repository generator</a></td>
     </tr>
 

packages/cli/generators/repository/index.js

@@ -43,7 +43,7 @@ module.exports = class RepositoryGenerator extends ArtifactGenerator {
    * get the property name for the id field
    * @param {string} modelName
    */
-  async _getModelIdType(modelName) {
+  async _getModelIdProperty(modelName) {
     let fileContent = '';
     let modelFile = path.join(
       this.artifactInfo.modelDir,
@@ -157,6 +157,9 @@ module.exports = class RepositoryGenerator extends ArtifactGenerator {
       utils.modelsDir,
     );
 
+    // to be able to write multiple files to the index.ts
+    this.artifactInfo.indexesToBeUpdated = [];
+
     this.artifactInfo.defaultTemplate = REPOSITORY_CRUD_TEMPLATE;
 
     this.option('model', {
@@ -354,7 +357,7 @@ module.exports = class RepositoryGenerator extends ArtifactGenerator {
 
   async promptModelId() {
     if (this.shouldExit()) return false;
-    let idType;
+    let idProperty;
 
     debug(`Model ID property name from command line: ${this.options.id}`);
     debug(`Selected Models: ${this.artifactInfo.modelNameList}`);
@@ -379,19 +382,19 @@ module.exports = class RepositoryGenerator extends ArtifactGenerator {
         if (this.options.id) {
           debug(`passing thru this.options.id with value : ${this.options.id}`);
 
-          idType = this.options.id;
+          idProperty = this.options.id;
           /**  make sure it is only used once, in case user selected more
            * than one model.
            */
           delete this.options.id;
         } else {
-          idType = await this._getModelIdType(item);
-          if (idType === null) {
+          idProperty = await this._getModelIdProperty(item);
+          if (idProperty === null) {
             const answer = await this.prompt(prompts);
-            idType = answer.propertyName;
+            idProperty = answer.propertyName;
           }
         }
-        this.artifactInfo.idType = idType;
+        this.artifactInfo.idProperty = idProperty;
         // Generate this repository
         await this._scaffold();
       }
@@ -413,13 +416,15 @@ module.exports = class RepositoryGenerator extends ArtifactGenerator {
       this.artifactInfo.className = utils.toClassName(
         this.artifactInfo.modelName,
       );
+
       this.artifactInfo.outFile = utils.getRepositoryFileName(
         this.artifactInfo.modelName,
       );
-    }
 
-    if (debug.enabled) {
-      debug(`Artifact output filename set to: ${this.artifactInfo.outFile}`);
+      this.artifactInfo.indexesToBeUpdated.push({
+        dir: this.artifactInfo.outDir,
+        file: this.artifactInfo.outFile,
+      });
     }
 
     const source = this.templatePath(
@@ -430,9 +435,6 @@ module.exports = class RepositoryGenerator extends ArtifactGenerator {
       ),
     );
 
-    if (debug.enabled) {
-      debug(`Using template at: ${source}`);
-    }
     const dest = this.destinationPath(
       path.join(this.artifactInfo.outDir, this.artifactInfo.outFile),
     );

packages/cli/generators/repository/templates/src/repositories/repository-crud-default-template.ts.ejs

@@ -5,7 +5,7 @@ import {inject} from '@loopback/core';
 
 export class <%= className %>Repository extends <%= repositoryTypeClass %><
   <%= modelName %>,
-  typeof <%= modelName %>.prototype.<%= idType %>
+  typeof <%= modelName %>.prototype.<%= idProperty %>
 > {
   constructor(
     @inject('datasources.<%= dataSourceName %>') protected datasource: <%= dataSourceClassName %>,

packages/cli/generators/repository/templates/src/repositories/repository-kv-template.ts.ejs

@@ -9,6 +9,6 @@ export class <%= className %>Repository extends <%= repositoryTypeClass %><
   constructor(
     @inject('datasources.<%= dataSourceName %>') datasource: <%= dataSourceClassName %>,
   ) {
-    super(<%= modelName %>,datasource);
+    super(<%= modelName %>, datasource);
   }
 }

packages/cli/lib/artifact-generator.js

@@ -129,17 +129,19 @@ module.exports = class ArtifactGenerator extends BaseGenerator {
     // Index Update Disabled
     if (this.artifactInfo.disableIndexUpdate) return;
 
+    if (!this.artifactInfo.indexesToBeUpdated) {
+      this.artifactInfo.indexesToBeUpdated = [];
+    }
+
     // No Array given for Index Update, Create default array
     if (
-      !this.artifactInfo.indexesToBeUpdated &&
       this.artifactInfo.outDir &&
-      this.artifactInfo.outFile
+      this.artifactInfo.outFile &&
+      this.artifactInfo.indexesToBeUpdated.length === 0
     ) {
       this.artifactInfo.indexesToBeUpdated = [
         {dir: this.artifactInfo.outDir, file: this.artifactInfo.outFile},
       ];
-    } else {
-      this.artifactInfo.indexesToBeUpdated = [];
     }
 
     for (const idx of this.artifactInfo.indexesToBeUpdated) {

packages/cli/test/integration/generators/repository.integration.js

@@ -28,6 +28,63 @@ describe('lb4 repository', () => {
 
   // special cases regardless of the repository type
   describe('generate repositories on special conditions', () => {
+    it('generates multipe crud repositories', async () => {
+      const multiItemPrompt = {
+        dataSourceClass: 'DbmemDatasource',
+        modelNameList: ['MultiWord', 'Defaultmodel'],
+      };
+
+      await testUtils
+        .executeGenerator(generator)
+        .inDir(
+          SANDBOX_PATH,
+          async () => await prepareGeneratorForRepository(SANDBOX_PATH),
+        )
+        .withPrompts(multiItemPrompt);
+
+      const expectedMultiWordFile = path.join(
+        SANDBOX_PATH,
+        REPOSITORY_APP_PATH,
+        'multi-word.repository.ts',
+      );
+      const expectedDefaultModelFile = path.join(
+        SANDBOX_PATH,
+        REPOSITORY_APP_PATH,
+        'defaultmodel.repository.ts',
+      );
+
+      assert.file(expectedMultiWordFile);
+      assert.file(expectedDefaultModelFile);
+
+      assert.fileContent(
+        expectedMultiWordFile,
+        /export class MultiWordRepository extends DefaultCrudRepository</,
+      );
+      assert.fileContent(
+        expectedMultiWordFile,
+        /typeof MultiWord.prototype.pk/,
+      );
+
+      assert.fileContent(
+        expectedDefaultModelFile,
+        /export class DefaultmodelRepository extends DefaultCrudRepository\</,
+      );
+      assert.fileContent(
+        expectedDefaultModelFile,
+        /typeof Defaultmodel.prototype.id/,
+      );
+
+      assert.file(INDEX_FILE);
+      assert.fileContent(
+        INDEX_FILE,
+        /export \* from '.\/multi-word.repository';/,
+      );
+      assert.fileContent(
+        INDEX_FILE,
+        /export \* from '.\/defaultmodel.repository';/,
+      );
+    });
+
     it('generates a multi-word crud repository', async () => {
       const multiItemPrompt = {
         dataSourceClass: 'DbmemDatasource',