jhipster · DanielFran · Nov 12, 2023 · Nov 12, 2023 · Nov 12, 2023
diff --git a/.blueprint/generate-sample/generator.mjs b/.blueprint/generate-sample/generator.mjs
@@ -1,4 +1,5 @@
 import { extname } from 'path';
+import { transform } from '@yeoman/transform';
 import BaseGenerator from '../../generators/base/index.mjs';
 import command from './command.mjs';
 import { generateSample } from './support/generate-sample.js';
@@ -48,7 +49,10 @@ export default class extends BaseGenerator {
         });
 
         // Cleanup mem-fs files. Reload them from disk.
-        await this.pipeline({ refresh: true, filter: () => true, pendingFiles: false });
+        await this.pipeline(
+          { refresh: true, pendingFiles: false },
+          transform(() => {}),
+        );
 
         let generatorOptions = {};
         if (sample.sample.workspaces && sample.sample.workspaces !== 'false') {

diff --git a/generators/base-application/support/index.mts b/generators/base-application/support/index.mts
@@ -29,3 +29,4 @@ export { default as prepareField } from './prepare-field.mjs';
 export * from './prepare-field.mjs';
 export { default as prepareRelationship } from './prepare-relationship.mjs';
 export * from './relationship.mjs';
+export * from './update-application-entities-transform.mjs';
diff --git a/generators/base-application/support/update-application-entities-transform.mts b/generators/base-application/support/update-application-entities-transform.mts
@@ -0,0 +1,61 @@
+import { readdir } from 'fs/promises';
+import { loadFile } from 'mem-fs';
+import type { MemFsEditorFile } from 'mem-fs-editor';
+import { Minimatch } from 'minimatch';
+import { transform } from 'p-transform';
+import { basename, join } from 'path';
+import { GENERATOR_JHIPSTER } from '../../generator-constants.mjs';
+
+export const updateApplicationEntitiesTransform = ({
+  destinationPath,
+  throwOnMissingConfig = true,
+}: {
+  destinationPath: string;
+  throwOnMissingConfig?: boolean;
+}) => {
+  let yoRcFileInMemory: MemFsEditorFile | undefined;
+  const entities: string[] = [];
+  const yoRcFilePath = join(destinationPath, '.yo-rc.json');
+  const entitiesMatcher = new Minimatch(`${destinationPath}/.jhipster/*.json`);
+
+  return transform<MemFsEditorFile>(
+    file => {
+      if (file.path === yoRcFilePath) {
+        yoRcFileInMemory = file;
+        return undefined;
+      }
+      if (entitiesMatcher.match(file.path)) {
+        entities.push(basename(file.path).replace('.json', ''));
+      }
+      return file;
+    },
+    async function () {
+      try {
+        entities.push(...(await readdir(join(destinationPath, '.jhipster'))).map(file => file.replace('.json', '')));
+      } catch {
+        // Directory does not exist
+      }
+      if (entities.length > 0) {
+        // The mem-fs instance requires another file instance to emit a change event
+        const yoRcFile: MemFsEditorFile = loadFile(yoRcFilePath) as any;
+        // Prefer in-memory file if it exists
+        const yoRcFileContents = yoRcFileInMemory?.contents ?? yoRcFile.contents;
+        if (yoRcFileContents) {
+          const contents = JSON.parse(yoRcFileContents.toString());
+          if (contents[GENERATOR_JHIPSTER]) {
+            contents[GENERATOR_JHIPSTER].entities = [...new Set([...(contents[GENERATOR_JHIPSTER].entities ?? []), ...entities])];
+            yoRcFile.contents = Buffer.from(JSON.stringify(contents, null, 2));
+            yoRcFileInMemory = yoRcFile;
+          } else if (throwOnMissingConfig) {
+            throw new Error(`File ${yoRcFile!.path} is not a valid JHipster configuration file`);
+          }
+        } else if (throwOnMissingConfig) {
+          throw new Error(`File ${yoRcFile!.path} has no contents`);
+        }
+      }
+      if (yoRcFileInMemory) {
+        this.push(yoRcFileInMemory);
+      }
+    },
+  );
+};
diff --git a/generators/jdl/generator.mts b/generators/jdl/generator.mts
@@ -35,6 +35,7 @@ import statistics from '../statistics.mjs';
 import { addApplicationIndex, allNewApplications, customizeForMicroservices } from './internal/index.mjs';
 import { mergeYoRcContent } from '../../jdl/index.js';
 import { normalizeBlueprintName } from '../base/internal/blueprint.mjs';
+import { updateApplicationEntitiesTransform } from '../base-application/support/update-application-entities-transform.mjs';
 
 const { upperFirst } = _;
 
@@ -102,8 +103,11 @@ export default class JdlGenerator extends BaseGenerator {
     return this.delegateTasksToBlueprint(() => this.initializing);
   }
 
-  get loading() {
-    return this.asLoadingTaskGroup({
+  get configuring() {
+    return this.asConfiguringTaskGroup({
+      insight() {
+        statistics.sendSubGenEvent('generator', 'import-jdl');
+      },
       async downloadJdlFiles() {
         if (this.jdlFiles) {
           this.jdlFiles = await Promise.all(
@@ -130,18 +134,6 @@ export default class JdlGenerator extends BaseGenerator {
           this.jdlContents.push(this.readDestination(jdlFile)?.toString() ?? '');
         }
       },
-    });
-  }
-
-  get [BaseGenerator.LOADING]() {
-    return this.delegateTasksToBlueprint(() => this.loading);
-  }
-
-  get default() {
-    return this.asDefaultTaskGroup({
-      insight() {
-        statistics.sendSubGenEvent('generator', 'import-jdl');
-      },
       async parseJDL() {
         const configuration = {
           applicationName: this.options.baseName ?? (this.existingProject ? this.jhipsterConfig.baseName : undefined),
@@ -167,6 +159,15 @@ export default class JdlGenerator extends BaseGenerator {
                 ...applicationsWithEntities.filter((app: ApplicationWithEntitiesAndPath) => app.config.applicationType !== 'gateway'),
               ];
       },
+      configure() {
+        const nrApplications = this.applications.length;
+        const allNew = allNewApplications(this.applications);
+        const interactiveFallback = !allNew;
+
+        this.interactive = this.interactive ?? interactiveFallback;
+        this.force = this.options.force ?? (nrApplications > 0 && allNew) ? true : undefined;
+        this.reproducible = allNew;
+      },
       customizeApplication() {
         for (const app of this.applications) {
           app.config.entities = app.entities.map(entity => entity.name);
@@ -182,18 +183,13 @@ export default class JdlGenerator extends BaseGenerator {
         addApplicationIndex(this.applications);
         customizeForMicroservices(this.exportedApplicationsWithEntities);
       },
-      configure() {
-        const nrApplications = this.applications.length;
-        const allNew = allNewApplications(this.applications);
-        const interactiveFallback = !allNew;
-
-        this.interactive = this.interactive ?? interactiveFallback;
-        this.force = this.options.force ?? (nrApplications > 0 && allNew) ? true : undefined;
-        this.reproducible = allNew;
-      },
-      generateJson() {
+      async generateJson() {
         if (this.applications.length === 0) {
           this.writeConfig({ entities: this.exportedEntities });
+          await this.env.sharedFs.pipeline(
+            { refresh: true },
+            updateApplicationEntitiesTransform({ destinationPath: this.destinationPath(), throwOnMissingConfig: false }),
+          );
         } else {
           this.writeConfig(...this.applications.map(app => (this.ignoreApplication ? { ...app, config: undefined } : app)));
         }
@@ -239,8 +235,8 @@ export default class JdlGenerator extends BaseGenerator {
     });
   }
 
-  get [BaseGenerator.DEFAULT]() {
-    return this.delegateTasksToBlueprint(() => this.default);
+  get [BaseGenerator.CONFIGURING]() {
+    return this.delegateTasksToBlueprint(() => this.configuring);
   }
 
   get end() {

diff --git a/generators/jdl/generator.spec.mts b/generators/jdl/generator.spec.mts
@@ -102,7 +102,9 @@ describe(`generator - ${generator}`, () => {
       });
 
       it('should write expected files', () => {
-        expect(runResult.getSnapshot()).toEqual({ '.yo-rc.json': expect.any(Object), '.jhipster/Foo.json': expect.any(Object) });
+        expect(runResult.getSnapshot()).toEqual({
+          '.jhipster/Foo.json': expect.objectContaining({ contents: expect.any(String), stateCleared: 'modified' }),
+        });
       });
     });
 
@@ -127,7 +129,9 @@ describe(`generator - ${generator}`, () => {
       });
 
       it('should write expected files', () => {
-        expect(runResult.getSnapshot()).toEqual({ '.yo-rc.json': expect.any(Object), '.jhipster/Foo.json': expect.any(Object) });
+        expect(runResult.getSnapshot()).toEqual({
+          '.jhipster/Foo.json': expect.objectContaining({ contents: expect.any(String), stateCleared: 'modified' }),
+        });
       });
     });
   });
@@ -312,7 +316,9 @@ describe(`generator - ${generator}`, () => {
         });
 
         it('should write expected files', () => {
-          expect(runResult.getSnapshot()).toEqual({ '.yo-rc.json': expect.any(Object), '.jhipster/Foo.json': expect.any(Object) });
+          expect(runResult.getSnapshot()).toEqual({
+            '.jhipster/Foo.json': expect.objectContaining({ contents: expect.any(String), stateCleared: 'modified' }),
+          });
         });
       });
 
@@ -327,7 +333,9 @@ describe(`generator - ${generator}`, () => {
         });
 
         it('should match files snapshot', () => {
-          expect(runResult.getSnapshot()).toEqual({ '.yo-rc.json': expect.any(Object), '.jhipster/Foo.json': expect.any(Object) });
+          expect(runResult.getSnapshot()).toEqual({
+            '.jhipster/Foo.json': expect.objectContaining({ contents: expect.any(String), stateCleared: 'modified' }),
+          });
         });
       });
     });
@@ -344,7 +352,9 @@ describe(`generator - ${generator}`, () => {
         });
 
         it('should write expected files', () => {
-          expect(runResult.getSnapshot()).toEqual({ '.yo-rc.json': expect.any(Object) });
+          expect(runResult.getSnapshot()).toEqual({
+            '.yo-rc.json': expect.objectContaining({ contents: expect.any(String), stateCleared: 'modified' }),
+          });
         });
       });
     });
