generator-jhipster 8.6.0 → 8.7.1

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

@@ -16,33 +16,34 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { basename, join as joinPath, dirname, relative, isAbsolute, join, extname } from 'path';
+import { basename, dirname, extname, isAbsolute, join, join as joinPath, relative } from 'path';
 import { relative as posixRelative } from 'path/posix';
 import { createHash } from 'crypto';
 import { fileURLToPath } from 'url';
-import { statSync, rmSync, existsSync, readFileSync } from 'fs';
+import { existsSync, readFileSync, rmSync, statSync } from 'fs';
 import assert from 'assert';
 import { requireNamespace } from '@yeoman/namespace';
 import chalk from 'chalk';
 import { parse as parseYaml, stringify as stringifyYaml } from 'yaml';
-import { kebabCase, snakeCase, merge, get, set, defaults, mergeWith } from 'lodash-es';
+import { defaults, get, kebabCase, merge, mergeWith, set, snakeCase } from 'lodash-es';
 import { simpleGit } from 'simple-git';
 import semver, { lt as semverLessThan } from 'semver';
 import YeomanGenerator from 'yeoman-generator';
 import latestVersion from 'latest-version';
 import SharedData from '../base/shared-data.js';
-import { CUSTOM_PRIORITIES, PRIORITY_NAMES, PRIORITY_PREFIX } from '../base/priorities.js';
-import { createJHipster7Context, formatDateForChangelog, joinCallbacks, removeFieldsWithNullishValues, } from '../base/support/index.js';
+import { CUSTOM_PRIORITIES, PRIORITY_NAMES, PRIORITY_PREFIX, QUEUES } from '../base/priorities.js';
+import { createJHipster7Context, formatDateForChangelog, joinCallbacks, removeFieldsWithNullishValues } from '../base/support/index.js';
+import { convertConfigToOption, } from '../../lib/command/index.js';
 import { packageJson } from '../../lib/index.js';
 import { GENERATOR_BOOTSTRAP } from '../generator-list.js';
 import NeedleApi from '../needle-api.js';
 import command from '../base/command.js';
 import { GENERATOR_JHIPSTER, YO_RC_FILE } from '../generator-constants.js';
-import { convertConfigToOption } from '../../lib/internal/index.js';
+import { loadConfig } from '../../lib/internal/index.js';
 import { getGradleLibsVersionsProperties } from '../gradle/support/dependabot-gradle.js';
 import { dockerPlaceholderGenerator } from '../docker/utils.js';
