generator-jhipster 8.2.1 → 8.3.0

package/dist/generators/client/generator.js

@@ -22,7 +22,7 @@ import { writeFiles as writeCommonFiles } from './files-common.js';
 import { addEnumerationFiles } from './entity-files.js';
 import { LOGIN_REGEX_JS } from '../generator-constants.js';
 import statistics from '../statistics.js';
-import { GENERATOR_BOOTSTRAP_APPLICATION, GENERATOR_CYPRESS, GENERATOR_COMMON, GENERATOR_CLIENT } from '../generator-list.js';
+import { GENERATOR_CYPRESS, GENERATOR_COMMON, GENERATOR_CLIENT } from '../generator-list.js';
 import { testFrameworkTypes, clientFrameworkTypes } from '../../jdl/jhipster/index.js';
 import { createNeedleCallback } from '../base/support/index.js';
 import { loadStoredAppOptions } from '../app/support/index.js';
@@ -35,11 +35,11 @@ export default class JHipsterClientGenerator extends BaseApplicationGenerator {
     async beforeQueue() {
         loadStoredAppOptions.call(this);
         if (!this.fromBlueprint) {
-            await this.composeWithBlueprints(GENERATOR_CLIENT);
+            await this.composeWithBlueprints();
         }
         if (!this.delegateToBlueprint) {
             // TODO depend on GENERATOR_BOOTSTRAP_APPLICATION_CLIENT.
-            await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION);
+            await this.dependsOnBootstrapApplication();
             await this.dependsOnJHipster(GENERATOR_COMMON);
         }
     }