@@ -361,7 +371,10 @@ describe(`generator - ${generator}`, () => {
         });
 
         it('should write expected files', () => {
-          expect(runResult.getSnapshot()).toEqual({ '.yo-rc.json': expect.any(Object), '.jhipster/Foo.json': expect.any(Object) });
+          expect(runResult.getSnapshot()).toEqual({
+            '.yo-rc.json': expect.objectContaining({ contents: expect.stringMatching(/"entities": \[\s*"Foo"\s*]/g) }),
+            '.jhipster/Foo.json': expect.objectContaining({ contents: expect.any(String), stateCleared: 'modified' }),
+          });
         });
       });
 
@@ -377,7 +390,9 @@ describe(`generator - ${generator}`, () => {
         });
 
         it('should write entity files', () => {
-          expect(runResult.getSnapshot()).toEqual({ '.jhipster/Foo.json': expect.any(Object) });
+          expect(runResult.getSnapshot()).toEqual({
+            '.jhipster/Foo.json': expect.objectContaining({ contents: expect.any(String), stateCleared: 'modified' }),
+          });
         });
       });
     });
@@ -411,8 +426,8 @@ describe(`generator - ${generator}`, () => {
 
         it('should write expected files', () => {
           expect(runResult.getSnapshot()).toEqual({
-            'jhipster/.jhipster/Foo.json': expect.any(Object),
-            'jhipster2/.jhipster/Bar.json': expect.any(Object),
+            'jhipster/.jhipster/Foo.json': expect.objectContaining({ contents: expect.any(String), stateCleared: 'modified' }),
+            'jhipster2/.jhipster/Bar.json': expect.objectContaining({ contents: expect.any(String), stateCleared: 'modified' }),
           });
         });
       });