generator-jhipster 8.0.0-rc.1 → 8.0.0

package/README.md

@@ -12,7 +12,16 @@ Please read our [guidelines](/CONTRIBUTING.md#submitting-an-issue) before submit
 
 ## Contributing
 
-We are honoured by any contributions you may have small or large. Please refer to our [contribution guidelines and instructions document](https://github.com/jhipster/generator-jhipster/blob/main/CONTRIBUTING.md) for any information about contributing to the project.
+We are honored by any contributions you may have small or large. Please refer to our [contribution guidelines and instructions document](https://github.com/jhipster/generator-jhipster/blob/main/CONTRIBUTING.md) for any information about contributing to the project.
+
+## Supported Java and Node versions
+
+The following Java and Node combinations are tested and verified by GitHub Actions:
+
+| Java | Node | Status |
+| ---- | ---- | ------ |
+| 21   | 20   | ✅     |
+| 17   | 18   | ✅     |
 
 ## Sponsors
 

package/dist/cli/environment-builder.mjs

@@ -190,10 +190,10 @@ export default class EnvironmentBuilder {
      * @return {EnvironmentBuilder} this for chaining.
      */
     async _lookupBlueprints(options) {
-        const allBlueprints = Object.keys(this._blueprintsWithVersion);
-        if (allBlueprints && allBlueprints.length > 0) {
+        const missingBlueprints = Object.keys(this._blueprintsWithVersion).filter(blueprint => !this.env.isPackageRegistered(packageNameToNamespace(blueprint)));
+        if (missingBlueprints && missingBlueprints.length > 0) {
             // Lookup for blueprints.
-            await this.env.lookup({ ...options, filterPaths: true, packagePatterns: allBlueprints });
+            await this.env.lookup({ ...options, filterPaths: true, packagePatterns: missingBlueprints });
         }
         return this;
     }

package/dist/cli/jhipster-command.mjs

@@ -192,9 +192,13 @@ export default class JHipsterCommand extends Command {
         else if (optionDefinition.type && optionDefinition.type !== Boolean) {
             cmdString = optionDefinition.required !== false ? `${cmdString} <value>` : `${cmdString} [value]`;
         }
-        const option = new Option(cmdString, optionDefinition.description + additionalDescription)
-            .default(optionDefinition.default)
-            .hideHelp(optionDefinition.hide ?? false);
+        // Passing default to `commander` (`.default(optionDefinition.default)`), will set at options passed to initial generator, so it's used in entire generation process.
+        // We want default value to be set on jhipster options parsing so ignore default at commander.
+        let defaultDescription = '';
+        if (optionDefinition.default !== undefined && (!Array.isArray(optionDefinition.default) || optionDefinition.default.length !== 0)) {
+            defaultDescription = ` (default: ${optionDefinition.default})`;
+        }
+        const option = new Option(cmdString, optionDefinition.description + defaultDescription + additionalDescription).hideHelp(optionDefinition.hide ?? false);
         if (optionDefinition.env) {
             option.env(optionDefinition.env);
         }

package/dist/cli/program.mjs

@@ -199,7 +199,7 @@ export const buildCommands = async ({ program, commands = {}, envBuilder, env, l
                 const boostrapGen = ['bootstrap', generator];
                 const allDependencies = await buildAllDependencies(boostrapGen, {
                     env,
-                    blueprintNamespaces: blueprint ? [] : envBuilder.getBlueprintsNamespaces(),
+                    blueprintNamespaces: envBuilder.getBlueprintsNamespaces(),
                 });
                 for (const [metaName, { meta: generatorMeta, blueprintNamespace }] of Object.entries(allDependencies)) {
                     if (blueprintNamespace) {

package/dist/generators/angular/generator.mjs

@@ -18,7 +18,7 @@
  */
 import * as _ from 'lodash-es';
 import chalk from 'chalk';
-import { isFilePending } from 'mem-fs-editor/state';
+import { isFileStateModified } from 'mem-fs-editor/state';
 import BaseApplicationGenerator from '../base-application/index.mjs';
 import { GENERATOR_ANGULAR, GENERATOR_CLIENT, GENERATOR_LANGUAGES } from '../generator-list.mjs';
 import { defaultLanguage } from '../languages/support/index.mjs';
@@ -102,6 +102,13 @@ export default class AngularGenerator extends BaseApplicationGenerator {
                 const entities = this.sharedData.getEntities().map(({ entity }) => entity);
                 this.localEntities = entities.filter(entity => !entity.builtIn && !entity.skipClient);
             },
+            queueTranslateTransform({ control, application }) {
+                this.queueTransformStream({
+                    name: 'translating angular application',
+                    filter: file => isFileStateModified(file) && file.path.startsWith(this.destinationPath()) && isTranslatedAngularFile(file),
+                    refresh: false,
+                }, translateAngularFilesTransform(control.getWebappTranslation, application.enableTranslation));
+            },
         });
     }
     get [BaseApplicationGenerator.DEFAULT]() {
@@ -111,12 +118,6 @@ export default class AngularGenerator extends BaseApplicationGenerator {
         return this.asWritingTaskGroup({
             cleanupOldFilesTask,
             writeFiles,
-            queueTranslateTransform({ control, application }) {
-                this.queueTransformStream(translateAngularFilesTransform(control.getWebappTranslation, application.enableTranslation), {
-                    name: 'translating webapp',
-                    streamOptions: { filter: file => isFilePending(file) && isTranslatedAngularFile(file) },
-                });
-            },
         });
     }
     get [BaseApplicationGenerator.WRITING]() {

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

@@ -1,10 +1,10 @@
 {
   "dependencies": {
-    "@angular/common": "16.2.9",
+    "@angular/common": "16.2.11",
     "@fortawesome/angular-fontawesome": "0.13.0",
     "@fortawesome/fontawesome-svg-core": "6.4.2",
     "@fortawesome/free-solid-svg-icons": "6.4.2",
-    "@ng-bootstrap/ng-bootstrap": "15.1.1",
+    "@ng-bootstrap/ng-bootstrap": "15.1.2",
     "@ngx-translate/core": "15.0.0",
     "@ngx-translate/http-loader": "8.0.0",
     "@popperjs/core": "2.11.8",
@@ -17,19 +17,20 @@
     "zone.js": "0.13.3"
   },
   "devDependencies": {
+    "@angular-architects/module-federation": "16.0.4",
     "@angular-architects/module-federation-runtime": "16.0.4",
     "@angular-builders/custom-webpack": "16.0.1",
     "@angular-builders/jest": "16.0.1",
     "@angular-eslint/eslint-plugin": "16.2.0",
-    "@angular/cli": "16.2.6",
-    "@types/jest": "29.5.5",
-    "@types/node": "18.18.5",
-    "@typescript-eslint/eslint-plugin": "6.7.5",
+    "@angular/cli": "16.2.9",
+    "@types/jest": "29.5.7",
+    "@types/node": "18.18.8",
+    "@typescript-eslint/eslint-plugin": "6.9.1",
     "browser-sync": "2.29.3",
     "browser-sync-webpack-plugin": "2.3.0",
     "buffer": "6.0.3",
     "copy-webpack-plugin": "11.0.0",
-    "eslint": "8.51.0",
+    "eslint": "8.52.0",
     "eslint-config-prettier": "9.0.0",
     "eslint-webpack-plugin": "4.0.1",
     "folder-hash": "4.0.4",
@@ -43,9 +44,9 @@
     "rimraf": "5.0.5",
     "ts-jest": "29.1.1",
     "typescript": "5.1.6",
-    "webpack": "5.88.2",
+    "webpack": "5.89.0",
     "webpack-bundle-analyzer": "4.9.1",
-    "webpack-merge": "5.9.0",
+    "webpack-merge": "5.10.0",
     "webpack-notifier": "1.15.0"
   }
 }

package/dist/generators/angular/templates/package.json.ejs

@@ -57,16 +57,17 @@
 <%_ if (communicationSpringWebsocket) { _%>
     "sockjs-client": "1.6.1",
     "@stomp/rx-stomp": "1.2.0",
-<%_ } _%>
-<%_ if (skipServer) { _%>
-    "sonar-scanner": "3.1.0",
 <%_ } _%>
     "tslib": "<%= nodeDependencies['tslib'] %>",
     "zone.js": "<%= nodeDependencies['zone.js'] %>"
   },
   "devDependencies": {
+<%_ if (skipServer) { _%>
+    "sonar-scanner": "3.1.0",
+<%_ } _%>
 <%_ if (microfrontend && applicationTypeGateway) { _%>
     "@angular-architects/module-federation-runtime": "<%= nodeDependencies['@angular-architects/module-federation-runtime'] %>",
+    "@angular-architects/module-federation": "<%= nodeDependencies['@angular-architects/module-federation'] %>",
 <%_ } _%>
 <%_ if (communicationSpringWebsocket) { _%>
     "@types/sockjs-client": "1.5.1",
@@ -77,9 +78,6 @@
 <%_ if (enableTranslation) { _%>
     "folder-hash": "<%= nodeDependencies['folder-hash'] %>",
     "merge-jsons-webpack-plugin": "<%= nodeDependencies['merge-jsons-webpack-plugin'] %>",
-<%_ } _%>
-<%_ if (!skipServer) { _%>
-    "prettier-plugin-java": "<%= nodeDependencies['prettier-plugin-java'] %>",
 <%_ } _%>
     "@angular/cli": "<%= nodeDependencies['@angular/cli'] %>",
     "@angular/compiler-cli": "<%= nodeDependencies['@angular/common'] %>",
@@ -105,8 +103,6 @@
     "jest-date-mock": "<%= nodeDependencies['jest-date-mock'] %>",
     "jest-junit": "<%= nodeDependencies['jest-junit'] %>",
     "jest-sonar": "<%= nodeDependencies['jest-sonar'] %>",
-    "prettier": "<%= nodeDependencies['prettier'] %>",
-    "prettier-plugin-packagejson": "<%= nodeDependencies['prettier-plugin-packagejson'] %>",
 <%_ if (enableI18nRTL) { _%>
     "postcss-rtlcss": "<%= nodeDependencies['postcss-rtlcss'] %>",
 <%_ } _%>

package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/list/_entityFile_.component.html.ejs

@@ -179,22 +179,18 @@ _%>
                             </button>
     <%_ } _%>
 <%_ } _%>
-                            <button type="submit"
-                                    [routerLink]="['/<%= entityPage %>', <%= entityInstance %>.<%= primaryKey.name %>, 'view']"
-                                    class="btn btn-info btn-sm"
-                                    data-cy="entityDetailsButton">
+                            <a [routerLink]="['/<%= entityPage %>', <%= entityInstance %>.<%= primaryKey.name %>, 'view']"
+                               class="btn btn-info btn-sm" data-cy="entityDetailsButton">
                                 <fa-icon icon="eye"></fa-icon>
                                 <span class="d-none d-md-inline" <%= jhiPrefix %>Translate="entity.action.view">__jhiTransformTranslate__('entity.action.view')</span>
-                            </button>
+                            </a>
 <%_ if (!readOnly) { _%>
 
-                            <button type="submit"
-                                    [routerLink]="['/<%= entityPage %>', <%= entityInstance %>.<%= primaryKey.name %>, 'edit']"
-                                    class="btn btn-primary btn-sm"
-                                    data-cy="entityEditButton">
+                            <a [routerLink]="['/<%= entityPage %>', <%= entityInstance %>.<%= primaryKey.name %>, 'edit']"
+                               class="btn btn-primary btn-sm" data-cy="entityEditButton">
                                 <fa-icon icon="pencil-alt"></fa-icon>
                                 <span class="d-none d-md-inline" <%= jhiPrefix %>Translate="entity.action.edit">__jhiTransformTranslate__('entity.action.edit')</span>
-                            </button>
+                            </a>
 
                             <button type="submit" (click)="delete(<%= entityInstance %>)"
                                     class="btn btn-danger btn-sm"

package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/service/_entityFile_.service.ts.ejs

@@ -77,7 +77,7 @@ export type EntityArrayResponseType = HttpResponse<I<%= entityAngularName %>[]>;
 export class <%= entityAngularName %>Service {
     protected resourceUrl = this.applicationConfigService.getEndpointFor('api/<%= entityApiUrl %>'<% if ((applicationTypeGateway || applicationTypeMicroservice) && locals.microserviceName) { %>, '<%= microserviceName.toLowerCase() %>'<% } %>);
 <%_ if (searchEngineAny) { _%>
-    protected resourceSearchUrl = this.applicationConfigService.getEndpointFor('api/_search/<%= entityApiUrl %>'<% if ((applicationTypeGateway || applicationTypeMicroservice) && locals.microserviceName) { %>, '<%= microserviceName.toLowerCase() %>'<% } %>);
+    protected resourceSearchUrl = this.applicationConfigService.getEndpointFor('api/<%= entityApiUrl %>/_search'<% if ((applicationTypeGateway || applicationTypeMicroservice) && locals.microserviceName) { %>, '<%= microserviceName.toLowerCase() %>'<% } %>);
 <%_ } _%>
 
     constructor(protected http: HttpClient, protected applicationConfigService: ApplicationConfigService) {}

package/dist/generators/angular/templates/src/main/webapp/app/layouts/navbar/navbar.component.scss.ejs

@@ -67,6 +67,6 @@ Logo styles
   width: 45px;
   display: inline-block;
   vertical-align: middle;
-  background: url('../../../content/images/logo-jhipster.png') no-repeat center center;
+  background: url('/content/images/logo-jhipster.png') no-repeat center center;
   background-size: contain;
 }

package/dist/generators/angular/templates/webpack/webpack.microfrontend.js.ejs

@@ -16,138 +16,60 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-const ModuleFederationPlugin = require('webpack/lib/container/ModuleFederationPlugin');
+const { withModuleFederationPlugin } = require('@angular-architects/module-federation/webpack');
 const packageJson = require('../package.json');
-const appVersion = packageJson.version;
+// Microfrontend api, should match across gateway and microservices.
+const apiVersion = '0.0.1';
+
+const sharedDefaults = { singleton: true, strictVersion: true, requiredVersion: apiVersion };
+const shareAllDefaults = { ...sharedDefaults, requiredVersion: 'auto' }
+const shareMappings = (...mappings) => Object.fromEntries(mappings.map(map => [map, { ...sharedDefaults, version: apiVersion }]));
+
+const shareDependencies = ({ skipList = [] } = {}) =>
+  Object.fromEntries(
+    Object.entries(packageJson.dependencies)
+      .filter(([dependency]) => !skipList.includes(dependency))
+      .map(([dependency, version]) => [dependency, { ...sharedDefaults, version, requiredVersion: version }]),
+  );
+
+let sharedDependencies = shareDependencies({ skipList: ['@angular/localize'] });
+sharedDependencies = {
+  ...sharedDependencies,
+  '@angular/common/http': sharedDependencies['@angular/common'],
+  'rxjs/operators': sharedDependencies.rxjs,
+};
 
 module.exports = (config, options, targetOptions) => {
-  return {
-    experiments: {
-      outputModule: true,
-    },
-    plugins: [
-      new ModuleFederationPlugin({
-        library: {
-          type: 'module',
-        },
+  return withModuleFederationPlugin({
+    name: '<%= lowercaseBaseName %>',
 <%_ if (applicationTypeMicroservice) { _%>
-        name: '<%= lowercaseBaseName %>',
-        filename: 'remoteEntry.js',
-        exposes: {
+    exposes: {
   <%_ if (enableTranslation) { _%>
-          './translation-module': 'app/shared/language/translation.module.ts',
+      './translation-module': 'app/shared/language/translation.module.ts',
   <%_ } _%>
-          './entity-navbar-items': 'app/entities/entity-navbar-items.ts',
-          './entity-routing': 'app/entities/entity-routing.module.ts',
-        },
-<%_ } _%>
-<%_ if (applicationTypeGateway) { _%>
-        remotes: {},
-<%_ } _%>
-        shared: {
-          // { eager?, import?, packageName?, requiredVersion?, shareKey?, shareScope?, singleton?, strictVersion?, version? }
-          '@angular/core': { singleton: true, strictVersion: true, requiredVersion: '<%= nodeDependencies['@angular/common'] %>' },
-          '@angular/common': { singleton: true, strictVersion: true, requiredVersion: '<%= nodeDependencies['@angular/common'] %>' },
-          '@angular/common/http': { singleton: true, strictVersion: true, requiredVersion: '<%= nodeDependencies['@angular/common'] %>' },
-          '@angular/router': { singleton: true, strictVersion: true, requiredVersion: '<%= nodeDependencies['@angular/common'] %>' },
-          '@angular/forms': { singleton: true, strictVersion: true, requiredVersion: '<%= nodeDependencies['@angular/common'] %>' },
-          '@angular/platform-browser': { singleton: true, strictVersion: true, requiredVersion: '<%= nodeDependencies['@angular/common'] %>' },
-          '@fortawesome/angular-fontawesome': { singleton: true, strictVersion: true, requiredVersion: '<%= nodeDependencies['@fortawesome/angular-fontawesome'] %>' },
-          '@fortawesome/fontawesome-common-types': { singleton: true, strictVersion: true },
-          '@fortawesome/fontawesome-svg-core': { singleton: true, strictVersion: true, requiredVersion: '<%= nodeDependencies['@fortawesome/fontawesome-svg-core'] %>' },
-          '@fortawesome/free-solid-svg-icons': { singleton: true },
-          '@ng-bootstrap/ng-bootstrap': { singleton: true, strictVersion: true, requiredVersion: '<%= nodeDependencies['@ng-bootstrap/ng-bootstrap'] %>' },
-          '@ngx-translate/core': { singleton: true, strictVersion: true, requiredVersion: '<%= nodeDependencies['@ngx-translate/core'] %>' },
-          '@ngx-translate/http-loader': { singleton: true, strictVersion: true, requiredVersion: '<%= nodeDependencies['@ngx-translate/http-loader'] %>' },
-          dayjs: { singleton: true, strictVersion: true, requiredVersion: '<%= nodeDependencies['dayjs'] %>' },
-          'ngx-infinite-scroll': { singleton: true, strictVersion: true, requiredVersion: '<%= nodeDependencies['ngx-infinite-scroll'] %>' },
-          rxjs: { singleton: true, strictVersion: true, requiredVersion: '<%= nodeDependencies['rxjs'] %>' },
-          'rxjs/operators': { singleton: true, strictVersion: true, requiredVersion: '<%= nodeDependencies['rxjs'] %>' },
-          'zone.js': { singleton: true, strictVersion: true, requiredVersion: '<%= nodeDependencies['zone.js'] %>' },
-          'app/config/input.constants': {
-            singleton: true,
-            import: 'app/config/input.constants',
-            requiredVersion: appVersion,
-          },
-          'app/config/pagination.constants': {
-            singleton: true,
-            import: 'app/config/pagination.constants',
-            requiredVersion: appVersion,
-          },
-          'app/config/translation.config': {
-            singleton: true,
-            import: 'app/config/translation.config',
-            requiredVersion: appVersion,
-          },
-          'app/core/auth': {
-            singleton: true,
-            import: 'app/core/auth',
-            requiredVersion: appVersion,
-          },
-          'app/core/config': {
-            singleton: true,
-            import: 'app/core/config',
-            requiredVersion: appVersion,
-          },
-          'app/core/interceptor': {
-            singleton: true,
-            import: 'app/core/interceptor',
-            requiredVersion: appVersion,
-          },
-          'app/core/request': {
-            singleton: true,
-            import: 'app/core/request',
-            requiredVersion: appVersion,
-          },
-          'app/core/util': {
-            singleton: true,
-            import: 'app/core/util',
-            requiredVersion: appVersion,
-          },
-          'app/shared': {
-            singleton: true,
-            import: 'app/shared',
-            requiredVersion: appVersion,
-          },
-          'app/shared/alert': {
-            singleton: true,
-            import: 'app/shared/alert',
-            requiredVersion: appVersion,
-          },
-          'app/shared/auth': {
-            singleton: true,
-            import: 'app/shared/auth',
-            requiredVersion: appVersion,
-          },
-          'app/shared/date': {
-            singleton: true,
-            import: 'app/shared/date',
-            requiredVersion: appVersion,
-          },
-          'app/shared/language': {
-            singleton: true,
-            import: 'app/shared/language',
-            requiredVersion: appVersion,
-          },
-          'app/shared/pagination': {
-            singleton: true,
-            import: 'app/shared/pagination',
-            requiredVersion: appVersion,
-          },
-          'app/shared/sort': {
-            singleton: true,
-            import: 'app/shared/sort',
-            requiredVersion: appVersion,
-          },
-        },
-      }),
-    ],
-    output: {
-      publicPath: 'auto',
-      uniqueName: '<%= lowercaseBaseName %>',
+      './entity-navbar-items': 'app/entities/entity-navbar-items.ts',
+      './entity-routing': 'app/entities/entity-routing.module.ts',
     },
-    optimization: {
-      runtimeChunk: false,
+<%_ } _%>
+    shared: {
+      ...sharedDependencies,
+      ...shareMappings(
+        'app/config/input.constants',
+        'app/config/pagination.constants',
+        'app/config/translation.config',
+        'app/core/auth',
+        'app/core/config',
+        'app/core/interceptor',
+        'app/core/request',
+        'app/core/util',
+        'app/shared',
+        'app/shared/alert',
+        'app/shared/auth',
+        'app/shared/date',
+        'app/shared/language',
+        'app/shared/pagination',
+        'app/shared/sort',
+      ),
     },
-  };
+  });
 };

package/dist/generators/app/support/config.mjs

@@ -1,7 +1,7 @@
 import { camelCase, kebabCase, startCase, upperFirst } from 'lodash-es';
 import { NODE_VERSION } from '../../generator-constants.mjs';
 import { applicationTypes, authenticationTypes, databaseTypes, testFrameworkTypes } from '../../../jdl/index.js';
-import { getHipster, mutateApplication, pickFields, upperFirstCamelCase } from '../../base/support/index.mjs';
+import { getHipster, mutateData, pickFields, upperFirstCamelCase } from '../../base/support/index.mjs';
 import { getDBTypeFromDBValue } from '../../server/support/index.mjs';
 import detectLanguage from '../../languages/support/detect-language.mjs';
 import { loadConfig, loadDerivedConfig } from '../../../lib/internal/index.mjs';
@@ -72,7 +72,7 @@ export function loadStoredAppOptions({ options = this.options, jhipsterConfig =
  */
 export const loadAppConfig = ({ config, application, useVersionPlaceholders, }) => {
     loadConfig(serverCommand.configs, { config, application });
-    mutateApplication(application, {
+    mutateData(application, {
         nodeVersion: useVersionPlaceholders ? 'NODE_VERSION' : NODE_VERSION,
         jhipsterVersion: useVersionPlaceholders ? 'JHIPSTER_VERSION' : undefined,
     }, pickFields(config, [
@@ -116,7 +116,7 @@ export const loadAppConfig = ({ config, application, useVersionPlaceholders, })
  */
 export const loadDerivedAppConfig = ({ application }) => {
     loadDerivedConfig(serverCommand.configs, { application });
-    mutateApplication(application, {
+    mutateData(application, {
         jhiPrefixCapitalized: ({ jhiPrefix }) => upperFirst(jhiPrefix),
         jhiPrefixDashed: ({ jhiPrefix }) => kebabCase(jhiPrefix),
         camelizedBaseName: ({ baseName }) => camelCase(baseName),

package/dist/generators/base/generator.mjs

@@ -462,9 +462,6 @@ export default class JHipsterBaseBlueprintGenerator extends CoreGenerator {
         }
         const generatorName = packageNameToNamespace(blueprint);
         const generatorNamespace = `${generatorName}:${subGen}`;
-        if (!this.env.isPackageRegistered(generatorName)) {
-            await this.env.lookup({ filterPaths: true, packagePatterns: blueprint });
-        }
         if (!(await this.env.get(generatorNamespace))) {
             this.log.debug(`No blueprint found for blueprint ${chalk.yellow(blueprint)} and ${chalk.yellow(subGen)} with namespace ${chalk.yellow(generatorNamespace)} subgenerator: falling back to default generator`);
             return undefined;

package/dist/generators/base/support/config.mjs

@@ -65,20 +65,20 @@ export const pickFields = (source, fields) => Object.fromEntries(fields.map(fiel
  *
  * @example
  * // application = { prop: 'foo-bar', prop2: 'foo2' }
- * mutateApplication(
- *   application,
+ * mutateData(
+ *   data,
  *   { prop: 'foo', prop2: ({ prop }) => prop + 2 },
  *   { prop: ({ prop }) => prop + '-bar', prop2: 'won\'t override' },
  * );
  */
-export const mutateApplication = (application, ...mutations) => {
+export const mutateData = (context, ...mutations) => {
     for (const mutation of mutations) {
         for (const [key, value] of Object.entries(mutation)) {
             if (typeof value === 'function') {
-                application[key] = value(application);
+                context[key] = value(context);
             }
-            else if (application[key] === undefined) {
-                application[key] = value;
+            else if (context[key] === undefined) {
+                context[key] = value;
             }
         }
     }

package/dist/generators/base/support/jhipster7-context.mjs

@@ -159,9 +159,9 @@ const deprecatedProperties = {
     },
 };
 const ejsBuiltInProperties = ['__append', '__line', 'escapeFn', 'include', 'undefined'];
-const javascriptBuiltInProperties = ['parseInt', 'Boolean', 'JSON', 'Object'];
+const javascriptBuiltInProperties = ['parseInt', 'Boolean', 'JSON', 'Object', 'toString'];
 const getProperty = (context, prop) => {
-    if (prop === Symbol.unscopables) {
+    if (typeof prop === 'symbol') {
         return undefined;
     }
     if (prop in deprecatedProperties) {
@@ -170,7 +170,7 @@ const getProperty = (context, prop) => {
         console.log(`Template data ${chalk.yellow(String(prop))} was removed and should be replaced with ${chalk.yellow(replacement)}. Value: ${value}`);
         return value;
     }
-    if (prop.startsWith('DOCKER_')) {
+    if (prop?.startsWith?.('DOCKER_')) {
         console.log(`Template data ${chalk.yellow(String(prop))} was removed and should be replaced with ${chalk.yellow(
         // eslint-disable-next-line no-template-curly-in-string
         'dockerContainers.${dockerImage}')}.`);

package/dist/generators/base-application/generator.mjs

@@ -22,7 +22,7 @@ import { CUSTOM_PRIORITIES, PRIORITY_NAMES, QUEUES } from './priorities.mjs';
 import { JHIPSTER_CONFIG_DIR } from '../generator-constants.mjs';
 import { getEntitiesFromDir } from './support/index.mjs';
 import command from './command.mjs';
-import { mutateApplication } from '../base/support/config.mjs';
+import { mutateData } from '../base/support/config.mjs';
 const { LOADING, PREPARING, POST_PREPARING, CONFIGURING_EACH_ENTITY, LOADING_ENTITIES, PREPARING_EACH_ENTITY, PREPARING_EACH_ENTITY_FIELD, PREPARING_EACH_ENTITY_RELATIONSHIP, POST_PREPARING_EACH_ENTITY, DEFAULT, WRITING, POST_WRITING, WRITING_ENTITIES, POST_WRITING_ENTITIES, PRE_CONFLICTS, INSTALL, END, } = PRIORITY_NAMES;
 const { CONFIGURING_EACH_ENTITY_QUEUE, LOADING_ENTITIES_QUEUE, PREPARING_EACH_ENTITY_QUEUE, PREPARING_EACH_ENTITY_FIELD_QUEUE, PREPARING_EACH_ENTITY_RELATIONSHIP_QUEUE, POST_PREPARING_EACH_ENTITY_QUEUE, WRITING_ENTITIES_QUEUE, POST_WRITING_ENTITIES_QUEUE, } = QUEUES;
 const asPriority = BaseGenerator.asPriority;
@@ -259,7 +259,7 @@ export default class BaseApplicationGenerator extends BaseGenerator {
         if ([PREPARING, LOADING].includes(priorityName)) {
             return {
                 application,
-                applicationDefaults: data => mutateApplication(application, data),
+                applicationDefaults: data => mutateData(application, data),
             };
         }
         if (LOADING_ENTITIES === priorityName) {

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

@@ -85,7 +85,7 @@ export const getEnumInfo = (field, clientRootFolder) => {
     const customValuesState = getCustomValuesState(enums);
     return {
         enumName: field.fieldType,
-        javadoc: field.fieldTypeDocumentation && formatDocAsJavaDoc(field.fieldTypeDocumentation),
+        enumJavadoc: field.fieldTypeDocumentation && formatDocAsJavaDoc(field.fieldTypeDocumentation),
         enumInstance: field.enumInstance,
         enums,
         ...customValuesState,

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

@@ -19,7 +19,7 @@
 import * as _ from 'lodash-es';
 import pluralize from 'pluralize';
 import { getDatabaseTypeData, hibernateSnakeCase } from '../../server/support/index.mjs';
-import { createFaker, parseChangelog, stringHashCode, upperFirstCamelCase, getMicroserviceAppName } from '../../base/support/index.mjs';
+import { createFaker, parseChangelog, stringHashCode, upperFirstCamelCase, getMicroserviceAppName, mutateData, } from '../../base/support/index.mjs';
 import { fieldToReference } from './prepare-field.mjs';
 import { getTypescriptKeyType, getEntityParentPathAddition } from '../../client/support/index.mjs';
 import { applicationTypes, authenticationTypes, binaryOptions, databaseTypes, entityOptions, fieldTypes, searchEngineTypes, } from '../../../jdl/jhipster/index.mjs';
@@ -113,7 +113,7 @@ export default function prepareEntity(entityWithConfig, generator, application)
     const entityName = _.upperFirst(entityWithConfig.name);
     _.defaults(entityWithConfig, entityDefaultConfig, BASE_TEMPLATE_DATA);
     if (entityWithConfig.changelogDate) {
-        entityWithConfig.changelogDateForRecent = parseChangelog(entityWithConfig.changelogDate);
+        entityWithConfig.changelogDateForRecent = parseChangelog(String(entityWithConfig.changelogDate));
     }
     entityWithConfig.entityAngularJSSuffix = entityWithConfig.angularJSSuffix;
     if (entityWithConfig.entityAngularJSSuffix && !entityWithConfig.entityAngularJSSuffix.startsWith('-')) {
@@ -228,7 +228,7 @@ export function derivedPrimaryKeyProperties(primaryKey) {
         typeNumeric: !primaryKey.composite && primaryKey.fields[0].fieldTypeNumeric,
     });
 }
-export function prepareEntityPrimaryKeyForTemplates(entityWithConfig, generator, enableCompositeId = true) {
+export function prepareEntityPrimaryKeyForTemplates({ entity: entityWithConfig, enableCompositeId = true, application }) {
     const idFields = entityWithConfig.fields.filter(field => field.id);
     const idRelationships = entityWithConfig.relationships.filter(relationship => relationship.id);
     let idCount = idFields.length + idRelationships.length;
@@ -236,8 +236,12 @@ export function prepareEntityPrimaryKeyForTemplates(entityWithConfig, generator,
         let idField = entityWithConfig.fields.find(field => field.fieldName === 'id');
         if (idField) {
             idField.id = true;
+            idField.autoGenerate = idField.autoGenerate ?? true;
         }
         else {
+            if (entityWithConfig.microserviceName && !application?.microfrontend) {
+                this?.log.warn("Microservice entities should have the id field type specified (e.g., id String) to make sure gateway and microservice types don't conflict");
+            }
             idField = {
                 fieldName: 'id',
                 id: true,
@@ -355,7 +359,7 @@ export function prepareEntityPrimaryKeyForTemplates(entityWithConfig, generator,
             idField.dynamic = false;
             // Allow ids type to be empty and fallback to default type for the database.
             if (!idField.fieldType) {
-                idField.fieldType = generator.jhipsterConfig.pkType ?? getDatabaseTypeData(entityWithConfig.databaseType).defaultPrimaryKeyType;
+                idField.fieldType = application?.pkType ?? getDatabaseTypeData(entityWithConfig.databaseType).defaultPrimaryKeyType;
             }
             primaryKeyName = idField.fieldName;
             primaryKeyType = idField.fieldType;
@@ -546,14 +550,14 @@ function preparePostEntityCommonDerivedPropertiesNotTyped(entity) {
             relationship.relationshipEagerLoad = false;
             return;
         }
-        relationship.bagRelationship = relationship.ownerSide && relationship.collection;
-        if (relationship.relationshipEagerLoad === undefined) {
-            relationship.relationshipEagerLoad =
-                relationship.bagRelationship ||
+        mutateData(relationship, {
+            bagRelationship: relationship.ownerSide && relationship.collection,
+            relationshipEagerLoad: ({ relationshipEagerLoad, bagRelationship, ownerSide, otherEntity, otherEntityField }) => relationshipEagerLoad ??
+                (bagRelationship ||
                     entity.eagerLoad ||
                     // Fetch relationships if otherEntityField differs otherwise the id is enough
-                    (relationship.ownerSide && relationship.otherEntity.primaryKey.name !== relationship.otherEntityField);
-        }
+                    (ownerSide && otherEntity.primaryKey.name !== otherEntityField)),
+        });
     });
     entity.relationshipsContainEagerLoad = entity.relationships.some(relationship => relationship.relationshipEagerLoad);
     entity.containsBagRelationships = entity.relationships.some(relationship => relationship.bagRelationship);