@@ -65,7 +65,7 @@ export default class JHipsterClientGenerator extends BaseApplicationGenerator {
         });
     }
     get [BaseApplicationGenerator.PROMPTING]() {
-        return this.asPromptingTaskGroup(this.delegateTasksToBlueprint(() => this.prompting));
+        return this.delegateTasksToBlueprint(() => this.prompting);
     }
     get configuring() {
         return this.asConfiguringTaskGroup({
@@ -106,7 +106,7 @@ export default class JHipsterClientGenerator extends BaseApplicationGenerator {
         });
     }
     get [BaseApplicationGenerator.CONFIGURING]() {
-        return this.asConfiguringTaskGroup(this.delegateTasksToBlueprint(() => this.configuring));
+        return this.delegateTasksToBlueprint(() => this.configuring);
     }
     get composing() {
         return this.asComposingTaskGroup({
@@ -122,7 +122,7 @@ export default class JHipsterClientGenerator extends BaseApplicationGenerator {
         });
     }
     get [BaseApplicationGenerator.COMPOSING]() {
-        return this.asComposingTaskGroup(this.delegateTasksToBlueprint(() => this.composing));
+        return this.delegateTasksToBlueprint(() => this.composing);
     }
     get loading() {
         return this.asLoadingTaskGroup({
@@ -137,7 +137,7 @@ export default class JHipsterClientGenerator extends BaseApplicationGenerator {
         });
     }
     get [BaseApplicationGenerator.LOADING]() {
-        return this.asLoadingTaskGroup(this.delegateTasksToBlueprint(() => this.loading));
+        return this.delegateTasksToBlueprint(() => this.loading);
     }
     // Public API method used by the getter and also by Blueprints
     get preparing() {
@@ -162,7 +162,7 @@ export default class JHipsterClientGenerator extends BaseApplicationGenerator {
         });
     }
     get [BaseApplicationGenerator.PREPARING]() {
-        return this.asPreparingTaskGroup(this.delegateTasksToBlueprint(() => this.preparing));
+        return this.delegateTasksToBlueprint(() => this.preparing);
     }
     get preparingEachEntity() {
         return {
@@ -191,7 +191,7 @@ export default class JHipsterClientGenerator extends BaseApplicationGenerator {
         });
     }
     get [BaseApplicationGenerator.DEFAULT]() {
-        return this.asDefaultTaskGroup(this.delegateTasksToBlueprint(() => this.default));
+        return this.delegateTasksToBlueprint(() => this.default);
     }
     // Public API method used by the getter and also by Blueprints
     get writing() {
@@ -203,7 +203,7 @@ export default class JHipsterClientGenerator extends BaseApplicationGenerator {
         });
     }
     get [BaseApplicationGenerator.WRITING]() {
-        return this.asWritingTaskGroup(this.delegateTasksToBlueprint(() => this.writing));
+        return this.delegateTasksToBlueprint(() => this.writing);
     }
     get writingEntities() {
         return this.asWritingEntitiesTaskGroup({
@@ -218,7 +218,7 @@ export default class JHipsterClientGenerator extends BaseApplicationGenerator {
         });
     }
     get [BaseApplicationGenerator.WRITING_ENTITIES]() {
-        return this.asWritingEntitiesTaskGroup(this.delegateTasksToBlueprint(() => this.writingEntities));
+        return this.delegateTasksToBlueprint(() => this.writingEntities);
     }
     get postWriting() {
         return this.asPostWritingTaskGroup({
@@ -263,6 +263,6 @@ export default class JHipsterClientGenerator extends BaseApplicationGenerator {
         });
     }
     get [BaseApplicationGenerator.POST_WRITING]() {
-        return this.asPostWritingTaskGroup(this.delegateTasksToBlueprint(() => this.postWriting));
+        return this.delegateTasksToBlueprint(() => this.postWriting);
     }
 }

package/dist/generators/client/needle-api/needle-client-vue.js

@@ -17,12 +17,12 @@
  * limitations under the License.
  */
 import chalk from 'chalk';
-import * as _ from 'lodash-es';
+import { startCase } from 'lodash-es';
 import needleClientBase from './needle-client.js';
 import { stripMargin } from '../../base/support/index.js';
 import { createNeedleCallback } from '../../base/support/needles.js';
 export default class extends needleClientBase {
-    addEntityToMenu(routerName, enableTranslation, entityTranslationKeyMenu, entityTranslationValue = _.startCase(routerName)) {
+    addEntityToMenu(routerName, enableTranslation, entityTranslationKeyMenu, entityTranslationValue = startCase(routerName)) {
         const ignoreNonExisting = this.generator.sharedData.getControl().ignoreNeedlesError &&
             `${chalk.yellow('Reference to ') + routerName} ${chalk.yellow('not added to menu.\n')}`;
         const filePath = `${this.clientSrcDir}/app/entities/entities-menu.vue`;

package/dist/generators/client/resources/package.json

@@ -3,14 +3,14 @@
     "dayjs": "1.11.10"
   },
   "devDependencies": {
-    "@cypress/code-coverage": "3.12.30",
+    "@cypress/code-coverage": "3.12.33",
     "babel-loader": "9.1.3",
     "babel-plugin-istanbul": "6.1.1",
-    "cypress": "13.7.0",
+    "cypress": "13.7.2",
     "cypress-audit": "1.1.0",
     "eslint-plugin-cypress": "2.15.1",
-    "lighthouse": "11.6.0",
+    "lighthouse": "11.7.0",
     "nyc": "15.1.0",
-    "swagger-ui-dist": "5.12.0"
+    "swagger-ui-dist": "5.13.0"
   }
 }

package/dist/generators/client/templates/src/main/webapp/index.html.ejs

@@ -17,7 +17,7 @@
  limitations under the License.
 -%>
 <!DOCTYPE html>
-<html class="no-js" lang="<% if (enableTranslation) { %><%= nativeLanguage %><% } else { %>en<% } %>" dir="ltr">
+<html class="no-js" lang="<%= nativeLanguage %>" dir="ltr">
   <head>
     <meta charset="utf-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />

package/dist/generators/common/generator.js

@@ -22,7 +22,7 @@ import BaseApplicationGenerator from '../base-application/index.js';
 import { writeFiles, prettierConfigFiles } from './files.js';
 import { MAIN_DIR, TEST_DIR, SERVER_MAIN_RES_DIR, JHIPSTER_DOCUMENTATION_URL, JHIPSTER_DOCUMENTATION_ARCHIVE_PATH, } from '../generator-constants.js';
 import { clientFrameworkTypes } from '../../jdl/jhipster/index.js';
-import { GENERATOR_COMMON, GENERATOR_BOOTSTRAP_APPLICATION, GENERATOR_GIT } from '../generator-list.js';
+import { GENERATOR_COMMON, GENERATOR_GIT } from '../generator-list.js';
 import command from './command.js';
 import { createPrettierTransform } from '../bootstrap/support/prettier-support.js';
 import { loadStoredAppOptions } from '../app/support/index.js';
@@ -32,10 +32,10 @@ export default class CommonGenerator extends BaseApplicationGenerator {
     async beforeQueue() {
         loadStoredAppOptions.call(this);
         if (!this.fromBlueprint) {
-            await this.composeWithBlueprints(GENERATOR_COMMON);
+            await this.composeWithBlueprints();
         }
         if (!this.delegateToBlueprint) {
-            await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION);
+            await this.dependsOnBootstrapApplication();
             await this.dependsOnJHipster(GENERATOR_GIT);
         }
     }
@@ -59,7 +59,7 @@ export default class CommonGenerator extends BaseApplicationGenerator {
         });
     }
     get [BaseApplicationGenerator.PROMPTING]() {
-        return this.asPromptingTaskGroup(this.delegateTasksToBlueprint(() => this.prompting));
+        return this.delegateTasksToBlueprint(() => this.prompting);
     }
     // Public API method used by the getter and also by Blueprints
     get configuring() {
@@ -161,7 +161,7 @@ export default class CommonGenerator extends BaseApplicationGenerator {
         });
     }
     get [BaseApplicationGenerator.DEFAULT]() {
-        return this.asDefaultTaskGroup(this.delegateTasksToBlueprint(() => this.default));
+        return this.delegateTasksToBlueprint(() => this.default);
     }
     // Public API method used by the getter and also by Blueprints
     get writing() {

package/dist/generators/common/resources/package.json

@@ -3,7 +3,7 @@
     "concurrently": "8.2.2",
     "husky": "9.0.11",
     "lint-staged": "15.2.2",
-    "npm": "10.5.0",
+    "npm": "10.5.1",
     "wait-on": "7.2.0"
   }
 }

