generator-jhipster 8.2.0 → 8.3.0

package/dist/generators/base-application/support/enum.js

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import * as _ from 'lodash-es';
+import { lowerFirst } from 'lodash-es';
 import { formatDocAsJavaDoc } from '../../java/support/doc.js';
 const doesTheEnumValueHaveACustomValue = enumValue => {
     return enumValue.includes('(');
@@ -67,7 +67,7 @@ const getEnums = (enums, customValuesState, comments) => {
 };
 const extractEnumInstance = field => {
     const fieldType = field.fieldType;
-    return _.lowerFirst(fieldType);
+    return lowerFirst(fieldType);
 };
 const extractEnumEntries = field => {
     return field.fieldValues.split(',').map(fieldValue => fieldValue.trim());

package/dist/generators/base-application/support/prepare-entity.js

@@ -573,7 +573,7 @@ function preparePostEntityCommonDerivedPropertiesNotTyped(entity) {
     entity.containsBagRelationships = entity.relationships.some(relationship => relationship.bagRelationship);
     entity.implementsEagerLoadApis = // Cassandra doesn't provides *WithEagerRelationships apis
         ![CASSANDRA, COUCHBASE, NEO4J].includes(entity.databaseType) &&
-            // Only sql and mongodb provides *WithEagerReationships apis for imperative implementation
+            // Only sql and mongodb provides *WithEagerRelationships apis for imperative implementation
             (entity.reactive || [SQL, MONGODB].includes(entity.databaseType)) &&
             entity.relationshipsContainEagerLoad;
     entity.eagerRelations = entity.relationships.filter(rel => rel.relationshipEagerLoad);

package/dist/generators/base-application/support/prepare-field.js

@@ -16,8 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { snakeCase, startCase, upperFirst } from 'lodash-es';
-import * as _ from 'lodash-es';
+import { snakeCase, startCase, upperFirst, defaults, kebabCase } from 'lodash-es';
 import { fieldTypes, validations } from '../../../jdl/jhipster/index.js';
 import { getTypescriptType, prepareField as prepareClientFieldForTemplates } from '../../client/support/index.js';
 import { prepareField as prepareServerFieldForTemplates } from '../../server/support/index.js';
@@ -223,7 +222,7 @@ function _derivedProperties(field) {
     const fieldType = field.fieldType;
     const fieldTypeBlobContent = field.fieldTypeBlobContent;
     const validationRules = field.fieldValidate ? field.fieldValidateRules : [];
-    _.defaults(field, {
+    defaults(field, {
         blobContentTypeText: fieldTypeBlobContent === TEXT,
         blobContentTypeImage: fieldTypeBlobContent === IMAGE,
         blobContentTypeAny: fieldTypeBlobContent === ANY,
@@ -281,13 +280,13 @@ function prepareCommonFieldForTemplates(entityWithConfig, field, generator) {
         tsType: ({ fieldType }) => getTypescriptType(fieldType),
     });
     prepareProperty(field);
-    _.defaults(field, {
+    defaults(field, {
         entity: entityWithConfig,
     });
     const fieldType = field.fieldType;
     field.fieldIsEnum = !field.id && fieldIsEnum(fieldType);
     if (field.fieldIsEnum) {
-        field.enumFileName = _.kebabCase(field.fieldType);
+        field.enumFileName = kebabCase(field.fieldType);
         field.enumValues = getEnumValuesWithCustomValues(field.fieldValues);
     }
     field.fieldWithContentType = (fieldType === BYTES || fieldType === BYTE_BUFFER) && field.fieldTypeBlobContent !== TEXT;
@@ -295,7 +294,7 @@ function prepareCommonFieldForTemplates(entityWithConfig, field, generator) {
         field.contentTypeFieldName = `${field.fieldName}ContentType`;
     }
     field.fieldValidate = Array.isArray(field.fieldValidateRules) && field.fieldValidateRules.length >= 1;
-    _.defaults(field, {
+    defaults(field, {
         nullable: !(field.fieldValidate === true && field.fieldValidateRules.includes(REQUIRED)),
     });
     field.unique = field.fieldValidate === true && field.fieldValidateRules.includes(UNIQUE);

package/dist/generators/base-application/support/relationship.js

@@ -16,10 +16,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import * as _ from 'lodash-es';
+import { upperFirst, lowerFirst } from 'lodash-es';
 import { stringifyApplicationData } from './debug.js';
 import { findEntityInEntities } from './entity.js';
-const { upperFirst, lowerFirst } = _;
 export const otherRelationshipType = relationshipType => relationshipType.split('-').reverse().join('-');
 export const findOtherRelationshipInRelationships = (entityName, relationship, inRelationships) => {
     return inRelationships.find(otherRelationship => {

package/dist/generators/base-application/support/task-type-inference.js

@@ -1,3 +1,9 @@
+export function asWriteFilesSection(section) {
+    return section;
+}
+export function asWriteFilesBlock(section) {
+    return section;
+}
 export function asInitializingTask(task) {
     return task;
 }

package/dist/generators/base-core/generator.js

@@ -25,8 +25,7 @@ import assert from 'assert';
 import { requireNamespace } from '@yeoman/namespace';
 import chalk from 'chalk';
 import { parse as parseYaml, stringify as stringifyYaml } from 'yaml';
-import * as _ from 'lodash-es';
-import { kebabCase } from 'lodash-es';
+import { kebabCase, snakeCase, merge, get, set } from 'lodash-es';
 import { simpleGit } from 'simple-git';
 import semver, { lt as semverLessThan } from 'semver';
 import YeomanGenerator from 'yeoman-generator';
@@ -41,7 +40,7 @@ import command from '../base/command.js';
 import { GENERATOR_JHIPSTER, YO_RC_FILE } from '../generator-constants.js';
 import { convertConfigToOption } from '../../lib/internal/index.js';
 import { getGradleLibsVersionsProperties } from '../gradle/support/dependabot-gradle.js';
-const { merge, get, set } = _;
+import { dockerPlaceholderGenerator } from '../docker/utils.js';
 const { INITIALIZING, PROMPTING, CONFIGURING, COMPOSING, LOADING, PREPARING, POST_PREPARING, DEFAULT, WRITING, POST_WRITING, INSTALL, POST_INSTALL, END, } = PRIORITY_NAMES;
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
@@ -83,6 +82,13 @@ export default class CoreGenerator extends YeomanGenerator {
      */
     jhipsterTemplatesFolders;
     blueprintStorage;
+    /** Allow to use a specific definition at current command operations */
+    generatorCommand;
+    /**
+     * @experimental
+     * Additional commands to be considered
+     */
+    generatorsToCompose = [];
     _jhipsterGenerator;
     _needleApi;
     constructor(args, options, features) {
@@ -211,19 +217,72 @@ You can ignore this error by passing '--skip-checks' to jhipster command.`);
         }
         return priorities;
     }
-    async parseCurrentJHipsterCommand() {
-        const module = await this._meta?.importModule?.();
-        if (!module?.command) {
-            throw new Error(`Command not found for generator ${this.options.namespace}`);
+    /**
+     * Get the current Command Definition for the generator.
+     * `generatorCommand` takes precedence.
+     */
+    async getCurrentJHipsterCommand() {
+        if (!this.generatorCommand) {
+            const { command } = ((await this._meta?.importModule?.()) ?? {});
+            if (!command) {
+                throw new Error(`Command not found for generator ${this.options.namespace}`);
+            }
+            this.generatorCommand = command;
+            return command;
         }
-        this.parseJHipsterCommand(module?.command);
+        return this.generatorCommand;
     }
+    /**
+     * Parse command definition arguments, options and configs.
+     * Blueprints with command override takes precedence.
+     */
+    async parseCurrentJHipsterCommand() {
+        const generatorCommand = await this.getCurrentJHipsterCommand();
+        this.parseJHipsterCommand(generatorCommand);
+    }
+    /**
+     * Prompts for command definition configs.
+     * Blueprints with command override takes precedence.
+     */
     async promptCurrentJHipsterCommand() {
-        const module = await this._meta?.importModule?.();
-        if (!module?.command?.configs) {
+        const generatorCommand = await this.getCurrentJHipsterCommand();
+        if (!generatorCommand.configs) {
             throw new Error(`Configs not found for generator ${this.options.namespace}`);
         }
-        return this.prompt(this.prepareQuestions(module?.command?.configs));
+        return this.prompt(this.prepareQuestions(generatorCommand.configs));
+    }
+    /**
+     * Load the current JHipster command storage configuration into the context.
+     * Blueprints with command override takes precedence.
+     */
+    async loadCurrentJHipsterCommandConfig(context) {
+        const generatorCommand = await this.getCurrentJHipsterCommand();
+        if (!generatorCommand.configs) {
+            throw new Error(`Configs not found for generator ${this.options.namespace}`);
+        }
+        const config = this.jhipsterConfigWithDefaults;
+        Object.entries(generatorCommand.configs).forEach(([name, def]) => {
+            if (def.scope === 'storage') {
+                context[name] = context[name] ?? config?.[name] ?? this.config.get(name);
+            }
+            if (def.scope === 'blueprint') {
+                context[name] = context[name] ?? this.blueprintStorage?.get(name);
+            }
+        });
+    }
+    /**
+     * @experimental
+     * Compose the current JHipster command compose.
+     * Blueprints commands compose without generators will be composed.
+     */
+    async composeCurrentJHipsterCommand() {
+        const generatorCommand = await this.getCurrentJHipsterCommand();
+        for (const compose of generatorCommand.compose ?? []) {
+            await this.composeWithJHipster(compose);
+        }
+        for (const compose of this.generatorsToCompose) {
+            await this.composeWithJHipster(compose);
+        }
     }
     parseJHipsterCommand(commandDef) {
         if (commandDef.arguments) {
@@ -871,9 +930,19 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
     /**
      * Shallow clone or convert dependencies to placeholder if needed.
      */
-    prepareDependencies(map, valuePlaceholder = value => `${_.snakeCase(value).toUpperCase()}_VERSION`) {
+    prepareDependencies(map, valuePlaceholder) {
+        let placeholder;
+        if (valuePlaceholder === 'java') {
+            placeholder = value => `'${kebabCase(value).toUpperCase()}-VERSION'`;
+        }
+        else if (valuePlaceholder === 'docker') {
+            placeholder = dockerPlaceholderGenerator;
+        }
+        else {
+            placeholder = valuePlaceholder ?? (value => `${snakeCase(value).toUpperCase()}_VERSION`);
+        }
         if (this.useVersionPlaceholders) {
-            return Object.fromEntries(Object.keys(map).map(dep => [dep, valuePlaceholder(dep)]));
+            return Object.fromEntries(Object.keys(map).map(dep => [dep, placeholder(dep)]));
         }
         return {
             ...map,
@@ -894,7 +963,7 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
         }
         const gradleLibsVersions = this.readTemplate(gradleCatalog)?.toString();
         if (gradleLibsVersions) {
-            Object.assign(javaDependencies, this.prepareDependencies(getGradleLibsVersionsProperties(gradleLibsVersions), value => `'${kebabCase(value).toUpperCase()}-VERSION'`));
+            Object.assign(javaDependencies, this.prepareDependencies(getGradleLibsVersionsProperties(gradleLibsVersions), 'java'));
         }
     }
     loadNodeDependenciesFromPackageJson(destination, packageJsonFile = this.templatePath('../resources/package.json')) {

package/dist/generators/base-workspaces/internal/deployments.js

@@ -16,13 +16,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import * as _ from 'lodash-es';
+import { defaults } from 'lodash-es';
 import { applicationOptions, deploymentOptions } from '../../../jdl/index.js';
 import { loadDerivedPlatformConfig, loadPlatformConfig, loadDerivedServerAndPlatformProperties } from '../../server/support/index.js';
 const { OptionNames } = applicationOptions;
 const { Options: DeploymentOptions } = deploymentOptions;
 const { JWT_SECRET_KEY } = OptionNames;
-export function loadDeploymentConfig({ config = _.defaults({}, this.jhipsterConfig, DeploymentOptions.defaults(this.jhipsterConfig.deploymentType)), deployment = this, } = {}) {
+export function loadDeploymentConfig({ config = defaults({}, this.jhipsterConfig, DeploymentOptions.defaults(this.jhipsterConfig.deploymentType)), deployment = this, } = {}) {
     deployment.appsFolders = config.appsFolders;
     deployment.directoryPath = config.directoryPath;
     deployment.clusteredDbApps = config.clusteredDbApps;

package/dist/generators/base-workspaces/internal/docker-dependencies.js

@@ -17,11 +17,11 @@
  * limitations under the License.
  */
 import { dockerContainers as elasticDockerContainer } from '../../generator-constants.js';
-import { dockerPlaceholderGenerator, getDockerfileContainers } from '../../docker/utils.js';
+import { getDockerfileContainers } from '../../docker/utils.js';
 export async function loadDockerDependenciesTask({ context = this } = {}) {
     const dockerfile = this.readTemplate(this.jhipsterTemplatePath('../../server/resources/Dockerfile'));
     context.dockerContainers = this.prepareDependencies({
         ...elasticDockerContainer,
         ...getDockerfileContainers(dockerfile),
-    }, dockerPlaceholderGenerator);
+    }, 'docker');
 }

package/dist/generators/bootstrap/generator.js

@@ -23,9 +23,8 @@ import { createCommitTransform } from 'mem-fs-editor/transform';
 import BaseGenerator from '../base/index.js';
 import { createMultiStepTransform, createPrettierTransform, createForceWriteConfigFilesTransform, autoCrlfTransform, isPrettierConfigFilePath, createSortConfigFilesTransform, createESLintTransform, createRemoveUnusedImportsTransform, } from './support/index.js';
 import { PRETTIER_EXTENSIONS } from '../generator-constants.js';
-import { GENERATOR_BOOTSTRAP, GENERATOR_UPGRADE } from '../generator-list.js';
+import { GENERATOR_UPGRADE } from '../generator-list.js';
 import { PRIORITY_NAMES, QUEUES } from '../base-application/priorities.js';
-import command from './command.js';
 import { loadStoredAppOptions } from '../app/support/index.js';
 const { MULTISTEP_TRANSFORM, PRE_CONFLICTS } = PRIORITY_NAMES;
 const { MULTISTEP_TRANSFORM_QUEUE, PRE_CONFLICTS_QUEUE } = QUEUES;
@@ -48,7 +47,7 @@ export default class BootstrapGenerator extends BaseGenerator {
         this.env.options.nodePackageManager = 'npm';
         this.upgradeCommand = this.options.commandName === GENERATOR_UPGRADE;
         if (!this.fromBlueprint) {
-            await this.composeWithBlueprints(GENERATOR_BOOTSTRAP);
+            await this.composeWithBlueprints();
         }
         if (this.delegateToBlueprint) {
             throw new Error('Only sbs blueprint is supported');
@@ -56,8 +55,8 @@ export default class BootstrapGenerator extends BaseGenerator {
     }
     get initializing() {
         return this.asInitializingTaskGroup({
-            loadOptions() {
-                this.parseJHipsterOptions(command.options, command.configs);
+            async parseCommand() {
+                await this.parseCurrentJHipsterCommand();
             },
             validateBlueprint() {
                 if (this.jhipsterConfig.blueprints && !this.skipChecks) {

package/dist/generators/bootstrap/internal/transform-utils.js

@@ -0,0 +1,4 @@
+export const addLineNumbers = input => input
+    .split('\n')
+    .map((line, index) => `${index + 1}: ${line}`)
+    .join('\n');

package/dist/generators/bootstrap/support/eslint-transform.js

@@ -22,6 +22,7 @@ import { Minimatch } from 'minimatch';
 import { Piscina } from 'piscina';
 import { getPackageRoot } from '../../../lib/index.js';
 import { JS_PRETTIER_EXTENSIONS } from '../../generator-constants.js';
+import { addLineNumbers } from '../internal/transform-utils.js';
 // eslint-disable-next-line import/prefer-default-export
 export const createESLintTransform = function (transformOptions = {}) {
     const { extensions = JS_PRETTIER_EXTENSIONS, ignoreErrors } = transformOptions;
@@ -44,7 +45,7 @@ export const createESLintTransform = function (transformOptions = {}) {
             file.contents = Buffer.from(result);
         }
         if (error) {
-            const errorMessage = `Error parsing file ${file.relative}: ${error} at ${fileContents}`;
+            const errorMessage = `Error parsing file ${file.relative}: ${error} at ${addLineNumbers(fileContents)}`;
             if (!ignoreErrors) {
                 throw new Error(errorMessage);
             }

package/dist/generators/bootstrap/support/java-unused-imports-transform.js

@@ -2,6 +2,7 @@ import { extname } from 'path';
 import { passthrough } from 'p-transform';
 import { isFileStateModified } from 'mem-fs-editor/state';
 import { Piscina } from 'piscina';
+import { addLineNumbers } from '../internal/transform-utils.js';
 // eslint-disable-next-line import/prefer-default-export
 export const createRemoveUnusedImportsTransform = function (options = {}) {
     const { ignoreErrors } = options;
@@ -21,7 +22,7 @@ export const createRemoveUnusedImportsTransform = function (options = {}) {
                     file.contents = Buffer.from(result);
                 }
                 if (error) {
-                    const errorMessage = `Error parsing file ${file.relative}: ${error} at ${fileContents}`;
+                    const errorMessage = `Error parsing file ${file.relative}: ${error} at ${addLineNumbers(fileContents)}`;
                     if (ignoreErrors) {
                         this?.log?.warn?.(errorMessage);
                         return;

package/dist/generators/bootstrap/support/prettier-worker.js

@@ -2,6 +2,7 @@ import prettier from 'prettier';
 import prettierPluginJava from 'prettier-plugin-java';
 import prettierPluginProperties from 'prettier-plugin-properties';
 import prettierPluginPackagejson from 'prettier-plugin-packagejson';
+import { addLineNumbers } from '../internal/transform-utils.js';
 export default async ({ relativeFilePath, filePath, fileContents, prettierOptions, prettierPackageJson, prettierJava, prettierProperties, }) => {
     try {
         const resolvedDestinationFileOptions = await prettier.resolveConfig(relativeFilePath);
@@ -29,10 +30,7 @@ export default async ({ relativeFilePath, filePath, fileContents, prettierOption
         if (fileContents) {
             errorMessage = `Error parsing file ${relativeFilePath}: ${error}
 
-At: ${fileContents
-                .split('\n')
-                .map((value, idx) => `${idx + 1}: ${value}`)
-                .join('\n')}`;
+At: ${addLineNumbers(fileContents)}`;
         }
         else {
             errorMessage = `Unknown prettier error: ${error}`;

package/dist/generators/bootstrap-application/generator.js

@@ -20,7 +20,6 @@ import assert from 'assert';
 import BaseApplicationGenerator from '../base-application/index.js';
 import { validations } from '../../jdl/jhipster/index.js';
 import { stringifyApplicationData, derivedPrimaryKeyProperties, preparePostEntitiesCommonDerivedProperties, preparePostEntityCommonDerivedProperties, } from '../base-application/support/index.js';
-import { GENERATOR_BOOTSTRAP_APPLICATION, GENERATOR_BOOTSTRAP_APPLICATION_CLIENT, GENERATOR_BOOTSTRAP_APPLICATION_SERVER, } from '../generator-list.js';
 import { preparePostEntityServerDerivedProperties } from '../server/support/index.js';
 import { loadStoredAppOptions } from '../app/support/index.js';
 import { JHIPSTER_DOCUMENTATION_ARCHIVE_PATH, JHIPSTER_DOCUMENTATION_URL } from '../generator-constants.js';
@@ -34,13 +33,13 @@ export default class BootstrapApplicationGenerator extends BaseApplicationGenera
     }
     async beforeQueue() {
         if (!this.fromBlueprint) {
-            await this.composeWithBlueprints(GENERATOR_BOOTSTRAP_APPLICATION);
+            await this.composeWithBlueprints();
         }
         if (this.delegateToBlueprint) {
             throw new Error('Only sbs blueprint is supported');
         }
-        await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION_CLIENT);
-        await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION_SERVER);
+        await this.dependsOnBootstrapApplicationClient();
+        await this.dependsOnBootstrapApplicationServer();
     }
     get preparing() {
         return this.asPreparingTaskGroup({

package/dist/generators/bootstrap-application-base/generator.js

@@ -18,7 +18,7 @@
  */
 import assert from 'assert';
 import os from 'os';
-import * as _ from 'lodash-es';
+import { lowerFirst } from 'lodash-es';
 import chalk from 'chalk';
 import { passthrough } from '@yeoman/transform';
 import { isFileStateModified } from 'mem-fs-editor/state';
@@ -26,14 +26,13 @@ import BaseApplicationGenerator from '../base-application/index.js';
 import { addFakerToEntity, loadEntitiesAnnotations, loadEntitiesOtherSide, stringifyApplicationData, prepareEntity as prepareEntityForTemplates, prepareField as prepareFieldForTemplates, prepareRelationship, } from '../base-application/support/index.js';
 import { createAuthorityEntity, createUserEntity, createUserManagementEntity } from './utils.js';
 import { JAVA_DOCKER_DIR } from '../generator-constants.js';
-import { GENERATOR_BOOTSTRAP, GENERATOR_BOOTSTRAP_APPLICATION_BASE, GENERATOR_COMMON, GENERATOR_PROJECT_NAME } from '../generator-list.js';
+import { GENERATOR_BOOTSTRAP, GENERATOR_COMMON, GENERATOR_PROJECT_NAME } from '../generator-list.js';
 import { packageJson } from '../../lib/index.js';
 import { loadLanguagesConfig } from '../languages/support/index.js';
 import { loadAppConfig, loadDerivedAppConfig, loadStoredAppOptions } from '../app/support/index.js';
 import { exportJDLTransform, importJDLTransform } from './support/index.js';
 import command from './command.js';
 const isWin32 = os.platform() === 'win32';
-const { lowerFirst } = _;
 export default class BootstrapApplicationBase extends BaseApplicationGenerator {
     constructor(args, options, features) {
         super(args, options, { jhipsterBootstrap: false, ...features });
@@ -43,7 +42,7 @@ export default class BootstrapApplicationBase extends BaseApplicationGenerator {
     }
     async beforeQueue() {
         if (!this.fromBlueprint) {
-            await this.composeWithBlueprints(GENERATOR_BOOTSTRAP_APPLICATION_BASE);
+            await this.composeWithBlueprints();
         }
         if (this.delegateToBlueprint) {
             throw new Error('Only sbs blueprint is supported');
@@ -286,7 +285,7 @@ export default class BootstrapApplicationBase extends BaseApplicationGenerator {
         });
     }
     get [BaseApplicationGenerator.POST_PREPARING_EACH_ENTITY]() {
-        return this.asPostPreparingEachEntityTaskGroup(this.delegateTasksToBlueprint(() => this.postPreparingEachEntity));
+        return this.delegateTasksToBlueprint(() => this.postPreparingEachEntity);
     }
     get default() {
         return this.asDefaultTaskGroup({

package/dist/generators/bootstrap-application-base/utils.js

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import * as _ from 'lodash-es';
+import { defaults } from 'lodash-es';
 import { Validations, authenticationTypes, databaseTypes, fieldTypes } from '../../jdl/jhipster/index.js';
 import { loadRequiredConfigIntoEntity } from '../base-application/support/index.js';
 import { PaginationTypes } from '../../jdl/jhipster/entity-options.js';
@@ -285,7 +285,7 @@ function addOrExtendFields(fields, fieldsToAdd) {
             }
         }
         else {
-            _.defaults(field, fieldToAdd);
+            defaults(field, fieldToAdd);
         }
     }
 }
@@ -299,7 +299,7 @@ function addOrExtendRelationships(relationships, relationshipsToAdd) {
             relationships.push(relationship);
         }
         else {
-            _.defaults(relationship, relationshipToAdd);
+            defaults(relationship, relationshipToAdd);
         }
     }
 }

package/dist/generators/bootstrap-application-client/generator.js

@@ -18,7 +18,6 @@
  */
 import { loadClientConfig, loadDerivedClientConfig, preparePostEntityClientDerivedProperties } from '../client/support/index.js';
 import BaseApplicationGenerator from '../base-application/index.js';
-import { GENERATOR_BOOTSTRAP_APPLICATION_BASE, GENERATOR_BOOTSTRAP_APPLICATION_CLIENT } from '../generator-list.js';
 import { loadStoredAppOptions } from '../app/support/index.js';
 import clientCommand from '../client/command.js';
 import { loadConfig, loadDerivedConfig } from '../../lib/internal/index.js';
@@ -31,12 +30,12 @@ export default class BootStrapApplicationClient extends BaseApplicationGenerator
     }
     async beforeQueue() {
         if (!this.fromBlueprint) {
-            await this.composeWithBlueprints(GENERATOR_BOOTSTRAP_APPLICATION_CLIENT);
+            await this.composeWithBlueprints();
         }
         if (this.delegateToBlueprint) {
             throw new Error('Only sbs blueprint is supported');
         }
-        await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION_BASE);
+        await this.dependsOnBootstrapApplicationBase();
     }
     get loading() {
         return this.asLoadingTaskGroup({

package/dist/generators/bootstrap-application-server/generator.js

@@ -16,19 +16,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import * as _ from 'lodash-es';
 import BaseApplicationGenerator from '../base-application/index.js';
-import { GENERATOR_BOOTSTRAP_APPLICATION_BASE, GENERATOR_BOOTSTRAP_APPLICATION_SERVER } from '../generator-list.js';
 import { JAVA_VERSION, MAIN_DIR, SERVER_MAIN_RES_DIR, SERVER_MAIN_SRC_DIR, SERVER_TEST_RES_DIR, SERVER_TEST_SRC_DIR, TEST_DIR, dockerContainers, } from '../generator-constants.js';
 import { loadRequiredConfigIntoEntity, prepareEntityPrimaryKeyForTemplates } from '../base-application/support/index.js';
 import { loadRequiredConfigDerivedProperties, prepareEntity as prepareEntityServerForTemplates, addEntitiesOtherRelationships, hibernateSnakeCase, loadServerConfig, loadDerivedServerConfig, prepareRelationship, } from '../server/support/index.js';
 import { getGradleLibsVersionsProperties } from '../gradle/support/index.js';
 import { getPomVersionProperties } from '../maven/support/index.js';
 import { prepareField as prepareFieldForLiquibaseTemplates } from '../liquibase/support/index.js';
-import { dockerPlaceholderGenerator, getDockerfileContainers } from '../docker/utils.js';
-import { GRADLE_VERSION } from '../gradle/constants.js';
+import { getDockerfileContainers } from '../docker/utils.js';
 import { normalizePathEnd } from '../base/support/path.js';
-import { getFrontendAppName } from '../base/support/index.js';
+import { getFrontendAppName, mutateData } from '../base/support/index.js';
 import { getMainClassName } from '../java/support/index.js';
 import { loadConfig, loadDerivedConfig } from '../../lib/internal/index.js';
 import serverCommand from '../server/command.js';
@@ -38,35 +35,44 @@ export default class BoostrapApplicationServer extends BaseApplicationGenerator
     }
     async beforeQueue() {
         if (!this.fromBlueprint) {
-            await this.composeWithBlueprints(GENERATOR_BOOTSTRAP_APPLICATION_SERVER);
+            await this.composeWithBlueprints();
         }
         if (this.delegateToBlueprint) {
             throw new Error('Only sbs blueprint is supported');
         }
-        await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION_BASE);
+        await this.dependsOnBootstrapApplicationBase();
     }
     get loading() {
         return this.asLoadingTaskGroup({
             async loadApplication({ application }) {
                 loadConfig(serverCommand.configs, { config: this.jhipsterConfigWithDefaults, application });
                 loadServerConfig({ config: this.jhipsterConfigWithDefaults, application });
-                application.gradleVersion = this.useVersionPlaceholders ? 'GRADLE_VERSION' : GRADLE_VERSION;
                 application.javaVersion = this.useVersionPlaceholders ? 'JAVA_VERSION' : JAVA_VERSION;
                 application.backendType = this.jhipsterConfig.backendType ?? 'Java';
                 const pomFile = this.readTemplate(this.jhipsterTemplatePath('../../server/resources/pom.xml'))?.toString();
                 const gradleLibsVersions = this.readTemplate(this.jhipsterTemplatePath('../../server/resources/gradle/libs.versions.toml'))?.toString();
-                application.packageInfoJavadocs = [];
-                application.javaDependencies = this.prepareDependencies({
+                const applicationJavaDependencies = this.prepareDependencies({
                     ...getPomVersionProperties(pomFile),
                     ...getGradleLibsVersionsProperties(gradleLibsVersions),
-                }, 
-                // Gradle doesn't allows snakeCase
-                value => `'${_.kebabCase(value).toUpperCase()}-VERSION'`);
+                }, 'java');
                 const dockerfile = this.readTemplate(this.jhipsterTemplatePath('../../server/resources/Dockerfile'));
-                application.dockerContainers = this.prepareDependencies({
+                const applicationDockerContainers = this.prepareDependencies({
                     ...dockerContainers,
                     ...getDockerfileContainers(dockerfile),
-                }, dockerPlaceholderGenerator);
+                }, 'docker');
+                mutateData(application, {
+                    packageInfoJavadocs: [],
+                    javaProperties: {},
+                    javaManagedProperties: {},
+                    javaDependencies: ({ javaDependencies }) => ({
+                        ...applicationJavaDependencies,
+                        ...javaDependencies,
+                    }),
+                    dockerContainers: ({ dockerContainers: currentDockerContainers = {} }) => ({
+                        ...applicationDockerContainers,
+                        ...currentDockerContainers,
+                    }),
+                });
             },
         });
     }

package/dist/generators/bootstrap-workspaces/generator.js

@@ -17,7 +17,6 @@
  * limitations under the License.
  */
 import BaseWorkspacesGenerator from '../base-workspaces/index.js';
-import { GENERATOR_BOOTSTRAP_WORKSPACES } from '../generator-list.js';
 import command from './command.js';
 export default class DockerComposeGenerator extends BaseWorkspacesGenerator {
     sharedWorkspaces;
@@ -27,7 +26,7 @@ export default class DockerComposeGenerator extends BaseWorkspacesGenerator {
         this.sharedWorkspaces.existingWorkspaces = this.sharedWorkspaces.existingWorkspaces ?? Boolean(this.jhipsterConfig.appsFolders);
         this.parseJHipsterOptions(command.options);
         if (!this.fromBlueprint) {
-            await this.composeWithBlueprints(GENERATOR_BOOTSTRAP_WORKSPACES);
+            await this.composeWithBlueprints();
         }
     }
     get prompting() {

package/dist/generators/ci-cd/command.js

@@ -17,8 +17,7 @@
  * limitations under the License.
  */
 import chalk from 'chalk';
-import * as _ from 'lodash-es';
-const { kebabCase, intersection } = _;
+import { kebabCase, intersection } from 'lodash-es';
 const includesValue = (prop, values) => answers => answers[prop] && intersection(answers[prop], values).length > 0;
 const command = {
     options: {},

package/dist/generators/ci-cd/generator.js

@@ -20,7 +20,7 @@
 import chalk from 'chalk';
 import BaseApplicationGenerator from '../base-application/index.js';
 import statistics from '../statistics.js';
-import { GENERATOR_BOOTSTRAP_APPLICATION, GENERATOR_CI_CD } from '../generator-list.js';
+import { GENERATOR_CI_CD } from '../generator-list.js';
 import { clientFrameworkTypes } from '../../jdl/jhipster/index.js';
 import { createPomStorage } from '../maven/support/pom-store.js';
 import command from './command.js';
@@ -30,10 +30,10 @@ export default class CiCdGenerator extends BaseApplicationGenerator {
     insideDocker;
     async beforeQueue() {
         if (!this.fromBlueprint) {
-            await this.composeWithBlueprints(GENERATOR_CI_CD);
+            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

package/dist/generators/client/command.js

@@ -17,12 +17,11 @@
  * limitations under the License.
  */
 import chalk from 'chalk';
-import * as _ from 'lodash-es';
+import { intersection } from 'lodash-es';
 import { testFrameworkTypes } from '../../jdl/jhipster/index.js';
 import { APPLICATION_TYPE_GATEWAY, APPLICATION_TYPE_MICROSERVICE, clientFrameworkTypes } from '../../jdl/index.js';
 import { GENERATOR_COMMON } from '../generator-list.js';
 const { CYPRESS } = testFrameworkTypes;
-const { intersection } = _;
 const { ANGULAR, REACT, VUE, NO: CLIENT_FRAMEWORK_NO } = clientFrameworkTypes;
 const microfrontendsToPromptValue = answer => (Array.isArray(answer) ? answer.map(({ baseName }) => baseName).join(',') : answer);
 const promptValueToMicrofrontends = answer => answer