-import { getConfigWithDefaults } from '../../jdl/index.js';
-import { extractArgumentsFromConfigs } from '../base/internal/command.js';
+import { getConfigWithDefaults } from '../../lib/jhipster/index.js';
+import { extractArgumentsFromConfigs } from '../../lib/command/index.js';
 const { INITIALIZING, PROMPTING, CONFIGURING, COMPOSING, COMPOSING_COMPONENT, LOADING, PREPARING, POST_PREPARING, DEFAULT, WRITING, POST_WRITING, INSTALL, POST_INSTALL, END, } = PRIORITY_NAMES;
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
@@ -71,6 +72,7 @@ export default class CoreGenerator extends YeomanGenerator {
     static INSTALL = asPriority(INSTALL);
     static POST_INSTALL = asPriority(POST_INSTALL);
     static END = asPriority(END);
+    context;
     useVersionPlaceholders;
     skipChecks;
     ignoreNeedlesError;
@@ -136,6 +138,11 @@ export default class CoreGenerator extends YeomanGenerator {
         // Add base template folder.
         this.jhipsterTemplatesFolders = [this.templatePath()];
         this.jhipster7Migration = this.features.jhipster7Migration ?? false;
+        if (this.features.queueCommandTasks === true) {
+            this.on('before:queueOwnTasks', () => {
+                this.queueCurrentJHipsterCommandTasks();
+            });
+        }
     }
     /**
      * Override yeoman generator's usage function to fine tune --help message.
@@ -224,6 +231,12 @@ You can ignore this error by passing '--skip-checks' to jhipster command.`);
         }
         return [{ control }];
     }
+    /**
+     * Check if the generator should ask for prompts.
+     */
+    shouldAskForPrompts({ control }) {
+        return !control.existingProject || this.options.askAnswered === true;
+    }
     /**
      * Override yeoman-generator method that gets methods to be queued, filtering the result.
      */
@@ -231,11 +244,97 @@ You can ignore this error by passing '--skip-checks' to jhipster command.`);
         let priorities = super.getTaskNames();
         if (!this.features.disableSkipPriorities && this.options.skipPriorities) {
             // Make sure yeoman-generator will not throw on empty tasks due to filtered priorities.
-            this.customLifecycle = priorities.length > 0;
+            this.customLifecycle = this.customLifecycle || priorities.length > 0;
             priorities = priorities.filter(priorityName => !this.options.skipPriorities.includes(priorityName));
         }
         return priorities;
     }
+    queueCurrentJHipsterCommandTasks() {
+        this.queueTask({
+            queueName: QUEUES.INITIALIZING_QUEUE,
+            taskName: 'parseCurrentCommand',
+            cancellable: true,
+            async method() {
+                try {
+                    await this.getCurrentJHipsterCommand();
+                }
+                catch {
+                    return;
+                }
+                await this.parseCurrentJHipsterCommand();
+            },
+        });
+        this.queueTask({
+            queueName: QUEUES.PROMPTING_QUEUE,
+            taskName: 'promptCurrentCommand',
+            cancellable: true,
+            async method() {
+                try {
+                    const command = await this.getCurrentJHipsterCommand();
+                    if (!command.configs)
+                        return;
+                }
+                catch {
+                    return;
+                }
+                const taskArgs = this.getArgsForPriority(PRIORITY_NAMES.INITIALIZING);
+                const [{ control }] = taskArgs;
+                if (!control)
+                    throw new Error(`Control object not found in ${this.options.namespace}`);
+                if (!this.shouldAskForPrompts({ control }))
+                    return;
+                await this.promptCurrentJHipsterCommand();
+            },
+        });
+        this.queueTask({
+            queueName: QUEUES.CONFIGURING_QUEUE,
+            taskName: 'configureCurrentCommand',
+            cancellable: true,
+            async method() {
+                try {
+                    const command = await this.getCurrentJHipsterCommand();
+                    if (!command.configs)
+                        return;
+                }
+                catch {
+                    return;
+                }
+                await this.configureCurrentJHipsterCommandConfig();
+            },
+        });
+        this.queueTask({
+            queueName: QUEUES.COMPOSING_QUEUE,
+            taskName: 'composeCurrentCommand',
+            cancellable: true,
+            async method() {
+                try {
+                    await this.getCurrentJHipsterCommand();
+                }
+                catch {
+                    return;
+                }
+                await this.composeCurrentJHipsterCommand();
+            },
+        });
+        this.queueTask({
+            queueName: QUEUES.LOADING_QUEUE,
+            taskName: 'loadCurrentCommand',
+            cancellable: true,
+            async method() {
+                try {
+                    const command = await this.getCurrentJHipsterCommand();
+                    if (!command.configs)
+                        return;
+                }
+                catch {
+                    return;
+                }
+                const taskArgs = this.getArgsForPriority(PRIORITY_NAMES.LOADING);
+                const [{ application }] = taskArgs;
+                await this.loadCurrentJHipsterCommandConfig(application ?? this);
+            },
+        });
+    }
     /**
      * Get the current Command Definition for the generator.
      * `generatorCommand` takes precedence.
@@ -292,18 +391,7 @@ You can ignore this error by passing '--skip-checks' to jhipster command.`);
         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) ?? def.default;