package/dist/generators/cucumber/generator.js

@@ -17,16 +17,15 @@
  * limitations under the License.
  */
 import BaseApplicationGenerator from '../base-application/index.js';
-import { GENERATOR_CUCUMBER, GENERATOR_BOOTSTRAP_APPLICATION } from '../generator-list.js';
 import writeTask from './files.js';
 import cleanupTask from './cleanup.js';
 export default class CucumberGenerator extends BaseApplicationGenerator {
     async beforeQueue() {
         if (!this.fromBlueprint) {
-            await this.composeWithBlueprints(GENERATOR_CUCUMBER);
+            await this.composeWithBlueprints();
         }
         if (!this.delegateToBlueprint) {
-            await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION);
+            await this.dependsOnJHipster('jhipster:java:build-tool');
         }
     }
     get writing() {
@@ -41,15 +40,23 @@ export default class CucumberGenerator extends BaseApplicationGenerator {
     get postWriting() {
         return this.asPostWritingTaskGroup({
             addDependencies({ application, source }) {
+                const { javaDependencies, gradleBuildSrc } = application;
+                source.addJavaDependencies?.([
+                    {
+                        groupId: 'io.cucumber',
+                        artifactId: 'cucumber-bom',
+                        version: javaDependencies['cucumber-bom'],
+                        type: 'pom',
+                        scope: 'import',
+                    },
+                    { groupId: 'io.cucumber', artifactId: 'cucumber-junit-platform-engine', scope: 'test' },
+                    { groupId: 'io.cucumber', artifactId: 'cucumber-java', scope: 'test' },
+                    { groupId: 'io.cucumber', artifactId: 'cucumber-spring', scope: 'test' },
+                    { groupId: 'org.junit.platform', artifactId: 'junit-platform-console', scope: 'test' },
+                    { groupId: 'org.testng', artifactId: 'testng', scope: 'test', version: javaDependencies.testng },
+                ], { gradleFile: `${gradleBuildSrc}src/main/groovy/jhipster.cucumber-conventions.gradle` });
                 if (application.buildToolMaven) {
                     source.addMavenDefinition?.({
-                        dependencies: [
-                            { groupId: 'io.cucumber', artifactId: 'cucumber-junit-platform-engine', scope: 'test' },
-                            { groupId: 'io.cucumber', artifactId: 'cucumber-java', scope: 'test' },
-                            { groupId: 'io.cucumber', artifactId: 'cucumber-spring', scope: 'test' },
-                            { groupId: 'org.junit.platform', artifactId: 'junit-platform-console', scope: 'test' },
-                            { groupId: 'org.testng', artifactId: 'testng', scope: 'test' },
-                        ],
                         plugins: [{ groupId: 'org.apache.maven.plugins', artifactId: 'maven-antrun-plugin' }],
                         pluginManagement: [
                             {

package/dist/generators/cucumber/templates/buildSrc/src/main/groovy/jhipster.cucumber-conventions.gradle.ejs

@@ -1,9 +1,5 @@
 dependencies {
-    testImplementation "io.cucumber:cucumber-junit-platform-engine"
-    testImplementation "io.cucumber:cucumber-java"
-    testImplementation "io.cucumber:cucumber-spring"
-    testImplementation "org.junit.platform:junit-platform-console"
-    testImplementation "org.testng:testng"
+    // jhipster-needle-gradle-dependency - JHipster will add additional dependencies here
 }
 
 tasks.register('consoleLauncherTest', JavaExec) {

package/dist/generators/cypress/generator.js

@@ -21,17 +21,16 @@ import BaseApplicationGenerator from '../base-application/index.js';
 import { cypressFiles, cypressEntityFiles } from './files.js';
 import { clientFrameworkTypes } from '../../jdl/jhipster/index.js';
 import { CLIENT_MAIN_SRC_DIR } from '../generator-constants.js';
-import { GENERATOR_CYPRESS, GENERATOR_BOOTSTRAP_APPLICATION } from '../generator-list.js';
 import { generateTestEntity as entityWithFakeValues } from '../client/support/index.js';
 const { ANGULAR } = clientFrameworkTypes;
 export default class CypressGenerator extends BaseApplicationGenerator {
     async beforeQueue() {
         if (!this.fromBlueprint) {
-            await this.composeWithBlueprints(GENERATOR_CYPRESS);
+            await this.composeWithBlueprints();
         }
         if (!this.delegateToBlueprint) {
             // TODO depend on GENERATOR_BOOTSTRAP_APPLICATION_CLIENT.
-            await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION);
+            await this.dependsOnBootstrapApplication();
         }
     }
     get prompting() {

package/dist/generators/cypress/templates/src/test/javascript/cypress/e2e/administration/administration.cy.ts.ejs

@@ -97,4 +97,14 @@ describe('/admin', () => {
       });
     });
   });
+<%_ if (communicationSpringWebsocket) { _%>
+
+  describe('/tracker', () => {
+    it('should load the page', () => {
+      cy.clickOnAdminMenuItem('tracker');
+      cy.get('[data-cy="trackerPageHeading"]').should('be.visible');
+      cy.get('[data-cy="trackerTable"] > tbody > tr').should('have.length', 1)
+    });
+  });
+<%_ } _%>
 });

package/dist/generators/docker/generator.js

@@ -17,24 +17,22 @@
  * limitations under the License.
  */
 /* eslint-disable camelcase */
-import * as _ from 'lodash-es';
+import { intersection } from 'lodash-es';
 import BaseApplicationGenerator from '../base-application/index.js';
 import { createDockerComposeFile, createDockerExtendedServices } from '../docker/support/index.js';
-import { GENERATOR_BOOTSTRAP_APPLICATION_SERVER, GENERATOR_DOCKER } from '../generator-list.js';
 import { dockerFiles } from './files.js';
 import { SERVICE_COMPLETED_SUCCESSFULLY, SERVICE_HEALTHY } from './constants.js';
 import { stringHashCode, createFaker } from '../base/support/index.js';
 import { getJdbcUrl, getR2dbcUrl } from '../spring-data-relational/support/index.js';
-const { intersection } = _;
 export default class DockerGenerator extends BaseApplicationGenerator {
     hasServicesFile = false;
     async beforeQueue() {
         if (!this.fromBlueprint) {
-            await this.composeWithBlueprints(GENERATOR_DOCKER);
+            await this.composeWithBlueprints();
         }
         if (!this.delegateToBlueprint) {
             // TODO depend on GENERATOR_BOOTSTRAP_APPLICATION_SERVER.
-            await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION_SERVER);
+            await this.dependsOnBootstrapApplicationServer();
         }
     }
     get loading() {
@@ -47,7 +45,7 @@ export default class DockerGenerator extends BaseApplicationGenerator {
         });
     }
     get [BaseApplicationGenerator.LOADING]() {
-        return this.asLoadingTaskGroup(this.delegateTasksToBlueprint(() => this.loading));
+        return this.delegateTasksToBlueprint(() => this.loading);
     }
     get preparing() {
         return this.asPreparingTaskGroup({

package/dist/generators/docker/templates/docker/realm-config/jhipster-realm.json.ejs

@@ -1912,22 +1912,6 @@
       "topLevel": false,
       "builtIn": true,
       "authenticationExecutions": [
-        {
-          "authenticator": "basic-auth",
-          "authenticatorFlow": false,
-          "requirement": "REQUIRED",
-          "priority": 10,
-          "userSetupAllowed": false,
-          "autheticatorFlow": false
-        },
-        {
-          "authenticator": "basic-auth-otp",
-          "authenticatorFlow": false,
-          "requirement": "DISABLED",
-          "priority": 20,
-          "userSetupAllowed": false,
-          "autheticatorFlow": false
-        },
         {
           "authenticator": "auth-spnego",
           "authenticatorFlow": false,
@@ -2318,14 +2302,6 @@
       "topLevel": true,
       "builtIn": true,
       "authenticationExecutions": [
-        {
-          "authenticator": "no-cookie-redirect",
-          "authenticatorFlow": false,
-          "requirement": "REQUIRED",
-          "priority": 10,
-          "userSetupAllowed": false,
-          "autheticatorFlow": false
-        },
         {
           "authenticatorFlow": true,
           "requirement": "REQUIRED",
@@ -2371,14 +2347,6 @@
           "userSetupAllowed": false,
           "autheticatorFlow": false
         },
-        {
-          "authenticator": "registration-profile-action",
-          "authenticatorFlow": false,
-          "requirement": "REQUIRED",
-          "priority": 40,
-          "userSetupAllowed": false,
-          "autheticatorFlow": false
-        },
         {
           "authenticator": "registration-password-action",
           "authenticatorFlow": false,

package/dist/generators/docker/utils.js

@@ -17,8 +17,7 @@
  * limitations under the License.
  */
 import { DockerfileParser } from 'dockerfile-ast';
-import * as _ from 'lodash-es';
-const { camelCase } = _;
+import { camelCase, kebabCase } from 'lodash-es';
 /**
  * Extract version properties from pom content
  * @param {string} pomContent
@@ -63,4 +62,4 @@ export function getDockerfileContainers(dockerfileContent) {
  * @param {string}
  * @returns {string}
  */
-export const dockerPlaceholderGenerator = value => `${_.kebabCase(value)}-placeholder`;
+export const dockerPlaceholderGenerator = value => `${kebabCase(value)}-placeholder`;

package/dist/generators/docker-compose/generator.js

@@ -21,7 +21,7 @@ import pathjs from 'path';
 import chalk from 'chalk';
 import jsyaml from 'js-yaml';
 import normalize from 'normalize-path';
-import * as _ from 'lodash-es';
+import { defaults } from 'lodash-es';
 import BaseWorkspacesGenerator from '../base-workspaces/index.js';
 import { writeFiles } from './files.js';
 import { deploymentOptions, monitoringTypes, serviceDiscoveryTypes } from '../../jdl/jhipster/index.js';
@@ -35,7 +35,6 @@ import { loadDerivedPlatformConfig, loadPlatformConfig } from '../server/support
 const { PROMETHEUS, NO: NO_MONITORING } = monitoringTypes;
 const { CONSUL, EUREKA, NO: NO_SERVICE_DISCOVERY } = serviceDiscoveryTypes;
 const { Options: DeploymentOptions } = deploymentOptions;
-const { defaults } = _;
 /* eslint-disable consistent-return */
 /**
  * @class
@@ -50,7 +49,7 @@ export default class DockerComposeGenerator extends BaseWorkspacesGenerator {
         }
         await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_WORKSPACES);
         if (!this.fromBlueprint) {
-            await this.composeWithBlueprints(GENERATOR_DOCKER_COMPOSE);
+            await this.composeWithBlueprints();
         }
     }
     get initializing() {
@@ -59,8 +58,8 @@ export default class DockerComposeGenerator extends BaseWorkspacesGenerator {
                 this.log.log(chalk.white(`${chalk.bold('🐳')}  Welcome to the JHipster Docker Compose Sub-Generator ${chalk.bold('🐳')}`));
                 this.log.log(chalk.white(`Files will be generated in folder: ${chalk.yellow(this.destinationRoot())}`));
             },
-            parseOptions() {
-                this.parseJHipsterOptions(command.options);
+            async parseCommand() {
+                await this.parseCurrentJHipsterCommand();
             },
             checkDocker,
             async checkDockerCompose() {

package/dist/generators/docker-compose/templates/realm-config/jhipster-realm.json.ejs

@@ -1914,22 +1914,6 @@
       "topLevel": false,
       "builtIn": true,
       "authenticationExecutions": [
-        {
-          "authenticator": "basic-auth",
-          "authenticatorFlow": false,
-          "requirement": "REQUIRED",
-          "priority": 10,
-          "userSetupAllowed": false,
-          "autheticatorFlow": false
-        },
-        {
-          "authenticator": "basic-auth-otp",
-          "authenticatorFlow": false,
-          "requirement": "DISABLED",
-          "priority": 20,
-          "userSetupAllowed": false,
-          "autheticatorFlow": false
-        },
         {
           "authenticator": "auth-spnego",
           "authenticatorFlow": false,
@@ -2320,14 +2304,6 @@
       "topLevel": true,
       "builtIn": true,
       "authenticationExecutions": [
-        {
-          "authenticator": "no-cookie-redirect",
-          "authenticatorFlow": false,
-          "requirement": "REQUIRED",
-          "priority": 10,
-          "userSetupAllowed": false,
-          "autheticatorFlow": false
-        },
         {
           "authenticatorFlow": true,
           "requirement": "REQUIRED",
@@ -2373,14 +2349,6 @@
           "userSetupAllowed": false,
           "autheticatorFlow": false
         },
-        {
-          "authenticator": "registration-profile-action",
-          "authenticatorFlow": false,
-          "requirement": "REQUIRED",
-          "priority": 40,
-          "userSetupAllowed": false,
-          "autheticatorFlow": false
-        },
         {
           "authenticator": "registration-password-action",
           "authenticatorFlow": false,

package/dist/generators/entities/generator.js

@@ -17,13 +17,13 @@
  * limitations under the License.
  */
 import BaseApplicationGenerator from '../base-application/index.js';
-import { GENERATOR_ENTITIES, GENERATOR_APP } from '../generator-list.js';
+import { GENERATOR_APP } from '../generator-list.js';
 import command from './command.js';
 export default class EntitiesGenerator extends BaseApplicationGenerator {
     entities;
     async beforeQueue() {
         if (!this.fromBlueprint) {
-            await this.composeWithBlueprints(GENERATOR_ENTITIES);
+            await this.composeWithBlueprints();
         }
     }
     get initializing() {
@@ -45,8 +45,8 @@ export default class EntitiesGenerator extends BaseApplicationGenerator {
                     this.log.verboseInfo('Generating entities', ...this.entities);
                 }
             },
-            loadOptions() {
-                this.parseJHipsterOptions(command.options);
+            async parseCommand() {
+                await this.parseCurrentJHipsterCommand();
             },
         });
     }

package/dist/generators/entity/generator.js

@@ -20,14 +20,13 @@
 import fs from 'fs';
 import path from 'path';
 import chalk from 'chalk';
-import * as _ from 'lodash-es';
+import { upperFirst } from 'lodash-es';
 import BaseApplicationGenerator from '../base-application/index.js';
 import prompts from './prompts.js';
 import { JHIPSTER_CONFIG_DIR } from '../generator-constants.js';
 import { applicationTypes, reservedKeywords } from '../../jdl/jhipster/index.js';
-import { GENERATOR_BOOTSTRAP_APPLICATION, GENERATOR_ENTITIES, GENERATOR_ENTITY } from '../generator-list.js';
+import { GENERATOR_ENTITIES } from '../generator-list.js';
 import { getDBTypeFromDBValue, hibernateSnakeCase } from '../server/support/index.js';
-import command from './command.js';
 const { GATEWAY, MICROSERVICE } = applicationTypes;
 const { isReservedClassName } = reservedKeywords;
 export default class EntityGenerator extends BaseApplicationGenerator {
@@ -38,18 +37,20 @@ export default class EntityGenerator extends BaseApplicationGenerator {
     }
     async beforeQueue() {
         if (!this.fromBlueprint) {
-            await this.composeWithBlueprints(GENERATOR_ENTITY);
+            await this.composeWithBlueprints();
         }
         if (!this.delegateToBlueprint) {
-            await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION);
+            await this.dependsOnBootstrapApplication();
         }
     }
     // Public API method used by the getter and also by Blueprints
     get initializing() {
         return this.asInitializingTaskGroup({
+            async parseCommand() {
+                await this.parseCurrentJHipsterCommand();
+            },
             parseOptions() {
-                this.parseJHipsterArguments(command.arguments);
-                const name = _.upperFirst(this.name).replace('.json', '');
+                const name = upperFirst(this.name).replace('.json', '');
                 this.entityStorage = this.getEntityConfig(name, true);
                 this.entityConfig = this.entityStorage.createProxy();
                 const configExisted = this.entityStorage.existed;
@@ -297,7 +298,7 @@ export default class EntityGenerator extends BaseApplicationGenerator {
      * @return {boolean} true if the entity is User.
      */
     isUserEntity(entityName) {
-        return _.upperFirst(entityName) === 'User';
+        return upperFirst(entityName) === 'User';
     }
     /**
      * @private
@@ -306,7 +307,7 @@ export default class EntityGenerator extends BaseApplicationGenerator {
      * @return {boolean} true if the entity is Authority.
      */
     isAuthorityEntity(entityName) {
-        return _.upperFirst(entityName) === 'Authority';
+        return upperFirst(entityName) === 'Authority';
     }
     /**
      * @private