generator-jhipster 8.11.0 → 9.0.0-beta.1

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

@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2025 the original author or authors from the JHipster project.
+ * Copyright 2013-2026 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.
@@ -16,37 +16,30 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-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 { existsSync, readFileSync, rmSync, statSync } from 'fs';
-import assert from 'assert';
+import assert from 'node:assert';
+import { existsSync, rmSync, statSync } from 'node:fs';
+import { basename, extname, isAbsolute, join, join as joinPath, relative } from 'node:path';
+import { relative as posixRelative } from 'node:path/posix';
 import { requireNamespace } from '@yeoman/namespace';
 import chalk from 'chalk';
-import { parse as parseYaml, stringify as stringifyYaml } from 'yaml';
-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, QUEUES } from '../base/priorities.js';
-import { CRLF, LF, createJHipster7Context, formatDateForChangelog, hasCrlr, joinCallbacks, normalizeLineEndings, 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 baseCommand from '../base/command.js';
-import { GENERATOR_JHIPSTER, YO_RC_FILE } from '../generator-constants.js';
-import { loadConfig, loadDerivedConfig } from '../../lib/internal/index.js';
-import { getGradleLibsVersionsProperties } from '../gradle/support/dependabot-gradle.js';
-import { dockerPlaceholderGenerator } from '../docker/utils.js';
-import { getConfigWithDefaults } from '../../lib/jhipster/index.js';
-import { extractArgumentsFromConfigs } from '../../lib/command/index.js';
+import { get, kebabCase, merge, mergeWith, set, snakeCase } from 'lodash-es';
+import semver, { lt as semverLessThan } from 'semver';
+import { simpleGit } from 'simple-git';
+import { parse as parseYaml, stringify as stringifyYaml } from 'yaml';
+import YeomanGenerator, {} from 'yeoman-generator';
+import { convertConfigToOption, extractArgumentsFromConfigs } from "../../lib/command/index.js";
+import { packageJson } from "../../lib/index.js";
+import { CRLF, LF, hasCrlf, normalizeLineEndings, removeFieldsWithNullishValues } from "../../lib/utils/index.js";
+import baseCommand from "../base/command.js";
+import { dockerPlaceholderGenerator } from "../docker/utils.js";
+import { GENERATOR_JHIPSTER } from "../generator-constants.js";
+import { getGradleLibsVersionsProperties } from "../java-simple-application/generators/gradle/support/dependabot-gradle.js";
+import { convertWriteFileSectionsToBlocks, loadConfig, loadConfigDefaults, loadDerivedConfig } from "./internal/index.js";
+import { createJHipster7Context } from "./internal/jhipster7-context.js";
+import { CUSTOM_PRIORITIES, PRIORITY_NAMES, PRIORITY_PREFIX, QUEUES } from "./priorities.js";
+import { createNeedleCallback, joinCallbacks } from "./support/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);
 const asPriority = (priorityName) => `${PRIORITY_PREFIX}${priorityName}`;
 const relativeDir = (from, to) => {
     const rel = posixRelative(from, to);
@@ -72,16 +65,13 @@ export default class CoreGenerator extends YeomanGenerator {
     static INSTALL = asPriority(INSTALL);
     static POST_INSTALL = asPriority(POST_INSTALL);
     static END = asPriority(END);
-    context;
     useVersionPlaceholders;
     skipChecks;
     ignoreNeedlesError;
     experimental;
     debugEnabled;
-    jhipster7Migration;
     relativeDir = relativeDir;
     relative = posixRelative;
-    sharedData;
     logger;
     jhipsterConfig;
     /**
@@ -96,14 +86,14 @@ export default class CoreGenerator extends YeomanGenerator {
      * Additional commands to be considered
      */
     generatorsToCompose = [];
-    _jhipsterGenerator;
-    _needleApi;
+    #jhipsterGeneratorRelativePath_;
     constructor(args, options, features) {
         super(args, options, {
             skipParseOptions: true,
             tasksMatchingPriority: true,
             taskPrefix: PRIORITY_PREFIX,
             unique: 'namespace',
+            disableInGeneratorOptionsSupport: true,
             ...features,
         });
         if (!this.options.help) {
@@ -111,70 +101,43 @@ export default class CoreGenerator extends YeomanGenerator {
             this._config = this._getStorage('generator-jhipster');
             /* JHipster config using proxy mode used as a plain object instead of using get/set. */
             this.jhipsterConfig = this.config.createProxy();
-            this.sharedData = this.createSharedData({ help: this.options.help });
             /* Options parsing must be executed after forcing jhipster storage namespace and after sharedData have been populated */
-            this.parseJHipsterOptions(baseCommand.options);
-            // Don't write jhipsterVersion to .yo-rc.json when reproducible
-            if (this.options.namespace.startsWith('jhipster:') &&
-                !this.options.namespace.startsWith('jhipster:bootstrap') &&
-                this.getFeatures().storeJHipsterVersion !== false &&
-                !this.options.reproducibleTests &&
-                !this.jhipsterConfig.jhipsterVersion) {
-                this.storeCurrentJHipsterVersion();
-            }
+            this.#parseJHipsterConfigs(baseCommand.configs);
         }
         this.logger = this.log;
         if (this.options.help) {
             return;
         }
         this.registerPriorities(CUSTOM_PRIORITIES);
-        if (this.getFeatures().jhipsterBootstrap ?? true) {
-            // jhipster:bootstrap is always required. Run it once the environment starts.
-            this.env.queueTask('environment:run', async () => this.composeWithJHipster(GENERATOR_BOOTSTRAP).then(), {
-                once: 'queueJhipsterBootstrap',
-                startQueue: false,
-            });
-        }
+        const { blueprintSupport = false, queueCommandTasks = true } = this.features;
         // Add base template folder.
         this.jhipsterTemplatesFolders = [this.templatePath()];
-        this.jhipster7Migration = this.features.jhipster7Migration ?? false;
-        if (this.features.queueCommandTasks === true) {
+        if (!blueprintSupport && queueCommandTasks) {
             this.on('before:queueOwnTasks', () => {
-                this.queueCurrentJHipsterCommandTasks();
+                this._queueCurrentJHipsterCommandTasks();
             });
         }
     }
+    get context() {
+        return undefined;
+    }
     /**
      * Override yeoman generator's usage function to fine tune --help message.
      */
     usage() {
         return super.usage().replace('yo jhipster:', 'jhipster ');
     }
-    storeCurrentJHipsterVersion() {
-        this.jhipsterConfig.jhipsterVersion = packageJson.version;
-    }
     /**
-     * @deprecated
+     * JHipster config with default values fallback
      */
-    get needleApi() {
-        if (this._needleApi === undefined || this._needleApi === null) {
-            this._needleApi = new NeedleApi(this);
-        }
-        return this._needleApi;
+    get jhipsterConfigWithDefaults() {
+        return removeFieldsWithNullishValues(this.config.getAll());
     }
     /**
-     * JHipster config with default values fallback
+     * Utility method to get typed objects for autocomplete.
      */
-    get jhipsterConfigWithDefaults() {
-        const configWithDefaults = getConfigWithDefaults(removeFieldsWithNullishValues(this.config.getAll()));
-        defaults(configWithDefaults, {
-            skipFakeData: false,
-            skipCheckLengthOfIdentifier: false,
-            enableGradleEnterprise: false,
-            autoCrlf: false,
-            pages: [],
-        });
-        return configWithDefaults;
+    asAnyTaskGroup(taskGroup) {
+        return taskGroup;
     }
     /**
      * Warn or throws check failure based on current skipChecks option.
@@ -189,15 +152,6 @@ export default class CoreGenerator extends YeomanGenerator {
 You can ignore this error by passing '--skip-checks' to jhipster command.`);
         }
     }
-    /**
-     * Check if the JHipster version used to generate an existing project is less than the passed version argument
-     *
-     * @param {string} version - A valid semver version string
-     */
-    isJhipsterVersionLessThan(version) {
-        const jhipsterOldVersion = this.sharedData.getControl().jhipsterOldVersion;
-        return this.isVersionLessThan(jhipsterOldVersion, version);
-    }
     /**
      * Wrapper for `semver.lt` to check if the oldVersion exists and is less than the newVersion.
      * Can be used by blueprints.
@@ -208,38 +162,14 @@ You can ignore this error by passing '--skip-checks' to jhipster command.`);
     /**
      * Get arguments for the priority
      */
-    getArgsForPriority(priorityName) {
-        const control = this.sharedData.getControl();
-        if (priorityName === POST_WRITING || priorityName === PREPARING || priorityName === POST_PREPARING) {
-            const source = this.sharedData.getSource();
-            return [{ control, source }];
-        }
-        if (priorityName === WRITING) {
-            if (existsSync(this.destinationPath(YO_RC_FILE))) {
-                try {
-                    const oldConfig = JSON.parse(readFileSync(this.destinationPath(YO_RC_FILE)).toString())[GENERATOR_JHIPSTER];
-                    const newConfig = this.config.getAll();
-                    const keys = [...new Set([...Object.keys(oldConfig), ...Object.keys(newConfig)])];
-                    const configChanges = Object.fromEntries(keys
-                        .filter(key => Array.isArray(newConfig[key])
-                        ? newConfig[key].length === oldConfig[key].length &&
-                            newConfig[key].find((element, index) => element !== oldConfig[key][index])
-                        : newConfig[key] !== oldConfig[key])
-                        .map(key => [key, { newValue: newConfig[key], oldValue: oldConfig[key] }]));
-                    return [{ control, configChanges }];
-                }
-                catch {
-                    // Fail to parse
-                }
-            }
-        }
-        return [{ control }];
+    getArgsForPriority(_priorityName) {
+        return [{}];
     }
     /**
      * Check if the generator should ask for prompts.
      */
-    shouldAskForPrompts({ control }) {
-        return !control.existingProject || this.options.askAnswered === true;
+    shouldAskForPrompts(_firstArg) {
+        return true;
     }
     /**
      * Override yeoman-generator method that gets methods to be queued, filtering the result.
@@ -253,19 +183,19 @@ You can ignore this error by passing '--skip-checks' to jhipster command.`);
         }
         return priorities;
     }
-    queueCurrentJHipsterCommandTasks() {
+    _queueCurrentJHipsterCommandTasks() {
         this.queueTask({
             queueName: QUEUES.INITIALIZING_QUEUE,
             taskName: 'parseCurrentCommand',
             cancellable: true,
             async method() {
                 try {
-                    await this.getCurrentJHipsterCommand();
+                    await this.#getCurrentJHipsterCommand();
                 }
                 catch {
                     return;
                 }
-                await this.parseCurrentJHipsterCommand();
+                await this.#parseCurrentJHipsterCommand();
             },
         });
         this.queueTask({
@@ -274,20 +204,17 @@ You can ignore this error by passing '--skip-checks' to jhipster command.`);
             cancellable: true,
             async method() {
                 try {
-                    const command = await this.getCurrentJHipsterCommand();
+                    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 }))
+                const [firstArg] = this.getArgsForPriority(PRIORITY_NAMES.INITIALIZING);
+                if (!this.shouldAskForPrompts(firstArg))
                     return;
-                await this.promptCurrentJHipsterCommand();
+                await this.#promptCurrentJHipsterCommand();
             },
         });
         this.queueTask({
@@ -296,14 +223,14 @@ You can ignore this error by passing '--skip-checks' to jhipster command.`);
             cancellable: true,
             async method() {
                 try {
-                    const command = await this.getCurrentJHipsterCommand();
+                    const command = await this.#getCurrentJHipsterCommand();
                     if (!command.configs)
                         return;
                 }
                 catch {
                     return;
                 }
-                await this.configureCurrentJHipsterCommandConfig();
+                await this.#configureCurrentJHipsterCommandConfig();
             },
         });
         this.queueTask({
@@ -312,30 +239,80 @@ You can ignore this error by passing '--skip-checks' to jhipster command.`);
             cancellable: true,
             async method() {
                 try {
-                    await this.getCurrentJHipsterCommand();
+                    await this.#getCurrentJHipsterCommand();
                 }
                 catch {
                     return;
                 }
-                await this.composeCurrentJHipsterCommand();
+                await this.#composeCurrentJHipsterCommand();
             },
         });
+        const { loadCommand = [], skipLoadCommand } = this.features;
         this.queueTask({
             queueName: QUEUES.LOADING_QUEUE,
             taskName: 'loadCurrentCommand',
             cancellable: true,
             async method() {
-                try {
-                    const command = await this.getCurrentJHipsterCommand();
-                    if (!command.configs)
-                        return;
-                    const taskArgs = this.getArgsForPriority(PRIORITY_NAMES.LOADING);
-                    const [{ application }] = taskArgs;
-                    loadConfig.call(this, command.configs, { application: application ?? this });
-                    loadDerivedConfig(command.configs, { application });
+                if (!skipLoadCommand) {
+                    try {
+                        const command = await this.#getCurrentJHipsterCommand();
+                        if (!command.configs)
+                            return;
+                        const context = this.context;
+                        loadConfig.call(this, command.configs, { application: context });
+                        loadDerivedConfig(command.configs, { application: context });
+                    }
+                    catch {
+                        // Ignore non existing command
+                    }
+                    const split = this.options.namespace.split(':');
+                    if (split.length === 3 && split[2] === 'bootstrap') {
+                        const parentMeta = this.env.getGeneratorMeta(this.options.namespace.replace(':bootstrap', ''));
+                        const parentModule = await parentMeta?.importModule?.();
+                        if (parentModule?.command?.configs) {
+                            const context = this.context;
+                            if (context) {
+                                loadConfig.call(this, parentModule.command.configs, { application: context });
+                                loadDerivedConfig(parentModule.command.configs, { application: context });
+                            }
+                        }
+                    }
                 }
-                catch {
-                    // Ignore non existing command
+                if (loadCommand.length > 0) {
+                    const context = this.context;
+                    for (const commandToLoad of loadCommand) {
+                        if (commandToLoad.configs) {
+                            loadConfig.call(this, commandToLoad.configs, { application: context });
+                            loadDerivedConfig(commandToLoad.configs, { application: context });
+                        }
+                    }
+                }
+            },
+        });
+        this.queueTask({
+            queueName: QUEUES.PREPARING_QUEUE,
+            taskName: 'preparingCurrentCommand',
+            cancellable: true,
+            async method() {
+                if (!skipLoadCommand) {
+                    try {
+                        const command = await this.#getCurrentJHipsterCommand();
+                        if (!command.configs)
+                            return;
+                        const context = this.context;
+                        loadConfigDefaults(command.configs, { context, scopes: ['blueprint', 'storage', 'context'] });
+                    }
+                    catch {
+                        // Ignore non existing command
+                    }
+                }
+                if (loadCommand.length > 0) {
+                    const context = this.context;
+                    for (const commandToLoad of loadCommand) {
+                        if (commandToLoad.configs) {
+                            loadConfigDefaults(commandToLoad.configs, { context, scopes: ['blueprint', 'storage', 'context'] });
+                        }
+                    }
                 }
             },
         });
@@ -344,7 +321,7 @@ You can ignore this error by passing '--skip-checks' to jhipster command.`);
      * Get the current Command Definition for the generator.
      * `generatorCommand` takes precedence.
      */
-    async getCurrentJHipsterCommand() {
+    async #getCurrentJHipsterCommand() {
         if (!this.generatorCommand) {
             const { command } = ((await this._meta?.importModule?.()) ?? {});
             if (!command) {
@@ -359,32 +336,32 @@ You can ignore this error by passing '--skip-checks' to jhipster command.`);
      * Parse command definition arguments, options and configs.
      * Blueprints with command override takes precedence.
      */
-    async parseCurrentJHipsterCommand() {
-        const generatorCommand = await this.getCurrentJHipsterCommand();
-        this.parseJHipsterCommand(generatorCommand);
+    async #parseCurrentJHipsterCommand() {
+        const generatorCommand = await this.#getCurrentJHipsterCommand();
+        this.#parseJHipsterCommand(generatorCommand);
     }
     /**
      * Prompts for command definition configs.
      * Blueprints with command override takes precedence.
      */
-    async promptCurrentJHipsterCommand() {
-        const generatorCommand = await this.getCurrentJHipsterCommand();
+    async #promptCurrentJHipsterCommand() {
+        const generatorCommand = await this.#getCurrentJHipsterCommand();
         if (!generatorCommand.configs) {
             throw new Error(`Configs not found for generator ${this.options.namespace}`);
         }
-        return this.prompt(this.prepareQuestions(generatorCommand.configs));
+        return this.prompt(this.#prepareQuestions(generatorCommand.configs));
     }
     /**
      * Configure the current JHipster command.
      * Blueprints with command override takes precedence.
      */
-    async configureCurrentJHipsterCommandConfig() {
-        const generatorCommand = await this.getCurrentJHipsterCommand();
+    async #configureCurrentJHipsterCommandConfig() {
+        const generatorCommand = await this.#getCurrentJHipsterCommand();
         if (!generatorCommand.configs) {
             throw new Error(`Configs not found for generator ${this.options.namespace}`);
         }
-        for (const def of Object.values(generatorCommand.configs)) {
-            def.configure?.(this);
+        for (const [name, def] of Object.entries(generatorCommand.configs)) {
+            def.configure?.(this, this.options[name]);
         }
     }
     /**
@@ -392,7 +369,7 @@ You can ignore this error by passing '--skip-checks' to jhipster command.`);
      * Blueprints with command override takes precedence.
      */
     async loadCurrentJHipsterCommandConfig(context) {
-        const generatorCommand = await this.getCurrentJHipsterCommand();
+        const generatorCommand = await this.#getCurrentJHipsterCommand();
         if (!generatorCommand.configs) {
             throw new Error(`Configs not found for generator ${this.options.namespace}`);
         }
@@ -403,8 +380,8 @@ You can ignore this error by passing '--skip-checks' to jhipster command.`);
      * Compose the current JHipster command compose.
      * Blueprints commands compose without generators will be composed.
      */
-    async composeCurrentJHipsterCommand() {
-        const generatorCommand = await this.getCurrentJHipsterCommand();
+    async #composeCurrentJHipsterCommand() {
+        const generatorCommand = await this.#getCurrentJHipsterCommand();
         for (const compose of generatorCommand.compose ?? []) {
             await this.composeWithJHipster(compose);
         }
@@ -412,63 +389,62 @@ You can ignore this error by passing '--skip-checks' to jhipster command.`);
             await this.composeWithJHipster(compose);
         }
     }
-    parseJHipsterCommand(commandDef) {
+    #parseJHipsterCommand(commandDef) {
         if (commandDef.arguments) {
-            this.parseJHipsterArguments(commandDef.arguments);
+            this._parseJHipsterArguments(commandDef.arguments);
         }
         else if (commandDef.configs) {
-            this.parseJHipsterArguments(extractArgumentsFromConfigs(commandDef.configs));
+            this._parseJHipsterArguments(extractArgumentsFromConfigs(commandDef.configs));
         }
-        if (commandDef.options || commandDef.configs) {
-            this.parseJHipsterOptions(commandDef.options, commandDef.configs);
+        if (commandDef.configs) {
+            this.#parseJHipsterConfigs(commandDef.configs);
         }
     }
-    parseJHipsterOptions(options, configs = {}, common = false) {
-        if (typeof configs === 'boolean') {
-            common = configs;
-            configs = {};
-        }
-        Object.entries(options ?? {})
-            .concat(Object.entries(configs).map(([name, def]) => [name, convertConfigToOption(name, def)]))
-            .forEach(([optionName, optionDesc]) => {
-            if (!optionDesc?.type || !optionDesc.scope || (common && optionDesc.scope === 'generator'))
+    #parseJHipsterConfigs(configs = {}, common = false) {
+        Object.entries(configs).forEach(([optionName, configDesc]) => {
+            const optionsDesc = convertConfigToOption(optionName, configDesc);
+            if (!optionsDesc || !optionsDesc.type || (common && configDesc.scope === 'generator'))
                 return;
             let optionValue;
+            const { name, type } = optionsDesc;
+            const envName = configDesc.cli?.env;
             // Hidden options are test options, which doesn't rely on commander for options parsing.
             // We must parse environment variables manually
-            if (this.options[optionDesc.name ?? optionName] === undefined && optionDesc.env && process.env[optionDesc.env]) {
-                optionValue = process.env[optionDesc.env];
+            if (this.options[name] === undefined && envName && process.env[envName]) {
+                optionValue = process.env[envName];
             }
             else {
-                optionValue = this.options[optionDesc.name ?? optionName];
+                optionValue = this.options[name];
             }
             if (optionValue !== undefined) {
-                optionValue = optionDesc.type !== Array && optionDesc.type !== Function ? optionDesc.type(optionValue) : optionValue;
-                if (optionDesc.scope === 'storage') {
+                optionValue = type !== Array && type !== Function ? type(optionValue) : optionValue;
+                if (optionsDesc.scope === 'storage') {
                     this.config.set(optionName, optionValue);
                 }
-                else if (optionDesc.scope === 'blueprint') {
+                else if (optionsDesc.scope === 'blueprint') {
+                    if (!this.blueprintStorage) {
+                        throw new Error('Blueprint storage is not initialized');
+                    }
                     this.blueprintStorage.set(optionName, optionValue);
                 }
-                else if (optionDesc.scope === 'control') {
-                    this.sharedData.getControl()[optionName] = optionValue;
-                }
-                else if (optionDesc.scope === 'generator') {
+                else if (optionsDesc.scope === 'generator') {
                     this[optionName] = optionValue;
                 }
-                else if (optionDesc.scope === 'context') {
+                else if (optionsDesc.scope === 'context') {
                     this.context[optionName] = optionValue;
                 }
-                else if (optionDesc.scope !== 'none') {
-                    throw new Error(`Scope ${optionDesc.scope} not supported`);
+                else if (optionsDesc.scope !== 'none') {
+                    throw new Error(`Scope ${optionsDesc.scope} not supported`);
                 }
             }
-            else if (optionDesc.default !== undefined && optionDesc.scope === 'generator' && this[optionName] === undefined) {
-                this[optionName] = optionDesc.default;
+            else if (optionsDesc.default !== undefined &&
+                optionsDesc.scope === 'generator' &&
+                this[optionName] === undefined) {
+                this[optionName] = optionsDesc.default;
             }
         });
     }
-    parseJHipsterArguments(jhipsterArguments = {}) {
+    _parseJHipsterArguments(jhipsterArguments = {}) {
         const hasPositionalArguments = Boolean(this.options.positionalArguments);
         let positionalArguments = hasPositionalArguments ? this.options.positionalArguments : this._args;
         const argumentEntries = Object.entries(jhipsterArguments);
@@ -483,7 +459,7 @@ You can ignore this error by passing '--skip-checks' to jhipster command.`);
                     argument = Array.isArray(positionalArguments) ? positionalArguments.shift() : positionalArguments;
                 }
                 else {
-                    // Varags argument.
+                    // Varargs argument.
                     argument = positionalArguments;
                     positionalArguments = [];
                 }
@@ -501,6 +477,9 @@ You can ignore this error by passing '--skip-checks' to jhipster command.`);
                         this.config.set(argumentName, convertedValue);
                     }
                     else if (argumentDef.scope === 'blueprint') {
+                        if (!this.blueprintStorage) {
+                            throw new Error('Blueprint storage is not initialized');
+                        }
                         this.blueprintStorage.set(argumentName, convertedValue);
                     }
                 }
@@ -516,7 +495,7 @@ You can ignore this error by passing '--skip-checks' to jhipster command.`);
         // Arguments should only be parsed by the root generator, cleanup to don't be forwarded.
         this.options.positionalArguments = [];
     }
-    prepareQuestions(configs = {}) {
+    #prepareQuestions(configs = {}) {
         return Object.entries(configs)
             .filter(([_name, def]) => def?.prompt)
             .map(([name, def]) => {
@@ -525,21 +504,24 @@ You can ignore this error by passing '--skip-checks' to jhipster command.`);
             if ((def.scope ?? 'storage') === 'storage') {
                 storage = this.config;
                 if (promptSpec.default === undefined) {
-                    promptSpec = { ...promptSpec, default: () => this.jhipsterConfigWithDefaults?.[name] };
+                    promptSpec = { ...promptSpec, default: () => this.jhipsterConfigWithDefaults[name] };
                 }
             }
             else if (def.scope === 'blueprint') {
+                if (!this.blueprintStorage) {
+                    throw new Error('Blueprint storage is not initialized');
+                }
                 storage = this.blueprintStorage;
             }
             else if (def.scope === 'generator') {
                 storage = {
-                    getPath: path => get(this, path),
+                    getPath: (path) => get(this, path),
                     setPath: (path, value) => set(this, path, value),
                 };
             }
             else if (def.scope === 'context') {
                 storage = {
-                    getPath: path => get(this.context, path),
+                    getPath: (path) => get(this.context, path),
                     setPath: (path, value) => set(this.context, path, value),
                 };
             }
@@ -551,82 +533,53 @@ You can ignore this error by passing '--skip-checks' to jhipster command.`);
             };
         });
     }
-    /**
-     * Generate a date to be used by Liquibase changelogs.
-     *
-     * @param {Boolean} [reproducible=true] - Set true if the changelog date can be reproducible.
-     *                                 Set false to create a changelog date incrementing the last one.
-     * @return {String} Changelog date.
-     */
-    dateFormatForLiquibase(reproducible) {
-        const control = this.sharedData.getControl();
-        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();
-        // Miliseconds is ignored for changelogDate.
-        now.setMilliseconds(0);
-        // Run reproducible timestamp when regenerating the project with reproducible option or an specific timestamp.
-        if (reproducible || creationTimestamp) {
-            if (control.reproducibleLiquibaseTimestamp) {
-                // Counter already started.
-                now = control.reproducibleLiquibaseTimestamp;
-            }
-            else {
-                // Create a new counter
-                const newCreationTimestamp = creationTimestamp ?? this.config.get('creationTimestamp');
-                now = newCreationTimestamp ? new Date(newCreationTimestamp) : now;
-                now.setMilliseconds(0);
-            }
-            now.setMinutes(now.getMinutes() + 1);
-            control.reproducibleLiquibaseTimestamp = now;
-            // Reproducible build can create future timestamp, save it.
-            const lastLiquibaseTimestamp = this.jhipsterConfig.lastLiquibaseTimestamp;
-            if (!lastLiquibaseTimestamp || now.getTime() > lastLiquibaseTimestamp) {
-                this.config.set('lastLiquibaseTimestamp', now.getTime());
+    get #jhipsterGeneratorRelativePath() {
+        if (!this.#jhipsterGeneratorRelativePath_) {
+            try {
+                this.#jhipsterGeneratorRelativePath_ = requireNamespace(this.options.namespace).generator.replace(':', '/generators/');
             }
-        }
-        else {
-            // Get and store lastLiquibaseTimestamp, a future timestamp can be used
-            let lastLiquibaseTimestamp = this.jhipsterConfig.lastLiquibaseTimestamp;
-            if (lastLiquibaseTimestamp) {
-                lastLiquibaseTimestamp = new Date(lastLiquibaseTimestamp);
-                if (lastLiquibaseTimestamp >= now) {
-                    now = lastLiquibaseTimestamp;
-                    now.setSeconds(now.getSeconds() + 1);
-                    now.setMilliseconds(0);
-                }
+            catch {
+                throw new Error('Could not determine the generator name');
             }
-            this.jhipsterConfig.lastLiquibaseTimestamp = now.getTime();
         }
-        return formatDateForChangelog(now);
+        return this.#jhipsterGeneratorRelativePath_;
     }
     /**
      * Alternative templatePath that fetches from the blueprinted generator, instead of the blueprint.
      */
     jhipsterTemplatePath(...path) {
-        let existingGenerator;
-        try {
-            existingGenerator = this._jhipsterGenerator ?? requireNamespace(this.options.namespace).generator;
-        }
-        catch {
-            if (this.options.namespace) {
-                const split = this.options.namespace.split(':', 2);
-                existingGenerator = split.length === 1 ? split[0] : split[1];
-            }
-            else {
-                throw new Error('Could not determine the generator name');
-            }
-        }
-        this._jhipsterGenerator = existingGenerator;
-        return this._jhipsterGenerator
-            ? this.fetchFromInstalledJHipster(this._jhipsterGenerator, 'templates', ...path)
-            : this.templatePath(...path);
+        return this.fetchFromInstalledJHipster(this.#jhipsterGeneratorRelativePath, 'templates', ...path);
+    }
+    /**
+     * Returns the resources path in the blueprinted jhipster generator
+     */
+    jhipsterResourcesPath(...path) {
+        return this.fetchFromInstalledJHipster(this.#jhipsterGeneratorRelativePath, 'resources', ...path);
+    }
+    /**
+     * Reads a resource file from the generator
+     */
+    readResource(path) {
+        return this.fs.read(this.templatePath('../resources', path));
+    }
+    /**
+     * Reads a resource file from the blueprinted jhipster generator
+     */
+    readJHipsterResource(path) {
+        return this.fs.read(this.jhipsterResourcesPath(path));
+    }
+    async dependsOnJHipster(generator, options) {
+        return this.composeWithJHipster(generator, {
+            ...options,
+            schedule: false,
+        });
     }
     /**
-     * Compose with a jhipster generator using default jhipster config.
-     * @return {object} the composed generator
+     * Compose with a jhipster bootstrap generator using default jhipster config, but queue it immediately.
      */
+    dependsOnBootstrap(gen, options) {
+        return this.dependsOnJHipster(`jhipster:${gen}:bootstrap`, options);
+    }
     async composeWithJHipster(gen, options) {
         assert(typeof gen === 'string', 'generator should to be a string');
         let generator = gen;
@@ -649,15 +602,6 @@ You can ignore this error by passing '--skip-checks' to jhipster command.`);
             },
         });
     }
-    /**
-     * Compose with a jhipster generator using default jhipster config, but queue it immediately.
-     */
-    async dependsOnJHipster(generator, options) {
-        return this.composeWithJHipster(generator, {
-            ...options,
-            schedule: false,
-        });
-    }
     /**
      * Remove File
      */
@@ -701,7 +645,7 @@ You can ignore this error by passing '--skip-checks' to jhipster command.`);
      */
     fetchFromInstalledJHipster(...path) {
         if (path) {
-            return joinPath(__dirname, '..', ...path);
+            return joinPath(import.meta.dirname, '..', ...path);
         }
         return path;
     }
@@ -731,24 +675,25 @@ You can ignore this error by passing '--skip-checks' to jhipster command.`);
         const paramCount = Object.keys(options).filter(key => ['sections', 'blocks', 'templates'].includes(key)).length;
         assert(paramCount > 0, 'One of sections, blocks or templates is required');
         assert(paramCount === 1, 'Only one of sections, blocks or templates must be provided');
-        const { sections, blocks, context = this, templates } = options;
+        let { context: templateData = {} } = options;
         const { rootTemplatesPath, customizeTemplatePath = file => file, transform: methodTransform = [] } = options;
-        const { _: commonSpec = {} } = sections || {};
-        const { transform: sectionTransform = [] } = commonSpec;
         const startTime = new Date().getMilliseconds();
-        const { customizeTemplatePaths: contextCustomizeTemplatePaths = [] } = context;
-        const templateData = this.jhipster7Migration
-            ? createJHipster7Context(this, context, { log: this.jhipster7Migration === 'verbose' ? msg => this.log.info(msg) : () => { } })
-            : context;
+        const { customizeTemplatePaths: contextCustomizeTemplatePaths = [] } = templateData;
+        const { jhipster7Migration } = this.features;
+        if (jhipster7Migration) {
+            templateData = createJHipster7Context(this, options.context ?? {}, {
+                log: jhipster7Migration === 'verbose' ? (msg) => this.log.info(msg) : () => { },
+            });
+        }
         /* Build lookup order first has preference.
          * Example
          * rootTemplatesPath = ['reactive', 'common']
-         * jhipsterTemplatesFolders = ['/.../generator-jhispter-blueprint/server/templates', '/.../generator-jhispter/server/templates']
+         * jhipsterTemplatesFolders = ['/.../generator-jhipster-blueprint/server/templates', '/.../generator-jhipster/server/templates']
          *
-         * /.../generator-jhispter-blueprint/server/templates/reactive/templatePath
-         * /.../generator-jhispter-blueprint/server/templates/common/templatePath
-         * /.../generator-jhispter/server/templates/reactive/templatePath
-         * /.../generator-jhispter/server/templates/common/templatePath
+         * /.../generator-jhipster-blueprint/server/templates/reactive/templatePath
+         * /.../generator-jhipster-blueprint/server/templates/common/templatePath
+         * /.../generator-jhipster/server/templates/reactive/templatePath
+         * /.../generator-jhipster/server/templates/common/templatePath
          */
         let rootTemplatesAbsolutePath;
         if (!rootTemplatesPath) {
@@ -762,7 +707,7 @@ You can ignore this error by passing '--skip-checks' to jhipster command.`);
                 .map(templateFolder => [].concat(rootTemplatesPath).map(relativePath => join(templateFolder, relativePath)))
                 .flat();
         }
-        const normalizeEjs = file => file.replace('.ejs', '');
+        const normalizeEjs = (file) => file.replace('.ejs', '');
         const resolveCallback = (maybeCallback, fallback) => {
             if (maybeCallback === undefined) {
                 if (typeof fallback === 'function') {
@@ -778,7 +723,7 @@ You can ignore this error by passing '--skip-checks' to jhipster command.`);
             }
             throw new Error(`Type not supported ${maybeCallback}`);
         };
-        const renderTemplate = async ({ condition, sourceFile, destinationFile, options, noEjs, transform, binary }) => {
+        const renderTemplate = async ({ condition, sourceFile, destinationFile, options, noEjs, transform, binary, }) => {
             if (condition !== undefined && !resolveCallback(condition, true)) {
                 return undefined;
             }
@@ -798,7 +743,7 @@ You can ignore this error by passing '--skip-checks' to jhipster command.`);
                 let existingTemplates = rootTemplatesAbsolutePath
                     .map(rootPath => this.templatePath(rootPath, sourceFile))
                     .filter(templateFile => existsSync(appendEjs ? `${templateFile}.ejs` : templateFile));
-                if (existingTemplates.length === 0 && this.getFeatures().jhipster7Migration) {
+                if (existingTemplates.length === 0 && jhipster7Migration) {
                     existingTemplates = rootTemplatesAbsolutePath
                         .map(rootPath => this.templatePath(rootPath, appendEjs ? sourceFile : `${sourceFile}.ejs`))
                         .filter(templateFile => existsSync(templateFile));
@@ -835,7 +780,7 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
                     resolvedSourceFile: sourceFileFrom,
                     destinationFile: targetFile,
                     templatesRoots,
-                }, context);
+                }, templateData);
                 if (!file) {
                     return undefined;
                 }
@@ -852,20 +797,17 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
                 }
                 else {
                     let useAsync = true;
-                    if (context.entityClass) {
-                        if (!context.baseName) {
+                    if (templateData.entityClass) {
+                        if (!templateData.baseName) {
                             throw new Error('baseName is required at templates context');
                         }
                         const sourceBasename = basename(sourceFileFrom);
-                        const seed = `${context.entityClass}-${sourceBasename}${context.fakerSeed ?? ''}`;
-                        Object.values(this.sharedData.getApplication()?.sharedEntities ?? {}).forEach((entity) => {
-                            entity.resetFakerSeed(seed);
-                        });
+                        this.emit('before:render', sourceBasename, templateData);
                         // Async calls will make the render method to be scheduled, allowing the faker key to change in the meantime.
                         useAsync = false;
                     }
                     const renderOptions = {
-                        ...(options?.renderOptions ?? {}),
+                        ...options?.renderOptions,
                         // Set root for ejs to lookup for partials.
                         root: templatesRoots,
                         // ejs caching cause problem https://github.com/jhipster/generator-jhipster/pull/20757
@@ -891,32 +833,14 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
             }
             return targetFile;
         };
-        let parsedBlocks = blocks;
-        if (sections) {
-            assert(typeof sections === 'object', 'sections must be an object');
-            const parsedSections = Object.entries(sections)
-                .map(([sectionName, sectionBlocks]) => {
-                if (sectionName.startsWith('_'))
-                    return undefined;
-                assert(Array.isArray(sectionBlocks), `Section must be an array for ${sectionName}`);
-                return { sectionName, sectionBlocks };
-            })
-                .filter(Boolean);
-            parsedBlocks = parsedSections
-                .map(({ sectionName, sectionBlocks }) => {
-                return sectionBlocks.map((block, blockIdx) => {
-                    const blockSpecPath = `${sectionName}[${blockIdx}]`;
-                    assert(typeof block === 'object', `Block must be an object for ${blockSpecPath}`);
-                    return { blockSpecPath, ...block };
-                });
-            })
-                .flat();
-        }
         let parsedTemplates;
-        if (parsedBlocks) {
-            parsedTemplates = parsedBlocks
+        if ('sections' in options || 'blocks' in options) {
+            const sectionTransform = 'sections' in options ? (options.sections._?.transform ?? []) : [];
+            parsedTemplates = ('sections' in options ? convertWriteFileSectionsToBlocks(options.sections) : options.blocks)
                 .map((block, blockIdx) => {
-                const { blockSpecPath = `${blockIdx}`, path: blockPathValue = './', from: blockFromCallback, to: blockToCallback, condition: blockConditionCallback, transform: blockTransform = [], renameTo: blockRenameTo, } = block;
+                const { path: blockPathValue = './', from: blockFromCallback, to: blockToCallback, condition: blockConditionCallback, transform: blockTransform = [], renameTo: blockRenameTo, } = block;
+                // Temporary variable added to identify section/block
+                const blockSpecPath = 'blockSpecPath' in block ? block.blockSpecPath : `${blockIdx}`;
                 assert(typeof block === 'object', `Block must be an object for ${blockSpecPath}`);
                 assert(Array.isArray(block.templates), `Block templates must be an array for ${blockSpecPath}`);
                 const condition = resolveCallback(blockConditionCallback);
@@ -932,9 +856,9 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
                     const fileSpecPath = `${blockSpecPath}[${fileIdx}]`;
                     assert(typeof fileSpec === 'object' || typeof fileSpec === 'string' || typeof fileSpec === 'function', `File must be an object, a string or a function for ${fileSpecPath}`);
                     if (typeof fileSpec === 'function') {
-                        fileSpec = fileSpec.call(this, context);
+                        fileSpec = fileSpec.call(this, templateData);
                     }
-                    let { noEjs } = fileSpec;
+                    let noEjs;
                     let derivedTransform;
                     if (typeof blockTransform === 'boolean') {
                         noEjs = !blockTransform;
@@ -947,7 +871,7 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
                         const sourceFile = join(blockPath, fileSpec);
                         let destinationFile;
                         if (blockRenameTo) {
-                            destinationFile = this.destinationPath(blockRenameTo.call(this, context, fileSpec, this));
+                            destinationFile = this.destinationPath(blockRenameTo.call(this, templateData, fileSpec));
                         }
                         else {
                             destinationFile = this.destinationPath(blockTo, fileSpec);
@@ -969,7 +893,7 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
                     sourceFile = join(blockPath, normalizedFile);
                     destinationFile = join(resolveCallback(destinationFile || renameTo, normalizedFile));
                     if (blockRenameTo) {
-                        destinationFile = this.destinationPath(blockRenameTo.call(this, context, destinationFile, this));
+                        destinationFile = this.destinationPath(blockRenameTo.call(this, templateData, destinationFile));
                     }
                     else {
                         destinationFile = this.destinationPath(blockTo, destinationFile);
@@ -979,13 +903,6 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
                         this.log.debug(`skipping file ${destinationFile}`);
                         return undefined;
                     }
-                    // TODO remove for jhipster 8
-                    if (noEjs === undefined) {
-                        const { method } = fileSpec;
-                        if (method === 'copy') {
-                            noEjs = true;
-                        }
-                    }
                     return {
                         condition,
                         sourceFile,
@@ -1001,14 +918,14 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
                 .filter(template => template);
         }
         else {
-            parsedTemplates = templates.map(template => {
+            parsedTemplates = options.templates.map(template => {
                 if (typeof template === 'string') {
                     return { sourceFile: template, destinationFile: template };
                 }
                 return template;
             });
         }
-        const files = await Promise.all(parsedTemplates.map(template => renderTemplate(template)).filter(Boolean));
+        const files = (await Promise.all(parsedTemplates.map(template => renderTemplate(template)).filter(Boolean)));
         this.log.debug(`Time taken to write files: ${new Date().getMilliseconds() - startTime}ms`);
         return files.filter(file => file);
     }
@@ -1021,6 +938,10 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
         else if (options === undefined) {
             actualOptions = {};
         }
+        else if ('needle' in options && 'contentToAdd' in options) {
+            transformCallbacks = [createNeedleCallback(options), ...transformCallbacks];
+            actualOptions = {};
+        }
         else {
             actualOptions = options;
         }
@@ -1035,7 +956,7 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
         catch {
             // null return should be treated like an error.
         }
-        if (!originalContent) {
+        if (typeof originalContent !== 'string') {
             const { ignoreNonExisting, create } = actualOptions;
             const errorMessage = typeof ignoreNonExisting === 'string' ? ` ${ignoreNonExisting}.` : '';
             if (!create || transformCallbacks.length === 0) {
@@ -1054,7 +975,7 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
         const writeCallback = (...callbacks) => {
             const { autoCrlf = this.jhipsterConfigWithDefaults.autoCrlf, assertModified } = actualOptions;
             try {
-                const fileHasCrlf = autoCrlf && hasCrlr(newContent);
+                const fileHasCrlf = autoCrlf && hasCrlf(newContent);
                 newContent = joinCallbacks(...callbacks).call(this, fileHasCrlf ? normalizeLineEndings(newContent, LF) : newContent, filePath);
                 if (assertModified && originalContent === newContent) {
                     const errorMessage = `${chalk.yellow('Fail to modify ')}${filePath}.`;
@@ -1225,23 +1146,6 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
             LANG: 'en',
         });
     }
-    calculateApplicationId(applicationPath) {
-        const dirname = basename(applicationPath);
-        return `${createHash('shake256', { outputLength: 1 }).update(applicationPath, 'utf8').digest('hex')}-${dirname}`;
-    }
-    getSharedApplication(applicationFolder = this.destinationPath()) {
-        return this.options.sharedData.applications?.[this.calculateApplicationId(applicationFolder)];
-    }
-    createSharedData({ help }) {
-        const applicationId = this.options.applicationId ?? this.calculateApplicationId(this.destinationPath());
-        if (this.options.sharedData.applications === undefined) {
-            this.options.sharedData.applications = {};
-        }
-        const sharedApplications = help ? {} : this.options.sharedData.applications;
-        if (!sharedApplications[applicationId]) {
-            sharedApplications[applicationId] = {};
-        }
-        const { ignoreNeedlesError } = this.options;
-        return new SharedData(sharedApplications[applicationId], { destinationPath: this.destinationPath(), memFs: this.env.sharedFs, log: this.log, logCwd: this.env.logCwd }, { ignoreNeedlesError });
-    }
+}
+export class CommandCoreGenerator extends CoreGenerator {
 }