-            }
-            if (def.scope === 'generator') {
-                this[name] = this[name] ?? this.options[name] ?? def.default;
-            }
-            if (def.scope === 'blueprint') {
-                context[name] = context[name] ?? this.blueprintStorage?.get(name) ?? def.default;
-            }
-        });
+        loadConfig.call(this, generatorCommand.configs, { application: context });
     }
     /**
      * @experimental
@@ -363,7 +451,10 @@ You can ignore this error by passing '--skip-checks' to jhipster command.`);
                 else if (optionDesc.scope === 'generator') {
                     this[optionName] = optionValue;
                 }
-                else {
+                else if (optionDesc.scope === 'context') {
+                    this.context[optionName] = optionValue;
+                }
+                else if (optionDesc.scope !== 'none') {
                     throw new Error(`Scope ${optionDesc.scope} not supported`);
                 }
             }
@@ -384,7 +475,7 @@ You can ignore this error by passing '--skip-checks' to jhipster command.`);
                 let argument;
                 if (hasPositionalArguments || argumentDef.type !== Array) {
                     // Positional arguments already parsed or a single argument.
-                    argument = positionalArguments.shift();
+                    argument = Array.isArray(positionalArguments) ? positionalArguments.shift() : positionalArguments;
                 }
                 else {
                     // Varags argument.
@@ -393,9 +484,12 @@ You can ignore this error by passing '--skip-checks' to jhipster command.`);
                 }
                 if (argument !== undefined) {
                     const convertedValue = !argumentDef.type || argumentDef.type === Array ? argument : argumentDef.type(argument);
-                    if ((argumentDef.scope ?? 'generator') === 'generator') {
+                    if (argumentDef.scope === undefined || argumentDef.scope === 'generator') {
                         this[argumentName] = convertedValue;
                     }
+                    else if (argumentDef.scope === 'context') {
+                        this.context[argumentName] = convertedValue;
+                    }
                     else if (argumentDef.scope === 'storage') {
                         this.config.set(argumentName, convertedValue);
                     }
@@ -419,12 +513,12 @@ You can ignore this error by passing '--skip-checks' to jhipster command.`);
         return Object.entries(configs)
             .filter(([_name, def]) => def?.prompt)
             .map(([name, def]) => {
-            const promptSpec = typeof def.prompt === 'function' ? def.prompt(this, def) : { ...def.prompt };
+            let promptSpec = typeof def.prompt === 'function' ? def.prompt(this, def) : { ...def.prompt };
             let storage;
             if ((def.scope ?? 'storage') === 'storage') {
                 storage = this.config;
                 if (promptSpec.default === undefined) {
-                    promptSpec.default = () => this.jhipsterConfigWithDefaults?.[name];
+                    promptSpec = { ...promptSpec, default: () => this.jhipsterConfigWithDefaults?.[name] };
                 }
             }
             else if (def.scope === 'blueprint') {
@@ -436,6 +530,12 @@ You can ignore this error by passing '--skip-checks' to jhipster command.`);
                     setPath: (path, value) => set(this, path, value),
                 };
             }
+            else if (def.scope === 'context') {
+                storage = {
+                    getPath: path => get(this.context, path),
+                    setPath: (path, value) => set(this.context, path, value),
+                };
+            }
             return {
                 name,
                 choices: def.choices,
@@ -453,7 +553,7 @@ You can ignore this error by passing '--skip-checks' to jhipster command.`);
      */
     dateFormatForLiquibase(reproducible) {
         const control = this.sharedData.getControl();
-        reproducible = reproducible ?? control.reproducible;
+        reproducible = reproducible ?? Boolean(control.reproducible);
         // Use started counter or use stored creationTimestamp if creationTimestamp option is passed
         const creationTimestamp = this.options.creationTimestamp ? this.config.get('creationTimestamp') : undefined;
         let now = new Date();
@@ -502,7 +602,7 @@ You can ignore this error by passing '--skip-checks' to jhipster command.`);
         try {
             existingGenerator = this._jhipsterGenerator ?? requireNamespace(this.options.namespace).generator;
         }
-        catch (error) {
+        catch {
             if (this.options.namespace) {
                 const split = this.options.namespace.split(':', 2);
                 existingGenerator = split.length === 1 ? split[0] : split[1];
@@ -520,8 +620,9 @@ You can ignore this error by passing '--skip-checks' to jhipster command.`);
      * Compose with a jhipster generator using default jhipster config.
      * @return {object} the composed generator
      */
