generator-jhipster 8.5.0 → 8.7.0

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

@@ -17,8 +17,7 @@
  * limitations under the License.
  */
 import { existsSync, opendirSync } from 'fs';
-import { extname, basename } from 'path';
-// eslint-disable-next-line import/prefer-default-export
+import { basename, extname } from 'path';
 export function getEntitiesFromDir(configDir) {
     if (!existsSync(configDir)) {
         return [];

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

@@ -17,5 +17,4 @@
  * limitations under the License.
  */
 import { upperFirst } from 'lodash-es';
-// eslint-disable-next-line import/prefer-default-export
 export const findEntityInEntities = (entityName, entities) => entities.find(entity => upperFirst(entity.name) === upperFirst(entityName));

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

@@ -56,7 +56,6 @@ const getEnums = (enums, customValuesState, comments) => {
                 comment: comments && comments[enumValue] && formatDocAsJavaDoc(comments[enumValue], 4),
             };
         }
-        // eslint-disable-next-line no-unused-vars
         const matched = /\s*(.+?)\s*\((.+?)\)/.exec(enumValue);
         return {
             name: matched[1],
@@ -78,7 +77,6 @@ const extractEnumEntries = field => {
  * @param {String} [clientRootFolder] - the client's root folder
  * @return {Object} the enum info.
  */
-// eslint-disable-next-line import/prefer-default-export
 export const getEnumInfo = (field, clientRootFolder) => {
     field.enumInstance = extractEnumInstance(field); // TODO remove side effect
     const enums = extractEnumEntries(field);

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

@@ -20,7 +20,6 @@ import { fieldTypes } from '../../../jdl/jhipster/index.js';
 const { CommonDBTypes, RelationalOnlyDBTypes } = fieldTypes;
 const { BYTES, BYTE_BUFFER } = RelationalOnlyDBTypes;
 const { BOOLEAN, BIG_DECIMAL, DOUBLE, DURATION, FLOAT, INSTANT, INTEGER, LOCAL_DATE, LONG, STRING, UUID, ZONED_DATE_TIME, IMAGE_BLOB, ANY_BLOB, TEXT_BLOB, BLOB, } = CommonDBTypes;
-// eslint-disable-next-line import/prefer-default-export
 export function fieldIsEnum(fieldType) {
     return ![
         STRING,

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

@@ -16,14 +16,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { camelCase, kebabCase, startCase, upperFirst, sortedUniq, intersection, lowerFirst, uniq } from 'lodash-es';
+import { camelCase, intersection, kebabCase, lowerFirst, sortedUniq, startCase, uniq, upperFirst } from 'lodash-es';
 import pluralize from 'pluralize';
 import { getDatabaseTypeData, hibernateSnakeCase } from '../../server/support/index.js';
-import { createFaker, parseChangelog, stringHashCode, upperFirstCamelCase, getMicroserviceAppName, mutateData, } from '../../base/support/index.js';
-import { fieldToReference } from './prepare-field.js';
-import { getTypescriptKeyType, getEntityParentPathAddition } from '../../client/support/index.js';
+import { createFaker, getMicroserviceAppName, mutateData, parseChangelog, stringHashCode, upperFirstCamelCase, } from '../../base/support/index.js';
+import { getEntityParentPathAddition, getTypescriptKeyType } from '../../client/support/index.js';
 import { applicationTypes, binaryOptions, databaseTypes, entityOptions, fieldTypes, searchEngineTypes, } from '../../../jdl/jhipster/index.js';
 import { fieldIsEnum } from './field-utils.js';
+import { fieldToReference } from './prepare-field.js';
 const NO_SEARCH_ENGINE = searchEngineTypes.NO;
 const { PaginationTypes, ServiceTypes, MapperTypes } = entityOptions;
 const { GATEWAY, MICROSERVICE } = applicationTypes;
@@ -192,7 +192,7 @@ export default function prepareEntity(entityWithConfig, generator, application)
     mutateData(entityWithConfig, {
         __override__: false,
         i18nKeyPrefix: data => data.i18nKeyPrefix ?? `${data.frontendAppName}.${data.entityTranslationKey}`,
-        i18nAlertHeaderPrefix: data => data.i18nAlertHeaderPrefix ?? data.microserviceAppName
+        i18nAlertHeaderPrefix: data => (data.i18nAlertHeaderPrefix ?? data.microserviceAppName)
             ? `${data.microserviceAppName}.${data.entityTranslationKey}`
             : data.i18nKeyPrefix,
         hasRelationshipWithBuiltInUser: ({ relationships }) => relationships.some(relationship => relationship.otherEntity.builtInUser),

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

@@ -16,12 +16,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { snakeCase, startCase, upperFirst, defaults, kebabCase } from 'lodash-es';
+import { defaults, kebabCase, snakeCase, startCase, upperFirst } 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';
-import { fieldIsEnum } from './field-utils.js';
 import { mutateData } from '../../base/support/config.js';
+import { fieldIsEnum } from './field-utils.js';
 import { prepareProperty } from './prepare-property.js';
 const { BlobTypes, CommonDBTypes, RelationalOnlyDBTypes } = fieldTypes;
 const { Validations: { MIN, MINLENGTH, MINBYTES, MAX, MAXBYTES, MAXLENGTH, PATTERN, REQUIRED, UNIQUE }, } = validations;
@@ -305,10 +305,9 @@ function prepareCommonFieldForTemplates(entityWithConfig, field, generator) {
     field.createRandexp = () => {
         // check if regex is valid. If not, issue warning and we skip fake data generation.
         try {
-            // eslint-disable-next-line no-new
             new RegExp(field.fieldValidateRulesPattern);
         }
-        catch (e) {
+        catch {
             generator.log.warn(`${field.fieldName} pattern is not valid: ${field.fieldValidateRulesPattern}. Skipping generating fake data. `);
             return undefined;
         }

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

@@ -18,10 +18,10 @@
  */
 import { lowerFirst, startCase, upperFirst } from 'lodash-es';
 import pluralize from 'pluralize';
-import { databaseTypes, entityOptions, validations, checkAndReturnRelationshipOnValue } from '../../../jdl/jhipster/index.js';
+import { checkAndReturnRelationshipOnValue, databaseTypes, entityOptions, validations } from '../../../jdl/jhipster/index.js';
 import { getJoinTableName, hibernateSnakeCase } from '../../server/support/index.js';
-import { stringifyApplicationData } from './debug.js';
 import { mutateData } from '../../base/support/config.js';
+import { stringifyApplicationData } from './debug.js';
 import { prepareProperty } from './prepare-property.js';
 const { NEO4J, NO: DATABASE_NO } = databaseTypes;
 const { MapperTypes } = entityOptions;

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

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { upperFirst, lowerFirst } from 'lodash-es';
+import { lowerFirst, upperFirst } from 'lodash-es';
 import { stringifyApplicationData } from './debug.js';
 import { findEntityInEntities } from './entity.js';
 export const otherRelationshipType = relationshipType => relationshipType.split('-').reverse().join('-');

package/dist/generators/base-application/support/update-application-entities-transform.js

@@ -1,8 +1,8 @@
 import { readdir } from 'fs/promises';
+import { basename, join } from 'path';
 import { loadFile } from 'mem-fs';
 import { Minimatch } from 'minimatch';
 import { transform } from 'p-transform';
-import { basename, join } from 'path';
 import { GENERATOR_JHIPSTER } from '../../generator-constants.js';
 export const updateApplicationEntitiesTransform = ({ destinationPath, throwOnMissingConfig = true, }) => {
     let yoRcFileInMemory;

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

@@ -16,32 +16,33 @@
  * 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 } 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 { CUSTOM_PRIORITIES, PRIORITY_NAMES, PRIORITY_PREFIX, QUEUES } from '../base/priorities.js';
 import { createJHipster7Context, formatDateForChangelog, joinCallbacks, removeFieldsWithNullishValues, } from '../base/support/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 { convertConfigToOption, 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';
 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);
@@ -50,6 +51,7 @@ const relativeDir = (from, to) => {
     const rel = posixRelative(from, to);
     return rel ? `${rel}/` : '';
 };
+const deepMerge = (source1, source2) => mergeWith({}, source1, source2, (a, b) => (Array.isArray(a) ? a.concat(b) : undefined));
 /**
  * This is the base class for a generator for every generator.
  */
@@ -71,6 +73,7 @@ export default class CoreGenerator extends YeomanGenerator {
     static END = asPriority(END);
     useVersionPlaceholders;
     skipChecks;
+    ignoreNeedlesError;
     experimental;
     debugEnabled;
     jhipster7Migration;
@@ -101,14 +104,12 @@ export default class CoreGenerator extends YeomanGenerator {
             unique: 'namespace',
             ...features,
         });
-        let jhipsterOldVersion = null;
         if (!this.options.help) {
             /* Force config to use 'generator-jhipster' namespace. */
             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();
-            jhipsterOldVersion = this.jhipsterConfig.jhipsterVersion ?? null;
-            this.sharedData = this.createSharedData({ jhipsterOldVersion, help: this.options.help });
+            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(command.options);
             // Don't write jhipsterVersion to .yo-rc.json when reproducible
@@ -135,6 +136,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.
@@ -223,6 +229,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.
      */
@@ -230,11 +242,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.
@@ -291,18 +389,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') {
-                context[name] = context[name] ?? this[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
@@ -323,15 +410,7 @@ You can ignore this error by passing '--skip-checks' to jhipster command.`);
             this.parseJHipsterArguments(commandDef.arguments);
         }
         else if (commandDef.configs) {
-            this.parseJHipsterArguments(Object.fromEntries(Object.entries(commandDef.configs)
-                .filter(([_name, def]) => def.argument)
-                .map(([name, def]) => [
-                name,
-                {
-                    description: def.description,
-                    ...def.argument,
-                },
-            ])));
+            this.parseJHipsterArguments(extractArgumentsFromConfigs(commandDef.configs));
         }
         if (commandDef.options || commandDef.configs) {
             this.parseJHipsterOptions(commandDef.options, commandDef.configs);
@@ -391,7 +470,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.
@@ -509,7 +588,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];
@@ -600,7 +679,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}`);
         }
     }
@@ -624,9 +703,13 @@ 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();
-        return this.renderTemplate(source, destination, data, { root, ...options }, { noGlob: true, ...copyOptions });
+        try {
+            return this.renderTemplate(source, destination, data, { root, ...options }, { noGlob: true, ...copyOptions });
+        }
+        catch (error) {
+            throw new Error(`Error writing file ${source} to ${destination}: ${error}`, { cause: error });
+        }
     }
     /**
      * write the given files using provided options.
@@ -635,10 +718,15 @@ 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, templates, rootTemplatesPath, context = this, transform: methodTransform = [] } = options;
+        const { sections, blocks, context = this, templates } = 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;
         /* Build lookup order first has preference.
          * Example
          * rootTemplatesPath = ['reactive', 'common']
@@ -673,7 +761,7 @@ You can ignore this error by passing '--skip-checks' to jhipster command.`);
                 return val;
             }
             if (typeof val === 'function') {
-                return val.call(this, context) || false;
+                return val.call(this, templateData) || false;
             }
             throw new Error(`Type not supported ${val}`);
         };
@@ -681,7 +769,6 @@ You can ignore this error by passing '--skip-checks' to jhipster command.`);
             const extension = extname(sourceFile);
             const isBinary = binary || ['.png', '.jpg', '.gif', '.svg', '.ico'].includes(extension);
             const appendEjs = noEjs === undefined ? !isBinary && extension !== '.ejs' : !noEjs;
-            const ejsFile = appendEjs || extension === '.ejs';
             let targetFile;
             if (typeof destinationFile === 'function') {
                 targetFile = resolveCallback(destinationFile);
@@ -692,9 +779,14 @@ You can ignore this error by passing '--skip-checks' to jhipster command.`);
             let sourceFileFrom;
             if (Array.isArray(rootTemplatesAbsolutePath)) {
                 // Look for existing templates
-                const existingTemplates = rootTemplatesAbsolutePath
+                let existingTemplates = rootTemplatesAbsolutePath
                     .map(rootPath => this.templatePath(rootPath, sourceFile))
                     .filter(templateFile => existsSync(appendEjs ? `${templateFile}.ejs` : templateFile));
+                if (existingTemplates.length === 0 && this.getFeatures().jhipster7Migration) {
+                    existingTemplates = rootTemplatesAbsolutePath
+                        .map(rootPath => this.templatePath(rootPath, appendEjs ? sourceFile : `${sourceFile}.ejs`))
+                        .filter(templateFile => existsSync(templateFile));
+                }
                 if (existingTemplates.length > 1) {
                     const moreThanOneMessage = `Multiples templates were found for file ${sourceFile}, using the first
 templates: ${JSON.stringify(existingTemplates, null, 2)}`;
@@ -706,9 +798,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);
@@ -716,43 +805,71 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
             else {
                 sourceFileFrom = this.templatePath(sourceFile);
             }
-            if (appendEjs) {
-                sourceFileFrom = `${sourceFileFrom}.ejs`;
+            const file = customizeTemplatePath.call(this, { sourceFile, resolvedSourceFile: sourceFileFrom, destinationFile: targetFile });
+            if (!file) {
+                return undefined;
             }
-            if (!ejsFile) {
-                await this.copyTemplateAsync(sourceFileFrom, targetFile);
-            }
-            else {
-                let useAsync = true;
-                if (context.entityClass) {
-                    if (!context.baseName) {
-                        throw new Error('baseName is require 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);
-                    });
-                    // Async calls will make the render method to be scheduled, allowing the faker key to change in the meantime.
-                    useAsync = false;
+            sourceFileFrom = file.resolvedSourceFile;
+            targetFile = file.destinationFile;
+            let templatesRoots = [].concat(rootTemplatesAbsolutePath);
+            for (const contextCustomizeTemplatePath of contextCustomizeTemplatePaths) {
+                const file = contextCustomizeTemplatePath.call(this, {
+                    namespace: this.options.namespace,
+                    sourceFile,
+                    resolvedSourceFile: sourceFileFrom,
+                    destinationFile: targetFile,
+                    templatesRoots,
+                }, context);
+                if (!file) {
+                    return undefined;
                 }
-                const renderOptions = {
-                    ...(options?.renderOptions ?? {}),
-                    // Set root for ejs to lookup for partials.
-                    root: rootTemplatesAbsolutePath,
-                    // ejs caching cause problem https://github.com/jhipster/generator-jhipster/pull/20757
-                    cache: false,
-                };
-                const copyOptions = { noGlob: true };
-                // TODO drop for v8 final release
-                const data = this.jhipster7Migration ? createJHipster7Context(this, context, { ignoreWarnings: true }) : context;
-                if (useAsync) {
-                    await this.renderTemplateAsync(sourceFileFrom, targetFile, data, renderOptions, copyOptions);
+                sourceFileFrom = file.resolvedSourceFile;
+                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);
                 }
                 else {
-                    this.renderTemplate(sourceFileFrom, targetFile, data, renderOptions, copyOptions);
+                    let useAsync = true;
+                    if (context.entityClass) {
+                        if (!context.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);
+                        });
+                        // 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 ?? {}),
+                        // Set root for ejs to lookup for partials.
+                        root: templatesRoots,
+                        // ejs caching cause problem https://github.com/jhipster/generator-jhipster/pull/20757
+                        cache: false,
+                    };
+                    const copyOptions = { noGlob: true };
+                    if (appendEjs) {
+                        sourceFileFrom = `${sourceFileFrom}.ejs`;
+                    }
+                    if (useAsync) {
+                        await this.renderTemplateAsync(sourceFileFrom, targetFile, templateData, renderOptions, copyOptions);
+                    }
+                    else {
+                        this.renderTemplate(sourceFileFrom, targetFile, templateData, renderOptions, copyOptions);
+                    }
                 }
             }
+            catch (error) {
+                throw new Error(`Error rendering template ${sourceFileFrom} to ${targetFile}: ${error}`, { cause: error });
+            }
             if (!isBinary && transform && transform.length) {
                 this.editFile(targetFile, ...transform);
             }
@@ -834,7 +951,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}`);
@@ -892,13 +1015,13 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
         try {
             originalContent = this.readDestination(filePath);
         }
-        catch (_error) {
+        catch {
             // null return should be treated like an error.
         }
         if (!originalContent) {
             const { ignoreNonExisting, create } = actualOptions;
             const errorMessage = typeof ignoreNonExisting === 'string' ? ` ${ignoreNonExisting}.` : '';
-            if (ignoreNonExisting) {
+            if (ignoreNonExisting || (!create && this.ignoreNeedlesError)) {
                 this.log(`${chalk.yellow('\nUnable to find ')}${filePath}.${chalk.yellow(errorMessage)}\n`);
                 // return a noop.
                 const noop = () => noop;
@@ -915,7 +1038,11 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
             try {
                 newContent = joinCallbacks(...callbacks).call(this, newContent, filePath);
                 if (actualOptions.assertModified && originalContent === newContent) {
-                    throw new Error(`Fail to edit file '${file}'.`);
+                    const errorMessage = `${chalk.yellow('Fail to modify ')}${filePath}.`;
+                    if (!this.ignoreNeedlesError) {
+                        throw new Error(errorMessage);
+                    }
+                    this.log(errorMessage);
                 }
                 this.writeDestination(filePath, newContent);
             }
@@ -950,7 +1077,9 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
                 }
                 return true;
             });
-            return headerComments.join('\n').concat('\n', stringifyYaml(merge(parseYaml(content), value)));
+            const mergedContent = stringifyYaml(deepMerge(parseYaml(content), value));
+            const header = headerComments.length > 0 ? headerComments.join('\n').concat('\n') : '';
+            return `${header}${mergedContent}`;
         });
     }
     /**
@@ -1091,7 +1220,7 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
     getSharedApplication(applicationFolder = this.destinationPath()) {
         return this.options.sharedData.applications?.[this.calculateApplicationId(applicationFolder)];
     }
-    createSharedData({ jhipsterOldVersion, help, }) {
+    createSharedData({ help }) {
         const applicationId = this.options.applicationId ?? this.calculateApplicationId(this.destinationPath());
         if (this.options.sharedData.applications === undefined) {
             this.options.sharedData.applications = {};
@@ -1101,6 +1230,6 @@ templates: ${JSON.stringify(existingTemplates, null, 2)}`;
             sharedApplications[applicationId] = {};
         }
         const { ignoreNeedlesError } = this.options;
-        return new SharedData(sharedApplications[applicationId], { jhipsterOldVersion, ignoreNeedlesError });
+        return new SharedData(sharedApplications[applicationId], { destinationPath: this.destinationPath(), memFs: this.env.sharedFs, log: this.log, logCwd: this.env.logCwd }, { ignoreNeedlesError });
     }
 }