generator-jhipster 8.7.0 → 8.7.2

package/dist/generators/angular/generator.d.ts

@@ -0,0 +1,157 @@
+import BaseApplicationGenerator from '../base-application/index.js';
+import type { PostWritingEntitiesTaskParam } from '../../lib/types/application/tasks.js';
+export default class AngularGenerator extends BaseApplicationGenerator {
+    localEntities?: any[];
+    beforeQueue(): Promise<void>;
+    get loading(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/application/tasks.js").TaskParamWithApplicationDefaults<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>, import("../../lib/types/application/application.js").ApplicationType<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>>>, "loadPackageJson" | "applicationDefauts">;
+    get preparing(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/application/tasks.js").PreparingTaskParam<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>, import("../../lib/types/application/application.js").ApplicationType<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>>>, "applicationDefauts" | "addNeedles">;
+    get preparingEachEntity(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/application/tasks.js").PreparingEachEntityTaskParam<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>, import("../../lib/types/application/application.js").ApplicationType<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>>>, "prepareEntity">;
+    get preparingEachEntityField(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/application/tasks.js").PreparingEachEntityFieldTaskParam<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>, import("../../lib/types/application/application.js").ApplicationType<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>>>, "prepareField">;
+    get default(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/application/tasks.js").TaskParamWithEntities<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>, import("../../lib/types/application/application.js").ApplicationType<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>>>, "loadEntities" | "queueTranslateTransform">;
+    get writing(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/application/tasks.js").WritingTaskParam<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>, import("../../lib/types/application/application.js").ApplicationType<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>>>, "cleanup" | "cleanupOldFilesTask" | "writeEslintClientRootConfigFile" | "writeFiles">;
+    get writingEntities(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/application/tasks.js").TaskParamWithEntities<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>, import("../../lib/types/application/application.js").ApplicationType<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>>>, "cleanupEntitiesFiles" | "writeEntitiesFiles">;
+    get postWriting(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/application/tasks.js").PostWritingTaskParam<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>, import("../../lib/types/application/application.js").ApplicationType<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>>>, "addWebsocketDependencies">;
+    get postWritingEntities(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, PostWritingEntitiesTaskParam<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>, import("../../lib/types/application/application.js").ApplicationType<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>>>, "postWriteEntitiesFiles">;
+    get end(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/application/tasks.js").TaskParamWithApplication<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>, import("../../lib/types/application/application.js").ApplicationType<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>>>, "end">;
+    /**
+     * @private
+     * Add new scss style to the angular application in "vendor.scss".
+     *
+     * @param {string} style - scss to add in the file
+     * @param {string} comment - comment to add before css code
+     *
+     * example:
+     *
+     * style = '.success {\n     @extend .message;\n    border-color: green;\n}'
+     * comment = 'Message'
+     *
+     * * ==========================================================================
+     * Message
+     * ========================================================================== *
+     * .success {
+     *     @extend .message;
+     *     border-color: green;
+     * }
+     *
+     */
+    addVendorSCSSStyle(style: any, comment?: any): void;
+    /**
+     * @private
+     * Add a new lazy loaded module to admin routing file.
+     *
+     * @param {string} route - The route for the module. For example 'entity-audit'.
+     * @param {string} modulePath - The path to the module file. For example './entity-audit/entity-audit.module'.
+     * @param {string} moduleName - The name of the module. For example 'EntityAuditModule'.
+     * @param {string} pageTitle - The translation key if i18n is enabled or the text if i18n is disabled for the page title in the browser.
+     *                             For example 'entityAudit.home.title' for i18n enabled or 'Entity audit' for i18n disabled.
+     *                             If undefined then application global page title is used in the browser title bar.
+     */
+    addAdminRoute(route: any, modulePath: any, moduleName: any, pageTitle: any): void;
+    /**
+     * @private
+     * Add a new module in the TS modules file.
+     *
+     * @param {string} appName - Angular2 application name.
+     * @param {string} angularName - The name of the new admin item.
+     * @param {string} folderName - The name of the folder.
+     * @param {string} fileName - The name of the file.
+     * @param {boolean} enableTranslation - If translations are enabled or not.
+     * @param {string} clientFramework - The name of the client framework.
+     */
+    addAngularModule(appName: any, angularName: any, folderName: any, fileName: any, enableTranslation: any): void;
+    /**
+     * @private
+     * Add a new icon to icon imports.
+     *
+     * @param {string} iconName - The name of the Font Awesome icon.
+     */
+    addIcon(iconName: any): void;
+    /**
+     * Add a new menu element to the admin menu.
+     *
+     * @param {string} routerName - The name of the Angular router that is added to the admin menu.
+     * @param {string} iconName - The name of the Font Awesome icon that will be displayed.
+     * @param {boolean} enableTranslation - If translations are enabled or not
+     * @param {string} translationKeyMenu - i18n key for entry in the admin menu
+     */
+    addElementToAdminMenu(routerName: any, iconName: any, enableTranslation: any, translationKeyMenu?: string, jhiPrefix?: any): void;
+    addEntitiesToMenu({ application, entities }: Pick<PostWritingEntitiesTaskParam, 'application' | 'entities'>): void;
+    addEntitiesToModule(param: Pick<PostWritingEntitiesTaskParam, 'application' | 'entities'>): void;
+    /**
+     * @private
+     * Add new scss style to the angular application in "global.scss
+     *
+     * @param {string} style - css to add in the file
+     * @param {string} comment - comment to add before css code
+     *
+     * example:
+     *
+     * style = '.jhipster {\n     color: #baa186;\n}'
+     * comment = 'New JHipster color'
+     *
+     * * ==========================================================================
+     * New JHipster color
+     * ========================================================================== *
+     * .jhipster {
+     *     color: #baa186;
+     * }
+     *
+     */
+    addMainSCSSStyle(style: any, comment?: any): void;
+    /**
+     * Returns the typescript import section of enums referenced by all fields of the entity.
+     * @param fields returns the import of enums that are referenced by the fields
+     * @returns {typeImports:Map} the fields that potentially contains some enum types
+     */
+    generateEntityClientEnumImports(fields: any): Map<any, any>;
+    /**
+     * Get the typescript type of a non-composite primary key
+     * @param primaryKey the primary key of the entity
+     * @returns {string} the typescript type.
+     */
+    getTypescriptKeyType(primaryKey: any): "string" | "number";
+    /**
+     * generates a value for a primary key type
+     * @param primaryKey the primary key attribute (or its type) of the entity
+     * @param index an index to add salt to the value
+     * @param wrapped if the value should be within quotes
+     * @returns {string|number|string}
+     */
+    generateTestEntityId(primaryKey: any, index?: number, wrapped?: boolean): any;
+    /**
+     * @private
+     * Generate a test entity, for the PK references (when the PK is a composite, derived key)
+     *
+     * @param {any} primaryKey - primary key definition.
+     * @param {number} [index] - index of the primary key sample, pass undefined for a random key.
+     */
+    generateTestEntityPrimaryKey(primaryKey: any, index: any): string;
+    /**
+     * @private
+     * Generate a test entity instance with faked values.
+     *
+     * @param {any} references - references to other entities.
+     * @param {any} additionalFields - additional fields to add to the entity or with default values that overrides generated values.
+     */
+    generateTypescriptTestEntity(references: any, additionalFields: any): string;
+    /**
+     * @private
+     * Create a angular form path getter method of reference.
+     *
+     * @param {object} reference
+     * @param {string[]} prefix
+     * @return {string}
+     */
+    buildAngularFormPath(reference: any, prefix?: never[]): string;
+    /**
+     * @private
+     * Add a new menu element, at the root of the menu.
+     *
+     * @param {string} routerName - The name of the router that is added to the menu.
+     * @param {string} iconName - The name of the Font Awesome icon that will be displayed.
+     * @param {boolean} enableTranslation - If translations are enabled or not
+     * @param {string} clientFramework - The name of the client framework
+     * @param {string} translationKeyMenu - i18n key for entry in the menu
+     */
+    addElementToMenu(routerName: any, iconName: any, enableTranslation: any, _clientFramework?: any, translationKeyMenu?: string): void;
+}

package/dist/generators/angular/generator.js

@@ -22,7 +22,7 @@ import { isFileStateModified } from 'mem-fs-editor/state';
 import BaseApplicationGenerator from '../base-application/index.js';
 import { GENERATOR_ANGULAR, GENERATOR_CLIENT, GENERATOR_LANGUAGES } from '../generator-list.js';
 import { defaultLanguage } from '../languages/support/index.js';
-import { clientFrameworkTypes } from '../../jdl/jhipster/index.js';
+import { clientFrameworkTypes } from '../../lib/jhipster/index.js';
 import { generateTypescriptTestEntity as generateTestEntity, generateEntityClientEnumImports as getClientEnumImportsFormat, getTypescriptKeyType as getTSKeyType, generateTestEntityId as getTestEntityId, generateTestEntityPrimaryKey as getTestEntityPrimaryKey, } from '../client/support/index.js';
 import { createNeedleCallback, mutateData } from '../base/support/index.js';
 import { writeEslintClientRootConfigFile } from '../javascript/generators/eslint/support/tasks.js';
@@ -71,9 +71,8 @@ export default class AngularGenerator extends BaseApplicationGenerator {
             },
             addNeedles({ source, application }) {
                 source.addEntitiesToClient = param => {
-                    const { application, entities } = param;
-                    this.addEntitiesToModule({ application, entities });
-                    this.addEntitiesToMenu({ application, entities });
+                    this.addEntitiesToModule(param);
+                    this.addEntitiesToMenu(param);
                 };
                 source.addAdminRoute = (args) => this.editFile(`${application.srcMainWebapp}app/admin/admin.routes.ts`, addRoute({
                     needle: 'add-admin-route',
@@ -180,8 +179,8 @@ export default class AngularGenerator extends BaseApplicationGenerator {
     }
     get writing() {
         return this.asWritingTaskGroup({
-            cleanup({ control }) {
-                control.cleanupFiles({
+            async cleanup({ control }) {
+                await control.cleanupFiles({
                     '8.6.1': ['.eslintrc.json', '.eslintignore'],
                 });
             },
@@ -327,10 +326,10 @@ export default class AngularGenerator extends BaseApplicationGenerator {
         const editCallback = addToEntitiesMenu({ application, entities });
         this.editFile(filePath, { ignoreNonExisting }, editCallback);
     }
-    addEntitiesToModule({ application, entities }) {
-        const filePath = `${application.clientSrcDir}app/entities/entity.routes.ts`;
+    addEntitiesToModule(param) {
+        const filePath = `${param.application.clientSrcDir}app/entities/entity.routes.ts`;
         const ignoreNonExisting = chalk.yellow(`Route(s) not added to ${filePath}.`);
-        const addRouteCallback = addEntitiesRoute({ application, entities });
+        const addRouteCallback = addEntitiesRoute(param);
         this.editFile(filePath, { ignoreNonExisting }, addRouteCallback);
     }
     /**
@@ -423,7 +422,7 @@ export default class AngularGenerator extends BaseApplicationGenerator {
      * @param {string} clientFramework - The name of the client framework
      * @param {string} translationKeyMenu - i18n key for entry in the menu
      */
-    addElementToMenu(routerName, iconName, enableTranslation, clientFramework, translationKeyMenu = camelCase(routerName)) {
+    addElementToMenu(routerName, iconName, enableTranslation, _clientFramework, translationKeyMenu = camelCase(routerName)) {
         this.needleApi.clientAngular.addElementToMenu(routerName, iconName, enableTranslation, translationKeyMenu);
     }
 }

package/dist/generators/angular/needle-api/needle-client-angular.d.ts

@@ -0,0 +1,17 @@
+import needleClientBase from '../../client/needle-api/needle-client.js';
+export default class extends needleClientBase {
+    addGlobalSCSSStyle(style: any, comment?: any): void;
+    addVendorSCSSStyle(style: any, comment?: any): void;
+    addModule(appName: any, angularName: any, folderName: any, fileName: any, enableTranslation: any): void;
+    _genericAddModule(appName: any, angularName: any, folderName: any, fileName: any, enableTranslation: any, clientFramework: any, modulePath: any, importNeedle: any, moduleNeedle: any): void;
+    _generateRewriteFileModelWithImportStatement(appName: any, angularName: any, folderName: any, fileName: any, modulePath: any, needle: any): import("../../needle-base.js").NeedleFileModel;
+    _generateImportStatement(appName: any, angularName: any, folderName: any, fileName: any): string;
+    _generateRewriteFileModelAddModule(appName: any, angularName: any, modulePath: any, needle: any): import("../../needle-base.js").NeedleFileModel;
+    addIcon(iconName: any): void;
+    addElementToMenu(routerName: any, iconName: any, enableTranslation: any, translationKeyMenu?: any, jhiPrefix?: string): void;
+    addElementToAdminMenu(routerName: any, iconName: any, enableTranslation: any, translationKeyMenu?: any, jhiPrefix?: string): void;
+    _addRoute(route: any, modulePath: any, moduleName: any, needleName: any, filePath: any, pageTitle?: any, { contentToCheck }?: {
+        contentToCheck?: string;
+    }): void;
+    addAdminRoute(route: any, modulePath: any, moduleName: any, pageTitle: any): void;
+}

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

@@ -21,7 +21,7 @@ import { startCase } from 'lodash-es';
 import needleClientBase from '../../client/needle-api/needle-client.js';
 import { LINE_LENGTH } from '../../generator-constants.js';
 import { stripMargin, upperFirstCamelCase } from '../../base/support/index.js';
-import { clientFrameworkTypes } from '../../../jdl/jhipster/index.js';
+import { clientFrameworkTypes } from '../../../lib/jhipster/index.js';
 import { createNeedleCallback } from '../../base/support/needles.js';
 const { ANGULAR } = clientFrameworkTypes;
 export default class extends needleClientBase {

package/dist/generators/angular/resources/package.json

@@ -1,10 +1,10 @@
 {
   "dependencies": {
-    "@angular/common": "18.2.1",
+    "@angular/common": "18.2.9",
     "@fortawesome/angular-fontawesome": "0.15.0",
     "@fortawesome/fontawesome-svg-core": "6.6.0",
     "@fortawesome/free-solid-svg-icons": "6.6.0",
-    "@ng-bootstrap/ng-bootstrap": "17.0.0",
+    "@ng-bootstrap/ng-bootstrap": "17.0.1",
     "@ngx-translate/core": "15.0.0",
     "@ngx-translate/http-loader": "8.0.0",
     "@popperjs/core": "2.11.8",
@@ -15,41 +15,41 @@
     "ngx-infinite-scroll": "18.0.0",
     "rxjs": "7.8.1",
     "sockjs-client": "1.6.1",
-    "tslib": "2.7.0",
+    "tslib": "2.8.0",
     "zone.js": "0.14.10"
   },
   "devDependencies": {
-    "@angular-architects/module-federation": "18.0.4",
-    "@angular-architects/module-federation-runtime": "18.0.4",
+    "@angular-architects/module-federation": "18.0.6",
+    "@angular-architects/module-federation-runtime": "18.0.6",
     "@angular-builders/custom-webpack": "18.0.0",
     "@angular-builders/jest": "18.0.0",
-    "@angular/cli": "18.2.1",
-    "@types/jest": "29.5.12",
+    "@angular/cli": "18.2.10",
+    "@types/jest": "29.5.14",
     "@types/node": "20.11.25",
     "@types/sockjs-client": "1.5.4",
-    "angular-eslint": "18.3.0",
-    "browser-sync": "3.0.2",
+    "angular-eslint": "18.4.0",
+    "browser-sync": "3.0.3",
     "browser-sync-webpack-plugin": "2.3.0",
     "buffer": "6.0.3",
     "copy-webpack-plugin": "12.0.2",
-    "eslint": "9.9.1",
+    "eslint": "9.13.0",
     "eslint-config-prettier": "9.1.0",
     "eslint-plugin-prettier": "5.2.1",
     "eslint-webpack-plugin": "4.2.0",
     "folder-hash": "4.0.4",
-    "globals": "15.9.0",
+    "globals": "15.11.0",
     "jest": "29.7.0",
     "jest-date-mock": "1.0.10",
     "jest-junit": "16.0.0",
-    "jest-preset-angular": "14.2.2",
+    "jest-preset-angular": "14.2.4",
     "jest-sonar": "0.2.16",
     "merge-jsons-webpack-plugin": "2.0.1",
-    "postcss-rtlcss": "5.3.1",
+    "postcss-rtlcss": "5.5.0",
     "rimraf": "5.0.8",
     "ts-jest": "29.2.5",
-    "typescript": "5.4.5",
-    "typescript-eslint": "8.2.0",
-    "webpack": "5.94.0",
+    "typescript": "5.5.4",
+    "typescript-eslint": "8.11.0",
+    "webpack": "5.95.0",
     "webpack-bundle-analyzer": "4.10.2",
     "webpack-merge": "6.0.1",
     "webpack-notifier": "1.15.0"

package/dist/generators/angular/support/needles.d.ts

@@ -0,0 +1,28 @@
+import type { PostWritingEntitiesTaskParam } from '../../../lib/types/application/tasks.js';
+export declare function addRoute({ needle, route, pageTitle, title, modulePath, moduleName, component, }: {
+    needle: string;
+    route: string;
+    modulePath: string;
+    pageTitle?: string;
+    title?: string;
+    moduleName?: string;
+    component?: boolean;
+}): import("../../base/api.js").EditFileCallback<import("../../index.js").GeneratorBaseCore>;
+export declare function addEntitiesRoute({ application, entities }: Pick<PostWritingEntitiesTaskParam, 'application' | 'entities'>): import("../../base/api.js").EditFileCallback<import("../../index.js").GeneratorBaseCore>;
+type MenuItem = {
+    jhiPrefix: string;
+    enableTranslation?: boolean;
+    route: string;
+    translationKey?: string;
+    icon?: string;
+    name?: string;
+};
+export declare function addItemToMenu({ needle, enableTranslation, jhiPrefix, icon, route, translationKey, name, }: MenuItem & {
+    needle: string;
+}): import("../../base/api.js").EditFileCallback<import("../../index.js").GeneratorBaseCore>;
+export declare const addItemToAdminMenu: (menu: MenuItem) => import("../../base/api.js").EditFileCallback<import("../../index.js").GeneratorBaseCore>;
+export declare const addIconImport: ({ icon }: {
+    icon: string;
+}) => import("../../base/api.js").EditFileCallback<import("../../index.js").GeneratorBaseCore>;
+export declare function addToEntitiesMenu({ application, entities }: Pick<PostWritingEntitiesTaskParam, 'application' | 'entities'>): import("../../base/api.js").EditFileCallback<import("../../index.js").GeneratorBaseCore>;
+export {};

package/dist/generators/angular/support/needles.js

@@ -1,5 +1,23 @@
+/**
+ * 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.
+ */
 import { createNeedleCallback } from '../../base/support/needles.js';
-import { upperFirstCamelCase } from '../../base/support/string.js';
+import { upperFirstCamelCase } from '../../../lib/utils/string.js';
 import { joinCallbacks } from '../../base/support/write-files.js';
 export function addRoute({ needle, route, pageTitle, title, modulePath, moduleName, component, }) {
     const routePath = `path: '${route}',`;

package/dist/generators/angular/support/path-utils.d.ts

@@ -0,0 +1,27 @@
+/**
+ * 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.
+ */
+/**
+ * @private
+ * Create a angular form path getter method of reference.
+ *
+ * @param {object} reference
+ * @param {string[]} prefix
+ * @return {string}
+ */
+export declare const buildAngularFormPath: (reference: any, prefix?: never[]) => string;

package/dist/generators/angular/support/translate-angular.d.ts

@@ -0,0 +1,13 @@
+export type ReplacerOptions = {
+    jhiPrefix: string;
+    enableTranslation: boolean;
+};
+/**
+ * Replace and cleanup translations.
+ *
+ * @type {import('../generator-base.js').EditFileCallback}
+ * @this {import('../generator-base.js')}
+ */
+export declare const createTranslationReplacer: (getWebappTranslation: any, opts: ReplacerOptions | boolean) => (content: any, filePath: any) => any;
+export declare const isTranslatedAngularFile: (file: any) => boolean;
+export declare const translateAngularFilesTransform: (getWebappTranslation: any, opts: ReplacerOptions | boolean) => import("stream").Transform;

package/dist/generators/angular/support/translate-angular.js

@@ -24,9 +24,6 @@ const PLACEHOLDER_REGEX = /(?:placeholder|title)=['|"](\{\{\s?['|"]([a-zA-Z0-9.\
 const JHI_TRANSLATE_REGEX = /(\n?\s*[a-z][a-zA-Z]*Translate="[a-zA-Z0-9 +{}'_!?.]+")/.source;
 const TRANSLATE_VALUES_REGEX = /(\n?\s*\[translateValues\]="\{(?:(?!\}").)*?\}")/.source;
 const TRANSLATE_REGEX = [JHI_TRANSLATE_REGEX, TRANSLATE_VALUES_REGEX].join('|');
-function getTranslationValue(getWebappTranslation, key, data) {
-    return getWebappTranslation(key, data) || undefined;
-}
 /**
  * Replace translation key with translation values
  *
@@ -46,7 +43,7 @@ function replaceTranslationKeysWithText(getWebappTranslation, content, regexSour
         // match is now the next match, in array form and our key is at index 1, index 1 is replace target.
         const key = match[keyIndex];
         const target = match[replacementIndex];
-        let translation = getTranslationValue(getWebappTranslation, key);
+        let translation = getWebappTranslation(key);
         if (escape) {
             translation = escape(translation, match);
         }
@@ -97,7 +94,7 @@ const tagTranslation = (getWebappTranslation, { enableTranslation, jhiPrefix },
     const translatedValueInterpolate = parsedInterpolate
         ? Object.fromEntries(Object.entries(parsedInterpolate).map(([key, value]) => [key, `{{ ${value} }}`]))
         : undefined;
-    const translatedValue = escapeHtmlTranslationValue(getTranslationValue(getWebappTranslation, key, translatedValueInterpolate));
+    const translatedValue = escapeHtmlTranslationValue(getWebappTranslation(key, translatedValueInterpolate));
     if (enableTranslation) {
         const translateValuesAttr = parsedInterpolate
             ? ` [translateValues]="{ ${Object.entries(parsedInterpolate)
@@ -116,7 +113,7 @@ const validationTagTranslation = (getWebappTranslation, { enableTranslation, jhi
     if (!parsedInterpolate || Object.keys(parsedInterpolate).length === 0) {
         throw new Error(`No interpolation values found for translation key ${key}, use __jhiTranslateTag__ instead.`);
     }
-    const translatedValue = escapeHtmlTranslationValue(getTranslationValue(getWebappTranslation, key, parsedInterpolate));
+    const translatedValue = escapeHtmlTranslationValue(getWebappTranslation(key, parsedInterpolate));
     if (enableTranslation) {
         const translateValuesAttr = parsedInterpolate
             ? ` [translateValues]="{ ${Object.entries(parsedInterpolate)
@@ -136,7 +133,7 @@ const tagPipeTranslation = (getWebappTranslation, { enableTranslation, jhiPrefix
         throw new Error(`No interpolation values found for translation key ${key}, use __jhiTranslateTag__ instead.`);
     }
     const translatedValueInterpolate = Object.fromEntries(Object.entries(parsedInterpolate).map(([key, value]) => [key, getWebappTranslation(value)]));
-    const translatedValue = escapeHtmlTranslationValue(getTranslationValue(getWebappTranslation, key, translatedValueInterpolate));
+    const translatedValue = escapeHtmlTranslationValue(getWebappTranslation(key, translatedValueInterpolate));
     if (enableTranslation) {
         const translateValuesAttr = ` [translateValues]="{ ${Object.entries(parsedInterpolate)
             .map(([key, value]) => `${key}: ('${value}' | translate)`)
@@ -154,7 +151,7 @@ const tagEnumTranslation = (getWebappTranslation, { enableTranslation, jhiPrefix
         throw new Error(`Value is required for TagEnum ${key}.`);
     }
     const { value, fallback } = parsedInterpolate;
-    const translatedValue = `{{ ${JSON.stringify(getTranslationValue(getWebappTranslation, key))}[${value}]${fallback ? ` || ${fallback}` : ''} }}`;
+    const translatedValue = `{{ ${JSON.stringify(getWebappTranslation(key))}[${value}]${fallback ? ` || ${fallback}` : ''} }}`;
     if (enableTranslation) {
         return ` [${jhiPrefix}Translate]="'${key}.' + (${parsedInterpolate?.value})"${prefix}${translatedValue}${suffix}`;
     }
@@ -168,13 +165,13 @@ const pipeTranslation = (getWebappTranslation, { enableTranslation }, { key, pre
     if (enableTranslation) {
         return `${prefix}{{ '${key}' | translate }}${suffix}`;
     }
-    return `${prefix}${escapeHtmlTranslationValue(getTranslationValue(getWebappTranslation, key))}${suffix}`;
+    return `${prefix}${escapeHtmlTranslationValue(getWebappTranslation(key))}${suffix}`;
 };
 /**
  * Get translation value.
  */
 const valueTranslation = (getWebappTranslation, _replacerOptions, { filePath, key, prefix, suffix }) => {
-    let translationValue = getTranslationValue(getWebappTranslation, key);
+    let translationValue = getWebappTranslation(key);
     const fileExtension = extname(filePath);
     if (fileExtension === '.html') {
         translationValue = escapeHtmlTranslationValue(translationValue);
@@ -196,7 +193,7 @@ const pipeEnumTranslation = (getWebappTranslation, { enableTranslation }, { key,
     if (enableTranslation) {
         return `${prefix}{{ '${key}.' + ${value} | translate }}${suffix}`;
     }
-    const translatedValue = `{{ ${JSON.stringify(getTranslationValue(getWebappTranslation, key))}[${value}]${fallback ? ` ?? ${fallback}` : ''} }}`;
+    const translatedValue = `{{ ${JSON.stringify(getWebappTranslation(key))}[${value}]${fallback ? ` ?? ${fallback}` : ''} }}`;
     return `${prefix}${translatedValue}${suffix}`;
 };
 const replaceImplementations = {
@@ -229,7 +226,7 @@ export const createTranslationReplacer = (getWebappTranslation, opts) => {
         }, { prefixPattern: '>\\s*', suffixPattern: '\\s*<' });
     }
     return function replaceAngularTranslations(content, filePath) {
-        if (/\.html$/.test(filePath)) {
+        if (filePath.endsWith('.html')) {
             if (!enableTranslation) {
                 content = content.replace(new RegExp(TRANSLATE_REGEX, 'g'), '');
                 content = replacePlaceholders(getWebappTranslation, content);
@@ -247,7 +244,7 @@ export const createTranslationReplacer = (getWebappTranslation, opts) => {
             if (/(:?route|module)\.ts$/.test(filePath)) {
                 content = replacePageTitles(getWebappTranslation, content);
             }
-            if (/error\.route\.ts$/.test(filePath)) {
+            if (filePath.endsWith('error.route.ts')) {
                 content = replaceErrorMessage(getWebappTranslation, content);
             }
         }

package/dist/generators/angular/templates/src/main/webapp/app/account/activate/activate.component.ts.ejs

@@ -33,8 +33,8 @@ export default class ActivateComponent implements OnInit {
   error = signal(false);
   success = signal(false);
 
-  private activateService = inject(ActivateService);
-  private route = inject(ActivatedRoute);
+  private readonly activateService = inject(ActivateService);
+  private readonly route = inject(ActivatedRoute);
 
   ngOnInit(): void {
     this.route.queryParams.pipe(mergeMap(params => this.activateService.get(params.key))).subscribe({

package/dist/generators/angular/templates/src/main/webapp/app/account/activate/activate.service.ts.ejs

@@ -24,8 +24,8 @@ import { ApplicationConfigService } from 'app/core/config/application-config.ser
 
 @Injectable({ providedIn: 'root' })
 export class ActivateService {
-  private http = inject(HttpClient);
-  private applicationConfigService = inject(ApplicationConfigService);
+  private readonly http = inject(HttpClient);
+  private readonly applicationConfigService = inject(ApplicationConfigService);
 
   get(key: string): Observable<{}> {
     return this.http.get(this.applicationConfigService.getEndpointFor('api/activate'), {

package/dist/generators/angular/templates/src/main/webapp/app/account/password/password-strength-bar/password-strength-bar.component.ts.ejs

@@ -30,8 +30,8 @@ import SharedModule from 'app/shared/shared.module';
 export default class PasswordStrengthBarComponent {
   colors = ['#F00', '#F90', '#FF0', '#9F0', '#0F0'];
 
-  private renderer = inject(Renderer2);
-  private elementRef = inject(ElementRef);
+  private readonly renderer = inject(Renderer2);
+  private readonly elementRef = inject(ElementRef);
 
   measureStrength(p: string): number {
     let force = 0;

package/dist/generators/angular/templates/src/main/webapp/app/account/password/password.component.ts.ejs

@@ -49,8 +49,8 @@ export default class PasswordComponent implements OnInit {
     }),
   });
 
-  private passwordService = inject(PasswordService);
-  private accountService = inject(AccountService);
+  private readonly passwordService = inject(PasswordService);
+  private readonly accountService = inject(AccountService);
 
   ngOnInit(): void {
     this.account$ = this.accountService.identity();

package/dist/generators/angular/templates/src/main/webapp/app/account/password/password.service.ts.ejs

@@ -24,8 +24,8 @@ import { ApplicationConfigService } from 'app/core/config/application-config.ser
 
 @Injectable({ providedIn: 'root' })
 export class PasswordService {
-  private http = inject(HttpClient);
-  private applicationConfigService = inject(ApplicationConfigService);
+  private readonly http = inject(HttpClient);
+  private readonly applicationConfigService = inject(ApplicationConfigService);
 
   save(newPassword: string, currentPassword: string): Observable<{}> {
     return this.http.post(this.applicationConfigService.getEndpointFor('api/account/change-password'), { currentPassword, newPassword });

package/dist/generators/angular/templates/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.ts.ejs

@@ -50,8 +50,8 @@ export default class PasswordResetFinishComponent implements OnInit, AfterViewIn
     }),
   });
 
-  private passwordResetFinishService = inject(PasswordResetFinishService);
-  private route = inject(ActivatedRoute);
+  private readonly passwordResetFinishService = inject(PasswordResetFinishService);
+  private readonly route = inject(ActivatedRoute);
 
   ngOnInit(): void {
     this.route.queryParams.subscribe(params => {

package/dist/generators/angular/templates/src/main/webapp/app/account/password-reset/finish/password-reset-finish.service.ts.ejs

@@ -24,8 +24,8 @@ import { ApplicationConfigService } from 'app/core/config/application-config.ser
 
 @Injectable({ providedIn: 'root' })
 export class PasswordResetFinishService {
-  private http = inject(HttpClient);
-  private applicationConfigService = inject(ApplicationConfigService);
+  private readonly http = inject(HttpClient);
+  private readonly applicationConfigService = inject(ApplicationConfigService);
 
   save(key: string, newPassword: string): Observable<{}> {
     return this.http.post(this.applicationConfigService.getEndpointFor('api/account/reset-password/finish'), { key, newPassword });

package/dist/generators/angular/templates/src/main/webapp/app/account/password-reset/init/password-reset-init.component.ts.ejs

@@ -34,8 +34,8 @@ export default class PasswordResetInitComponent implements AfterViewInit {
   success = signal(false);
   resetRequestForm;
 
-  private passwordResetInitService = inject(PasswordResetInitService);
-  private fb = inject(FormBuilder);
+  private readonly passwordResetInitService = inject(PasswordResetInitService);
+  private readonly fb = inject(FormBuilder);
 
   constructor() {
     this.resetRequestForm = this.fb.group({

package/dist/generators/angular/templates/src/main/webapp/app/account/password-reset/init/password-reset-init.service.ts.ejs

@@ -24,8 +24,8 @@ import { ApplicationConfigService } from 'app/core/config/application-config.ser
 
 @Injectable({ providedIn: 'root' })
 export class PasswordResetInitService {
-  private http = inject(HttpClient);
-  private applicationConfigService = inject(ApplicationConfigService);
+  private readonly http = inject(HttpClient);
+  private readonly applicationConfigService = inject(ApplicationConfigService);
 
   save(mail: string): Observable<{}> {
     return this.http.post(this.applicationConfigService.getEndpointFor('api/account/reset-password/init'), mail);

package/dist/generators/angular/templates/src/main/webapp/app/account/register/register.component.ts.ejs

@@ -68,8 +68,8 @@ export default class RegisterComponent implements AfterViewInit {
     }),
   });
 
-  <%_ if (enableTranslation) { _%>private translateService = inject(TranslateService);<%_ } _%>
-  private registerService = inject(RegisterService);
+  <%_ if (enableTranslation) { _%>private readonly translateService = inject(TranslateService);<%_ } _%>
+  private readonly registerService = inject(RegisterService);
 
   ngAfterViewInit(): void {
     this.login().nativeElement.focus();