-    async composeWithJHipster(generator, options) {
-        assert(typeof generator === 'string', 'generator should to be a string');
+    async composeWithJHipster(gen, options) {
+        assert(typeof gen === 'string', 'generator should to be a string');
+        let generator = gen;
         if (!isAbsolute(generator)) {
             const namespace = generator.includes(':') ? generator : `jhipster:${generator}`;
             if (await this.env.get(namespace)) {
@@ -593,7 +694,7 @@ You can ignore this error by passing '--skip-checks' to jhipster command.`);
                 rmSync(destinationFolder, { recursive: true });
             }
         }
-        catch (error) {
+        catch {
             this.log.log(`Could not remove folder ${destinationFolder}`);
         }
     }
@@ -617,7 +718,6 @@ You can ignore this error by passing '--skip-checks' to jhipster command.`);
      */
     writeFile(source, destination, data = this, options, copyOptions = {}) {
         // Convert to any because ejs types doesn't support string[] https://github.com/DefinitelyTyped/DefinitelyTyped/pull/63315
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         const root = this.jhipsterTemplatesFolders ?? this.templatePath();
         try {
             return this.renderTemplate(source, destination, data, { root, ...options }, { noGlob: true, ...copyOptions });
@@ -713,9 +813,6 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
                     }
                 }
                 sourceFileFrom = existingTemplates.shift();
-                if (sourceFileFrom === undefined) {
-                    throw new Error(`Template file ${sourceFile} was not found at ${rootTemplatesAbsolutePath}`);
-                }
             }
             else if (typeof rootTemplatesAbsolutePath === 'string') {
                 sourceFileFrom = this.templatePath(rootTemplatesAbsolutePath, sourceFile);
@@ -723,7 +820,7 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
             else {
                 sourceFileFrom = this.templatePath(sourceFile);
             }
-            const file = customizeTemplatePath({ sourceFile, resolvedSourceFile: sourceFileFrom, destinationFile: targetFile });
+            const file = customizeTemplatePath.call(this, { sourceFile, resolvedSourceFile: sourceFileFrom, destinationFile: targetFile });
             if (!file) {
                 return undefined;
             }
@@ -731,13 +828,13 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
             targetFile = file.destinationFile;
             let templatesRoots = [].concat(rootTemplatesAbsolutePath);
             for (const contextCustomizeTemplatePath of contextCustomizeTemplatePaths) {
-                const file = contextCustomizeTemplatePath({
+                const file = contextCustomizeTemplatePath.call(this, {
                     namespace: this.options.namespace,
                     sourceFile,
                     resolvedSourceFile: sourceFileFrom,
                     destinationFile: targetFile,
                     templatesRoots,
-                });
+                }, context);
                 if (!file) {
                     return undefined;
                 }
@@ -745,6 +842,9 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
                 targetFile = file.destinationFile;
                 templatesRoots = file.templatesRoots;
             }
+            if (sourceFileFrom === undefined) {
+                throw new Error(`Template file ${sourceFile} was not found at ${rootTemplatesAbsolutePath}`);
+            }
             try {
                 if (!appendEjs && extname(sourceFileFrom) !== '.ejs') {
                     await this.copyTemplateAsync(sourceFileFrom, targetFile);
@@ -785,7 +885,7 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
             catch (error) {
                 throw new Error(`Error rendering template ${sourceFileFrom} to ${targetFile}: ${error}`, { cause: error });
             }
-            if (!isBinary && transform && transform.length) {
+            if (!isBinary && transform?.length) {
                 this.editFile(targetFile, ...transform);
             }
             return targetFile;
@@ -866,7 +966,13 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
                     }
                     const normalizedFile = resolveCallback(sourceFile || file);
                     sourceFile = join(blockPath, normalizedFile);
-                    destinationFile = this.destinationPath(blockTo, join(resolveCallback(destinationFile || renameTo, normalizedFile)));
+                    destinationFile = join(resolveCallback(destinationFile || renameTo, normalizedFile));
+                    if (blockRenameTo) {
+                        destinationFile = this.destinationPath(blockRenameTo.call(this, context, destinationFile, this));
+                    }
+                    else {
+                        destinationFile = this.destinationPath(blockTo, destinationFile);
+                    }
                     const override = resolveCallback(fileSpec.override);
                     if (override !== undefined && !override && this.fs.exists(destinationFile)) {
                         this.log.debug(`skipping file ${destinationFile}`);
@@ -924,7 +1030,7 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
         try {
             originalContent = this.readDestination(filePath);
         }
-        catch (_error) {
+        catch {
             // null return should be treated like an error.
         }
         if (!originalContent) {

package/dist/generators/base-entity-changes/generator.d.ts

@@ -0,0 +1,35 @@
+import GeneratorBaseApplication from '../base-application/index.js';
+import type { TaskTypes as ApplicationTaskTypes } from '../../lib/types/application/tasks.js';
+import type { ApplicationType } from '../../lib/types/application/application.js';
+import type { Entity } from '../../lib/types/application/entity.js';
+import type { BaseChangelog } from './types.js';
+type TaskTypes<E, A> = ApplicationTaskTypes<E, A> & {
+    DefaultTaskParam: {
+        entityChanges?: BaseChangelog[];
+    };
+    WritingEntitiesTaskParam: {
+        entityChanges?: BaseChangelog[];
+    };
+    PostWritingEntitiesTaskParam: {
+        entityChanges?: BaseChangelog[];
+    };
+};
+/**
+ * This is the base class for a generator for every generator.
+ */
+export default abstract class GeneratorBaseEntityChanges<E extends Entity = Entity, A extends ApplicationType<E> = ApplicationType<E>> extends GeneratorBaseApplication<E, A, TaskTypes<E, A>> {
+    recreateInitialChangelog: boolean;
+    private entityChanges;
+    abstract isChangelogNew({ entityName, changelogDate }: {
+        entityName: any;
+        changelogDate: any;
+    }): boolean;
+    protected getTaskFirstArgForPriority(priorityName: any): any;
+    /**
+     * Generate changelog from differences between the liquibase entity and current entity.
+     */
+    protected generateIncrementalChanges(): BaseChangelog[];
+    private hasAnyDefaultValue;
+    private doDefaultValuesDiffer;
+}
+export {};

package/dist/generators/base-entity-changes/index.d.ts

@@ -0,0 +1,19 @@
+/**
+ * Copyright 2013-2024 the original author or authors from the JHipster project.
+ *
+ * This file is part of the JHipster project, see https://www.jhipster.tech/
+ * for more information.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export { default } from './generator.js';

package/dist/generators/base-workspaces/command.d.ts

@@ -0,0 +1,3 @@
+import type { JHipsterCommandDefinition } from '../../lib/command/index.js';
+declare const command: JHipsterCommandDefinition;
+export default command;

package/dist/generators/base-workspaces/generator.d.ts

@@ -0,0 +1,38 @@
+/**
+ * Copyright 2013-2021 the original author or authors from the JHipster project.
+ *
+ * This file is part of the JHipster project, see https://www.jhipster.tech/
+ * for more information.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import BaseGenerator from '../base/index.js';
+/**
+ * This is the base class for a generator that generates entities.
+ */
+export default abstract class BaseWorkspacesGenerator extends BaseGenerator {
+    static PROMPTING_WORKSPACES: string;
+    static CONFIGURING_WORKSPACES: string;
+    static LOADING_WORKSPACES: string;
+    static PREPARING_WORKSPACES: string;
+    appsFolders?: string[];
+    directoryPath: string;
+    constructor(args: any, options: any, features: any);
+    protected loadWorkspacesConfig(opts?: any): void;
+    protected configureWorkspacesConfig(): void;
+    protected askForWorkspacesConfig(): Promise<void>;
+    protected findApplicationFolders(directoryPath?: string): Promise<string[]>;
+    private resolveApplicationFolders;
+    bootstrapApplications(): Promise<void>;
+    getArgsForPriority(priorityName: any): any;
+}

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

@@ -20,11 +20,11 @@ import { readdir } from 'fs/promises';
 import { existsSync } from 'fs';
 import chalk from 'chalk';
 import BaseGenerator from '../base/index.js';
-import { PRIORITY_NAMES, CUSTOM_PRIORITIES } from './priorities.js';
 import { YO_RC_FILE } from '../generator-constants.js';
 import { GENERATOR_BOOTSTRAP_APPLICATION } from '../generator-list.js';
-import command from './command.js';
 import { normalizePathEnd } from '../base/support/path.js';
+import command from './command.js';
+import { CUSTOM_PRIORITIES, PRIORITY_NAMES } from './priorities.js';
 const { PROMPTING_WORKSPACES, CONFIGURING_WORKSPACES, LOADING_WORKSPACES, PREPARING_WORKSPACES, DEFAULT, WRITING, POST_WRITING, PRE_CONFLICTS, INSTALL, END, } = PRIORITY_NAMES;
 /**
  * This is the base class for a generator that generates entities.
@@ -43,7 +43,8 @@ export default class BaseWorkspacesGenerator extends BaseGenerator {
             this.parseJHipsterOptions(command.options);
         }
     }
-    loadWorkspacesConfig({ context = this } = {}) {
+    loadWorkspacesConfig(opts) {
+        const { context = this } = opts ?? {};
         context.appsFolders = this.jhipsterConfig.appsFolders;
         context.directoryPath = this.jhipsterConfig.directoryPath ?? './';
     }

package/dist/generators/base-workspaces/index.d.ts

@@ -0,0 +1,20 @@
+/**
+ * Copyright 2013-2024 the original author or authors from the JHipster project.
+ *
+ * This file is part of the JHipster project, see https://www.jhipster.tech/
+ * for more information.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export { default } from './generator.js';
+export { default as command } from './command.js';

package/dist/generators/base-workspaces/internal/deployments.d.ts

@@ -0,0 +1,5 @@
+import type { GeneratorBaseCore } from '../../index.js';
+export declare function loadDeploymentConfig(this: GeneratorBaseCore, { config, deployment, }?: {
+    config?: any;
+    deployment?: any;
+}): void;

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

@@ -17,8 +17,8 @@
  * limitations under the License.
  */
 import { defaults } from 'lodash-es';
-import { applicationOptions, deploymentOptions } from '../../../jdl/index.js';
-import { loadDerivedPlatformConfig, loadPlatformConfig, loadDerivedServerAndPlatformProperties } from '../../server/support/index.js';
+import { applicationOptions, deploymentOptions } from '../../../lib/jhipster/index.js';
+import { loadDerivedPlatformConfig, loadDerivedServerAndPlatformProperties, loadPlatformConfig } from '../../server/support/index.js';
 const { OptionNames } = applicationOptions;
 const { Options: DeploymentOptions } = deploymentOptions;
 const { JWT_SECRET_KEY } = OptionNames;

package/dist/generators/base-workspaces/internal/docker-base.d.ts

@@ -0,0 +1,19 @@
+export { checkDocker } from '../../docker/support/index.js';
+/**
+ * Check Images
+ */
+export declare function checkImages(): void;
+/**
+ * Generate Jwt Secret
+ */
+export declare function generateJwtSecret(): void;
+/**
+ * Configure Image Names
+ */
+export declare function configureImageNames(): void;
+/**
+ * Load config from this.appFolders
+ */
+export declare function loadConfigs(): Promise<void>;
+export declare function setClusteredApps(): void;
+export declare function loadFromYoRc(): Promise<void>;

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

@@ -1,3 +1,4 @@
+// @ts-nocheck
 /**
  * Copyright 2013-2024 the original author or authors from the JHipster project.
  *
@@ -19,11 +20,13 @@
 import { existsSync } from 'fs';
 import chalk from 'chalk';
 import { convertSecretToBase64, createBase64Secret, removeFieldsWithNullishValues } from '../../base/support/index.js';
-import { applicationTypes, buildToolTypes, getConfigWithDefaults } from '../../../jdl/jhipster/index.js';
+import { applicationTypes, buildToolTypes, getConfigWithDefaults } from '../../../lib/jhipster/index.js';
 import { GENERATOR_JHIPSTER } from '../../generator-constants.js';
 import { loadDeploymentConfig } from '../../base-workspaces/internal/index.js';
 import { loadDerivedAppConfig } from '../../app/support/index.js';
 import { loadDerivedPlatformConfig, loadDerivedServerConfig } from '../../server/support/index.js';
+import { loadCommandConfigsIntoApplication } from '../../../lib/command/load.js';
+import { lookupCommandsConfigs } from '../../../lib/command/lookup-commands-configs.js';
 const { MAVEN } = buildToolTypes;
 const { MONOLITH, MICROSERVICE, GATEWAY } = applicationTypes;
 export { checkDocker } from '../../docker/support/index.js';
@@ -73,7 +76,7 @@ export function configureImageNames() {
 /**
  * Load config from this.appFolders
  */
-export function loadConfigs() {
+export async function loadConfigs() {
     this.appConfigs = [];
     this.gatewayNb = 0;
     this.monolithicNb = 0;
@@ -82,13 +85,18 @@ export function loadConfigs() {
     const getJhipsterConfig = yoRcPath => this.createStorage(yoRcPath, GENERATOR_JHIPSTER);
     // Loading configs
     this.log.debug(`Apps folders: ${this.appsFolders}`);
-    this.appsFolders.forEach((appFolder, index) => {
+    for (const [index, appFolder] of this.appsFolders.entries()) {
         const path = this.destinationPath(`${this.directoryPath + appFolder}`);
         this.log.debug(chalk.red.bold(`App folder ${path}`));
         if (this.fs.exists(`${path}/.yo-rc.json`)) {
             const config = getConfigWithDefaults(removeFieldsWithNullishValues(getJhipsterConfig(`${path}/.yo-rc.json`).getAll()));
             config.composePort = serverPort + index;
             this.log.debug(chalk.red.bold(`${config.baseName} has compose port ${config.composePort} and appIndex ${config.applicationIndex}`));
+            loadCommandConfigsIntoApplication({
+                source: config,
+                application: config,
+                commandsConfigs: this.options.commandsConfigs ?? (await lookupCommandsConfigs()),
+            });
             loadDerivedAppConfig({ application: config });
             loadDerivedPlatformConfig({ application: config });
             loadDerivedServerConfig({ application: config });
@@ -108,7 +116,7 @@ export function loadConfigs() {
         else {
             throw new Error(`Application '${appFolder}' is not found in the path '${this.directoryPath}'`);
         }
-    });
+    }
 }
 export function setClusteredApps() {
     for (let i = 0; i < this.appsFolders.length; i++) {
@@ -117,13 +125,13 @@ export function setClusteredApps() {
         }
     }
 }
-export function loadFromYoRc() {
+export async function loadFromYoRc() {
     loadDeploymentConfig.call(this);
     this.useKafka = false;
     this.usePulsar = false;
     this.useMemcached = false;
     this.useRedis = false;
-    loadConfigs.call(this);
+    await loadConfigs.call(this);
     if (this.microserviceNb > 0 || this.gatewayNb > 0) {
         this.deploymentApplicationType = MICROSERVICE;
     }

package/dist/generators/base-workspaces/internal/docker-dependencies.d.ts

@@ -0,0 +1,3 @@
+export declare function loadDockerDependenciesTask(this: any, { context }?: {
+    context?: any;
+}): Promise<void>;